From 69425e48400b46b47c2dc0291b19e0813afcc37f Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 09:54:05 +0700 Subject: [PATCH 01/30] Create pack.json --- blueprints/speeedcraft/pack.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 blueprints/speeedcraft/pack.json diff --git a/blueprints/speeedcraft/pack.json b/blueprints/speeedcraft/pack.json new file mode 100644 index 000000000..1070259ee --- /dev/null +++ b/blueprints/speeedcraft/pack.json @@ -0,0 +1 @@ +{"version":1,"pack-format":1,"desc":"This is your local Structurepack. This is where all your scans go.","authors":["SpeeeDCraft"],"mods":["structurize"],"name":"SpeeeDCraft","icon":""} \ No newline at end of file From 81dcb654cbebe4dcfc828c31ef450516f4830821 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 09:54:39 +0700 Subject: [PATCH 02/30] configgs --- config/attributefix.json | 11 +++++++++++ config/embeddium++.toml | 2 +- config/jade/sort-order.json | 8 ++++---- config/minecolonies-client.toml | 16 ++++++++++++++++ config/minecolonies-common.toml | 11 +++++++++++ config/structurize-client.toml | 18 ++++++++++++++++++ 6 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 config/minecolonies-client.toml create mode 100644 config/minecolonies-common.toml create mode 100644 config/structurize-client.toml diff --git a/config/attributefix.json b/config/attributefix.json index 0861b66a8..587b4093e 100644 --- a/config/attributefix.json +++ b/config/attributefix.json @@ -110,6 +110,17 @@ "value": 1000000 } }, + "minecolonies:mc_mob_damage": { + "enabled": false, + "min": { + "default": 1, + "value": 1 + }, + "max": { + "default": 20, + "value": 20 + } + }, "minecraft:generic.luck": { "enabled": true, "min": { diff --git a/config/embeddium++.toml b/config/embeddium++.toml index d4cb72c43..ec795a475 100644 --- a/config/embeddium++.toml +++ b/config/embeddium++.toml @@ -12,7 +12,7 @@ #Set Fullscreen mode #Borderless let you change between screens more faster and move your mouse across monitors #Allowed Values: WINDOWED, BORDERLESS, FULLSCREEN - fullscreen = "WINDOWED" + fullscreen = "FULLSCREEN" #Configure FPS Display gravity #Places counter on specified corner of your screen #Allowed Values: LEFT, CENTER, RIGHT diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index 6fa827b56..df5164d44 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -207,10 +207,6 @@ "tfc:ocelot": null, "tfc:rabbit": null, "tfc:fishing_hook": null, - "gtceu:electric_container_provider": null, - "gtceu:workable_provider": null, - "gtceu:controllable_provider": null, - "gtceu:recipe_logic_provider": null, "minecraft:brewing_stand": null, "minecraft:beehive": null, "minecraft:command_block": null, @@ -267,6 +263,10 @@ "ae2:part_icon": null, "ae2:part_tooltip": null, "ae2:part_mod_name": null, + "gtceu:electric_container_provider": null, + "gtceu:workable_provider": null, + "gtceu:controllable_provider": null, + "gtceu:recipe_logic_provider": null, "treetap:tap": null, "firmalife:drying_mat": null, "firmalife:solar_drier": null, diff --git a/config/minecolonies-client.toml b/config/minecolonies-client.toml new file mode 100644 index 000000000..7a190118f --- /dev/null +++ b/config/minecolonies-client.toml @@ -0,0 +1,16 @@ + +#All configuration items related to the core gameplay +[gameplay] + #minecolonies.config.enablecitizenvoices.comment [Default: true] + enablecitizenvoices = true + #By default, when placing a schematic near other buildings, the already-placed buildings will show as if they were at level 5 and have a blue outline around them. You can disable that by setting this to false. [Default: true] + neighborbuildingrendering = true + #How close a building needs to be to another to be considered a neighbor, in blocks. -1 = intersecting, 0 = touching [Default: 4, min: -2, max: 16] + #Range: -2 ~ 16 + neighborbuildingrange = 4 + #How close (in blocks) you need to be to see work orders while wearing the Build Goggles. [Default: 50, min: 1, max: 250] + #Range: 1 ~ 250 + buildgogglerange = 50 + #When true, the colony borders shown when holding the build tool will be in the colony's team color. When false, the colony you're inside will be white and any other colony will be red. [Default: true] + colonyteamborders = true + diff --git a/config/minecolonies-common.toml b/config/minecolonies-common.toml new file mode 100644 index 000000000..2a1bca83e --- /dev/null +++ b/config/minecolonies-common.toml @@ -0,0 +1,11 @@ + +#All configuration items related to the core gameplay +[gameplay] + #Whether to generate supply ships and camps in loot chests. [Default: true] + generatesupplyloot = true + +#All configurations related to the request system +[requestsystem] + #Should the request system show debug information in the debug.log? Useful if malfunctioning. [Default: false] + enabledebuglogging = false + diff --git a/config/structurize-client.toml b/config/structurize-client.toml new file mode 100644 index 000000000..6cf8ba84f --- /dev/null +++ b/config/structurize-client.toml @@ -0,0 +1,18 @@ + +[blueprint] + + #Affects all previews + [blueprint.renderer] + #If disabled show placeholders as normal blocks, if enabled render: any (light) -> nothing, fluid (blue) -> dimension default fluid, solid (brown) -> worldgen block, tag (transparent) -> content block. Fluid and solid only work in singleplayer/for LAN owner, else it's just best guess. Currently without auto-updating [Default: false] + render_placeholders_nice = false + #Enabling this will send most of your active previews to nearby players [Default: false] + share_previews = false + #Once enabled you will see previews from other players within sensible distance [Default: false] + see_shared_previews = false + #-1 for same as current vanilla world, 0 to 15 (min to max) for static light level [Default: 15, min: -1, max: 15] + #Range: -1 ~ 15 + light_level = 15 + #From 0 (transparent) to 1 (opaque). ALPHA FEATURE, reported bugs may not receive fix. (Minus values also mean disabled) [Default: -1.0, min: -1.0, max: 1.0] + #Range: -1.0 ~ 1.0 + transparency = -1.0 + From 23e035536b59ae0703f48230acf75bf9fc5cb8f5 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 10:36:12 +0700 Subject: [PATCH 03/30] some quests shit --- config/ftbquests/quests/chapters/ae2.snbt | 457 +++++++++--------- config/ftbquests/quests/chapters/cc.snbt | 32 +- config/ftbquests/quests/chapters/create.snbt | 2 +- .../quests/chapters/hv__high_voltage.snbt | 34 +- .../quests/chapters/multiblock_dilemma.snbt | 14 +- .../ftbquests/quests/chapters/steam_age.snbt | 25 +- .../quests/chapters/uv__ultimate_voltage.snbt | 8 +- 7 files changed, 272 insertions(+), 300 deletions(-) diff --git a/config/ftbquests/quests/chapters/ae2.snbt b/config/ftbquests/quests/chapters/ae2.snbt index 643b12bd9..dcb68b017 100644 --- a/config/ftbquests/quests/chapters/ae2.snbt +++ b/config/ftbquests/quests/chapters/ae2.snbt @@ -1,17 +1,24 @@ { default_hide_dependency_lines: false - default_quest_shape: "" + default_quest_shape: "rsquare" filename: "ae2" group: "" icon: "ae2:controller" id: "09BE9F51822EC180" order_index: 7 - quest_links: [ ] + quest_links: [{ + id: "3293CB774C1A4DF0" + linked_quest: "1D88369409736DC7" + size: 2.0d + x: -5.0d + y: 0.0d + }] quests: [ { dependencies: ["15B4CB2A3B01C930"] id: "11069B97D8CA203D" - shape: "circle" + shape: "gear" + size: 2.0d tasks: [{ id: "0F463046CA1A890F" item: { @@ -26,26 +33,24 @@ } type: "item" }] - x: -2.0d + x: 1.5d y: -2.0d } { dependencies: ["20AAF0C5177EC3FE"] id: "15B4CB2A3B01C930" - shape: "diamond" size: 1.0d tasks: [{ id: "641D2A6D8BEF2A5E" item: "ae2:fluix_crystal" type: "item" }] - x: 0.0d + x: -1.0d y: 0.0d } { dependencies: ["11069B97D8CA203D"] id: "64C0AAAC93D59520" - shape: "circle" tasks: [{ id: "57F5A1752F077CF7" item: { @@ -60,13 +65,12 @@ } type: "item" }] - x: -2.0d + x: 4.5d y: -4.0d } { dependencies: ["64C0AAAC93D59520"] id: "5D8C1BFC675A117F" - shape: "circle" tasks: [{ id: "2FD9DC79452B5B40" item: { @@ -81,13 +85,12 @@ } type: "item" }] - x: -2.0d - y: -6.0d + x: 6.0d + y: -4.0d } { dependencies: ["5D8C1BFC675A117F"] id: "6495EE6BBB1F5182" - shape: "circle" tasks: [{ id: "639E6F5FEBE8E2A6" item: { @@ -102,13 +105,12 @@ } type: "item" }] - x: -3.0d - y: -7.0d + x: 6.0d + y: -5.5d } { dependencies: ["64C0AAAC93D59520"] id: "3D2A3259673738B1" - shape: "circle" tasks: [{ id: "496B150BE185851D" item: { @@ -123,37 +125,34 @@ } type: "item" }] - x: -3.0d - y: -5.0d + x: 4.5d + y: -5.5d } { dependencies: ["11069B97D8CA203D"] id: "6E2F0F0D9E5BA86D" - shape: "circle" tasks: [{ id: "5ECA6F8EB97BE119" item: "ae2:level_emitter" type: "item" }] - x: -3.0d - y: -2.0d + x: 1.5d + y: -4.0d } { dependencies: ["6E2F0F0D9E5BA86D"] id: "37321DFE14E8850F" - shape: "circle" tasks: [{ id: "30254756C90272FE" item: "ae2:energy_level_emitter" type: "item" }] - x: -4.0d - y: -3.0d + x: 3.0d + y: -5.5d } { dependencies: ["6E2F0F0D9E5BA86D"] id: "58F7CFE5F57C9FD7" - shape: "circle" tasks: [{ id: "2A9825E43F2E4998" item: { @@ -168,20 +167,19 @@ } type: "item" }] - x: -4.0d - y: -2.0d + x: 1.5d + y: -5.5d } { - dependencies: ["15B4CB2A3B01C930"] + dependencies: ["3E0EE1623F16A15A"] id: "0BBA3FA755FB2698" - shape: "pentagon" tasks: [{ id: "48D2855552F028D6" item: "ae2:me_p2p_tunnel" type: "item" }] - x: 0.0d - y: -6.0d + x: 2.0d + y: 7.0d } { dependencies: ["0BBA3FA755FB2698"] @@ -191,8 +189,8 @@ item: "ae2:fe_p2p_tunnel" type: "item" }] - x: -2.0d - y: -8.0d + x: 3.5d + y: 4.0d } { dependencies: ["0BBA3FA755FB2698"] @@ -203,8 +201,8 @@ item: "ae2:fluid_p2p_tunnel" type: "item" }] - x: -1.0d - y: -8.0d + x: 3.5d + y: 5.5d } { dependencies: ["0BBA3FA755FB2698"] @@ -214,8 +212,8 @@ item: "ae2:item_p2p_tunnel" type: "item" }] - x: 1.0d - y: -8.0d + x: 3.5d + y: 8.5d } { dependencies: ["0BBA3FA755FB2698"] @@ -225,8 +223,8 @@ item: "ae2:redstone_p2p_tunnel" type: "item" }] - x: 2.0d - y: -8.0d + x: 3.5d + y: 10.0d } { dependencies: ["0BBA3FA755FB2698"] @@ -236,52 +234,41 @@ item: "ae2:light_p2p_tunnel" type: "item" }] - x: 0.0d - y: -8.0d + x: 3.5d + y: 7.0d } { - dependencies: ["77865DA468B31959"] + dependencies: ["1D88369409736DC7"] id: "20AAF0C5177EC3FE" - shape: "circle" + size: 1.5d tasks: [{ id: "38FBD1879EDC06B6" item: "ae2:charged_certus_quartz_crystal" type: "item" }] - x: -1.0d - y: 0.0d - } - { - dependencies: ["1E73F9956E6EC967"] - id: "77865DA468B31959" - shape: "circle" - tasks: [{ - id: "48FD363CD151D50C" - item: "ae2:certus_quartz_crystal" - type: "item" - }] - x: -2.0d - y: 0.0d - } - { - dependencies: [ - "3568BC9742092FC5" - "16B735F9C391D260" - ] - id: "1E73F9956E6EC967" - shape: "rsquare" - tasks: [{ - id: "0587ACDD51ADC077" - item: "ae2:controller" - type: "item" - }] x: -3.0d y: 0.0d } + { + dependencies: [ + "3568BC9742092FC5" + "16B735F9C391D260" + "15B4CB2A3B01C930" + ] + id: "1E73F9956E6EC967" + shape: "gear" + size: 2.0d + tasks: [{ + id: "0587ACDD51ADC077" + item: "ae2:controller" + type: "item" + }] + x: -1.0d + y: -2.0d + } { dependencies: ["1E73F9956E6EC967"] id: "63114F9095903E55" - shape: "circle" tasks: [{ id: "0624EA9D860EA98F" item: { @@ -296,80 +283,84 @@ } type: "item" }] - x: -4.0d - y: 0.0d + x: -1.0d + y: -4.0d } { dependencies: ["03051939555D211E"] id: "4C9EB2FF05EB47CB" - shape: "circle" tasks: [{ id: "7D24D63E3FFA3BF6" item: "ae2:conversion_monitor" type: "item" }] - x: -8.0d - y: -2.0d + x: -4.0d + y: -4.0d } { dependencies: ["63114F9095903E55"] id: "03051939555D211E" - shape: "circle" tasks: [{ id: "6960A9B39312A77A" item: "ae2:storage_monitor" type: "item" }] - x: -6.0d - y: -1.0d + x: -2.5d + y: -4.0d } { dependencies: ["63114F9095903E55"] id: "311EFB6031E268F6" - shape: "circle" + size: 2.0d tasks: [{ id: "4F1DAE02D4CBBDC0" item: "ae2:terminal" type: "item" }] - x: -6.0d - y: 1.0d + x: -1.0d + y: -6.0d } { - dependencies: ["311EFB6031E268F6"] + dependencies: [ + "311EFB6031E268F6" + "26FD8E74CFFF1971" + ] id: "2B69AC5267633F37" - shape: "circle" tasks: [{ id: "3CAF0E94DF11F1C0" item: "ae2:pattern_encoding_terminal" type: "item" }] - x: -8.0d - y: 0.0d + x: -2.5d + y: -8.5d } { - dependencies: ["311EFB6031E268F6"] + dependencies: [ + "311EFB6031E268F6" + "26FD8E74CFFF1971" + ] id: "22262840D8FB66F6" - shape: "circle" tasks: [{ id: "793F9E9150647BEE" item: "ae2:pattern_access_terminal" type: "item" }] - x: -8.0d - y: 1.0d + x: 0.5d + y: -8.5d } { - dependencies: ["311EFB6031E268F6"] + dependencies: [ + "311EFB6031E268F6" + "26FD8E74CFFF1971" + ] id: "1C1B3A46E03FCE67" - shape: "circle" tasks: [{ id: "32DECB9740131BFF" item: "ae2:crafting_terminal" type: "item" }] - x: -8.0d - y: 2.0d + x: -1.0d + y: -8.5d } { dependencies: ["15B4CB2A3B01C930"] @@ -379,8 +370,8 @@ item: "ae2:annihilation_core" type: "item" }] - x: 5.0d - y: -1.0d + x: 3.5d + y: -0.5d } { dependencies: ["15B4CB2A3B01C930"] @@ -390,8 +381,8 @@ item: "ae2:formation_core" type: "item" }] - x: 5.0d - y: 1.0d + x: 3.5d + y: 0.5d } { dependencies: ["5CAF4D91F281D3BC"] @@ -401,8 +392,8 @@ item: "ae2:import_bus" type: "item" }] - x: 5.0d - y: -3.0d + x: 3.5d + y: -2.0d } { dependencies: ["780DB1BBED7236C3"] @@ -412,8 +403,8 @@ item: "ae2:export_bus" type: "item" }] - x: 5.0d - y: 3.0d + x: 3.5d + y: 2.0d } { dependencies: ["5CAF4D91F281D3BC"] @@ -423,8 +414,8 @@ item: "ae2:annihilation_plane" type: "item" }] - x: 7.0d - y: -3.0d + x: 5.0d + y: -2.0d } { dependencies: ["780DB1BBED7236C3"] @@ -434,8 +425,8 @@ item: "ae2:formation_plane" type: "item" }] - x: 7.0d - y: 3.0d + x: 5.0d + y: 2.0d } { dependencies: [ @@ -449,7 +440,7 @@ item: "ae2:interface" type: "item" }] - x: 7.0d + x: 5.0d y: 0.0d } { @@ -460,7 +451,7 @@ item: "ae2:storage_bus" type: "item" }] - x: 9.0d + x: 6.5d y: 0.0d } { @@ -472,7 +463,7 @@ item: "ae2:molecular_assembler" type: "item" }] - x: 11.0d + x: 8.0d y: 0.0d } { @@ -484,7 +475,7 @@ item: "ae2:crafting_unit" type: "item" }] - x: 12.5d + x: 9.5d y: 0.0d } { @@ -496,8 +487,8 @@ item: "ae2:1k_crafting_storage" type: "item" }] - x: 12.5d - y: -2.5d + x: 12.0d + y: -2.0d } { dependencies: ["1DDEDA43A63A1B14"] @@ -508,8 +499,8 @@ item: "ae2:4k_crafting_storage" type: "item" }] - x: 13.5d - y: -2.5d + x: 12.0d + y: -1.0d } { dependencies: ["1DDEDA43A63A1B14"] @@ -520,8 +511,8 @@ item: "ae2:16k_crafting_storage" type: "item" }] - x: 14.5d - y: -2.0d + x: 12.0d + y: 0.0d } { dependencies: ["1DDEDA43A63A1B14"] @@ -532,8 +523,8 @@ item: "ae2:64k_crafting_storage" type: "item" }] - x: 15.0d - y: -1.0d + x: 12.0d + y: 1.0d } { dependencies: ["1DDEDA43A63A1B14"] @@ -544,8 +535,8 @@ item: "ae2:256k_crafting_storage" type: "item" }] - x: 15.0d - y: 0.0d + x: 12.0d + y: 2.0d } { dependencies: ["1DDEDA43A63A1B14"] @@ -556,8 +547,8 @@ item: "ae2:crafting_accelerator" type: "item" }] - x: 13.5d - y: 1.5d + x: 9.5d + y: -2.0d } { dependencies: ["1DDEDA43A63A1B14"] @@ -568,8 +559,8 @@ item: "ae2:crafting_monitor" type: "item" }] - x: 12.5d - y: 1.5d + x: 9.5d + y: 2.0d } { dependencies: ["0BBA3FA755FB2698"] @@ -585,7 +576,7 @@ type: "item" }] x: 2.0d - y: -6.0d + y: 4.0d } { dependencies: ["15B4CB2A3B01C930"] @@ -596,7 +587,7 @@ item: "ae2:network_tool" type: "item" }] - x: 0.0d + x: -1.0d y: 2.0d } { @@ -608,7 +599,7 @@ item: "ae2:silicon_press" type: "item" }] - x: -1.0d + x: -2.0d y: 2.0d } { @@ -620,7 +611,7 @@ item: "ae2:engineering_processor_press" type: "item" }] - x: 1.0d + x: 0.0d y: 2.0d } { @@ -632,8 +623,8 @@ item: "ae2:logic_processor_press" type: "item" }] - x: 2.0d - y: 2.5d + x: 1.0d + y: 2.0d } { dependencies: ["15B4CB2A3B01C930"] @@ -644,8 +635,8 @@ item: "ae2:calculation_processor_press" type: "item" }] - x: -2.0d - y: 2.5d + x: -3.0d + y: 2.0d } { dependencies: [ @@ -670,7 +661,7 @@ } type: "item" }] - x: 0.0d + x: -1.0d y: 4.0d } { @@ -682,7 +673,7 @@ item: "ae2:printed_logic_processor" type: "item" }] - x: 2.0d + x: 0.5d y: 5.5d } { @@ -694,8 +685,8 @@ item: "ae2:printed_silicon" type: "item" }] - x: -1.0d - y: 6.0d + x: -1.5d + y: 5.5d } { dependencies: ["6A000300061A94CB"] @@ -706,7 +697,7 @@ item: "ae2:printed_calculation_processor" type: "item" }] - x: -2.0d + x: -2.5d y: 5.5d } { @@ -718,8 +709,8 @@ item: "ae2:printed_engineering_processor" type: "item" }] - x: 1.0d - y: 6.0d + x: -0.5d + y: 5.5d } { dependencies: [ @@ -749,8 +740,8 @@ } ] title: "Processors" - x: 0.0d - y: 8.0d + x: -1.0d + y: 7.0d } { dependencies: ["3E0EE1623F16A15A"] @@ -761,8 +752,8 @@ item: "ae2:chest" type: "item" }] - x: 1.5d - y: 7.5d + x: 1.0d + y: 10.0d } { dependencies: ["3E0EE1623F16A15A"] @@ -773,8 +764,8 @@ item: "ae2:cell_workbench" type: "item" }] - x: 1.5d - y: 8.5d + x: -3.0d + y: 11.0d } { dependencies: ["3E0EE1623F16A15A"] @@ -785,7 +776,7 @@ item: "ae2:drive" type: "item" }] - x: 0.0d + x: -0.5d y: 11.0d } { @@ -797,8 +788,8 @@ item: "ae2:io_port" type: "item" }] - x: 0.0d - y: 12.0d + x: 1.0d + y: 11.0d } { dependencies: ["3E0EE1623F16A15A"] @@ -816,7 +807,7 @@ type: "item" } ] - x: -2.0d + x: -1.5d y: 11.0d } { @@ -828,8 +819,8 @@ item: "ae2:spatial_cell_component_2" type: "item" }] - x: -2.0d - y: 13.0d + x: -1.5d + y: 12.5d } { dependencies: ["29F882A468CF31F1"] @@ -840,8 +831,8 @@ item: "ae2:spatial_cell_component_16" type: "item" }] - x: -2.0d - y: 14.0d + x: -1.5d + y: 13.5d } { dependencies: ["29F882A468CF31F1"] @@ -852,8 +843,8 @@ item: "ae2:spatial_cell_component_128" type: "item" }] - x: -2.0d - y: 15.0d + x: -1.5d + y: 14.5d } { dependencies: ["631F87CEEA9DF64E"] @@ -864,8 +855,8 @@ item: "ae2:spatial_storage_cell_2" type: "item" }] - x: 0.0d - y: 13.0d + x: -3.0d + y: 12.5d } { dependencies: ["11743B7B9DAF0004"] @@ -876,8 +867,8 @@ item: "ae2:spatial_storage_cell_16" type: "item" }] - x: 0.0d - y: 14.0d + x: -3.0d + y: 13.5d } { dependencies: ["541634A975DCDCFC"] @@ -888,8 +879,8 @@ item: "ae2:spatial_storage_cell_128" type: "item" }] - x: 0.0d - y: 15.0d + x: -3.0d + y: 14.5d } { dependencies: ["7FE61D03A7F15A6F"] @@ -900,8 +891,8 @@ item: "ae2:wireless_access_point" type: "item" }] - x: 3.0d - y: 11.0d + x: -0.5d + y: 12.5d } { dependencies: ["7F4B44F220336BAC"] @@ -912,8 +903,8 @@ item: "ae2:wireless_booster" type: "item" }] - x: 3.0d - y: 8.0d + x: 1.0d + y: 12.5d } { dependencies: ["2054E9812A64BF56"] @@ -924,8 +915,8 @@ item: "ae2:wireless_terminal" type: "item" }] - x: 5.0d - y: 8.0d + x: 3.5d + y: 12.5d } { dependencies: ["694C8A2A90A70052"] @@ -940,8 +931,8 @@ } type: "item" }] - x: 7.0d - y: 7.0d + x: 5.5d + y: 11.5d } { dependencies: ["694C8A2A90A70052"] @@ -952,8 +943,8 @@ item: "ae2wtlib:wireless_pattern_encoding_terminal" type: "item" }] - x: 7.0d - y: 9.0d + x: 5.5d + y: 13.5d } { dependencies: [ @@ -969,8 +960,8 @@ item: "ae2wtlib:wireless_universal_terminal" type: "item" }] - x: 9.0d - y: 8.0d + x: 7.5d + y: 12.5d } { dependencies: ["2054E9812A64BF56"] @@ -981,8 +972,8 @@ item: "ae2wtlib:quantum_bridge_card" type: "item" }] - x: 5.0d - y: 10.0d + x: 2.5d + y: 14.0d } { dependencies: ["2054E9812A64BF56"] @@ -993,8 +984,8 @@ item: "ae2wtlib:magnet_card" type: "item" }] - x: 5.0d - y: 11.0d + x: 1.0d + y: 14.0d } { dependencies: ["694C8A2A90A70052"] @@ -1005,8 +996,8 @@ item: "ae2wtlib:wireless_pattern_access_terminal" type: "item" }] - x: 7.0d - y: 8.0d + x: 5.5d + y: 12.5d } { dependencies: ["3E0EE1623F16A15A"] @@ -1017,8 +1008,8 @@ item: "ae2:item_cell_housing" type: "item" }] - x: -3.5d - y: 7.0d + x: -4.0d + y: 6.0d } { dependencies: ["3E0EE1623F16A15A"] @@ -1029,8 +1020,8 @@ item: "ae2:fluid_cell_housing" type: "item" }] - x: -3.5d - y: 9.0d + x: -4.0d + y: 8.0d } { dependencies: [ @@ -1045,8 +1036,8 @@ item: "ae2:cell_component_1k" type: "item" }] - x: -5.0d - y: 8.0d + x: -5.5d + y: 7.0d } { dependencies: [ @@ -1061,8 +1052,8 @@ item: "ae2:cell_component_4k" type: "item" }] - x: -6.0d - y: 8.0d + x: -6.5d + y: 7.0d } { dependencies: [ @@ -1077,8 +1068,8 @@ item: "ae2:cell_component_16k" type: "item" }] - x: -7.0d - y: 8.0d + x: -7.5d + y: 7.0d } { dependencies: [ @@ -1093,8 +1084,8 @@ item: "ae2:cell_component_64k" type: "item" }] - x: -8.0d - y: 8.0d + x: -8.5d + y: 7.0d } { dependencies: [ @@ -1109,8 +1100,8 @@ item: "ae2:cell_component_256k" type: "item" }] - x: -9.0d - y: 8.0d + x: -9.5d + y: 7.0d } { dependencies: ["10A45BEBBEA7A466"] @@ -1125,8 +1116,8 @@ } type: "item" }] - x: -9.0d - y: 6.5d + x: -9.5d + y: 5.5d } { dependencies: ["10A45BEBBEA7A466"] @@ -1141,8 +1132,8 @@ } type: "item" }] - x: -9.0d - y: 9.5d + x: -9.5d + y: 8.5d } { dependencies: ["10A45BEBBEA7A466"] @@ -1157,8 +1148,8 @@ } type: "item" }] - x: -9.5d - y: 5.5d + x: -10.0d + y: 4.5d } { dependencies: ["10A45BEBBEA7A466"] @@ -1173,8 +1164,8 @@ } type: "item" }] - x: -9.5d - y: 10.5d + x: -10.0d + y: 9.5d } { dependencies: ["0607FA5840388340"] @@ -1189,8 +1180,8 @@ } type: "item" }] - x: -8.0d - y: 6.5d + x: -8.5d + y: 5.5d } { dependencies: ["0607FA5840388340"] @@ -1205,8 +1196,8 @@ } type: "item" }] - x: -8.0d - y: 9.5d + x: -8.5d + y: 8.5d } { dependencies: ["0607FA5840388340"] @@ -1221,8 +1212,8 @@ } type: "item" }] - x: -8.5d - y: 5.5d + x: -9.0d + y: 4.5d } { dependencies: ["0607FA5840388340"] @@ -1237,8 +1228,8 @@ } type: "item" }] - x: -8.5d - y: 10.5d + x: -9.0d + y: 9.5d } { dependencies: ["2BC9838A531A4A09"] @@ -1253,8 +1244,8 @@ } type: "item" }] - x: -7.0d - y: 9.5d + x: -7.5d + y: 8.5d } { dependencies: ["2BC9838A531A4A09"] @@ -1269,8 +1260,8 @@ } type: "item" }] - x: -7.0d - y: 6.5d + x: -7.5d + y: 5.5d } { dependencies: ["2BC9838A531A4A09"] @@ -1285,8 +1276,8 @@ } type: "item" }] - x: -7.5d - y: 5.5d + x: -8.0d + y: 4.5d } { dependencies: ["2BC9838A531A4A09"] @@ -1301,8 +1292,8 @@ } type: "item" }] - x: -7.5d - y: 10.5d + x: -8.0d + y: 9.5d } { dependencies: ["10E9CA0C1E6611A8"] @@ -1317,8 +1308,8 @@ } type: "item" }] - x: -6.0d - y: 6.5d + x: -6.5d + y: 5.5d } { dependencies: ["10E9CA0C1E6611A8"] @@ -1333,8 +1324,8 @@ } type: "item" }] - x: -6.0d - y: 9.5d + x: -6.5d + y: 8.5d } { dependencies: ["10E9CA0C1E6611A8"] @@ -1349,8 +1340,8 @@ } type: "item" }] - x: -6.5d - y: 5.5d + x: -7.0d + y: 4.5d } { dependencies: ["10E9CA0C1E6611A8"] @@ -1365,8 +1356,8 @@ } type: "item" }] - x: -6.5d - y: 10.5d + x: -7.0d + y: 9.5d } { dependencies: ["6F6E7BCA93EA420B"] @@ -1381,8 +1372,8 @@ } type: "item" }] - x: -5.0d - y: 6.5d + x: -5.5d + y: 5.5d } { dependencies: ["6F6E7BCA93EA420B"] @@ -1397,8 +1388,8 @@ } type: "item" }] - x: -5.0d - y: 9.5d + x: -5.5d + y: 8.5d } { dependencies: ["6F6E7BCA93EA420B"] @@ -1413,8 +1404,8 @@ } type: "item" }] - x: -5.5d - y: 5.5d + x: -6.0d + y: 4.5d } { dependencies: ["6F6E7BCA93EA420B"] @@ -1429,9 +1420,9 @@ } type: "item" }] - x: -5.5d - y: 10.5d + x: -6.0d + y: 9.5d } ] - title: "AE2" + title: "&6HV&r - AE2" } diff --git a/config/ftbquests/quests/chapters/cc.snbt b/config/ftbquests/quests/chapters/cc.snbt index 52ad364cf..b4234ca14 100644 --- a/config/ftbquests/quests/chapters/cc.snbt +++ b/config/ftbquests/quests/chapters/cc.snbt @@ -5,7 +5,7 @@ group: "" icon: "computercraft:computer_advanced" id: "1A6D6B70EC13DDC6" - order_index: 6 + order_index: 5 quest_links: [ ] quests: [ { @@ -31,8 +31,8 @@ item: "computercraft:computer_normal" type: "item" }] - x: -2.5d - y: -3.0d + x: 2.5d + y: -2.5d } { dependencies: ["591C5E26EE7466F3"] @@ -42,8 +42,8 @@ item: "computercraft:computer_advanced" type: "item" }] - x: -2.5d - y: 3.0d + x: 2.5d + y: 2.5d } { dependencies: ["249A6189A9334B14"] @@ -53,8 +53,8 @@ item: "computercraft:turtle_advanced" type: "item" }] - x: -1.5d - y: 4.5d + x: 2.5d + y: 4.0d } { dependencies: ["0BFFB20573B2A9A5"] @@ -64,7 +64,7 @@ item: "computercraft:turtle_normal" type: "item" }] - x: -1.5d + x: 2.5d y: -4.5d } { @@ -79,7 +79,7 @@ item: "computercraft:cable" type: "item" }] - x: -4.0d + x: 2.5d y: 0.0d } { @@ -91,13 +91,13 @@ icon: "computercraft:monitor_advanced" id: "7FFDA4C59514AA98" shape: "octagon" - size: 1.5d + size: 2.0d tasks: [{ id: "7D070BAFC0F4226A" type: "checkmark" }] title: "It's time to craft trinkets" - x: 6.0d + x: 5.0d y: 0.0d } { @@ -109,7 +109,7 @@ item: "computercraft:monitor_normal" type: "item" }] - x: 5.5d + x: 5.0d y: -3.0d } { @@ -121,7 +121,7 @@ item: "computercraft:monitor_advanced" type: "item" }] - x: 5.5d + x: 5.0d y: 3.0d } { @@ -133,7 +133,7 @@ item: "computercraft:wireless_modem_normal" type: "item" }] - x: 7.0d + x: 6.5d y: -3.0d } { @@ -145,7 +145,7 @@ item: "computercraft:wireless_modem_advanced" type: "item" }] - x: 7.0d + x: 6.5d y: 3.0d } { @@ -209,5 +209,5 @@ y: 0.0d } ] - title: "CC: Tweaked" + title: "&bMV&r - Computers" } diff --git a/config/ftbquests/quests/chapters/create.snbt b/config/ftbquests/quests/chapters/create.snbt index 7960af2c0..1b28b0c44 100644 --- a/config/ftbquests/quests/chapters/create.snbt +++ b/config/ftbquests/quests/chapters/create.snbt @@ -446,5 +446,5 @@ y: -4.0d } ] - title: "Create" + title: "Mechanical Age" } diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 5d57246de..83b75136f 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -5,7 +5,7 @@ group: "" icon: "gtceu:hv_electric_motor" id: "237BDB19A9495869" - order_index: 5 + order_index: 6 quest_links: [ { id: "2583D0B64E51FAC8" @@ -842,16 +842,6 @@ "" "The catch here is that it takes &dDistilled Water&r, and consumes a bit of &dSulfur&r with every step." ] - icon: { - Count: 1b - id: "gtceu:fluid_cell" - tag: { - Fluid: { - Amount: 8000 - FluidName: "gtceu:nitrobenzene" - } - } - } id: "56E7A3A0CC690C8A" shape: "rsquare" size: 0.66d @@ -1107,16 +1097,6 @@ "" "The catch comes in the complexity of making &dTNM&r. In order to concoct it, you must react &aNitric Acid&r with either &dEthenone&r or &aMethyl Acetate&r, both of which have quite an involved process themselves!" ] - icon: { - Count: 1b - id: "gtceu:fluid_cell" - tag: { - Fluid: { - Amount: 8000 - FluidName: "gtceu:cetane_boosted_diesel" - } - } - } id: "04F6E968CEEC3D49" shape: "rsquare" size: 0.66d @@ -1246,6 +1226,18 @@ x: 6.75d y: -0.75d } + { + dependencies: ["16A6AE5C770DB83A"] + id: "1D88369409736DC7" + size: 0.75d + tasks: [{ + id: "722AEA3607BBAC94" + item: "gtceu:hv_polarizer" + type: "item" + }] + x: 4.5d + y: -3.0d + } ] subtitle: ["Scale up your power and begin advanced chemistry"] title: "&6HV&r - High Voltage" diff --git a/config/ftbquests/quests/chapters/multiblock_dilemma.snbt b/config/ftbquests/quests/chapters/multiblock_dilemma.snbt index 261fd9e1f..384fb4eb7 100644 --- a/config/ftbquests/quests/chapters/multiblock_dilemma.snbt +++ b/config/ftbquests/quests/chapters/multiblock_dilemma.snbt @@ -84,15 +84,15 @@ id: "3003AF60FECF2899" linked_quest: "33263404ED38C6D2" shape: "rsquare" - x: 0.0d + x: 1.5d y: 1.5d } { id: "7D7392009AC28773" linked_quest: "1BB40CCF17D00719" shape: "rsquare" - x: 0.0d - y: 3.0d + x: 3.0d + y: 0.0d } { id: "1666AE4895ABBED3" @@ -199,14 +199,14 @@ id: "26A69E20AEC61DF1" linked_quest: "249FA99AADAC3710" shape: "rsquare" - x: 0.0d - y: 4.5d + x: 1.5d + y: 0.0d } { id: "7D67FF93BFAF6A4A" linked_quest: "328CFD483C26EA44" shape: "rsquare" - x: 0.0d + x: 1.5d y: 6.0d } { @@ -243,7 +243,7 @@ { id: "7DF7C035D303B90A" linked_quest: "1D623D93EEDD3C67" - x: 1.5d + x: 3.0d y: 6.0d } ] diff --git a/config/ftbquests/quests/chapters/steam_age.snbt b/config/ftbquests/quests/chapters/steam_age.snbt index 7bedeadca..066862c8b 100644 --- a/config/ftbquests/quests/chapters/steam_age.snbt +++ b/config/ftbquests/quests/chapters/steam_age.snbt @@ -16,7 +16,7 @@ { id: "09E0E263CC81CD99" linked_quest: "2658E7679CD42ACD" - x: 9.5d + x: 9.0d y: 4.5d } { @@ -51,6 +51,12 @@ x: -7.5d y: 0.0d } + { + id: "3E93FFAACC24EEA5" + linked_quest: "7B74DB051202E97E" + x: 11.5d + y: -1.0d + } ] quests: [ { @@ -239,7 +245,7 @@ type: "item" }] title: "Electronics #1: Resistors" - x: 9.5d + x: 9.0d y: 3.0d } { @@ -370,7 +376,7 @@ "4ED5A9AEF7B928BA" "54AF8696674766B4" "77EA56D16A9B3BFC" - "7941AFD548C8C405" + "7B74DB051202E97E" ] description: [ "We made it to &7LV&r! Give yourself a pat on the back!" @@ -786,18 +792,7 @@ x: -4.5d y: 0.0d } - { - dependencies: ["78BE0A10CE7B4BBE"] - id: "7941AFD548C8C405" - tasks: [{ - id: "366B735B8F6F02B1" - item: "create:deployer" - type: "item" - }] - x: 11.5d - y: -1.0d - } ] subtitle: ["Harness the power of Steam and learn the basics"] - title: "Steam Age" + title: "ULV - Steam Age" } diff --git a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt b/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt index 2f44306c8..de95169c2 100644 --- a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt +++ b/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt @@ -53,13 +53,7 @@ "&6&lThank you for playing the pack! :D&r" "- The GregTech Community Pack Dev Team" ] - icon: { - Count: 1b - id: "gtceu:iron_wrench" - tag: { - Damage: 0 - } - } + icon: "gtceu:nan_certificate" id: "6E8F257261F93501" shape: "heart" size: 4.0d From fe3260ab07433ab92d2f6e9ec411e788ea9b9c4d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 10:36:27 +0700 Subject: [PATCH 04/30] Update recipes.js more charged certus quartz recipes --- kubejs/server_scripts/ae2/recipes.js | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 53ab5951a..78baed2be 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -1677,13 +1677,27 @@ const registerAE2Recipes = (event) => { .duration(20) .EUt(480) - // Charged Certus Quartz - event.recipes.gtceu.polarizer('ae2:charged_certus_quartz_crystal') - .itemInputs('#forge:gems/certus_quartz') + // Charged Certus Quartz 1x + event.recipes.gtceu.polarizer('ae2:charged_certus_quartz_crystal_1x') + .itemInputs('ae2:certus_quartz_crystal') .itemOutputs('ae2:charged_certus_quartz_crystal') .duration(800) .EUt(190) + // Charged Certus Quartz 2x + event.recipes.gtceu.polarizer('ae2:charged_certus_quartz_crystal_2x') + .itemInputs('gtceu:flawless_certus_quartz_gem') + .itemOutputs('2x ae2:charged_certus_quartz_crystal') + .duration(800) + .EUt(190) + + // Charged Certus Quartz 4x + event.recipes.gtceu.polarizer('ae2:charged_certus_quartz_crystal_4x') + .itemInputs('gtceu:exquisite_certus_quartz_gem') + .itemOutputs('4x ae2:charged_certus_quartz_crystal') + .duration(800) + .EUt(190) + //#region Cell Packing event.recipes.gtceu.packer('ae2:view_cell') From b8ce374fb017c8ea82c7cc95108ad9fed181c3b8 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 10:44:52 +0700 Subject: [PATCH 05/30] Fix #248 --- kubejs/server_scripts/exposure/recipes.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubejs/server_scripts/exposure/recipes.js b/kubejs/server_scripts/exposure/recipes.js index 381b1cc83..87714cfcf 100644 --- a/kubejs/server_scripts/exposure/recipes.js +++ b/kubejs/server_scripts/exposure/recipes.js @@ -27,6 +27,11 @@ const registerExposureRecipes = (event) => { F: '#forge:screws/wrought_iron' }).id('exposure:camera') + // Album + event.shapeless('exposure:album', [ + 'minecraft:writable_book', 'minecraft:paper', 'minecraft:paper' + ]).id('exposure:album') + // Black and White Film event.shaped('exposure:black_and_white_film', [ 'ABB', From effc55196075d02910bf0c85207435b16268e9e5 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 11:12:57 +0700 Subject: [PATCH 06/30] Fix #251 --- kubejs/server_scripts/exposure/recipes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/exposure/recipes.js b/kubejs/server_scripts/exposure/recipes.js index 87714cfcf..fbde705f9 100644 --- a/kubejs/server_scripts/exposure/recipes.js +++ b/kubejs/server_scripts/exposure/recipes.js @@ -23,7 +23,7 @@ const registerExposureRecipes = (event) => { B: 'gtceu:wrought_iron_gear', C: '#minecraft:wooden_buttons', D: '#forge:plates/wrought_iron', - E: '#forge:lenses/glass', + E: 'tfc:lens', F: '#forge:screws/wrought_iron' }).id('exposure:camera') From b504f6c0e0f63caa2e5b8554d994cf2cbfda80f2 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 11:13:25 +0700 Subject: [PATCH 07/30] Fix #229 --- kubejs/startup_scripts/firmaciv/blocks.js | 8 ++++++++ kubejs/startup_scripts/main_startup_script.js | 20 ++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 kubejs/startup_scripts/firmaciv/blocks.js diff --git a/kubejs/startup_scripts/firmaciv/blocks.js b/kubejs/startup_scripts/firmaciv/blocks.js new file mode 100644 index 000000000..f9a3a5c57 --- /dev/null +++ b/kubejs/startup_scripts/firmaciv/blocks.js @@ -0,0 +1,8 @@ +// priority: 0 + +const modifyFirmaCivBlocks = (event) => { + event.modify('firmaciv:cleat', block => { + block.requiresTool = false + block.destroySpeed = 0.1 + }) +} \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 98f98dc45..fcf3f4ac5 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -3,21 +3,35 @@ /** * Событие регистрации предметов. */ -StartupEvents.registry('item', (event) => { +StartupEvents.registry('item', event => { registerGTCEuItems(event) }) /** * Событие регистрации блоков. */ -StartupEvents.registry('block', (event) => { +StartupEvents.registry('block', event => { registerGTCEuBlocks(event) + + }) +/** + * Событие изменения блоков. + */ +BlockEvents.modification(event => { + modifyFirmaCivBlocks(event) +}) + +/** + * Событие изменения предметов. + */ +ItemEvents.modification(event => {}) + /** * Событие регистрации жидкостей. */ -StartupEvents.registry('fluid', (event) => {}) +StartupEvents.registry('fluid', event => {}) /** * Событие регистрации типов рецептов. From 780807fe25d0134365eb48fd23cd00c1b5b8ac66 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 11:24:05 +0700 Subject: [PATCH 08/30] Fix #252 --- kubejs/server_scripts/minecraft/recipes.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 272afe749..bf7593f8f 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -3165,6 +3165,13 @@ const registerMinecraftRecipes = (event) => { .duration(1600) .EUt(666) + event.recipes.gtceu.assembler('tfg:minecraft/elytra_repairing') + .itemInputs('6x #forge:plates/polyvinyl_butyral', Item.of('minecraft:elytra', '{Damage:431}').strongNBT()) + .circuit(32) + .itemOutputs(Item.of('minecraft:elytra', "{Damage:0,display:{Name:'{\"text\":\"Wings of Gods\",\"italic\":true}'}}")) + .duration(1600) + .EUt(120) + //#endregion //#region Исправление дерьма с медью (Однажды разраб GTCEu вспомнит, лучше бы забыл) From f0a8b1072b09afac49c7ece11f54ebef647d08a2 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 11:24:09 +0700 Subject: [PATCH 09/30] Update create.snbt --- config/ftbquests/quests/chapters/create.snbt | 74 +++++++------------- 1 file changed, 25 insertions(+), 49 deletions(-) diff --git a/config/ftbquests/quests/chapters/create.snbt b/config/ftbquests/quests/chapters/create.snbt index 1b28b0c44..28e16d17a 100644 --- a/config/ftbquests/quests/chapters/create.snbt +++ b/config/ftbquests/quests/chapters/create.snbt @@ -6,7 +6,20 @@ icon: "create:cogwheel" id: "73633085BF22A8E9" order_index: 1 - quest_links: [ ] + quest_links: [ + { + id: "36CEFCACDF2AA4A8" + linked_quest: "10FB27DD3C7BEC2F" + x: 1.0d + y: -5.5d + } + { + id: "222131C44D4E98DF" + linked_quest: "517EFADD8F22717F" + x: -2.0d + y: -5.5d + } + ] quests: [ { dependencies: ["2E3F6613C490E9AD"] @@ -39,13 +52,13 @@ } ] title: "Engineer's tools" - x: 0.0d - y: -3.0d + x: -1.0d + y: -4.0d } { dependencies: [ "6E1CD5151284199F" - "01E921F78C3A9A3D" + "10FB27DD3C7BEC2F" ] id: "576584250B7CE6E9" tasks: [ @@ -83,34 +96,9 @@ type: "item" } ] - x: 0.0d + x: 1.0d y: -4.0d } - { - dependencies: ["6BB98D128822730E"] - description: [ - "If you want to be less fancy, just call it plastic." - "" - "For the polymerization process, add &aOxygen&r, which gives better returns than Air, then solidify like you would with Rubber." - "" - "&aPolyethylene (PE)&r is the key to unlocking &6many new things&r. It's commonly used as &dSheets&r, or in &dFluid&r form." - "" - "&l&3Lore:&r&o The OreDict and fluid name for Polyethylene in 1.12.2 GTCEu was &bplastic&f, for cross-mod compatibility." - ] - icon: "gtceu:polyethylene_plate" - id: "01E921F78C3A9A3D" - shape: "gear" - size: 1.0d - subtitle: "Baby's first polymer!" - tasks: [{ - id: "2FC6492E5EB2C945" - item: "gtceu:polyethylene_plate" - type: "item" - }] - title: "Polyethylene" - x: 0.0d - y: -5.5d - } { dependencies: ["6E1CD5151284199F"] id: "6C6579B8C07D4136" @@ -176,8 +164,8 @@ item: "create:clipboard" type: "item" }] - x: 1.0d - y: -3.0d + x: 3.0d + y: -4.0d } { dependencies: ["6C6579B8C07D4136"] @@ -263,19 +251,7 @@ y: 5.0d } { - dependencies: ["6E24ECF6CEE950D1"] - id: "7123E4EFAEB457B2" - shape: "gear" - tasks: [{ - id: "4B14EA2B169153EA" - item: "tfc:glue" - type: "item" - }] - x: -1.0d - y: -5.5d - } - { - dependencies: ["7123E4EFAEB457B2"] + dependencies: ["517EFADD8F22717F"] id: "7067BC9D1CEB6982" tasks: [{ id: "559495DDBA2E1557" @@ -288,7 +264,7 @@ } type: "item" }] - x: -1.0d + x: -2.0d y: -4.0d } { @@ -430,8 +406,8 @@ item: "create:brown_toolbox" type: "item" }] - x: -1.0d - y: -3.0d + x: -3.0d + y: -4.0d } { dependencies: ["6E1CD5151284199F"] @@ -442,7 +418,7 @@ item: "create:belt_connector" type: "item" }] - x: 1.0d + x: 2.0d y: -4.0d } ] From d2a8bfb59f722c52a833d39d14863838bdf392f2 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 11:39:55 +0700 Subject: [PATCH 10/30] Update recipes.js --- kubejs/server_scripts/gregtech/recipes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 869b4dd5a..248a2ac33 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1434,7 +1434,7 @@ const registerGTCEURecipes = (event) => { let ingotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1) - if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && material != GTMaterials.Wood && material != GTMaterials.TreatedWood) + if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && material != GTMaterials.Wood && material != GTMaterials.TreatedWood && !material.hasProperty(PropertyKey.POLYMER)) { let plateStack = ChemicalHelper.get(TagPrefix.plate, material, 1) let blockStack = ChemicalHelper.get(TagPrefix.block, material, 1) @@ -1443,7 +1443,7 @@ const registerGTCEURecipes = (event) => { { if (!plateStack.isEmpty()) { // Слиток -> Стержень - event.recipes.createPressing(plateStack.withChance(0.97), ingotStack) + event.recipes.createPressing(plateStack.withChance(0.8), ingotStack) .id(`tfg:pressing/${material.getName()}_plate`) if (!blockStack.isEmpty()) { From df34f12a7e3d2dd63e5820d91320f7daf8af3ef1 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 11:40:08 +0700 Subject: [PATCH 11/30] handglider --- config/hangglider-client.toml | 11 +++++ config/hangglider-server.toml | 82 ++++++++++++++++++++++++++++++++++ config/musicplayer-client.toml | 6 +++ mods | 2 +- 4 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 config/hangglider-client.toml create mode 100644 config/hangglider-server.toml create mode 100644 config/musicplayer-client.toml diff --git a/config/hangglider-client.toml b/config/hangglider-client.toml new file mode 100644 index 000000000..d82a70de5 --- /dev/null +++ b/config/hangglider-client.toml @@ -0,0 +1,11 @@ +#Multiplier for camera tilt speed when gliding. +#Range: 0.1 ~ 1.0 +gliding_tilt_speed = 0.4 +#Automatically switch to third-person mode while gliding. +auto_third_person_gliding = false +#Tilt camera depending on gliding turn angle. +gliding_camera_tilt = true +#Multiplier for camera tilt amount when gliding. +#Range: 0.1 ~ 1.0 +gliding_tilt_amount = 0.5 + diff --git a/config/hangglider-server.toml b/config/hangglider-server.toml new file mode 100644 index 000000000..585dfcadf --- /dev/null +++ b/config/hangglider-server.toml @@ -0,0 +1,82 @@ + +[wind] + #The size of the wind gusts, larger values mean the gusts push the player around in greater angles from their intended direction. Default is moderately sized. Observable gameplay effects are highly tied with wind frequency. + #Range: 1.0 ~ 100.0 + gust_size = 19.0 + #How much stronger the wind should be while it is raining. 1 means the wind is the same if raining or not, 10 means the wind is 10x stronger while it is raining. + #Range: 1.0 ~ 10.0 + raining_multiplier = 3.0 + #Enables wind, making the player move unpredictably around when gliding. + allow_wind = true + #The frequency of the wind gusts, larger values mean the wind effects occur more often. 0 removes wind. Default is semi-common. Observable gameplay effects are highly tied with gust size. + #Range: 0.0 ~ 5.0 + frequency = 0.15 + #The player's y-level/height changes the overall wind effect by this multiplier. Default is that the higher you are up in the world the stronger the wind is, but only by a moderate amount. 0 means the player's height has no effect on the wind. + #Range: -10.0 ~ 10.0 + height_multiplier = 1.5 + #Enables air resistance, making the player slow down over time when flying. Values conditional on tier of glider. + allow_air_resistance = true + #The glider's durability remaining changes the overall wind effect by this additional amount. 0 means the glider's durability won't effect the wind power, whereas 1 will mean a nearly broken glider is affected by wind about twice as much as a new one. + #Range: 0.0 ~ 5.0 + durability_multiplier = 0.7 + #A quality-of-life option to quickly change the overall power of the wind effect for all gliders. Default is an overall relatively weak wind, with moderate gusts that occur semi-commonly. Note that this value can be a decimal (i.e. 0.5 would be half as strong). More fine-grained options are available below. + #Range: 0.001 ~ 10.0 + overall_power = 1.0 + #When going fast, the overall wind effect is changed by this multiplier. Default is that going fast reduces the wind effect by a moderate amount. 0 means the player's speed has no effect on the wind. + #Range: -10.0 ~ 10.0 + speed_multiplier = 0.4 + +[reinforced_hang_glider] + #A quality-of-life option to quickly change the overall power of the wind effect for this glider. Default is an overall relatively weak wind, with moderate gusts that occur semi-commonly. + #Note that this value can be a decimal (i.e. 0.5 would be half as strong). More fine-grained options are available in the 'wind' section of this config. + #Range: 0.001 ~ 10.0 + overall_wind_power = 0.75 + #The amount of blocks to move forwards (per-tick) while gliding fast (pressing 'Shift'). + #Range: 0.0 ~ 100.0 + fast_forward_movement = 0.08 + #The amount of blocks a player falls (per-tick) while gliding normally. + #Range: 0.0 ~ 100.0 + normal_fall_movement = 0.55 + #Enables durability usage of the hang glider when gliding. + consume_durability = true + #The timeframe for durability usage, in ticks. Recall that there are 20 ticks in a second, so a value of 20 would damage the item about once a second. + #Default is 1 damage about every 10 seconds of flight, so with a durability of 618 means about 15 minutes of flight time with an undamaged glider. + #Range: 1 ~ 10000 + durability_use_interval = 200 + #The rate at which air resistance hinders your movement. 1 is no resistance, 0.5 is 1/2 as fast each tick. + #Range: 0.0 ~ 1.0 + air_resistance = 0.99 + #The amount of blocks to move forwards (per-tick) while gliding normally. + #Range: 0.0 ~ 100.0 + normal_forward_movement = 0.04 + #The amount of blocks to fall (per-tick) while gliding fast (pressing 'Shift'). + #Range: 0.0 ~ 100.0 + fast_fall_movement = 0.675 + +[hang_glider] + #A quality-of-life option to quickly change the overall power of the wind effect for this glider. Default is an overall relatively weak wind, with moderate gusts that occur semi-commonly. + #Note that this value can be a decimal (i.e. 0.5 would be half as strong). More fine-grained options are available in the 'wind' section of this config. + #Range: 0.001 ~ 10.0 + overall_wind_power = 1.4 + #The amount of blocks to move forwards (per-tick) while gliding fast (pressing 'Shift'). + #Range: 0.0 ~ 100.0 + fast_forward_movement = 0.05 + #The amount of blocks a player falls (per-tick) while gliding normally. + #Range: 0.0 ~ 100.0 + normal_fall_movement = 0.55 + #Enables durability usage of the hang glider when gliding. + consume_durability = true + #The timeframe for durability usage, in ticks. Recall that there are 20 ticks in a second, so a value of 20 would damage the item about once a second. + #Default is 1 damage about every 10 seconds of flight, so with a durability of 618 means about 15 minutes of flight time with an undamaged glider. + #Range: 1 ~ 10000 + durability_use_interval = 200 + #The rate at which air resistance hinders your movement. 1 is no resistance, 0.5 is 1/2 as fast each tick. + #Range: 0.0 ~ 1.0 + air_resistance = 0.985 + #The amount of blocks to move forwards (per-tick) while gliding normally. + #Range: 0.0 ~ 100.0 + normal_forward_movement = 0.025 + #The amount of blocks to fall (per-tick) while gliding fast (pressing 'Shift'). + #Range: 0.0 ~ 100.0 + fast_fall_movement = 0.675 + diff --git a/config/musicplayer-client.toml b/config/musicplayer-client.toml new file mode 100644 index 000000000..b86d06ab4 --- /dev/null +++ b/config/musicplayer-client.toml @@ -0,0 +1,6 @@ + +#Client configuration settings +[client] + #Should we use instead of the global appdata dir a local dir in configs for storing and loading our playlist + internalPlaylists = false + diff --git a/mods b/mods index 79d75643b..ba20262d3 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 79d75643bae0c99cb4fb6d490eb1d460d2c61f27 +Subproject commit ba20262d3a1a2a503615a27b6a6779e1a415e751 From 7884801ccfe83451fc55f1a01dac44ccc93f3efe Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 11:40:13 +0700 Subject: [PATCH 12/30] Update CHANGELOG.md --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab62608ae..1517ea4f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +## [0.7.0] - 18.03.2024? +### Changes +- Fixed bug when some quests (when using eng language) displays russian titles and descriptions. (FriendlyCube) +- Added new recipes for TFC alebaster via workbench. (FriendlyCube) +- Added new recipes for TFC alebaster via GTCEu + Create machines. (Exception) +- Fixed a lot of shit with quests. (FriendlyCube) +- Added AE2 and Create chapters in quests (FriendlyCube) +- Added new recipes for charged certus quarts. (Exception) +- Fixed Exposure album recipe. (Exception) +- Fixed bug when cleat from firmaciv cant be broken with hand. (Exception) +- Replaced GTCEu lens with tfc lens for camera from Exposure. (Exception) +- Added elytra repairing recipe. (Exception) +- Removed polymer recipes from create press and packer. (Exception) +- Gregified HandGlider recipes. (Exception) +~~- Возвращена механика из TFC.~~ +~~- Механические блоки из TFC переименованы в примитивную механику.~~ +~~- Исправлена проблема, когда было невозможно запитать разбрызгиватель из FirmaLife для теплицы.~~ +~~- Вовращены некоторые блоки, которые работали на механической энергии TFC.~~ +### New Mods +- HangGlider-v8.0.1-1.20.1-Forge +- u_team_core-forge-1.20.1-5.1.4.269 +- music_player-forge-1.20.1-2.7.0.236 + ## [0.6.15] - 17.02.2024 ### Changes - Fixed upgrading backpack through JEI crashes the game. From 6194572df485315dd2cbfe2ef23119b3b03fa7e0 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 11:49:06 +0700 Subject: [PATCH 13/30] glider quests + recipes --- .../quests/chapters/hv__high_voltage.snbt | 38 +++++++++++++++++++ .../quests/chapters/primitive_age.snbt | 17 +++++++++ kubejs/server_scripts/handglider/recipes.js | 16 ++++++++ kubejs/server_scripts/main_server_script.js | 1 + 4 files changed, 72 insertions(+) create mode 100644 kubejs/server_scripts/handglider/recipes.js diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 83b75136f..8af651b45 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1238,6 +1238,44 @@ x: 4.5d y: -3.0d } + { + dependencies: ["7FA0ACB7F161F378"] + id: "2F5778EDE6426D7E" + shape: "circle" + size: 0.8d + tasks: [{ + id: "1BCFD5295BE92C4E" + item: { + Count: 1b + id: "minecraft:elytra" + tag: { + Damage: 0 + } + } + type: "item" + }] + x: 5.625d + y: -6.5d + } + { + dependencies: ["2F5778EDE6426D7E"] + id: "2045D32219AA0DCC" + shape: "circle" + size: 0.9d + tasks: [{ + id: "3785469E7628386A" + item: { + Count: 1b + id: "hangglider:reinforced_hang_glider" + tag: { + Damage: 0 + } + } + type: "item" + }] + x: 5.625d + y: -8.0d + } ] subtitle: ["Scale up your power and begin advanced chemistry"] title: "&6HV&r - High Voltage" diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index 12e1057be..61efae5c1 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -5145,6 +5145,23 @@ x: 19.5d y: -8.5d } + { + dependencies: ["095104BA3C842978"] + id: "4718D375758B9219" + tasks: [{ + id: "37312BCB967DE348" + item: { + Count: 1b + id: "hangglider:hang_glider" + tag: { + Damage: 0 + } + } + type: "item" + }] + x: 20.5d + y: 11.0d + } ] title: "Primitive Age" } diff --git a/kubejs/server_scripts/handglider/recipes.js b/kubejs/server_scripts/handglider/recipes.js new file mode 100644 index 000000000..9db80bdb0 --- /dev/null +++ b/kubejs/server_scripts/handglider/recipes.js @@ -0,0 +1,16 @@ +// priority: 0 + +const registerHandGliderRecipes = (event) => { + + // Glider Framework + event.shaped('hangglider:glider_framework', [ + 'AAA', + 'BCB', + 'DCD' + ], { + A: '#forge:rods/wrought_iron', + B: '#forge:rods/long/wrought_iron', + C: '#forge:screws', + D: '#forge:rings' + }).id('tfg:shaped/hangglider/glider_framework') +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index c73f82953..7d595a016 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -115,6 +115,7 @@ ServerEvents.recipes(event => { registerFirmaLifeRecipes(event) registerFTBQuestsRecipes(event) registerGTCEURecipes(event) + registerHandGliderRecipes(event) registerMinecraftRecipes(event) registerMoreRedRecipes(event) registerRailWaysRecipes(event) From f4e75a1fc8e62324bdf8839bb7139c3d45c1e506 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 11:49:54 +0700 Subject: [PATCH 14/30] lol --- CHANGELOG.md | 2 +- kubejs/server_scripts/handglider/recipes.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1517ea4f8..a5456328a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ ### Changes - Fixed bug when some quests (when using eng language) displays russian titles and descriptions. (FriendlyCube) - Added new recipes for TFC alebaster via workbench. (FriendlyCube) -- Added new recipes for TFC alebaster via GTCEu + Create machines. (Exception) - Fixed a lot of shit with quests. (FriendlyCube) - Added AE2 and Create chapters in quests (FriendlyCube) - Added new recipes for charged certus quarts. (Exception) @@ -14,6 +13,7 @@ - Added elytra repairing recipe. (Exception) - Removed polymer recipes from create press and packer. (Exception) - Gregified HandGlider recipes. (Exception) +~~- Added new recipes for TFC alebaster via GTCEu + Create machines. (Exception)~~ ~~- Возвращена механика из TFC.~~ ~~- Механические блоки из TFC переименованы в примитивную механику.~~ ~~- Исправлена проблема, когда было невозможно запитать разбрызгиватель из FirmaLife для теплицы.~~ diff --git a/kubejs/server_scripts/handglider/recipes.js b/kubejs/server_scripts/handglider/recipes.js index 9db80bdb0..f8713697e 100644 --- a/kubejs/server_scripts/handglider/recipes.js +++ b/kubejs/server_scripts/handglider/recipes.js @@ -12,5 +12,5 @@ const registerHandGliderRecipes = (event) => { B: '#forge:rods/long/wrought_iron', C: '#forge:screws', D: '#forge:rings' - }).id('tfg:shaped/hangglider/glider_framework') + }).id('hangglider:glider_framework') } \ No newline at end of file From afbbf8dd0a994c3f23333ad9f001b0211611dc88 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:01:43 +0700 Subject: [PATCH 15/30] Fix #275 --- kubejs/server_scripts/tfc/recipes.js | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 73219b47b..46aec9923 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -2847,7 +2847,7 @@ const registerTFCRecipes = (event) => { let element = global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS[i]; - event.recipes.gtceu.macerator(`tfg:tfc/${element.name}`) + event.recipes.gtceu.assembler(`tfg:tfc/${element.name}`) .itemInputs(element.input) .circuit(i) .itemOutputs(element.output) @@ -2871,10 +2871,24 @@ const registerTFCRecipes = (event) => { //#endregion + //#region Оливки + + event.recipes.gtceu.macerator(`tfg:tfc/olive_paste`) + .itemInputs('tfc:food/olive') + .itemOutputs('2x tfc:olive_paste') + .duration(60) + .EUt(2) + + event.recipes.tfc.quern('2x tfc:olive_paste', 'tfc:food/olive') + .id(`tfg:quern/tfc/olive_paste`) + + event.recipes.createMilling('2x tfc:olive_paste', 'tfc:food/olive') + .id(`tfg:milling/tfc/olive_paste`) + + //#endregion + //#region Рецепты бочки в миксере - - - + // А где? //#endregion // Другое @@ -2883,6 +2897,8 @@ const registerTFCRecipes = (event) => { event.remove({ id: `tfc:crafting/steel_pump` }) event.remove({ id: `tfc:crafting/crankshaft` }) + + // Доменная печь event.shaped('tfc:blast_furnace', [ 'AAA', From 8823b922e507fb5ca22d98232552ab7ba4a8ed58 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:03:00 +0700 Subject: [PATCH 16/30] woops --- CHANGELOG.md | 2 ++ kubejs/server_scripts/tfc/recipes.js | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5456328a..d0b1c4011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ - Added elytra repairing recipe. (Exception) - Removed polymer recipes from create press and packer. (Exception) - Gregified HandGlider recipes. (Exception) +- Fixed some shit with clay -> mold assembler recipes. (Exception) +- Added Olive -> Olive Paste mixer recipes. (Exception) ~~- Added new recipes for TFC alebaster via GTCEu + Create machines. (Exception)~~ ~~- Возвращена механика из TFC.~~ ~~- Механические блоки из TFC переименованы в примитивную механику.~~ diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 46aec9923..cdb25966c 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -2879,9 +2879,6 @@ const registerTFCRecipes = (event) => { .duration(60) .EUt(2) - event.recipes.tfc.quern('2x tfc:olive_paste', 'tfc:food/olive') - .id(`tfg:quern/tfc/olive_paste`) - event.recipes.createMilling('2x tfc:olive_paste', 'tfc:food/olive') .id(`tfg:milling/tfc/olive_paste`) From 0f523fa83b50f41696a1d612b8e9f3cddddb40d5 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:04:31 +0700 Subject: [PATCH 17/30] Fix #253 --- kubejs/startup_scripts/tfc/constants.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 9db38f627..f42daa210 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -966,6 +966,7 @@ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ { input: '#forge:dusts/graphite', output: '4x tfc:powder/graphite', name: 'graphite_powder' }, { input: '#forge:dusts/borax', output: '4x tfc:powder/flux', name: 'flux_powder' }, { input: '#forge:dusts/soda_ash', output: '4x tfc:powder/soda_ash', name: 'soda_ash' }, + { input: 'minecraft:charcoal', output: '2x tfc:powder/charcoal', name: 'charcoal' }, ]; global.TFC_QUERN_GRAIN_RECIPE_COMPONENTS = [ From 9e762069b0e727ad8766eb745900484d08220d5c Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:06:25 +0700 Subject: [PATCH 18/30] Fix #272 --- kubejs/server_scripts/minecraft/recipes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index bf7593f8f..921a920f0 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2856,6 +2856,7 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.assembler('cauldron') .itemInputs('7x #forge:plates/wrought_iron') + .circuit(10) .itemOutputs('minecraft:cauldron') .duration(700) .EUt(4) From bdd6c1c8cc4b332acd6bf0e676d386dbe3d23250 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:11:45 +0700 Subject: [PATCH 19/30] Fix #267 --- CHANGELOG.md | 2 ++ kubejs/server_scripts/firmalife/recipes.js | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0b1c4011..dfef4583e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ - Gregified HandGlider recipes. (Exception) - Fixed some shit with clay -> mold assembler recipes. (Exception) - Added Olive -> Olive Paste mixer recipes. (Exception) +- Added recipes for charcoal powder. (Exception) +- Added crushing recipes for nixtamal. (Exception) ~~- Added new recipes for TFC alebaster via GTCEu + Create machines. (Exception)~~ ~~- Возвращена механика из TFC.~~ ~~- Механические блоки из TFC переименованы в примитивную механику.~~ diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 9cb6914a5..9322632a8 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -131,6 +131,19 @@ const registerFirmaLifeRecipes = (event) => { .duration(10) .EUt(2)*/ + //#region Никстамаль + + event.recipes.gtceu.macerator(`tfg:firmalife/nixtamal`) + .itemInputs('firmalife:food/nixtamal') + .itemOutputs('4x firmalife:food/masa_flour') + .duration(60) + .EUt(2) + + event.recipes.createMilling('4x firmalife:food/masa_flour', 'firmalife:food/nixtamal') + .id(`tfg:milling/firmalife/nixtamal`) + + //#endregion + //#region Рецепты теплиц //#region Медная From e3d8721aae3bfd14b706ea47a1cf69574cdd4e5d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:21:28 +0700 Subject: [PATCH 20/30] better way to fix #267 --- kubejs/server_scripts/firmalife/recipes.js | 28 ++++++++++--------- kubejs/startup_scripts/firmalife/constants.js | 6 ++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 9322632a8..45f46f8e8 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -131,19 +131,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(10) .EUt(2)*/ - //#region Никстамаль - - event.recipes.gtceu.macerator(`tfg:firmalife/nixtamal`) - .itemInputs('firmalife:food/nixtamal') - .itemOutputs('4x firmalife:food/masa_flour') - .duration(60) - .EUt(2) - - event.recipes.createMilling('4x firmalife:food/masa_flour', 'firmalife:food/nixtamal') - .id(`tfg:milling/firmalife/nixtamal`) - - //#endregion - //#region Рецепты теплиц //#region Медная @@ -356,6 +343,21 @@ const registerFirmaLifeRecipes = (event) => { //#endregion + //#region Рецепты муки + + global.FIRMALIFE_QUERN_FLOUR_RECIPE_COMPONENTS.forEach(element => { + event.recipes.gtceu.macerator(`tfg:${element.name}`) + .itemInputs(element.input) + .itemOutputs(element.output) + .duration(200) + .EUt(16) + + event.recipes.createMilling(element.output, element.input) + .id(`tfg:milling/${element.name}`) + }) + + //#endregion + //#region Рецепты теста global.FIRMALIFE_MIXER_FLATBREAD_DOUGH_RECIPE_COMPONENTS .forEach(element => { diff --git a/kubejs/startup_scripts/firmalife/constants.js b/kubejs/startup_scripts/firmalife/constants.js index 503461298..27b131cf2 100644 --- a/kubejs/startup_scripts/firmalife/constants.js +++ b/kubejs/startup_scripts/firmalife/constants.js @@ -108,6 +108,10 @@ global.FIRMALIFE_GREENHOUSE_BERRY_RECIPE_COMPONENTS = [ { input: 'firmalife:plant/nightshade_bush', fluid_amount: 6000, output: '3x firmalife:food/nightshade_berry', name: 'nightshade' }, ]; +global.FIRMALIFE_QUERN_FLOUR_RECIPE_COMPONENTS = [ + { input: 'firmalife:food/nixtamal', output: '2x firmalife:food/masa_flour', name: 'masa_flour' }, +]; + global.FIRMALIFE_MIXER_FLATBREAD_DOUGH_RECIPE_COMPONENTS = [ { input: 'tfc:food/barley_flour', output: '4x firmalife:food/barley_dough', name: 'firmalife_barley_dough' }, { input: 'tfc:food/maize_flour', output: '4x firmalife:food/maize_dough', name: 'firmalife_maize_dough' }, @@ -115,6 +119,7 @@ global.FIRMALIFE_MIXER_FLATBREAD_DOUGH_RECIPE_COMPONENTS = [ { input: 'tfc:food/rye_flour', output: '4x firmalife:food/rye_dough', name: 'firmalife_rye_dough' }, { input: 'tfc:food/rice_flour', output: '4x firmalife:food/rice_dough', name: 'firmalife_rice_dough' }, { input: 'tfc:food/wheat_flour', output: '4x firmalife:food/wheat_dough', name: 'firmalife_wheat_dough' }, + { input: 'firmalife:food/masa_flour', output: '2x firmalife:food/masa', name: 'firmalife_masa' }, ]; global.FIRMALIFE_FURNACE_FLATBREAD_RECIPE_COMPONENTS = [ @@ -124,4 +129,5 @@ global.FIRMALIFE_FURNACE_FLATBREAD_RECIPE_COMPONENTS = [ { input: 'tfc:food/rye_dough', output: 'firmalife:food/rye_flatbread', name: 'rye_flatbread' }, { input: 'tfc:food/rice_dough', output: 'firmalife:food/rice_flatbread', name: 'rice_flatbread' }, { input: 'tfc:food/wheat_dough', output: 'firmalife:food/wheat_flatbread', name: 'wheat_flatbread' }, + { input: 'firmalife:food/masa', output: 'firmalife:food/corn_tortilla', name: 'corn_tortilla' }, ]; \ No newline at end of file From 3cf7a846c79da71d4c7408b13efaf05d3ce432a2 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:27:39 +0700 Subject: [PATCH 21/30] dynamic light return! --- CHANGELOG.md | 1 + config/dynamic_lights_reforged.toml | 11 +++++++++++ config/embeddium-options.json | 4 ++-- mods | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 config/dynamic_lights_reforged.toml diff --git a/CHANGELOG.md b/CHANGELOG.md index dfef4583e..fab1e235c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - HangGlider-v8.0.1-1.20.1-Forge - u_team_core-forge-1.20.1-5.1.4.269 - music_player-forge-1.20.1-2.7.0.236 +- Embeddium/Rubidium Dynamic Lights ## [0.6.15] - 17.02.2024 ### Changes diff --git a/config/dynamic_lights_reforged.toml b/config/dynamic_lights_reforged.toml new file mode 100644 index 000000000..26e4e32bb --- /dev/null +++ b/config/dynamic_lights_reforged.toml @@ -0,0 +1,11 @@ + +#Dynamic Lights Settings +[Settings] + + [Settings."Lighting Settings"] + #Allowed Values: OFF, SLOW, FAST, REALTIME + "Quality Mode (OFF, SLOW, FAST, REALTIME)" = "REALTIME" + "Dynamic Entity Lighting" = true + "Dynamic TileEntity Lighting" = true + "Only Update On Position Change" = true + diff --git a/config/embeddium-options.json b/config/embeddium-options.json index b717c30ba..27d200d67 100644 --- a/config/embeddium-options.json +++ b/config/embeddium-options.json @@ -23,7 +23,7 @@ }, "notifications": { "force_disable_donation_prompts": false, - "has_cleared_donation_button": false, - "has_seen_donation_prompt": true + "has_cleared_donation_button": true, + "has_seen_donation_prompt": false } } \ No newline at end of file diff --git a/mods b/mods index ba20262d3..d8c813d19 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit ba20262d3a1a2a503615a27b6a6779e1a415e751 +Subproject commit d8c813d19cc0eca67a99864a3acfe763e77ec0c2 From 714641f882c0db57e7f60e71f8ba45862da96a14 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:34:55 +0700 Subject: [PATCH 22/30] Fix #259 --- kubejs/server_scripts/gregtech/recipes.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 248a2ac33..bdcbdbc59 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1439,6 +1439,8 @@ const registerGTCEURecipes = (event) => { let plateStack = ChemicalHelper.get(TagPrefix.plate, material, 1) let blockStack = ChemicalHelper.get(TagPrefix.block, material, 1) + let matAmount = TagPrefix.block.getMaterialAmount(material) / GTValues.M; + if (material.hasProperty(PropertyKey.INGOT)) { if (!plateStack.isEmpty()) { @@ -1448,7 +1450,7 @@ const registerGTCEURecipes = (event) => { if (!blockStack.isEmpty()) { // 9х Слиток -> Блок - event.recipes.createCompacting(blockStack, ingotStack.withCount(9)) + event.recipes.createCompacting(blockStack, ingotStack.withCount(matAmount)) .heated() .id(`tfg:compacting/${material.getName()}_block`) } @@ -1460,7 +1462,7 @@ const registerGTCEURecipes = (event) => { { if (!blockStack.isEmpty()) { // Блок из гемов -> 9 Пластин - event.recipes.createCutting(Item.of(plateStack.withCount(9)).withChance(0.65), `#forge:storage_blocks/${material.getName()}`) + event.recipes.createCutting(Item.of(plateStack.withCount(matAmount)).withChance(0.65), `#forge:storage_blocks/${material.getName()}`) .id(`tfg:cutting/${material.getName()}_plate`) } From 4bd0beb845ef21de19e8d9567891cacc40d050f8 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:41:52 +0700 Subject: [PATCH 23/30] Fix #260 --- CHANGELOG.md | 1 + kubejs/server_scripts/minecraft/recipes.js | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fab1e235c..9b4e643bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Added Olive -> Olive Paste mixer recipes. (Exception) - Added recipes for charcoal powder. (Exception) - Added crushing recipes for nixtamal. (Exception) +- Fix dupes with gem blocks. (Exception) ~~- Added new recipes for TFC alebaster via GTCEu + Create machines. (Exception)~~ ~~- Возвращена механика из TFC.~~ ~~- Механические блоки из TFC переименованы в примитивную механику.~~ diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 921a920f0..10872ab89 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -3131,6 +3131,15 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:brick' }) + event.shaped('minecraft:bricks', [ + 'BAB', + 'ABA', + 'BAB' + ], { + A: 'tfc:mortar', + B: 'minecraft:brick' + }).id('tfc:crafting/bricks') + //#endregion //#region Выъод: Незер кирпич From 89754e7f1f046b6653699fa45e1566d7906b847b Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 16 Mar 2024 12:52:13 +0700 Subject: [PATCH 24/30] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b4e643bd..1ee9baebf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Added recipes for charcoal powder. (Exception) - Added crushing recipes for nixtamal. (Exception) - Fix dupes with gem blocks. (Exception) +- Fix dupes with vanilla bricks. (Exception) ~~- Added new recipes for TFC alebaster via GTCEu + Create machines. (Exception)~~ ~~- Возвращена механика из TFC.~~ ~~- Механические блоки из TFC переименованы в примитивную механику.~~ From 23a79b9e95aa32ef2796babc1d3f79bdbc41507e Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 17 Mar 2024 22:34:20 +0700 Subject: [PATCH 25/30] Copy paste #286 because git... Co-Authored-By: Cube <112543401+FriendlyCube@users.noreply.github.com> --- kubejs/server_scripts/firmalife/recipes.js | 263 +++++++++++++++++++++ 1 file changed, 263 insertions(+) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 45f46f8e8..74c12799d 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -379,4 +379,267 @@ const registerFirmaLifeRecipes = (event) => { }) //#endregion + + //#region Смешивание в миске + + // Тесто для пиццы + event.recipes.gtceu.mixer('firmalife:food/pizza_dough') + .itemInputs('firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt') + .inputFluids(Fluid.of('tfc:olive_oil', 1000)) + .itemOutputs('4x firmalife:food/pizza_dough') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('4x firmalife:food/pizza_dough', ['firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt', Fluid.of('tfc:olive_oil', 1000)]) + .id('firmalife:create/mixer/food/pizza_dough') + + // Vanilla Ice Cream + event.recipes.gtceu.mixer('firmalife:food/vanilla_ice_cream') + .itemInputs('firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla') + .inputFluids(Fluid.of('firmalife:cream', 1000)) + .itemOutputs('2x firmalife:food/vanilla_ice_cream') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/vanilla_ice_cream', ['firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla', Fluid.of('firmalife:cream', 1000)]) + .id('firmalife:create/mixer/food/vanilla_ice_cream') + + // Pumpkin Pie Dough + event.recipes.gtceu.mixer('firmalife:food/pumpkin_pie_dough') + .itemInputs('#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour') + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemOutputs('firmalife:food/pumpkin_pie_dough') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('firmalife:food/pumpkin_pie_dough', ['#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)] + ).id('firmalife:create/mixer/food/pumpkin_pie_dough') + + // Butter + event.recipes.gtceu.mixer('firmalife:food/butter') + .itemInputs('tfc:powder/salt') + .inputFluids(Fluid.of('firmalife:cream', 1000)) + .itemOutputs('firmalife:food/butter') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('firmalife:food/butter', ['tfc:powder/salt', Fluid.of('firmalife:cream', 1000)]) + .id('firmalife:create/mixer/food/butter') + + // Pie Dough + event.recipes.gtceu.mixer('firmalife:food/pie_dough') + .itemInputs('#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour') + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemOutputs('firmalife:food/pie_dough') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('firmalife:food/pie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]) + .id('firmalife:create/mixer/food/pie_dough') + + // Cookie Dough + event.recipes.gtceu.mixer('firmalife:food/cookie_dough') + .itemInputs('#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', '#forge:eggs', 'firmalife:spice/vanilla') + .itemOutputs('4x firmalife:food/cookie_dough') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('4x firmalife:food/cookie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', '#forge:eggs', 'firmalife:spice/vanilla']) + .id('firmalife:create/mixer/food/cookie_dough') + + // Hardtack Dough + event.recipes.gtceu.mixer('firmalife:food/hardtack_dough') + .itemInputs('tfc:powder/salt', '#tfc:foods/flour') + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemOutputs('4x firmalife:food/hardtack_dough') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('4x firmalife:food/hardtack_dough', ['tfc:powder/salt', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]) + .id('firmalife:create/mixer/food/hardtack_dough') + + // Chocolate Ice Cream + event.recipes.gtceu.mixer('firmalife:food/chocolate_ice_cream') + .itemInputs('firmalife:food/vanilla_ice_cream') + .inputFluids(Fluid.of('firmalife:chocolate', 1000)) + .itemOutputs('firmalife:food/chocolate_ice_cream') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('firmalife:food/chocolate_ice_cream', ['firmalife:food/vanilla_ice_cream', Fluid.of('firmalife:chocolate', 1000)]) + .id('firmalife:create/mixer/food/chocolate_ice_cream') + + // White Chocolate Blend + event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/milk') + .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') + .inputFluids(Fluid.of('minecraft:milk', 1000)) + .itemOutputs('2x firmalife:food/white_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)]) + .id('firmalife:create/mixer/food/white_chocolate_blend/milk') + + event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/yak_milk') + .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') + .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) + .itemOutputs('2x firmalife:food/white_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)]) + .id('firmalife:create/mixer/food/white_chocolate_blend/yak_milk') + + event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/goat_milk') + .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') + .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) + .itemOutputs('2x firmalife:food/white_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)]) + .id('firmalife:create/mixer/food/white_chocolate_blend/goat_milk') + + event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/coconut_milk') + .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') + .inputFluids(Fluid.of('firmalife:coconut_milk', 1000)) + .itemOutputs('2x firmalife:food/white_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)]) + .id('firmalife:create/mixer/food/white_chocolate_blend/coconut_milk') + + // Dark Chocolate Blend + event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/milk') + .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') + .inputFluids(Fluid.of('minecraft:milk', 1000)) + .itemOutputs('2x firmalife:food/dark_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)]) + .id('firmalife:create/mixer/food/dark_chocolate_blend/milk') + + event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/yak_milk') + .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') + .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) + .itemOutputs('2x firmalife:food/dark_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)]) + .id('firmalife:create/mixer/food/dark_chocolate_blend/yak_milk') + + event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/goat_milk') + .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') + .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) + .itemOutputs('2x firmalife:food/dark_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)]) + .id('firmalife:create/mixer/food/dark_chocolate_blend/goat_milk') + + event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/coconut_milk') + .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') + .inputFluids(Fluid.of('firmalife:coconut_milk', 1000)) + .itemOutputs('2x firmalife:food/dark_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)]) + .id('firmalife:create/mixer/food/dark_chocolate_blend/coconut_milk') + + // Milk Chocolate Blend + event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/milk') + .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') + .inputFluids(Fluid.of('minecraft:milk', 1000)) + .itemOutputs('2x firmalife:food/milk_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter','#tfc:sweetener', Fluid.of('minecraft:milk', 1000)]) + .id('firmalife:create/mixer/food/milk_chocolate_blend/milk') + + event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/yak_milk') + .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') + .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) + .itemOutputs('2x firmalife:food/milk_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter','#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)]) + .id('firmalife:create/mixer/food/milk_chocolate_blend/yak_milk') + + event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/goat_milk') + .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') + .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) + .itemOutputs('2x firmalife:food/milk_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter','#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)]) + .id('firmalife:create/mixer/food/milk_chocolate_blend/goat_milk') + + event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/coconut_milk') + .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') + .inputFluids(Fluid.of('firmalife:coconut_milk', 1000)) + .itemOutputs('2x firmalife:food/milk_chocolate_blend') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter','#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)]) + .id('firmalife:create/mixer/food/milk_chocolate_blend/coconut_milk') + + // Strawberry Ice Cream + event.recipes.gtceu.mixer('firmalife:food/strawberry_ice_cream') + .itemInputs('firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry') + .itemOutputs('firmalife:food/strawberry_ice_cream') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('firmalife:food/strawberry_ice_cream', ['firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry'] + ).id('firmalife:create/mixer/food/strawberry_ice_cream') + + // Hardtack Dough + event.recipes.gtceu.mixer('firmalife:food/chocolate_chip_cookie_dough') + .itemInputs('4x firmalife:food/cookie_dough', '#firmalife:chocolate_blends') + .itemOutputs('4x firmalife:food/chocolate_chip_cookie_dough') + .duration(300) + .EUt(16) + + event.recipes.create.mixing('4x firmalife:food/chocolate_chip_cookie_dough', ['4x firmalife:food/cookie_dough', '#firmalife:chocolate_blends']) + .id('firmalife:create/mixer/food/chocolate_chip_cookie_dough') + + //#endregion + + //#region Обжарка некоторой еды + + // Cooked Pizza + event.smelting('firmalife:food/cooked_pizza', 'firmalife:food/raw_pizza') + + // Taco Shell + event.smelting('firmalife:food/taco_shell', 'firmalife:food/corn_tortilla') + + // Sugar Cookie + event.smelting('firmalife:food/sugar_cookie', 'firmalife:food/cookie_dough') + + // Chocolate Chip Cookie + event.smelting('firmalife:food/chocolate_chip_cookie', 'firmalife:food/chocolate_chip_cookie_dough') + + // Hardtack + event.smelting('firmalife:food/hardtack', 'firmalife:food/hardtack_dough') + + // Cooked Pie + event.smelting('firmalife:food/cooked_pie', 'firmalife:food/filled_pie') + + // Roasted Cocoa Beans + event.smelting('firmalife:food/roasted_cocoa_beans', 'firmalife:food/cocoa_beans') + + // Pumpkin Pie + event.smelting('minecraft:pumpkin_pie', 'firmalife:food/raw_pumpkin_pie') + + //#endregion + } \ No newline at end of file From 9a9ba0f1926224380f76b10e21291ca7678e8c4d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 17 Mar 2024 22:39:59 +0700 Subject: [PATCH 26/30] Update CHANGELOG.md --- CHANGELOG.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ee9baebf..5b25a4268 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,11 +19,9 @@ - Added crushing recipes for nixtamal. (Exception) - Fix dupes with gem blocks. (Exception) - Fix dupes with vanilla bricks. (Exception) -~~- Added new recipes for TFC alebaster via GTCEu + Create machines. (Exception)~~ -~~- Возвращена механика из TFC.~~ -~~- Механические блоки из TFC переименованы в примитивную механику.~~ -~~- Исправлена проблема, когда было невозможно запитать разбрызгиватель из FirmaLife для теплицы.~~ -~~- Вовращены некоторые блоки, которые работали на механической энергии TFC.~~ +- Added new recipes for TFC alebaster via GTCEu + Create machines. (FriendlyCube) +- Added a lot of smelting, mixing, and etc recipes for firmalife and tfc. (FriendlyCube) +- Added rubber producing by using vat from firmalife. (FriendlyCube) ### New Mods - HangGlider-v8.0.1-1.20.1-Forge - u_team_core-forge-1.20.1-5.1.4.269 From 49d974810e2052791f4c85781ef2dadf49ce0ed4 Mon Sep 17 00:00:00 2001 From: FriendlyCube Date: Sun, 17 Mar 2024 18:08:55 +0200 Subject: [PATCH 27/30] =?UTF-8?q?=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/firmalife/recipes.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 74c12799d..9f68d21d6 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -360,7 +360,7 @@ const registerFirmaLifeRecipes = (event) => { //#region Рецепты теста - global.FIRMALIFE_MIXER_FLATBREAD_DOUGH_RECIPE_COMPONENTS .forEach(element => { + global.FIRMALIFE_MIXER_FLATBREAD_DOUGH_RECIPE_COMPONENTS.forEach(element => { event.recipes.gtceu.mixer(element.name) .itemInputs(element.input, '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:yeast_starter', 100)) @@ -642,4 +642,21 @@ const registerFirmaLifeRecipes = (event) => { //#endregion + //region sticky resin + event.custom({ + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "item": 'tfc:powder/sulfur' + } + }, + "input_fluid": { + "ingredient": 'gtceu:latex', + "amount": 1000 + }, + "output_item": { + "item": 'gtceu:sticky_resin' + } + }); + //#endregion } \ No newline at end of file From e257f4e6f1b5ee8e5adce8d3ece3ce5c104db9b4 Mon Sep 17 00:00:00 2001 From: FriendlyCube Date: Sun, 17 Mar 2024 18:16:14 +0200 Subject: [PATCH 28/30] fix --- kubejs/server_scripts/firmalife/recipes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 9f68d21d6..2467e9ed3 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -642,7 +642,7 @@ const registerFirmaLifeRecipes = (event) => { //#endregion - //region sticky resin + // Sticky Resin by Vat event.custom({ "type": "firmalife:vat", "input_item": { @@ -658,5 +658,5 @@ const registerFirmaLifeRecipes = (event) => { "item": 'gtceu:sticky_resin' } }); - //#endregion + } \ No newline at end of file From bc9e1c50916273b06969fcd628b74ab3c701faf6 Mon Sep 17 00:00:00 2001 From: FriendlyCube Date: Sun, 17 Mar 2024 20:03:31 +0200 Subject: [PATCH 29/30] Update create.snbt Co-Authored-By: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com> --- config/ftbquests/quests/chapters/create.snbt | 269 ++++++++++++++----- 1 file changed, 199 insertions(+), 70 deletions(-) diff --git a/config/ftbquests/quests/chapters/create.snbt b/config/ftbquests/quests/chapters/create.snbt index 28e16d17a..97e10f5c0 100644 --- a/config/ftbquests/quests/chapters/create.snbt +++ b/config/ftbquests/quests/chapters/create.snbt @@ -11,33 +11,26 @@ id: "36CEFCACDF2AA4A8" linked_quest: "10FB27DD3C7BEC2F" x: 1.0d - y: -5.5d + y: -4.5d } { id: "222131C44D4E98DF" linked_quest: "517EFADD8F22717F" x: -2.0d - y: -5.5d + y: -4.5d + } + { + id: "5D9724BBB04F9D78" + linked_quest: "222A4146EF7750E9" + shape: "gear" + size: 2.0d + x: 0.0d + y: 0.0d } ] quests: [ { - dependencies: ["2E3F6613C490E9AD"] - icon: "create:large_cogwheel" - id: "6E1CD5151284199F" - shape: "gear" - size: 2.0d - tasks: [{ - id: "46C68190E469F783" - item: "create:cogwheel" - type: "item" - }] - title: "The beginning of Create" - x: 0.0d - y: 0.0d - } - { - dependencies: ["6E1CD5151284199F"] + dependencies: ["222A4146EF7750E9"] id: "02BBC87042D9516B" tasks: [ { @@ -53,11 +46,11 @@ ] title: "Engineer's tools" x: -1.0d - y: -4.0d + y: -3.0d } { dependencies: [ - "6E1CD5151284199F" + "222A4146EF7750E9" "10FB27DD3C7BEC2F" ] id: "576584250B7CE6E9" @@ -97,10 +90,10 @@ } ] x: 1.0d - y: -4.0d + y: -3.0d } { - dependencies: ["6E1CD5151284199F"] + dependencies: ["222A4146EF7750E9"] id: "6C6579B8C07D4136" shape: "circle" tasks: [{ @@ -118,8 +111,8 @@ type: "item" }] title: "The first energy" - x: 0.0d - y: 2.5d + x: -2.5d + y: 0.0d } { dependencies: ["6C6579B8C07D4136"] @@ -129,11 +122,11 @@ item: "create:mechanical_press" type: "item" }] - x: 0.0d - y: 5.0d + x: -4.5d + y: 0.0d } { - dependencies: ["6E1CD5151284199F"] + dependencies: ["222A4146EF7750E9"] id: "78BE0A10CE7B4BBE" shape: "rsquare" tasks: [{ @@ -141,22 +134,33 @@ item: "create:electron_tube" type: "item" }] - x: 4.0d + x: 2.5d y: 0.0d } { dependencies: ["78BE0A10CE7B4BBE"] + description: [ + "Let's break down sequential crafting using Precision Mechanism as an example." + "You will need 1 Gold Plate, 5 Deploy Cogwheel, 5 Deploy Large Cogwheel and 5 Iron Nugget" + "" + "Place the gold plate on the Depot or Mechanical Belt that is under the Deployer" + "Next, place the items in the Deployer in order from the JEI." + "" + "You will end up with Precision Mechanism" + ] id: "7B74DB051202E97E" + shape: "rsquare" + subtitle: "new mechanics" tasks: [{ id: "135E35D4524364D0" item: "create:deployer" type: "item" }] - x: 4.0d - y: 2.5d + x: 2.5d + y: 2.0d } { - dependencies: ["6E1CD5151284199F"] + dependencies: ["222A4146EF7750E9"] hide_dependency_lines: true id: "525EA99C7879E3FB" tasks: [{ @@ -165,7 +169,7 @@ type: "item" }] x: 3.0d - y: -4.0d + y: -3.0d } { dependencies: ["6C6579B8C07D4136"] @@ -176,8 +180,8 @@ item: "createaddition:rolling_mill" type: "item" }] - x: 1.0d - y: 5.0d + x: -4.5d + y: 1.0d } { dependencies: ["6C6579B8C07D4136"] @@ -188,8 +192,8 @@ item: "create:millstone" type: "item" }] - x: -1.0d - y: 5.0d + x: -4.5d + y: -1.0d } { dependencies: ["6C6579B8C07D4136"] @@ -200,8 +204,8 @@ item: "create:mechanical_mixer" type: "item" }] - x: 0.0d - y: 6.0d + x: -5.5d + y: 0.0d } { dependencies: ["6C6579B8C07D4136"] @@ -212,8 +216,8 @@ item: "create:basin" type: "item" }] - x: 0.0d - y: 7.0d + x: -6.5d + y: -0.5d } { dependencies: ["6C6579B8C07D4136"] @@ -224,8 +228,8 @@ item: "create:mechanical_saw" type: "item" }] - x: 1.0d - y: 6.0d + x: -5.5d + y: 1.0d } { dependencies: ["78BE0A10CE7B4BBE"] @@ -236,7 +240,7 @@ item: "create:mechanical_crafter" type: "item" }] - x: 8.0d + x: 5.5d y: 0.0d } { @@ -247,8 +251,8 @@ item: "create:crushing_wheel" type: "item" }] - x: 8.0d - y: 5.0d + x: 5.5d + y: 2.0d } { dependencies: ["517EFADD8F22717F"] @@ -265,7 +269,7 @@ type: "item" }] x: -2.0d - y: -4.0d + y: -3.0d } { dependencies: ["7B74DB051202E97E"] @@ -275,8 +279,8 @@ item: "create:depot" type: "item" }] - x: 5.0d - y: 2.5d + x: 3.5d + y: 3.0d } { dependencies: ["6C6579B8C07D4136"] @@ -287,8 +291,8 @@ item: "create:item_drain" type: "item" }] - x: -1.0d - y: 6.0d + x: -5.5d + y: -1.0d } { dependencies: ["45EA7CA14EE67AA4"] @@ -305,8 +309,8 @@ } type: "item" }] - x: 9.0d - y: 5.0d + x: 6.5d + y: 2.0d } { dependencies: ["45EA7CA14EE67AA4"] @@ -323,8 +327,8 @@ } type: "item" }] - x: 7.0d - y: 5.0d + x: 4.5d + y: 2.0d } { dependencies: ["45EA7CA14EE67AA4"] @@ -335,8 +339,8 @@ item: "create:wand_of_symmetry" type: "item" }] - x: 8.0d - y: 6.0d + x: 5.5d + y: 3.0d } { dependencies: ["6C6579B8C07D4136"] @@ -347,8 +351,8 @@ item: "create:encased_fan" type: "item" }] - x: 1.0d - y: 7.0d + x: -6.5d + y: 0.5d } { dependencies: ["7B74DB051202E97E"] @@ -359,8 +363,8 @@ item: "create:precision_mechanism" type: "item" }] - x: 4.0d - y: 5.0d + x: 2.5d + y: 4.0d } { dependencies: ["2D95C927AA8A641D"] @@ -370,8 +374,8 @@ item: "create:rotation_speed_controller" type: "item" }] - x: 4.0d - y: 8.0d + x: 0.5d + y: 4.0d } { dependencies: ["2D95C927AA8A641D"] @@ -382,8 +386,8 @@ item: "create:mechanical_arm" type: "item" }] - x: 5.0d - y: 8.0d + x: 0.0d + y: 3.0d } { dependencies: ["2D95C927AA8A641D"] @@ -394,11 +398,11 @@ item: "create:controls" type: "item" }] - x: 3.0d - y: 8.0d + x: -0.5d + y: 4.0d } { - dependencies: ["6E1CD5151284199F"] + dependencies: ["222A4146EF7750E9"] hide_dependency_lines: true id: "0553929CC6470D24" tasks: [{ @@ -407,10 +411,10 @@ type: "item" }] x: -3.0d - y: -4.0d + y: -3.0d } { - dependencies: ["6E1CD5151284199F"] + dependencies: ["222A4146EF7750E9"] hide_dependency_lines: true id: "560240B49B7BC7CA" tasks: [{ @@ -419,7 +423,132 @@ type: "item" }] x: 2.0d - y: -4.0d + y: -3.0d + } + { + dependencies: ["54D9026F3BE09E88"] + id: "48E26F1E509F4BD0" + tasks: [{ + id: "531A0B06F3A3EB88" + item: "create:schedule" + type: "item" + }] + x: -4.5d + y: 4.0d + } + { + dependencies: ["54D9026F3BE09E88"] + hide_dependency_lines: true + id: "6F419731D917B8C0" + tasks: [{ + id: "05FBF52F27F9279E" + item: { + Count: 1b + id: "ftbfiltersystem:smart_filter" + tag: { + display: { + Name: "{\"text\":\"Any Train Track\"}" + } + "ftbfiltersystem:filter": "or(item(railways:track_create_andesite_wide)item(railways:track_create_andesite_narrow)item(railways:track_monorail))" + } + } + type: "item" + }] + x: -5.5d + y: 4.0d + } + { + dependencies: ["54D9026F3BE09E88"] + hide_dependency_lines: true + id: "08AD4D4DF8FB3695" + tasks: [{ + id: "50DA2411CD4D51AE" + item: "create:track_signal" + type: "item" + }] + x: -4.5d + y: 3.0d + } + { + dependencies: ["54D9026F3BE09E88"] + hide_dependency_lines: true + id: "268A812D73AC53DF" + tasks: [{ + id: "1A55B26A64B966F4" + item: "railways:track_coupler" + type: "item" + }] + x: -5.5d + y: 3.0d + } + { + dependencies: ["54D9026F3BE09E88"] + hide_dependency_lines: true + id: "540FDE5960AAF38F" + tasks: [{ + id: "7F6979FCA3DA0652" + item: "create:track_station" + type: "item" + }] + x: -4.5d + y: 5.0d + } + { + dependencies: ["54D9026F3BE09E88"] + hide_dependency_lines: true + id: "1C6B0CD142F5B472" + tasks: [{ + id: "358613EF5374954C" + item: "create:track_observer" + type: "item" + }] + x: -5.5d + y: 5.0d + } + { + dependencies: ["2D95C927AA8A641D"] + hide_dependency_lines: true + id: "320CA5D0313DB27F" + tasks: [{ + id: "4948D961FC3435A9" + item: "railways:remote_lens" + type: "item" + }] + x: 0.0d + y: 5.0d + } + { + dependencies: ["54D9026F3BE09E88"] + hide_dependency_lines: true + id: "3B19E2A579C1F3A2" + tasks: [{ + id: "40851585BA2693AC" + item: { + Count: 1b + id: "ftbfiltersystem:smart_filter" + tag: { + display: { + Name: "{\"text\":\"Any Track Switch\"}" + } + "ftbfiltersystem:filter": "or(item(railways:track_switch_andesite)item(railways:track_switch_brass))" + } + } + type: "item" + }] + x: -6.5d + y: 4.5d + } + { + dependencies: ["54D9026F3BE09E88"] + hide_dependency_lines: true + id: "13D5F948FE677003" + tasks: [{ + id: "0FA370BC8CFB7600" + item: "railways:semaphore" + type: "item" + }] + x: -6.5d + y: 3.5d } ] title: "Mechanical Age" From 7b28f3695ba3ae9cb59848dfb31422a8bf4059f4 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Mar 2024 09:29:20 +0700 Subject: [PATCH 30/30] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b25a4268..6751fb01d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - Added new recipes for TFC alebaster via GTCEu + Create machines. (FriendlyCube) - Added a lot of smelting, mixing, and etc recipes for firmalife and tfc. (FriendlyCube) - Added rubber producing by using vat from firmalife. (FriendlyCube) +- Added new quests for Create. (FriendlyCube) ### New Mods - HangGlider-v8.0.1-1.20.1-Forge - u_team_core-forge-1.20.1-5.1.4.269