From dde122dbedaac42058ec7a994f79da1206b59e02 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 12:08:44 +0100 Subject: [PATCH 01/95] you can now put a wool cloth on a tool rack (since it's a glass blowing tool!) --- kubejs/server_scripts/tfc/tags.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 193c1db14..136a4b8fd 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -29,6 +29,7 @@ const registerTFCItemTags = (event) => { event.add('tfc:usable_on_tool_rack', '#forge:tools/plungers') event.add('tfc:usable_on_tool_rack', '#forge:tools/mortars') event.add('tfc:usable_on_tool_rack', '#forge:tools/mallets') + event.add('tfc:usable_on_tool_rack', 'tfc:wool_cloth') event.add('tfc:usable_on_tool_rack', '#forge:tools/chainsaws') event.add('tfc:usable_on_tool_rack', '#forge:tools/buzzsaws') From 0ef9f6db21090cea2b2855d338effa48b68620d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 12:10:24 +0100 Subject: [PATCH 02/95] now you can put construction wands on tool racks --- kubejs/server_scripts/constructionwand/tags.js | 8 ++++++++ kubejs/server_scripts/main_server_script.js | 1 + 2 files changed, 9 insertions(+) create mode 100644 kubejs/server_scripts/constructionwand/tags.js diff --git a/kubejs/server_scripts/constructionwand/tags.js b/kubejs/server_scripts/constructionwand/tags.js new file mode 100644 index 000000000..fa110e01f --- /dev/null +++ b/kubejs/server_scripts/constructionwand/tags.js @@ -0,0 +1,8 @@ +// priority: 0 + +function registerConstructionWandItemTags(event) { + event.add('tfc:usable_on_tool_rack', 'constructionwand:stone_wand') + event.add('tfc:usable_on_tool_rack', 'constructionwand:iron_wand') + event.add('tfc:usable_on_tool_rack', 'constructionwand:diamond_wand') + event.add('tfc:usable_on_tool_rack', 'constructionwand:infinity_wand') +} \ 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 5ea97b213..883bd4b08 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -14,6 +14,7 @@ ServerEvents.tags('item', event => { registerChalkItemTags(event); registerChiselAndBitsItemTags(event) registerComputerCraftItemTags(event) + registerConstructionWandItemTags(event) registerCreateItemTags(event) registerCreateAdditionsItemTags(event) registerCreateConnectedItemTags(event) From 26275c0b09bafa96c6b52ba17c16f95751e766ed Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 12:47:38 +0100 Subject: [PATCH 03/95] buffing nether entity loot tables --- .../loot_tables/entities/cave_enderman.json | 58 ++++++++++++---- .../entities/dark_oak_enderman.json | 46 ++++++++++--- .../entities/mushroom_fields_enderman.json | 50 +++++++++++--- .../entities/nether_wastes_enderman.json | 66 ------------------ .../loot_tables/entities/swamp_enderman.json | 68 +++++++++++++++++-- .../loot_tables/entities/enderman.json | 16 ++--- .../loot_tables/entities/phantom.json | 16 ++--- .../loot_tables/entities/wither_skeleton.json | 46 ++++++++++--- .../server_scripts/endermanoverhaul/tags.js | 13 +++- kubejs/startup_scripts/minecraft/constants.js | 3 +- 10 files changed, 253 insertions(+), 129 deletions(-) delete mode 100644 kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json index 10953fcfc..cdb4a42cc 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json @@ -11,16 +11,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -41,16 +41,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -71,16 +71,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -101,7 +101,37 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "tfc:ore/normal_native_copper" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 1.0, "min": 0.0 }, "function": "minecraft:set_count" @@ -116,7 +146,7 @@ "function": "minecraft:looting_enchant" } ], - "name": "tfc:ore/normal_native_copper" + "name": "endermanoverhaul:summoner_pearl" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json index 3fe97f6cf..19df111fe 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json @@ -11,16 +11,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -42,15 +42,15 @@ "count": { "type": "minecraft:uniform", "max": 8.0, - "min": 0.0 + "min": 4.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -72,6 +72,36 @@ "count": { "type": "minecraft:uniform", "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "minecraft:charcoal" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 1.0, "min": 0.0 }, "function": "minecraft:set_count" @@ -86,7 +116,7 @@ "function": "minecraft:looting_enchant" } ], - "name": "minecraft:charcoal" + "name": "endermanoverhaul:corrupted_pearl" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json index 870221ae6..af35178ec 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json @@ -11,16 +11,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -41,16 +41,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -71,7 +71,37 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "minecraft:brown_mushroom" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 1.0, "min": 0.0 }, "function": "minecraft:set_count" @@ -86,7 +116,7 @@ "function": "minecraft:looting_enchant" } ], - "name": "minecraft:brown_mushroom" + "name": "endermanoverhaul:summoner_pearl" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json deleted file mode 100644 index da0f4b05d..000000000 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], - "name": "ae2:ender_dust" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], - "name": "endermanoverhaul:summoner_pearl" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "endermanoverhaul:entities/nether_wastes_enderman" -} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json index c47a90367..02bf8d53d 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json @@ -11,16 +11,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -31,6 +31,66 @@ ], "rolls": 1.0 }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "minecraft:glow_berries" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "tfc:wood/sapling/mangrove" + } + ], + "rolls": 1.0 + }, { "bonus_rolls": 0.0, "entries": [ diff --git a/kubejs/data/minecraft/loot_tables/entities/enderman.json b/kubejs/data/minecraft/loot_tables/entities/enderman.json index 7fd609913..8fc22b68f 100644 --- a/kubejs/data/minecraft/loot_tables/entities/enderman.json +++ b/kubejs/data/minecraft/loot_tables/entities/enderman.json @@ -12,16 +12,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -42,16 +42,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" diff --git a/kubejs/data/minecraft/loot_tables/entities/phantom.json b/kubejs/data/minecraft/loot_tables/entities/phantom.json index c81073174..83e70384a 100644 --- a/kubejs/data/minecraft/loot_tables/entities/phantom.json +++ b/kubejs/data/minecraft/loot_tables/entities/phantom.json @@ -12,16 +12,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -36,16 +36,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" diff --git a/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json b/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json index 031bb3e7b..be0b4fc56 100644 --- a/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json +++ b/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json @@ -12,16 +12,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -42,16 +42,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 + "max": 5.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -60,6 +60,36 @@ "name": "beneath:cursecoal" } ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "gtceu:rich_raw_coal" + } + ] } ] } \ No newline at end of file diff --git a/kubejs/server_scripts/endermanoverhaul/tags.js b/kubejs/server_scripts/endermanoverhaul/tags.js index b838d389c..c381c1956 100644 --- a/kubejs/server_scripts/endermanoverhaul/tags.js +++ b/kubejs/server_scripts/endermanoverhaul/tags.js @@ -4,7 +4,18 @@ const registerEndermanOverhaulItemTags = (event) => { 'endermanoverhaul:tiny_skull', 'endermanoverhaul:enderman_tooth', 'endermanoverhaul:corrupted_blade', - 'endermanoverhaul:corrupted_shield' + 'endermanoverhaul:corrupted_shield', + + 'endermanoverhaul:badlands_hood', + 'endermanoverhaul:savannah_hood', + 'endermanoverhaul:snowy_hood', + + 'endermanoverhaul:soul_pearl', + 'endermanoverhaul:ancient_pearl', + 'endermanoverhaul:bubble_pearl', + 'endermanoverhaul:icy_pearl', + 'endermanoverhaul:crimson_pearl', + 'endermanoverhaul:warped_pearl' ] DISABLED_ITEMS.forEach(item => { diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 4abb73568..958a8b15e 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -626,8 +626,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:purpur_slab', 'minecraft:shears', 'minecraft:lantern', - 'minecraft:soul_lantern', - 'minecraft:smithing_table', + 'minecraft:soul_lantern', 'minecraft:smoker', 'minecraft:blast_furnace', 'minecraft:chiseled_bookshelf', From 830e6231dece76173e1d2c86aa10a7a506faa5cb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 13:04:52 +0100 Subject: [PATCH 04/95] updated graphite vein to spawn in every stone type --- .../earth/vein/normal_graphite.json | 211 +++++++++++++++++- 1 file changed, 210 insertions(+), 1 deletion(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json index a8ff92783..685bd52f7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json @@ -179,13 +179,222 @@ "weight": 30 } ] + }, + { + "replace": [ + "tfc:rock/raw/dacite" + ], + "with": [ + { + "block": "gtceu:dacite_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:dacite_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:dacite_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/rhyolite" + ], + "with": [ + { + "block": "gtceu:rhyolite_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:rhyolite_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:rhyolite_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/andesite" + ], + "with": [ + { + "block": "gtceu:andesite_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:andesite_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:andesite_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/basalt" + ], + "with": [ + { + "block": "gtceu:basalt_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:basalt_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:basalt_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/shale" + ], + "with": [ + { + "block": "gtceu:shale_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:shale_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:shale_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/claystone" + ], + "with": [ + { + "block": "gtceu:claystone_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:claystone_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:claystone_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/limestone" + ], + "with": [ + { + "block": "gtceu:limestone_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:limestone_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:limestone_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/conglomerate" + ], + "with": [ + { + "block": "gtceu:conglomerate_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:conglomerate_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:conglomerate_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dolomite" + ], + "with": [ + { + "block": "gtceu:dolomite_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:dolomite_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:dolomite_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chert" + ], + "with": [ + { + "block": "gtceu:chert_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:chert_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:chert_coal_ore", + "weight": 30 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chalk" + ], + "with": [ + { + "block": "gtceu:chalk_graphite_ore", + "weight": 45 + }, + { + "block": "gtceu:chalk_diamond_ore", + "weight": 25 + }, + { + "block": "gtceu:chalk_coal_ore", + "weight": 30 + } + ] } ], "indicator": { "rarity": 10, "depth": 80, "underground_rarity": 30, - "underground_count": 250, + "underground_count": 400, "blocks": [ { "block": "gtceu:graphite_indicator", From 099a1e0a8bb5bdc03783aade5c2a290a981ed8ec Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 13:35:34 +0100 Subject: [PATCH 05/95] fixed "mechanic: hydration" completing instantly on spawn --- config/ftbquests/quests/chapters/questsstoneage.snbt | 1 - 1 file changed, 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index 2c539de95..372346e1a 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -1699,7 +1699,6 @@ subtitle: "{quests.stone_age.hydration.subtitle}" tasks: [{ id: "01CB74D1BA1BC018" - optional_task: true title: "{quests.tasktype.checkmark}" type: "checkmark" }] From 37b7a6716a70e1374fcf8b79eb2f33cbca54cd8f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 13:35:43 +0100 Subject: [PATCH 06/95] lang files for primitive creatures --- kubejs/assets/kaolinclayze/lang/en_us.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 kubejs/assets/kaolinclayze/lang/en_us.json diff --git a/kubejs/assets/kaolinclayze/lang/en_us.json b/kubejs/assets/kaolinclayze/lang/en_us.json new file mode 100644 index 000000000..33324601f --- /dev/null +++ b/kubejs/assets/kaolinclayze/lang/en_us.json @@ -0,0 +1,9 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "entity.kaolinclayze.tfc": "Kaolin Klayze", + "entity.terramod.tfc": "Kaolin Klayze", + "entity.kaolinclayze.golem_2": "Graphite Glayze", + "item.kaolinclayze.tfc_spawn_egg": "Kaolin Klayze Spawn Egg", + "item.kaolinclayze.golem_2_spawn_egg": "Graphite Glayze Spawn Egg", + "item.terramod.tfc_spawn_egg": "Kaolin Klayze Spawn Egg" +} \ No newline at end of file From be4f667c37830a9659aea3b4f6c42fa7b51b8c62 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 14:09:41 +0100 Subject: [PATCH 07/95] changed the "pls go mining" quest to a mining hammer quest --- .../quests/chapters/questsmetallurgy.snbt | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index a08b8fd91..1427e9b64 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -558,29 +558,20 @@ { dependencies: ["3C173357029AB649"] description: ["{quests.metal_age.mining.desc}"] - icon: "gtceu:almandine_indicator" id: "234B68E86F72C29E" subtitle: "{quests.metal_age.mining.subtitle}" - tasks: [ - { - id: "6BB5900B1E695C61" - title: "{quests.tasktype.checkmark}" - type: "checkmark" - } - { - id: "42657F198063D88B" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:tools/mining_hammers)" - } + tasks: [{ + id: "42657F198063D88B" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:tools/mining_hammers)" } - optional_task: true - title: "Any #forge:tools/mining_hammers" - type: "item" } - ] + title: "Any #forge:tools/mining_hammers" + type: "item" + }] title: "{quests.metal_age.mining.title}" x: 0.0d y: -32.0d From 4d122c614b260edef6622f6fd4ae918bbceed21b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 14:10:33 +0100 Subject: [PATCH 08/95] fixed kaolin overworld spawns! I may be stupid --- kubejs/server_scripts/main_server_script.js | 1 + kubejs/server_scripts/tfc/tags.js | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 883bd4b08..091f8afef 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -101,6 +101,7 @@ ServerEvents.tags('worldgen/placed_feature', event => { }) ServerEvents.tags('worldgen/biome', event => { + registerTFCBiomeTags(event) registerTFGBiomeTags(event) }) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 136a4b8fd..6f70a8a7a 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -476,11 +476,23 @@ const registerTFCFluidTags = (event) => { event.add('c:hidden_from_recipe_viewers', 'tfc:metal/high_carbon_blue_steel') } +const registerTFCBiomeTags = (event) => { + + event.add('tfc:kaolin_clay_spawns_in', 'tfc:rolling_hills') +} + const registerTFCPlacedFeatures = (event) => { // Удаление event.removeAll('tfc:in_biome/veins') + // Add back the non-ore ones + event.add('tfc:in_biome/veins', 'tfc:vein/gravel') + event.add('tfc:in_biome/veins', 'tfc:vein/kaolin_disc') + event.add('tfc:in_biome/veins', 'tfc:vein/granite_dike') + event.add('tfc:in_biome/veins', 'tfc:vein/diorite_dike') + event.add('tfc:in_biome/veins', 'tfc:vein/gabbro_dike') + // Добавление event.add('tfc:in_biome/veins', 'tfg:earth/vein/deep_garnet_amethyst') event.add('tfc:in_biome/veins', 'tfg:earth/vein/deep_garnet_opal') From a2d1a9bff2d1fc0cdc3ced54a732ca8cfac2931f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 15:27:38 +0100 Subject: [PATCH 09/95] cleaned up more duplicate tfc/gt recipes --- kubejs/server_scripts/beneath/recipes.js | 1 + kubejs/server_scripts/gregtech/recipes.js | 7 +++++ .../gregtech/recipes.removes.js | 20 ++++++++++++ kubejs/server_scripts/minecraft/recipes.js | 31 ++++++++++--------- .../minecraft/recipes.removes.js | 1 + kubejs/server_scripts/tfc/recipes.removes.js | 6 ++-- .../server_scripts/tfg/recipes.terrariums.js | 9 ------ kubejs/startup_scripts/minecraft/constants.js | 3 ++ 8 files changed, 53 insertions(+), 25 deletions(-) diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index 3232efb8f..48f4c6cd7 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -17,6 +17,7 @@ const registerBeneathRecipes = (event) => { event.remove({ id: 'beneath:crafting/blackstone_plate' }) event.remove({ id: 'beneath:crafting/blackstone_button' }) event.remove({ id: 'beneath:crafting/hellbricks' }) + event.remove({ id: 'beneath:crafting/nether_brick' }) event.remove({ id: 'beneath:quern/slime' }) event.shaped('beneath:unposter', [ diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4e83ca7af..56395b420 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -232,6 +232,13 @@ const registerGTCEURecipes = (event) => { .duration(128) .EUt(3) + event.recipes.gtceu.brewery('biomass_from_minecraft_plants') + .itemInputs('#createaddition:plants') + .inputFluids(Fluid.of('minecraft:water', 20)) + .outputFluids(Fluid.of('gtceu:biomass', 20)) + .duration(128) + .EUt(3) + //#endregion //#region Выход: Рыбье масло diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index efeca1f05..2a785a1e4 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -574,6 +574,18 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:shaped/barrel' }) event.remove({ id: 'gtceu:shaped/book' }) event.remove({ id: 'gtceu:shaped/bucket_of_concrete' }) + event.remove({ id: 'gtceu:shaped/smithing_table' }) + event.remove({ id: 'gtceu:shaped/brick_slab_saw' }) + event.remove({ id: 'gtceu:shaped/brick_stair_saw' }) + event.remove({ id: 'gtceu:shaped/brick_wall_saw' }) + event.remove({ id: 'gtceu:shaped/lightning_rod' }) + event.remove({ id: 'gtceu:shaped/painting' }) + event.remove({ id: 'gtceu:shaped/rail' }) + event.remove({ id: 'gtceu:shaped/powered_rail' }) + event.remove({ id: 'gtceu:shaped/detector_rail' }) + event.remove({ id: 'gtceu:shaped/activator_rail' }) + event.remove({ id: 'gtceu:shaped/shield' }) + event.remove({ id: 'gtceu:shaped_fluid_container/treated_wood_planks' }) event.remove({ id: 'gtceu:assembler/bell' }) @@ -585,6 +597,14 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/barrel' }) event.remove({ id: 'gtceu:assembler/book_from_leather' }) event.remove({ id: 'gtceu:assembler/name_tag' }) + event.remove({ id: 'gtceu:assembler/smithing_table' }) + event.remove({ id: 'gtceu:assembler/loom' }) + event.remove({ id: 'gtceu:assembler/flower_pot' }) + event.remove({ id: 'gtceu:assembler/piston' }) + event.remove({ id: 'gtceu:assembler/clock' }) + event.remove({ id: 'gtceu:assembler/spyglass' }) + event.remove({ id: 'gtceu:assembler/map' }) + event.remove({ id: 'gtceu:assembler/spyglass' }) event.remove({ id: 'gtceu:chemical_reactor/ghast_tear_separation' }) } diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 359710340..010ebf123 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -274,6 +274,8 @@ const registerMinecraftRecipes = (event) => { .inputFluids(Fluid.of('gtceu:glue', 50)) .EUt(7).duration(30) + event.replaceInput({ id: 'minecraft:writable_book' }, 'minecraft:inc_sac', '#forge:dyes/black') + //#endregion //#region @@ -777,6 +779,21 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Элитра // Ну и херь я придумал + + event.recipes.gtceu.arc_furnace('tfg:minecraft/arc_furnace/recycling/elytra') + .itemInputs(Item.of('minecraft:elytra', '{Damage:0}').strongNBT()) + .itemOutputs('4x gtceu:aluminium_ingot', '2x gtceu:polycaprolactam_ingot') + .duration(224) + .EUt(GTValues.VA[GTValues.LV]) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + + event.recipes.gtceu.macerator('tfg:minecraft/macerator/recycling/elytra') + .itemInputs(Item.of('minecraft:elytra', '{Damage:0}').strongNBT()) + .itemOutputs('4x gtceu:aluminium_dust', '2x gtceu:polycaprolactam_dust') + .duration(224) + .EUt(GTValues.VA[GTValues.ULV]) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + event.recipes.gtceu.assembler('tfg:minecraft/elytra') .itemInputs('16x #forge:foils/polycaprolactam', '16x #forge:foils/aluminium', '8x minecraft:phantom_membrane', '4x #forge:rings/aluminium', '2x #forge:rods/long/vanadium_steel', '2x #forge:small_springs/aluminium', '1x #forge:small_gears/aluminium') .circuit(4) @@ -798,20 +815,6 @@ const registerMinecraftRecipes = (event) => { .duration(1600) .EUt(120) - event.recipes.gtceu.arc_furnace('tfg:minecraft/arc_furnace/recycling/elytra') - .itemInputs(Item.of('minecraft:elytra', '{Damage:0}').strongNBT()) - .itemOutputs('4x gtceu:aluminium_ingot', '2x gtceu:polycaprolactam_ingot') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator('tfg:minecraft/macerator/recycling/elytra') - .itemInputs(Item.of('minecraft:elytra', '{Damage:0}').strongNBT()) - .itemOutputs('4x gtceu:aluminium_dust', '2x gtceu:polycaprolactam_dust') - .duration(224) - .EUt(GTValues.VA[GTValues.ULV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - //#endregion //#region Glowstone diff --git a/kubejs/server_scripts/minecraft/recipes.removes.js b/kubejs/server_scripts/minecraft/recipes.removes.js index 6f4752edc..218d999b5 100644 --- a/kubejs/server_scripts/minecraft/recipes.removes.js +++ b/kubejs/server_scripts/minecraft/recipes.removes.js @@ -2074,4 +2074,5 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'gtceu:assembler/end_crystal' }) //#endregion + event.remove({ id: 'minecraft:flower_banner_pattern' }) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index 213f2b033..582bcaf8c 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -141,7 +141,9 @@ function removeTFCRecipes(event) { event.remove({ id: `tfc:anvil/brass_mechanisms` }) event.remove({ id: `tfc:crafting/steel_pump` }) event.remove({ id: `tfc:crafting/crankshaft` }) - - event.remove({ id: 'tfc:crafting/sandpaper' }) + + event.remove({ id: 'tfc:crafting/vanilla/redstone/steel_minecart' }) + event.remove({ id: 'tfc:crafting/vanilla/redstone/minecart' }) + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.terrariums.js b/kubejs/server_scripts/tfg/recipes.terrariums.js index a6f59272e..9e63e1565 100644 --- a/kubejs/server_scripts/tfg/recipes.terrariums.js +++ b/kubejs/server_scripts/tfg/recipes.terrariums.js @@ -76,15 +76,6 @@ function registerTFGTerrariumRecipes(event) { .EUt(512) // nether bricks - - event.shaped('4x minecraft:nether_bricks', [ - 'ABA', - 'BAB', - 'ABA' - ], { - A: 'minecraft:nether_brick', - B: 'tfc:mortar' - }).id('tfg:shaped/nether_bricks') event.recipes.gtceu.assembler('tfg:nether_bricks') .itemInputs('5x minecraft:nether_brick') diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 958a8b15e..2833fb522 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -739,6 +739,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:nether_sprouts', 'minecraft:warped_roots', 'minecraft:dragon_head', + 'minecraft:dragon_breath', 'minecraft:creeper_head', 'minecraft:wither_skeleton_skull', 'minecraft:weeping_vines', @@ -748,6 +749,8 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:twisting_vines', 'minecraft:warped_fungus', 'minecraft:respawn_anchor', + 'minecraft:ghast_tear', + 'minecraft:nautilus_shell' ]; global.MINECRAFT_HIDED_ITEMS = [ From af16b2d63cd54bdc76805d9945283dc1ddb37385 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 15:27:51 +0100 Subject: [PATCH 10/95] granitic/basaltic mineral sand now melts into cast iron --- kubejs/startup_scripts/gtceu/materials.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 9ff4119a0..7f3af6bf5 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -103,22 +103,26 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Magnetite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); GTMaterials.Pyrite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); GTMaterials.Goethite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); + GTMaterials.BasalticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); + GTMaterials.GraniticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); + GTMaterials.Malachite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 90)); GTMaterials.Tetrahedrite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 90)); GTMaterials.Chalcopyrite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 85)); GTMaterials.Chalcocite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 95)); GTMaterials.Bornite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 90)); + GTMaterials.Cassiterite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(648, 864, 230, GTMaterials.Tin, 1, 100)); GTMaterials.CassiteriteSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 230, GTMaterials.Tin, 1, 85)); GTMaterials.Sphalerite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 420, GTMaterials.Zinc, 1, 90)); GTMaterials.Garnierite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1453, GTMaterials.Nickel, 1, 100)); GTMaterials.Pentlandite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1453, GTMaterials.Nickel, 1, 85)); - - + GTMaterials.Redstone.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(240, 320, 460, 1)); GTMaterials.RedAlloy.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(570, 650, 740, 2)); GTMaterials.TinAlloy.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1000, 1100, 1250, 3)); + GTMaterials.Gold.addFlags(GENERATE_BELL); GTMaterials.Brass.addFlags(GENERATE_BELL); GTMaterials.Bronze.addFlags(GENERATE_BELL); From 590f8d590ee3a13703119efdae3f964176fa40d4 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 15:45:47 +0100 Subject: [PATCH 11/95] updating langs --- kubejs/assets/tfg/lang/en_us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index dfd4f52e5..b71208b98 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1539,7 +1539,7 @@ "quests.tfg_tips.arborfirmacraft.desc": "ArborFirmaCraft is a mod that adds multiple new trees, some are Variants of existing TFC trees, such as Ancient Kapok, while others are completely new, such as Baobab and Hevea. Some of the colors of the trees may remind you of vanilla tree colors, such as Baobab.\n\nThis part will go all over Tree Tapping.\nAs a bonus, all ArborFirmaCraft woods are compatible with FirmaLife, and FirmaCiv.", "quests.tfg_tips.treetap.title": "Treetap", "quests.tfg_tips.treetap.subtitle": "Now with less jank!", - "quests.tfg_tips.treetap.desc": "To begin tapping trees, you'll need to craft a Tree Tap, you'll need to at least know how to work Copper Ingots into these taps.\n\nFor returning players, you may recall the existence of the old \"Tap\" item from the \"Treetap\" mod, this item has been disabled and no longer does anything, however, you can convert it &lfor free&r into an ArborFirmaCraft Tree Tap!\n\nThe process of tapping requires finding a tree, there's a dedicated &oTapping Index&r in the Field Guide's section on ArborFirmaCraft that'll tell you how to find the trees. There's also the \"Tapping Trees\" entry, which can be used to learn how to actually tap the trees.", + "quests.tfg_tips.treetap.desc": "To begin tapping trees, you'll need to craft a Tree Tap, you'll need to at least know how to work Copper Ingots into these taps.\n\nThe process of tapping requires finding a tree, there's a dedicated &oTapping Index&r in the Field Guide's section on ArborFirmaCraft that'll tell you how to find the trees. There's also the \"Tapping Trees\" entry, which can be used to learn how to actually tap the trees.", "quests.tfg_tips.find_rosin_tree.title": "Rosin Trees", "quests.tfg_tips.find_rosin_tree.subtitle": "It's going to be chilly...", "quests.tfg_tips.find_rosin_tree.desc": "Rosin Trees can be found in cold areas of the world that receive moderate to large amounts of rainfall. It can be tapped to obtain Pitch. Pitch can be used to create both Sticky Resin and Conifer Rosin\n\nTo complete this quest, you need to look at a block that has the tag \"#tfg:rosin_logs\", you can use JEI to learn which blocks have this tag.", @@ -1548,7 +1548,7 @@ "quests.tfg_tips.find_latex_tree.desc": "Latex Trees can be found in temperate areas of the world that receive large amounts of rainfall. It can be tapped to obtain Latex. Latex can be used to create both Sticky Resin, and Vulcanized Latex. Vulcanized Latex is used in the creation of Rubber Gloves, which protect you from poisonous materials on contact.\n\nTo complete this quest, you need to look at a block that has the tag \"#tfg:latex_logs\", you can use JEI to learn which blocks have this tag.", "quests.tfg_tips.find_syrup_tree.title": "Syrup Trees", "quests.tfg_tips.find_syrup_tree.subtitle": "Diabetes is Skyrocketing", - "quests.tfg_tips.find_syrup_tree.desc": "Syrup Trees can be found in moderate climates of the world that receive moderate amounts of rainfall. It can be tapped to obtain Syrup. Syrup can be used to create Tree Sugars, which works for sweetning food among other uses.To complete this quest, you need to look at a block that has the tag \"#tfg:latex_logs\", you can use JEI to learn which blocks have this tag.", + "quests.tfg_tips.find_syrup_tree.desc": "Syrup Trees can be found in moderate climates of the world that receive moderate amounts of rainfall. It can be tapped to obtain Syrup. Syrup can be used to create Tree Sugars, which works for sweetning food among other uses.To complete this quest, you need to look at a block that has the tag \"#tfg:syrup_logs\", you can use JEI to learn which blocks have this tag.", "quests.tfg_tips.create_conifer_rosin.title": "Conifer Rosin", "quests.tfg_tips.create_conifer_rosin.subtitle": "No, it's not Resin", "quests.tfg_tips.create_conifer_rosin.desc": "Conifer Rosin can be utilized as a Wax, letting you create Candles and other items.\n\nTo create the Conifer Rosin, you need to boil Confier Pitch in a vat mixed with Charcoal Powder.", From eb2e9ef2e9234bde5dac75d1c7e747184a2ca613 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 15:46:05 +0100 Subject: [PATCH 12/95] updating changelog --- CHANGELOG.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0535a771f..88f82ece3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,29 @@ # Changelog -## [Unreleased] +## [0.9.2] ### Changes +- Fixed kaolin clay not generating in the overworld +- Changed some quests based on feedback +- Added a temporary workaround for the ULS-MV millstones/crushing wheels voiding poor raw ores +- Added recipes for digger helmet upgrades +- Fixed a duping exploit involving metal plated blocks +- Updated field guide for 0.9 (oosyrag) +- Fixed some recipes that were using the wrong wrench tag +- Removed recipes for firmalife sprinklers. Use gt pipes instead, those can go through sprinkler walls now, and put your sprinklers on drums/fluid tanks/barrels +- Buffed the mixer glowstone recipe +- Nerfed kapok growth speed a little +- Added recipes to turn more things into biomass +- Added recipe to turn saplings into sticks +- Changed mud brick recipes to not require mortar any more +- Fixed not being able to pick up spring water or put it in a mixing bowl +- Buffed hot or not insulation items by x3 +- Nerfed rotation speed controller recipe +- Now you can put construction wands on tool racks +- Buffed nether mob loot tables +- The overworld graphite vein now spawns in every stone type +- Granitic/basaltic mineral sand is now usable for iron in primitive age +- Removed some more duplicate recipes for vanilla items +- Hid some more things in JEI that aren't craftable ## [0.9.1] - 18.04.2025 ### Changes From 3b80f0687ed0ca0eadcb6c6a64bdfb3fefb0bd68 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 15:54:21 +0100 Subject: [PATCH 13/95] changed the graphite indicator to have coal buds (more visible on map) --- .../worldgen/configured_feature/earth/vein/normal_graphite.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json index 685bd52f7..8ce89b1e3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json @@ -401,7 +401,7 @@ "weight": 45 }, { - "block": "gtceu:coal_indicator", + "block": "gtceu:coal_bud_indicator", "weight": 30 }, { From b054d59d27c1baa45b18891cea0892c41e20d498 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 19:59:42 +0100 Subject: [PATCH 14/95] buffed the stick spawn rate in the nether --- kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json | 1 + kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json | 1 + kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json | 1 + kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json | 1 + kubejs/data/tfg/worldgen/biome/nether/granite_caves.json | 1 + kubejs/data/tfg/worldgen/biome/nether/schist_caves.json | 1 + kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json | 1 + .../placed_feature/nether/surface/pumice_patch.json | 2 +- .../worldgen/placed_feature/nether/surface/stick_patch.json | 6 +----- 9 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json index 4d625df11..15907092f 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json +++ b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json @@ -65,6 +65,7 @@ "tfg:nether/surface/pumice_patch", "tfg:nether/surface/beneath_mushrooms", "tfg:nether/surface/guano_patch", + "tfg:nether/surface/stick_patch", "tfg:glow_lichen" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json index 84db3ad65..fa9968461 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json @@ -62,6 +62,7 @@ "tfg:nether/surface/pumice_patch", "tfg:nether/surface/beneath_mushrooms", "tfg:nether/surface/guano_patch", + "tfg:nether/surface/stick_patch", "tfg:glow_lichen" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json index a153e073d..30f203713 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json @@ -62,6 +62,7 @@ "tfg:nether/surface/pumice_patch", "tfg:nether/surface/beneath_mushrooms", "tfg:nether/surface/guano_patch", + "tfg:nether/surface/stick_patch", "tfg:glow_lichen" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json index 6727997c6..47be21839 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json @@ -63,6 +63,7 @@ "tfg:nether/surface/pumice_patch", "tfg:nether/surface/beneath_mushrooms", "tfg:nether/surface/guano_patch", + "tfg:nether/surface/stick_patch", "tfg:glow_lichen" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json index eb7ee6830..6b81b7ff9 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json @@ -63,6 +63,7 @@ "tfg:nether/surface/pumice_patch", "tfg:nether/surface/beneath_mushrooms", "tfg:nether/surface/guano_patch", + "tfg:nether/surface/stick_patch", "tfg:glow_lichen" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json index 64d47ccbe..f53265473 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json @@ -62,6 +62,7 @@ "tfg:nether/surface/pumice_patch", "tfg:nether/surface/beneath_mushrooms", "tfg:nether/surface/guano_patch", + "tfg:nether/surface/stick_patch", "tfg:glow_lichen" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json index c2cb68321..c4eb20fd6 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json +++ b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json @@ -59,6 +59,7 @@ "tfg:nether/surface/pumice_patch", "tfg:nether/surface/beneath_mushrooms", "tfg:nether/surface/guano_patch", + "tfg:nether/surface/stick_patch", "tfg:glow_lichen" ], [ diff --git a/kubejs/data/tfg/worldgen/placed_feature/nether/surface/pumice_patch.json b/kubejs/data/tfg/worldgen/placed_feature/nether/surface/pumice_patch.json index d1aa2cd2d..df59b5e6c 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/nether/surface/pumice_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/nether/surface/pumice_patch.json @@ -8,7 +8,7 @@ }, { "type": "minecraft:count_on_every_layer", - "count": 5 + "count": 10 }, { "type": "minecraft:height_range", diff --git a/kubejs/data/tfg/worldgen/placed_feature/nether/surface/stick_patch.json b/kubejs/data/tfg/worldgen/placed_feature/nether/surface/stick_patch.json index 0fd942fb2..f03ca089f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/nether/surface/stick_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/nether/surface/stick_patch.json @@ -1,10 +1,6 @@ { "feature": "tfg:nether/surface/stick_patch", "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 3 - }, { "type": "minecraft:height_range", "height": { @@ -19,7 +15,7 @@ }, { "type": "minecraft:count_on_every_layer", - "count": 1 + "count": 3 }, { "type": "minecraft:in_square" From 41794b800af046a1612e7b733a57a5e74b492c79 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 21:53:20 +0100 Subject: [PATCH 15/95] fixed mining machines, at the expense of hammering ores to get cobble (why would you do that anyway?) --- kubejs/server_scripts/gregtech/loot.js | 29 +++++--------------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/kubejs/server_scripts/gregtech/loot.js b/kubejs/server_scripts/gregtech/loot.js index b79dd5c15..a7e44678f 100644 --- a/kubejs/server_scripts/gregtech/loot.js +++ b/kubejs/server_scripts/gregtech/loot.js @@ -80,16 +80,6 @@ const registerGTCEULoots = (event) => { .addLoot(STONE_TYPES_TO_COBBLE[stoneType]); }) - if (TFGHelpers.isMaterialRegistrationFinished) { - registerGTCEUMaterialLoots(event); - } - else { - console.log("!!!!!!!! MATERIALS NOT DONE YET !!!!!!!!!") - } -} - -function registerGTCEUMaterialLoots(event) { - // Go through all materials GTMaterialRegistry.getRegisteredMaterials().forEach(material => { @@ -124,17 +114,12 @@ function registerGTCEUMaterialLoots(event) { event.addBlockLootModifier(rawOreBlock) .removeLoot(ItemFilter.ALWAYS_TRUE) - .or((or) => { - or.matchMainHand('#minecraft:pickaxes') - .matchMainHand('#forge:tools/hammers') - .matchMainHand('#forge:tools/mining_hammers') - }) .addWeightedLoot([4, 6], - [ - richRawOre.withChance(0.2), - normalRawOre.withChance(0.6), - poorRawOre.withChance(0.2) - ]); + [ + richRawOre.withChance(0.2), + normalRawOre.withChance(0.6), + poorRawOre.withChance(0.2) + ]); // Stone ores global.ORE_BEARING_STONES.forEach(stoneType => { @@ -154,10 +139,6 @@ function registerGTCEUMaterialLoots(event) { // break with pickaxe event.addBlockLootModifier(`gtceu:${stoneType}_${material.getName()}_ore`) .removeLoot(ItemFilter.ALWAYS_TRUE) - .or((or) => { - or.matchMainHand('#minecraft:pickaxes') - .matchMainHand('#forge:tools/mining_hammers') - }) .addWeightedLoot([ richRawOre.withChance(0.2), normalRawOre.withChance(0.6), From 24602a46c0bd9d85a015fe70639102bf3d88a4c3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 21:53:45 +0100 Subject: [PATCH 16/95] fixed redstone lamp assembler recipe to be consistent with gt --- .../gregtech/recipes.tfcmetals.js | 42 ++++--------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js index 84388d6bb..b0912e4f7 100644 --- a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js +++ b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js @@ -46,43 +46,17 @@ function registerGTCEuTFCMetalsRecipes(event) event.remove({ id: 'gtceu:electric_blast_furnace/blast_rose_gold' }) event.remove({ id: 'gtceu:electric_blast_furnace/blast_rose_gold_gas' }) - event.smelting('gtceu:bismuth_bronze_ingot', 'gtceu:bismuth_bronze_dust') - event.smelting('gtceu:black_bronze_ingot', 'gtceu:black_bronze_dust') - event.smelting('gtceu:sterling_silver_ingot', 'gtceu:sterling_silver_dust') - event.smelting('gtceu:rose_gold_ingot', 'gtceu:rose_gold_dust') + event.smelting('gtceu:bismuth_bronze_ingot', '#forge:dusts/bismuth_bronze') + .id('tfg:smelting/bismuth_bronze_ingot') + event.smelting('gtceu:black_bronze_ingot', '#forge:dusts/black_bronze') + .id('tfg:smelting/black_bronze_ingot') + event.smelting('gtceu:sterling_silver_ingot', '#forge:dusts/sterling_silver') + .id('tfg:smelting/sterling_silver_ingot') + event.smelting('gtceu:rose_gold_ingot', '#forge:dusts/rose_gold') + .id('tfg:smelting/rose_gold_ingot') //#endregion - // Add circuit to assembler recipe for redstone lamp. - // Avoids conflict with AE2 smart cables. - event.remove({ id: 'gtceu:assembler/redstone_lamp' }) - event.recipes.gtceu.assembler('redstone_lamp') - .itemInputs('4x #forge:dusts/redstone', '4x #forge:dusts/glowstone') - .itemOutputs('1x minecraft:redstone_lamp') - .circuit(1) - .duration(100) - .EUt(1) - - // Clear NBT on tanks with shapeless crafts. - const TANK_NAMES = [ - "lv_super", - "mv_super", - "hv_super", - "ev_super", - "iv_quantum", - "luv_quantum", - "zpm_quantum", - "uv_quantum", - "uhv_quantum", - ] - - TANK_NAMES.forEach(prefix => { - // Craft super tanks to remove their NBT data. - event.shapeless(`gtceu:${prefix}_tank`, [`gtceu:${prefix}_tank`]) - // Craft super chests to remove their NBT data. - event.shapeless(`gtceu:${prefix}_chest`, [`gtceu:${prefix}_chest`]) - }) - // red alloy, because crucible always makes 4+1=5 event.remove({ id: 'gtceu:mixer/red_alloy' }) From f9db4f8c6856eed51f063414c91a743432f1d716 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 21:55:31 +0100 Subject: [PATCH 17/95] changed glowstone dust recipes to need glowstone block instead, so lamps are still relevant until you get to steam power. Also removed eternal candle --- kubejs/server_scripts/createdeco/recipes.js | 4 +-- kubejs/server_scripts/diggerhelmet/recipes.js | 12 ++++----- kubejs/server_scripts/diggerhelmet/tags.js | 1 + .../server_scripts/framed_blocks/recipes.js | 25 +++++++++++++++++++ kubejs/server_scripts/minecraft/recipes.js | 7 ++++++ kubejs/server_scripts/simplylight/recipes.js | 23 ++++++++--------- 6 files changed, 51 insertions(+), 21 deletions(-) diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 874417279..94d91622f 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -14,7 +14,7 @@ const registerCreatedecoRecipes = (event) => { 'createdeco:industrial_iron_ingot': '#forge:ingots/steel', 'createdeco:industrial_iron_sheet': '#forge:plates/steel', 'createdeco:industrial_iron_nugget': '#forge:nuggets/steel', - 'minecraft:torch': 'minecraft:glowstone_dust', + 'minecraft:torch': 'minecraft:glowstone', 'minecraft:vine': '#tfc:moss', 'create:andesite_alloy': '#forge:ingots/tin_alloy', 'createdeco:andesite_sheet': '#forge:plates/tin_alloy', @@ -76,7 +76,7 @@ const registerCreatedecoRecipes = (event) => { } let ingredients = { - T: `minecraft:glowstone_dust`, + T: `minecraft:glowstone`, N: `#forge:nuggets/${replacementLampType}`, P: `#forge:plates/${replacementLampType}`, D: null, diff --git a/kubejs/server_scripts/diggerhelmet/recipes.js b/kubejs/server_scripts/diggerhelmet/recipes.js index 8abb548d0..ae65bff3f 100644 --- a/kubejs/server_scripts/diggerhelmet/recipes.js +++ b/kubejs/server_scripts/diggerhelmet/recipes.js @@ -3,19 +3,17 @@ function registerDiggerHelmetRecipes(event) { event.remove({ mod: 'diggerhelmet' }) - event.shapeless('diggerhelmet:eternal_candle', ['#minecraft:candles', 'minecraft:glowstone_dust']) - .id('tfg:shapeless/eternal_candle') - event.shaped('diggerhelmet:digger_helmet', [ - ' A ', - 'EB ', + ' F ', + 'EAB', 'DCD' ], { - A: 'diggerhelmet:eternal_candle', + A: '#minecraft:candles', B: '#forge:rings', C: 'minecraft:leather_helmet', D: '#forge:rods/tin', - E: '#forge:tools/hammers' + E: '#forge:tools/hammers', + F: 'minecraft:glowstone_dust' }) .id('tfg:shaped/digger_helmet') diff --git a/kubejs/server_scripts/diggerhelmet/tags.js b/kubejs/server_scripts/diggerhelmet/tags.js index 483727141..7e7176c35 100644 --- a/kubejs/server_scripts/diggerhelmet/tags.js +++ b/kubejs/server_scripts/diggerhelmet/tags.js @@ -3,6 +3,7 @@ function registerDiggerHelmetItemTags(event) { const DISABLED_ITEMS = [ + 'diggerhelmet:eternal_candle', 'diggerhelmet:wool_lining' ] diff --git a/kubejs/server_scripts/framed_blocks/recipes.js b/kubejs/server_scripts/framed_blocks/recipes.js index 237152eee..6667bce79 100644 --- a/kubejs/server_scripts/framed_blocks/recipes.js +++ b/kubejs/server_scripts/framed_blocks/recipes.js @@ -539,4 +539,29 @@ const registerFramedBlocksRecipes = (event) => { count: 4 } }).id('framedblocks:framing_saw/framed_lever') + + // Glowing cube + + event.shapeless( + Item.of('framedblocks:framed_glowing_cube', 1), + [ + 'framedblocks:framed_cube', + 'minecraft:glowstone', + ] + ).id('framedblocks:framed_glowing_cube') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + "count": 1, + "ingredient": { item: "minecraft:glowstone" } + } + ], + material: 6144, + result: { + item: "framedblocks:framed_glowing_cube", + count: 1 + } + }).id('framedblocks:framing_saw/framed_glowing_cube') } diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 010ebf123..bc6049948 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -348,6 +348,13 @@ const registerMinecraftRecipes = (event) => { C: '#tfc:rock/smooth' }).id('tfg:shaped/comparator_nether_quartz'); + event.replaceInput({id: 'gtceu:shaped/redstone_lamp' }, 'minecraft:glass_pane', '#forge:glass_panes') + event.recipes.gtceu.assembler('redstone_lamp') + .itemInputs('1x #forge:glass', '1x minecraft:glowstone', '1x #forge:rods/red_alloy') + .itemOutputs('minecraft:redstone_lamp') + .duration(50) + .EUt(7) + //#endregion //#region Выход: Рамка diff --git a/kubejs/server_scripts/simplylight/recipes.js b/kubejs/server_scripts/simplylight/recipes.js index b650a278d..a6f763729 100644 --- a/kubejs/server_scripts/simplylight/recipes.js +++ b/kubejs/server_scripts/simplylight/recipes.js @@ -86,7 +86,7 @@ const registerSimplylightRecipes = (event) => { 'BBB', ' ' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy' }).id('tfg:simplylight/illuminant_slab') @@ -95,7 +95,7 @@ const registerSimplylightRecipes = (event) => { 'BA ', 'BA ' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy' }).id('tfg:simplylight/wall_lamp') @@ -104,7 +104,7 @@ const registerSimplylightRecipes = (event) => { 'ABA', 'ACA' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:rods/tin_alloy', C: '#forge:bolts/tin_alloy' }).id('tfg:simplylight/rod_lamp') @@ -114,7 +114,7 @@ const registerSimplylightRecipes = (event) => { 'BBB', ' ' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy' }).id('tfg:simplylight/light_bulb') @@ -123,20 +123,19 @@ const registerSimplylightRecipes = (event) => { 'CBC', ' ' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:rods/tin_alloy', C: '#forge:bolts/tin_alloy' }).id('tfg:simplylight/edge_light') - event.shaped('8x simplylight:lamp_post', [ + event.shaped('4x simplylight:lamp_post', [ ' A ', ' B ', - 'CDC' + ' C ' ], { A: '#simplylight:any_lamp_on', - B: '#forge:rods/long/bronze', - C: '#forge:plates/bronze', - D: '#forge:screws/bronze' + B: '#forge:rods/long/tin_alloy', + C: '#forge:plates/tin_alloy', }).id('tfg:simplylight/lamp_post') event.shaped('8x simplylight:illuminant_block_on', [ @@ -144,7 +143,7 @@ const registerSimplylightRecipes = (event) => { 'ACA', 'BAB' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy', C: '#forge:fine_wires/red_alloy', }).id('tfg:simplylight/illuminant_block_on') @@ -154,7 +153,7 @@ const registerSimplylightRecipes = (event) => { 'BCB', 'ABA' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy', C: '#forge:fine_wires/red_alloy', }).id('tfg:simplylight/illuminant_block') From 89ec25bb3d482c42d8aa65343bba4a93e1baff6e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 22:25:57 +0100 Subject: [PATCH 18/95] removed cast iron tools --- kubejs/startup_scripts/gtceu/materials.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 7f3af6bf5..d78392041 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -217,7 +217,6 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BismuthBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.5, 2.0, 178, 2, metalTooling).build()); GTMaterials.BlackBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(3.3, 2.0, 204, 2, metalTooling).build()); GTMaterials.BlackSteel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(6.5, 4.5, 1228, 3, metalTooling).build()); - GTMaterials.Iron.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(6.5, 4.5, 1228, 3, metalTooling).build()); for (var material of GTCEuAPI.materialManager.getRegisteredMaterials()) { var toolProperty = material.getProperty(PropertyKey.TOOL); From dd9c1ede08732486fe633c0f883a78619d1cfd63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Apr 2025 21:40:22 +0000 Subject: [PATCH 19/95] Bump softprops/action-gh-release in the dependencies group Bumps the dependencies group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2.2.1 to 2.2.2 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v2.2.1...v2.2.2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 2.2.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc67b91d5..d4b4ce519 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -400,7 +400,7 @@ jobs: - name: 🚀 Create release id: release - uses: softprops/action-gh-release@v2.2.1 + uses: softprops/action-gh-release@v2.2.2 with: name: ${{ needs.info.outputs.project_version }} tag_name: ${{ needs.info.outputs.project_version }} From 740a879e44c8726b6349c3abfa38f50b60f664da Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 22:43:42 +0100 Subject: [PATCH 20/95] added curios x corpse compat mod --- pakku-lock.json | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/pakku-lock.json b/pakku-lock.json index c49405223..17997219d 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -2933,6 +2933,81 @@ } ] }, + { + "pakku_id": "gAgHdhnBNULr0m6H", + "type": "MOD", + "side": "SERVER", + "slug": { + "curseforge": "corpse-x-curios-api-compat", + "modrinth": "corpse-x-curios-api-compat" + }, + "name": { + "curseforge": "Corpse x Curios API Compat", + "modrinth": "Corpse x Curios API Compat" + }, + "id": { + "curseforge": "1138130", + "modrinth": "pJGcKPh1" + }, + "files": [ + { + "type": "curseforge", + "file_name": "corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar", + "mc_versions": [ + "1.20.2", + "1.20.3", + "1.20.1", + "1.20", + "1.20.4" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6327/919/corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar", + "id": "6327919", + "parent_id": "1138130", + "hashes": { + "sha1": "1e00db91b74287eb63f389c6c8cb5a70df41f8e0", + "md5": "82d54c35a60a963f292dc3f3fd3b3af2" + }, + "required_dependencies": [], + "size": 9117, + "date_published": "2025-03-21T09:35:57.857Z" + }, + { + "type": "modrinth", + "file_name": "corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar", + "mc_versions": [ + "1.18.2", + "1.19", + "1.19.1", + "1.19.2", + "1.19.3", + "1.19.4", + "1.20", + "1.20.1", + "1.20.2", + "1.20.3", + "1.20.4" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/pJGcKPh1/versions/svYuXRgL/corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar", + "id": "svYuXRgL", + "parent_id": "pJGcKPh1", + "hashes": { + "sha512": "966b34642604bd6bf7b27591820a64471448cb21e8ff560ff19c29a891e9a2bf4abf66ab879878839ce0eac45250a39600b83580afb2455da9ef467ae5270d59", + "sha1": "1e00db91b74287eb63f389c6c8cb5a70df41f8e0" + }, + "required_dependencies": [], + "size": 9117, + "date_published": "2025-03-22T08:58:23.301497Z" + } + ] + }, { "pakku_id": "MR4Y9duUBP4YpwJY", "type": "MOD", From 5e61774f339532a0c053206009a7e033bb35520c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 22:46:22 +0100 Subject: [PATCH 21/95] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88f82ece3..6b83e7881 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Fixed a duping exploit involving metal plated blocks - Updated field guide for 0.9 (oosyrag) - Fixed some recipes that were using the wrong wrench tag +- Fixed mining machines not working - Removed recipes for firmalife sprinklers. Use gt pipes instead, those can go through sprinkler walls now, and put your sprinklers on drums/fluid tanks/barrels - Buffed the mixer glowstone recipe - Nerfed kapok growth speed a little From d8cfeb9fbef349483adb495837f189a7101accf5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 22:50:41 +0100 Subject: [PATCH 22/95] changed the graphite indicator back to coal dust, because the buds are white on the map for some reason (makes it confusing with certus veins) --- .../worldgen/configured_feature/earth/vein/normal_graphite.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json index 8ce89b1e3..685bd52f7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json @@ -401,7 +401,7 @@ "weight": 45 }, { - "block": "gtceu:coal_bud_indicator", + "block": "gtceu:coal_indicator", "weight": 30 }, { From 04e08f362b77700b710255ebb68a5f8809058e01 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 23:19:48 +0100 Subject: [PATCH 23/95] langs --- kubejs/assets/gtceu/lang/en_us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 9f6a25bf3..c7b598c79 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s Surface Bud", "block.gtceu.nether_dome": "Netherarium", - "block.gtceu.ender_dome": "Enderarium", + "block.gtceu.end_dome": "Enderarium", "block.gtceu.greenhouse": "Greenhouse", "block.gtceu.steam_bloomery": "Steam Bloomery", "block.gtceu.copper_crate": "Copper Crate", @@ -12,7 +12,7 @@ "block.gtceu.bismuth_bronze_crate": "Bismuth Bronze Crate", "block.gtceu.bismuth_bronze_drum": "Bismuth Bronze Drum", "gtceu.nether_dome": "Netherarium", - "gtceu.ender_dome": "Enderarium", + "gtceu.end_dome": "Enderarium", "gtceu.greenhouse": "Electric Greenhouse", "gtceu.steam_bloomery": "Steam Bloomery", "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", From a7882bc93b3f8274799bcdd49f143bb5591420b2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 23:20:52 +0100 Subject: [PATCH 24/95] hid unused grapplemod items --- .../{grapplinghook => grapplemod}/recipes.js | 0 kubejs/server_scripts/grapplemod/tags.js | 9 +++++++++ kubejs/server_scripts/main_server_script.js | 1 + .../startup_scripts/grapplemod/constants.js | 19 +++++++++++++++++++ 4 files changed, 29 insertions(+) rename kubejs/server_scripts/{grapplinghook => grapplemod}/recipes.js (100%) create mode 100644 kubejs/server_scripts/grapplemod/tags.js create mode 100644 kubejs/startup_scripts/grapplemod/constants.js diff --git a/kubejs/server_scripts/grapplinghook/recipes.js b/kubejs/server_scripts/grapplemod/recipes.js similarity index 100% rename from kubejs/server_scripts/grapplinghook/recipes.js rename to kubejs/server_scripts/grapplemod/recipes.js diff --git a/kubejs/server_scripts/grapplemod/tags.js b/kubejs/server_scripts/grapplemod/tags.js new file mode 100644 index 000000000..969d261ea --- /dev/null +++ b/kubejs/server_scripts/grapplemod/tags.js @@ -0,0 +1,9 @@ +// priority: 0 + +function registerGrapplemodItemTags(event) { + + global.GRAPPLEMOD_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) +} \ 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 091f8afef..f4bf51528 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -28,6 +28,7 @@ ServerEvents.tags('item', event => { registerFirmaLifeItemTags(event) registerFramedBlocksItemTags(event) registerFTBQuestsItemTags(event) + registerGrapplemodItemTags(event) registerGreateItemTags(event) registerGTCEUItemTags(event) registerMegaCellsItemTags(event) diff --git a/kubejs/startup_scripts/grapplemod/constants.js b/kubejs/startup_scripts/grapplemod/constants.js new file mode 100644 index 000000000..c9e87547d --- /dev/null +++ b/kubejs/startup_scripts/grapplemod/constants.js @@ -0,0 +1,19 @@ +// priority: 0 + +global.GRAPPLEMOD_DISABLED_ITEMS = [ + "grapplemod:launcheritem", + "grapplemod:repeller", + "grapplemod:baseupgradeitem", + "grapplemod:doubleupgradeitem", + "grapplemod:forcefieldupgradeitem", + "grapplemod:magnetupgradeitem", + "grapplemod:motorupgradeitem", + "grapplemod:ropeupgradeitem", + "grapplemod:staffupgradeitem", + "grapplemod:swingupgradeitem", + "grapplemod:throwupgradeitem", + "grapplemod:limitsupgradeitem", + "grapplemod:rocketupgradeitem", + "grapplemod:longfallboots", + "grapplemod:block_grapple_modifier" +] \ No newline at end of file From 6fd8dc7c6ba5c724b3568a87bed75c7a5f2a46e6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 23:21:00 +0100 Subject: [PATCH 25/95] fixed bug with enderarium forming --- kubejs/startup_scripts/gtceu/machines.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index e3077c496..a62224601 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -146,7 +146,18 @@ const registerGTCEuMachines = (event) => { .where('S', Predicates.blocks('tfg:artificial_end_portal_frame')) .where('N', Predicates.blocks('minecraft:black_concrete')) .where('G', Predicates.blocks('tfc:ore/small_malachite') - .or(Predicates.blockTag($Tags.block("tfc:small_ore_pieces")))) + .or(Predicates.blocks('tfc:ore/small_native_copper')) + .or(Predicates.blocks('tfc:ore/small_native_gold')) + .or(Predicates.blocks('tfc:ore/small_hematite')) + .or(Predicates.blocks('tfc:ore/small_native_silver')) + .or(Predicates.blocks('tfc:ore/small_cassiterite')) + .or(Predicates.blocks('tfc:ore/small_bismuthinite')) + .or(Predicates.blocks('tfc:ore/small_garnierite')) + .or(Predicates.blocks('tfc:ore/small_malachite')) + .or(Predicates.blocks('tfc:ore/small_magnetite')) + .or(Predicates.blocks('tfc:ore/small_limonite')) + .or(Predicates.blocks('tfc:ore/small_sphalerite')) + .or(Predicates.blocks('tfc:ore/small_tetrahedrite'))) .where('C', Predicates.blocks(GTBlocks.CASING_TITANIUM_STABLE.get()).setMinGlobalLimited(10) .or(Predicates.autoAbilities(definition.getRecipeTypes())) .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))) From a8254e0e44849b7abe70b30a03bf6bec69229482 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 23:52:47 +0100 Subject: [PATCH 26/95] updated some tool textures --- .../item/material_sets/dull/tool_head_axe.png | Bin 1976 -> 217 bytes .../item/material_sets/dull/tool_head_hoe.png | Bin 1958 -> 188 bytes .../material_sets/dull/tool_head_knife.png | Bin 175 -> 176 bytes .../item/material_sets/dull/tool_head_saw.png | Bin 1976 -> 228 bytes .../material_sets/dull/tool_head_shovel.png | Bin 1952 -> 184 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_axe.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_axe.png index 1219eaa294c4b54fb9d397b6559569bc8a3ae962..8456962fb02793558d3f1ec32f5c6ef957f7f495 100644 GIT binary patch delta 190 zcmdnNf0J>7ayremhX#17$==x zC=kru`(Y8+s|8FdI`$cjdxTg=9N;P-Nwg!7? zEM4$@U(6TP8|{n^E)FiwS^awq^%;$uXD&D0wwQ~-!6hNhyn|!SRt`ml=YOW{JkKKU ve7L&*+O02_RwnrO6t3PHSN*jA14GmW+lQC_OgCm=U|{fc^>bP0l+XkKky}mS literal 1976 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7)iRx(0~}NGlTsCe+?^CO z3@t4!G#MB)&L<}%7!{Nh7NrU$B%C;_t;tnX9@Np%6O>?o{=l&VXBgNzPab9MV`Q{b zD2uC$(_&`(QP$fi=n{X8b>>kAsRv$q8d{8(>KkrosBX2G+1PlI;lw#TeNBcg<8zFg zTqkWh_=Z=ZEYM?u@q}8I6VJTcH>_{C;VJMaK+#a=7GtM4iG-E$Bjd7!Q zkha4&Ba7$aA!4b^(x+%hL`6kuSuA^^zEq1PTx|N1XJXnF&s3j_i#`!oowj5d!&Rp{ z>}*W}tqTM$Gh}VKkg~vt;V5&kg&dz0$52&wyhE*{vvz>6rA&mQWebg40V$Y3=9;^E%nTk64R2?40IHX z42%r*4Gr`SjdcwStV|58j4TwOK*>(QrYI%ND#*nRYFSZAnypesNlAf~zJ7Umxn8-k zUVc%!zM-Y1rM`iYzLAk`QA(O_ab;dfVufyAu`3q#^x16!znpGSHB{$K;KZ$0OTjIXH$~l>IzDWa=@0SBKVe-7G&g?#l$lC>0&PAz-CHX}m`T04pm!X~C`waH5>paO5(z3! zNw!MMFUn0Uu~o{0TMi!Czj!NI&o16aT8XjBPT|PGSZw54VL7L z#Ju#>6k8>IC6H(IK}8HCQuNW|3oM6J9N8(@fQ5ow+(1ll(FrO>?GzB@b823Stx}Pa zy`9^ve18T8hGb6{#}JFtPbVMbJmA2=qI)h$*Ln8_w%G<18xrbf{SivEKXgX3Xv)kl zYF`{3_0!IIz3*jZbvxoYy@#bC)bwtx`U`_iQH)JhI}-$VdLGkG$niMy=1W+(gJ{g8 h<4is#LVrH!$DF!3W9gpvxhFt1g{P~Z%Q~loCIFu6i{}6U diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_hoe.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_hoe.png index 36fcd717c8b6b30ffee41f329d29a378215ef08d..ecf8e98c6110d4ad37e28de1c7fcc3140f72251a 100644 GIT binary patch delta 161 zcmZ3+zlU*xayw$Z;uvDl`?mie=Me)Q7W3;J-Z#Bi zqGugUeW6+)n&A}e*5oQG59;XX2}-a(f8f}GGYo8X)&|?DC=z$bcw&lI`gQ5)B`U)4K2n?^$j;PRJU5pY;3&9aN?Yvz9vJL@j1p# zu9G$$e8a0y7U(g-ctS19iD%yJ8`d}6@D%taEU=s71*gJqZjV~48E20$nz0|6#<-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+asv@@_H?<^Dp&~aYuh^=> zRtapbRbH_bNLXJ<0j#7X+g1q@e-XX`3eNdOsS4(LhPufH1_lb|mU`w%iD}7c2098x z21bVZh6ehE#<~UuRwjm4MivTCpk$|DQXyiMgevuA!wxnr>>cNwRKIYO;}Tnz6Z&nTchpd6Gpk zOutKhaw#ZgLHZ%7JS9IlGsOyFt4X4PMXIT(k#4eKl7+5$nu)otg^{JDuBDl!xj{;@ ziLs@LDa~yS&5u%JV zr$d7!IU_MIJvGHvNnZ)%8GTR@1Bn!U^!NhHAr(h<3N~P&AQv|f6I^tHicvcSMERVW zmtw0_q-1Yrx+B7lfq@~=)5S5wLNNKq|Nr*PsxuO=FuY+?QBnERo;Zn@A#+#hYcUyN zBbL<*_U`>#FK};fwYfy|jg(eKkH>Q?iw{UlS9D<&IU%}(N6~7FX3@cnpkw`vnm0e5 U4d?&w0jd`~UHx3vIVCg!06(RGN&o-= diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_knife.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_knife.png index 3ca0fe0cbd68c3ccea69c00929d75be5a39634ac..c80b4b0fd622fe48d9384a99418ee7a5fda8efc7 100644 GIT binary patch delta 126 zcmZ3_xPftkWqFdPi(`mIZ*qbJYtIpluHN3i{b%C$R2as{a~n#nUZo`|XIFFNz`1h= z4f5~BJengWE&codudmtv*T?VwR)4%t_W$?y_8;W$sWm%%9i(`mI@6!nfc^eEkTrb-GFKLn8aaHpaSFi95;k{DH(W^fu)R+t1 z^KN+Y*+=;_Lyf)hXH)qG=7P;HR=qkN5N_6e{)xb}?@xA$dS))2V=grD)!|u<^I}*J i{5YFF@%E?l8t=kGr4B!~C}v<_VDNPHb6Mw<&;$Vg89B%R diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_saw.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_saw.png index 9cef3c6dac8d1c3bd6b26b7490b4f9bbfb12e527..2252b7686ec17cc68d488087be8ae232e375d896 100644 GIT binary patch delta 201 zcmdnN|AcXZayu;1H%cOg9n8pavsX93dv;-Jh}3(`Gm?%x()NW1SJJ;o|=98xhn^w_6f#-&?j@I zPuMOn(Qxz3o1ZKg7@p5LD&gz0PPtnAzCyb!gF`m25>u$F)7q~k8=V(?-?wziy!6ny zO3n|qcH5q@S#vv$;X}lV?{W+if}Av;ZmH{v`6v8;qV@KjaROfVN;nu87#KWV{an^L HB{Ts52>wwA literal 1976 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7)iRx(0~}NGlTsCe+?^CO z3@t4!G#MB)M3WN|j0#E$i&BLW5>A}e*5oQG59;XX2}-a(f8f}GGYo8X)&|?DC=z$bcw&lI`gQ5)B`U)4K2n?^$j;PRJU5pY;3&9aN?Yvz9vJL@j1p# zu9G$$e8a0y7U(g-ctS19iD%yJ8`d}6@D%taEU=s71*gJqZjV~48E20$nz0|6#<-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+asv@@_H?<^Dp&~aYuh^=> zRtapbRbH_bNLXJ<0j#7X+g1q@e-XX`3eNdOsS4(LhPufH1_lb|mU`w%iD}7c2098x z21bVZh6ehE#<~UuRwjm4MivTCpk$|DQ-46syF6v+nImo7hT$PfUVg*uYoS15%n`~-grfXnglBjE8Xke&oVqpk!mQi9-k^v|+ zgA<6AM`m$Jeo-Yfe*~u%LRmSP3g9$hm6!}l>$XbCph!+lQGyC*VhInTY=-JD&q&R~ z8~G61i}TY;$`gxH9n(|uN(d${eO!(&PAtRkbmF2C;wG$4M^20oWu!SB8Z5~fiFxU% zDYi=bN+8eZgNhhPr0Ao^7g!FdII>f)0Sg7WxPh49q7zh%+9@E)=hVCuTcsi;d%H{h z>^%$&49T7@jv*F;$v^)8w`W$Jkys$fz?7Jn`2X#jHwrR34C@&~Lqq>>&%OPv{!k02 z1@FOZhpMVy|Ff^JduZCSfSW_o$$-a!VZNe^WW#w?FrgyZ@J?tFuY*~KhCWa89tS=) Y2GtJ*Uz+Y2M}le!Pgg&ebxsLQ09~kv2><{9 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_shovel.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/tool_head_shovel.png index 31936a7d096898c22d9af8efd916e5fdd7419eb9..d3eaa96666d02579199fcb010767618a3e55936c 100644 GIT binary patch delta 157 zcmZ3$zk_jtaywwX;uvDl`?hZ*?*RoK7W=?u3G!BL z33^s#3qH%N`H)?srP9UV6{Hp(x#|7i1Lw21-85=hU^YEy+4kv1o)f3cT*?31(yhpg zb8FaymhW{xGU893+Zlb9k-^aI>73LwCCfGYc`9|x<4($pJz_b?Xfx-P!uo{_3=9mO Lu6{1-oD!MA}e*5oQG59;XX2}-a(f8f}GGYo8X)&|?DC=z$bcw&lI`gQ5)B`U)4K2n?^$j;PRJU5pY;3&9aN?Yvz9vJL@j1p# zu9G$$e8a0y7U(g-ctS19iD%yJ8`d}6@D%taEU=s71*gJqZjV~48E20$nz0|6#<-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+asv@@_H?<^Dp&~aYuh^=> zRtapbRbH_bNLXJ<0j#7X+g1q@e-XX`3eNdOsS4(LhPufH1_lb|mU`w%iD}7c2098x z21bVZh6ehE#<~UuRwjm4MivTCpk$|DQ-46e}}>6!VlMGc#Q?^JFt!(#a%PGZ!q&uOizLg`WK&%;!=zN*Bm)y;T?-2nGuR5jtei{*aGJ16Oa`TOTcu=BB&Vh*L4`B1ga=VJL-m(u zq~_s`e2DGE`DrEPiAAZ7>8W`o1QVA&F2@%qmf?3gaZw3z6IQ1qCq{@e(wq(rmgJ1Y zy!6x*TP1xZkZ1HkMGPcT^wHxBEQeGa*(un7g@Rn%KumDa2`WbI6cFWeYF>)1QjwCq zUDWisaSRL$-kvUwAr^wkKmPx>XI7n&c!l8)+m9bV{ Date: Mon, 21 Apr 2025 23:52:58 +0100 Subject: [PATCH 27/95] field guide cleanup --- .../en_us/entries/firmalife/irrigation.json | 84 +--- .../entries/getting_started/introduction.json | 2 +- .../en_us/entries/mechanics/bloomery.json | 2 +- .../en_us/entries/tfg_tips/create.json | 40 -- .../entries/firmalife/stainless_steel.json | 14 - .../it_it/entries/mechanics/bloomery.json | 156 +++---- .../it_it/entries/mechanics/glassworking.json | 82 ---- .../mechanics/glassworking_applications.json | 433 ------------------ .../entries/mechanics/mechanical_power.json | 38 -- .../it_it/entries/mechanics/pumps.json | 39 -- .../inventory_management.json} | 2 +- .../entries/firmalife/stainless_steel.json | 14 - .../entries/getting_started/introduction.json | 2 +- .../ru_ru/entries/mechanics/crops.json | 13 +- .../ru_ru/entries/mechanics/decay.json | 2 +- .../ru_ru/entries/mechanics/pumps.json | 40 -- .../basic_automation.json} | 2 +- .../inventory_management.json} | 2 +- .../entries/firmalife/stainless_steel.json | 14 - .../entries/getting_started/introduction.json | 2 +- .../uk_ua/entries/mechanics/bloomery.json | 156 +++---- .../uk_ua/entries/mechanics/pumps.json | 39 -- .../basic_automation.json} | 2 +- .../inventory_management.json} | 2 +- 24 files changed, 196 insertions(+), 986 deletions(-) delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/create.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/firmalife/stainless_steel.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking_applications.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/mechanical_power.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/pumps.json rename kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/{mechanics/crankshaft.json => tfg_tips/inventory_management.json} (99%) delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/stainless_steel.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/pumps.json rename kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/{mechanics/mechanical_power.json => tfg_tips/basic_automation.json} (99%) rename kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/{mechanics/crankshaft.json => tfg_tips/inventory_management.json} (99%) delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/firmalife/stainless_steel.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/pumps.json rename kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/{mechanics/mechanical_power.json => tfg_tips/basic_automation.json} (99%) rename kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/{mechanics/crankshaft.json => tfg_tips/inventory_management.json} (99%) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json index 33bbc83fd..82d01a01d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json @@ -1,62 +1,26 @@ { - "__comment__": "This file was automatically created by mcresources", - "name": "Irrigation", - "category": "tfc:firmalife", - "icon": "firmalife:sprinkler", - "pages": [ - { - "type": "patchouli:text", - "text": "The $(thing)Sprinkler$() is a device that sprinkles water in a 5x6x5 area centered on the block below the sprinkler block. You know it is working when it drips out water particles. Sprinklers placed facing up irrigate the same 5x6x5 area above." - }, - { - "type": "tfc:anvil_recipe", - "recipe": "firmalife:anvil/sprinkler", - "text": "The sprinkler is made with a $(thing)Copper Plate$()." - }, - { - "type": "patchouli:text", - "text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Copper Pipes$() to them. Copper Pipes transport water up to 32 blocks to a sprinkler. They are connected to $(thing)Pumping Stations$()." - }, - { - "type": "tfc:anvil_recipe", - "recipe": "firmalife:anvil/copper_pipe", - "text": "The copper pipe is made with a plate." - }, - { - "type": "patchouli:multiblock", - "multiblock": { - "pattern": [ - [ - "X" - ], - [ - "0" - ] - ], - "mapping": { - "X": "firmalife:pumping_station" - } - }, - "name": "", - "text": "", - "enable_visualize": false - }, - { - "type": "patchouli:crafting", - "recipe": "tfg:shaped/pumping_station", - "text": "Pumping stations must be above a source block of water in order to work. Activate them with a redstone signal." - }, - { - "type": "patchouli:crafting", - "recipe": "firmalife:crafting/oxidized_copper_pipe", - "text": "Oxidized pipes are the same as regular copper pipes, except they do not connect to the other kind of pipe." - }, - { - "type": "patchouli:crafting", - "recipe": "firmalife:crafting/greenhouse/iron_greenhouse_port", - "text": "Greenhouse ports have a single pipe inside of them. They can be used to pass water through the walls of greenhouses!" - } - ], - "read_by_default": true, - "sortnum": 8 + "name": "Irrigation", + "category": "tfc:firmalife", + "icon": "firmalife:sprinkler", + "pages": [ + { + "type": "patchouli:text", + "text": "The $(thing)Sprinkler$() is a device that sprinkles water in a 5x6x5 area centered on the block below the sprinkler block. You know it is working when it drips out water particles. Sprinklers placed facing up irrigate the same 5x6x5 area above." + }, + { + "type": "tfc:anvil_recipe", + "recipe": "firmalife:anvil/sprinkler", + "text": "The sprinkler is made with a $(thing)Copper Plate$()." + }, + { + "type": "patchouli:text", + "text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Fluid Pipes$() to them. You can pump fluid into them with a $(thing)Mechanical Pump$()." + }, + { + "type": "patchouli:text", + "text": "You can right-click a pipe with a GregTech Frame (such as a $(thing)Copper Frame$()) to make them flush with the wall. You will need a Drum or Fluid Tank attached to each sprinkler in order for them to work." + } + ], + "read_by_default": true, + "sortnum": 8 } \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/introduction.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/introduction.json index 3e990232b..de0b044c4 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/introduction.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/introduction.json @@ -69,7 +69,7 @@ }, { "type": "patchouli:crafting", - "recipe": "tfc:crafting/stone/knife_sedimentary", + "recipe": "gtceu:shaped/knife_stone", "text": "All stone tool heads can be crafted with a stick or twig to assemble them into a tool.$(br2)The stone knife can be used to harvest $(thing)Straw$() by breaking plants." }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json index ea8447dae..86959d363 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json @@ -62,7 +62,7 @@ }, { "type": "tfc:anvil_recipe", - "recipe": "tfc:anvil/metal/ingot/wrought_iron", + "recipe": "tfc:anvil/wrought_iron_from_bloom", "text": "The $(thing)Refined Iron Bloom$() must be worked in a $(l:mechanics/anvils)anvil$() to make $(thing)Wrought Iron Ingots$()." }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/create.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/create.json deleted file mode 100644 index 3c79158d9..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/create.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "Getting Started With Create", - "category": "tfc:tfg_tips", - "icon": "create:cogwheel", - "read_by_default": true, - "pages": [ - { - "type": "patchouli:text", - "title": "Getting Started With Create", - "text": "In TerraFirmaGreg, TFC's own mechanical power system has been replaced with $(thing)Create$().$(br2)You can make a few Create things once you have Wrought Iron, but you can only really get started once you have access to $(l:mechanics/steel)Steel$() and $(thing)Steam Machines$().$(br2)First, you will need a source of $(thing)Mechanical Power$(), either Water Wheels, Windmills, or a Steam Engine. Of these, $(thing)Water Wheels$() are the easiest to start with, just put them in a river!$(br)" - }, - { - "type": "patchouli:crafting", - "recipe": "create:crafting/kinetics/water_wheel", - "recipe2": "create:crafting/kinetics/large_water_wheel" - }, - { - "type": "tfc:sealed_barrel_recipe", - "recipe": "tfg:barrel/treated_wood_planks", - "text": "To move mechanical power around, you will need $(thing)Cogwheels$().$(br)To make these, first put some $(l:tfg_tips/basic_automation)Creosote$() and any $(thing)Wooden Planks$() in a $(l:mechanics/barrels)Sealed Barrel$().$(br)This will give you $(thing)Creosote-Treated Wood Planks$()." - }, - { - "type": "patchouli:spotlight", - "title": "Treated Wood Pulp", - "item": "gtceu:hp_steam_macerator,gtceu:treated_wood_dust", - "text": "Next, put those treated planks in a $(thing)Steam Macerator$(). This will produce $(thing)Treated Wood Pulp$()." - }, - { - "type": "patchouli:spotlight", - "title": "Treated Wood Plank", - "item": "gtceu:hp_steam_compressor,gtceu:treated_wood_plate", - "text": "Lastly, putting the pulp into a $(thing)Steam Compressor$() will produce a $(thing)Treated Wood Plank$().$(br2)You can then use these to craft $(item)Cogwheels$()!" - }, - { - "type": "patchouli:crafting", - "recipe": "tfg:create/shapeless/cogwheel", - "recipe2": "tfg:create/shaped/large_cogwheel" - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/firmalife/stainless_steel.json b/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/firmalife/stainless_steel.json deleted file mode 100644 index 2899809ed..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/firmalife/stainless_steel.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Acciaio inossidabile", - "icon": "firmalife:metal/ingot/stainless_steel", - "category": "tfc:firmalife", - "read_by_default": true, - "pages": [ - { - "type": "patchouli:spotlight", - "item": "gtceu:stainless_steel_ingot", - "title": "Acciaio inossidabile", - "text": "$(thing)Questa pagina serve per sovrascrivere la pagina predefinita di Firmalife per l'acciaio Inossidabile.$(br2)L'Acciaio inossidabile è un materiale di Gregtech sbloccato in $(thing)HV, quindi non è craftabile con attrezzi dell'era primitiva come sarebbe normalmente possibile con Firmalife.$(br)Anche la serra in acciaio inossidabile non è craftabile. Ci dispiace!" - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/bloomery.json index e07f122a4..4bdd799a6 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/bloomery.json @@ -1,80 +1,80 @@ { - "__comment__": "This file was automatically created by mcresources", - "name": "Fucina", - "category": "tfc:mechanics", - "icon": "tfc:bloomery", - "pages": [ - { - "type": "patchouli:text", - "text": "La $(thing)Fucina$() è un dispositivo usato per fondere del$(thing)Minerale di Ferro$() in $(thing)Blumi di Ferro$() che possono essere forgiati in $(thing)Ferro Battuto$(). \nI minerali di ferro sono : $(l:the_world/ores_and_minerals#hematite)Hematite$(), $(l:the_world/ores_and_minerals#limonite)Limonite$(), e $(l:the_world/ores_and_minerals#magnetite)Magnetite$(). Quasti minerali possono essere fusi per creare $(thing)Ghisa$() al posto di $(thing)Ferro Battuto$(). Tutti gli oggetti contenenti ferro, se fusi, daranno Ghisa. Per farli diventare ferro usabile, c'è bisogno della fucina. Ogni oggetto in ferro piò essere usato nella fucina, inclusi attrezzi e lingotti di Ghisa!$(thing)" - }, - { - "type": "patchouli:crafting", - "recipe": "tfc:crafting/bloomery", - "text": "La fucina si crea con 8 $(thing)Doppie Piaste di Bronzo$()." - }, - { - "type": "patchouli:multiblock", - "multiblock_id": "tfc:bloomery", - "name": "Una Fucina", - "text": "Una Fucina di grandezza minima. Il blocco della fucina si può aprire e chiudere con $(item)$(k:key.use)$().", - "enable_visualize": true - }, - { - "type": "patchouli:text", - "text": "La fucina può contenere un massimo di 48 $(thing)Input$(), con 16 item per strato della ciminiera. Per aggiungere strati alla ciminiera, piazza altri 2 strati di blocchi di pietra.$(br2)Per aggiungere oggetti alla fucina, arrampicati su di essa e lancia gli oggetti al suo interno. Una pila di minerale grigio dovrebbe comparire." - }, - { - "type": "patchouli:image", - "images": [ - "tfc:textures/gui/book/tutorial/bloomery_hole.png" - ], - "text": "Aggiungere oggetti alla fucina.", - "border": true - }, - { - "type": "patchouli:text", - "text": "Aggiungere oggetti alla fucina." - }, - { - "type": "patchouli:multiblock", - "multiblock": { - "pattern": [ - [ - "X" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:bloom[layers=8]" - } - }, - "name": "Blocco di Blumi", - "text": "Un grande $(thing)Blumo$().", - "enable_visualize": false - }, - { - "type": "tfc:anvil_recipe", - "recipe": "tfc:anvil/refined_iron_bloom", - "text": "Un $(thing)Blumo di Ferro Grezzo$() deve essere forgiato in una $(l:mechanics/anvils)incudine$() per creare un $(thing)Blumo di Ferro Raffinato$()." - }, - { - "type": "tfc:anvil_recipe", - "recipe": "tfc:anvil/metal/ingot/wrought_iron", - "text": "Un $(thing)Blumi di Ferro Raffinato$() deve essere forgiato in una $(l:mechanics/anvils)incudine$() per creare $(thing)Ferro Battuto$()." - }, - { - "type": "patchouli:text", - "text": "$(li)Se la fucina si ritrova con più oggetti di quanti ne può contenere in base alla sua ciminiera, li sputerà fuori dal davanti.$()$(li)Per riprendere i tuoi oggetti da una fucina che non è accesa, non rompere i blocchi al suo interno. Rompi il blocco principale della fucina.$()$(li)I blumi si fondono solo in ghisa e non in ferro battuto. Devono essere lavorati!$()", - "title": "Note del Fabbro" - } - ], - "read_by_default": true, - "extra_recipe_mappings": { - "tfc:bloom": 6, - "tfc:raw_iron_bloom": 7, - "tfc:refined_iron_bloom": 8 - } + "__comment__": "This file was automatically created by mcresources", + "name": "Fucina", + "category": "tfc:mechanics", + "icon": "tfc:bloomery", + "pages": [ + { + "type": "patchouli:text", + "text": "La $(thing)Fucina$() è un dispositivo usato per fondere del$(thing)Minerale di Ferro$() in $(thing)Blumi di Ferro$() che possono essere forgiati in $(thing)Ferro Battuto$(). \nI minerali di ferro sono : $(l:the_world/ores_and_minerals#hematite)Hematite$(), $(l:the_world/ores_and_minerals#limonite)Limonite$(), e $(l:the_world/ores_and_minerals#magnetite)Magnetite$(). Quasti minerali possono essere fusi per creare $(thing)Ghisa$() al posto di $(thing)Ferro Battuto$(). Tutti gli oggetti contenenti ferro, se fusi, daranno Ghisa. Per farli diventare ferro usabile, c'è bisogno della fucina. Ogni oggetto in ferro piò essere usato nella fucina, inclusi attrezzi e lingotti di Ghisa!$(thing)" + }, + { + "type": "patchouli:crafting", + "recipe": "tfc:crafting/bloomery", + "text": "La fucina si crea con 8 $(thing)Doppie Piaste di Bronzo$()." + }, + { + "type": "patchouli:multiblock", + "multiblock_id": "tfc:bloomery", + "name": "Una Fucina", + "text": "Una Fucina di grandezza minima. Il blocco della fucina si può aprire e chiudere con $(item)$(k:key.use)$().", + "enable_visualize": true + }, + { + "type": "patchouli:text", + "text": "La fucina può contenere un massimo di 48 $(thing)Input$(), con 16 item per strato della ciminiera. Per aggiungere strati alla ciminiera, piazza altri 2 strati di blocchi di pietra.$(br2)Per aggiungere oggetti alla fucina, arrampicati su di essa e lancia gli oggetti al suo interno. Una pila di minerale grigio dovrebbe comparire." + }, + { + "type": "patchouli:image", + "images": [ + "tfc:textures/gui/book/tutorial/bloomery_hole.png" + ], + "text": "Aggiungere oggetti alla fucina.", + "border": true + }, + { + "type": "patchouli:text", + "text": "Aggiungere oggetti alla fucina." + }, + { + "type": "patchouli:multiblock", + "multiblock": { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:bloom[layers=8]" + } + }, + "name": "Blocco di Blumi", + "text": "Un grande $(thing)Blumo$().", + "enable_visualize": false + }, + { + "type": "tfc:anvil_recipe", + "recipe": "tfc:anvil/refined_iron_bloom", + "text": "Un $(thing)Blumo di Ferro Grezzo$() deve essere forgiato in una $(l:mechanics/anvils)incudine$() per creare un $(thing)Blumo di Ferro Raffinato$()." + }, + { + "type": "tfc:anvil_recipe", + "recipe": "tfc:anvil/wrought_iron_from_bloom", + "text": "Un $(thing)Blumi di Ferro Raffinato$() deve essere forgiato in una $(l:mechanics/anvils)incudine$() per creare $(thing)Ferro Battuto$()." + }, + { + "type": "patchouli:text", + "text": "$(li)Se la fucina si ritrova con più oggetti di quanti ne può contenere in base alla sua ciminiera, li sputerà fuori dal davanti.$()$(li)Per riprendere i tuoi oggetti da una fucina che non è accesa, non rompere i blocchi al suo interno. Rompi il blocco principale della fucina.$()$(li)I blumi si fondono solo in ghisa e non in ferro battuto. Devono essere lavorati!$()", + "title": "Note del Fabbro" + } + ], + "read_by_default": true, + "extra_recipe_mappings": { + "tfc:bloom": 6, + "tfc:raw_iron_bloom": 7, + "tfc:refined_iron_bloom": 8 + } } \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking.json b/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking.json deleted file mode 100644 index dc8355c1a..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "name": "Glassworking", - "category": "tfc:mechanics", - "icon": "tfc:silica_glass_bottle", - "pages": [ - { - "type": "patchouli:text", - "text": "Glassworking is the process of turning sand into glass. To start, you must create a $(thing)Glass Batch$(), of which there are four types:$(br)$(br) 1. $(thing)Silica$(), from white sand.$(br) 2. $(thing)Hematitic$(), from yellow, red, or pink sand.$(br) 3. $(thing)Olivine$(), from green or brown sand.$(br) 4. $(thing)Volcanic$(), from black sand." - }, - { - "type": "patchouli:crafting", - "title": "Silica Glass Batch", - "recipe": "tfc:crafting/silica_glass_batch", - "text": "Glass batches can then be crafted using one of the aforementioned colors of sand, plus $(l:mechanics/glassworking#lime)Lime$() and a type of $(l:mechanics/glassworking#potash)Potash$()." - }, - { - "type": "patchouli:smelting", - "anchor": "lime", - "recipe": "tfg:smelting/lime", - "text": "$(thing)Lime$() is one of the ingredients required to make glass batches. It is a powder obtained by $(l:mechanics/heating)heating$() $(l:mechanics/flux)Flux$()." - }, - { - "type": "patchouli:smelting", - "anchor": "potash", - "recipe": "tfg:smelting/dried_seaweed_to_soda", - "recipe2": "tfg:smelting/dried_kelp_to_soda", - "text": "A type of $(thing)Potash$() or equivalent is also required for glass batches. $(thing)Soda Ash$() can be used, which is a powder made from heating $(thing)Dried Seaweed$() or $(thing)Kelp$(). $(l:the_world/ores_and_minerals#saltpeter)Saltpeter$() can be used as well." - }, - { - "type": "patchouli:text", - "text": "Glassworking is done by starting with a glass batch, and then completing a series of steps. These steps may require specific tools:$(br)$(li)A $(l:mechanics/glassworking#blowpipe)Blowpipe$(), to $(thing)Blow$() and $(thing)Stretch$()$(li)A $(l:mechanics/glassworking#paddle)Paddle$(), to $(thing)Flatten$()$(li)$(l:mechanics/glassworking#jacks)Jacks$(), to $(thing)Pinch$()$(li)A $(l:mechanics/glassworking#saw)Gem Saw$(), to $(thing)Saw$()", - "title": "Tools of the Trade" - }, - { - "type": "tfc:knapping_recipe", - "anchor": "blowpipe", - "recipe": "tfc:clay_knapping/blowpipe", - "text": "The most important tool is the $(thing)Blowpipe$(). It can be $(thing)knapped$() from clay, and then fired into a $(thing)Ceramic Blowpipe$()." - }, - { - "type": "tfc:anvil_recipe", - "recipe": "tfc:anvil/blowpipe", - "text": "Ceramic blowpipes are brittle, and have a chance to to break when used. A more sturdy blowpipe can be $(l:mechanics/anvils#working)worked$() from a $(thing)Brass Rod$() on an anvil." - }, - { - "type": "patchouli:crafting", - "anchor": "paddle", - "recipe": "tfc:crafting/paddle", - "text": "The $(thing)Flatten$() operation can be done with a $(thing)Paddle$(), which is crafted from wood." - }, - { - "type": "tfc:welding_recipe", - "anchor": "jacks", - "recipe": "tfc:welding/jacks", - "text": "The $(thing)Pinch$() operation can be done with $(thing)Jacks$(), made from welding two brass rods together." - }, - { - "type": "patchouli:crafting", - "anchor": "saw", - "recipe": "tfc:crafting/gem_saw", - "text": "The $(thing)Saw$() operation can be done with a $(thing)Gem Saw$(). The gem saw is also used to break both $(thing)Glass Blocks$() and $(thing)Glass Panes$() and obtain them." - }, - { - "type": "patchouli:text", - "text": "First, glass on the blowpipe must be heated to $(4)$(bold)Faint Red$(). Then, hold the blowpipe in your $(thing)offhand$() and hold $(item)$(k:key.use)$() to perform each step$().$(br)Use $(item)$(k:key.swapOffhand)$() to pick up a hot blowpipe into your offhand.$(br2)$(bold)Blow$()$(br)Use the $(thing)Blowpipe$() while facing straight ahead.$(br2)$(bold)Stretch$()$(br)Use the $(thing)Blowpipe$() while facing straight down.", - "title": "How to Glass" - }, - { - "type": "patchouli:text", - "text": "$(bold)Flatten$()$(br)Use the $(thing)Blowpipe$() while holding a $(l:mechanics/glassworking#paddle)Paddle$() in your main hand.$(br2)$(bold)Pinch$()$(br)Use the $(thing)Blowpipe$() while holding $(l:mechanics/glassworking#jacks)Jacks$() in your main hand.$(br2)$(bold)Saw$()$(br)Use the $(thing)Blowpipe$() while holding a $(l:mechanics/glassworking#saw)Gem Saw$() in your main hand.$(br2)$(bold)Roll$()$(br)Use the $(thing)Blowpipe$() with a $(l:mechanics/weaving#wool_cloth)Wool Cloth$() in your main hand." - } - ], - "read_by_default": true, - "extra_recipe_mappings": { - "tfc:powder/lime": 2, - "tfc:powder/soda_ash": 3, - "tfc:paddle": 7, - "tfc:jacks": 8, - "tfc:gem_saw": 9 - } -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking_applications.json b/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking_applications.json deleted file mode 100644 index 722a6306a..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking_applications.json +++ /dev/null @@ -1,433 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "name": "Glass Products", - "category": "tfc:mechanics", - "icon": "minecraft:glass", - "pages": [ - { - "type": "patchouli:text", - "text": "The most simple glass products are $(thing)Glass Panes$() and $(thing)Glass Blocks$(). In order to craft them, you must start with a $(l:mechanics/glassworking#blowpipe)Blowpipe$() with a $(thing)Glass Batch$(), and then perform a $(thing)Pour$().$(br)$(li)$(bold)Table Pours$() are used to create $(thing)Glass Panes$()$(li)$(bold)Basin Pours$() are used to create $(thing)Glass Blocks$()" - }, - { - "type": "patchouli:text", - "text": "Glass can also be $(thing)dyed$() before it is poured to create colored glass. The color is dependent on the type of glass batch, and any powders that have been added.$(br2)Each type of $(thing)Glass Batch$() has a different natural color of glass that they will create. $(thing)Silica$() glass batches can be made into many colors, $(thing)Olivine$(), and $(thing)Volcanic$() glass can be made into relatively few colors." - }, - { - "type": "patchouli:text", - "text": "$(thing)Glass Panes$() are made with a $(thing)Table Pour$(). A pouring table is made by placing up to sixteen $(thing)Kaolin Clay Blocks$() or $(thing)Brass Blocks$() in a continuous area.$(br2) 1. Add a $(l:mechanics/glassworking)Glass Batch$() to a $(thing)Blowpipe$().$(br) 2. Heat the blowpipe to $(4)$(bold)Faint Red$().$(br) 3. $()$(item)$(k:key.use)$() the $(thing)Blowpipe$() on the top of the table.$(br) 4. Finally $(item)$(k:key.use)$() with a $(l:mechanics/glassworking#paddle)Paddle$() to flatten the glass.", - "title": "Table Pour" - }, - { - "type": "patchouli:multiblock", - "multiblock": { - "mapping": { - "C": "#tfc:glass_pouring_table", - "0": "#tfc:glass_pouring_table" - }, - "pattern": [ - [ - "CCCC", - "CCC0", - "CCCC", - "CCCC" - ] - ] - }, - "text": "Once the glass is cooled, it can be broken with a $(l:mechanics/glassworking#saw)Gem Saw$() to obtain.", - "border": true - }, - { - "type": "patchouli:text", - "text": "$(thing)Glass Blocks$() are made with a $(thing)Basin Pour$(). A basin is made by surrounding all sides of an air block except the top with $(thing)Kaolin Clay Blocks$() or $(thing)Brass Blocks$().$(br2) 1. Add a $(l:mechanics/glassworking)Glass Batch$() to a $(thing)Blowpipe$().$(br) 2. Heat the blowpipe to $(4)$(bold)Faint Red$().$(br) 3. $(item)$(k:key.use)$() the $(thing)Blowpipe$() on the top of the table.", - "title": "Basin Pour" - }, - { - "type": "patchouli:multiblock", - "multiblock": { - "mapping": { - "C": "#tfc:glass_basin_blocks", - "0": "#tfc:glass_basin_blocks" - }, - "pattern": [ - [ - " C ", - "C C", - " C " - ], - [ - " ", - " 0 ", - " " - ] - ] - }, - "text": "Once the glass is cooled, it can be broken with a $(l:mechanics/glassworking#saw)Gem Saw$() to obtain.", - "border": true - }, - { - "type": "patchouli:text", - "anchor": "coloring", - "text": "Glass has a natural color based on the type of $(l:mechanics/glassworking)Glass Batch$() that was used. Other colors can be made using a $(l:mechanics/bowls)Bowl$().$(br2)To use, place the $(l:mechanics/bowls)Bowl$() on the ground, then $(item)$(k:key.use)$() the required $(thing)Powder$(). Before $(thing)Pouring$(), use the $(thing)Blowpipe$() on the bowl to add the powder to the batch.", - "title": "Coloring Glass" - }, - { - "type": "patchouli:text", - "text": "$(br2)The next pages show the different combinations of glass types and powder materials to create each color." - }, - { - "type": "patchouli:text", - "text": "$(li)$(bold)$(7)White$(): Silica or Hematitic Glass + $(thing)Soda Ash$()$(li)$(bold)$(0)Black$(): Any Glass + $(thing)Graphite$()$(li)$(bold)$(8)Gray$(): Any + $(thing)Graphite$() + $(thing)Soda Ash$()$(li)$(bold)$(7)Light Gray$(): Any + $(thing)Graphite$() + 2x $(thing)Soda Ash$()$(li)$(bold)$(5)Purple$(): Any + $(thing)Iron$() + $(thing)Copper$()$(li)$(bold)$(#964b00)Brown$(): Any + $(thing)Nickel$()$(li)$(bold)$(3)Cyan$(): Non-Volcanic Glass + $(thing)Copper$() + $(thing)Sapphire$()$(li)$(bold)$(2)Green$(): Silica or Hematitic Glass + $(thing)Iron$()", - "title": "Dye Colors" - }, - { - "type": "patchouli:text", - "text": "$(li)$(bold)$(a)Lime$(): Silica or Hematitic Glass + $(thing)Iron$() + $(thing)Soda Ash$()$(li)$(bold)$(b)Light Blue$(): Silica Glass + $(thing)Lapis Lazuli$()$(li)$(bold)$(1)Blue$(): Silica Glass + $(thing)Copper$()$(li)$(bold)$(4)Red$(): Silica or Hematitic Glass + $(thing)Tin$()$(li)$(bold)$(6)Yellow$(): Silica or Hematitic Glass + $(thing)Silver$()$(li)$(bold)$(#ef8e38)Orange$(): Silica Glass + $(thing)Pyrite$()$(li)$(bold)$(5)Magenta$(): Silica or Hematitic Glass + $(thing)Ruby$()$(li)$(bold)$(d)Pink$(): Silica Glass + $(thing)Gold$()$(li)$(bold)$(0)Tinted$(): Non-Silica Glass + $(thing)Amethyst$()" - }, - { - "type": "tfc:table_small", - "strings": [ - { - "text": "" - }, - { - "text": "C" - }, - { - "text": "T" - }, - { - "fill": "0xff42f2" - }, - { - "fill": "0x8af3ff" - }, - { - "fill": "0x526cff" - }, - { - "fill": "0xe3e3e3" - }, - { - "fill": "0xe69407" - }, - { - "fill": "0xc738c9" - }, - { - "fill": "0xffe81c" - }, - { - "fill": "0x48ff1f" - }, - { - "fill": "0xe01414" - }, - { - "fill": "0x0c9400" - }, - { - "fill": "0x188a9e" - }, - { - "fill": "0x7d4f00" - }, - { - "fill": "0x6e059c" - }, - { - "fill": "0x7d7d7d" - }, - { - "fill": "0xbdbdbd" - }, - { - "fill": "0x000000" - }, - { - "text": "Silica" - }, - { - "fill": "0x3d42a8" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "text": "Hematitic" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3d42a8" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "text": "Olivine" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0x3d42a8" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "text": "Volcanic" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0x3d42a8" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0xb33e3e" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - }, - { - "fill": "0x3eb340" - } - ], - "text": "The availability of glass colors. 'C' is clear, 'T' is tinted. Colors can only be crafted with certain glass batches.", - "title": "Glass Color Availability", - "legend": [ - { - "text": "Can be Crafted", - "color": "0x3eb340" - }, - { - "text": "Cannot be Crafted", - "color": "0xb33e3e" - }, - { - "text": "Default Color", - "color": "0x3d42a8" - } - ], - "columns": 18, - "first_column_width": 35, - "column_width": 10, - "row_height": 10, - "left_buffer": 5, - "top_buffer": 15, - "draw_background": true - }, - { - "type": "patchouli:empty", - "draw_filler": false - }, - { - "type": "tfc:glassworking_recipe", - "anchor": "lamp_glass", - "recipe": "tfc:glassworking/lamp_glass", - "text": "$(thing)Lamp Glass$() is a necessary component to craft $(l:mechanics/lamps)Lamps$()." - }, - { - "type": "tfc:glassworking_recipe", - "anchor": "jar", - "recipe": "tfc:glassworking/empty_jar", - "text": "$(l:mechanics/jarring)Jars$() are also made from blown glass, but only silica or hematitic glass." - }, - { - "type": "tfc:glassworking_recipe", - "anchor": "glass_bottle", - "recipe": "tfc:glassworking/silica_glass_bottle", - "text": "$(thing)Glass Bottles$() can also be made. The quality of the glass bottle depends on the type of glass used to make it." - }, - { - "type": "tfc:glassworking_recipe", - "recipe": "tfc:glassworking/lens", - "text": "The $(thing)Lens$() is used for crafting the spyglass, compasses, and other things." - } - ], - "read_by_default": true, - "extra_recipe_mappings": { - "tag:tfc:glass_batches": 1, - "tag:c:glass_panes": 2, - "tag:c:glass_blocks": 4 - } -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/mechanical_power.json b/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/mechanical_power.json deleted file mode 100644 index 4a95e5010..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/mechanical_power.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "Basic Automation", - "category": "tfc:mechanics", - "icon": "gtceu:coke_oven", - "pages": [ - { - "type": "patchouli:text", - "title": "Basic Automation", - "text": "Tired of making charcoal in huge pits? Once you've got $(l:mechanics/bloomery)Wrought Iron$(), you'll be able to make your first GregTech multiblock, the $(item)Coke Oven$().$(br)It will turn logs into $(thing)charcoal$() automatically, as well as upgrade any $(thing)Coal$() into $(thing)Coke$() which burns twice as long in a $(l:mechanics/charcoal_forge)Forge$().$(br)All recipes output $(thing)Creosote$(), which can be used as a lamp fuel and is required for $(l:mechanics/pumps)Create$()." - }, - { - "type": "patchouli:spotlight", - "title": "Coke Oven", - "item": "gtceu:coke_oven,gtceu:coke_oven_bricks,gtceu:coke_oven_hatch", - "text": "Use JEI for a multiblock preview by looking at the $(thing)Coke Oven$() and pressing $(item)$(k:jei.showUses)$(). You can click individual blocks to see what's valid there.$(br2)Note that the center is hollow, and up to 5 $(thing)Coke Oven Hatches$() can be placed anywhere instead of bricks." - }, - { - "type": "patchouli:spotlight", - "item": "gtceu:tin_small_item_pipe", - "title": "Item Pipes", - "text": "Hatches will automatically pull items into them and push fluids and items out, so you can put $(l:mechanics/crankshaft#crates)Crates$(), $(l:mechanics/crankshaft#drums)Drums$(), and $(l:mechanics/barrels)Barrels$() right up against them, but if you'd like to have more control, you'll want to use GregTech's pipes.$(br2)$(item)Item Pipes$() will not pull from any inventory they're attached to, so you'll want to use a $(thing)Chute$() or $(thing)Hopper$() to pull from the inventory and push into the pipe." - }, - { - "type": "patchouli:text", - "text": "Different tiers of pipes will move different amounts of items, but the cheapest to start with is the $(item)Small Tin Item Pipe$().$(br2)Item pipes move items instantly, prioritizing closest inventories first. You can make pipes one-way by $(thing)Sneak-Right-Clicking$() them with a $(thing)Wrench$() and en empty offhand.$(br2)You can also control how items move with $(thing)Item Filters$(), $(thing)Item Tag Filters$(), and $(thing)Restricted Item Pipes$()." - }, - { - "type": "patchouli:spotlight", - "item": "gtceu:wood_normal_fluid_pipe,gtceu:bronze_normal_fluid_pipe", - "title": "Fluid Pipes", - "text": "$(item)Fluid Pipes$() unsurprisingly are for moving fluids. Unlike item pipes, fluid pipes do not move fluids instantly, and will \"slosh\" back and forth, so it's a good idea to make them all one-way by $(thing)Sneak-Right-Clicking$() with a $(thing)Wrench$() and an empty offhand." - }, - { - "type": "patchouli:text", - "text": "Different kinds of pipes can hold different things. $(thing)Wooden pipes$() can't hold gases, for example, and will burn if you try to put something hot in them. Other metal pipes like $(thing)Bronze$() can handle some hot things like Steam and Lava, but not acids.$(br2)Hold shift over a fluid pipe to see what it can handle." - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/pumps.json b/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/pumps.json deleted file mode 100644 index 3b6828175..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/pumps.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "Getting Started With Create", - "category": "tfc:mechanics", - "icon": "create:cogwheel", - "pages": [ - { - "type": "patchouli:text", - "title": "Getting Started With Create", - "text": "In TerraFirmaGreg, TFC's own mechanical power system has been replaced with $(thing)Create$().$(br2)You can make a few Create things once you have Wrought Iron, but you can only really get started once you have access to $(l:mechanics/steel)Steel$() and $(thing)Steam Machines$().$(br2)First, you will need a source of $(thing)Mechanical Power$(), either Water Wheels, Windmills, or a Steam Engine. Of these, $(thing)Water Wheels$() are the easiest to start with, just put them in a river!$(br)" - }, - { - "type": "patchouli:crafting", - "recipe": "create:crafting/kinetics/water_wheel", - "recipe2": "create:crafting/kinetics/large_water_wheel" - }, - { - "type": "tfc:sealed_barrel_recipe", - "recipe": "tfg:barrel/treated_wood_planks", - "text": "To move mechanical power around, you will need $(thing)Cogwheels$().$(br)To make these, first put some $(l:mechanics/mechanical_power)Creosote$() and any $(thing)Wooden Planks$() in a $(l:mechanics/barrels)Sealed Barrel$().$(br)This will give you $(thing)Creosote-Treated Wood Planks$()." - }, - { - "type": "patchouli:spotlight", - "title": "Treated Wood Pulp", - "item": "gtceu:hp_steam_macerator,gtceu:treated_wood_dust", - "text": "Next, put those treated planks in a $(thing)Steam Macerator$(). This will produce $(thing)Treated Wood Pulp$()." - }, - { - "type": "patchouli:spotlight", - "title": "Treated Wood Plank", - "item": "gtceu:hp_steam_compressor,gtceu:treated_wood_plate", - "text": "Lastly, putting the pulp into a $(thing)Steam Compressor$() will produce a $(thing)Treated Wood Plank$().$(br2)You can then use these to craft $(item)Cogwheels$()!" - }, - { - "type": "patchouli:crafting", - "recipe": "tfg:create/shapeless/cogwheel", - "recipe2": "tfg:create/shaped/large_cogwheel" - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/crankshaft.json b/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/tfg_tips/inventory_management.json similarity index 99% rename from kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/crankshaft.json rename to kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/tfg_tips/inventory_management.json index e1291bc19..6fd181bab 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/crankshaft.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/tfg_tips/inventory_management.json @@ -1,6 +1,6 @@ { "name": "Gestione dell'inventario", - "category": "tfc:mechanics", + "category": "tfc:tfg_tips", "icon": "minecraft:chest", "pages": [ { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/stainless_steel.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/stainless_steel.json deleted file mode 100644 index 8bc328e78..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/stainless_steel.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Нержавеющая сталь", - "icon": "firmalife:metal/ingot/stainless_steel", - "category": "tfc:firmalife", - "read_by_default": true, - "pages": [ - { - "type": "patchouli:spotlight", - "item": "gtceu:stainless_steel_ingot", - "title": "Нержавеющая сталь", - "text": "Эта страница не используется.$(br2)Нержавеющая сталь - Грегтеховский материал $(thing)HV$(), поэтому в примитивной эре он не создаётся.$(br)Теплицу из нержавеющей стали так же сделать невозможно, приносим свои извинения!" - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/getting_started/introduction.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/getting_started/introduction.json index 42ceb48bb..2caeb823a 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/getting_started/introduction.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/getting_started/introduction.json @@ -69,7 +69,7 @@ }, { "type": "patchouli:crafting", - "recipe": "tfc:crafting/stone/knife_sedimentary", + "recipe": "gtceu:shaped/knife_stone", "text": "Все головки каменных инструментов можно собрать с палкой или веткой, чтобы собрать их в инструмент.$(br2)Каменный нож можно использовать для сбора $(thing)Соломы$(), разбивая растения." }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/crops.json index d1bfdd6c1..f329b87d4 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/crops.json @@ -14,17 +14,16 @@ }, { "type": "tfc:rock_knapping_recipe", - "recipes": [ - "tfc:rock_knapping/hoe_head_sedimentary", - "tfc:rock_knapping/hoe_head_metamorphic", - "tfc:rock_knapping/hoe_head_igneous_extrusive", - "tfc:rock_knapping/hoe_head_igneous_intrusive" - ], + "recipes": [ + "tfg:rock_knapping/stone_hoe_head", + "tfg:rock_knapping/stone_hoe_head_1", + "tfg:rock_knapping/stone_hoe_head_2" + ], "text": "Чтобы начать, $(thing)Каменную мотыгу$() можно $(thing)выколотить$(), как показано выше." }, { "type": "patchouli:crafting", - "recipe": "tfc:crafting/stone/hoe_sedimentary", + "recipe": "gtceu:shaped/hoe_stone", "text": "После того как головка мотыги выколота, ее можно скрафтить в мотыгу.$(br2)Мотыги работают как в ванили, позволяя правым кликом превращать блоки земли в $(thing)пашню$(). Они также могут использоваться для превращения $(thing)корнистой земли$() в обычную $(thing)землю$()." }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/decay.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/decay.json index 29b562a0b..5eb36d1fc 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/decay.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/decay.json @@ -56,7 +56,7 @@ }, { "type": "tfc:quern_recipe", - "recipe": "tfc:quern/salt", + "recipe": "tfg:quern/salt_powder", "text": "Один из способов получить соль - это $(l:mechanics/quern)измельчение$() $(l:the_world/ores_and_minerals#halite)галита$(), который является минералом." }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/pumps.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/pumps.json deleted file mode 100644 index c324cac67..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/pumps.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "Первые шаги с модом Create", - "category": "tfc:mechanics", - "icon": "create:cogwheel", - "pages": - [ - { - "type": "patchouli:text", - "title": "Первые шаги с модом Create", - "text": "В TFG, кинетика мода TFC упразднена в пользу мода $(thing)Create$().$(br2)Кованое железо даёт доступ к небольшой части мода, однако полноценно к нему приступить получится только по получению $(l:mechanics/steel)Стали$() и $(thing)Паровых машин$().$(br2)Перво-наперво вам потребуется $(thing)Механическая энергия$()- водяное колесо, ветряная мельница или паровой двигатель. Самое просто из трёх - это $(thing)Водяное колесо$(), его достаточно просто поставить над рекой и вуаля!$(br)" - }, - { - "type": "patchouli:crafting", - "recipe": "create:crafting/kinetics/water_wheel", - "recipe2": "create:crafting/kinetics/large_water_wheel" - }, - { - "type": "tfc:sealed_barrel_recipe", - "recipe": "tfg:barrel/treated_wood_planks", - "text": "Для передачи кинетической энергии используют $(thing)Шестерни$().$(br)Чтобы их сделать, необходим $(l:mechanics/mechanical_power)Креозот$() и любые $(thing)Доски$(), запечатанные в $(l:mechanics/barrels)Бочке из TFC$().$(br)Через 8 минут вас будут ждать $(thing)Доски из обработанного креозотом дерева$()." - }, - { - "type": "patchouli:spotlight", - "title": "Кучка обработанной древесной массы", - "item": "gtceu:hp_steam_macerator,gtceu:treated_wood_dust", - "text": "После этого, доски необходимо измельчить в $(thing)Паровом измельчителе$()." - }, - { - "type": "patchouli:spotlight", - "title": "Обработанная доска", - "item": "gtceu:hp_steam_compressor,gtceu:treated_wood_plate", - "text": "И, наконец, положив эту кучку в $(thing)Паровой компрессор$(), вы получите сами $(thing)обработанные доски$().$(br2)И уже с их помощью можно создавать $(item)Шестерни$()!" - }, - { - "type": "patchouli:crafting", - "recipe": "tfg:create/shapeless/cogwheel", - "recipe2": "tfg:create/shaped/large_cogwheel" - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/mechanical_power.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/basic_automation.json similarity index 99% rename from kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/mechanical_power.json rename to kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/basic_automation.json index b98fb7845..40485166c 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/mechanical_power.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/basic_automation.json @@ -1,6 +1,6 @@ { "name": "Примитивная автоматизация", - "category": "tfc:mechanics", + "category": "tfc:tfg_tips", "icon": "gtceu:coke_oven", "pages": [ diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/crankshaft.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/inventory_management.json similarity index 99% rename from kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/crankshaft.json rename to kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/inventory_management.json index b7333b70d..68ddb6fa9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/crankshaft.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/inventory_management.json @@ -1,6 +1,6 @@ { "name": "Хранение предметов", - "category": "tfc:mechanics", + "category": "tfc:tfg_tips", "icon": "minecraft:chest", "pages": [ diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/firmalife/stainless_steel.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/firmalife/stainless_steel.json deleted file mode 100644 index 22772126a..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/firmalife/stainless_steel.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Нержавіюча сталь", - "icon": "firmalife:metal/ingot/stainless_steel", - "category": "tfc:firmalife", - "read_by_default": true, - "pages": [ - { - "type": "patchouli:spotlight", - "item": "gtceu:stainless_steel_ingot", - "title": "Нержавіюча сталь", - "text": "Ця сторінка замінює сторінку Firmalife з нержавіючої сталі за замовчуванням.$(br2)Нержавіюча сталь - це матеріал GregTech $(thing)HV$(), тому її неможливо виготовити за допомогою примітивних інструментів, як це зазвичай робиться з Firmalife.$(br)Теплицю з нержавіючої сталі також неможливо виготовити. Вибачте!" - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/getting_started/introduction.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/getting_started/introduction.json index da5fa72e9..ee79724f5 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/getting_started/introduction.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/getting_started/introduction.json @@ -69,7 +69,7 @@ }, { "type": "patchouli:crafting", - "recipe": "tfc:crafting/stone/knife_sedimentary", + "recipe": "gtceu:shaped/knife_stone", "text": "До леза або кам’яної головки інструменту треба додати палицю або гілку, щоб отримати готовий інструмент.$(br2)Кам'яний ніж можна використовувати для збору $(thing)соломи$(), просто зрізавши траву ножем." }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/bloomery.json index 22bbec9f6..d71bce84d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/bloomery.json @@ -1,80 +1,80 @@ { - "__comment__": "This file was automatically created by mcresources", - "name": "Сиродутне горно", - "category": "tfc:mechanics", - "icon": "tfc:bloomery", - "pages": [ - { - "type": "patchouli:text", - "text": "$(thing)Сиродутне Горно$() це пристрій, що використовується для переплавлення $(thing)Залізної Руди$() на $(thing)Крицю$(), які можна переробити на $(thing)Ковке Залізо$(). Залізні руди - це $(l:the_world/ores_and_minerals#hematite)Гематит$(), $(l:the_world/ores_and_minerals#limonite)Лимоніт$(), та $(l:the_world/ores_and_minerals#magnetite)Магнетит$(). Ці руди плавляться на $(thing)Чавун$() а не на $(thing)Ковке Залізо$(). Усі залізовмісні предмети плавляться на чавун. Щоб перетворити їх на придатне для використання залізо, потрібна ковальська майстерня. Будь-який залізний предмет може бути використаний в сиродутному горні, включаючи залізні інструменти і чавунні злитки!" - }, - { - "type": "patchouli:crafting", - "recipe": "tfc:crafting/bloomery", - "text": "Сиродутне горно зроблене з 8 $(thing)Бронзових Подвійних Листів$()." - }, - { - "type": "patchouli:multiblock", - "multiblock_id": "tfc:bloomery", - "name": "Сиродутне горно", - "text": "Мінімальний розмір сиродутного горна. Блок сиродутного горна буде відкриватися і закриватися за допомогою $(item)$(k:key.use)$().", - "enable_visualize": true - }, - { - "type": "patchouli:text", - "text": "Сиродутне горно може містити максимум 48 $(thing)Вхідних$(), по 16 предметів на один шар димаря. Щоб додати шари до димаря, викладіть ще два шари кам'яних блоків.$(br2)Щоб додати предмети до сиродутного горна, підніміться на вершину і кидайте предмети всередину. Повинна утворитися вежа з сірої руди." - }, - { - "type": "patchouli:image", - "images": [ - "tfc:textures/gui/book/tutorial/bloomery_hole.png" - ], - "text": "Додавання елементів до сиродутного горна.", - "border": true - }, - { - "type": "patchouli:text", - "text": "На виробництво однієї $(thing)Криці$() витрачається $(thing)1 Деревинне Вугілля$() та $(thing)144 mB Чавуну$(). Після того, як ви заповнили сирудутне горно комбінацією $(thing)Деревинне Вугілля$() та $(thing)Руди$(), запаліть блок сиродутного горна і зачекайте 15 годин, поки руда розплавиться. Коли піч вимкнеться, вона залишить по собі блок $(thing)Криці$(). Він містить $(thing)Сире Кричне Залізо$(), який можна отримати, видобуваючи блок $(thing)Крицю$() кілька разів киркою." - }, - { - "type": "patchouli:multiblock", - "multiblock": { - "pattern": [ - [ - "X" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:bloom[layers=8]" - } - }, - "name": "Блок Криці", - "text": "Велика $(thing)Криця$().", - "enable_visualize": false - }, - { - "type": "tfc:anvil_recipe", - "recipe": "tfc:anvil/refined_iron_bloom", - "text": "Щоб перетворити $(thing)Сире Кричне Залізо$(), потрібно обробити її на $(l:mechanics/anvils)ковадлі$() щоб отримати $(thing)Очищену Залізну Крицю$()." - }, - { - "type": "tfc:anvil_recipe", - "recipe": "tfc:anvil/metal/ingot/wrought_iron", - "text": "Щоб перетворити $(thing)Очищену Залізну Крицю $() потрібно обробити її на $(l:mechanics/anvils)ковадлі$() щоб отримати $(thing)Злитки Ковкого Заліза$()." - }, - { - "type": "patchouli:text", - "text": "$(li)Якщо у сиродутному горні виявиться більше предметів, ніж може вмістити її димар, вона спробує виплюнути їх назовні.$()$(li)Щоб дістати предмети з сиродутного горна, яка не горить, не розбивайте вежу з розплавлених блоків. Розбийте блок сиродутного горна.$()$(li)Криця переплавляється лише на чавун, а не на коване залізо. З ними треба працювати!$()", - "title": "Нотатки Сміта" - } - ], - "read_by_default": true, - "extra_recipe_mappings": { - "tfc:bloom": 6, - "tfc:raw_iron_bloom": 7, - "tfc:refined_iron_bloom": 8 - } + "__comment__": "This file was automatically created by mcresources", + "name": "Сиродутне горно", + "category": "tfc:mechanics", + "icon": "tfc:bloomery", + "pages": [ + { + "type": "patchouli:text", + "text": "$(thing)Сиродутне Горно$() це пристрій, що використовується для переплавлення $(thing)Залізної Руди$() на $(thing)Крицю$(), які можна переробити на $(thing)Ковке Залізо$(). Залізні руди - це $(l:the_world/ores_and_minerals#hematite)Гематит$(), $(l:the_world/ores_and_minerals#limonite)Лимоніт$(), та $(l:the_world/ores_and_minerals#magnetite)Магнетит$(). Ці руди плавляться на $(thing)Чавун$() а не на $(thing)Ковке Залізо$(). Усі залізовмісні предмети плавляться на чавун. Щоб перетворити їх на придатне для використання залізо, потрібна ковальська майстерня. Будь-який залізний предмет може бути використаний в сиродутному горні, включаючи залізні інструменти і чавунні злитки!" + }, + { + "type": "patchouli:crafting", + "recipe": "tfc:crafting/bloomery", + "text": "Сиродутне горно зроблене з 8 $(thing)Бронзових Подвійних Листів$()." + }, + { + "type": "patchouli:multiblock", + "multiblock_id": "tfc:bloomery", + "name": "Сиродутне горно", + "text": "Мінімальний розмір сиродутного горна. Блок сиродутного горна буде відкриватися і закриватися за допомогою $(item)$(k:key.use)$().", + "enable_visualize": true + }, + { + "type": "patchouli:text", + "text": "Сиродутне горно може містити максимум 48 $(thing)Вхідних$(), по 16 предметів на один шар димаря. Щоб додати шари до димаря, викладіть ще два шари кам'яних блоків.$(br2)Щоб додати предмети до сиродутного горна, підніміться на вершину і кидайте предмети всередину. Повинна утворитися вежа з сірої руди." + }, + { + "type": "patchouli:image", + "images": [ + "tfc:textures/gui/book/tutorial/bloomery_hole.png" + ], + "text": "Додавання елементів до сиродутного горна.", + "border": true + }, + { + "type": "patchouli:text", + "text": "На виробництво однієї $(thing)Криці$() витрачається $(thing)1 Деревинне Вугілля$() та $(thing)144 mB Чавуну$(). Після того, як ви заповнили сирудутне горно комбінацією $(thing)Деревинне Вугілля$() та $(thing)Руди$(), запаліть блок сиродутного горна і зачекайте 15 годин, поки руда розплавиться. Коли піч вимкнеться, вона залишить по собі блок $(thing)Криці$(). Він містить $(thing)Сире Кричне Залізо$(), який можна отримати, видобуваючи блок $(thing)Крицю$() кілька разів киркою." + }, + { + "type": "patchouli:multiblock", + "multiblock": { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:bloom[layers=8]" + } + }, + "name": "Блок Криці", + "text": "Велика $(thing)Криця$().", + "enable_visualize": false + }, + { + "type": "tfc:anvil_recipe", + "recipe": "tfc:anvil/refined_iron_bloom", + "text": "Щоб перетворити $(thing)Сире Кричне Залізо$(), потрібно обробити її на $(l:mechanics/anvils)ковадлі$() щоб отримати $(thing)Очищену Залізну Крицю$()." + }, + { + "type": "tfc:anvil_recipe", + "recipe": "tfc:anvil/wrought_iron_from_bloom", + "text": "Щоб перетворити $(thing)Очищену Залізну Крицю $() потрібно обробити її на $(l:mechanics/anvils)ковадлі$() щоб отримати $(thing)Злитки Ковкого Заліза$()." + }, + { + "type": "patchouli:text", + "text": "$(li)Якщо у сиродутному горні виявиться більше предметів, ніж може вмістити її димар, вона спробує виплюнути їх назовні.$()$(li)Щоб дістати предмети з сиродутного горна, яка не горить, не розбивайте вежу з розплавлених блоків. Розбийте блок сиродутного горна.$()$(li)Криця переплавляється лише на чавун, а не на коване залізо. З ними треба працювати!$()", + "title": "Нотатки Сміта" + } + ], + "read_by_default": true, + "extra_recipe_mappings": { + "tfc:bloom": 6, + "tfc:raw_iron_bloom": 7, + "tfc:refined_iron_bloom": 8 + } } \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/pumps.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/pumps.json deleted file mode 100644 index dfc89b1ee..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/pumps.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "Початок роботи з Create", - "category": "tfc:mechanics", - "icon": "create:cogwheel", - "pages": [ - { - "type": "patchouli:text", - "title": "Початок роботи з Create", - "text": "У TerraFirmaGreg власну механічну систему TFC замінено на $(thing)Create$().$(br2)Ви можете створити кілька речей Create, коли у вас є Коване залізо, але по-справжньому почати можна лише тоді, коли у вас є доступ до $(l:mechanics/steel)Сталі$() і $(thing)Парових Машин$().$(br2)По-перше, вам знадобиться джерело $(thing)Механічної енергії$(), Водяні колеса, Вітряки або Парова машина. З них найпростіше почати з $(thing)Водяних Коліс$(), просто помістіть їх у річку!$(br)" - }, - { - "type": "patchouli:crafting", - "recipe": "create:crafting/kinetics/water_wheel", - "recipe2": "create:crafting/kinetics/large_water_wheel" - }, - { - "type": "tfc:sealed_barrel_recipe", - "recipe": "tfg:barrel/treated_wood_planks", - "text": "Для переміщення механічної енергії вам знадобляться $(thing)Зубчасті колеса$().$(br)Щоб виготовити їх, спочатку покладіть трохи $(l:mechanics/mechanical_power)Креозота$() та Будь-які $(thing)Дерев'яні Дошки$() в $(l:mechanics/barrels)Герметичну Діжку$().$(br)Це дасть вам $(thing)Дерев'яні Дошки, Оброблені Креозотом$()." - }, - { - "type": "patchouli:spotlight", - "title": "Оброблена деревна целюлоза", - "item": "gtceu:hp_steam_macerator,gtceu:treated_wood_dust", - "text": "Далі покладіть оброблені дошки в $(thing)Паровий Подрібнювач$(). результаті ви отримаєте $(thing)Оброблену деревну целюлозу$()." - }, - { - "type": "patchouli:spotlight", - "title": "Оброблена дерев'яна дошка", - "item": "gtceu:hp_steam_compressor,gtceu:treated_wood_plate", - "text": "Нарешті, помістивши целюлозу у $(thing)Паровий Компресор$(), ви отримаєте$(thing)Оброблену дерев'яну дошку$().$(br2)Потім ви можете використати її для виготовлення $(item)Шестерні$()!" - }, - { - "type": "patchouli:crafting", - "recipe": "tfg:create/shapeless/cogwheel", - "recipe2": "tfg:create/shaped/large_cogwheel" - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/mechanical_power.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/basic_automation.json similarity index 99% rename from kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/mechanical_power.json rename to kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/basic_automation.json index 4e6f17dd1..70416896e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/mechanical_power.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/basic_automation.json @@ -1,6 +1,6 @@ { "name": "Базова автоматизація", - "category": "tfc:mechanics", + "category": "tfc:tfg_tips", "icon": "gtceu:coke_oven", "pages": [ { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/crankshaft.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/inventory_management.json similarity index 99% rename from kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/crankshaft.json rename to kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/inventory_management.json index 69b1a1794..6d2e3a048 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/crankshaft.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/inventory_management.json @@ -1,6 +1,6 @@ { "name": "Управління Інвентарем", - "category": "tfc:mechanics", + "category": "tfc:tfg_tips", "icon": "minecraft:chest", "pages": [ { From 764ca6f5ff6ed337e193507a056c127cd1aa4618 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 23:53:19 +0100 Subject: [PATCH 28/95] forgot this side of the plated block exploit --- kubejs/server_scripts/gregtech/utility.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index 6b07372c3..6460e509f 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -122,13 +122,13 @@ function generatePlatedBlockRecipe(event, material) { } event.recipes.gtceu.macerator(`tfg:${material.getName()}_plated_slab`) .itemInputs(platedSlab) - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, material, 1), 'gtceu:small_stone_dust') + .itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, material, 2), 'gtceu:small_stone_dust') .duration(material.getMass()) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.arc_furnace(`tfg:${material.getName()}_plated_slab`) .itemInputs(platedSlab) - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, material, 1), 'gtceu:small_ash_dust') + .itemOutputs(ChemicalHelper.get(TagPrefix.nugget, material, 4), 'gtceu:small_ash_dust') .duration(material.getMass()) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) From 8d934c713512a2a9d82db7045c2b051b0c67db87 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 00:04:39 +0100 Subject: [PATCH 29/95] made the confier rosin recipe less tedious in a pot --- kubejs/server_scripts/tfg/recipes.miscellaneous.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index f59886b12..ccb690ef0 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -39,7 +39,7 @@ function registerTFGMiscellaneousRecipes(event) { .outputItem('tfg:conifer_rosin') .id('tfg:vat/conifer_pitch_to_rosin'); - event.recipes.tfc.pot('tfc:powder/charcoal', Fluid.of('tfg:conifer_pitch', 1000), 5000, 300) + event.recipes.tfc.pot('tfc:powder/charcoal', Fluid.of('tfg:conifer_pitch', 1000), 1200, 300) .itemOutput('tfg:conifer_rosin') .id('tfg:pot/conifer_pitch_to_rosin') From 918f3ce7e528f4c90217f7bff58ae7fb206598f4 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 00:04:57 +0100 Subject: [PATCH 30/95] fixed butchery knife recipe mixup --- kubejs/server_scripts/tfc/recipes.materials.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 0ff8fd95c..ef4f82008 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -360,7 +360,7 @@ function registerTFCMaterialsRecipes(event) { } - let butcheryKnifeHeadItem = ChemicalHelper.get(TFGTagPrefix.toolHeadKnife, material, 1) + let butcheryKnifeHeadItem = ChemicalHelper.get(TFGTagPrefix.toolHeadButcheryKnife, material, 1) if (!butcheryKnifeHeadItem.isEmpty()) { // Декрафт оголовья в жидкость From bf0d05a63307e0fc29fa4750c3d45fe87cda40f6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 01:05:34 +0100 Subject: [PATCH 31/95] apparently iron tools need to exist otherwise GTM shits itself --- kubejs/startup_scripts/gtceu/materials.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index d78392041..4f6f66f12 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -217,6 +217,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BismuthBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.5, 2.0, 178, 2, metalTooling).build()); GTMaterials.BlackBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(3.3, 2.0, 204, 2, metalTooling).build()); GTMaterials.BlackSteel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(6.5, 4.5, 1228, 3, metalTooling).build()); + // Cast iron tools don't make sense but gregtech shits itself if they're missing, + // so I'm just giving them terrible terrible stats + GTMaterials.Iron.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(1.0, 1.0, 100, 2, metalTooling).build()); for (var material of GTCEuAPI.materialManager.getRegisteredMaterials()) { var toolProperty = material.getProperty(PropertyKey.TOOL); From 175c1582649fc56f991316f302075d8482f77813 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 01:24:25 +0100 Subject: [PATCH 32/95] added some recipes to craft gt's marble --- kubejs/server_scripts/gregtech/recipes.js | 13 +++++++++++++ kubejs/startup_scripts/gtceu/constants.js | 10 +++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 56395b420..a45d9e31c 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -347,6 +347,19 @@ const registerGTCEURecipes = (event) => { //#endregion + //#region GT marble + + event.stonecutting('gtceu:polished_marble', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_polished_marble') + event.stonecutting('gtceu:chiseled_marble', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_chiseled_marble') + event.stonecutting('gtceu:marble_tile', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_marble_tile') + event.stonecutting('gtceu:marble_small_tile', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_marble_small_tile') + event.stonecutting('gtceu:marble_windmill_a', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_marble_windmill_a') + event.stonecutting('gtceu:marble_windmill_b', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_marble_windmill_b') + event.stonecutting('gtceu:small_marble_bricks', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_small_marble_bricks') + event.stonecutting('gtceu:square_marble_bricks', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_square_marble_bricks') + + //#endregion + //#region Выход: Бурильная жидкость generateMixerRecipe( diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index e2c80c853..93f2f79cd 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -82,7 +82,15 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:echo_shard_block', 'gtceu:tiny_skulk_dust', 'gtceu:small_skulk_dust', - 'gtceu:skulk_dust' + 'gtceu:skulk_dust', + + // Marble + 'gtceu:marble', + 'gtceu:marble_cobblestone', + 'gtceu:mossy_marble_cobblestone', + 'gtceu:marble_bricks', + 'gtceu:cracked_marble_bricks', + 'gtceu:mossy_marble_bricks' ]; global.GTCEU_HIDED_ITEMS = [ From d8c85170eb1e1d288b2d3864fcedf4626deb8a08 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 01:26:02 +0100 Subject: [PATCH 33/95] fixed inconsistent create deco doors --- kubejs/server_scripts/createdeco/recipes.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 94d91622f..6ab764a5c 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -174,23 +174,23 @@ const registerCreatedecoRecipes = (event) => { event.remove({ id: `createdeco:${bar.metal}_door` }) if (bar.metal != 'iron') { - event.recipes.tfc.anvil(`8x createdeco:${bar.metal}_bars`, `#forge:plates/${bar.material}`, ['shrink_last', 'punch_second_last', 'punch_third_last']) + event.recipes.tfc.anvil(`4x createdeco:${bar.metal}_bars`, `#forge:ingots/${bar.material}`, ['shrink_last', 'punch_second_last', 'punch_third_last']) .tier(bar.tier).id(`createdeco:anvil/${bar.metal}_bars`) - event.recipes.tfc.anvil(`createdeco:${bar.metal}_door`, `#forge:double_plates/${bar.material}`, ['draw_last', 'draw_second_last', 'punch_third_last']) + event.recipes.tfc.anvil(`createdeco:${bar.metal}_door`, `#forge:ingots/${bar.material}`, ['draw_last', 'draw_second_last', 'punch_third_last']) .tier(bar.tier).id(`createdeco:anvil/${bar.metal}_door`) - event.recipes.tfc.anvil(`createdeco:${bar.metal}_trapdoor`, `#forge:plates/${bar.material}`, ['shrink_last', 'draw_second_last', 'draw_third_last']) + event.recipes.tfc.anvil(`createdeco:${bar.metal}_trapdoor`, `#forge:ingots/${bar.material}`, ['shrink_last', 'draw_second_last', 'draw_third_last']) .tier(bar.tier).id(`createdeco:anvil/${bar.metal}_trapdoor`) - event.stonecutting(`4x createdeco:${bar.metal}_trapdoor`, `#forge:ingots/${bar.material}`) + event.stonecutting(`createdeco:${bar.metal}_trapdoor`, `#forge:ingots/${bar.material}`) .id(`createdeco:stonecutting/${bar.metal}_trapdoor`) event.stonecutting(`createdeco:${bar.metal}_door`, `#forge:ingots/${bar.material}`) .id(`createdeco:stonecutting/${bar.metal}_door`) } - event.recipes.tfc.anvil(`8x createdeco:${bar.metal}_bars_overlay`, `#forge:plates/${bar.material}`, ['draw_last', 'punch_second_last', 'punch_third_last']) + event.recipes.tfc.anvil(`4x createdeco:${bar.metal}_bars_overlay`, `#forge:ingots/${bar.material}`, ['draw_last', 'punch_second_last', 'punch_third_last']) .tier(bar.tier).id(`createdeco:anvil/${bar.metal}_bars_overlay`) }) From b5eafc98ac7fceed9941138f05f47b39d6bed13f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 01:39:01 +0100 Subject: [PATCH 34/95] added assembler recipes for the create deco bricks, fixed vanilla bricks only crafting a single at a time --- kubejs/server_scripts/createdeco/recipes.js | 7 +++++++ kubejs/server_scripts/gregtech/recipes.removes.js | 2 ++ kubejs/server_scripts/minecraft/recipes.js | 9 ++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 6ab764a5c..aacd70c2e 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -147,6 +147,13 @@ const registerCreatedecoRecipes = (event) => { D: powder, M: `tfc:mortar` }); + + event.recipes.gtceu.assembler(`createdeco:${type}_bricks`) + .itemInputs('5x minecraft:brick', powder) + .inputFluids(Fluid.of('gtceu:concrete', 144)) + .itemOutputs(`4x createdeco:${type}_bricks`) + .duration(50) + .EUt(7) }); //#endregion diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 2a785a1e4..3482b6653 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -607,4 +607,6 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/spyglass' }) event.remove({ id: 'gtceu:chemical_reactor/ghast_tear_separation' }) + + event.remove({ id: 'gtceu:compressor/bricks' }) } diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index bc6049948..ffd020ccd 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -772,7 +772,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Кирпич - event.shaped('minecraft:bricks', [ + event.shaped('4x minecraft:bricks', [ 'BAB', 'ABA', 'BAB' @@ -781,6 +781,13 @@ const registerMinecraftRecipes = (event) => { B: 'minecraft:brick' }).id('tfc:crafting/bricks') + event.recipes.gtceu.assembler('minecraft:bricks') + .itemInputs('5x minecraft:brick') + .inputFluids(Fluid.of('gtceu:concrete', 144)) + .itemOutputs(`4x minecraft:bricks`) + .duration(50) + .EUt(7) + //#endregion //#region Выход: Элитра From abf831e2af5f2401400aef1167cfaea1437b9ce5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 01:40:56 +0100 Subject: [PATCH 35/95] once again I am buffing train tracks --- kubejs/server_scripts/railways/recipes.js | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 68326170b..624591e77 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -281,7 +281,7 @@ const registerRailWaysRecipes = (event) => { // Монорельс event.recipes.createSequencedAssembly([ - '4x railways:track_monorail', + '8x railways:track_monorail', ], 'create:metal_girder', [ event.recipes.createDeploying('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail', '#forge:plates/wrought_iron']), event.recipes.createDeploying('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail', '#forge:tools/hammers']), @@ -291,13 +291,13 @@ const registerRailWaysRecipes = (event) => { event.recipes.gtceu.assembler('railways/monorail') .itemInputs('create:metal_girder', '2x #forge:plates/wrought_iron') - .itemOutputs('4x railways:track_monorail') + .itemOutputs('8x railways:track_monorail') .duration(250) .EUt(32) // Железнодорожное полотно (Узкое) event.recipes.createSequencedAssembly([ - '8x railways:track_create_andesite_narrow', + '16x railways:track_create_andesite_narrow', ], '#tfg:rock_slabs', [ event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_rod']), event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#tfc:mortar']), @@ -307,14 +307,14 @@ const registerRailWaysRecipes = (event) => { event.recipes.gtceu.assembler('railways/track_create_andesite_narrow_from_steel') .itemInputs('#tfg:rock_slabs', '2x gtceu:steel_rod') .inputFluids(Fluid.of('gtceu:concrete', 144)) - .itemOutputs('8x railways:track_create_andesite_narrow') + .itemOutputs('16x railways:track_create_andesite_narrow') .duration(800) .EUt(16) .circuit(1) // Железнодорожное полотно (Нормальное) event.recipes.createSequencedAssembly([ - '8x create:track', + '16x create:track', ], '#tfg:rock_slabs', [ event.recipes.createDeploying('create:incomplete_track', ['create:incomplete_track', '#tfg:rock_slabs']), event.recipes.createDeploying('create:incomplete_track', ['create:incomplete_track', 'gtceu:steel_rod']), @@ -325,14 +325,14 @@ const registerRailWaysRecipes = (event) => { event.recipes.gtceu.assembler('railways/track') .itemInputs('3x #tfg:rock_slabs', '2x gtceu:steel_rod') .inputFluids(Fluid.of('gtceu:concrete', 144)) - .itemOutputs('8x create:track') + .itemOutputs('16x create:track') .duration(800) .EUt(16) .circuit(2) // Железнодорожное полотно (Широкое) event.recipes.createSequencedAssembly([ - '8x railways:track_create_andesite_wide', + '16x railways:track_create_andesite_wide', ], '#tfg:rock_slabs', [ event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', '#forge:stone']), event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', 'gtceu:steel_rod']), @@ -343,7 +343,7 @@ const registerRailWaysRecipes = (event) => { event.recipes.gtceu.assembler('railways/track_create_andesite_wide') .itemInputs('5x #tfg:rock_slabs', '2x gtceu:steel_rod') .inputFluids(Fluid.of('gtceu:concrete', 144)) - .itemOutputs('8x railways:track_create_andesite_wide') + .itemOutputs('16x railways:track_create_andesite_wide') .duration(800) .EUt(16) .circuit(3) @@ -352,7 +352,7 @@ const registerRailWaysRecipes = (event) => { global.TFC_WOOD_TYPES.forEach(woodType => { // Узкое event.recipes.createSequencedAssembly([ - `8x railways:track_tfc_${woodType}_narrow`, + `16x railways:track_tfc_${woodType}_narrow`, ], `tfc:wood/planks/${woodType}_slab`, [ event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_rod']), event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, '#forge:screws']), @@ -361,14 +361,14 @@ const registerRailWaysRecipes = (event) => { event.recipes.gtceu.assembler(`railways/track_create_${woodType}_narrow`) .itemInputs(`tfc:wood/planks/${woodType}_slab`, '2x gtceu:steel_rod', '2x #forge:screws') - .itemOutputs(`8x railways:track_tfc_${woodType}_narrow`) + .itemOutputs(`16x railways:track_tfc_${woodType}_narrow`) .duration(800) .EUt(16) .circuit(1) // Нормальное event.recipes.createSequencedAssembly([ - `8x railways:track_tfc_${woodType}`, + `16x railways:track_tfc_${woodType}`, ], `tfc:wood/planks/${woodType}_slab`, [ event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, `tfc:wood/lumber/${woodType}`]), event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, 'gtceu:steel_rod']), @@ -378,14 +378,14 @@ const registerRailWaysRecipes = (event) => { event.recipes.gtceu.assembler(`railways/track_${woodType}`) .itemInputs(`tfc:wood/planks/${woodType}_slab`, `2x tfc:wood/lumber/${woodType}`, '2x gtceu:steel_rod', '2x #forge:screws') - .itemOutputs(`8x railways:track_tfc_${woodType}`) + .itemOutputs(`16x railways:track_tfc_${woodType}`) .duration(800) .EUt(16) .circuit(2) // Широкое event.recipes.createSequencedAssembly([ - `8x railways:track_tfc_${woodType}_wide`, + `16x railways:track_tfc_${woodType}_wide`, ], `tfc:wood/planks/${woodType}_slab`, [ event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, `tfc:wood/planks/${woodType}_slab`]), event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, `gtceu:steel_rod`]), @@ -395,7 +395,7 @@ const registerRailWaysRecipes = (event) => { event.recipes.gtceu.assembler(`railways/track_${woodType}_wide`) .itemInputs(`3x tfc:wood/planks/${woodType}_slab`, '2x gtceu:steel_rod', '2x #forge:screws') - .itemOutputs(`8x railways:track_tfc_${woodType}_wide`) + .itemOutputs(`16x railways:track_tfc_${woodType}_wide`) .duration(800) .EUt(16) .circuit(3) From ead388a5508d124d287cc69744796548d8f3a031 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 02:00:49 +0100 Subject: [PATCH 36/95] some recipe tweaks for create's decorative stuff --- kubejs/server_scripts/create/recipes.js | 34 +++++++++++++------------ 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 27703b489..325c1bba2 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -165,7 +165,7 @@ const registerCreateRecipes = (event) => { .EUt(20) // Металлический держатель - event.shaped('2x create:metal_bracket', [ + event.shaped('4x create:metal_bracket', [ 'AAA', ' B ' ], { @@ -1098,23 +1098,21 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/shaped/copper_scaffolding') // Цинковая ступень - event.shapeless('create:copycat_step', [ - '#forge:plates/zinc', - '#forge:tools/files' - ]).id('tfg:create/shapeless/copycat_step') + event.shaped('4x create:copycat_step', [ + 'A ', + ' B' + ], { + A: '#forge:plates/zinc', + B: '#forge:tools/files' + }).id('tfg:create/shapeless/copycat_step') // Цинковая панель - event.shapeless('create:copycat_panel', [ - '#forge:double_plates/zinc', - '#forge:tools/files' - ]).id('tfg:create/shapeless/copycat_panel') - - event.recipes.gtceu.assembler('tfg:create/copycat_panel') - .itemInputs('#forge:double_plates/zinc') - .circuit(5) - .itemOutputs('create:copycat_panel') - .duration(200) - .EUt(20) + event.shaped('4x create:copycat_panel', [ + 'A B', + ], { + A: '#forge:plates/zinc', + B: '#forge:tools/files' + }).id('tfg:create/shapeless/copycat_panel') // Деталь рельса event.shaped('3x create:metal_girder', [ @@ -1670,4 +1668,8 @@ const registerCreateRecipes = (event) => { D: '#forge:tools/wrenches', E: '#forge:tools/hammers' }).id('tfg:create/shaped/clutch') + + event.stonecutting('2x create:andesite_scaffolding', '#forge:ingots/tin_alloy') + event.stonecutting('2x create:andesite_ladder', '#forge:ingots/tin_alloy') + event.stonecutting('2x create:andesite_bars', '#forge:ingots/tin_alloy') } From ae13e8dbcb8fdb3a2ef25a02bd2bec485f6ef20e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 02:01:02 +0100 Subject: [PATCH 37/95] hide create's peculiar/haunted bell --- kubejs/startup_scripts/create/constants.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 12131cfa1..9b0263296 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -291,5 +291,7 @@ global.CREATE_DISABLED_ITEMS = [ 'create:minecart_contraption', 'create:furnace_minecart_contraption', 'create:chest_minecart_contraption', - 'create:mechanical_pump' + 'create:mechanical_pump', + 'create:peculiar_bell', + 'create:haunted_bell' ]; From 0e6a8b4cf74d3489982704442d3eceeda6901872 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 02:01:08 +0100 Subject: [PATCH 38/95] updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b83e7881..8c511c258 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,10 @@ - Buffed nether mob loot tables - The overworld graphite vein now spawns in every stone type - Granitic/basaltic mineral sand is now usable for iron in primitive age +- Fixed butchery knives missing anvil recipes +- Added recipes to craft GT's marble blocks +- Added assembler recipes for create deco's bricks, and made vanilla bricks consistent (4 instead of 1 per craft) +- Doubled the amount of train tracks you get per craft - Removed some more duplicate recipes for vanilla items - Hid some more things in JEI that aren't craftable From 9b73dad3b771f259f7e1fba70db20f5dcfe6d8d4 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 12:34:38 +0100 Subject: [PATCH 39/95] why does gt have two constants files? --- kubejs/server_scripts/gregtech/constants.js | 37 -------------------- kubejs/startup_scripts/gtceu/constants.js | 38 ++++++++++++++++++++- 2 files changed, 37 insertions(+), 38 deletions(-) delete mode 100644 kubejs/server_scripts/gregtech/constants.js diff --git a/kubejs/server_scripts/gregtech/constants.js b/kubejs/server_scripts/gregtech/constants.js deleted file mode 100644 index 6c3465ca2..000000000 --- a/kubejs/server_scripts/gregtech/constants.js +++ /dev/null @@ -1,37 +0,0 @@ -// priority: 0 - -global.GTCEU_ANVIL_TOOL_TYPES = [ - - GTToolType.SWORD, - GTToolType.PICKAXE, - GTToolType.SHOVEL, - GTToolType.AXE, - GTToolType.HOE, - GTToolType.MINING_HAMMER, - GTToolType.SPADE, - GTToolType.SAW, - GTToolType.HARD_HAMMER, - // GTToolType.SOFT_MALLET, - // GTToolType.WRENCH, - GTToolType.FILE, - // GTToolType.CROWBAR, - // GTToolType.SCREWDRIVER, - // GTToolType.MORTAR, - // GTToolType.WIRE_CUTTER, - GTToolType.SCYTHE, - GTToolType.KNIFE, - GTToolType.BUTCHERY_KNIFE, - // GTToolType.PLUNGER -]; - -global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS = { - "tfc:swords" : GTToolType.SWORD, - "tfc:pickaxes" : GTToolType.PICKAXE, - "tfc:axes" : GTToolType.AXE, - "tfc:shovels" : GTToolType.SHOVEL, - "tfc:hoes" : GTToolType.HOE, - "tfc:hammers" : GTToolType.HARD_HAMMER, - "tfc:knives" : GTToolType.KNIFE, - "tfc:saws" : GTToolType.SAW, - "tfc:scythes" : GTToolType.SCYTHE -}; \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 93f2f79cd..1c698bb05 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -172,4 +172,40 @@ global.ORE_BEARING_STONES = [ 'deepslate', 'pyroxenite', 'dripstone' -]; \ No newline at end of file +]; + +global.GTCEU_ANVIL_TOOL_TYPES = [ + + GTToolType.SWORD, + GTToolType.PICKAXE, + GTToolType.SHOVEL, + GTToolType.AXE, + GTToolType.HOE, + GTToolType.MINING_HAMMER, + GTToolType.SPADE, + GTToolType.SAW, + GTToolType.HARD_HAMMER, + // GTToolType.SOFT_MALLET, + // GTToolType.WRENCH, + GTToolType.FILE, + // GTToolType.CROWBAR, + // GTToolType.SCREWDRIVER, + // GTToolType.MORTAR, + // GTToolType.WIRE_CUTTER, + GTToolType.SCYTHE, + GTToolType.KNIFE, + GTToolType.BUTCHERY_KNIFE, + // GTToolType.PLUNGER +]; + +global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS = { + "tfc:swords" : GTToolType.SWORD, + "tfc:pickaxes" : GTToolType.PICKAXE, + "tfc:axes" : GTToolType.AXE, + "tfc:shovels" : GTToolType.SHOVEL, + "tfc:hoes" : GTToolType.HOE, + "tfc:hammers" : GTToolType.HARD_HAMMER, + "tfc:knives" : GTToolType.KNIFE, + "tfc:saws" : GTToolType.SAW, + "tfc:scythes" : GTToolType.SCYTHE +}; \ No newline at end of file From d7b1304bd1a755a6708f4b53d197a10299b9d9c6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 12:52:39 +0100 Subject: [PATCH 40/95] fixed red alloy/tin alloy double ingots not needing to be heated to be worked --- kubejs/server_scripts/tfc/data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 24b811262..6b903d9db 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -36,8 +36,8 @@ const registerTFCMetals = (event) => { event.metal('gtceu:brass', 930, 0.00857, '#forge:ingots/brass', '#forge:double_ingots/brass', '#forge:plates/brass', 2, 'tfc:brass') event.metal('gtceu:redstone', 460, 0.01729, null, null, null, 1, 'tfg:redstone') - event.metal('gtceu:red_alloy', 740, 0.01529, '#forge:ingots/red_alloy', null, '#forge:plates/red_alloy', 2, 'tfg:red_alloy') - event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', null, '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy') + event.metal('gtceu:red_alloy', 740, 0.01529, '#forge:ingots/red_alloy', '#forge:double_ingots/red_alloy', '#forge:plates/red_alloy', 2, 'tfg:red_alloy') + event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', '#forge:double_ingots/tin_alloy', '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy') } //#endregion From bfb2cd17b84c8295ccf5d6ae2f0f43adedb2ce8f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 12:59:33 +0100 Subject: [PATCH 41/95] oh so that's why you have two constants --- kubejs/server_scripts/gregtech/constants.js | 36 +++++++++++++++++++++ kubejs/startup_scripts/gtceu/constants.js | 36 --------------------- 2 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 kubejs/server_scripts/gregtech/constants.js diff --git a/kubejs/server_scripts/gregtech/constants.js b/kubejs/server_scripts/gregtech/constants.js new file mode 100644 index 000000000..4169872e9 --- /dev/null +++ b/kubejs/server_scripts/gregtech/constants.js @@ -0,0 +1,36 @@ + +global.GTCEU_ANVIL_TOOL_TYPES = [ + + GTToolType.SWORD, + GTToolType.PICKAXE, + GTToolType.SHOVEL, + GTToolType.AXE, + GTToolType.HOE, + GTToolType.MINING_HAMMER, + GTToolType.SPADE, + GTToolType.SAW, + GTToolType.HARD_HAMMER, + // GTToolType.SOFT_MALLET, + // GTToolType.WRENCH, + GTToolType.FILE, + // GTToolType.CROWBAR, + // GTToolType.SCREWDRIVER, + // GTToolType.MORTAR, + // GTToolType.WIRE_CUTTER, + GTToolType.SCYTHE, + GTToolType.KNIFE, + GTToolType.BUTCHERY_KNIFE, + // GTToolType.PLUNGER +]; + +global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS = { + "tfc:swords" : GTToolType.SWORD, + "tfc:pickaxes" : GTToolType.PICKAXE, + "tfc:axes" : GTToolType.AXE, + "tfc:shovels" : GTToolType.SHOVEL, + "tfc:hoes" : GTToolType.HOE, + "tfc:hammers" : GTToolType.HARD_HAMMER, + "tfc:knives" : GTToolType.KNIFE, + "tfc:saws" : GTToolType.SAW, + "tfc:scythes" : GTToolType.SCYTHE +}; \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 1c698bb05..3694330b4 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -173,39 +173,3 @@ global.ORE_BEARING_STONES = [ 'pyroxenite', 'dripstone' ]; - -global.GTCEU_ANVIL_TOOL_TYPES = [ - - GTToolType.SWORD, - GTToolType.PICKAXE, - GTToolType.SHOVEL, - GTToolType.AXE, - GTToolType.HOE, - GTToolType.MINING_HAMMER, - GTToolType.SPADE, - GTToolType.SAW, - GTToolType.HARD_HAMMER, - // GTToolType.SOFT_MALLET, - // GTToolType.WRENCH, - GTToolType.FILE, - // GTToolType.CROWBAR, - // GTToolType.SCREWDRIVER, - // GTToolType.MORTAR, - // GTToolType.WIRE_CUTTER, - GTToolType.SCYTHE, - GTToolType.KNIFE, - GTToolType.BUTCHERY_KNIFE, - // GTToolType.PLUNGER -]; - -global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS = { - "tfc:swords" : GTToolType.SWORD, - "tfc:pickaxes" : GTToolType.PICKAXE, - "tfc:axes" : GTToolType.AXE, - "tfc:shovels" : GTToolType.SHOVEL, - "tfc:hoes" : GTToolType.HOE, - "tfc:hammers" : GTToolType.HARD_HAMMER, - "tfc:knives" : GTToolType.KNIFE, - "tfc:saws" : GTToolType.SAW, - "tfc:scythes" : GTToolType.SCYTHE -}; \ No newline at end of file From c1fe9d3e8efd5e1ff7eb3ae9478f415e0f6b9200 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 13:20:44 +0100 Subject: [PATCH 42/95] long distance item/fluid pipes now need HV because please build trains please --- .../gregtech/recipes.machines.js | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 1b655e940..9c6a6e520 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -581,29 +581,39 @@ function registerGTCEuMachineRecipes(event) { //#endregion - //#region Long Distance Pipelines + //#region Long distance pipes - event.remove({ id: 'gtceu:assembler/long_distance_item_pipe' }) event.recipes.gtceu.assembler('long_distance_item_pipe') - .itemInputs( - '1x gtceu:tin_large_item_pipe', - '4x #forge:plates/steel') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 144 / 4)) + .itemInputs('1x #forge:large_item_pipes/polyvinyl_chloride', '4x #forge:plates/vanadium_steel') + .inputFluids(Fluid.of('gtceu:soldering_alloy', 72)) .itemOutputs('32x gtceu:long_distance_item_pipeline') + .EUt(GTValues.VA[GTValues.HV]) .circuit(2) .duration(300) - .EUt(24) - event.remove({ id: 'gtceu:assembler/long_distance_fluid_pipe' }) event.recipes.gtceu.assembler('long_distance_fluid_pipe') - .itemInputs( - '1x gtceu:bronze_large_fluid_pipe', - '4x #forge:plates/steel') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 144 / 4)) + .itemInputs('1x #forge:large_fluid_pipes/vanadium_steel', '4x #forge:plates/polyvinyl_chloride') + .inputFluids(Fluid.of('gtceu:soldering_alloy', 72)) .itemOutputs('32x gtceu:long_distance_fluid_pipeline') + .EUt(GTValues.VA[GTValues.HV]) .circuit(2) .duration(300) - .EUt(24) + + event.recipes.gtceu.assembler('long_distance_item_endpoint') + .itemInputs('2x #forge:large_item_pipes/polyvinyl_chloride', '8x #forge:plates/vanadium_steel', '2x #forge:gears/stainless_steel') + .inputFluids(Fluid.of('gtceu:soldering_alloy', 144)) + .itemOutputs('2x gtceu:long_distance_item_pipeline_endpoint') + .EUt(GTValues.VA[GTValues.HV]) + .circuit(1) + .duration(400) + + event.recipes.gtceu.assembler('long_distance_fluid_endpoint') + .itemInputs('2x #forge:large_fluid_pipes/vanadium_steel', '8x #forge:plates/polyvinyl_chloride', '2x #forge:gears/stainless_steel') + .inputFluids(Fluid.of('gtceu:soldering_alloy', 144)) + .itemOutputs('2x gtceu:long_distance_fluid_pipeline_endpoint') + .EUt(GTValues.VA[GTValues.HV]) + .circuit(1) + .duration(400) //#endregion From c692d52fd6650538af3fdb803a123648db10d412 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 13:24:11 +0100 Subject: [PATCH 43/95] bismuth item pipes are now really slow --- kubejs/startup_scripts/gtceu/materials.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 4f6f66f12..a1ee77581 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -19,11 +19,9 @@ const registerGTCEuMaterialModification = (event) => { HAS_TFC_TOOL, HAS_TFC_ARMOR, HAS_TFC_UTILITY, - HAS_PLATED_BLOCK, CAN_BE_UNMOLDED, GENERATE_BELL, GENERATE_DOUBLE_INGOTS, - GENERATE_FIRMALIFE_GREENHOUSE_BLOCKS, HAS_SMALL_TFC_ORE, HAS_SMALL_NATIVE_TFC_ORE, } = TFGMaterialFlags @@ -229,8 +227,8 @@ const registerGTCEuMaterialModification = (event) => { toolProperty.setDurability(toolProperty.getDurability() * 6); } - // Bismuth item pipe - same stats as tin - GTMaterials.Bismuth.setProperty(PropertyKey.ITEM_PIPE, new $ITEM_PIPE_PROPERTY(4096, 0.5)); + // Bismuth item pipe - 1/4 as good as tin + GTMaterials.Bismuth.setProperty(PropertyKey.ITEM_PIPE, new $ITEM_PIPE_PROPERTY(16384, 0.125)); // Bis bronze fluid pipe - same stats as bronze GTMaterials.BismuthBronze.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1696, 20, true, false, false, false)); // Red steel fluid pipe - same flow rate as aluminium, bad heat tolerance (same as PE) but can do cryo @@ -242,7 +240,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Realgar.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.ARSENICOSIS, 1, false)); GTMaterials.Cobaltite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.ARSENICOSIS, 1, false)); GTMaterials.Galena.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON, 1, false)); - GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.CARCINOGEN, 1, false)); + GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.IRRITANT, 1, false)); // Color Adjustments GTMaterials.BismuthBronze.setMaterialARGB(0x5A966E) From f509a3a84669f1f16792f29037e0e81696fd41c6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 13:54:15 +0100 Subject: [PATCH 44/95] fixed raw ore item textures for a bunch of gem materials --- .../item/material_sets/certus/poor_raw_ore.json | 7 +++++++ .../item/material_sets/certus/raw_ore.json | 7 +++++++ .../item/material_sets/certus/rich_raw_ore.json | 7 +++++++ .../item/material_sets/quartz/poor_raw_ore.json | 7 +++++++ .../item/material_sets/quartz/raw_ore.json | 7 +++++++ .../item/material_sets/quartz/rich_raw_ore.json | 7 +++++++ .../material_sets/tfc_realgar/poor_raw_ore.json | 7 +++++++ .../item/material_sets/tfc_realgar/raw_ore.json | 7 +++++++ .../material_sets/tfc_realgar/rich_raw_ore.json | 7 +++++++ .../item/material_sets/certus/poor_raw_ore.png | Bin 0 -> 1827 bytes .../certus/poor_raw_ore_secondary.png | Bin 0 -> 440 bytes .../item/material_sets/certus/raw_ore.png | Bin 0 -> 615 bytes .../material_sets/certus/raw_ore_secondary.png | Bin 0 -> 464 bytes .../item/material_sets/certus/rich_raw_ore.png | Bin 0 -> 1932 bytes .../certus/rich_raw_ore_secondary.png | Bin 0 -> 458 bytes .../item/material_sets/quartz/poor_raw_ore.png | Bin 0 -> 2423 bytes .../quartz/poor_raw_ore_secondary.png | Bin 0 -> 348 bytes .../item/material_sets/quartz/raw_ore.png | Bin 0 -> 2460 bytes .../material_sets/quartz/raw_ore_secondary.png | Bin 0 -> 414 bytes .../item/material_sets/quartz/rich_raw_ore.png | Bin 0 -> 553 bytes .../quartz/rich_raw_ore_secondary.png | Bin 0 -> 412 bytes .../material_sets/tfc_realgar/poor_raw_ore.png | Bin 0 -> 1827 bytes .../tfc_realgar/poor_raw_ore_secondary.png | Bin 0 -> 440 bytes .../item/material_sets/tfc_realgar/raw_ore.png | Bin 0 -> 615 bytes .../tfc_realgar/raw_ore_secondary.png | Bin 0 -> 464 bytes .../material_sets/tfc_realgar/rich_raw_ore.png | Bin 0 -> 1932 bytes .../tfc_realgar/rich_raw_ore_secondary.png | Bin 0 -> 458 bytes kubejs/startup_scripts/tfc/icon_sets.js | 1 + kubejs/startup_scripts/tfc/materials.js | 8 +++++--- 29 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 kubejs/assets/gtceu/models/item/material_sets/certus/poor_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/certus/raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/certus/rich_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/quartz/poor_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/quartz/raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/quartz/rich_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/poor_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/rich_raw_ore.json create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/certus/poor_raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/certus/poor_raw_ore_secondary.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/certus/raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/certus/raw_ore_secondary.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/certus/rich_raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/certus/rich_raw_ore_secondary.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/quartz/poor_raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/quartz/poor_raw_ore_secondary.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/quartz/raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/quartz/raw_ore_secondary.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/quartz/rich_raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/quartz/rich_raw_ore_secondary.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/poor_raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/poor_raw_ore_secondary.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/raw_ore_secondary.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/rich_raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/rich_raw_ore_secondary.png diff --git a/kubejs/assets/gtceu/models/item/material_sets/certus/poor_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/certus/poor_raw_ore.json new file mode 100644 index 000000000..5960a96b0 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/certus/poor_raw_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/certus/poor_raw_ore", + "layer1": "gtceu:item/material_sets/certus/poor_raw_ore_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/certus/raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/certus/raw_ore.json new file mode 100644 index 000000000..fe75a223d --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/certus/raw_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/certus/raw_ore", + "layer1": "gtceu:item/material_sets/certus/raw_ore_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/certus/rich_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/certus/rich_raw_ore.json new file mode 100644 index 000000000..6a0d55bf7 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/certus/rich_raw_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/certus/rich_raw_ore", + "layer1": "gtceu:item/material_sets/certus/rich_raw_ore_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/quartz/poor_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/quartz/poor_raw_ore.json new file mode 100644 index 000000000..46b830cfb --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/quartz/poor_raw_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/quartz/poor_raw_ore", + "layer1": "gtceu:item/material_sets/quartz/poor_raw_ore_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/quartz/raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/quartz/raw_ore.json new file mode 100644 index 000000000..cd33a41c5 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/quartz/raw_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/quartz/raw_ore", + "layer1": "gtceu:item/material_sets/quartz/raw_ore_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/quartz/rich_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/quartz/rich_raw_ore.json new file mode 100644 index 000000000..3f07748bc --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/quartz/rich_raw_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/quartz/rich_raw_ore", + "layer1": "gtceu:item/material_sets/quartz/rich_raw_ore_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/poor_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/poor_raw_ore.json new file mode 100644 index 000000000..20bc0e03a --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/poor_raw_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/tfc_realgar/poor_raw_ore", + "layer1": "gtceu:item/material_sets/tfc_realgar/poor_raw_ore_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/raw_ore.json new file mode 100644 index 000000000..e74a8950b --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/raw_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/tfc_realgar/raw_ore", + "layer1": "gtceu:item/material_sets/tfc_realgar/raw_ore_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/rich_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/rich_raw_ore.json new file mode 100644 index 000000000..1a5428a11 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/rich_raw_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/tfc_realgar/rich_raw_ore", + "layer1": "gtceu:item/material_sets/tfc_realgar/rich_raw_ore_secondary" + } +} diff --git a/kubejs/assets/gtceu/textures/item/material_sets/certus/poor_raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/certus/poor_raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..a1e144deeb75bb6775cee61569192ed66ed93d38 GIT binary patch literal 1827 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qY@nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rg~<&$%ZCI3g(u2hGqtqMkYE6Mh1rF z`Ud9uhQ_)EhE@hqbJP@rU|U{jQmW)Qa)e((;RP6H9EB zGIJBtQ}qk-(v=k8p=RZrpOatYo1cPIz^_NqMUOK!1Z;wlsH` z&YGN*)T5WeHY!f?@QUlS5&tx&I(=98{l72r-aVQ%YP{c-k3^L@T$ z58_2<`n35i51w^4EmK8kq5Z>snhDb-4J3FTRqcILVdJDA&>%SVbgC2w%e)i!_K9tb z=&9Np=dmZf-jKu;KULzO>Dpoi0rK@Au!#Y5QB(AGEUNWC~MS@7uj90$i;t z!dBneef)8w*HWk5cimQBJyc`YemBp3ZP?+m-L6U#6Cx+5bMq_+(MmLty7>C5fmH8> z43h^17CV+!?d5BAI{17tliJy*MF(@t7GHk3AV9-GMd;(^g9#0{-?D9uI?G&_>A3jf zffS>UJTpSrHbkwJ=s#XyHFv`4r#EuUYU;N9a&*`y7ic22w5Or;V1mJe8oR~!-+$&a zP_>)SKh=x%Zl3thntzSeDI0FTHIU&;+!&!S`Q(n?uT^KCOnzF_8KZanq{NSWZhkc< wjzbR(Qm;l@N2;Anne^ui>psCh+wcG23ugFcb<6inHmDl&boFyt=akR{02v^QV*mgE literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/certus/poor_raw_ore_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/certus/poor_raw_ore_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..3fd6534bdfb7e47ba6a4fcc47f9b5bea0b0e1c26 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s6~PZ!4!i{7)7_GVv66lj^hvm#=ykiC$NsA7kbqL8$*XR_}5#6;yK8#V}P3+7(p zx+eDRm3+eF>Wv!=6~dAfmIYjJJGg)?Sc6gVXmasU{&!4eR#!LeHh#my{a;G*>YJ}s z=2uc52pNQC$Nti83_4Z&AaRmzDbo%fABOppa#mc=UK>7ZPFQn|{>jfO_E+~FSgZ0@ zrGJu5;C&|TrBjwGvoc%>T`)I=^F|o|%J?gu51u9DE24v^`mOz1pY3 zYQbj1wrh9n2Ie!&vJYB+`P$BSvZl(VcJaBD#!IJI?~a_|`APQ2j3*`qPPXiO*tRu( z_B3letH|xS>y`HdTLa!0);j()^+v<5uN59VN(j?FZ}z^HO4L zt+bBFer3AAcI`^}0nG)A<5=b~avzu(_4?5Yo^Q;-2dp+sO_8z)$lg2qNx`J-11bCO t$LAEZ*?n}JbUusw#kHvX&-Wkm|Kyyx#N_S4eGCi?44$rjF6*2UngCnDwr2nU literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/certus/raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/certus/raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..2d81e83c1f2d1dae9f5f53d8a3f988941017bb85 GIT binary patch literal 615 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_mZcPZ!4!i{9Ev`@O3IC63vD|Mfb~-@{}^SJG0Ui(zcx%i9*@?0q2ePx9;~p}*{{ z-4B%fe3e`ry#;vn1Up>x+{9*TbV}X(Evs~L{macVapykQojY6^-zjs>qd?)5d1O0|$# zv`WitHg7`7ziEGVdn^rl_VA&iwY7D|EH;P57Y{uCsBqfoVL^r2ftMwhGE6@F{wpId zFWi6pm|y@9w_(tM>1&UtM?e)MuY9s;jfx#=e;4ZQ1PAtF>DM)~s10z}LRV_iaR2@L_p?u*jPmpIMYvk+ZS8-t Z-)`9xKXG%lC<6lngQu&X%Q~loCIIgoB)9+o literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/certus/raw_ore_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/certus/raw_ore_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..8dfa6088c1fe9f509a0118a261d4c265bde98b16 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s6^PZ!4!i{94D=ey4)iX8uVUD94zSlKPdBWTmc37Z0^RJ=RoC3ec~lX$|yHGjoV zxowYk)=`oC-2FS^jQO)T<8r&x#dh<*f1dOFON*V>(k+Iqj%&`J z30trJi)H>}&A0^NvWHb^^I~7c?)Ld%=k|do+n~91+1?AUdeJuHgjgq zzj!bro}n&D;_=cc(t;l)gx7{?OTBLnI<>d1;r`{Q zW=6fP`*YyLcy) z4T?(Zw%&fr_wCpAWB;#wo#~}%zL7O|&0)iw!w=8c?A1!(%wT!HQQ7$X`Vy-@jN*ws WXI6KfX<}etVDNPHb6Mw<&;$TO#@bi_ literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/certus/rich_raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/certus/rich_raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..1c567585b16ae31fe9fa2178fe7fbada1355a717 GIT binary patch literal 1932 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qY@nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rg~<&$%ZCI3g(u2hGqtqMkYE6Mh1rF z`Ud9uhQ_)EhE@hqbJP@rU|U{jQmW)Qa)e((;RP6H9EB zGIJBtQ}qk-(v=k8p=RZrpOatYo1cgre6c)|-f{2n zae*&_N*R-s4edR=eZ9ST&wly${?^~EQriz!@0eG7{omWI=fgrmkH#N5a6D<_fu~QO z`m3fUCp(+Y^qFz~`G%;q875MviatMj(}q+kXXKac|}##p$eO0fB)`H$j{F|-TwOZ>i`kf!w&`Q z=JT%%@w)2b>Tc+*zU3gjY;p0cf=7S8&FLzeh{JVX` zLq#cV@BaPDB3vikR)z>oa!_E{e_wy=YqCGoQ{*VNUWVw~k+Y;JCT)Tin|-ya@Dgl7`xJ&OPUHWc5Wew+M-zV@^+0EhsK-F0txO zG16R`$x_^YSTQxALtAv@6($m$?Wt~$(698Hi Bwuk@# literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/certus/rich_raw_ore_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/certus/rich_raw_ore_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..a96446d64c6c41ba8e952c603b64fb721ec7450f GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s6&PZ!4!i{7=D_h*GTim-jSzh*bvA~iSHCfq3qu%U1oqE-ay{-6N!8!B$-_P#+^Vq9&Qt`g<=S!!w z&iS1C<`Kg-Z%zJxTo*Fxy482Ix`&4D_0jZAX1i|Kc{k{k6Yqt*2Hl73b&vGY7Vm8T zuJNO#+m~&v+drAt7A?g$R<3%bd~Ad0S@#XoiuW0FZ4fGyoL(q1cgm$unZuegF7ojo zN<<#G&M@r@|It$!!~Iv6+1b45Zq^JNmKj{LblzNz!w$Bdo;{Rxx@uzU|{fc L^>bP0l+XkK)6T=8 literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/quartz/poor_raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/quartz/poor_raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..a5aeddc17e2a088da5d8b2669cee5a21634e32ae GIT binary patch literal 2423 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4i*LmhONKMUokK+3uZby2e{;yD7YtP<|!DN zsxmNWOiWHlnD^ktqbH|S4jc#w2nl*3_e4TcP;%*kx_OPgjWZiTK+$mLjsu1Y2ihAO z8x{5K^`|m2*X%xa;KYFg2MQvuUp#tJG+0hQ!BU2jmirfM(lEAN z>~iqJrAt8v4OQ(mLlt*y+M!~)J>sCTzUBTE3i~xSs+hJmHZo?hGcz+YulKI&Y^qL5 zo7XgPrB>%VH4Y`E#UctiEP(MZ8W9|Eee=K6&#AMIf9t&4Tx<8+zb~NAcaGB>)j8%na&}HD`dl1dy#Gn(6U(F7 z$9K2-x93al7y8e{$lB=Il+~2o;?wetvzqh1$Vri(y0`R~X>AL)ar)DJM8#A2q;}BM zOP?+sPwh&1nsWZc)l;ue+Xv2ADzW6q>XM+H&PSc6Mt|LN%jByCuWxVuEcY$TvX;NT z@q+91zH8RY_TN}=(%|HYs}ZMNE+tf`-*nzgem~znu<+6)&0E3d{@dpk7KQzIBVN4v z*=OB|O()VmZe4oxG;4THjOdzH3%<$E3Xb`!)O9*Wdcw(%t#|(Y|@ia_u+x z|#me33VRN*1KB)10@@ezx-Ru4L%q+eAb={@fHgxV%QuQiw3m8Da#=fE;F*!T6L?J0PJu}Z%>HY5gN(z}N zwo2iqz6QPp&Z!xh9#uuD!Bu`C$yM3OmMKd1b_zBXRu#Dgxv3?I3Kh9IdBs*0wn|`g zt@4VkK*IV;3ScEA*|tiKAPW^Dd;=7m^NUgyEcFa^lMM_E70fO53{A|8EG#W`6pRdv zjP(u7^o>k)jSQ>|46RH}6`(-LPQj)qCCw_x#SLm%QA(PvQbtKhft9{~d3m{Bxv^e; zQM$gNrKP35fswwEk#12+nr?ArUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjTCALaR zP-81{3*g4)6+^=*IX_pwBC$Zl^AB z!qpaJfuXK}Nr<7Dm9e3fiHWv>sg;2NM5%9nN@iLmR;9*PhUO?rQ%e$45=#;ZDo#nZ zO3N?GO)Rlh%FInnPt`BTOIK2W2cwm9eolUoZ+=Rut&$Ezd~J!M<9H9DDdYepX3fr=zAK+nQx@tq1ik#kq)^Kjh;Pn|#nV!X-jQ zNT@rcV||$Ok|m`)OD}SrE1LBA-?{6v58a>m)7|`zFXxoS58Upp$y#J>?aHrleAli_ z@mqZ%_M(a`*A~fDU+ihV(RW(o==4vO&X#6#W(el-SZ-Y`!tDO+PE}z#C;z$ny24Zs z=jdxIW=;E8r?6b@wdd`Qz8>}dzYfuXpVH2m-qVeci3u!OuV6BF=7%>+?yop&BJY~a zCo8>qO_DvY&yDLBKCVg*I-2)uRef=h>9QwVujDLU*UHSG-56Ic|Dn2uLD4aM&Q1R7 Q+d!qir>mdKI;Vst08JLAh5!Hn literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/quartz/poor_raw_ore_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/quartz/poor_raw_ore_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..aad996b5c43807330a80ecd699d4efa3b897a48d GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_nkxPZ!4!i{7J`cY8HE3a~!VSIZDMx;s$u1_xJDZ}0jIOBJr|YcjKIn)+VgNZjsP z=7Z;sIqAB5ytmR88wKX1O}|-uZjNNy&-WUCzX&*GJdiWBd8l-3$6xJ6 zmwSf{)*1A2iQRVHRdm8S;wwga5B$0D*G#i`Cm_dwSdzNA0_scb6Icle7o3Ts8?RJK}9-2()Q(^v&zq{ zJoL&6b)z3@y)rzu)h6d+{Ego`o`?S1T*1!!)xpB_y}?Na1_lOCS3j3^P6U2jmirfM(lEAN z>~iqJrAt8v4OQ(mLlt*y+M!~)J>sCTzUBTE3i~xSs+hJmHZo?hGcz+YulKI&Y^qL5 zo7XgPrB>%VH4Y`E#UctiEP(MZ8W9|Eee=K6&#AMIf9t&4Tx<8+zb~NAcaGB>)j8%na&}HD`dl1dy#Gn(6U(F7 z$9K2-x93al7y8e{$lB=Il+~2o;?wetvzqh1$Vri(y0`R~X>AL)ar)DJM8#A2q;}BM zOP?+sPwh&1nsWZc)l;ue+Xv2ADzW6q>XM+H&PSc6Mt|LN%jByCuWxVuEcY$TvX;NT z@q+91zH8RY_TN}=(%|HYs}ZMNE+tf`-*nzgem~znu<+6)&0E3d{@dpk7KQzIBVN4v z*=OB|O()VmZe4oxG;4THjOdzH3%<$E3Xb`!)O9*Wdcw(%t#|(Y|@ia_u+x z|#me33VRN*1KB)10@@ezx-Ru4L%q+eAb={@fHgxV%QuQiw3m8Da#=fE;F*!T6L?J0PJu}Z%>HY5gN(z}N zwo2iqz6QPp&Z!xh9#uuD!Bu`C$yM3OmMKd1b_zBXRu#Dgxv3?I3Kh9IdBs*0wn|`g zt@4VkK*IV;3ScEA*|tiKAPW^Dd;=7m^NUgyEcFa^lMM_E70fO53{A|8EG#W`6pRdv zjP(u7^o>k)jSQ>|46RH}6`(-LPQj)qCCw_x#SLm%QA(PvQbtKhft9{~d3m{Bxv^e; zQM$gNrKP35fswwEk#12+nr?ArUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjTCALaR zP-81{3*g4)6+^=*IX_pwBC$Zl^AB z!qpaJfuXK}Nr<7Dm4UI9v6;4ksg;2NM5%9nN@iLmHl@bKRz~J1N>fV`QxZ!O2`WxW zwo1z{%1tb>Rm#jwOi$G>$V*pJfCrKk#BxVs;!bCvbd+Sb3jpkT4qkFtrBwG z0d}dcua#$BaY}rDV&nQoe~ zsj+2Rnn7}MVj@hxOMY@GDE49cQ%KbBUzC}inU|PDwmG0o2}(9r9+|}@`9+n`ToasH z2xaADDu7dpRbnzI2iPhlgQ7k)MF}dLNp=W8j4jVd&BL1{Aj*pK(@M${i&7oaQ}ap) zCOLgO1si=(UWNEWADlCgya<*<%GWUEK`w3}Cb$d&l}C08h=MLPFU3}=NXg#rb*-f) z0|TS5r;B5V#>CbO=e3^}N*w)o{rRp;u0+GLI?F`3ePk({F2P^dTXCPgW)mHHA&h_OIjFRWEOGX z?^^WYz~@cf(}dROmWwCXG~CUp77fneS6uTjY%$028^>jPo^t&C`9}HM2aENyUo*PR zwZG%6^N_#FpgHr-@!M~HJz4+alFXBw{0*Jzl11Xne*}met>Z{ET>53pJZ1|A^?8>6 z{VL`zY*uW!EAw^HznMpDxbJ^tzWd@pcu&HTJA3sOh&(mVd%iY#%ayM6OV2TcT#ugH U@y%p50|Nttr>mdKI;Vst0G+SBQ2+n{ literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/quartz/rich_raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/quartz/rich_raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..4bfb674c0883f098fece0a35db3cab570c65c5ab GIT binary patch literal 553 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s94o-U3d7QII&`JdJ-6gj^CPaf}Ok%uSSS|?rEu;DY`6w$cGoVPm5*G$r$TXn+5G|%N$Lfuba30`J=M%?Y|@ItnZ(<>}LLxuXDa}-D~+Kg+D9} zMLT`WX7hfmklB5g?`6ra)PJfOX0w-MN=YPtsIW2c6@FMCVK<-u@kfc1DW8^pc3m5` z`1V`3y>b01k!nhdE@rr#emW^?t=P&{UQ@kV_m$V#c;9+!<`Q@$#pqzt#sfcV+73T- zP@3ql{kE&!{PuOPL$s#qFeLnqOY2b-;d)rN|F8iMM^l53TJ!CtZ_S>4%PjB3xSGO!^<%Q*M=6~d_(6ZIqTjmY%7+=^2#^Ss~loG1Mp&wuMQHSWK4 z^=SqYe_A_sG|#W-Ri0^iW22+Xog++jkF~2J4y);;|g! literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/poor_raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/poor_raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..a1e144deeb75bb6775cee61569192ed66ed93d38 GIT binary patch literal 1827 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qY@nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rg~<&$%ZCI3g(u2hGqtqMkYE6Mh1rF z`Ud9uhQ_)EhE@hqbJP@rU|U{jQmW)Qa)e((;RP6H9EB zGIJBtQ}qk-(v=k8p=RZrpOatYo1cPIz^_NqMUOK!1Z;wlsH` z&YGN*)T5WeHY!f?@QUlS5&tx&I(=98{l72r-aVQ%YP{c-k3^L@T$ z58_2<`n35i51w^4EmK8kq5Z>snhDb-4J3FTRqcILVdJDA&>%SVbgC2w%e)i!_K9tb z=&9Np=dmZf-jKu;KULzO>Dpoi0rK@Au!#Y5QB(AGEUNWC~MS@7uj90$i;t z!dBneef)8w*HWk5cimQBJyc`YemBp3ZP?+m-L6U#6Cx+5bMq_+(MmLty7>C5fmH8> z43h^17CV+!?d5BAI{17tliJy*MF(@t7GHk3AV9-GMd;(^g9#0{-?D9uI?G&_>A3jf zffS>UJTpSrHbkwJ=s#XyHFv`4r#EuUYU;N9a&*`y7ic22w5Or;V1mJe8oR~!-+$&a zP_>)SKh=x%Zl3thntzSeDI0FTHIU&;+!&!S`Q(n?uT^KCOnzF_8KZanq{NSWZhkc< wjzbR(Qm;l@N2;Anne^ui>psCh+wcG23ugFcb<6inHmDl&boFyt=akR{02v^QV*mgE literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/poor_raw_ore_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/poor_raw_ore_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..3fd6534bdfb7e47ba6a4fcc47f9b5bea0b0e1c26 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s6~PZ!4!i{7)7_GVv66lj^hvm#=ykiC$NsA7kbqL8$*XR_}5#6;yK8#V}P3+7(p zx+eDRm3+eF>Wv!=6~dAfmIYjJJGg)?Sc6gVXmasU{&!4eR#!LeHh#my{a;G*>YJ}s z=2uc52pNQC$Nti83_4Z&AaRmzDbo%fABOppa#mc=UK>7ZPFQn|{>jfO_E+~FSgZ0@ zrGJu5;C&|TrBjwGvoc%>T`)I=^F|o|%J?gu51u9DE24v^`mOz1pY3 zYQbj1wrh9n2Ie!&vJYB+`P$BSvZl(VcJaBD#!IJI?~a_|`APQ2j3*`qPPXiO*tRu( z_B3letH|xS>y`HdTLa!0);j()^+v<5uN59VN(j?FZ}z^HO4L zt+bBFer3AAcI`^}0nG)A<5=b~avzu(_4?5Yo^Q;-2dp+sO_8z)$lg2qNx`J-11bCO t$LAEZ*?n}JbUusw#kHvX&-Wkm|Kyyx#N_S4eGCi?44$rjF6*2UngCnDwr2nU literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..2d81e83c1f2d1dae9f5f53d8a3f988941017bb85 GIT binary patch literal 615 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_mZcPZ!4!i{9Ev`@O3IC63vD|Mfb~-@{}^SJG0Ui(zcx%i9*@?0q2ePx9;~p}*{{ z-4B%fe3e`ry#;vn1Up>x+{9*TbV}X(Evs~L{macVapykQojY6^-zjs>qd?)5d1O0|$# zv`WitHg7`7ziEGVdn^rl_VA&iwY7D|EH;P57Y{uCsBqfoVL^r2ftMwhGE6@F{wpId zFWi6pm|y@9w_(tM>1&UtM?e)MuY9s;jfx#=e;4ZQ1PAtF>DM)~s10z}LRV_iaR2@L_p?u*jPmpIMYvk+ZS8-t Z-)`9xKXG%lC<6lngQu&X%Q~loCIIgoB)9+o literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/raw_ore_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/raw_ore_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..8dfa6088c1fe9f509a0118a261d4c265bde98b16 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s6^PZ!4!i{94D=ey4)iX8uVUD94zSlKPdBWTmc37Z0^RJ=RoC3ec~lX$|yHGjoV zxowYk)=`oC-2FS^jQO)T<8r&x#dh<*f1dOFON*V>(k+Iqj%&`J z30trJi)H>}&A0^NvWHb^^I~7c?)Ld%=k|do+n~91+1?AUdeJuHgjgq zzj!bro}n&D;_=cc(t;l)gx7{?OTBLnI<>d1;r`{Q zW=6fP`*YyLcy) z4T?(Zw%&fr_wCpAWB;#wo#~}%zL7O|&0)iw!w=8c?A1!(%wT!HQQ7$X`Vy-@jN*ws WXI6KfX<}etVDNPHb6Mw<&;$TO#@bi_ literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/rich_raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/rich_raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..1c567585b16ae31fe9fa2178fe7fbada1355a717 GIT binary patch literal 1932 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qY@nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rg~<&$%ZCI3g(u2hGqtqMkYE6Mh1rF z`Ud9uhQ_)EhE@hqbJP@rU|U{jQmW)Qa)e((;RP6H9EB zGIJBtQ}qk-(v=k8p=RZrpOatYo1cgre6c)|-f{2n zae*&_N*R-s4edR=eZ9ST&wly${?^~EQriz!@0eG7{omWI=fgrmkH#N5a6D<_fu~QO z`m3fUCp(+Y^qFz~`G%;q875MviatMj(}q+kXXKac|}##p$eO0fB)`H$j{F|-TwOZ>i`kf!w&`Q z=JT%%@w)2b>Tc+*zU3gjY;p0cf=7S8&FLzeh{JVX` zLq#cV@BaPDB3vikR)z>oa!_E{e_wy=YqCGoQ{*VNUWVw~k+Y;JCT)Tin|-ya@Dgl7`xJ&OPUHWc5Wew+M-zV@^+0EhsK-F0txO zG16R`$x_^YSTQxALtAv@6($m$?Wt~$(698Hi Bwuk@# literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/rich_raw_ore_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/tfc_realgar/rich_raw_ore_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..a96446d64c6c41ba8e952c603b64fb721ec7450f GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s6&PZ!4!i{7=D_h*GTim-jSzh*bvA~iSHCfq3qu%U1oqE-ay{-6N!8!B$-_P#+^Vq9&Qt`g<=S!!w z&iS1C<`Kg-Z%zJxTo*Fxy482Ix`&4D_0jZAX1i|Kc{k{k6Yqt*2Hl73b&vGY7Vm8T zuJNO#+m~&v+drAt7A?g$R<3%bd~Ad0S@#XoiuW0FZ4fGyoL(q1cgm$unZuegF7ojo zN<<#G&M@r@|It$!!~Iv6+1b45Zq^JNmKj{LblzNz!w$Bdo;{Rxx@uzU|{fc L^>bP0l+XkK)6T=8 literal 0 HcmV?d00001 diff --git a/kubejs/startup_scripts/tfc/icon_sets.js b/kubejs/startup_scripts/tfc/icon_sets.js index 07415ba6d..bf2378eae 100644 --- a/kubejs/startup_scripts/tfc/icon_sets.js +++ b/kubejs/startup_scripts/tfc/icon_sets.js @@ -18,6 +18,7 @@ function registerTFCIconSets(event) { event.create('tfc_ruby').parent('ruby') event.create('tfc_sapphire').parent('gem_horizontal') event.create('tfc_topaz').parent('gem_vertical') + event.create('tfc_realgar').parent('fine') event.create('tfc_bismuth').parent('bright') event.create('tfc_cassiterite').parent('bright') diff --git a/kubejs/startup_scripts/tfc/materials.js b/kubejs/startup_scripts/tfc/materials.js index 235e4d515..6ea57a9cc 100644 --- a/kubejs/startup_scripts/tfc/materials.js +++ b/kubejs/startup_scripts/tfc/materials.js @@ -72,6 +72,8 @@ const registerTFCMaterials = (event) => { GTMaterials.Chromite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_chromite')) GTMaterials.NetherQuartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) + GTMaterials.CertusQuartz.setMaterialIconSet(GTMaterialIconSet.getByName('certus')) + GTMaterials.Quartzite.setMaterialIconSet(GTMaterialIconSet.getByName('quartz')) GTMaterials.RedAlloy.setMaterialIconSet(GTMaterialIconSet.SHINY) GTMaterials.TinAlloy.setMaterialIconSet(GTMaterialIconSet.SHINY) GTMaterials.BismuthBronze.setMaterialIconSet(GTMaterialIconSet.BRIGHT) @@ -80,7 +82,7 @@ const registerTFCMaterials = (event) => { GTMaterials.Aluminium.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_silver')) GTMaterials.Asbestos.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_gold')) - GTMaterials.Almandine.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_redstone')) + GTMaterials.Almandine.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_realgar')) GTMaterials.Beryllium.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_copper')) GTMaterials.Cobalt.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sphalerite')) GTMaterials.Cobaltite.setMaterialIconSet(GTMaterialIconSet.LAPIS) @@ -112,14 +114,14 @@ const registerTFCMaterials = (event) => { GTMaterials.Pitchblende.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_magnetite')) GTMaterials.VanadiumMagnetite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_chromite')) GTMaterials.Wulfenite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_borax')) - GTMaterials.Realgar.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_redstone')) + GTMaterials.Realgar.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_realgar')) GTMaterials.Spodumene.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_gypsum')) GTMaterials.Mica.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sulfur')) GTMaterials.Barite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_graphite')) GTMaterials.Alunite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_saltpeter')) GTMaterials.Pyrochlore.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_hematite')) GTMaterials.Olivine.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_topaz')) - GTMaterials.GarnetYellow.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_redstone')) + GTMaterials.GarnetYellow.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_realgar')) GTMaterials.Trona.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_pyrite')) GTMaterials.Zeolite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_copper')) GTMaterials.Electrotine.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_garnierite')) From 39fd352f1da21c0d488518e29a27378a5e52bbf9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 15:58:31 +0100 Subject: [PATCH 45/95] changed lush caves' clay patches to a weighted random selected, made kaolin patches a bit rarer --- .../nether/terrain/lush_caves_clay.json | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/lush_caves_clay.json b/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/lush_caves_clay.json index 37e9ec8d5..0daf9f8dd 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/lush_caves_clay.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/lush_caves_clay.json @@ -1,18 +1,31 @@ { - "type": "minecraft:simple_random_selector", + "type": "minecraft:random_selector", "config": { + "default": { + "feature": "tfg:nether/terrain/clay_patch", + "placement": [] + }, "features": [ { - "feature": "tfg:nether/terrain/clay_pool", - "placement": [] + "chance": 0.3, + "feature": { + "feature": "tfg:nether/terrain/clay_pool", + "placement": [] + } }, { - "feature": "tfg:nether/terrain/clay_patch", - "placement": [] + "feature": { + "feature": "tfg:nether/terrain/clay_patch", + "placement": [] + }, + "chance": 0.5 }, { - "feature": "tfg:nether/terrain/clay_patch_kaolin", - "placement": [] + "feature": { + "feature": "tfg:nether/terrain/clay_patch_kaolin", + "placement": [] + }, + "chance": 0.2 } ] } From df62627a4b02049d5a8d91dc81f138f88837684c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 18:37:43 +0100 Subject: [PATCH 46/95] fixed obsidian dust recipe for enderarium --- kubejs/server_scripts/tfg/recipes.terrariums.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/kubejs/server_scripts/tfg/recipes.terrariums.js b/kubejs/server_scripts/tfg/recipes.terrariums.js index 9e63e1565..487e3fa0d 100644 --- a/kubejs/server_scripts/tfg/recipes.terrariums.js +++ b/kubejs/server_scripts/tfg/recipes.terrariums.js @@ -69,12 +69,6 @@ function registerTFGTerrariumRecipes(event) { .duration(200) .EUt(512) - event.recipes.gtceu.macerator('tfg:obsidian') - .itemInputs('minecraft:obsidian') - .itemOutputs('gtceu:obsidian_dust') - .duration(100) - .EUt(512) - // nether bricks event.recipes.gtceu.assembler('tfg:nether_bricks') @@ -87,7 +81,7 @@ function registerTFGTerrariumRecipes(event) { // ender slurry event.recipes.gtceu.mixer('tfg:ender_slurry') - .itemInputs('gtceu:obsidian_dust', 'minecraft:end_stone') + .itemInputs('#forge:dusts/obsidian', 'minecraft:end_stone') .inputFluids(Fluid.of('gtceu:helium', 200), Fluid.of('gtceu:radon', 50)) .outputFluids(Fluid.of('tfg:ender_slurry', 250)) .duration(200) From ca7f66fa8f2e24a3d1d17e9b5a1e5894e1e94164 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 18:44:48 +0100 Subject: [PATCH 47/95] ice and sea ice can't be picked up with a saw any more, added a bunch of recipes around ice and snow for making packed ice in primitive age --- .../quests/chapters/queststfc_tips.snbt | 2 +- kubejs/assets/gtceu/lang/en_us.json | 3 + kubejs/assets/tfg/lang/en_us.json | 15 ++-- kubejs/server_scripts/minecraft/tags.js | 3 + kubejs/server_scripts/tfc/loot.js | 18 +++++ kubejs/server_scripts/tfc/tags.js | 5 ++ .../tfg/recipes.miscellaneous.js | 80 +++++++++++++++++++ 7 files changed, 120 insertions(+), 6 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 862e05861..855826efa 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -3912,7 +3912,7 @@ } { id: "75FC7712CD89CAD7" - item: "minecraft:ice" + item: "minecraft:packed_ice" type: "item" } ] diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index c7b598c79..cfce3d307 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -51,8 +51,11 @@ "item.gtceu.iron_quadruple_cable": "4x Cast Iron Cable", "item.gtceu.iron_octal_cable": "8x Cast Iron Cable", "item.gtceu.iron_hex_cable": "16x Cast Iron Cable", + "item.gtceu.ice_bucket": "Ice Water Bucket", + "material.gtceu.ice": "Ice Water", "metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust", "metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore", + "item.gtceu.tool.behavior.silk_ice": "Silk Harvests Packed Ice", "tagprefix.sword_head": "%s Sword Head", "tagprefix.pickaxe_head": "%s Pickaxe Head", "tagprefix.shovel_head": "%s Shovel Head", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index b71208b98..f07cb814a 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -203,9 +203,6 @@ "material.gtceu.hardwood": "Hardwood", "tfg.disabled_portal": "Portal magic seems to be blocked by an unknown force, try reaching another dimension by going down or up", "item.treetap.tap": "Deprecated Item, Craft to Upgrade", - "tfc.jei.flint_knapping": "Flint Knapping", - "tfc.recipe.barrel.tfg.barrel.soak_hardwood_strip": "Soaking Hardwood Strips", - "tfc.recipe.barrel.tfc.barrel.treated_wood_planks": "Treating Wood Planks", "item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade", "item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade", "item.gtceu.vanadium_ingot": "Deprecated Item, Craft to Upgrade", @@ -374,6 +371,7 @@ "quests..st": "", "quests..d1": "", "quests..t1": "", + "tfc.jei.flint_knapping": "Flint Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "Dyeing", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.light_gray": "Dyeing", @@ -422,7 +420,14 @@ "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_orange_block": "Dyeing", "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_red_block": "Dyeing", "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_brown_block": "Dyeing", - "tfg.grapplemod.repair": "Repair recipe, keeps your upgrades. §lNEVER combine two grapples or you'll loose ALL your upgrades!§r", + "tfc.recipe.barrel.tfg.barrel.soak_hardwood_strip": "Soaking Hardwood Strips", + "tfc.recipe.barrel.tfc.barrel.treated_wood_planks": "Treating Wood Planks", + "tfc.recipe.barrel.tfg.barrel.packed_ice": "Freezing Ice", + "tfc.recipe.barrel.tfg.barrel.cooling_water_1": "Cooling Water", + "tfc.recipe.barrel.tfg.barrel.cooling_water_2": "Cooling Water", + "tfc.recipe.barrel.tfg.barrel.cooling_water_3": "Cooling Water", + "tfc.recipe.barrel.tfg.barrel.cooling_water_4": "Cooling Water", + "tfg.grapplemod.repair": "Repair recipe, keeps your upgrades. §lNEVER combine two grapples or you'll lose ALL your upgrades!§r", "tfg.grapplemod.upgrades.maxlen": "Increases §lMax Length§r by 20, up to 200.", "tfg.grapplemod.downgrades.maxlen": "Decreases §lMax Length§r by 20, down to 20. (Jute Rope is Returned).", "tfg.grapplemod.upgrades.motor.lv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1\n§lMotorAcceleration§r set to 0.125", @@ -1805,7 +1810,7 @@ "quests.tfg_tips.beneath_prep.desc": "The Beneath is a very, VERY hostile environment, due to it being very deep underground the average temperature is always above 15°C, going higher as you go deeper. Not to mention the amount of hostile creatures overall.\nThe quests below this one provide basic preparations for your adventure.", "quests.tfg_tips.beneath_temp_management.title": "Temperature Management: Active", "quests.tfg_tips.beneath_temp_management.subtitle": "Things to cool off quickly", - "quests.tfg_tips.beneath_temp_management.desc": "In the beneath, while the temperature is relatively high, its not high enough to immediatly evaporate nearby sources of Water. As such, you should bring some Water to cool off on demand, or some Ice.\n\nYou can harvest Ice using a regular Saw.", + "quests.tfg_tips.beneath_temp_management.desc": "In the beneath, while the temperature is relatively high, its not high enough to immediatly evaporate nearby sources of Water. As such, you should bring some Water to cool off on demand, or some Packed Ice.\n\nYou can harvest Packed Ice using a Saw, or obtain it by cooling water down in a barrel.", "quests.tfg_tips.beneath_clothes.title": "Temperature Management: Passive", "quests.tfg_tips.beneath_clothes.subtitle": "Things to passively cool off", "quests.tfg_tips.beneath_clothes.desc": "Clothes can also play an important role to cool off. The easiest cloth type to craft before going to the Beneath are Burlap Clothes.\n\nSilk Clothes require String, which can be found inside a Beneath Biome called the Webbed Lair.\n\nThere is a better alternative if you have access to Blue Steel however.", diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 298790c65..39b506db5 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -64,6 +64,9 @@ const registerMinecraftBlockTags = (event) => { event.removeAllTagsFrom(item) }) + // Stops saws from being able to pick up ice + event.remove('minecraft:ice', 'minecraft:ice') + // Теперь обсидиан сторадж блок event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') diff --git a/kubejs/server_scripts/tfc/loot.js b/kubejs/server_scripts/tfc/loot.js index 8e27b403d..dbb7c8c77 100644 --- a/kubejs/server_scripts/tfc/loot.js +++ b/kubejs/server_scripts/tfc/loot.js @@ -58,4 +58,22 @@ function registerTFCLoots(event) event.addEntityLootModifier('tfc:crocodile') .addWeightedLoot([5,10], ['tfc:food/bluegill', 'tfc:food/crappie', 'tfc:food/lake_trout', 'tfc:food/rainbow_trout', 'tfc:food/frog_legs']) .addSequenceLoot(LootEntry.of('tfc:metal/fish_hook/copper').when(c => c.randomChance(0.2))) + + + event.addBlockLootModifier('minecraft:ice') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('firmalife:ice_shavings') + + event.addBlockLootModifier('minecraft:packed_ice') + .not(n => n.matchMainHand("#forge:tools/saws")) + .addWeightedLoot([4,6], ['firmalife:ice_shavings']) + + event.addBlockLootModifier('minecraft:blue_ice') + .not(n => n.matchMainHand("#forge:tools/saws")) + .addWeightedLoot([8,12], ['firmalife:ice_shavings']) + + event.addBlockLootModifier('tfc:sea_ice') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot('firmalife:ice_shavings') + .addSequenceLoot(LootEntry.of('tfc:powder/salt').when(c => c.randomChance(0.2))) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 6f70a8a7a..a978d589d 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -445,6 +445,11 @@ const registerTFCFluidTags = (event) => { event.add('tfc:usable_in_red_steel_bucket', 'gtceu:creosote') event.add('tfc:usable_in_blue_steel_bucket', 'gtceu:creosote') + event.add('tfc:usable_in_barrel', 'gtceu:ice') + event.add('tfc:usable_in_pot', 'gtceu:ice') + event.add('tfc:usable_in_wooden_bucket', 'gtceu:ice') + event.add('tfc:usable_in_red_steel_bucket', 'gtceu:ice') + event.add('tfc:ingredients', 'tfc:spring_water') event.add('tfc:usable_in_barrel', 'tfc:spring_water') event.add('tfc:usable_in_wooden_bucket', 'tfc:spring_water') diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index ccb690ef0..d8655c616 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -233,4 +233,84 @@ function registerTFGMiscellaneousRecipes(event) { B: '#forge:rods/wooden', C: 'tfg:fletching' }).id('tfg:shaped/arrow') + + // Ice + event.remove({id: 'gtceu:compressor/ice_from_dust' }) + event.remove({id: 'gtceu:compressor/ice_from_snow' }) + + event.shapeless('#forge:dusts/ice', ['#forge:tools/mortars', '4x firmalife:ice_shavings']) + .id('tfg:shaped/ice_shavings') + + event.recipes.tfc.quern('#forge:small_dusts/ice', 'firmalife:ice_shavings') + .id('tfg:quern/ice_dust') + + event.recipes.gtceu.macerator('tfg:macerating_ice_shavings') + .itemInputs('4x firmalife:ice_shavings') + .itemOutputs('#forge:dusts/ice') + .duration(40) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.macerator('tfg:macerating_ice_shavings_reverse') + .itemInputs('#forge:dusts/ice') + .itemOutputs('4x firmalife:ice_shavings') + .duration(20) + .EUt(GTValues.VA[GTValues.ULV]) + + event.shapeless('4x firmalife:ice_shavings', ['#forge:dusts/ice', '#forge:tools/hammers']) + + // Cooling water + event.recipes.tfc.barrel_sealed(1000) + .inputItem('1x #forge:dusts/ice') + .inputFluid(Fluid.of('minecraft:water', 144)) + .outputFluid(Fluid.of('gtceu:ice', 144)) + .id('tfg:barrel/cooling_water_1') + + event.recipes.tfc.barrel_sealed(1000) + .inputItem('16x minecraft:snowball') + .inputFluid(Fluid.of('minecraft:water', 144)) + .outputFluid(Fluid.of('gtceu:ice', 144)) + .id('tfg:barrel/cooling_water_2') + + event.recipes.tfc.barrel_sealed(2000) + .inputItem('1x #forge:dusts/ice') + .inputFluid(Fluid.of('tfc:salt_water', 144)) + .outputFluid(Fluid.of('gtceu:ice', 144)) + .id('tfg:barrel/cooling_water_3') + + event.recipes.tfc.barrel_sealed(2000) + .inputItem('16x minecraft:snowball') + .inputFluid(Fluid.of('tfc:salt_water', 144)) + .outputFluid(Fluid.of('gtceu:ice', 144)) + .id('tfg:barrel/cooling_water_4') + + // Freezing it + event.recipes.tfc.barrel_sealed(3000) + .inputItem('9x #forge:dusts/ice') + .inputFluid(Fluid.of('gtceu:ice', 144)) + .outputItem('minecraft:packed_ice') + .id('tfg:barrel/packed_ice') + + // Heating it back up + event.recipes.tfc.pot([], Fluid.of('gtceu:ice', 144), 300, 100) + .fluidOutput(Fluid.of('minecraft:water', 144)) + + event.recipes.firmalife.vat() + .inputFluid(Fluid.of('gtceu:ice', 144)) + .outputFluid(Fluid.of('minecraft:water', 144)) + .length(300) + .temperature(100) + + // Snow + event.recipes.firmalife.stomping('minecraft:snow', 'minecraft:snowball', + 'minecraft:block/snow', 'minecraft:block/snow', 'minecraft:block.snow.place') + .id('tfg:stomping/snow_layer') + + event.shapeless('minecraft:snow_block', ['8x minecraft:snow']) + .id('tfg:shapeless/snow_block') + + event.shapeless('8x minecraft:snowball', ['minecraft:snow_block']) + .id('tfg:shapeless/snowball') + + event.shapeless('8x minecraft:snow', ['minecraft:snow_block', '#forge:tools/saws']) + .id('tfg:shapeless/snow') } \ No newline at end of file From d7ab34649af04501597d4fb4eb20d70f1d43a652 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 18:44:57 +0100 Subject: [PATCH 48/95] forgot to unhide this --- kubejs/startup_scripts/create/constants.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 9b0263296..56fc162f5 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -255,7 +255,6 @@ global.CREATE_DISABLED_ITEMS = [ 'create:blaze_cake', 'create:blaze_cake_base', 'create:sturdy_sheet', - 'create:powdered_obsidian', 'create:polished_rose_quartz', 'create:rose_quartz', 'create:cinder_flour', From 2cab05072f6b5aef2d377c28cae66c493b56d570 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Tue, 22 Apr 2025 22:53:49 +0500 Subject: [PATCH 49/95] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c511c258..bad62a02e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.9.2] +## [Unreleased] ### Changes - Fixed kaolin clay not generating in the overworld - Changed some quests based on feedback From 82c6f08faff049fb09245e54104b84ad69c130c8 Mon Sep 17 00:00:00 2001 From: SverhRazum-Nah Date: Tue, 22 Apr 2025 21:20:54 +0300 Subject: [PATCH 50/95] Add speed boost to nanosuit leggings (#772) * Add files via upload Signed-off-by: SverhRazum-Nah * Update armor.js Signed-off-by: Pyritie --------- Signed-off-by: SverhRazum-Nah Signed-off-by: Pyritie Co-authored-by: Pyritie --- kubejs/server_scripts/gregtech/armor.js | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 kubejs/server_scripts/gregtech/armor.js diff --git a/kubejs/server_scripts/gregtech/armor.js b/kubejs/server_scripts/gregtech/armor.js new file mode 100644 index 000000000..3dd7cff2e --- /dev/null +++ b/kubejs/server_scripts/gregtech/armor.js @@ -0,0 +1,9 @@ +PlayerEvents.tick((event) => { + const { player } = event; + if (player.age % 100 != 0) return; + if (player.legsArmorItem == 'gtceu:nanomuscle_leggings') { + player.potionEffects.add("minecraft:speed", 350, 1, true, false); + } else { + player.removeEffect("minecraft:speed"); + } +}); From 9d45ae65aaf0a4074b02132d7ce940819197ba8a Mon Sep 17 00:00:00 2001 From: Risuga Date: Tue, 22 Apr 2025 11:23:45 -0700 Subject: [PATCH 51/95] Update small vessel capacity (#908) * update small vessel capacity * update --- defaultconfigs/tfc-server.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaultconfigs/tfc-server.toml b/defaultconfigs/tfc-server.toml index 580368763..0b9111095 100644 --- a/defaultconfigs/tfc-server.toml +++ b/defaultconfigs/tfc-server.toml @@ -159,7 +159,7 @@ # # Tank capacity of a crucible (in mB). #Range: 0 ~ 2147483645 - crucibleCapacity = 4000 + crucibleCapacity = 4032 # # A modifier for how fast fluid containers empty into crucibles. Containers will empty 1 mB every (this) number of ticks. #Range: > 1 @@ -502,7 +502,7 @@ # # Tank capacity of a small vessel (in mB). #Range: 0 ~ 2147483645 - smallVesselCapacity = 3000 + smallVesselCapacity = 3024 # # The largest (inclusive) size of an item that is allowed in a small vessel. #Allowed Values: TINY, VERY_SMALL, SMALL, NORMAL, LARGE, VERY_LARGE, HUGE From 850d1c43bf40334e4b3bb9780b78831cccb7e04b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 19:26:20 +0100 Subject: [PATCH 52/95] updated changelog --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bad62a02e..dc233e4d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,12 @@ ### Changes - Fixed kaolin clay not generating in the overworld - Changed some quests based on feedback -- Added a temporary workaround for the ULS-MV millstones/crushing wheels voiding poor raw ores - Added recipes for digger helmet upgrades -- Fixed a duping exploit involving metal plated blocks - Updated field guide for 0.9 (oosyrag) +- Added speed boost to nanosuit leggings (SverhRazum-Nah) +- Updated max capacity of small vessel and crucible to be multiples of 144 (oosyrag) +- Added a temporary fix for the ULS-MV millstones/crushing wheels voiding poor raw ores +- Fixed a duping exploit involving metal plated blocks - Fixed some recipes that were using the wrong wrench tag - Fixed mining machines not working - Removed recipes for firmalife sprinklers. Use gt pipes instead, those can go through sprinkler walls now, and put your sprinklers on drums/fluid tanks/barrels @@ -27,6 +29,10 @@ - Added recipes to craft GT's marble blocks - Added assembler recipes for create deco's bricks, and made vanilla bricks consistent (4 instead of 1 per craft) - Doubled the amount of train tracks you get per craft +- Fixed red alloy/tin alloy double ingots not needing to be heated for anvil recipes +- Long distance item/fluid pipes now need HV +- Kaolin patches now spawn less often in lush cave biomes +- You can no longer pick up regular ice with a saw to prevent moving around water sources, but you can craft packed ice instead if you need to cool off - Removed some more duplicate recipes for vanilla items - Hid some more things in JEI that aren't craftable From ad4e211086c904efd1f67c35cc313f25336c857b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 20:07:32 +0100 Subject: [PATCH 53/95] oh, you can just directly turn off the tfc xp bar, neat --- config/tfc-client.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/tfc-client.toml b/config/tfc-client.toml index 80d50f053..880597f01 100644 --- a/config/tfc-client.toml +++ b/config/tfc-client.toml @@ -20,7 +20,7 @@ enableThirstBar = true # # Allows the vanilla XP bar to render. - enableExperienceBar = true + enableExperienceBar = false # # Enables squids inking your screen. enableInkSplatter = true @@ -85,7 +85,7 @@ # BUMP = Move elements closer to the hotbar; when fishing or riding a jumping entity, other elements move to their default positions # LEFT_HOTBAR = Move elements closer to the hotbar; when fishing or riding a jumping entity, those elements will appear as a vertical bar between the hotbar and offhand slot #Allowed Values: HOVER, BUMP, LEFT_HOTBAR - disabledExperienceBarStyle = "HOVER" + disabledExperienceBarStyle = "BUMP" # # If prospect information should appear in the space above the hotbar (the actionbar). False will put them in the chat window. sendProspectResultsToActionbar = true From a4eda078bf71f82413f5efe7ce4ddd6651e13c68 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 20:15:15 +0100 Subject: [PATCH 54/95] changed the poor ore macerator workaround recipe so everything always gives crushed. Yes this might mean you'll need a robot arm on your crate but it's better than getting no byproducts at all --- kubejs/server_scripts/gregtech/recipes.materials.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 9ec0e6fba..ac7bdaac8 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -310,21 +310,22 @@ function registerGTCEUMetalRecipes(event) { // Macerator let maceratorRecipe = event.recipes.gtceu.macerator(`macerate_poor_raw_${material.getName()}_ore_to_crushed_ore`) - .itemInputs(poorOreItem) .category(GTRecipeCategories.ORE_CRUSHING) .duration(400) .EUt(2) if (multiplier > 1) { + maceratorRecipe.itemInputs(poorOreItem) maceratorRecipe.itemOutputs(crushedOreItem.copyWithCount(multiplier / 2)) } else { // TODO: Change this when Greate fixes its bug //maceratorRecipe.chancedOutput(crushedOreItem, 5000, 750) - maceratorRecipe.itemOutputs(ChemicalHelper.get(TagPrefix.dustSmall, material, 1)) + maceratorRecipe.itemInputs(poorOreItem.copyWithCount(2)) + maceratorRecipe.itemOutputs(crushedOreItem.copyWithCount(1)) } maceratorRecipe.chancedOutput(crushedOreItem.copyWithCount(1), 2500, 500) - .chancedOutput(crushedOreItem.copyWithCount(1), 1250, 250) + maceratorRecipe.chancedOutput(crushedOreItem.copyWithCount(1), 1250, 250) // Quern if (multiplier > 1) { From 17bd5a9a0a039a9a2b2130f607dd774ac388bca9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 22 Apr 2025 20:24:14 +0100 Subject: [PATCH 55/95] oops this was halved --- kubejs/server_scripts/gregtech/recipes.materials.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index ac7bdaac8..10ea4a07b 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -336,7 +336,7 @@ function registerGTCEUMetalRecipes(event) { } else { event.recipes.tfc.quern( - ChemicalHelper.get(TagPrefix.dustSmall, material, 1), + ChemicalHelper.get(TagPrefix.dustSmall, material, 2), poorOreItem ).id(`tfg:quern/${material.getName()}_crushed_ore_from_poor_raw_ore`) } From 5db88cda005b43130ffb86bfe0b0400e5ee8d750 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 00:23:29 +0100 Subject: [PATCH 56/95] fixed mechanical bearing --- kubejs/server_scripts/create/recipes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 325c1bba2..540506441 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1605,7 +1605,7 @@ const registerCreateRecipes = (event) => { ' D ' ], { A: 'create:andesite_casing', - B: '#minecraft:plates/wrought_iron', + B: '#forge:plates/wrought_iron', C: 'tfc:glue', D: '#tfg:small_cogwheels', E: '#forge:tools/wrenches' From 0ac8108f503dc0df6bd4fb60ba4510ec4d21c4a5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 00:33:35 +0100 Subject: [PATCH 57/95] fixed iron dust in the steam bloomery --- kubejs/server_scripts/gregtech/recipes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index a45d9e31c..4c49df757 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -990,7 +990,8 @@ const registerGTCEURecipes = (event) => { if (tfcProperty == null) return; - if (tfcProperty.getOutputMaterial() == GTMaterials.Iron) { + const outputMaterial = tfcProperty.getOutputMaterial() == null ? material : tfcProperty.getOutputMaterial() + if (outputMaterial == GTMaterials.Iron) { event.recipes.gtceu.steam_bloomery(`steam_raw_iron_bloom_coal_${material.getName()}`) .itemInputs(ChemicalHelper.get(TagPrefix.dust, material, 1), '#tfc:steam_bloomery_basic_fuels') .itemOutputs('tfc:raw_iron_bloom') From 87b3937768b2892bb8a4ef17c0008384a8280a78 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 01:08:57 +0100 Subject: [PATCH 58/95] cast iron tools are (mostly) gone! --- kubejs/server_scripts/gregtech/recipes.materials.js | 4 ++++ kubejs/server_scripts/gregtech/recipes.removes.js | 1 + kubejs/startup_scripts/gtceu/constants.js | 2 ++ kubejs/startup_scripts/gtceu/materials.js | 8 ++++---- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 10ea4a07b..8e597519a 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -11,6 +11,10 @@ function registerGTCEUMetalRecipes(event) { if (toolHeadItem.isEmpty()) return + // Skip this one because it has a duping bug, and you can't remove the macerator/arc furnace iron pick recipes + if (material == GTMaterials.Iron) + return; + event.recipes.tfc.advanced_shapeless_crafting( TFC.itemStackProvider.of(toolItem).copyForgingBonus().copyHeat(), [toolHeadItem, '#forge:rods/wooden'], toolHeadItem) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 3482b6653..869a6d6ea 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -585,6 +585,7 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:shaped/detector_rail' }) event.remove({ id: 'gtceu:shaped/activator_rail' }) event.remove({ id: 'gtceu:shaped/shield' }) + event.remove({ id: 'gtceu:shaped/pickaxe_iron' }) event.remove({ id: 'gtceu:shaped_fluid_container/treated_wood_planks' }) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 3694330b4..e6673295c 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -36,6 +36,8 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:firebricks', 'gtceu:wood_drum', 'gtceu:primitive_blast_furnace', + 'gtceu:iron_pickaxe', + 'gtceu:iron_pickaxe_head', 'gtceu:wood_screwdriver_tip', 'gtceu:wood_wrench_tip', diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index a1ee77581..f4dbfe7a9 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -94,7 +94,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Tin.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 230, 1)); GTMaterials.Zinc.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(252, 336, 420, 1)); GTMaterials.SterlingSilver.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(570, 760, 950, 1)); - GTMaterials.Iron.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, 3)); + GTMaterials.Iron.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3)); GTMaterials.Hematite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); GTMaterials.YellowLimonite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); @@ -212,12 +212,12 @@ const registerGTCEuMaterialModification = (event) => { ]).build()); GTMaterials.Copper.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.0, 1.5, 132, 2, metalTooling).build()); - GTMaterials.BismuthBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.5, 2.0, 178, 2, metalTooling).build()); - GTMaterials.BlackBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(3.3, 2.0, 204, 2, metalTooling).build()); + GTMaterials.BismuthBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.7, 2.0, 188, 2, metalTooling).build()); + GTMaterials.BlackBronze.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(3.1, 2.0, 194, 2, metalTooling).build()); GTMaterials.BlackSteel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(6.5, 4.5, 1228, 3, metalTooling).build()); // Cast iron tools don't make sense but gregtech shits itself if they're missing, // so I'm just giving them terrible terrible stats - GTMaterials.Iron.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(1.0, 1.0, 100, 2, metalTooling).build()); + GTMaterials.Iron.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.5, 1.0, 20, 2, [GTToolType.PICKAXE]).build()); for (var material of GTCEuAPI.materialManager.getRegisteredMaterials()) { var toolProperty = material.getProperty(PropertyKey.TOOL); From 03fa741db6c843ef092736a5ebf52659d27ef90a Mon Sep 17 00:00:00 2001 From: TomPlop Date: Wed, 23 Apr 2025 12:34:31 -0400 Subject: [PATCH 59/95] Quests rework and small fixes (#911) * First modification of MV Quest structure test * Starting some changes for quest_rework * Fixes for scaffolding frame and bloomery steam consumption so it works with only one High pressure liquid boiler * Big changes for quests including Ore Processing Chapter, MV Chapter without the lang file and some fixes around the quest book. Also include a fix for Steam Bloomery so it only needs 1 High Pressure Liquid Boiler to run as max parallel and the fix for scaffolding frame * Update my branch with recent changes * Fix for Ice to Packed Ice --- config/ftbquests/quests/chapters/ae2.snbt | 53 + config/ftbquests/quests/chapters/cc.snbt | 2 +- .../quests/chapters/ev__extreme_voltage.snbt | 19 +- .../quests/chapters/hv__high_voltage.snbt | 76 +- .../quests/chapters/lv__low_voltage.snbt | 53 +- .../quests/chapters/mv__medium_voltage.snbt | 1138 +++++++++-------- .../quests/chapters/ore_processing.snbt | 836 ++++++++++++ .../quests/chapters/progression.snbt | 18 +- .../quests/chapters/questsmetallurgy.snbt | 2 +- .../quests/chapters/questsstoneage.snbt | 2 +- .../quests/chapters/queststfc_tips.snbt | 206 ++- kubejs/server_scripts/gregtech/recipes.js | 8 +- kubejs/server_scripts/tfc/recipes.js | 1 + .../tfg/recipes.miscellaneous.js | 6 +- 14 files changed, 1796 insertions(+), 624 deletions(-) create mode 100644 config/ftbquests/quests/chapters/ore_processing.snbt diff --git a/config/ftbquests/quests/chapters/ae2.snbt b/config/ftbquests/quests/chapters/ae2.snbt index 0cc682b1e..0561b6d5a 100644 --- a/config/ftbquests/quests/chapters/ae2.snbt +++ b/config/ftbquests/quests/chapters/ae2.snbt @@ -2302,6 +2302,59 @@ x: 8.5d y: 4.0d } + { + dependencies: ["1269F30575599F10"] + id: "2D90631147B852D2" + tasks: [{ + id: "4B92CEB19BA7FB49" + item: "expatternprovider:oversize_interface" + type: "item" + }] + x: 15.5d + y: 4.0d + } + { + dependencies: [ + "1FB2089C461BD7F5" + "6D1FC61E12586D57" + ] + id: "6F9069736E604DB4" + tasks: [ + { + id: "0C7898F1DF3EDC06" + item: "expatternprovider:assembler_matrix_frame" + type: "item" + } + { + id: "4688AE993B97749F" + item: "expatternprovider:assembler_matrix_wall" + type: "item" + } + { + id: "156E6F2A72944DD1" + item: "expatternprovider:assembler_matrix_pattern" + type: "item" + } + { + id: "4DDF957C178999AF" + item: "expatternprovider:assembler_matrix_crafter" + type: "item" + } + { + id: "11BCB5AF876035A2" + item: "expatternprovider:assembler_matrix_speed" + type: "item" + } + { + id: "19B6A6C5D2A9C3BE" + item: "expatternprovider:assembler_matrix_glass" + optional_task: true + type: "item" + } + ] + x: 13.5d + y: 6.0d + } ] title: "&6HV&r - AE2" } diff --git a/config/ftbquests/quests/chapters/cc.snbt b/config/ftbquests/quests/chapters/cc.snbt index 498840db0..5312e34b9 100644 --- a/config/ftbquests/quests/chapters/cc.snbt +++ b/config/ftbquests/quests/chapters/cc.snbt @@ -5,7 +5,7 @@ group: "44D0F3E5067B5AB8" icon: "computercraft:computer_advanced" id: "1A6D6B70EC13DDC6" - order_index: 2 + order_index: 3 quest_links: [ ] quests: [ { diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index ac0f139c4..6d9c53fdc 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -340,7 +340,6 @@ dependencies: [ "40408FFD02134148" "7FA0ACB7F161F378" - "4AFD3073C731A1E4" ] description: ["You know the drill by now."] icon: "gtceu:ev_assembler" @@ -389,7 +388,6 @@ "3398FC108D9DCB46" "41D32C5178760F47" "40408FFD02134148" - "4AFD3073C731A1E4" "6B08799BCFD01D3D" "7FA0ACB7F161F378" ] @@ -582,10 +580,7 @@ y: 5.625d } { - dependencies: [ - "4AFD3073C731A1E4" - "7FA0ACB7F161F378" - ] + dependencies: ["7FA0ACB7F161F378"] description: [ "The &aLarge Titanium Boiler&r is yet another steam boiler. It's even more efficient than the previous ones, and produces more steam too. However, Steam &cbarely scales&r at this voltage." "" @@ -690,7 +685,6 @@ { dependencies: [ "40408FFD02134148" - "4AFD3073C731A1E4" "7FA0ACB7F161F378" ] description: [ @@ -714,7 +708,6 @@ "73E8283634E5E33A" "3398FC108D9DCB46" "40408FFD02134148" - "4AFD3073C731A1E4" "7FA0ACB7F161F378" ] description: [ @@ -735,10 +728,7 @@ y: 7.875d } { - dependencies: [ - "4AFD3073C731A1E4" - "7FA0ACB7F161F378" - ] + dependencies: ["7FA0ACB7F161F378"] description: [ "Note that in theory, the &3EV Chemical Reactor&r is skippable by using the &3Large Chemical Reactor&r instead, but we're evil enough to force you to make this." "" @@ -1358,10 +1348,7 @@ y: 9.0d } { - dependencies: [ - "4AFD3073C731A1E4" - "16A6AE5C770DB83A" - ] + dependencies: ["16A6AE5C770DB83A"] description: [ "The &3Distillation Tower&r is a multiblock that will help you extract the most out of fluids. In &3Distilleries&r, you had to pick only one product to output. DTs output &6all of it at once&r!" "" diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index adf45f331..66b19f6d2 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -5,7 +5,7 @@ group: "44D0F3E5067B5AB8" icon: "gtceu:hv_electric_motor" id: "237BDB19A9495869" - order_index: 3 + order_index: 2 quest_links: [ { id: "2583D0B64E51FAC8" @@ -14,13 +14,6 @@ x: 7.875d y: -5.25d } - { - id: "47BF469B9B0EB28A" - linked_quest: "4AFD3073C731A1E4" - size: 0.75d - x: 7.875d - y: -4.125d - } { id: "6C3B2B8F8B6646EA" linked_quest: "6DDDE2268B691F74" @@ -572,7 +565,6 @@ y: -5.25d } { - dependencies: ["4AFD3073C731A1E4"] description: [ "The &3Vacuum Freezer&r is a multiblock used to cool down &eHot Ingots&r. All ingots made in the EBF with a temperature above &d1750K&r will need it." "" @@ -613,10 +605,7 @@ y: -4.125d } { - dependencies: [ - "41D32C5178760F47" - "4AFD3073C731A1E4" - ] + dependencies: ["41D32C5178760F47"] description: [ "The next &3Circuit Assembler&r. This tier of Circuit Assembler is only required for one type of Circuit - your first ever &aMainframe&r." "" @@ -653,10 +642,7 @@ y: -1.875d } { - dependencies: [ - "4AFD3073C731A1E4" - "6B1595678ECB7AC8" - ] + dependencies: ["6A451F43F3D7A671"] description: [ "The first &1IV&r circuit. Congratulations on making it this far!" "" @@ -1268,6 +1254,62 @@ x: 2.25d y: -3.0d } + { + description: [ + "&aBlue Alloy&r is an excellent Cable material for &6HV&r power." + "" + "Nothing is preventing you from using it for &bMV&r power too! Make sure that you don't overvolt your machines, though." + "" + "Superconductors for both &bMV&r and &6HV&r are unlocked... later." + "" + "&aElectrotine&r is obtained from the &cNether&r, so don't craft it in the Mixer!" + "" + "Furthermore, &aElectrotine&r can be separated for &dElectrum&r and &dRedstone&r." + ] + icon: "gtceu:blue_alloy_ingot" + id: "073F59194B479AA3" + rewards: [{ + id: "6DDC52F547CDE852" + item: "gtceu:electrotine_dust" + random_bonus: 7 + type: "item" + }] + shape: "square" + size: 1.0d + subtitle: "You're blue now... that's my alloy" + tasks: [{ + id: "6214AC99E4182DD9" + item: "gtceu:blue_alloy_ingot" + type: "item" + }] + title: "Blue Alloy" + x: 11.0d + y: -6.0d + } + { + dependencies: [ + "5063FDFFBE3E4855" + "3568BC9742092FC5" + ] + description: [ + "Your first &5EV&r Circuit gets a unique texture. If you still consider yourself to be in &bMV&r, &ahold off&r on making too many of these, as they won't benefit you right now. We can't stop you from making these if you &djust wanna flex&r on us, though." + "" + "It'll be needed in &6HV&r." + ] + icon: "gtceu:micro_processor_computer" + id: "6A451F43F3D7A671" + shape: "square" + size: 1.0d + subtitle: "Standing out amongst the rest" + tasks: [{ + id: "01FE6BC2780D623B" + item: "gtceu:micro_processor_computer" + type: "item" + }] + title: "First EV Circuits!" + x: 8.0d + y: -4.0d + } ] subtitle: ["Scale up your power and begin advanced chemistry"] title: "&6HV&r - High Voltage" diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index db0817f6c..3f083108b 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -177,34 +177,6 @@ x: 5.5d y: -0.5d } - { - description: [ - "In theory, Crates are flat upgrades to Chests. A single block space that stores more items - what more could you ask for?" - "" - "Unfortunately, there's a small downside - Crates do not support item movement shortcuts well. We plan on fixing this in the long-term." - "" - "Where they shine however is the fact that they &6accept Covers&r, making them perfect candidates for buffers in automation." - ] - icon: "gtceu:bronze_crate" - id: "7CCC1BDDE0C67F16" - shape: "rsquare" - size: 1.0d - subtitle: "Earlygame buffering" - tasks: [{ - id: "78E120F8EDE2BD3F" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:wood_crate)item(gtceu:bronze_crate)item(gtceu:steel_crate)item(gtceu:aluminium_crate)item(gtceu:stainless_steel_crate)item(gtceu:titanium_crate)item(gtceu:tungsten_steel_crate))" - } - } - type: "item" - }] - title: "GregTech Storage" - x: 6.5d - y: -0.5d - } { dependencies: [ "288CE4AA4C5AA8BF" @@ -384,7 +356,8 @@ "{quests.low_voltage.lv_superconductor.desc.2}" ] id: "46AD7A6F3B6775F5" - shape: "rsquare" + optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.lv_superconductor.subtitle}" tasks: [{ @@ -590,7 +563,10 @@ y: 4.5d } { - dependencies: ["3E6DC423FE4A99F7"] + dependencies: [ + "3E6DC423FE4A99F7" + "02FDECC931B5E8EF" + ] description: ["{quests.low_voltage.lv_ore_prospector.desc}"] id: "2E36E5755B2F551C" shape: "heart" @@ -1195,23 +1171,6 @@ x: 3.0d y: -0.5d } - { - dependencies: ["7CCC1BDDE0C67F16"] - description: ["With that tape you wil be able to move around the crate. The main advantage? You can put anything in a crate, weight won't be an issue here."] - icon: "gtceu:basic_tape" - id: "37151F9C4A240041" - shape: "rsquare" - size: 1.0d - subtitle: "Moving stuff around" - tasks: [{ - id: "2FCA41AFFAF08816" - item: "gtceu:basic_tape" - type: "item" - }] - title: "Tape for Crate" - x: 7.5d - y: -0.5d - } { dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.lv_mixer.desc}"] diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index 03e0fe32b..8c3a7301f 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -1,25 +1,15 @@ { default_hide_dependency_lines: false - default_quest_shape: "rsquare" + default_quest_shape: "square" filename: "mv__medium_voltage" group: "44D0F3E5067B5AB8" icon: "gtceu:mv_electric_motor" id: "43E779CEEB25D55B" order_index: 1 - quest_links: [{ - id: "6FCAD016C795DE93" - linked_quest: "7567E885B7166603" - shape: "gear" - size: 1.2d - x: 0.0d - y: 0.375d - }] + quest_links: [ ] quests: [ { - dependencies: [ - "0DBC148D92A9F69F" - "7567E885B7166603" - ] + dependencies: ["22E462070F8B027A"] description: [ "The &3Pyrolyse Oven&r is an electric equivalent to the &3Coke Oven&r. It can produce &9Coal Coke&r and &9Charcoal&r with a &9Creosote&r byproduct just as before, but also has additional &6Organic Byproducts&r, the most beneficial of these being &aWood Tar&r." "" @@ -38,13 +28,13 @@ "" "The Pyrolyse Oven remains &doptional&r. However, it is very rewarding to construct one either for Power, or for the various Byproducts, and we highly recommend you give it a look." "" - "&l&3Lore:&r&o In GT5u, the structure for the Pyrolyse Oven was infamously a giant box with only 9 coils inside. Players usually spent several minutes debugging what is wrong due to a lack of a JEI preview." + "&l&3Lore:&r&o In GT5u, the structure for the Pyrolyse Oven was infamously a giant box with only 9 coils inside. Players usually spent several minutes debugging what is wrong due to a lack of a EMI preview." ] icon: "gtceu:pyrolyse_oven" id: "53DC6E32C41C94C3" optional: true shape: "square" - size: 0.75d + size: 1.0d subtitle: "Thermal Decomposition" tasks: [{ id: "0FD2962C232149F8" @@ -52,8 +42,8 @@ type: "item" }] title: "Pyrolyse Oven" - x: 0.0d - y: -0.75d + x: -2.5d + y: -0.5d } { dependencies: [ @@ -73,31 +63,33 @@ ] icon: "gtceu:plant_ball" id: "6EB68C28BEE24DEF" - size: 0.66d + size: 1.0d subtitle: "Plants aren't industrial enough!" tasks: [{ - id: "74B1433E65EC86E4" + id: "4FBD476EB6B6DD04" item: "gtceu:biomass_bucket" type: "item" }] title: "Biomass" - x: 0.0d - y: -1.875d + x: -5.5d + y: -0.5d } { - dependencies: ["648BCF486E16CCB2"] + dependencies: ["22E462070F8B027A"] description: [ "The Brewery can be used to make &aLubricant&r from &aRedstone&r and &aCreosote&r/&aOil&r. Lubricant has some niche uses, namely being used in the &3Cutter&r to significantly reduce the duration of its recipes." "" - "The Brewery is a very very slow machine, but it requires almost no power. Building &2many Breweries&r will help you obtain enough Biomass on your quest for plastic." + "The Brewery is a very, very slow machine, but it requires almost no power to run its recipes. Building &2many Breweries&r will help you obtain enough Biomass on your quest for plastic. Oh, and you can use it to brew &dPotions&r too!" "" "&9Note:&r The Brewery \"unlocks\" the Biomass path towards &9Ethylene&r. The same can be done in the &3Pyrolyse Oven&r. The other path involves Oil.&r" "{@pagebreak}" "&l&3Lore:&r&o You could make your own Brewery if you want to build up a company and start selling Booze... in GregTech 6.&r" ] + hide_dependency_lines: true icon: "gtceu:mv_brewery" id: "1A29EFBCEA017F99" - size: 0.66d + shape: "square" + size: 1.0d subtitle: "*hic*... *hic*" tasks: [ { @@ -106,16 +98,15 @@ type: "item" } { - amount: 1000L - fluid: "gtceu:lubricant" - id: "1C0C8D71AF8C41C2" + id: "1CB0F32E8293B5D7" + item: "gtceu:lubricant_bucket" optional_task: true - type: "fluid" + type: "item" } ] title: "Local Brewery selling Booze" - x: 1.125d - y: -1.875d + x: -5.5d + y: -2.0d } { dependencies: [ @@ -132,18 +123,18 @@ ] icon: "gtceu:ethylene_bucket" id: "6BB98D128822730E" - min_required_dependencies: 2 + min_required_dependencies: 1 shape: "square" - size: 0.75d + size: 1.0d subtitle: "One of many hydrocarbons" tasks: [{ - id: "286ED57C12F41DF2" + id: "29191DABA0ACE155" item: "gtceu:ethylene_bucket" type: "item" }] title: "Ethylene" - x: 1.125d - y: -3.0d + x: -10.0d + y: 1.0d } { dependencies: [ @@ -160,16 +151,17 @@ "&cDo not try&r to use Ethanol as a Power source... it's quite possibly its worst use. If it's organic &9Power&r that you want, we suggest taking a look at &dBenzene&r instead!" ] id: "5D9D01EF219A31C5" - size: 0.66d + optional: true + size: 1.0d subtitle: "Yo, wait - that's alcohol!" tasks: [{ - id: "65AD613CEB9435CB" + id: "6D7350EA7AB6CF25" item: "gtceu:ethanol_bucket" type: "item" }] title: "Ethanol" - x: 0.0d - y: -3.0d + x: -8.0d + y: -0.5d } { dependencies: ["6A304E453D74C57C"] @@ -184,22 +176,25 @@ ] icon: "gtceu:naphtha_bucket" id: "6238B2A7ED1BE5A1" - size: 0.66d + optional: true + size: 1.0d + subtitle: "We're still confused on how this is pronounced" tasks: [ { - id: "64118ED7C2393AA4" - item: "gtceu:naphtha_bucket" + id: "01BF2D557A9EF2B0" + item: "gtceu:sulfuric_naphtha_bucket" + optional_task: true type: "item" } { - id: "2CDC4272BD17EB7D" - item: "gtceu:sulfuric_naphtha_bucket" + id: "75B40C6A92BB88B5" + item: "gtceu:naphtha_bucket" type: "item" } ] title: "Naphtha" - x: -1.125d - y: -4.125d + x: -7.5d + y: 2.5d } { dependencies: ["6238B2A7ED1BE5A1"] @@ -216,16 +211,17 @@ ] icon: "gtceu:severely_steam_cracked_naphtha_bucket" id: "3E2E161F8CE35138" - size: 0.66d + optional: true + size: 1.0d subtitle: "Fuel and oil cracking can get complicated..." tasks: [{ - id: "11731C5DF7FBC8DF" + id: "5687D81E6BFDC7E0" item: "gtceu:severely_steam_cracked_naphtha_bucket" type: "item" }] title: "Fuel Cracking" - x: 0.0d - y: -4.125d + x: -8.5d + y: 2.5d } { dependencies: [ @@ -247,25 +243,36 @@ icon: "gtceu:mv_steam_turbine" id: "583D0CC4FAA4FC98" shape: "square" - size: 0.75d + size: 1.0d + subtitle: "Things are 'boutta get rough" tasks: [{ id: "1F170291094582D6" item: { Count: 1 - id: "ftbfiltersystem:smart_filter" + id: "itemfilters:or" tag: { - display: { - Name: "{\"text\":\"MV Generators\"}" - } - "ftbfiltersystem:filter": "or(item(gtceu:mv_steam_turbine)item(gtceu:mv_combustion)item(gtceu:mv_gas_turbine))" + items: [ + { + Count: 1b + id: "gtceu:mv_steam_turbine" + } + { + Count: 1b + id: "gtceu:mv_gas_turbine" + } + { + Count: 1b + id: "gtceu:mv_combustion" + } + ] } } title: "MV Generators" type: "item" }] title: "Electricity Generation in MV" - x: 2.25d - y: -1.875d + x: 5.5d + y: -2.0d } { dependencies: ["2AD44111B9B39C90"] @@ -274,7 +281,7 @@ "" "Stainless Steel is the material for &6HV&r components, like Aluminium for &bMV&r and Steel for &7LV&r. It is also used in high quantities for the &3Distillation Tower&r." "" - "It requires &cChrome&r, obtained mainly from &cRuby&r, and &2Manganese&r, obtained from &2Pyrolusite&r and others in its vein." + "It requires &cChromium&r, obtained mainly from &cRuby&r, and &2Manganese&r, obtained from &2Pyrolusite&r and others in its vein." "{@pagebreak}" "Smelting Stainless Steel requires &dHV Power&r, which you likely do not have at this point. Scaling Power Production is crucial." "" @@ -284,8 +291,13 @@ ] icon: "gtceu:stainless_steel_ingot" id: "16A6AE5C770DB83A" - shape: "gear" - size: 1.3d + rewards: [{ + exclude_from_claim_all: true + id: "3973B757526393F6" + type: "choice" + }] + shape: "octagon" + size: 1.5d subtitle: "HV is in your grasp" tasks: [{ id: "3192FF80FBDC7A28" @@ -293,8 +305,8 @@ type: "item" }] title: "Stainless Steel" - x: 3.375d - y: 0.375d + x: 0.5d + y: 7.5d } { dependencies: [ @@ -317,21 +329,19 @@ hide_dependency_lines: true icon: "gtceu:mv_transformer_1a" id: "6C20A9A64C1BE0BF" - size: 0.75d + size: 1.0d + subtitle: "LV In Disguise" tasks: [{ id: "6C36867EB98E772D" item: "gtceu:lv_transformer_1a" type: "item" }] title: "Transformers" - x: 2.25d - y: 1.5d + x: 5.5d + y: -5.0d } { - dependencies: [ - "7567E885B7166603" - "0DBC148D92A9F69F" - ] + dependencies: ["22E462070F8B027A"] description: [ "If you're wanting to dive into &bMV&r, start here." "" @@ -340,7 +350,7 @@ icon: "gtceu:mv_mixer" id: "4A92AFD2532EED26" shape: "square" - size: 0.75d + size: 1.0d subtitle: "Mixing more complex alloys" tasks: [{ id: "31B514C75B302F25" @@ -348,8 +358,8 @@ type: "item" }] title: "Advanced Mixer" - x: 1.125d - y: 1.5d + x: 5.5d + y: 1.0d } { dependencies: ["7567E885B7166603"] @@ -364,7 +374,8 @@ ] icon: "gtceu:mv_electric_motor" id: "1BE0349B8F3890D3" - size: 0.66d + shape: "square" + size: 1.0d subtitle: "Hated crafting these in the previous tier?" tasks: [ { @@ -399,76 +410,31 @@ } ] title: "MV Components" - x: 0.0d - y: 1.5d + x: 0.5d + y: -2.0d } { dependencies: [ "7567E885B7166603" "0DBC148D92A9F69F" ] - description: ["The Advanced Electrolyzer allows you to decompose &6far more&r Dusts. This will make getting materials such as &aAluminium&r&o a lot easier!"] + description: ["The Advanced Electrolyzer allows you to decompose &6far more&r Dusts. This will make getting materials such as &aAluminium&r&o a lot&r easier!"] icon: "gtceu:mv_electrolyzer" id: "0EFEE489906256AA" shape: "square" - size: 0.75d + size: 1.0d subtitle: "We made it to MV, and, well..." tasks: [{ id: "151788F66BAD5F97" item: "gtceu:mv_electrolyzer" type: "item" }] - title: "Advanced Electrolyser" - x: -1.125d - y: 1.5d + title: "{quests.medium_voltage.electrolyzer.title}" + x: 7.0d + y: -0.5d } { - dependencies: ["0EFEE489906256AA"] - description: [ - "All four output Dusts obtained from Clay electrolysis are immensely useful." - "" - "We'll ask you to give us a total of &a416 Clay Dust&r for this quest. You may also want to look into other sources of similar materials, such as &aSodalite&r. Check JEI for some ideas." - "" - "You should use the Sodium and/or Lithium to make some &6MV Batteries&r." - "" - "Grr, all this useless &dWater&r you're getting keeps clogging the machine! Maybe you should deal with it by using a &3Voiding Cover&r." - ] - icon: "minecraft:clay_ball" - id: "2273DD7E5CD49017" - size: 0.66d - subtitle: "Clay is an extremely &mbalanced&r useful material for electrolysis" - tasks: [ - { - count: 64L - id: "0BE33D992F7761EA" - item: "gtceu:sodium_dust" - type: "item" - } - { - count: 32L - id: "3C7B4B2F850620FB" - item: "gtceu:lithium_dust" - type: "item" - } - { - count: 64L - id: "531FE43ADBEE689B" - item: "gtceu:aluminium_dust" - type: "item" - } - { - count: 64L - id: "0048C85BB03C4811" - item: "gtceu:silicon_dust" - type: "item" - } - ] - title: "A Balanced Quest" - x: -2.25d - y: 1.5d - } - { - dependencies: ["0DBC148D92A9F69F"] + dependencies: ["22E462070F8B027A"] description: [ "This kind soul&r will mine ores for you when placed above a vein." "" @@ -476,38 +442,36 @@ "" "The &bMV&r variant may not have the range to mine a full vein, but the &6HV&r variant does, so you may wish hold off for now. Get &eeither&r to complete this Quest." "{@pagebreak}" - "You will need &9Power&r. &aCharged Batteries&r may work but they may also run out which is a bit inconvenient." + "You will need &9Power&r. &aCharged Batteries&r may work, but they tend to run out of power, which is a bit inconvenient." "" - "Our top suggestion is to use a filled &3Drum&r of some kind of fuel (if you are using Steam, no dice!) and a &3Generator&r. " + "Our top suggestion is to use a filled &3Drum&r of some kind of fuel &7(if you're using Steam, no dice!)&r and a &3Generator&r. " "" "Place the Drum above your Generator and right-click it with a &5Screwdriver&r to auto-output into the Generator." "{@pagebreak}" - "&cNote:&r Do not forget to &dchunkload&r all 9 chunks of the ore vein with FTB Utilities (open the map in the top left corner, claim the chunks with left-click, and enable force loading with shift-left-click)." + "&cNote:&r Do not forget to &dchunkload&r all 9 chunks of the ore vein with FTB Utilities &7(open the map in the top left corner, claim the chunks with left-click, and enable force loading with shift-left-click)&r." "" "&9Tip:&r You can either use an &3ME Chest&r or a &32x2 Drawer&r as the output inventory to make transporting the ores back home a simple task. The &3ME Chest&r can be powered with EU directly." ] icon: "gtceu:mv_miner" id: "5C94CF50090D7DA0" - shape: "square" - size: 0.75d + optional: true + shape: "heart" + size: 1.0d tasks: [{ id: "431D533510584687" item: { Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - display: { - Name: "{\"text\":\"Any miner\"}" - } - "ftbfiltersystem:filter": "or(item(gtceu:lv_miner)item(gtceu:mv_miner)item(gtceu:hv_miner))" + "ftbfiltersystem:filter": "or(item(gtceu:lp_steam_miner)item(gtceu:hp_steam_miner)item(gtceu:lv_miner)item(gtceu:mv_miner)item(gtceu:hv_miner))" } } title: "Any of the listed Miners" type: "item" }] title: "Digital Miner" - x: -3.375d - y: 1.5d + x: 0.5d + y: 3.0d } { dependencies: ["4A92AFD2532EED26"] @@ -521,7 +485,8 @@ icon: "gtceu:vanadium_steel_ingot" id: "682C26579EDDCA76" shape: "square" - size: 0.75d + size: 1.0d + subtitle: "Steel Your Heart" tasks: [{ count: 4L id: "2E6C71CB2E5EEAC7" @@ -529,8 +494,8 @@ type: "item" }] title: "Steel Alloys" - x: 1.125d - y: 2.625d + x: 7.0d + y: 1.0d } { dependencies: ["682C26579EDDCA76"] @@ -543,8 +508,8 @@ ] icon: "gtceu:mv_cutter" id: "5CBBBFD1FBBE95CE" - shape: "square" - size: 0.75d + shape: "octagon" + size: 2.0d subtitle: "Upgrades, people, upgrades!" tasks: [{ id: "2AFB7F9BD4D82974" @@ -552,8 +517,8 @@ type: "item" }] title: "Advanced Cutter" - x: 2.25d - y: 2.625d + x: 7.0d + y: 4.0d } { dependencies: [ @@ -567,16 +532,16 @@ ] icon: "gtceu:mv_laser_engraver" id: "315169840E06110F" - shape: "square" - size: 0.75d + shape: "octagon" + size: 2.0d tasks: [{ id: "75E27D981733ED44" item: "gtceu:mv_laser_engraver" type: "item" }] title: "Laser Engraving" - x: 4.5d - y: 2.625d + x: 7.0d + y: 8.0d } { dependencies: [ @@ -590,8 +555,14 @@ ] icon: "gtceu:mv_energy_input_hatch" id: "2AD44111B9B39C90" - shape: "square" - size: 0.75d + rewards: [{ + count: 24 + id: "42B5E0E29F987E16" + item: "gtceu:annealed_copper_single_wire" + type: "item" + }] + shape: "octagon" + size: 1.5d subtitle: "LV is so old-school!" tasks: [{ id: "1C69557EB4F9E50F" @@ -599,14 +570,11 @@ type: "item" }] title: "Upgrade your EBF!" - x: 3.375d - y: -0.75d + x: 3.0d + y: 10.0d } { - dependencies: [ - "7567E885B7166603" - "0DBC148D92A9F69F" - ] + dependencies: ["22E462070F8B027A"] description: [ "The &3Assembler&r is a staple for every Tier; an important goal to unlock more recipes and progress further into the Age. Many in the community see crafting a voltage tier's Assembler as a sign of &oproperly&r reaching said voltage." "" @@ -616,16 +584,17 @@ ] icon: "gtceu:mv_assembler" id: "75F38905DEA60F15" - shape: "square" - size: 0.75d + shape: "octagon" + size: 2.0d + subtitle: "Assengers, Avemble" tasks: [{ id: "2396FECF2A11AA8E" item: "gtceu:mv_assembler" type: "item" }] title: "Advanced Assembler" - x: 1.125d - y: -0.75d + x: 3.0d + y: 4.0d } { dependencies: [ @@ -637,13 +606,13 @@ "" "The multiblock &3Greenhouse&r will be your source of &aWood&r and other plants if you wish." "" - "The &aWood&r production should be enough to run &32 Pyrolyse Ovens&r at their lowest Power." + "Its &aWood&r production should be enough to run &32 Pyrolyse Ovens&r at their lowest Power." "" "You can also use this for automated &aResin&r. The yields are kept low to incentivize other rubber sources later in the game." "{@pagebreak}" "&9Note: &rWith &d40 EU/t&r recipes, it needs either 1 &bMV&r energy hatch or 2 &7LV&r energy hatches. Multiblocks will &cnot&r use 2A of one tier to reach the next one for recipe voltage minimums. " "" - "In other words, the controller needs to say at least \"&bMV&r\" in the GUI to run recipes which say \"&bMV&r\" in JEI, even if they can draw enough EU/t with a lower tier hatch configuration." + "In other words, the controller needs to say at least \"&bMV&r\" in the GUI to run recipes which say \"&bMV&r\" in EMI, even if they can draw enough EU/t with a lower tier hatch configuration." "" "&9Note:&r The structure requires a lot of &9Wrought Iron&r. Make sure you have an &3Arc Furnace&r for that." "{@pagebreak}" @@ -651,8 +620,8 @@ ] icon: "minecraft:oak_sapling" id: "2655B72C9FF3B372" - shape: "square" - size: 0.75d + shape: "octagon" + size: 2.0d subtitle: "The power of KubeJS" tasks: [{ id: "35CFA225ADAD5D06" @@ -660,27 +629,28 @@ type: "item" }] title: "Greenhouse" - x: 0.0d - y: 2.625d + x: -2.5d + y: -2.0d } { dependencies: [ "1646BF9194100E57" "2AD44111B9B39C90" + "66805BB78A828C00" ] description: [ "&3Kanthal Heating Coils&r are the next major step in progression. They increase the temperature of your &3Blast Furnace&r to &d2,700K&r, allowing you to process new materials. They may also &eaccelerate&r less hot recipes - check the quest to the top-left for details." "" "You will need a staggering &a128 Ingots&r for a full set of Coils, which will easily take over an hour. We advise that you move on to other projects while your &3EBF&r is hard at work - that or build another one!" + "{@pagebreak}" + "An &3MV Chemical Bath&r is required to cool &cHot Ingots&r down. They're &chot&r when held, as the name implies. &o&7Maybe you should save your hands and automate this...&r" "" - "An &3MV Chemical Bath&r is required to cool &cHot Ingots&r down. They're &chot&r when held, as the name implies. &oMaybe you should save your hands and automate this...&r" - "" - "With the construction of a &3Kanthal EBF&r, you're now able to make &dSilicon Ingots&r!" + "With the construction of a &3Kanthal EBF&r, you're now able to make &dSilicon Ingots&r, opening up the vast majority of AE2!" ] icon: "gtceu:kanthal_coil_block" id: "1C55AE6AD5BDE304" shape: "square" - size: 0.75d + size: 1.0d subtitle: "Is it getting hot in here?" tasks: [{ count: 16L @@ -689,64 +659,14 @@ type: "item" }] title: "Kanthal Coils" - x: 4.5d - y: -0.75d - } - { - dependencies: ["1C55AE6AD5BDE304"] - description: [ - "This is a guide on how to automatically route &lall&r&o your Hot Ingots to your Chemical Bath, while keeping everything automated in tip-top shape." - "" - "The cheap way would be to use filters, and manually add Hot Ingots one by one... which is so boring! Let's try the fun option." - "" - "Install an &aItem Tag Filter&r Cover on the side of your &3Chemical Bath&r, open it and set it to whitelist \"&e&lingots/hot&r\"." - "" - "From here, you can route with &9any logistics system&r of your choice." - "{@pagebreak}" - "Connect the output of your &3EBF(s)&r to the input of your &3Chemical Bath&r and the output dump (Chest or Crate)." - "You can also have a &dRestrictive Pipe&r in front of the output dump to ensure the Chemical Bath will be prioritized." - "" - "&l&9Note:&r If you wish to know more tags for more automation setups, they will display if you press Shift when hovering over an item. For instance, an item tagged with &e&o#forge:plates/copper&r would be filtered as &e&lplates/copper&r." - "" - "&9Other Note:&r The Item Tag Filter partially supports &dregex&r. Hover over the info icon for more information." - ] - icon: "gtceu:item_tag_filter" - id: "13A976D0D612BC84" - size: 0.66d - tasks: [{ - id: "76A20EE57CB39857" - item: "gtceu:item_tag_filter" - type: "item" - }] - title: "250IQ" - x: 3.375d - y: -1.875d - } - { - dependencies: [ - "10FB27DD3C7BEC2F" - "75F38905DEA60F15" - "1C55AE6AD5BDE304" - ] - description: ["A circuit component that you can now produce thanks to the &3MV Assembler&r and your shiny new &3Kanthal EBF&r."] - icon: "gtceu:transistor" - id: "375684F9CBEF9132" - shape: "square" - size: 0.75d - tasks: [{ - id: "240735279EBC0193" - item: "gtceu:transistor" - type: "item" - }] - title: "Moore's Law" - x: 6.75d - y: -0.75d + x: 1.5d + y: 10.0d } { dependencies: [ "60D7F6C1EE918B66" - "375684F9CBEF9132" "1E7BF65DB32B8B3E" + "5DD01CBADFFF3571" ] description: [ "Alright... technically, obtaining &6HV&r Circuits and Stainless Steel lets you progress to &6HV&r - but let's not rush things." @@ -756,7 +676,7 @@ icon: "gtceu:advanced_integrated_circuit" id: "26394C1290D70AB6" shape: "square" - size: 0.75d + size: 1.0d subtitle: "...but hold on before getting too giddy" tasks: [{ id: "75EB5730046212D0" @@ -764,8 +684,8 @@ type: "item" }] title: "First HV Circuits!" - x: 6.75d - y: 0.375d + x: 3.0d + y: 16.5d } { dependencies: ["315169840E06110F"] @@ -773,7 +693,7 @@ icon: "gtceu:ram_chip" id: "1E7BF65DB32B8B3E" shape: "square" - size: 0.75d + size: 1.0d subtitle: "Random Access Memories" tasks: [ { @@ -784,6 +704,7 @@ { id: "2EACE2CF99B4B3D3" item: "gtceu:ram_wafer" + optional_task: true type: "item" } { @@ -794,8 +715,8 @@ } ] title: "Download more RAM" - x: 5.625d - y: 1.5d + x: 8.5d + y: 10.0d } { dependencies: ["6F6D2829FC42F21C"] @@ -804,12 +725,12 @@ "" "&9Note:&r This is not a strict upgrade to the cost of Circuits - you would need to get to the next Tier for that, just slightly further down in &bMV&r. It is still an important upgrade, and is required to get to &6HV circuits&r." "{@pagebreak}" - "&l&3Lore:&r&o The circuit progression in GTCEu is mostly based on GT5u's progression. It has been rebalanced to not be as painful. &lSpecifically&r this circuit tier, which was a trap!" + "&l&3Lore:&r&o The circuit progression in GTCEu is mostly based on GT5u's progression. It has been rebalanced to not be as painful. &lSpecifically&r&o this circuit tier, which was a trap!" ] icon: "gtceu:basic_integrated_circuit" id: "5C17BF90DA2AAEEE" shape: "square" - size: 0.75d + size: 1.0d subtitle: "You have unlocked a new tier of Circuits!" tasks: [{ id: "2301CD2A841F17D9" @@ -817,8 +738,8 @@ type: "item" }] title: "More LV Circuits" - x: 6.75d - y: 2.625d + x: 3.0d + y: 12.0d } { dependencies: ["5C17BF90DA2AAEEE"] @@ -826,15 +747,16 @@ icon: "gtceu:good_integrated_circuit" id: "60D7F6C1EE918B66" shape: "square" - size: 0.75d + size: 1.0d + subtitle: "More... I demand more!" tasks: [{ id: "0622E51767B0AB58" item: "gtceu:good_integrated_circuit" type: "item" }] title: "More MV Circuits" - x: 6.75d - y: 1.5d + x: 3.0d + y: 14.0d } { dependencies: [ @@ -855,7 +777,7 @@ icon: "gtceu:silicon_boule" id: "71412502C81F21C1" shape: "square" - size: 0.75d + size: 1.0d subtitle: "These wafers are fully fungible" tasks: [ { @@ -871,8 +793,8 @@ } ] title: "Silicon Lottery" - x: 4.5d - y: 3.75d + x: 9.5d + y: 8.0d } { dependencies: ["26394C1290D70AB6"] @@ -883,8 +805,14 @@ ] icon: "gtceu:mv_circuit_assembler" id: "0DE5C3FBC9A6A690" - shape: "square" - size: 0.75d + rewards: [{ + count: 40 + id: "484745BF48673036" + item: "gtceu:soldering_alloy_dust" + type: "item" + }] + shape: "octagon" + size: 2.0d subtitle: "Yippee, yahoo" tasks: [{ id: "7ED7103DAF7E4413" @@ -892,8 +820,8 @@ type: "item" }] title: "Advanced Circuit Assembler" - x: 7.875d - y: 0.375d + x: 1.0d + y: 14.0d } { dependencies: ["26394C1290D70AB6"] @@ -906,8 +834,13 @@ ] icon: "gtceu:multi_smelter" id: "6DDDE2268B691F74" - shape: "square" - size: 0.75d + rewards: [{ + id: "006F83AC08E87057" + item: "gtceu:advanced_integrated_circuit" + type: "item" + }] + shape: "octagon" + size: 2.0d subtitle: "Possibly the most powerful furnace you've seen" tasks: [{ id: "0A42FE4B72071451" @@ -915,13 +848,12 @@ type: "item" }] title: "Ultimate Smelter" - x: 5.625d - y: 0.375d + x: 6.0d + y: 16.5d } { dependencies: [ "4600221BF0A30C3A" - "6E9E15DA847DD0A1" "0DE5C3FBC9A6A690" ] description: [ @@ -933,64 +865,41 @@ ] icon: "gtceu:microchip_processor" id: "5E76D4C24026157D" - shape: "square" - size: 0.75d + shape: "octagon" + size: 1.5d + subtitle: "It Feels Good to be the Best" tasks: [{ id: "4E076080D7B23372" item: "gtceu:microchip_processor" type: "item" }] title: "Best LV Circuits" - x: 7.875d - y: -0.75d + x: -1.0d + y: 12.0d } { dependencies: [ "4600221BF0A30C3A" "0DE5C3FBC9A6A690" - "6E9E15DA847DD0A1" ] description: [ "&6The best MV Circuits&r! You will be making these for the remainder of the game." "" - "Eventually (in &1IV&r), they will become even cheaper." + "Eventually (in &9IV&r), they will become even cheaper." ] icon: "gtceu:micro_processor" id: "38DE506FF5B32031" - shape: "square" - size: 0.75d + shape: "octagon" + size: 1.5d + subtitle: "MV has peaked" tasks: [{ id: "120B63C2E40D359A" item: "gtceu:micro_processor" type: "item" }] title: "Best MV Circuits" - x: 7.875d - y: 1.5d - } - { - dependencies: [ - "1FCF2C103E25972B" - "5063FDFFBE3E4855" - "3568BC9742092FC5" - ] - description: [ - "Your first &5EV&r Circuit gets a unique texture." - "" - "It'll be needed in &6HV&r." - ] - icon: "gtceu:micro_processor_computer" - id: "4AFD3073C731A1E4" - shape: "square" - size: 0.75d - tasks: [{ - id: "34EA9B71F8BF607F" - item: "gtceu:micro_processor_computer" - type: "item" - }] - title: "First EV Circuits!" - x: 7.875d - y: 3.75d + x: -1.0d + y: 14.0d } { dependencies: [ @@ -1000,68 +909,24 @@ description: [ "Better &6HV&r Circuits - much &dcheaper&r and easier to make than before." "" - "&6You should now be ready to move on the HV Chapter&r, unless you're yet to scale up your Power Production." + "You should now be &aready to move on&r to the HV Chapter, unless you're yet to scale up your Power Production." ] icon: "gtceu:micro_processor_assembly" id: "5063FDFFBE3E4855" - shape: "square" - size: 0.75d + shape: "gear" + size: 3.0d + subtitle: "On that HV grind" tasks: [{ id: "2FE33281A44C34F6" item: "gtceu:micro_processor_assembly" type: "item" }] title: "More HV Circuits" - x: 7.875d - y: 2.625d + x: -1.0d + y: 16.5d } { - dependencies: [ - "375684F9CBEF9132" - "10FB27DD3C7BEC2F" - ] - description: ["A circuit component that you can now produce thanks to the &3MV Assembler&r!"] - icon: "gtceu:capacitor" - id: "6E9E15DA847DD0A1" - shape: "square" - size: 0.75d - subtitle: "No cap, bussin frfr" - tasks: [{ - id: "60D8154F5C9C0EAC" - item: "gtceu:capacitor" - type: "item" - }] - title: "Capacitors" - x: 7.875d - y: -1.875d - } - { - dependencies: ["648BCF486E16CCB2"] - description: [ - "&aBlue Alloy&r is an excellent Cable material for &6HV&r power." - "" - "Nothing is preventing you from using it for &bMV&r power too! Make sure that you don't overvolt your machines, though." - "" - "Superconductors for both &bMV&r and &6HV&r are unlocked... later." - "" - "&aElectrotine&r is obtained from the &cNether&r, so don't craft it in the Mixer!" - "" - "Furthermore, &aElectrotine&r can be separated for &dElectrum&r and &dRedstone&r." - ] - icon: "gtceu:blue_alloy_ingot" - id: "1FCF2C103E25972B" - size: 0.66d - tasks: [{ - id: "15C7369398FAB8DB" - item: "gtceu:blue_alloy_ingot" - type: "item" - }] - title: "Blue Alloy" - x: 6.75d - y: 3.75d - } - { - dependencies: ["6E9E15DA847DD0A1"] + dependencies: ["10FB27DD3C7BEC2F"] description: [ "A Circuit Component that you can now make thanks to the &3MV Assembler&r." "" @@ -1070,15 +935,16 @@ icon: "gtceu:inductor" id: "3DFFA8F91452C62A" shape: "square" - size: 0.75d + size: 1.0d + subtitle: "Z = jwL" tasks: [{ id: "6690451CCAB62CA1" item: "gtceu:inductor" type: "item" }] title: "Inductors" - x: 9.0d - y: 0.375d + x: -5.0d + y: 16.5d } { dependencies: ["6BB98D128822730E"] @@ -1094,7 +960,7 @@ icon: "gtceu:polyethylene_plate" id: "10FB27DD3C7BEC2F" shape: "gear" - size: 1.2d + size: 3.0d subtitle: "Baby's first polymer!" tasks: [{ id: "15E5F008339B8964" @@ -1102,8 +968,8 @@ type: "item" }] title: "Polyethylene" - x: 6.75d - y: -3.0d + x: -10.0d + y: 10.0d } { dependencies: ["10FB27DD3C7BEC2F"] @@ -1118,7 +984,9 @@ ] icon: "gtceu:lv_super_tank" id: "6C53B01A05FFF1DC" - size: 0.66d + optional: true + shape: "heart" + size: 2.0d subtitle: "Super Tanks are OP!" tasks: [{ id: "47EA273D728C158F" @@ -1126,8 +994,8 @@ type: "item" }] title: "Super Tank" - x: 5.625d - y: -1.875d + x: -14.0d + y: 10.0d } { dependencies: ["10FB27DD3C7BEC2F"] @@ -1141,7 +1009,7 @@ icon: "gtceu:polyvinyl_chloride_plate" id: "40408FFD02134148" shape: "square" - size: 0.75d + size: 1.0d subtitle: "You've already made one polymer, what's two?" tasks: [{ id: "72696AD2B77F805B" @@ -1149,8 +1017,8 @@ type: "item" }] title: "Polyvinyl Chloride" - x: 6.75d - y: -4.125d + x: -5.0d + y: 11.0d } { dependencies: [ @@ -1158,14 +1026,15 @@ "10FB27DD3C7BEC2F" ] description: [ - "At this point, you have all the tools available to start making Plastic Boards." + "At this point, you have all the tools available to start making Plastic Boards. Higher-tier polymers in future will increase your PCB yields substantially." "" "The recipe chains are starting to get pretty long, so we recommend processing large batches in two dedicated &3Chemical Reactors&r." ] icon: "gtceu:plastic_printed_circuit_board" id: "4600221BF0A30C3A" shape: "square" - size: 0.75d + size: 1.0d + subtitle: "It's a Casio on a Plastic Board" tasks: [ { id: "68B5E2667EDAE895" @@ -1179,8 +1048,8 @@ } ] title: "Plastic Boards" - x: 7.875d - y: -3.0d + x: -5.0d + y: 12.0d } { dependencies: [ @@ -1188,7 +1057,7 @@ "3D98819A799D2E64" ] description: [ - "&aSodium Persulfate&r can be used in &9Ore Processing&r in the &3Chemical Bath&r to get various bonus outputs you would not normally obtain. It is completely optional, but pretty rewarding." + "&aSodium Persulfate&r can be used in &9Ore Processing&r in the &3Chemical Bath&r to get various bonus outputs you would not normally obtain. It's completely optional, but pretty rewarding." "" "&lWait, stop! That's only a distraction&r - the real topic of this Quest is..." "" @@ -1200,36 +1069,33 @@ "" "With more automation later in the game, Iron III Chloride will be the cheaper and more straight forward path." "" - "This Quest can be completed with &eeither&r Fluid." + "This Quest requires &eboth&r Fluids to complete. You'll need both anyway..." ] icon: "gtceu:iron_iii_chloride_bucket" id: "4353AB0E20601AEC" shape: "square" - size: 0.75d + size: 1.0d subtitle: "Let's etch some Copper off Circuit Boards!" tasks: [ { - id: "78987D2587319508" - item: "gtceu:iron_iii_chloride_bucket" + id: "118468CD578081CF" + item: "gtceu:sodium_persulfate_bucket" type: "item" } { - id: "33509BA5416BC14F" - item: "gtceu:sodium_persulfate_bucket" + id: "1B7EDF573783D986" + item: "gtceu:iron_iii_chloride_bucket" type: "item" } ] title: "Sodium Persulfate / Iron III Chloride" - x: 7.875d - y: -4.125d + x: -5.0d + y: 14.0d } { - dependencies: [ - "3D98819A799D2E64" - "1A77CA35F054F988" - ] + dependencies: ["3D98819A799D2E64"] description: [ - "JEI might look a little overwhelming here, so we'll go through the best path for Sulfuric Acid here." + "EMI might look a little overwhelming here, so we'll go through the best path for Sulfuric Acid here." "" "Making &eSulfuric Acid&r is a three step process. It is used in many important reactions, so you should automate its production ASAP." "{@pagebreak}" @@ -1243,20 +1109,21 @@ ] id: "316FF60D6FFE97CE" shape: "square" - size: 0.75d + size: 1.0d + subtitle: "\"...what he thought was H2O was H2SO4!\"" tasks: [{ - id: "6A7372203A20D7CA" + id: "06B5F04DEFC12458" item: "gtceu:sulfuric_acid_bucket" type: "item" }] title: "Sulfuric Acid" - x: 1.125d - y: -4.125d + x: -10.0d + y: -0.5d } { dependencies: [ - "32B08E6F414A00C0" - "3D98819A799D2E64" + "694DF1C33B53A0D5" + "042E4EF7CF366C0C" ] description: [ "Obtain &9Hydrochloric Acid&r by mixing &aHydrogen&r and &aChlorine&r." @@ -1273,15 +1140,16 @@ ] icon: "gtceu:hydrochloric_acid_bucket" id: "64CACABB48635904" - size: 0.66d + size: 1.0d + subtitle: "You'll need a lot of this!" tasks: [{ - id: "447B1F9FF3A2D837" + id: "34147C1DD7B8DE55" item: "gtceu:hydrochloric_acid_bucket" type: "item" }] title: "Hydrochloric Acid" - x: 3.375d - y: -4.125d + x: -10.0d + y: -2.5d } { dependencies: [ @@ -1303,18 +1171,19 @@ "" "&l&3Lore:&r&o The acid transportation and storage mechanics originate from GregTech 6." ] - icon: "minecraft:bamboo_sign" + icon: "gtceu:acid_hazard_sign_block" id: "079442C113D54856" shape: "circle" - size: 0.66d + size: 1.0d + subtitle: "...if you don't read this quest." tasks: [{ id: "2D0DE3FB6E5E4146" title: "I'm an acid professional, don't worry" type: "checkmark" }] title: "It will Melt Your Flesh" - x: 2.25d - y: -4.125d + x: -10.0d + y: -1.5d } { dependencies: [ @@ -1322,27 +1191,23 @@ "6D9D54FAB21EC086" ] description: [ - "&bMV&r Batteries will be convenient to buffer Energy, just like &7LV&r." + "&bMV&r Batteries will appeal to you if you want to buffer Energy, just like &7LV&r." "" - "The cost in &aSodium&r, &aLithium&r or &aCadmium&r jumps up to 8 dusts, so you may use whatever you have the most of." - "" - "The difference in capacity is not that huge after all." + "The cost in &aSodium&r, &aLithium&r or &aCadmium&r jumps up to 8 dusts, so you should use whatever you have the most of. The difference in capacity isn't &7THAT&r huge, after all!" "" "Get &eeither&r Battery to complete the Quest." ] icon: "gtceu:hv_battery_hull" id: "2202AA5DC6DB0A26" shape: "square" - size: 0.75d + size: 1.0d + subtitle: "Baby Got Battery" tasks: [{ id: "5FEE671A75766B78" item: { Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - display: { - Name: "{\"text\":\"Any mv battery\"}" - } "ftbfiltersystem:filter": "or(item_tag(gtceu:batteries/mv))" } } @@ -1350,14 +1215,11 @@ type: "item" }] title: "Better Batteries" - x: 4.5d - y: -1.875d + x: 5.5d + y: -4.0d } { - dependencies: [ - "7567E885B7166603" - "0DBC148D92A9F69F" - ] + dependencies: ["22E462070F8B027A"] description: [ "We &lSINCERELY&r hope at &cno&r point you made the &7LV&r Extruder, because only the &bMV&r Extruder is actually useful. If you did, immediately &arecycle it&r through the Arc Furnace." "" @@ -1369,8 +1231,20 @@ ] icon: "gtceu:mv_extruder" id: "22B5AD670496C02D" - shape: "square" - size: 0.75d + rewards: [ + { + id: "0E6CAED1ED976D9E" + item: "gtceu:small_gear_extruder_mold" + type: "item" + } + { + id: "0A0BD551FFBC2E1C" + item: "gtceu:gear_extruder_mold" + type: "item" + } + ] + shape: "octagon" + size: 2.0d subtitle: "The biggest upgrade you'll make" tasks: [{ id: "73E8504BA235C4BF" @@ -1378,11 +1252,11 @@ type: "item" }] title: "Advanced Extruder" - x: 1.125d - y: 0.375d + x: 3.0d + y: -2.0d } { - dependencies: ["22B5AD670496C02D"] + dependencies: ["75F38905DEA60F15"] description: [ "Aluminium Cells are a big upgrade over the Steel Cells or Universal Fluid Cells." "" @@ -1390,29 +1264,29 @@ ] icon: "gtceu:aluminium_fluid_cell" id: "53B0D08DB90EC369" - size: 0.66d + optional: true + shape: "heart" + size: 1.0d + subtitle: "Like cells... only larger!" tasks: [{ id: "105EA8621A99C1EC" item: "gtceu:aluminium_fluid_cell" type: "item" }] title: "Large Cells" - x: 2.25d - y: 0.375d + x: 4.5d + y: 4.0d } { - dependencies: [ - "7567E885B7166603" - "0DBC148D92A9F69F" - ] + dependencies: ["22E462070F8B027A"] description: [ "It's quite the investment to own a &3Fluid Drilling Rig&r, but it is &oby far&r the most prominent &6source of Oil&r." "" "It pumps fluids from underneath Bedrock itself. Note that the fluids aren't actually there, instead being simulated." "" - "Fluid veins are stored within regions of &48x8 chunks&r. Each vein has a different fluid, but they are mostly types of Oil." + "Fluid veins are stored within &cchunk-sized regions&r. Each vein has a different fluid, but they are mostly types of Oil." "" - "You are not able to carry out prospecting for fluid veins &oyet&r - this will come at &6HV&r." + "You can't carry out prospecting for fluid veins &oyet&r - this will come at &6HV&r." "{@pagebreak}" "Each vein generates with a different base yield. This is typically between &d150L&r to &d300L per second&r." "" @@ -1438,8 +1312,9 @@ ] icon: "gtceu:mv_fluid_drilling_rig" id: "05ADBAE5B6F38956" + optional: true shape: "square" - size: 0.75d + size: 1.0d subtitle: "Fluid Drilling Rigs in CEu!" tasks: [{ id: "3FB527F5B10381D2" @@ -1447,11 +1322,11 @@ type: "item" }] title: "Fluid Drilling Rigs" - x: -1.125d - y: 0.375d + x: -2.5d + y: 2.5d } { - dependencies: ["648BCF486E16CCB2"] + dependencies: ["05ADBAE5B6F38956"] description: [ "Get any kind of &3Pump&r, place it above an Oil spout and... give it some power." "" @@ -1477,21 +1352,78 @@ ] icon: "gtceu:oil_bucket" id: "0774EC59CD3DD7A5" - size: 0.66d + optional: true + shape: "square" + size: 1.0d subtitle: "Ever mined into an Oil deposit?" - tasks: [{ - id: "05B59556092AC5EB" - item: "gtceu:oil_bucket" - type: "item" - }] + tasks: [ + { + id: "21FF6E45F9AC5E76" + item: { + Count: 1 + id: "itemfilters:or" + tag: { + items: [ + { + Count: 1b + id: "gtceu:lv_pump" + } + { + Count: 1b + id: "gtceu:mv_pump" + } + { + Count: 1b + id: "gtceu:hv_pump" + } + { + Count: 1b + id: "gtceu:ev_pump" + } + ] + } + } + title: "Any Pump will do" + type: "item" + } + { + id: "1095B3DE28330980" + item: { + Count: 1 + id: "itemfilters:or" + tag: { + items: [ + { + Count: 1b + id: "gtceu:oil_bucket" + } + { + Count: 1b + id: "gtceu:oil_heavy_bucket" + } + { + Count: 1b + id: "gtceu:oil_medium_bucket" + } + { + Count: 1b + id: "gtceu:oil_light_bucket" + } + ] + } + } + title: "Any Oil bucket" + type: "item" + } + ] title: "US Simulator" - x: -1.125d - y: -0.75d + x: -3.0d + y: 4.0d } { - dependencies: ["648BCF486E16CCB2"] + dependencies: ["6A304E453D74C57C"] description: [ - "The underground has pure Oilsands ore veins. You may &3centrifuge&r the Dust to get &aOil&r." + "Underground, you may come across pure Oilsands ore veins. You can &3centrifuge&r the Dust to get &aOil&r." "" "&9&lNote:&r&l The Oil path is one path towards &9&lEthylene&r&l. The other paths involve getting natural with some Ethanol.&r" "" @@ -1503,35 +1435,26 @@ "" "Oilsands are a &6great starting point&r - they'll tide you over until you unlock Fluid Drilling Rigs." ] - icon: "gtceu:marble_oilsands_ore" id: "575B07D390D9D079" - size: 0.66d - tasks: [ - { - id: "1838F842C9D12880" - item: "gtceu:oilsands_dust" - optional_task: true - type: "item" - } - { - id: "18DBDA6D5021E9FA" - item: "gtceu:oil_bucket" - type: "item" - } - ] + optional: true + shape: "square" + size: 1.0d + subtitle: "This quest was sponsored by the US Military" + tasks: [{ + id: "1838F842C9D12880" + item: "gtceu:oilsands_dust" + type: "item" + }] title: "America Simulator" - x: -2.25d - y: -0.75d + x: -2.5d + y: 1.0d } { dependencies: [ "53DC6E32C41C94C3" "6EB68C28BEE24DEF" - "0774EC59CD3DD7A5" - "575B07D390D9D079" "05ADBAE5B6F38956" ] - dependency_requirement: "one_completed" description: [ "Before we start, here's some important information if you're aiming to make Ethylene:" "" @@ -1541,7 +1464,7 @@ "" "Get &eeither&r to complete this quest." "{@pagebreak}" - "Got all that? &6Alright&r! Let's discuss a complex topic: &9Distillation&r. We'll try to help you understand how and why the &aJEI&r recipes are the way they are, so stick with us." + "Got all that? &6Alright&r! Let's discuss a complex topic: &9Distillation&r. We'll try to help you understand how and why the &aEMI&r recipes are the way they are, so stick with us." "" "Nearly all the &3Distillery&r recipes are duplicates from the &3Distillation Tower&r, except that they only have one Fluid output, and void everything else." "" @@ -1557,26 +1480,25 @@ ] icon: "gtceu:mv_distillery" id: "6A304E453D74C57C" + min_required_dependencies: 1 shape: "square" - size: 0.75d + size: 1.0d + subtitle: "The Illusion of Free Choice" tasks: [{ id: "685043442271A0D0" item: { Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - display: { - Name: "{\"text\":\"Either an LV or MV Distillery\"}" - } - "ftbfiltersystem:filter": "or(item(gtceu:lv_distillery)item(gtceu:mv_distillery))" + "ftbfiltersystem:filter": "or(item(gtceu:mv_distillery)item(gtceu:lv_distillery))" } } title: "Either an LV or MV Distillery" type: "item" }] title: "Distillery" - x: -1.125d - y: -1.875d + x: -5.5d + y: 1.0d } { dependencies: ["05ADBAE5B6F38956"] @@ -1593,28 +1515,30 @@ ] icon: "gtceu:natural_gas_bucket" id: "227D89550BB9BD55" - size: 0.66d + optional: true + shape: "square" + size: 1.0d subtitle: "Whoever smelt it..." tasks: [ { - id: "55FA956EF00E68C9" - item: "gtceu:lpg_bucket" + id: "027B41ACE1566E28" + item: "gtceu:refinery_gas_bucket" type: "item" } { - id: "0669F66C86C8D31B" + id: "0ABB837337D9CAF9" item: "gtceu:methane_bucket" type: "item" } { - id: "4B82683A47C13A07" - item: "gtceu:refinery_gas_bucket" + id: "401B9B85969AE681" + item: "gtceu:lpg_bucket" type: "item" } ] title: "The Church of Natural Farts" - x: -2.25d - y: 0.375d + x: -2.0d + y: 4.0d } { dependencies: ["6A304E453D74C57C"] @@ -1633,15 +1557,17 @@ ] icon: "gtceu:benzene_bucket" id: "00E1A728E6F6D6A0" - size: 0.66d + shape: "square" + size: 1.0d + subtitle: "In the end, it's always Benzene" tasks: [{ - id: "63594021204B976A" + id: "4E9EBCCCC7BBAFDD" item: "gtceu:benzene_bucket" type: "item" }] title: "The Church of Benzene" - x: -2.25d - y: -1.875d + x: -5.0d + y: 2.5d } { dependencies: ["6A304E453D74C57C"] @@ -1656,22 +1582,25 @@ ] icon: "gtceu:lightly_hydro_cracked_heavy_fuel_bucket" id: "61972B16805FC9EE" - size: 0.66d + shape: "square" + size: 1.0d + subtitle: "Turn up the Lights in here, baby" tasks: [ { - id: "694F46D263E7A235" - item: "gtceu:light_fuel_bucket" + id: "6E4D818CE088D7D4" + item: "gtceu:sulfuric_light_fuel_bucket" + optional_task: true type: "item" } { - id: "7FE38BAB7B545EF9" - item: "gtceu:sulfuric_light_fuel_bucket" + id: "36D70C00EF5171D6" + item: "gtceu:light_fuel_bucket" type: "item" } ] title: "Light Fuel" - x: -1.125d - y: -3.0d + x: -6.0d + y: 2.5d } { dependencies: ["61972B16805FC9EE"] @@ -1694,16 +1623,16 @@ ] icon: "gtceu:diesel_bucket" id: "45769156F4253C86" - size: 0.66d + size: 1.0d subtitle: "Mother, how is diesel made?" tasks: [{ - id: "49A059992EE21C9A" + id: "10BAA54947D975AF" item: "gtceu:diesel_bucket" type: "item" }] title: "The Church of Diesel" - x: -2.25d - y: -3.0d + x: -5.5d + y: 3.5d } { dependency_requirement: "one_started" @@ -1718,25 +1647,25 @@ ] icon: "gtceu:tungsten_steel_quadruple_fluid_pipe" id: "66041DE10C882382" - size: 0.66d + optional: true + shape: "square" + size: 1.0d + subtitle: "\"I thought channels were disabled!\"" tasks: [{ id: "2620FA131244B3DA" item: { Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - display: { - Name: "{\"text\":\"Any Quadruple or Nonuple Pipe\"}" - } - "ftbfiltersystem:filter": "or(item_tag(forge:quadruple_fluid_pipes)item_tag(forge:nonuple_fluid_pipes))" + "ftbfiltersystem:filter": "or(item(gtceu:aluminium_quadruple_fluid_pipe)item(gtceu:blue_steel_quadruple_fluid_pipe)item(gtceu:steel_quadruple_fluid_pipe))" } } title: "Multiple Channel Potin Pipes, please" type: "item" }] title: "Multiple Channel Pipes" - x: 4.5d - y: -4.125d + x: -8.0d + y: 1.0d } { dependencies: ["315169840E06110F"] @@ -1747,7 +1676,8 @@ ] icon: "gtceu:ilc_chip" id: "6F6D2829FC42F21C" - size: 0.66d + shape: "square" + size: 1.0d subtitle: "I C U" tasks: [ { @@ -1769,8 +1699,8 @@ } ] title: "IC Chips" - x: 5.625d - y: 2.625d + x: 7.0d + y: 10.0d } { dependencies: ["315169840E06110F"] @@ -1781,7 +1711,9 @@ ] icon: "gtceu:ulpic_chip" id: "16A1EF8B80A96633" - size: 0.66d + shape: "square" + size: 1.0d + subtitle: "Pickin' up Chips" tasks: [ { id: "6D4D63F75646DB1C" @@ -1801,55 +1733,25 @@ type: "item" } ] - title: "IC Chips" - x: 4.5d - y: 0.375d + title: "ULPIC Chips" + x: 5.5d + y: 10.0d } { - dependencies: ["5C94CF50090D7DA0"] - description: [ - "&3Long-Distance Item Pipes&r can be used to send items across great distances. Place one endpoint at each end, and connect them with pipeline blocks." - "" - "These pipes instantly transfer from the input side to the output side." - "" - "They also have a minimum distance between pipe endpoints, so you can't use these for short-range operations." - ] - icon: "gtceu:long_distance_item_pipeline_endpoint" - id: "653345427522D728" - size: 0.66d - subtitle: "Wondering how to move those ores around?" - tasks: [ - { - count: 2L - id: "0A8CADD371444760" - item: "gtceu:long_distance_item_pipeline_endpoint" - type: "item" - } - { - id: "66D528959958D445" - item: "gtceu:long_distance_item_pipeline" - type: "item" - } - ] - title: "Long-Distance Items" - x: -3.375d - y: 0.375d - } - { - dependencies: [ - "0774EC59CD3DD7A5" - "575B07D390D9D079" - ] description: [ "&3Long-Distance Fluid Pipes&r can be used to send fluids across great distances. Place one endpoint at each end, and connect them with pipeline blocks." "" "These pipes instantly transfer from the input side to the output side." "" "They also have a minimum distance between pipe endpoints, so you can't use these for short-range operations." + "{@pagebreak}" + "These pipes have a reputation of being &4buggy&r to set up. If they don't seem to work at first, try rotating the endpoints with a &eWrench&r." ] icon: "gtceu:long_distance_fluid_pipeline_endpoint" id: "5480AF2EDEDB6A36" - size: 0.66d + optional: true + shape: "heart" + size: 1.0d subtitle: "Wondering how to move that oil around?" tasks: [ { @@ -1864,9 +1766,199 @@ type: "item" } ] - title: "Long-Distance Fluids" - x: -3.375d - y: -0.75d + title: "Long-Distance Pipeline" + x: -9.5d + y: -6.5d + } + { + dependencies: ["45769156F4253C86"] + dependency_requirement: "one_completed" + description: [ + "This Jetpack takes most &aCombustion Fuels&r (excluding oils) to enable a primitive form of flight." + "" + "Fill it like you would fill a Drum, or with a &3Canning Machine&r." + "" + "Press &4H&r (default) to enable Hover Mode." + ] + id: "6FA956DAA72D6139" + optional: true + shape: "heart" + size: 1.0d + subtitle: "...well, almost Fly" + tasks: [{ + id: "022324F9630960C6" + item: { + Count: 1 + id: "gtceu:liquid_fuel_jetpack" + tag: { } + } + type: "item" + }] + title: "I Believe I Can Fly" + x: -5.5d + y: 5.0d + } + { + dependencies: ["75F38905DEA60F15"] + dependency_requirement: "one_completed" + description: [ + "This jetpack enables flight, and requires energy." + "" + "Charge it like you would charge a Battery." + "" + "Press &4H&r (default) to enable Hover Mode." + "" + "&o&8(Yeah, yeah, a jetpack is supposed to work off \"propellants\". Y'all are always here to nitpick.)&r" + ] + id: "21F70EACF6D81E6A" + optional: true + shape: "heart" + size: 1.0d + subtitle: "...still not quite there." + tasks: [{ + id: "1940421A45E45E25" + item: { + Count: 1 + id: "gtceu:electric_jetpack" + tag: { } + } + type: "item" + }] + title: "I Believe I Can Fly II" + x: 1.5d + y: 4.0d + } + { + dependencies: [ + "10FB27DD3C7BEC2F" + "1C55AE6AD5BDE304" + ] + id: "5DD01CBADFFF3571" + shape: "square" + tasks: [ + { + id: "128CD77BAAB2775E" + item: "gtceu:capacitor" + type: "item" + } + { + id: "4D8C5B8BEE0AF29C" + item: "gtceu:transistor" + type: "item" + } + { + id: "796E58783B37BA74" + item: "gtceu:diode" + type: "item" + } + ] + x: 0.5d + y: 10.0d + } + { + id: "4976BECA32C200C2" + optional: true + shape: "heart" + tasks: [{ + id: "37FF418866E8D44B" + item: "create:track_station" + type: "item" + }] + x: -10.5d + y: -6.5d + } + { + dependencies: ["45449ECE4F8128E7"] + id: "694DF1C33B53A0D5" + tasks: [{ + id: "28B146A81C429249" + item: "gtceu:chlorine_bucket" + type: "item" + }] + x: -10.5d + y: -3.5d + } + { + dependencies: ["45449ECE4F8128E7"] + id: "042E4EF7CF366C0C" + tasks: [{ + id: "089961E2732EDC72" + item: "gtceu:hydrogen_bucket" + type: "item" + }] + x: -9.5d + y: -3.5d + } + { + dependencies: [ + "4976BECA32C200C2" + "5480AF2EDEDB6A36" + ] + dependency_requirement: "one_started" + id: "45449ECE4F8128E7" + optional: true + tasks: [{ + id: "77395198DC98E3A5" + item: "tfc:bucket/salt_water" + type: "item" + }] + x: -10.0d + y: -5.0d + } + { + id: "6F898B934BB79016" + tasks: [{ + id: "50BDD4D0FAFBE5E6" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:mv_battery_buffer_4x)item(gtceu:mv_battery_buffer_8x)item(gtceu:mv_battery_buffer_16x))" + } + } + type: "item" + }] + x: 5.5d + y: -3.0d + } + { + dependencies: [ + "16A6AE5C770DB83A" + "10FB27DD3C7BEC2F" + ] + id: "3E25696C98A6F123" + shape: "gear" + size: 4.0d + tasks: [{ + id: "23FB958E73846929" + item: "gtceu:hv_machine_hull" + type: "item" + }] + x: -4.0d + y: 7.5d + } + { + description: [ + "Everytime you begin a new tier it can be a bit overwhelming. There is going to be lots of &enew machines&r to acquire and &echemicals&r to create.\\n\\nAs you can tell from the quests you have &2three main objectives&r before being able to get into &6HV&r. We are going to take this time to explain each of them." + "{@pagebreak}" + "First you will need to upgrade your &dEBF&r with two new &bMV Energy Hatches&r so it can overcloak and runs &6HV recipes&r. That will help you getting &estainless steal&r, the main material for &6HV&r and &eKanthal&r that you will use to upgrade your &dEBF coils&r." + "{@pagebreak}" + "Your second objective that could be tackle first if you feel like it will be about chemicals. Your first plastic aka Polyethylene will be required to progress further, later on there will be others but let's focus on this one. The quests will guide you with the possibility of two paths:\\n\\n-Going Petrochem by extracting oil from the ground or from oilsands: you will also be able to make Diesel for fuel combustion\\n\\n-Going Biochem by using a Pyrolyse Oven and wood (a Create tree farm could do a good job here): you will also get more benzene and will be able to go towards gas generator.\\n\\nBoth path have their pros and cons though later on you will need both anyway." + "{@pagebreak}" + "Finally " + ] + id: "22E462070F8B027A" + shape: "gear" + size: 3.0d + subtitle: "{quests.medium_voltage.mv_machine_hull.subtitle}" + tasks: [{ + id: "242FDFA23A5DEC91" + item: "gtceu:mv_machine_hull" + type: "item" + }] + title: "{quests.medium_voltage.mv_machine_hull.title}" + x: 3.0d + y: 1.0d } ] subtitle: ["Venture into petrochemistry and refine electronics"] diff --git a/config/ftbquests/quests/chapters/ore_processing.snbt b/config/ftbquests/quests/chapters/ore_processing.snbt new file mode 100644 index 000000000..97ac21185 --- /dev/null +++ b/config/ftbquests/quests/chapters/ore_processing.snbt @@ -0,0 +1,836 @@ +{ + default_hide_dependency_lines: false + default_quest_shape: "" + filename: "ore_processing" + group: "19428C6E7A36D463" + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:crushed_iron_ore" + } + id: "24C1683140DBB5F2" + order_index: 4 + quest_links: [ ] + quests: [ + { + description: ["{quests.ore_proc.native_ore.desc}"] + id: "5D09BEE61210DF02" + size: 1.5d + subtitle: "{quests.ore_proc.native_ore.subtitle}" + tasks: [ + { + id: "047DA2872D107BA0" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item_tag(tfc:ore_pieces))" + } + } + optional_task: true + title: "{quests.ore_proc.native_ore.task}" + type: "item" + } + { + id: "2D0D9226FDB3CAC9" + type: "checkmark" + } + ] + title: "{quests.ore_proc.native_ore.title}" + x: 0.5d + y: -8.5d + } + { + dependencies: [ + "514AEDB447F4AF42" + "68A48B07F9489620" + ] + dependency_requirement: "one_completed" + description: ["{quests.ore_proc.crushed_ores.desc}"] + id: "28419A1010EEE93A" + subtitle: "{quests.ore_proc.crushed_ores.subtitle}" + tasks: [ + { + id: "321A5E0E6EA03930" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item_tag(forge:crushed_ores))" + } + } + optional_task: true + type: "item" + } + { + id: "4A590589A3C1B57E" + type: "checkmark" + } + ] + title: "{quests.ore_proc.crushed_ores.title}" + x: 0.5d + y: -4.5d + } + { + dependencies: ["5D09BEE61210DF02"] + description: ["{quests.ore_proc.macerator_byproduct.desc}"] + icon: "gtceu:hv_macerator" + id: "68A48B07F9489620" + subtitle: "{quests.ore_proc.macerator_byproduct.subtitle}" + tasks: [ + { + id: "34740ED2B48819BB" + item: "gtceu:hv_macerator" + optional_task: true + type: "item" + } + { + id: "0A045AAA4BBEF63F" + item: "greate:stainless_steel_crushing_wheel" + optional_task: true + type: "item" + } + { + id: "0E86067C993E18BF" + type: "checkmark" + } + ] + title: "{quests.ore_proc.macerator_byproduct.title}" + x: 0.0d + y: -6.5d + } + { + dependencies: ["5D09BEE61210DF02"] + description: ["{quests.ore_proc.macerator_noproduct.desc}"] + icon: "greate:steel_millstone" + id: "514AEDB447F4AF42" + subtitle: "{quests.ore_proc.macerator_noproduct.subtitle}" + tasks: [ + { + id: "5EC14F048516D792" + item: "greate:steel_millstone" + optional_task: true + type: "item" + } + { + id: "5D23CEE2220A31FD" + item: "tfc:quern" + optional_task: true + type: "item" + } + { + id: "3D6010FE11723186" + item: "gtceu:hp_steam_forge_hammer" + optional_task: true + type: "item" + } + { + id: "79C87A0922F99B91" + type: "checkmark" + } + ] + title: "{quests.ore_proc.macerator_noproduct.title}" + x: 1.0d + y: -6.5d + } + { + dependencies: ["28419A1010EEE93A"] + description: ["{quests.ore_proc.ore_washer.desc}"] + icon: "greate:steel_encased_fan" + id: "35995A8DD303B08D" + subtitle: "{quests.ore_proc.ore_washer.subtitle}" + tasks: [ + { + id: "768C7F10A1490AB7" + item: "gtceu:lv_ore_washer" + optional_task: true + type: "item" + } + { + id: "58FCB68304F6943D" + item: "greate:steel_encased_fan" + optional_task: true + type: "item" + } + { + id: "3150FF938CABCC54" + type: "checkmark" + } + ] + title: "{quests.ore_proc.ore_washer.title}" + x: 0.5d + y: -2.5d + } + { + dependencies: ["28419A1010EEE93A"] + description: ["{quests.ore_proc.mercury_ores.desc}"] + icon: "gtceu:mercury_bucket" + id: "7C67BAEE68852188" + subtitle: "{quests.ore_proc.mercury_ores.subtitle}" + tasks: [ + { + id: "1BB9800D737EBEE4" + item: "gtceu:lv_chemical_bath" + optional_task: true + type: "item" + } + { + id: "0D235407594C22F2" + item: "gtceu:mercury_bucket" + optional_task: true + type: "item" + } + { + id: "09E366F7C581F34F" + type: "checkmark" + } + ] + title: "{quests.ore_proc.mercury_ores.title}" + x: 2.0d + y: -2.5d + } + { + dependencies: ["28419A1010EEE93A"] + description: ["{quests.ore_proc.sodium_persuflate.desc}"] + icon: "gtceu:sodium_persulfate_bucket" + id: "3513778F204293CD" + subtitle: "{quests.ore_proc.sodium_persuflate.subtitle}" + tasks: [ + { + id: "6E0289DE2614FDB2" + item: "gtceu:lv_chemical_bath" + optional_task: true + type: "item" + } + { + id: "5615AC3A2E3F915E" + item: "gtceu:sodium_persulfate_bucket" + optional_task: true + type: "item" + } + { + id: "33B1AD17A68606A6" + type: "checkmark" + } + ] + title: "{quests.ore_proc.sodium_persuflate.title}" + x: -1.0d + y: -2.5d + } + { + dependencies: ["7C67BAEE68852188"] + description: ["{quests.ore_proc.mercury.desc}"] + id: "68AC3E2C9093FCFE" + optional: true + subtitle: "{quests.ore_proc.mercury.subtitle}" + tasks: [ + { + id: "3FC4A7F71B918F68" + item: "gtceu:crushed_platinum_ore" + type: "item" + } + { + id: "417A27E90C01166E" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:crushed_nickel_ore" + } + type: "item" + } + { + id: "3D85D53762AA09F5" + item: "gtceu:crushed_cooperite_ore" + type: "item" + } + ] + title: "{quests.ore_proc.mercury.title}" + x: 3.5d + y: -2.5d + } + { + dependencies: ["3513778F204293CD"] + description: ["{quests.ore_proc.sodium_ores.desc}"] + id: "0502E478E27D4B73" + optional: true + subtitle: "{quests.ore_proc.sodium_ores.subtitle}" + tasks: [ + { + id: "605F3A1BFD554922" + item: "gtceu:crushed_aluminium_ore" + type: "item" + } + { + id: "5ADFEF5AF8FDD5AF" + item: "gtceu:crushed_bauxite_ore" + type: "item" + } + { + id: "28A082F6FF520B21" + item: "gtceu:crushed_cobalt_ore" + type: "item" + } + { + id: "46B6DEFD1A7BEA60" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:crushed_tetrahedrite_ore" + } + type: "item" + } + ] + title: "{quests.ore_proc.sodium_ores.title}" + x: -2.5d + y: -2.5d + } + { + dependencies: [ + "3513778F204293CD" + "7C67BAEE68852188" + "35995A8DD303B08D" + ] + dependency_requirement: "one_completed" + description: ["{quests.ore_proc.purified_ores.desc}"] + id: "544EA7FF98FDCFB7" + subtitle: "{quests.ore_proc.purified_ores.subtitle}" + tasks: [ + { + id: "4C6F60AC9C803D7B" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item_tag(forge:purified_ores))" + } + } + optional_task: true + type: "item" + } + { + id: "3C194AEB554DA4CA" + type: "checkmark" + } + ] + title: "{quests.ore_proc.purified_ores.title}" + x: 0.5d + y: -0.5d + } + { + dependencies: ["544EA7FF98FDCFB7"] + description: ["{quests.ore_proc.indium.desc}"] + icon: "gtceu:indium_dust" + id: "642FD77427A3B2FA" + subtitle: "{quests.ore_proc.indium.subtitle}" + tasks: [ + { + id: "199F216EDD90F24E" + item: "gtceu:indium_dust" + optional_task: true + type: "item" + } + { + id: "0373F4E380F2A0BC" + item: "gtceu:indium_concentrate_bucket" + optional_task: true + type: "item" + } + { + id: "246799A19B9A47B6" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:purified_sphalerite_ore" + } + optional_task: true + type: "item" + } + { + id: "54041D4FF39893F5" + item: "gtceu:purified_galena_ore" + optional_task: true + type: "item" + } + { + id: "52FCA464BD827E37" + type: "checkmark" + } + ] + title: "{quests.ore_proc.indium.title}" + x: -1.0d + y: -0.5d + } + { + dependencies: ["544EA7FF98FDCFB7"] + description: ["{quests.ore_proc.platline.desc}"] + icon: "gtceu:platinum_group_sludge_dust" + id: "7B2EE67E37809269" + subtitle: "{quests.ore_proc.platline.subtitle}" + tasks: [ + { + id: "2CEBE8BC5E3AF11A" + item: "gtceu:platinum_group_sludge_dust" + optional_task: true + type: "item" + } + { + id: "1F185450C1FF7379" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:purified_chalcocite_ore" + } + optional_task: true + type: "item" + } + { + id: "6140EA15476B4A16" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:purified_chalcopyrite_ore" + } + optional_task: true + type: "item" + } + { + id: "6F239C59DC002095" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:purified_bornite_ore" + } + optional_task: true + type: "item" + } + { + id: "29D38459E25A0D3E" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:purified_pentlandite_ore" + } + optional_task: true + type: "item" + } + { + id: "22DF4DB3FF6976EA" + item: "gtceu:purified_cooperite_ore" + optional_task: true + type: "item" + } + { + id: "1A8C5E755FE82C59" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:purified_tetrahedrite_ore" + } + optional_task: true + type: "item" + } + { + id: "1637CE96CB926DF2" + type: "checkmark" + } + ] + title: "{quests.ore_proc.platline.title}" + x: 2.0d + y: -0.5d + } + { + dependencies: ["544EA7FF98FDCFB7"] + description: ["{quests.ore_proc.thermal_centrifuge.desc}"] + icon: "gtceu:lv_thermal_centrifuge" + id: "6BAC3BE1D4FE0F6B" + subtitle: "{quests.ore_proc.thermal_centrifuge.subtitle}" + tasks: [ + { + id: "5626010B0878F067" + item: "gtceu:lv_thermal_centrifuge" + optional_task: true + type: "item" + } + { + id: "5C4C3401C72CC768" + type: "checkmark" + } + ] + title: "{quests.ore_proc.thermal_centrifuge.title}" + x: 0.5d + y: 1.5d + } + { + dependencies: ["544EA7FF98FDCFB7"] + description: ["{quests.ore_proc.sifter.desc}"] + icon: "gtceu:lv_sifter" + id: "31A6A236B6710B95" + subtitle: "{quests.ore_proc.sifter.subtitle}" + tasks: [ + { + id: "018A18B6F52ED096" + item: "gtceu:lv_sifter" + optional_task: true + type: "item" + } + { + id: "019C7598748D30E1" + item: "vintageimprovements:vibrating_table" + optional_task: true + type: "item" + } + { + id: "1BA3E3F150F2296C" + type: "checkmark" + } + ] + title: "{quests.ore_proc.sifter.title}" + x: 2.0d + y: 1.0d + } + { + dependencies: ["31A6A236B6710B95"] + description: ["{quests.ore_proc.centrifuge_sifter.desc}"] + icon: "vintageimprovements:centrifuge" + id: "2F1AFDB17C5FC291" + subtitle: "{quests.ore_proc.centrifuge_sifter.subtitle}" + tasks: [ + { + id: "7B3C64B98597B573" + item: "gtceu:lv_centrifuge" + optional_task: true + type: "item" + } + { + id: "288ABE9C064D983F" + item: "vintageimprovements:centrifuge" + optional_task: true + type: "item" + } + { + id: "54EA71173CCA6298" + type: "checkmark" + } + ] + title: "{quests.ore_proc.centrifuge_sifter.title}" + x: 2.0d + y: 2.0d + } + { + dependencies: ["544EA7FF98FDCFB7"] + description: ["{quests.ore_proc.macerator_separator.desc}"] + icon: "greate:stainless_steel_crushing_wheel" + id: "630D44C9BD1D7190" + subtitle: "{quests.ore_proc.macerator_separator.subtitile}" + tasks: [ + { + id: "57FD0D0741991622" + item: "gtceu:hv_macerator" + optional_task: true + type: "item" + } + { + id: "473B6D9D44F5CA51" + item: "greate:stainless_steel_crushing_wheel" + optional_task: true + type: "item" + } + { + id: "5DE1F541B6A2C27E" + type: "checkmark" + } + ] + title: "{quests.ore_proc.macerator_separator.desc}" + x: -1.0d + y: 1.0d + } + { + dependencies: ["630D44C9BD1D7190"] + description: ["{quests.ore_proc.electro_separator.desc}"] + icon: "gtceu:lv_electromagnetic_separator" + id: "5DC7D0B4E591417D" + subtitle: "{quests.ore_proc.electro_separator.subtitle}" + tasks: [ + { + id: "2F017A29A979276C" + item: "gtceu:hv_electromagnetic_separator" + optional_task: true + type: "item" + } + { + id: "6B3DD2CB3874478A" + item: "gtceu:pure_bastnasite_dust" + optional_task: true + type: "item" + } + { + id: "753028DDF077DCFD" + item: "gtceu:pure_naquadah_dust" + optional_task: true + type: "item" + } + { + id: "4347664AB3BF5736" + type: "checkmark" + } + ] + title: "{quests.ore_proc.electro_separator.title}" + x: -1.0d + y: 2.0d + } + { + dependencies: [ + "5DC7D0B4E591417D" + "6BAC3BE1D4FE0F6B" + "2F1AFDB17C5FC291" + ] + dependency_requirement: "one_completed" + description: ["{quests.ore_proc.dust_processed.desc}"] + id: "22C1D541452D4AD4" + subtitle: "{quests.ore_proc.dust_processed.subtitle}" + tasks: [ + { + id: "3EA3BABECE52085B" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item_tag(forge:dusts))" + } + } + type: "item" + } + { + id: "1A1B2762EFD6C6B0" + type: "checkmark" + } + ] + title: "{quests.ore_proc.dust_processed.title}" + x: 0.5d + y: 3.5d + } + { + dependencies: ["22C1D541452D4AD4"] + description: ["{quests.ore_proc.electrolyzer.desc}"] + icon: "gtceu:lv_electrolyzer" + id: "1BE7400D97562227" + subtitle: "{quests.ore_proc.electrolyzer.subtitle}" + tasks: [ + { + id: "266A62102285A81F" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:lv_electrolyzer)item(gtceu:mv_electrolyzer)item(gtceu:hv_electrolyzer)item(gtceu:ev_electrolyzer)item(gtceu:iv_electrolyzer)item(gtceu:luv_electrolyzer)item(gtceu:zpm_electrolyzer)item(gtceu:uv_electrolyzer))" + } + } + optional_task: true + type: "item" + } + { + id: "63355BE55659968E" + type: "checkmark" + } + ] + title: "{quests.ore_proc.electrolyzer.title}" + x: 0.0d + y: 5.5d + } + { + dependencies: ["22C1D541452D4AD4"] + description: ["{quests.ore_proc.packer.desc}"] + icon: "gtceu:lv_packer" + id: "0D75C3A7D69E12C2" + subtitle: "{quests.ore_proc.packer.subtitle}" + tasks: [ + { + id: "5B4F1397CD746E02" + item: "gtceu:lv_packer" + optional_task: true + type: "item" + } + { + id: "1652532FFCF3E37A" + type: "checkmark" + } + ] + title: "{quests.ore_proc.packer.title}" + x: 1.0d + y: 5.5d + } + { + dependencies: ["5D09BEE61210DF02"] + description: ["{quests.ore_proc.gtcy.desc}"] + icon: "gtceu:alloy_blast_smelter" + id: "335FE15E81D3AB06" + shape: "octagon" + size: 1.25d + subtitle: "{quests.ore_proc.gtcy.subtitle}" + tasks: [ + { + id: "5B6E8C5E63F5AF97" + item: "gtceu:large_maceration_tower" + optional_task: true + type: "item" + } + { + id: "3A25030D00212FC6" + item: "gtceu:large_centrifuge" + optional_task: true + type: "item" + } + { + id: "4A3FE7BC2DBA8D37" + item: "gtceu:large_sifting_funnel" + optional_task: true + type: "item" + } + { + id: "4035CEFA54AF8CA7" + item: "gtceu:large_chemical_bath" + optional_task: true + type: "item" + } + { + id: "757E5A50BE7FDF72" + item: "gtceu:large_electromagnet" + optional_task: true + type: "item" + } + { + id: "087302FFE78EA9AB" + item: "gtceu:large_electrolyzer" + optional_task: true + type: "item" + } + { + id: "243D67333DA333D8" + item: "gtceu:large_packer" + optional_task: true + type: "item" + } + { + id: "5C78A0155B10864F" + type: "checkmark" + } + ] + title: "{quests.ore_proc.gtcy.title}" + x: 3.0d + y: -8.5d + } + { + dependencies: ["5D09BEE61210DF02"] + description: ["{quests.ore_proc.ae2.desc}"] + icon: "expatternprovider:tag_storage_bus" + id: "4ED1E28BDDE50E6C" + shape: "octagon" + size: 1.25d + subtitle: "{quests.ore_proc.ae2.subtitle}" + tasks: [ + { + id: "120F92F5742F409A" + item: "ae2:controller" + optional_task: true + type: "item" + } + { + id: "32D21FB6D64AB61E" + item: "expatternprovider:tag_storage_bus" + optional_task: true + type: "item" + } + { + id: "3F6075F8DEA148A6" + type: "checkmark" + } + ] + title: "{quests.ore_proc.ae2.title}" + x: -2.0d + y: -8.5d + } + { + dependencies: ["5D09BEE61210DF02"] + description: ["{quests.ore_proc.robot_arm.desc}"] + icon: "gtceu:item_tag_filter" + id: "5AB0C996B1325FDC" + shape: "octagon" + size: 1.25d + subtitle: "{quests.ore_proc.robot_arm.subtitle}" + tasks: [ + { + id: "7CB8EAD1E4450C34" + item: "gtceu:item_tag_filter" + optional_task: true + type: "item" + } + { + id: "028E7DEC8CE595E8" + item: "gtceu:item_smart_filter" + optional_task: true + type: "item" + } + { + id: "0DCF304790B84769" + item: "gtceu:lv_robot_arm" + optional_task: true + type: "item" + } + { + id: "208DF030039D27B3" + type: "checkmark" + } + ] + title: "{quests.ore_proc.robot_arm.title}" + x: 0.5d + y: -11.0d + } + ] + subtitle: ["{quests.ore_proc.subtitle}"] + title: "{quest.ore_proc}" +} diff --git a/config/ftbquests/quests/chapters/progression.snbt b/config/ftbquests/quests/chapters/progression.snbt index bbf0b3a3a..cd9b367f9 100644 --- a/config/ftbquests/quests/chapters/progression.snbt +++ b/config/ftbquests/quests/chapters/progression.snbt @@ -70,14 +70,6 @@ x: 2.0d y: 2.0d } - { - id: "0B4D429E3441C906" - linked_quest: "4AFD3073C731A1E4" - shape: "rsquare" - size: 0.8d - x: 2.0d - y: 3.0d - } { id: "2B8FBCD290196265" linked_quest: "14D277A164202FF8" @@ -310,6 +302,14 @@ x: 6.0d y: -4.0d } + { + id: "713A4F2E798A8BDB" + linked_quest: "6A451F43F3D7A671" + shape: "rsquare" + size: 0.8d + x: 2.0d + y: 3.0d + } ] quests: [ { @@ -358,7 +358,6 @@ "38DE506FF5B32031" "5063FDFFBE3E4855" "14D277A164202FF8" - "4AFD3073C731A1E4" "5E76D4C24026157D" ] description: [ @@ -547,7 +546,6 @@ { dependencies: [ "49C1D61741AA288E" - "4AFD3073C731A1E4" "0017FFFAD7CD2EFE" ] description: [ diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 1427e9b64..4ecf2351a 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -1308,4 +1308,4 @@ ] subtitle: ["{quests.metal_age.subtitle}"] title: "{quests.metal_age}" -} +} \ No newline at end of file diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index 372346e1a..c66c7e6ee 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -2294,4 +2294,4 @@ ] subtitle: ["{quests.stone_age.subtitle}"] title: "{quests.stone_age}" -} +} \ No newline at end of file diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 855826efa..15e80bfc4 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -6,7 +6,12 @@ icon: "minecraft:apple" id: "5D74D1A68158F29E" order_index: 1 - quest_links: [ ] + quest_links: [{ + id: "1AD1F9822B738105" + linked_quest: "2E36E5755B2F551C" + x: 4.0d + y: 6.0d + }] quests: [ { dependencies: ["427814F6E9386772"] @@ -4526,6 +4531,205 @@ x: -13.5d y: 6.5d } + { + dependencies: ["02FDECC931B5E8EF"] + description: [ + "&3Long-Distance Item Pipes&r can be used to send items across great distances. Place one endpoint at each end, and connect them with pipeline blocks." + "" + "These pipes instantly transfer from the input side to the output side." + "" + "They also have a minimum distance between pipe endpoints, so you can't use these for short-range operations." + ] + icon: "gtceu:long_distance_item_pipeline_endpoint" + id: "22B0E30FF38145E7" + shape: "square" + size: 1.0d + subtitle: "Wondering how to move those ores around?" + tasks: [ + { + count: 2L + id: "7D5959A062BEE77C" + item: "gtceu:long_distance_item_pipeline_endpoint" + type: "item" + } + { + id: "30A1D0C682D0FC2E" + item: "gtceu:long_distance_item_pipeline" + type: "item" + } + ] + title: "Long-Distance Items" + x: 4.0d + y: 2.0d + } + { + dependencies: ["02FDECC931B5E8EF"] + dependency_requirement: "one_completed" + description: [ + "The &aPortable Scanner&r, or &aTricorder&r, is GTCEu's debug tool." + "" + "Using it will show you a block's details, the details of the energy network, its current status and contents, and its impact on performance." + "" + "It'll also display a percentage of fluid remaining in the fluid vein for the &3Fluid Rigs&r." + "{@pagebreak}" + "&l&3Lore:&r&o This little useful device comes from GregTech 5. It was extremely useful in the early days, because very little information (basically nothing) was given by GUIs or WAILA." + ] + id: "58D40A430654C997" + shape: "square" + size: 1.0d + subtitle: "For the nosiest GregTech players" + tasks: [{ + id: "1E2E112D32893B8D" + item: "gtceu:portable_scanner" + type: "item" + }] + title: "Tricorder" + x: 6.0d + y: 2.0d + } + { + dependencies: ["02FDECC931B5E8EF"] + description: [ + "&3Long-Distance Fluid Pipes&r can be used to send fluids across great distances. Place one endpoint at each end, and connect them with pipeline blocks." + "" + "These pipes instantly transfer from the input side to the output side." + "" + "They also have a minimum distance between pipe endpoints, so you can't use these for short-range operations." + "{@pagebreak}" + "These pipes have a reputation of being &4buggy&r to set up. If they don't seem to work at first, try rotating the endpoints with a &eWrench&r." + ] + icon: "gtceu:long_distance_fluid_pipeline_endpoint" + id: "0B1AA0D4CEBD06A8" + optional: true + shape: "square" + size: 1.0d + subtitle: "Wondering how to move that oil around?" + tasks: [ + { + count: 2L + id: "2B2586817A16F100" + item: "gtceu:long_distance_fluid_pipeline_endpoint" + type: "item" + } + { + id: "246FB107C0C2B28C" + item: "gtceu:long_distance_fluid_pipeline" + type: "item" + } + ] + title: "Long-Distance Pipeline" + x: 5.0d + y: 2.0d + } + { + dependencies: ["02FDECC931B5E8EF"] + description: [ + "In this quest, we'll bestow upon you &5cursed wisdom&r... the ability to easily automate the Electrolyzer." + "" + "The &9Smart Item Filter&r is a filter that recognises Recipe Maps. When placed on the side of a machine, you can set it to \"&3Electrolyzer&r\" to allow insertion of electrolyzable items specifically. You heard that right - no need to filter manually!" + "" + "Oh, and it only gets &abetter&r. If you combine this bad boy with a &aRobot Arm&r, it'll only supply the &6exact amount&r of items required for a successful recipe to the machine." + "{@pagebreak}" + "Place the &aRobot Arm&r on your Electrolyzer, open its GUI, then place the &9Smart Filter&r inside. Ensure that the Smart Filter is set to Electrolyzer." + "" + "Next, configure it to &d&lImport&r and &d&lSupply Exact&r. Finally, attach any inventory &7(a chest will do)&r onto the side where you placed the &aRobot Arm&r. Ta-dah! You've figured out how to handle &6all&r Electrolyzer recipes!" + "" + "What about the output of the &3Electrolyzer&r? You may want to route the Fluids to several Tanks - or even &3Super Tanks&r if you've gotten that far. We highly recommend that you avoid any methods involving voiding Fluids.&7.&8. except for Water for obvious reasons." + "{@pagebreak}" + "&9Note:&r The Robot Arm has to facilitate the item transfer for its filtering functionality to work! Inserting directly into the machine &7(for instance, pushing with a Hopper!)&r will ignore the Robot Arm's &dSupply Exact&r setting." + ] + icon: "gtceu:item_smart_filter" + id: "222295CD03AF00DC" + shape: "square" + size: 1.0d + subtitle: "Knock, knock - who's that? It's MENSA!" + tasks: [{ + id: "11EC9A6D9E2C4B7E" + item: "gtceu:item_smart_filter" + type: "item" + }] + title: "200IQ" + x: 6.0d + y: 3.0d + } + { + dependencies: ["02FDECC931B5E8EF"] + description: [ + "This is a guide on how to automatically route &lall&r your Hot Ingots to your Chemical Bath, while keeping everything automated in tip-top shape." + "" + "The cheap way would be to use filters, and manually add Hot Ingots one by one... which is so boring! Let's try the fun option." + "" + "Install an &aItem Tag Filter&r Cover on the side of your &3Chemical Bath&r, open it and set it to whitelist \"&e&lhot_ingots&r\"." + "" + "From here, you can route with &9any logistics system&r of your choice." + "{@pagebreak}" + "Connect the output of your &3EBF(s)&r to the input of your &3Chemical Bath&r and the output dump (Chest or Crate)." + "You can also have a &dRestrictive Pipe&r in front of the output dump to ensure the Chemical Bath will be prioritized." + "" + "&l&9Note:&r If you wish to know more tags for more automation setups, they will display if you press Shift when hovering over an item. For instance, an item tagged with &e&o#forge:plates/copper&r would be filtered as &e&lplates/copper&r." + "" + "&9Other Note:&r The Item Tag Filter partially supports &dregex&r. Hover over the info icon for more information." + ] + icon: "gtceu:item_tag_filter" + id: "7C1FD81C5DCFB74E" + shape: "square" + size: 1.0d + subtitle: "Stop burning your darn hands!" + tasks: [{ + id: "34DEDF3B7F0DB3BC" + item: "gtceu:item_tag_filter" + type: "item" + }] + title: "250IQ" + x: 6.0d + y: 4.0d + } + { + dependencies: ["02FDECC931B5E8EF"] + description: [ + "In theory, Crates are flat upgrades to Chests. A single block space that stores more items - what more could you ask for?" + "" + "Unfortunately, there's a small downside - Crates do not support item movement shortcuts well. We plan on fixing this in the long-term." + "" + "Where they shine however is the fact that they &6accept Covers&r, making them perfect candidates for buffers in automation." + ] + icon: "gtceu:bronze_crate" + id: "6702D52922D85C0D" + shape: "square" + size: 1.0d + subtitle: "Earlygame buffering" + tasks: [{ + id: "2F8D9ACDF8EB5B8D" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:wood_crate)item(gtceu:bronze_crate)item(gtceu:steel_crate)item(gtceu:aluminium_crate)item(gtceu:stainless_steel_crate)item(gtceu:titanium_crate)item(gtceu:tungsten_steel_crate))" + } + } + type: "item" + }] + title: "GregTech Storage" + x: 5.0d + y: 7.0d + } + { + dependencies: ["6702D52922D85C0D"] + description: ["With that tape you wil be able to move around the crate. The main advantage? You can put anything in a crate, weight won't be an issue here."] + icon: "gtceu:basic_tape" + id: "36B64597F76625ED" + shape: "square" + size: 1.0d + subtitle: "Moving stuff around" + tasks: [{ + id: "1257FC299E957859" + item: "gtceu:basic_tape" + type: "item" + }] + title: "Tape for Crate" + x: 5.0d + y: 8.0d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4c49df757..41c17a60e 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -976,13 +976,13 @@ const registerGTCEURecipes = (event) => { .itemInputs('#forge:ingots/iron', '#tfc:steam_bloomery_basic_fuels') .itemOutputs('tfc:raw_iron_bloom') .duration(2400) - .EUt(GTValues.VEX[GTValues.ULV]) + .EUt(2) event.recipes.gtceu.steam_bloomery('steam_raw_iron_bloom_coalcoke') .itemInputs('2x #forge:ingots/iron', '#tfc:blast_furnace_fuel') .itemOutputs('2x tfc:raw_iron_bloom') .duration(2400) - .EUt(GTValues.VEX[GTValues.ULV]) + .EUt(2) GTMaterialRegistry.getRegisteredMaterials().forEach(material => { @@ -996,13 +996,13 @@ const registerGTCEURecipes = (event) => { .itemInputs(ChemicalHelper.get(TagPrefix.dust, material, 1), '#tfc:steam_bloomery_basic_fuels') .itemOutputs('tfc:raw_iron_bloom') .duration(2400) - .EUt(GTValues.VEX[GTValues.ULV]) + .EUt(2) event.recipes.gtceu.steam_bloomery(`steam_raw_iron_bloom_coalcoke_${material.getName()}`) .itemInputs(ChemicalHelper.get(TagPrefix.dust, material, 2), '#tfc:blast_furnace_fuel') .itemOutputs('2x tfc:raw_iron_bloom') .duration(2400) - .EUt(GTValues.VEX[GTValues.ULV]) + .EUt(2) } }) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index f1ce0d7b3..f59f52eb7 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -237,4 +237,5 @@ const registerTFCRecipes = (event) => { // Brass Mechanism event.recipes.shapeless('gtceu:small_brass_gear', [ 'tfc:brass_mechanisms' ]).id('tfg:replace_brass_mechanisms') event.replaceInput({ input: 'tfc:brass_mechanisms' }, 'tfc:brass_mechanisms', 'gtceu:small_brass_gear') + } diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index d8655c616..41836919d 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -128,9 +128,9 @@ function registerTFGMiscellaneousRecipes(event) { //Scaffolding Frame event.shaped('tfg:scaffolding_frame', [ - 'AAA', + ' A ', 'ABA', - 'AAA' + ' A ' ], { A: '#forge:rods/wood', @@ -138,7 +138,7 @@ function registerTFGMiscellaneousRecipes(event) { }).id('tfg:shaped/scaffolding_frame'); event.recipes.gtceu.assembler('tfg:assembler/scaffolding_frame') - .itemInputs('8x #forge:rods/wood', '#forge:cloth') + .itemInputs('4x #forge:rods/wood', '#forge:cloth') .itemOutputs('tfg:scaffolding_frame') .duration(10) .EUt(GTValues.VA[GTValues.ULV]); From 032773d491185741cdb56c12b3ba53d57685bab0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 21:41:36 +0100 Subject: [PATCH 60/95] added some configs --- config/tfcimprovedbadlands-common.toml | 18 ++++++++++++++++++ defaultconfigs/beneath-server.toml | 6 ++++++ 2 files changed, 24 insertions(+) create mode 100644 config/tfcimprovedbadlands-common.toml create mode 100644 defaultconfigs/beneath-server.toml diff --git a/config/tfcimprovedbadlands-common.toml b/config/tfcimprovedbadlands-common.toml new file mode 100644 index 000000000..57588d479 --- /dev/null +++ b/config/tfcimprovedbadlands-common.toml @@ -0,0 +1,18 @@ + +[General] + # + # Toggles generation of sand layers. Disabling this (false) will shorten world generation time. + enableSandLayers = false + # + # Maximum rainfall for where sand layers can generate. Set to 500 to enable everywhere. + #Range: 4.9E-324 ~ 1.7976931348623157E308 + sandLayerRainfall = 100.0 + # + # The center point (rainfall) at which some biomes will start to turn into sand dunes. Set to any arbitrary large or low number to disable entirely. + #Range: > -2147483648 + duneThreshold = 20 + # + # The center point (rainfall) at which badland biomes will start to turn into their normal terrain. Set to any arbitrary large or low number to disable entirely. + #Range: > -2147483648 + badlandsThreshold = 140 + diff --git a/defaultconfigs/beneath-server.toml b/defaultconfigs/beneath-server.toml new file mode 100644 index 000000000..80b32e383 --- /dev/null +++ b/defaultconfigs/beneath-server.toml @@ -0,0 +1,6 @@ + +[general] + # + # If the sacrifice method should be allowed for getting to the nether, rather than building a portal (requires black steel pickaxe) + allowSacrifice = false + From 9558604a72173c7a7402bf5614a39d11df14ed99 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 21:41:50 +0100 Subject: [PATCH 61/95] buffed tong durability, hopefully also fixes the oven thing too --- config/tfchotornot-common.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/tfchotornot-common.toml b/config/tfchotornot-common.toml index 7e77ea351..158dc3fa3 100644 --- a/config/tfchotornot-common.toml +++ b/config/tfchotornot-common.toml @@ -10,7 +10,7 @@ yeet = true #This sets the temperature when a hot object should start burning the player (in celsius). #Range: > -2147483648 - hotTemperature = 300 + hotTemperature = 500 #This sets the temperature when a cold object should add effects to the player (in celsius). #Range: > -2147483648 coldTemperature = -20 @@ -25,10 +25,10 @@ itemTemperatureModifier = 2.0 #How often the heat of your tongs, mittens or potholders should increase. Higher value -> slower. Too high and items won't heat up. #Range: > 1 - itemHeatTimeInterval = 1 + itemHeatTimeInterval = 4 #How often the durability of your tongs, mittens or potholders should take damage. Higher value -> slower. Holding multiple hot items will damage your insulating items faster! #Range: > 1 - itemDamageTimeInterval = 10 + itemDamageTimeInterval = 40 #Durability for wooden tongs. #Range: > 0 woodenTongsDurability = 250 From b17f61ffa30dd98358cf1bf1da8a1b7834d2f0e4 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 21:42:01 +0100 Subject: [PATCH 62/95] rebalanced alternators and steam engines --- config/createaddition-common.toml | 4 ++-- defaultconfigs/create-server.toml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/createaddition-common.toml b/config/createaddition-common.toml index 87bf53dbc..7db4bf738 100644 --- a/config/createaddition-common.toml +++ b/config/createaddition-common.toml @@ -5,10 +5,10 @@ [general] #Forge Energy conversion rate (in FE/t at 256 RPM, value is the FE/t generated and consumed is at 256rpm). #Range: > 0 - fe_at_max_rpm = 512 + fe_at_max_rpm = 128 #Max stress for the Alternator and Electric Motor (in SU at 256 RPM). #Range: > 0 - max_stress = 256 + max_stress = 64 #If audio should be enabled or not. audio_enabled = true diff --git a/defaultconfigs/create-server.toml b/defaultconfigs/create-server.toml index a3d5e69b6..e0cb19ac7 100644 --- a/defaultconfigs/create-server.toml +++ b/defaultconfigs/create-server.toml @@ -130,7 +130,7 @@ #. #Game ticks required for a Fan-based processing recipe to take effect. #Range: > 0 - fanProcessingTime = 150 + fanProcessingTime = 3200 #. #Moving Contraptions @@ -292,7 +292,7 @@ gearbox = 0.0 hose_pulley = 0.5 elevator_pulley = 0.5 - mechanical_crafter = 0.25 + mechanical_crafter = 0.125 #. #[in Stress Units] @@ -300,10 +300,10 @@ [kinetics.stressValues.v2.capacity] copper_valve_handle = 2.0 hand_crank = 2.0 - steam_engine = 32.0 + steam_engine = 16.0 creative_motor = 16384.0 - large_water_wheel = 32.0 - water_wheel = 8.0 + large_water_wheel = 16.0 + water_wheel = 4.0 windmill_bearing = 32.0 #. From 1ca74a876986305a01abedf9e9c8ac30975070ed Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 22:13:25 +0100 Subject: [PATCH 63/95] hot or not fixes! goodbye, blowpipe exploit --- config/tfchotornot-common.toml | 4 +-- kubejs/server_scripts/hotornot/tags.js | 3 -- kubejs/startup_scripts/horornot/constants.js | 28 ------------------- .../startup_scripts/horornot/modifications.js | 10 ------- kubejs/startup_scripts/main_startup_script.js | 1 - 5 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 kubejs/startup_scripts/horornot/modifications.js diff --git a/config/tfchotornot-common.toml b/config/tfchotornot-common.toml index 158dc3fa3..4e174fcf0 100644 --- a/config/tfchotornot-common.toml +++ b/config/tfchotornot-common.toml @@ -25,10 +25,10 @@ itemTemperatureModifier = 2.0 #How often the heat of your tongs, mittens or potholders should increase. Higher value -> slower. Too high and items won't heat up. #Range: > 1 - itemHeatTimeInterval = 4 + itemHeatTimeInterval = 3 #How often the durability of your tongs, mittens or potholders should take damage. Higher value -> slower. Holding multiple hot items will damage your insulating items faster! #Range: > 1 - itemDamageTimeInterval = 40 + itemDamageTimeInterval = 60 #Durability for wooden tongs. #Range: > 0 woodenTongsDurability = 250 diff --git a/kubejs/server_scripts/hotornot/tags.js b/kubejs/server_scripts/hotornot/tags.js index 9aa9be1b7..f31f1c7e2 100644 --- a/kubejs/server_scripts/hotornot/tags.js +++ b/kubejs/server_scripts/hotornot/tags.js @@ -7,9 +7,6 @@ const registerHotOrNotItemTags = (event) => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }) - - // TODO: TEMP FIX - event.add('tfchotornot:insulating', '#tfc:all_blowpipes') } const registerHotOrNotBlockTags = (event) => { diff --git a/kubejs/startup_scripts/horornot/constants.js b/kubejs/startup_scripts/horornot/constants.js index 544611c11..ed60a260c 100644 --- a/kubejs/startup_scripts/horornot/constants.js +++ b/kubejs/startup_scripts/horornot/constants.js @@ -1,32 +1,4 @@ // priority: 0 global.HOT_OR_NOT_DISABLED_ITEMS = [ -]; - -// Can't just use the #tfchotornot:insulating tag here because tags don't exist at startup -global.HOT_OR_NOT_ITEMS = [ - 'tfchotornot:mittens', - 'tfchotornot:burlap_potholder', - 'tfchotornot:silk_potholder', - 'tfchotornot:wool_potholder', - 'tfchotornot:tongs/wood', - 'tfchotornot:tongs/bismuth', - 'tfchotornot:tongs/bismuth_bronze', - 'tfchotornot:tongs/black_bronze', - 'tfchotornot:tongs/bronze', - 'tfchotornot:tongs/brass', - 'tfchotornot:tongs/copper', - 'tfchotornot:tongs/gold', - 'tfchotornot:tongs/nickel', - 'tfchotornot:tongs/rose_gold', - 'tfchotornot:tongs/silver', - 'tfchotornot:tongs/tin', - 'tfchotornot:tongs/zinc', - 'tfchotornot:tongs/sterling_silver', - 'tfchotornot:tongs/wrought_iron', - 'tfchotornot:tongs/cast_iron', - 'tfchotornot:tongs/steel', - 'tfchotornot:tongs/black_steel', - 'tfchotornot:tongs/red_steel', - 'tfchotornot:tongs/blue_steel', ]; \ No newline at end of file diff --git a/kubejs/startup_scripts/horornot/modifications.js b/kubejs/startup_scripts/horornot/modifications.js deleted file mode 100644 index e4138548c..000000000 --- a/kubejs/startup_scripts/horornot/modifications.js +++ /dev/null @@ -1,10 +0,0 @@ -// priority: 0 - -function registerHotOrNotItemModifications(event) { - - global.HOT_OR_NOT_ITEMS.forEach(i => { - event.modify(i, item => { - item.maxDamage = item.maxDamage * 3 - }) - }) -} \ 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 c93d56db9..cdf916826 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -27,7 +27,6 @@ BlockEvents.modification(event => { */ ItemEvents.modification(event => { registerBeneathItemModifications(event) - registerHotOrNotItemModifications(event) registerMinecraftItemModifications(event) }) From 9e1e67b2cdca7a3022b60942f67b6edce5af62d7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 22:14:10 +0100 Subject: [PATCH 64/95] bumped up how fast your tongs get hot --- config/tfchotornot-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tfchotornot-common.toml b/config/tfchotornot-common.toml index 4e174fcf0..ed10d7c44 100644 --- a/config/tfchotornot-common.toml +++ b/config/tfchotornot-common.toml @@ -25,7 +25,7 @@ itemTemperatureModifier = 2.0 #How often the heat of your tongs, mittens or potholders should increase. Higher value -> slower. Too high and items won't heat up. #Range: > 1 - itemHeatTimeInterval = 3 + itemHeatTimeInterval = 4 #How often the durability of your tongs, mittens or potholders should take damage. Higher value -> slower. Holding multiple hot items will damage your insulating items faster! #Range: > 1 itemDamageTimeInterval = 60 From 4b60d9b88814dffcca1242ac1e10ab0da614149a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 22:14:22 +0100 Subject: [PATCH 65/95] implemented visual workbench for tfc workbenches --- config/visual_workbench.json | 311 ++++------------------------- config/visualworkbench-client.toml | 6 +- 2 files changed, 40 insertions(+), 277 deletions(-) diff --git a/config/visual_workbench.json b/config/visual_workbench.json index e99524fcb..ae4359f62 100644 --- a/config/visual_workbench.json +++ b/config/visual_workbench.json @@ -1,276 +1,39 @@ { - "__comment": "Crafting table blocks to enable Visual Workbench support for.", - "values": [ - "minecraft:crafting_table", - "blue_skies:bluebright_crafting_table", - "blue_skies:starlit_crafting_table", - "blue_skies:frostbright_crafting_table", - "blue_skies:lunar_crafting_table", - "blue_skies:dusk_crafting_table", - "blue_skies:maple_crafting_table", - "blue_skies:cherry_crafting_table", - "blocksplus:spruce_crafting_table", - "blocksplus:birch_crafting_table", - "blocksplus:jungle_crafting_table", - "blocksplus:acacia_crafting_table", - "blocksplus:dark_oak_crafting_table", - "blocksplus:crimson_crafting_table", - "blocksplus:warped_crafting_table", - "blocksplus:bamboo_crafting_table", - "blocksplus:mushroom_crafting_table", - "mctb:spruce_crafting_table", - "mctb:birch_crafting_table", - "mctb:acacia_crafting_table", - "mctb:jungle_crafting_table", - "mctb:dark_oak_crafting_table", - "mctb:warped_crafting_table", - "mctb:crimson_crafting_table", - "mctb:cherry_crafting_table", - "mctb:dead_crafting_table", - "mctb:fir_crafting_table", - "mctb:hellbark_crafting_table", - "mctb:jacaranda_crafting_table", - "mctb:magic_crafting_table", - "mctb:mahogany_crafting_table", - "mctb:palm_crafting_table", - "mctb:redwood_crafting_table", - "mctb:umbran_crafting_table", - "mctb:willow_crafting_table", - "mctb:azalea_crafting_table", - "mctb:blossom_crafting_table", - "betternether:rubeus_crafting_table", - "betternether:nether_sakura_crafting_table", - "betternether:crafting_table_crimson", - "betternether:wart_crafting_table", - "betternether:crafting_table_warped", - "betternether:anchor_tree_crafting_table", - "betternether:willow_crafting_table", - "betternether:nether_mushroom_crafting_table", - "betternether:stalagnate_crafting_table", - "betternether:mushroom_fir_crafting_table", - "betternether:nether_reed_crafting_table", - "betterend:helix_tree_crafting_table", - "betterend:mossy_glowshroom_crafting_table", - "betterend:end_lotus_crafting_table", - "betterend:pythadendron_crafting_table", - "betterend:jellyshroom_crafting_table", - "betterend:tenanea_crafting_table", - "betterend:dragon_tree_crafting_table", - "betterend:lucernia_crafting_table", - "betterend:lacugrove_crafting_table", - "betterend:umbrella_tree_crafting_table", - "betterendforge:helix_tree_crafting_table", - "betterendforge:mossy_glowshroom_crafting_table", - "betterendforge:end_lotus_crafting_table", - "betterendforge:pythadendron_crafting_table", - "betterendforge:jellyshroom_crafting_table", - "betterendforge:tenanea_crafting_table", - "betterendforge:dragon_tree_crafting_table", - "betterendforge:lucernia_crafting_table", - "betterendforge:lacugrove_crafting_table", - "betterendforge:umbrella_tree_crafting_table", - "crumbs:spruce_crafting_table", - "crumbs:birch_crafting_table", - "crumbs:jungle_crafting_table", - "crumbs:acacia_crafting_table", - "crumbs:dark_oak_crafting_table", - "crumbs:crimson_crafting_table", - "crumbs:warped_crafting_table", - "byg:aspen_crafting_table", - "byg:baobab_crafting_table", - "byg:blue_enchanted_crafting_table", - "byg:cherry_crafting_table", - "byg:cika_crafting_table", - "byg:cypress_crafting_table", - "byg:ebony_crafting_table", - "byg:fir_crafting_table", - "byg:green_enchanted_crafting_table", - "byg:holly_crafting_table", - "byg:jacaranda_crafting_table", - "byg:mahogany_crafting_table", - "byg:mangrove_crafting_table", - "byg:maple_crafting_table", - "byg:pine_crafting_table", - "byg:rainbow_eucalyptus_crafting_table", - "byg:redwood_crafting_table", - "byg:skyris_crafting_table", - "byg:willow_crafting_table", - "byg:witch_hazel_crafting_table", - "byg:zelkova_crafting_table", - "byg:sythian_crafting_table", - "byg:embur_crafting_table", - "byg:palm_crafting_table", - "byg:lament_crafting_table", - "byg:bulbis_crafting_table", - "byg:nightshade_crafting_table", - "byg:ether_crafting_table", - "byg:imparius_crafting_table", - "vct:spruce_crafting_table", - "vct:birch_crafting_table", - "vct:jungle_crafting_table", - "vct:acacia_crafting_table", - "vct:dark_oak_crafting_table", - "vct:mangrove_crafting_table", - "vct:crimson_crafting_table", - "vct:warped_crafting_table", - "vct:bop_cherry_crafting_table", - "vct:bop_dead_crafting_table", - "vct:bop_fir_crafting_table", - "vct:bop_hellbark_crafting_table", - "vct:bop_jacaranda_crafting_table", - "vct:bop_magic_crafting_table", - "vct:bop_mahogany_crafting_table", - "vct:bop_palm_crafting_table", - "vct:bop_redwood_crafting_table", - "vct:bop_umbran_crafting_table", - "vct:bop_willow_crafting_table", - "vct:canopy_crafting_table", - "vct:darkwood_crafting_table", - "vct:twilight_mangrove_crafting_table", - "vct:minewood_crafting_table", - "vct:sortingwood_crafting_table", - "vct:timewood_crafting_table", - "vct:transwood_crafting_table", - "vct:twilight_oak_crafting_table", - "vct:aspen_crafting_table", - "vct:grimwood_crafting_table", - "vct:kousa_crafting_table", - "vct:morado_crafting_table", - "vct:rosewood_crafting_table", - "vct:yucca_crafting_table", - "vct:maple_crafting_table", - "vct:bamboo_crafting_table", - "vct:azalea_crafting_table", - "vct:poise_crafting_table", - "vct:cherry_crafting_table", - "vct:willow_crafting_table", - "vct:wisteria_crafting_table", - "vct:driftwood_crafting_table", - "vct:river_crafting_table", - "vct:jacaranda_crafting_table", - "vct:redbud_crafting_table", - "vct:cypress_crafting_table", - "vct:brown_mushroom_crafting_table", - "vct:red_mushroom_crafting_table", - "vct:glowshroom_crafting_table", - "vct:twisted_crafting_table", - "vct:petrified_crafting_table", - "vct:eco_azalea_crafting_table", - "vct:eco_flowering_azalea_crafting_table", - "vct:eco_coconut_crafting_table", - "vct:eco_walnut_crafting_table", - "vct:fairy_ring_mushroom_crafting_table", - "vct:azure_crafting_table", - "vct:araucaria_crafting_table", - "vct:heidiphyllum_crafting_table", - "vct:liriodendrites_crafting_table", - "vct:metasequoia_crafting_table", - "vct:protojuniperoxylon_crafting_table", - "vct:protopiceoxylon_crafting_table", - "vct:zamites_crafting_table", - "vct:quark_azalea_crafting_table", - "vct:quark_blossom_crafting_table", - "vct:grongle_crafting_table", - "vct:smogstem_crafting_table", - "vct:wigglewood_crafting_table", - "vct:congealed_crafting_table", - "vct:echo_crafting_table", - "vct:ebony_crafting_table", - "vct:pream_crafting_table", - "vct:verdant_crafting_table", - "vct:jaboticaba_crafting_table", - "vct:ramboutan_crafting_table", - "vct:bm_ancient_oak_crafting_table", - "vct:bm_blighted_balsa_crafting_table", - "vct:bm_swamp_cypress_crafting_table", - "vct:bm_willow_crafting_table", - "vct:rue_baobab_crafting_table", - "vct:rue_blackwood_crafting_table", - "vct:rue_cherry_crafting_table", - "vct:rue_cypress_crafting_table", - "vct:rue_dead_crafting_table", - "vct:rue_eucalyptus_crafting_table", - "vct:rue_joshua_crafting_table", - "vct:rue_larch_crafting_table", - "vct:rue_maple_crafting_table", - "vct:rue_mauve_crafting_table", - "vct:rue_palm_crafting_table", - "vct:rue_pine_crafting_table", - "vct:rue_redwood_crafting_table", - "vct:rue_willow_crafting_table", - "variantcraftingtables:acacia_crafting_table", - "variantcraftingtables:birch_crafting_table", - "variantcraftingtables:dark_oak_crafting_table", - "variantcraftingtables:jungle_crafting_table", - "variantcraftingtables:spruce_crafting_table", - "variantcraftingtables:mangrove_crafting_table", - "variantcraftingtables:crimson_crafting_table", - "variantcraftingtables:warped_crafting_table", - "variantcraftingtables:rubber_crafting_table", - "variantcraftingtables:bamboo_crafting_table", - "variantcraftingtables:charred_crafting_table", - "variantcraftingtables:legacy_crafting_table", - "variantcraftingtables:white_oak_crafting_table", - "variantcraftingtables:herringbone_acacia_crafting_table", - "variantcraftingtables:herringbone_birch_crafting_table", - "variantcraftingtables:herringbone_dark_oak_crafting_table", - "variantcraftingtables:herringbone_jungle_crafting_table", - "variantcraftingtables:herringbone_oak_crafting_table", - "variantcraftingtables:herringbone_spruce_crafting_table", - "variantcraftingtables:herringbone_white_oak_crafting_table", - "variantcraftingtables:herringbone_bamboo_crafting_table", - "variantcraftingtables:herringbone_charred_crafting_table", - "variantcraftingtables:herringbone_crimson_crafting_table", - "variantcraftingtables:herringbone_warped_crafting_table", - "variantcraftingtables:cherry_oak_crafting_table", - "variantcraftingtables:dark_amaranth_crafting_table", - "variantcraftingtables:palm_crafting_table", - "variantcraftingtables:cypress_crafting_table", - "variantcraftingtables:dragons_blood_crafting_table", - "variantcraftingtables:elder_crafting_table", - "variantcraftingtables:juniper_crafting_table", - "variantcraftingtables:dreamwood_crafting_table", - "variantcraftingtables:livingwood_crafting_table", - "variantcraftingtables:mossy_dreamwood_crafting_table", - "variantcraftingtables:mossy_livingwood_crafting_table", - "variantcraftingtables:shimmerwood_crafting_table", - "variantcraftingtables:black_crafting_table", - "variantcraftingtables:blue_crafting_table", - "variantcraftingtables:brown_crafting_table", - "variantcraftingtables:cyan_crafting_table", - "variantcraftingtables:gray_crafting_table", - "variantcraftingtables:green_crafting_table", - "variantcraftingtables:light_blue_crafting_table", - "variantcraftingtables:light_gray_crafting_table", - "variantcraftingtables:lime_crafting_table", - "variantcraftingtables:magenta_crafting_table", - "variantcraftingtables:orange_crafting_table", - "variantcraftingtables:pink_crafting_table", - "variantcraftingtables:purple_crafting_table", - "variantcraftingtables:red_crafting_table", - "variantcraftingtables:white_crafting_table", - "variantcraftingtables:yellow_crafting_table", - "variantcraftingtables:ancient_oak_crafting_table", - "variantcraftingtables:blighted_balsa_crafting_table", - "variantcraftingtables:swamp_cypress_crafting_table", - "variantcraftingtables:willow_crafting_table", - "variantcraftingtables:mango_crafting_table", - "variantcraftingtables:wisteria_crafting_table", - "variantcraftingtables:bamboo_crafting_table_ve", - "variantcraftingtables:redwood_crafting_table", - "variantcraftingtables:azalea_crafting_table", - "variantcraftingtables:coconut_crafting_table", - "variantcraftingtables:flowering_azalea_crafting_table", - "variantcraftingtables:walnut_crafting_table", - "variantcraftingtables:stripped_bamboo_crafting_table", - "variantcraftingtables:crystal_crafting_table", - "variantcraftingtables:golden_oak_crafting_table", - "variantcraftingtables:orange_crafting_table_pl", - "variantcraftingtables:skyroot_crafting_table", - "variantcraftingtables:wisteria_crafting_table_pl", - "variantcraftingtables:cinnamon_crafting_table", - "variantcraftingtables:jade_crafting_table", - "variantcraftingtables:moon_crafting_table", - "variantcraftingtables:shadow_crafting_table" - ] + "__comment": "Crafting table blocks to enable Visual Workbench support for.", + "values": [ + [ + "afc:wood/planks/fig_workbench", + "afc:wood/planks/ironwood_workbench", + "afc:wood/planks/ipe_workbench", + "beneath:wood/planks/crimson_workbench", + "beneath:wood/planks/warped_workbench", + "tfc:wood/planks/kapok_workbench", + "tfc:wood/planks/hickory_workbench", + "tfc:wood/planks/douglas_fir_workbench", + "tfc:wood/planks/chestnut_workbench", + "tfc:wood/planks/blackwood_workbench", + "tfc:wood/planks/birch_workbench", + "tfc:wood/planks/acacia_workbench", + "tfc:wood/planks/ash_workbench", + "tfc:wood/planks/aspen_workbench", + "tfc:wood/planks/sycamore_workbench", + "tfc:wood/planks/spruce_workbench", + "tfc:wood/planks/sequoia_workbench", + "tfc:wood/planks/rosewood_workbench", + "tfc:wood/planks/pine_workbench", + "tfc:wood/planks/palm_workbench", + "tfc:wood/planks/oak_workbench", + "tfc:wood/planks/maple_workbench", + "tfc:wood/planks/mangrove_workbench", + "afc:wood/planks/cypress_workbench", + "afc:wood/planks/teak_workbench", + "afc:wood/planks/tualang_workbench", + "afc:wood/planks/hevea_workbench", + "afc:wood/planks/mahogany_workbench", + "afc:wood/planks/eucalyptus_workbench", + "afc:wood/planks/baobab_workbench", + "tfc:wood/planks/willow_workbench", + "tfc:wood/planks/white_cedar_workbench" + ] + ] } \ No newline at end of file diff --git a/config/visualworkbench-client.toml b/config/visualworkbench-client.toml index 13a2e7913..c0223adf3 100644 --- a/config/visualworkbench-client.toml +++ b/config/visualworkbench-client.toml @@ -1,7 +1,7 @@ #Rotate crafting table contents so they always face the closest player. -rotate_ingredients = true +rotate_ingredients = false #Makes crafting table contents lay flat on the table instead of floating above. -flat_rendering = false +flat_rendering = true #Render the result of the crafting operation in addition to crafting table contents. -render_result = true +render_result = false From 87dc55582d22cf389c85f33266a6938e8a946480 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 22:15:23 +0100 Subject: [PATCH 66/95] removed adjustable chain gearshift because you could get around greate with it --- kubejs/server_scripts/create/recipes.js | 1 - kubejs/startup_scripts/create/constants.js | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 540506441..7946b67f8 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -5,7 +5,6 @@ const registerCreateRecipes = (event) => { // Удаление рецептов мода create event.remove({ not: [ - { id: 'create:crafting/kinetics/adjustable_chain_gearshift' }, { id: 'create:crafting/kinetics/cuckoo_clock' }, { id: 'create:crafting/kinetics/mysterious_cuckoo_clock' }, { id: 'create:crafting/kinetics/smart_chute' }, diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 56fc162f5..2c917a567 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -292,5 +292,6 @@ global.CREATE_DISABLED_ITEMS = [ 'create:chest_minecart_contraption', 'create:mechanical_pump', 'create:peculiar_bell', - 'create:haunted_bell' + 'create:haunted_bell', + 'create:adjustable_chain_gearshift' ]; From 058a3ae1030e33c3ce92d2c05e85c0f68be461aa Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 22:15:57 +0100 Subject: [PATCH 67/95] added recipe for vanilla campfire, for people who like smoke particles (me) --- kubejs/server_scripts/minecraft/recipes.js | 24 +++++++++++++++++++ kubejs/startup_scripts/minecraft/constants.js | 1 - 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index ffd020ccd..4f91ab922 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -948,4 +948,28 @@ const registerMinecraftRecipes = (event) => { .itemOutputs('minecraft:leather') .EUt(7).duration(80) //#endregion + + //#region Campfire + event.shaped('minecraft:campfire', [ + ' A ', + 'ABA', + 'CDC' + ], { + A: 'minecraft:blaze_rod', + B: 'minecraft:blaze_powder', + C: '#forge:ingots/blue_steel', + D: '#forge:storage_blocks/charcoal', + }).id('tfg:campfire_charcoal') + + event.shaped('minecraft:campfire', [ + ' A ', + 'ABA', + 'CDC' + ], { + A: 'minecraft:blaze_rod', + B: 'minecraft:blaze_powder', + C: '#forge:ingots/blue_steel', + D: '#forge:storage_blocks/coal', + }).id('tfg:campfire_coal') + //#endregion } diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 2833fb522..d7f07dfed 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -595,7 +595,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:frogspawn', 'minecraft:cactus', 'minecraft:sweet_berries', - 'minecraft:campfire', 'minecraft:soul_campfire', 'minecraft:bee_nest', 'minecraft:fletching_table', From 7d2f188dff1370862c272f4f1b38f445de55c41a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 22:19:07 +0100 Subject: [PATCH 68/95] properly fixed the bronze millstone this time --- kubejs/server_scripts/greate/recipes.js | 80 ++++++++++++------------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index dab57c9cb..bc3ef4c6a 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -83,47 +83,41 @@ function registerGreateRecipes(event) { // #region Millstones - event.recipes.tfc.damage_inputs_shaped_crafting( - event.shaped('greate:andesite_alloy_millstone', [ - ' B ', - 'DCE', - ' A ' - ], { - A: 'tfc:quern', - B: 'tfc:handstone', - C: '#forge:gears/bronze', - D: '#forge:tools/hammers', - E: '#tfc:chisels' - }) - ).id('greate:shaped/andesite_alloy_millstone') + event.shaped('greate:andesite_alloy_millstone', [ + ' B ', + 'DCE', + ' A ' + ], { + A: 'tfc:quern', + B: 'tfc:handstone', + C: '#forge:gears/bronze', + D: '#forge:tools/hammers', + E: '#forge:tools/saws' + }).id('greate:shaped/andesite_alloy_millstone') - event.recipes.tfc.damage_inputs_shaped_crafting( - event.shaped('greate:andesite_alloy_millstone', [ - ' B ', - 'DCE', - ' A ' - ], { - A: 'tfc:quern', - B: 'tfc:handstone', - C: '#forge:gears/bismuth_bronze', - D: '#forge:tools/hammers', - E: '#tfc:chisels' - }) - ).id('greate:shaped/andesite_alloy_millstone2') + event.shaped('greate:andesite_alloy_millstone', [ + ' B ', + 'DCE', + ' A ' + ], { + A: 'tfc:quern', + B: 'tfc:handstone', + C: '#forge:gears/bismuth_bronze', + D: '#forge:tools/hammers', + E: '#forge:tools/saws' + }).id('greate:shaped/andesite_alloy_millstone2') - event.recipes.tfc.damage_inputs_shaped_crafting( - event.shaped('greate:andesite_alloy_millstone', [ - ' B ', - 'DCE', - ' A ' - ], { - A: 'tfc:quern', - B: 'tfc:handstone', - C: '#forge:gears/black_bronze', - D: '#forge:tools/hammers', - E: '#tfc:chisels' - }) - ).id('greate:shaped/andesite_alloy_millstone3') + event.shaped('greate:andesite_alloy_millstone', [ + ' B ', + 'DCE', + ' A ' + ], { + A: 'tfc:quern', + B: 'tfc:handstone', + C: '#forge:gears/black_bronze', + D: '#forge:tools/hammers', + E: '#forge:tools/saws' + }).id('greate:shaped/andesite_alloy_millstone3') event.shaped('greate:steel_millstone', [ 'FBF', @@ -234,7 +228,7 @@ function registerGreateRecipes(event) { A: '#gtceu:circuits/ulv', B: 'gtceu:cobalt_brass_buzz_saw_blade', C: 'greate:steel_cogwheel', - D: 'gtceu:ulv_machine_casing', + D: 'gtceu:ulv_machine_hull', E: 'greate:steel_shaft', F: '#forge:tools/wrenches' }).id('greate:shaped/steel_mechanical_saw') @@ -247,7 +241,7 @@ function registerGreateRecipes(event) { A: '#gtceu:circuits/mv', B: 'gtceu:vanadium_steel_buzz_saw_blade', C: 'gtceu:mv_electric_motor', - D: 'gtceu:mv_machine_casing', + D: 'gtceu:mv_machine_hull', E: 'greate:aluminium_shaft', F: '#forge:tools/wrenches' }).id('greate:shaped/aluminium_mechanical_saw') @@ -262,7 +256,7 @@ function registerGreateRecipes(event) { // A: '#gtceu:circuits/hv', // B: 'gtceu:red_steel_buzz_saw_blade', // C: 'gtceu:hv_electric_motor', - // D: 'gtceu:hv_machine_casing', + // D: 'gtceu:hv_machine_hull', // E: 'greate:stainless_steel_shaft', // F: '#forge:tools/wrenches' // }).id('greate:shaped/stainless_steel_mechanical_saw') @@ -275,7 +269,7 @@ function registerGreateRecipes(event) { // A: '#gtceu:circuits/ev', // B: 'gtceu:ultimet_buzz_saw_blade', // C: 'gtceu:ev_electric_motor', - // D: 'gtceu:ev_machine_casing', + // D: 'gtceu:ev_machine_hull', // E: 'greate:titanium_shaft', // F: '#forge:tools/wrenches' //}).id('greate:shaped/titanium_mechanical_saw') From 4334b9c46535a71ca986c13a675f0cc0226cd128 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 22:20:00 +0100 Subject: [PATCH 69/95] glass recipe fixes --- kubejs/server_scripts/gregtech/recipes.removes.js | 1 + kubejs/server_scripts/vintage_improvements/recipes.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 869a6d6ea..e2bf5f384 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -586,6 +586,7 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:shaped/activator_rail' }) event.remove({ id: 'gtceu:shaped/shield' }) event.remove({ id: 'gtceu:shaped/pickaxe_iron' }) + event.remove({ id: 'gtceu:shapeless/glass_full_dust_flint' }) event.remove({ id: 'gtceu:shaped_fluid_container/treated_wood_planks' }) diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 584f06431..20af0a895 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -499,6 +499,8 @@ function registerVintageImprovementsRecipes(event) { if (!(EUt <= 32)) { return } // Skip this one if (r.outputs.item[0].content.ingredient.item == "gtceu:nan_certificate") { return } + // Skip glass too + if (r.outputs.item[1].content.ingredient.item == "gtceu:glass_dust") { return } let input = r.inputs.item[0].content.ingredient; input.count = r.inputs.item[0].content.count; From fb47aa38f15faa2ea350789c7d9eb1c483d216d7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 22:59:32 +0100 Subject: [PATCH 70/95] added second recipe for drink upgrade --- kubejs/server_scripts/diggerhelmet/recipes.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/diggerhelmet/recipes.js b/kubejs/server_scripts/diggerhelmet/recipes.js index ae65bff3f..0e9a39e16 100644 --- a/kubejs/server_scripts/diggerhelmet/recipes.js +++ b/kubejs/server_scripts/diggerhelmet/recipes.js @@ -33,5 +33,15 @@ function registerDiggerHelmetRecipes(event) { B: '#forge:string', C: 'minecraft:bamboo', D: 'tfc:glue' - }).id('tfg:shaped/auto_drink_modifier') + }).id('tfg:shaped/auto_drink_modifier_bamboo') + + event.shaped('diggerhelmet:auto_drink_modifier', [ + ' A ', + 'BCB', + ' C ' + ], { + A: 'waterflasks:leather_flask', + B: '#forge:screws/wrought_iron', + C: '#forge:foils/rubber' + }).id('tfg:shaped/auto_drink_modifier_rubber') } \ No newline at end of file From b2e3097cc4769800e0c6458ae92fabc10b8f47cb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 23:10:07 +0100 Subject: [PATCH 71/95] fixed recipes for glass panes, hid most of create:connected for crimes against greate --- kubejs/server_scripts/create/recipes.js | 29 +++++++------- .../create_connected/recipes.js | 31 +++++++++----- .../server_scripts/create_connected/tags.js | 12 +++--- kubejs/server_scripts/createdeco/recipes.js | 38 ++++++++++++++++++ kubejs/server_scripts/every_compat/recipes.js | 40 +++++++++++++++++++ .../create_connected/constants.js | 14 +++++++ 6 files changed, 134 insertions(+), 30 deletions(-) create mode 100644 kubejs/startup_scripts/create_connected/constants.js diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 7946b67f8..4e4b1e238 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -848,7 +848,7 @@ const registerCreateRecipes = (event) => { ' CE' ], { A: '#tfg:small_cogwheels', - B: 'create:andesite_casing', + B: 'gtceu:ulv_machine_casing', C: 'create:brass_hand', D: '#forge:tools/wrenches', E: '#forge:tools/screwdrivers', @@ -1361,12 +1361,12 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/vertical_framed_glass') const CREATE_FRAMED_GLASS_WINDOWS = - [ - 'framed_glass', - 'tiled_glass', - 'horizontal_framed_glass', - 'vertical_framed_glass' - ] + [ + 'framed_glass', + 'tiled_glass', + 'horizontal_framed_glass', + 'vertical_framed_glass' + ] CREATE_FRAMED_GLASS_WINDOWS.forEach(x => { event.shapeless(`2x create:${x}_pane`, @@ -1384,17 +1384,18 @@ const registerCreateRecipes = (event) => { }) const CREATE_OTHER_GLASS_WINDOWS = - [ - ['dark_oak', 'tfc:wood/lumber/hickory'], - ['mangrove', 'tfc:wood/lumber/mangrove'], - ['ornate_iron', 'gtceu:wrought_iron_rod'] - ] + [ + ['dark_oak', 'tfc:wood/planks/hickory'], + ['mangrove', 'tfc:wood/planks/mangrove'], + ['ornate_iron', 'tfc:metal/bars/wrought_iron'] + ] CREATE_OTHER_GLASS_WINDOWS.forEach(x => { event.shaped(`2x create:${x[0]}_window`, [ - ' B ', - 'BAB' + ' ', + 'BAB', + ' B ' ], { A: 'minecraft:glass', B: x[1] diff --git a/kubejs/server_scripts/create_connected/recipes.js b/kubejs/server_scripts/create_connected/recipes.js index ade6c0fc4..2bf5f8299 100644 --- a/kubejs/server_scripts/create_connected/recipes.js +++ b/kubejs/server_scripts/create_connected/recipes.js @@ -2,6 +2,11 @@ const registerCreateConnectedRecipes = (event) => { + global.CREATE_CONNECTED_DISABLED_ITEMS.forEach(item => { + event.remove({ input: item }) + event.remove({ output: item }) + }) + // Remove Fluid Vessel Crafting event.remove({ id: 'create_connected:crafting/kinetics/fluid_vessel' }) @@ -50,21 +55,29 @@ const registerCreateConnectedRecipes = (event) => { // Sequenced Pulse Generator event.shaped('create_connected:sequenced_pulse_generator', [ - 'AB ', - 'ACD', + 'DA ', + 'DCD', 'EEE' ], { A: 'create:electron_tube', - B: '#gtceu:circuits/ulv', C: '#forge:plates/bronze', D: 'minecraft:redstone_torch', E: '#forge:stone' }).id('create_connected:crafting/kinetics/sequenced_pulse_generator') - // Shear Pin - event.recipes.gtceu.cutter('tfg:create_connected/shear_pin') - .itemInputs('#tfg:shafts') - .itemOutputs('create_connected:shear_pin') - .duration(96) - .EUt(8) + event.shaped('create_connected:cherry_window_pane', [ + 'ABA', + ' A ' + ], { + A: 'afc:wood/planks/fig', + B: 'minecraft:glass' + }).id('create_connected:shaped/cherry_window_pane') + + event.shaped('create_connected:bamboo_window_pane', [ + ' A ', + 'ABA' + ], { + A: 'minecraft:bamboo_planks', + B: 'minecraft:glass' + }).id('create_connected:shaped/bamboo_window_pane') } \ No newline at end of file diff --git a/kubejs/server_scripts/create_connected/tags.js b/kubejs/server_scripts/create_connected/tags.js index 4dbd1c471..088e8b331 100644 --- a/kubejs/server_scripts/create_connected/tags.js +++ b/kubejs/server_scripts/create_connected/tags.js @@ -1,11 +1,9 @@ const registerCreateConnectedItemTags = (event) => { - // Removes tags from the Cherry and Bamboo wooden panes added by Create Connected - event.removeAllTagsFrom("create_connected:cherry_window_pane") - event.add("c:hidden_from_recipe_viewers", "create_connected:cherry_window_pane") - event.removeAllTagsFrom("create_connected:bamboo_window_pane") - event.add("c:hidden_from_recipe_viewers", "create_connected:bamboo_window_pane") - event.removeAllTagsFrom('create_connected:control_chip') - event.add('c:hidden_from_recipe_viewers', 'create_connected:control_chip') + + global.CREATE_CONNECTED_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) event.remove('minecraft:creeper_drop_music_discs', ['create_connected:music_disc_elevator', 'create_connected:music_disc_interlude']) } \ No newline at end of file diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index aacd70c2e..b33c3f803 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -257,4 +257,42 @@ const registerCreatedecoRecipes = (event) => { .EUt(16) // #region + + // #region Window panes + + const CREATE_DECO_GLASS_WINDOWS = + [ + ['andesite', '#forge:rods/tin_alloy'], + ['copper', '#forge:rods/copper'], + ['iron', '#forge:rods/wrought_iron'], + ['industrial_iron', '#forge:rods/steel'], + ['brass', '#forge:rods/brass'], + ['zinc', '#forge:rods/zinc'] + ] + + CREATE_DECO_GLASS_WINDOWS.forEach(x => { + event.shaped(`2x createdeco:${x[0]}_window`, + [ + ' B ', + 'BAB' + ], { + A: 'minecraft:glass', + B: x[1] + }).id(`createdeco:${x[0]}_window`) + + event.shapeless(`2x createdeco:${x[0]}_window_pane`, + [ + `createdeco:${x[0]}_window`, + '#forge:tools/saws' + ]) + .id(`createdeco:${x[0]}_window_pane`) + + event.recipes.gtceu.cutter(`tfg:createdeco/${x[0]}_window_pane`) + .itemInputs(`3x createdeco:${x[0]}_window`) + .itemOutputs(`8x createdeco:${x[0]}_window_pane`) + .duration(40) + .EUt(7) + }) + + // #endregion }; \ No newline at end of file diff --git a/kubejs/server_scripts/every_compat/recipes.js b/kubejs/server_scripts/every_compat/recipes.js index dbd2b5af0..69ec47d2a 100644 --- a/kubejs/server_scripts/every_compat/recipes.js +++ b/kubejs/server_scripts/every_compat/recipes.js @@ -19,4 +19,44 @@ const registerEveryCompatRecipes = (event) => { .duration(40) .EUt(7) }) + + global.AFC_WOOD_TYPES.forEach(wood => + { + event.remove({ id: `everycomp:c/afc/${wood}_window_pane` }) + + event.shapeless(`2x everycomp:c/afc/${wood}_window_pane`, + [ + `everycomp:c/afc/${wood}_window`, + '#forge:tools/saws' + ]) + .id(`tfg:everycompat/shapeless/${wood}_window_pane`) + + event.recipes.gtceu.cutter(`tfg:everycompat/shapeless/${wood}_window_pane`) + .itemInputs(`3x everycomp:c/afc/${wood}_window`) + .itemOutputs(`8x everycomp:c/afc/${wood}_window_pane`) + .duration(40) + .EUt(7) + }) + + const DOMUM = [ + 'cactus', + 'cactus_extra' + ] + + DOMUM.forEach(wood => { + event.remove({ id: `everycomp:c/domum_ornamentum/${wood}_window_pane` }) + + event.shapeless(`2x everycomp:c/domum_ornamentum/${wood}_window_pane`, + [ + `everycomp:c/domum_ornamentum/${wood}_window`, + '#forge:tools/saws' + ]) + .id(`tfg:everycompat/shapeless/${wood}_window_pane`) + + event.recipes.gtceu.cutter(`tfg:everycompat/shapeless/${wood}_window_pane`) + .itemInputs(`3x everycomp:c/domum_ornamentum/${wood}_window`) + .itemOutputs(`8x everycomp:c/domum_ornamentum/${wood}_window_pane`) + .duration(40) + .EUt(7) + }) } \ No newline at end of file diff --git a/kubejs/startup_scripts/create_connected/constants.js b/kubejs/startup_scripts/create_connected/constants.js new file mode 100644 index 000000000..be67b4ff7 --- /dev/null +++ b/kubejs/startup_scripts/create_connected/constants.js @@ -0,0 +1,14 @@ +// priority: 0 + +global.CREATE_CONNECTED_DISABLED_ITEMS = [ + 'create_connected:encased_chain_cogwheel', + 'create_connected:parallel_gearbox', + 'create_connected:vertical_parallel_gearbox', + 'create_connected:six_way_gearbox', + 'create_connected:vertical_six_way_gearbox', + 'create_connected:brass_gearbox', + 'create_connected:vertical_brass_gearbox', + 'create_connected:shear_pin', + 'create_connected:control_chip', + 'create_connected:incomplete_control_chip' +] \ No newline at end of file From 40e8c9c5457ba7ea4065326e880ab844ab58ceb0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 23:10:17 +0100 Subject: [PATCH 72/95] fixed glass dust recipes --- kubejs/server_scripts/vintage_improvements/recipes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 20af0a895..9020b87cd 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -500,7 +500,7 @@ function registerVintageImprovementsRecipes(event) { // Skip this one if (r.outputs.item[0].content.ingredient.item == "gtceu:nan_certificate") { return } // Skip glass too - if (r.outputs.item[1].content.ingredient.item == "gtceu:glass_dust") { return } + if (r.inputs.item[0].content.ingredient.item == "gtceu:glass_dust") { return } let input = r.inputs.item[0].content.ingredient; input.count = r.inputs.item[0].content.count; From 6025d81c23bac2994caf21be44b52c03b72aeb98 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 23:10:28 +0100 Subject: [PATCH 73/95] hid mv+ solar panels --- kubejs/startup_scripts/gtceu/constants.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index e6673295c..690013acc 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -71,6 +71,14 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:rubber_boat', 'gtceu:rubber_chest_boat', + 'gtceu:mv_solar_panel', + 'gtceu:hv_solar_panel', + 'gtceu:ev_solar_panel', + 'gtceu:iv_solar_panel', + 'gtceu:luv_solar_panel', + 'gtceu:zpm_solar_panel', + 'gtceu:uv_solar_panel', + // Sculk 'gtceu:tiny_echo_shard_dust', 'gtceu:small_echo_shard_dust', From f48052afd61066fbc2ab93d12ba0cc363f733602 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 23:10:35 +0100 Subject: [PATCH 74/95] missed a rod --- kubejs/startup_scripts/vintage_improvements/constants.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js index e1fc1244b..80cfd1bd3 100644 --- a/kubejs/startup_scripts/vintage_improvements/constants.js +++ b/kubejs/startup_scripts/vintage_improvements/constants.js @@ -57,6 +57,7 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ 'vintageimprovements:hepatizon_rod', 'vintageimprovements:invar_rod', 'vintageimprovements:lead_rod', + 'vintageimprovements:zinc_rod', 'vintageimprovements:lumium_rod', 'vintageimprovements:manyullyn_rod', 'vintageimprovements:nickel_rod', From f4bfbdd3cc8601360aec1a440b75370e7995fb7e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 23:17:55 +0100 Subject: [PATCH 75/95] update todos --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc233e4d1..751418ed5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Updated field guide for 0.9 (oosyrag) - Added speed boost to nanosuit leggings (SverhRazum-Nah) - Updated max capacity of small vessel and crucible to be multiples of 144 (oosyrag) +- You can no longer use a blowpipe to hold hot ingots, but tongs have been buffed 6x instead - Added a temporary fix for the ULS-MV millstones/crushing wheels voiding poor raw ores - Fixed a duping exploit involving metal plated blocks - Fixed some recipes that were using the wrong wrench tag @@ -33,6 +34,10 @@ - Long distance item/fluid pipes now need HV - Kaolin patches now spawn less often in lush cave biomes - You can no longer pick up regular ice with a saw to prevent moving around water sources, but you can craft packed ice instead if you need to cool off +- Hid the xp bar because xp isn't used for anything +- Fixed visual workbench not working with tfc workbenches +- Removed adjustable chain gearshift and half of create:connected because they let you get around greate's restrictions +- Added recipe for vanilla campfire for people who like smoke particles - Removed some more duplicate recipes for vanilla items - Hid some more things in JEI that aren't craftable From 8cc17b5fb0ede7f981f1cd498069ca12a48dd67d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 23:17:55 +0100 Subject: [PATCH 76/95] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc233e4d1..751418ed5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Updated field guide for 0.9 (oosyrag) - Added speed boost to nanosuit leggings (SverhRazum-Nah) - Updated max capacity of small vessel and crucible to be multiples of 144 (oosyrag) +- You can no longer use a blowpipe to hold hot ingots, but tongs have been buffed 6x instead - Added a temporary fix for the ULS-MV millstones/crushing wheels voiding poor raw ores - Fixed a duping exploit involving metal plated blocks - Fixed some recipes that were using the wrong wrench tag @@ -33,6 +34,10 @@ - Long distance item/fluid pipes now need HV - Kaolin patches now spawn less often in lush cave biomes - You can no longer pick up regular ice with a saw to prevent moving around water sources, but you can craft packed ice instead if you need to cool off +- Hid the xp bar because xp isn't used for anything +- Fixed visual workbench not working with tfc workbenches +- Removed adjustable chain gearshift and half of create:connected because they let you get around greate's restrictions +- Added recipe for vanilla campfire for people who like smoke particles - Removed some more duplicate recipes for vanilla items - Hid some more things in JEI that aren't craftable From fb2a2dd864eaeb09461f7a7bbf9e1760208363d1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 23:33:12 +0100 Subject: [PATCH 77/95] swapped panes to need any glass block and not the clear one --- kubejs/server_scripts/create/recipes.js | 2 +- kubejs/server_scripts/create_connected/recipes.js | 4 ++-- kubejs/server_scripts/createdeco/recipes.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 4e4b1e238..9b225c674 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1397,7 +1397,7 @@ const registerCreateRecipes = (event) => { 'BAB', ' B ' ], { - A: 'minecraft:glass', + A: '#forge:glass', B: x[1] }).id(`tfg:create/shaped/${x[0]}_window`) diff --git a/kubejs/server_scripts/create_connected/recipes.js b/kubejs/server_scripts/create_connected/recipes.js index 2bf5f8299..9ad00e228 100644 --- a/kubejs/server_scripts/create_connected/recipes.js +++ b/kubejs/server_scripts/create_connected/recipes.js @@ -70,7 +70,7 @@ const registerCreateConnectedRecipes = (event) => { ' A ' ], { A: 'afc:wood/planks/fig', - B: 'minecraft:glass' + B: '#forge:glass' }).id('create_connected:shaped/cherry_window_pane') event.shaped('create_connected:bamboo_window_pane', [ @@ -78,6 +78,6 @@ const registerCreateConnectedRecipes = (event) => { 'ABA' ], { A: 'minecraft:bamboo_planks', - B: 'minecraft:glass' + B: '#forge:glass' }).id('create_connected:shaped/bamboo_window_pane') } \ No newline at end of file diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index b33c3f803..f6c4091d8 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -276,7 +276,7 @@ const registerCreatedecoRecipes = (event) => { ' B ', 'BAB' ], { - A: 'minecraft:glass', + A: '#forge:glass', B: x[1] }).id(`createdeco:${x[0]}_window`) From 41044519cb9aa5ad87792b475f70341311709136 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 23:46:39 +0100 Subject: [PATCH 78/95] once again I am changing the rotation speed controller recipe --- kubejs/server_scripts/create/recipes.js | 4 ++-- kubejs/startup_scripts/gtceu/materials.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 9b225c674..4b422b1dc 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1580,9 +1580,9 @@ const registerCreateRecipes = (event) => { ], { A: 'create:brass_casing', B: '#forge:small_gears/brass', - C: '#forge:gears/black_steel', + C: '#forge:small_gears/red_alloy', D: '#forge:tools/wrenches', - E: '#forge:small_springs/gold', + E: '#forge:small_springs/steel', F: '#tfg:shafts', G: '#forge:tools/hammers' }).id('tfg:create/shaped/rotation_speed_controller') diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index f4dbfe7a9..01b6e0f90 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -167,7 +167,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Silver.addFlags(HAS_SMALL_NATIVE_TFC_ORE); // // /* Имеют двойные слитки */ - GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS); + GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_SMALL_GEAR); GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS); // // /* Другое */ From 3828ce5de7c65f5837d38068cc2e3620a016de8c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 23 Apr 2025 23:52:23 +0100 Subject: [PATCH 79/95] fixed being able to macerate basic belts from leather into rubber --- kubejs/server_scripts/greate/recipes.recycling.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index 40bdededf..aef46dfb3 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -480,13 +480,6 @@ function registerGreateRecyclingRecipes(event) { // #region Belts - event.recipes.gtceu.macerator('greate:rubber_belt_connector') - .itemInputs('greate:rubber_belt_connector') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Rubber, 6)) - .duration(GTMaterials.Rubber.getMass() * 6) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.macerator('greate:silicone_rubber_belt_connector') .itemInputs('greate:silicone_rubber_belt_connector') .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.SiliconeRubber, 6)) From 1a4ac7e0ca3c889b8cbed1a29da3e15e588926cd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 20:57:22 +0100 Subject: [PATCH 80/95] removed VI laser engraver --- .../assets/emi/recipe/filters/categories.json | 3 +++ kubejs/server_scripts/create/recipes.js | 14 +++++------ kubejs/server_scripts/tfg/recipes.rocks.js | 14 +++++------ .../vintage_improvements/recipes.js | 25 ++++++++++--------- .../vintage_improvements/constants.js | 1 + 5 files changed, 31 insertions(+), 26 deletions(-) diff --git a/kubejs/assets/emi/recipe/filters/categories.json b/kubejs/assets/emi/recipe/filters/categories.json index 19a43d2d5..8b7fd72fd 100644 --- a/kubejs/assets/emi/recipe/filters/categories.json +++ b/kubejs/assets/emi/recipe/filters/categories.json @@ -92,6 +92,9 @@ }, { "category": "vintageimprovements:auto_curving" + }, + { + "category": "vintageimprovements:laser_cutting" } ] } \ No newline at end of file diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 4b422b1dc..f923bcec3 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1450,13 +1450,13 @@ const registerCreateRecipes = (event) => { .duration(32) .EUt(GTValues.VA[GTValues.ULV]) - event.custom({ - type: 'vintageimprovements:laser_cutting', - ingredients: [{ item: x.base }], - results: [{item: x.cut }], - energy: GTValues.VA[GTValues.ULV] * 32 * 4, - maxChargeRate: GTValues.VA[GTValues.ULV] * 4 - }).id(`tfg:vi/laser/create/${x.cut.split(':')[1]}`) + //event.custom({ + // type: 'vintageimprovements:laser_cutting', + // ingredients: [{ item: x.base }], + // results: [{item: x.cut }], + // energy: GTValues.VA[GTValues.ULV] * 32 * 4, + // maxChargeRate: GTValues.VA[GTValues.ULV] * 4 + //}).id(`tfg:vi/laser/create/${x.cut.split(':')[1]}`) event.shaped(`2x create:layered_${x.cut.split('_')[1]}`, [ 'AA' diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index 69b315b72..b5df6af20 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -75,13 +75,13 @@ function registerTFGRockRecipes(event) { .duration(30) .EUt(GTValues.VA[GTValues.ULV]) - event.custom({ - type: 'vintageimprovements:laser_cutting', - ingredients: [{ item: x.raw }], - results: [{item: x.polished }], - energy: GTValues.VA[GTValues.ULV] * 30 * 4, - maxChargeRate: GTValues.VA[GTValues.ULV] * 4 - }).id(`tfg:vi/laser/tfg/${x.raw.replace(/:/g, '_')}_to_${x.polished.replace(/:/g, '_')}`) + //event.custom({ + // type: 'vintageimprovements:laser_cutting', + // ingredients: [{ item: x.raw }], + // results: [{item: x.polished }], + // energy: GTValues.VA[GTValues.ULV] * 30 * 4, + // maxChargeRate: GTValues.VA[GTValues.ULV] * 4 + //}).id(`tfg:vi/laser/tfg/${x.raw.replace(/:/g, '_')}_to_${x.polished.replace(/:/g, '_')}`) }) // cracked bricks diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 9020b87cd..506ad7b32 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -130,18 +130,19 @@ function registerVintageImprovementsRecipes(event) { G: 'create:precision_mechanism' }).id('tfg:vi/mechanical_crafting/lathe') - event.shaped('vintageimprovements:laser', [ - 'FBF', - 'EAE', - 'DCD' - ], { - A: 'gtceu:ulv_machine_hull', - B: 'create:precision_mechanism', - C: 'tfc:lens', - D: 'gtceu:red_alloy_single_wire', - E: 'minecraft:piston', - F: '#gtceu:circuits/ulv' - }).id('tfg:vi/shaped/laser') + // Re-enable this thing's EMI category as well, if we end up using it + //event.shaped('vintageimprovements:laser', [ + // 'FBF', + // 'EAE', + // 'DCD' + //], { + // A: 'gtceu:ulv_machine_hull', + // B: 'create:precision_mechanism', + // C: 'tfc:lens', + // D: 'gtceu:red_alloy_single_wire', + // E: 'minecraft:piston', + // F: '#gtceu:circuits/ulv' + //}).id('tfg:vi/shaped/laser') // #endregion diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js index 80cfd1bd3..3843fe607 100644 --- a/kubejs/startup_scripts/vintage_improvements/constants.js +++ b/kubejs/startup_scripts/vintage_improvements/constants.js @@ -13,6 +13,7 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ 'vintageimprovements:v_shaped_curving_head', 'vintageimprovements:grinder_belt', 'vintageimprovements:spring_coiling_machine_wheel', + 'vintageimprovements:laser', 'vintageimprovements:laser_item', 'vintageimprovements:sulfur_chunk', 'vintageimprovements:sulfur', From ae03865762f96631fa2d864bdeb9d16ae6aa73d9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 21:17:59 +0100 Subject: [PATCH 81/95] removed create connected's hand cogwheels because they were another greate exploit, added recipes for its windows, enabled its copycat blocks --- config/create_connected-common.toml | 38 ++++++++--------- .../create_connected/recipes.js | 41 ++++++++++++++----- .../create_connected/constants.js | 4 +- 3 files changed, 53 insertions(+), 30 deletions(-) diff --git a/config/create_connected-common.toml b/config/create_connected-common.toml index dae5d6bad..3ab572a6e 100644 --- a/config/create_connected-common.toml +++ b/config/create_connected-common.toml @@ -8,36 +8,36 @@ migrateCopycatsOnInitialize = false #. #Enable/disable features. Values on server override clients [features] - bamboo_window = false + bamboo_window = true item_silo = true inverted_clutch = true empty_fan_catalyst = false - parallel_gearbox = true - cherry_window = false + parallel_gearbox = false + cherry_window = true centrifugal_clutch = true - copycat_slab = false + copycat_slab = true overstress_clutch = true brake = true - copycat_block = false - copycat_fence_gate = false - copycat_stairs = false - brass_gearbox = true - copycat_vertical_step = false - copycat_wall = false - six_way_gearbox = true - encased_chain_cogwheel = true + copycat_block = true + copycat_fence_gate = true + copycat_stairs = true + brass_gearbox = false + copycat_vertical_step = true + copycat_wall = true + six_way_gearbox = false + encased_chain_cogwheel = false sequenced_pulse_generator = true freewheel_clutch = true - shear_pin = true - inverted_gearshift = true + shear_pin = false + inverted_gearshift = false linked_transmitter = true - copycat_beam = false - copycat_board = false - copycat_fence = false + copycat_beam = true + copycat_board = true + copycat_fence = true #. fluid_vessel = true - large_crank_wheel = true - crank_wheel = true + large_crank_wheel = false + crank_wheel = false inventory_access_port = true inventory_bridge = true diff --git a/kubejs/server_scripts/create_connected/recipes.js b/kubejs/server_scripts/create_connected/recipes.js index 9ad00e228..860581e3b 100644 --- a/kubejs/server_scripts/create_connected/recipes.js +++ b/kubejs/server_scripts/create_connected/recipes.js @@ -65,19 +65,40 @@ const registerCreateConnectedRecipes = (event) => { E: '#forge:stone' }).id('create_connected:crafting/kinetics/sequenced_pulse_generator') - event.shaped('create_connected:cherry_window_pane', [ + + // Windows + event.shapeless(`2x create_connected:cherry_window_pane`, + [ + `create_connected:cherry_window`, + '#forge:tools/saws' + ]) + .id(`create_connected:crafting/palettes/cherry_window_pane`) + + event.recipes.gtceu.cutter(`create_connected:cherry_window_pane`) + .itemInputs(`3x create_connected:cherry_window`) + .itemOutputs(`8x create_connected:cherry_window_pane`) + .duration(40) + .EUt(7) + + + event.shapeless(`2x create_connected:bamboo_window_pane`, + [ + `create_connected:bamboo_window`, + '#forge:tools/saws' + ]) + .id(`create_connected:crafting/palettes/bamboo_window_pane`) + + event.recipes.gtceu.cutter(`create_connected:bamboo_window_pane`) + .itemInputs(`3x create_connected:bamboo_window`) + .itemOutputs(`8x create_connected:bamboo_window_pane`) + .duration(40) + .EUt(7) + + event.shaped('create_connected:cherry_window', [ 'ABA', ' A ' ], { A: 'afc:wood/planks/fig', B: '#forge:glass' - }).id('create_connected:shaped/cherry_window_pane') - - event.shaped('create_connected:bamboo_window_pane', [ - ' A ', - 'ABA' - ], { - A: 'minecraft:bamboo_planks', - B: '#forge:glass' - }).id('create_connected:shaped/bamboo_window_pane') + }).id('create_connected:crafting/palettes/cherry_window') } \ No newline at end of file diff --git a/kubejs/startup_scripts/create_connected/constants.js b/kubejs/startup_scripts/create_connected/constants.js index be67b4ff7..b1f25efd2 100644 --- a/kubejs/startup_scripts/create_connected/constants.js +++ b/kubejs/startup_scripts/create_connected/constants.js @@ -10,5 +10,7 @@ global.CREATE_CONNECTED_DISABLED_ITEMS = [ 'create_connected:vertical_brass_gearbox', 'create_connected:shear_pin', 'create_connected:control_chip', - 'create_connected:incomplete_control_chip' + 'create_connected:incomplete_control_chip', + 'create_connected:crank_wheel', + 'create_connected:large_crank_wheel' ] \ No newline at end of file From f7a242462c57217b2062f20ea7da85f00007d056 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 21:20:38 +0100 Subject: [PATCH 82/95] basic belts now only accept rubber, but all belts are now half price! --- kubejs/server_scripts/greate/recipes.js | 27 ++++++++++++------- .../greate/recipes.recycling.js | 11 ++++++-- kubejs/startup_scripts/greate/constants.js | 4 +++ 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index bc3ef4c6a..09b318c39 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -295,23 +295,32 @@ function registerGreateRecipes(event) { // #region Belt Connector event.shaped('greate:rubber_belt_connector', [ + 'C ', 'AAA', - 'AAA', - 'BDC' + 'B ' ], { - A: '#forge:leather', + A: '#forge:plates/rubber', B: '#forge:tools/knives', - C: '#tfc:sewing_needles', - D: '#forge:string' - }).id('greate:shaped/rubber_belt_connector_from_leather') + C: '#forge:tools/hammers', + }).id('greate:shaped/rubber_belt_connector') + + event.shaped('greate:silicone_rubber_belt_connector', [ + 'C ', + 'AAA', + 'B ' + ], { + A: '#forge:plates/silicone_rubber', + B: '#forge:tools/knives', + C: '#forge:tools/hammers', + }).id('greate:shaped/silicone_rubber_belt_connector') event.shaped('greate:polyethylene_belt_connector', [ + 'C ', 'AAA', - 'AAA', - 'B C' + 'B ' ], { A: '#forge:plates/styrene_butadiene_rubber', - B: '#forge:tools/files', + B: '#forge:tools/knives', C: '#forge:tools/hammers', }).id('greate:shaped/polyethylene_belt_connector') diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index aef46dfb3..b38223a16 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -480,17 +480,24 @@ function registerGreateRecyclingRecipes(event) { // #region Belts + event.recipes.gtceu.macerator('greate:rubber_belt_connector') + .itemInputs('greate:rubber_belt_connector') + .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Rubber, 6)) + .duration(GTMaterials.Rubber.getMass() * 3) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.macerator('greate:silicone_rubber_belt_connector') .itemInputs('greate:silicone_rubber_belt_connector') .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.SiliconeRubber, 6)) - .duration(GTMaterials.SiliconeRubber.getMass() * 6) + .duration(GTMaterials.SiliconeRubber.getMass() * 3) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.macerator('greate:polyethylene_belt_connector') .itemInputs('greate:polyethylene_belt_connector') .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.StyreneButadieneRubber, 6)) - .duration(GTMaterials.StyreneButadieneRubber.getMass() * 6) + .duration(GTMaterials.StyreneButadieneRubber.getMass() * 3) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index e2239b611..31af4a66d 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -29,6 +29,10 @@ global.GREATE_DISABLED_ITEMS = [ 'greate:stainless_steel_millstone', 'greate:titanium_millstone', + // Disabled because they don't respect the cleanroom requirement of some recipes + 'greate:stainless_steel_mechanical_saw', + 'greate:titanium_mechanical_saw', + // Disable these until it's possible to disable spring recipes in them 'greate:andesite_alloy_mechanical_press', 'greate:steel_mechanical_press', From 756f27861bbf340d82bc6543517d683b24dc269f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 21:35:13 +0100 Subject: [PATCH 83/95] changed bricks and flagstones to use a cutter instead of an assembler --- kubejs/server_scripts/rnr/recipes.js | 6 +++--- kubejs/server_scripts/tfc/recipes.stone.js | 3 +-- kubejs/server_scripts/tfg/recipes.rocks.js | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/rnr/recipes.js b/kubejs/server_scripts/rnr/recipes.js index 229a1216a..b0d9b5366 100644 --- a/kubejs/server_scripts/rnr/recipes.js +++ b/kubejs/server_scripts/rnr/recipes.js @@ -18,14 +18,14 @@ const registerRnrRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) global.TFC_STONE_TYPES.forEach(stone => { - event.recipes.gtceu.assembler(`rnr:assembler/flagstone/${stone}`) - .itemInputs(`tfc:rock/loose/${stone}`) + event.recipes.gtceu.cutter(`rnr:assembler/flagstone/${stone}`) + .itemInputs(`tfc:brick/${stone}`) .itemOutputs(`2x rnr:flagstone/${stone}`) .circuit(7) .duration(20) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.assembler(`rnr:assembler/flagstone/mossy_${stone}`) + event.recipes.gtceu.cutter(`rnr:assembler/flagstone/mossy_${stone}`) .itemInputs(`tfc:rock/mossy_loose/${stone}`) .itemOutputs(`2x rnr:flagstone/${stone}`) .circuit(7) diff --git a/kubejs/server_scripts/tfc/recipes.stone.js b/kubejs/server_scripts/tfc/recipes.stone.js index b914b647e..8165b868f 100644 --- a/kubejs/server_scripts/tfc/recipes.stone.js +++ b/kubejs/server_scripts/tfc/recipes.stone.js @@ -9,10 +9,9 @@ function registerTFCStoneRecipes(event) { let smallStoneDust = ChemicalHelper.get(TagPrefix.dustSmall, stoneMaterial, 1) // Кирпич (предмет) - event.recipes.gtceu.assembler(`tfg:tfc/${stone}_loose_to_brick`) + event.recipes.gtceu.cutter(`tfg:tfc/${stone}_loose_to_brick`) .itemInputs(`tfc:rock/loose/${stone}`) .itemOutputs(`tfc:brick/${stone}`) - .circuit(1) .duration(40) .EUt(8) diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index b5df6af20..357bd9ac2 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -43,7 +43,7 @@ function registerTFGRockRecipes(event) { x.brick, [x.loose, '#tfc:chisels'] )) - event.recipes.gtceu.assembler(`${x.loose}_to_${x.brick}`.replace(/:/g, '_')) + event.recipes.gtceu.cutter(`${x.loose}_to_${x.brick}`.replace(/:/g, '_')) .itemInputs(x.loose) .itemOutputs(x.brick) .circuit(1) From 655e2685f2b76810b27dd399a16ca3ed4b06b6eb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 21:35:24 +0100 Subject: [PATCH 84/95] added gt lathe recipe to make a tfc lens --- kubejs/server_scripts/tfc/recipes.machines.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index c8b943e01..3dc68bbe0 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -359,6 +359,12 @@ function registerTFCMachineRecipes(event) { .duration(50) .EUt(2) + event.recipes.gtceu.lathe('tfc:lens') + .itemInputs('#forge:glass') + .itemOutputs('tfc:lens') + .duration(100) + .EUt(16) + // Wool Yarn event.recipes.gtceu.macerator('macerate_wool') .itemInputs('#minecraft:wool') From f44552e59ed6f4f78d2ce9726f3dcc9ed7c48a72 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 21:40:03 +0100 Subject: [PATCH 85/95] langs --- kubejs/assets/create/lang/en_us.json | 2 ++ kubejs/assets/createconnected/lang/en_us.json | 5 +++++ kubejs/assets/greate/lang/en_us.json | 4 +--- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 kubejs/assets/createconnected/lang/en_us.json diff --git a/kubejs/assets/create/lang/en_us.json b/kubejs/assets/create/lang/en_us.json index 5aa93fb5d..6ce3acd87 100644 --- a/kubejs/assets/create/lang/en_us.json +++ b/kubejs/assets/create/lang/en_us.json @@ -1,5 +1,7 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.create.dark_oak_window": "Hickory Window", + "block.create.dark_oak_window_pane": "Hickory Window Pane", "block.create.andesite_bars": "Metal Bars", "block.create.andesite_belt_funnel": "Metal Belt Funnel", "block.create.andesite_casing": "Metal Casing", diff --git a/kubejs/assets/createconnected/lang/en_us.json b/kubejs/assets/createconnected/lang/en_us.json new file mode 100644 index 000000000..2c1a83ebf --- /dev/null +++ b/kubejs/assets/createconnected/lang/en_us.json @@ -0,0 +1,5 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "create_connected:cherry_window": "Fig Window", + "create_connected:cherry_window_pane": "Fig Window Pane" +} \ No newline at end of file diff --git a/kubejs/assets/greate/lang/en_us.json b/kubejs/assets/greate/lang/en_us.json index 31f6b4e00..c17139505 100644 --- a/kubejs/assets/greate/lang/en_us.json +++ b/kubejs/assets/greate/lang/en_us.json @@ -32,9 +32,7 @@ "block.greate.large_andesite_alloy_cogwheel": "Large Basic Cogwheel", "block.greate.metal_girder_encased_andesite_alloy_shaft": "Metal Girder Encased Basic Shaft", "block.greate.powered_andesite_alloy_shaft": "Powered Basic Shaft", - "block.greate.rubber_belt_andesite_alloy": "Basic Belt", - "block.greate.rubber_belt_steel": "Basic Belt", - "item.greate.rubber_belt_connector": "Basic Belt", + "item.greate.rubber_belt_connector": "Rubber Belt", "item.greate.silicone_rubber_belt_connector": "Silicone Rubber Belt", "block.greate.polyethylene_belt_titanium": "Styrene Butadiene Rubber Belt", "block.greate.polyethylene_belt_tungsten_steel": "Styrene Butadiene Rubber Belt", From 2be25e16f4bce1ce9664811312679477791d6801 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 22:03:56 +0100 Subject: [PATCH 86/95] fixed the create cut stone consuming your chisel --- kubejs/server_scripts/create/recipes.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index f923bcec3..9c30efd12 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1441,7 +1441,10 @@ const registerCreateRecipes = (event) => { ] DECO_BLOCKS.forEach(x => { - event.shapeless(x.cut, [x.base, '#tfc:chisels', '#forge:tools/files']).id(`create:shapeless/chisel_${x.cut.split(':')[1]}`) + + event.recipes.tfc.damage_inputs_shaped_crafting( + event.shapeless(x.cut, [x.base, '#tfc:chisels', '#forge:tools/files']) + ).id(`create:shapeless/chisel_${x.cut.split(':')[1]}`) event.recipes.gtceu.laser_engraver(`engrave_${x.cut.split(':')[1]}`) .itemInputs(x.base) From 8b9f0d693c34d26492a71ee807f8ea7c7cb31548 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 22:10:48 +0100 Subject: [PATCH 87/95] added some more glue recipes --- kubejs/server_scripts/gregtech/recipes.js | 2 +- .../vintage_improvements/recipes.js | 30 ++++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 41c17a60e..cbf626792 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -499,7 +499,7 @@ const registerGTCEURecipes = (event) => { }).id('gtceu:shaped/electric_blast_furnace') // Клей из ТФК клея - event.recipes.gtceu.centrifuge('glue_from_tfc_glue') + event.recipes.gtceu.extractor('glue_from_tfc_glue') .itemInputs('tfc:glue') .outputFluids(Fluid.of('gtceu:glue', 50)) .duration(400) diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 506ad7b32..76dde34b8 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -409,7 +409,7 @@ function registerVintageImprovementsRecipes(event) { event.custom({ type: 'vintageimprovements:pressurizing', ingredients: [ingotItem, ingotItem, { item: 'tfc:powder/flux' }], - "heatRequirement": "heated", + heatRequirement: "heated", results: [ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1)], processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/pressurizing/${material.getName()}_double_ingot`) @@ -419,7 +419,7 @@ function registerVintageImprovementsRecipes(event) { event.custom({ type: 'vintageimprovements:pressurizing', ingredients: [plateItem, plateItem, { item: 'tfc:powder/flux' }], - "heatRequirement": "heated", + heatRequirement: "heated", results: [ChemicalHelper.get(TagPrefix.plateDouble, material, 1)], processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/pressurizing/${material.getName()}_double_plate`) @@ -529,9 +529,31 @@ function registerVintageImprovementsRecipes(event) { results: [{ fluid: 'gtceu:glue', amount: 50 }], heatRequirement: "heated", processingTime: 100 - }).id('tfg:vi/vacuumizing/glue') + }).id('tfg:vi/vacuumizing/glue_melting') + + event.custom({ + type: 'vintageimprovements:vacuumizing', + ingredients: [{ item: 'gtceu:sticky_resin' }], + results: [{ fluid: 'gtceu:glue', amount: 100 }], + heatRequirement: "heated", + processingTime: 200 + }).id('tfg:vi/vacuumizing/glue_from_resin') + + event.custom({ + type: 'vintageimprovements:vacuumizing', + ingredients: [{ item: 'minecraft:bone_meal' }, { fluid: 'tfc:limewater', amount: 500 }], + results: [{ fluid: 'gtceu:glue', amount: 50 }], + heatRequirement: "heated", + processingTime: 100 + }).id('tfg:vi/vacuumizing/glue_from_bone_meal') + + event.custom({ + type: 'vintageimprovements:pressurizing', + ingredients: [{ fluid: 'gtceu:glue', amount: 50 }], + results: [{ item: 'tfc:glue' }], + processingTime: 100 + }).id('tfg:vi/pressurizing/glue_solidifying') - // TODO: Remove me when we upgrade Greate and can just slap rubber onto wires again event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ item: 'gtceu:rubber_dust' }], From d37f1baa20daf392a80d1a0ea8c900b13135f3e0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 22:11:04 +0100 Subject: [PATCH 88/95] why does the mortar recipe use a centrifuge? changed to a mixer --- kubejs/server_scripts/tfc/recipes.machines.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index 3dc68bbe0..3e88be7e7 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -376,7 +376,7 @@ function registerTFCMachineRecipes(event) { .EUt(2) // LimeWater + Sand -> Mortar - event.recipes.gtceu.centrifuge('mortar') + event.recipes.gtceu.mixer('mortar') .itemInputs('#forge:sand') .inputFluids(Fluid.of('tfc:limewater', 100)) .itemOutputs('16x tfc:mortar') From 4a75d000d7dbd420c6a90207fde549d3c9ad20cf Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 22:36:52 +0100 Subject: [PATCH 89/95] buffed how much string you get from cobwebs, made tfc shears work for silk touching it --- .../minecraft/loot_tables/blocks/cobweb.json | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 kubejs/data/minecraft/loot_tables/blocks/cobweb.json diff --git a/kubejs/data/minecraft/loot_tables/blocks/cobweb.json b/kubejs/data/minecraft/loot_tables/blocks/cobweb.json new file mode 100644 index 000000000..fd6d76a0a --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/cobweb.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "tfc:shears" + } + } + ] + } + ], + "name": "minecraft:cobweb" + }, + { + "type": "minecraft:item", + "name": "minecraft:string", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "minecraft:blocks/cobweb" +} \ No newline at end of file From c765e00e5b9b2f52a77285a5fdd39412aa64e0a1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 22:37:30 +0100 Subject: [PATCH 90/95] fixed some warnings --- kubejs/server_scripts/create/recipes.js | 2 +- kubejs/server_scripts/rnr/recipes.js | 2 -- kubejs/server_scripts/tfg/recipes.rocks.js | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 9c30efd12..baa860369 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1442,7 +1442,7 @@ const registerCreateRecipes = (event) => { DECO_BLOCKS.forEach(x => { - event.recipes.tfc.damage_inputs_shaped_crafting( + event.recipes.tfc.damage_inputs_shapeless_crafting( event.shapeless(x.cut, [x.base, '#tfc:chisels', '#forge:tools/files']) ).id(`create:shapeless/chisel_${x.cut.split(':')[1]}`) diff --git a/kubejs/server_scripts/rnr/recipes.js b/kubejs/server_scripts/rnr/recipes.js index b0d9b5366..8b3e37213 100644 --- a/kubejs/server_scripts/rnr/recipes.js +++ b/kubejs/server_scripts/rnr/recipes.js @@ -21,14 +21,12 @@ const registerRnrRecipes = (event) => { event.recipes.gtceu.cutter(`rnr:assembler/flagstone/${stone}`) .itemInputs(`tfc:brick/${stone}`) .itemOutputs(`2x rnr:flagstone/${stone}`) - .circuit(7) .duration(20) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.cutter(`rnr:assembler/flagstone/mossy_${stone}`) .itemInputs(`tfc:rock/mossy_loose/${stone}`) .itemOutputs(`2x rnr:flagstone/${stone}`) - .circuit(7) .duration(20) .EUt(GTValues.VA[GTValues.ULV]) }); diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index 357bd9ac2..9a0ba3b7e 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -46,7 +46,6 @@ function registerTFGRockRecipes(event) { event.recipes.gtceu.cutter(`${x.loose}_to_${x.brick}`.replace(/:/g, '_')) .itemInputs(x.loose) .itemOutputs(x.brick) - .circuit(1) .duration(40) .EUt(8) }) From 52aa6e91a1aebc14340c6325d927ba4705034df5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 22:37:39 +0100 Subject: [PATCH 91/95] another greate workaround... --- kubejs/server_scripts/gregtech/recipes.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index cbf626792..945066891 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1009,6 +1009,9 @@ const registerGTCEURecipes = (event) => { //#endregion // TODO: Greate again... + event.shapeless('gtceu:programmed_circuit', ['minecraft:stick']) + .id('tfg:shapeless/programmed_circuit_from_stick') + event.shapeless('gtceu:red_alloy_single_cable', ['gtceu:red_alloy_single_wire', '#forge:plates/rubber']) .id('tfg:shapeless/red_alloy_single_cable') From 2cc2516d25772a4daa8eb63d61c871144794391b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 23:33:12 +0100 Subject: [PATCH 92/95] added an early way to get gregtech medicine, and added some more plants for medicines --- kubejs/server_scripts/tfg/recipes.medicine.js | 8 ++++++++ kubejs/server_scripts/tfg/tags.js | 13 ++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/tfg/recipes.medicine.js b/kubejs/server_scripts/tfg/recipes.medicine.js index d30597abe..f2bae6045 100644 --- a/kubejs/server_scripts/tfg/recipes.medicine.js +++ b/kubejs/server_scripts/tfg/recipes.medicine.js @@ -546,4 +546,12 @@ function registerTFGMedicineRecipes(event) { //#endregion + //#region Paracetamol + + event.recipes.firmalife.mixing_bowl() + .ingredients(['tfg:regeneration_pill', 'tfg:weakness_pill', 'tfg:antipoison_pill', 'tfg:slowness_pill'], Fluid.of('tfc:vinegar', 250)) + .outputItem('4x gtceu:paracetamol_pill') + .id(`tfg:mixing_bowl/paracetamol`) + + //#endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 1101bef09..78a2217bc 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -56,23 +56,29 @@ const registerTFGItemTags = (event) => { event.add('tfg:speed_ingredients', 'firmalife:raw_honey') event.add('tfg:slowness_ingredients', 'tfc:plant/marigold') + event.add('tfg:slowness_ingredients', 'tfc:plant/snapdragon_red') + event.add('tfg:slowness_ingredients', 'tfc:plant/snapdragon_white') + event.add('tfg:slowness_ingredients', 'tfc:plant/snapdragon_yellow') event.add('tfg:weakness_ingredients', 'tfc:plant/laminaria') + event.add('tfg:weakness_ingredients', 'tfc:plant/sea_palm') + event.add('tfg:weakness_ingredients', 'tfc:plant/sea_lavender') - event.add('tfg:haste_ingredients', 'minecraft:sugar') - event.add('tfg:haste_ingredients', 'afc:birch_sugar') - event.add('tfg:haste_ingredients', 'afc:maple_sugar') + event.add('tfg:haste_ingredients', '#tfg:sugars') event.add('tfg:water_breathing_ingredients', 'tfc:powder/saltpeter') event.add('tfg:water_breathing_ingredients', 'tfc:powder/charcoal') event.add('tfg:night_vision_ingredients', 'tfc:food/carrot') + event.add('tfg:night_vision_ingredients', 'beneath:gleamflower') event.add('tfg:invisibility_ingredients', 'tfc:plant/calendula') + event.add('tfg:absorption_ingredients', 'beneath:burpflower') event.add('tfg:fire_resistance_ingredients', 'tfc:plant/cattail') event.add('tfg:fire_resistance_ingredients', 'tfc:plant/meads_milkweed') event.add('tfg:fire_resistance_ingredients', 'firmalife:plant/bay_laurel') + event.add('tfg:fire_resistance_ingredients', 'beneath:ghost_pepper') event.add('tfg:resistance_ingredients', 'tfc:plant/hibiscus') event.add('tfg:resistance_ingredients', 'gtceu:calcium_dust') @@ -81,6 +87,7 @@ const registerTFGItemTags = (event) => { event.add('tfg:instant_health_ingredients', 'tfc:plant/artists_conk') event.add('tfg:absorption_ingredients', 'tfc:plant/poppy') + event.add('tfg:invisibility_ingredients', 'tfc:plant/snapdragon_pink') event.add('tfg:luck_ingredients', 'tfc:plant/goldenrod') event.add('tfg:luck_ingredients', 'tfc:plant/heather') From 04ce564c92f54645dbdc34efa650ba528e16bcf2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 23:33:27 +0100 Subject: [PATCH 93/95] fixed aoe tools in bastion chests not having their aoes properly --- .../loot_tables/chests/bastion_bridge.json | 141 +++++++++++------- .../chests/bastion_hoglin_stable.json | 141 +++++++++++------- .../loot_tables/chests/bastion_other.json | 141 +++++++++++------- .../loot_tables/chests/bastion_treasure.json | 115 +++++++------- 4 files changed, 328 insertions(+), 210 deletions(-) diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json index 3e30a39ee..a6312d5dc 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json @@ -47,7 +47,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -66,7 +66,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -85,7 +85,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -104,7 +104,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -123,7 +123,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -141,7 +141,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -160,7 +160,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -179,7 +179,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -198,7 +198,26 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_axe", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -217,7 +236,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -236,7 +255,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -294,21 +313,6 @@ "name": "minecraft:snout_armor_trim_smithing_template", "weight": 30 }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 30 - }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_hammer", @@ -316,7 +320,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -327,7 +331,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -338,7 +342,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -349,18 +353,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ] - }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_butchery_knife", - "weight": 10, - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -371,7 +364,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -382,7 +375,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -393,7 +386,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -404,7 +397,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -415,7 +408,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -426,7 +419,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -437,7 +430,29 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_mortar", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_file", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -448,7 +463,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_hoe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -459,7 +485,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_axe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } @@ -660,8 +697,8 @@ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 5, + "min": 1, + "max": 4, "type": "minecraft:uniform" } } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json index 3e30a39ee..a6312d5dc 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json @@ -47,7 +47,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -66,7 +66,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -85,7 +85,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -104,7 +104,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -123,7 +123,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -141,7 +141,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -160,7 +160,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -179,7 +179,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -198,7 +198,26 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_axe", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -217,7 +236,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -236,7 +255,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -294,21 +313,6 @@ "name": "minecraft:snout_armor_trim_smithing_template", "weight": 30 }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 30 - }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_hammer", @@ -316,7 +320,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -327,7 +331,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -338,7 +342,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -349,18 +353,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ] - }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_butchery_knife", - "weight": 10, - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -371,7 +364,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -382,7 +375,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -393,7 +386,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -404,7 +397,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -415,7 +408,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -426,7 +419,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -437,7 +430,29 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_mortar", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_file", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -448,7 +463,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_hoe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -459,7 +485,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_axe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } @@ -660,8 +697,8 @@ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 5, + "min": 1, + "max": 4, "type": "minecraft:uniform" } } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json index 3e30a39ee..a6312d5dc 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json @@ -47,7 +47,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -66,7 +66,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -85,7 +85,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -104,7 +104,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -123,7 +123,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ] }, @@ -141,7 +141,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -160,7 +160,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -179,7 +179,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -198,7 +198,26 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" + } + ], + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "gtceu:black_bronze_axe", + "functions": [ + { + "function": "minecraft:set_damage", + "damage": { + "type": "minecraft:uniform", + "min": 0.1, + "max": 0.9 + } + }, + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -217,7 +236,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -236,7 +255,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 3}" } ], "weight": 100 @@ -294,21 +313,6 @@ "name": "minecraft:snout_armor_trim_smithing_template", "weight": 30 }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 30 - }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_hammer", @@ -316,7 +320,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -327,7 +331,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -338,7 +342,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -349,18 +353,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ] - }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_butchery_knife", - "weight": 10, - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -371,7 +364,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -382,7 +375,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -393,7 +386,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -404,7 +397,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -415,7 +408,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -426,7 +419,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -437,7 +430,29 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_mortar", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_file", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -448,7 +463,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_hoe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -459,7 +485,18 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_axe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } @@ -660,8 +697,8 @@ { "function": "minecraft:set_count", "count": { - "min": 2, - "max": 5, + "min": 1, + "max": 4, "type": "minecraft:uniform" } } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json b/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json index 908d62f07..5e70329c4 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json @@ -5,106 +5,80 @@ "name": "loot_pool", "rolls": 2, "entries": [ - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_ingot", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ], - "weight": 20 - }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_hammer", - "weight": 10, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_pickaxe", - "weight": 10, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_sword", - "weight": 5, + "weight": 10, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_knife", - "weight": 10, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" - } - ] - }, - { - "type": "minecraft:item", - "name": "gtceu:damascus_steel_butchery_knife", - "weight": 5, - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_mining_hammer", - "weight": 5, + "weight": 10, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_shovel", - "weight": 10, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_spade", - "weight": 5, + "weight": 10, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -115,73 +89,106 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_wire_cutter", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_wrench", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_crowbar", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_mortar", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_file", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_screwdriver", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:damascus_steel_hoe", + "weight": 20, + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", "name": "gtceu:damascus_steel_saw", - "weight": 15, + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, { "type": "minecraft:item", - "name": "minecraft:crossbow", - "weight": 5, + "name": "gtceu:damascus_steel_axe", + "weight": 20, "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4}" + "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } From 2908bab19e0bceb21eb12307dd7ccbb39ad2b240 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 23:44:06 +0100 Subject: [PATCH 94/95] fixed visual workbench crash --- config/visual_workbench.json | 66 +++++++++++++++++------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/config/visual_workbench.json b/config/visual_workbench.json index ae4359f62..2ccd212e7 100644 --- a/config/visual_workbench.json +++ b/config/visual_workbench.json @@ -1,39 +1,37 @@ { "__comment": "Crafting table blocks to enable Visual Workbench support for.", "values": [ - [ - "afc:wood/planks/fig_workbench", - "afc:wood/planks/ironwood_workbench", - "afc:wood/planks/ipe_workbench", - "beneath:wood/planks/crimson_workbench", - "beneath:wood/planks/warped_workbench", - "tfc:wood/planks/kapok_workbench", - "tfc:wood/planks/hickory_workbench", - "tfc:wood/planks/douglas_fir_workbench", - "tfc:wood/planks/chestnut_workbench", - "tfc:wood/planks/blackwood_workbench", - "tfc:wood/planks/birch_workbench", - "tfc:wood/planks/acacia_workbench", - "tfc:wood/planks/ash_workbench", - "tfc:wood/planks/aspen_workbench", - "tfc:wood/planks/sycamore_workbench", - "tfc:wood/planks/spruce_workbench", - "tfc:wood/planks/sequoia_workbench", - "tfc:wood/planks/rosewood_workbench", - "tfc:wood/planks/pine_workbench", - "tfc:wood/planks/palm_workbench", - "tfc:wood/planks/oak_workbench", - "tfc:wood/planks/maple_workbench", - "tfc:wood/planks/mangrove_workbench", - "afc:wood/planks/cypress_workbench", - "afc:wood/planks/teak_workbench", - "afc:wood/planks/tualang_workbench", - "afc:wood/planks/hevea_workbench", - "afc:wood/planks/mahogany_workbench", - "afc:wood/planks/eucalyptus_workbench", - "afc:wood/planks/baobab_workbench", - "tfc:wood/planks/willow_workbench", - "tfc:wood/planks/white_cedar_workbench" - ] + "afc:wood/planks/fig_workbench", + "afc:wood/planks/ironwood_workbench", + "afc:wood/planks/ipe_workbench", + "afc:wood/planks/cypress_workbench", + "afc:wood/planks/teak_workbench", + "afc:wood/planks/tualang_workbench", + "afc:wood/planks/hevea_workbench", + "afc:wood/planks/mahogany_workbench", + "afc:wood/planks/eucalyptus_workbench", + "afc:wood/planks/baobab_workbench", + "beneath:wood/planks/crimson_workbench", + "beneath:wood/planks/warped_workbench", + "tfc:wood/planks/kapok_workbench", + "tfc:wood/planks/hickory_workbench", + "tfc:wood/planks/douglas_fir_workbench", + "tfc:wood/planks/chestnut_workbench", + "tfc:wood/planks/blackwood_workbench", + "tfc:wood/planks/birch_workbench", + "tfc:wood/planks/acacia_workbench", + "tfc:wood/planks/ash_workbench", + "tfc:wood/planks/aspen_workbench", + "tfc:wood/planks/sycamore_workbench", + "tfc:wood/planks/spruce_workbench", + "tfc:wood/planks/sequoia_workbench", + "tfc:wood/planks/rosewood_workbench", + "tfc:wood/planks/pine_workbench", + "tfc:wood/planks/palm_workbench", + "tfc:wood/planks/oak_workbench", + "tfc:wood/planks/maple_workbench", + "tfc:wood/planks/mangrove_workbench", + "tfc:wood/planks/willow_workbench", + "tfc:wood/planks/white_cedar_workbench" ] } \ No newline at end of file From 909765e8f37367d9d477267c066a80009a7a4638 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 24 Apr 2025 23:48:38 +0100 Subject: [PATCH 95/95] piglins can have a little explosives, as a treat --- .../loot_tables/chests/bastion_bridge.json | 30 +++++++++++++++++++ .../chests/bastion_hoglin_stable.json | 30 +++++++++++++++++++ .../loot_tables/chests/bastion_other.json | 30 +++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json index a6312d5dc..411acdc09 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json @@ -959,6 +959,36 @@ } ], "weight": 50 + }, + { + "type": "minecraft:item", + "name": "gtceu:dynamite", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 5, + "max": 10, + "type": "minecraft:uniform" + } + } + ], + "weight": 30 + }, + { + "type": "minecraft:item", + "name": "gtceu:powderbarrel", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 5, + "type": "minecraft:uniform" + } + } + ], + "weight": 30 } ] } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json index a6312d5dc..411acdc09 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json @@ -959,6 +959,36 @@ } ], "weight": 50 + }, + { + "type": "minecraft:item", + "name": "gtceu:dynamite", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 5, + "max": 10, + "type": "minecraft:uniform" + } + } + ], + "weight": 30 + }, + { + "type": "minecraft:item", + "name": "gtceu:powderbarrel", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 5, + "type": "minecraft:uniform" + } + } + ], + "weight": 30 } ] } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json index a6312d5dc..411acdc09 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json @@ -959,6 +959,36 @@ } ], "weight": 50 + }, + { + "type": "minecraft:item", + "name": "gtceu:dynamite", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 5, + "max": 10, + "type": "minecraft:uniform" + } + } + ], + "weight": 30 + }, + { + "type": "minecraft:item", + "name": "gtceu:powderbarrel", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 5, + "type": "minecraft:uniform" + } + } + ], + "weight": 30 } ] }