From b9a4aaf5c3c038f4641d052b5dbc3f463a4ff2b8 Mon Sep 17 00:00:00 2001 From: Tatjam Date: Sat, 3 Feb 2024 13:35:04 +0100 Subject: [PATCH 1/6] Force hotworking of metals which support it --- kubejs/server_scripts/recipes/removal.js | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/kubejs/server_scripts/recipes/removal.js b/kubejs/server_scripts/recipes/removal.js index d73f722a..dc5430eb 100644 --- a/kubejs/server_scripts/recipes/removal.js +++ b/kubejs/server_scripts/recipes/removal.js @@ -314,4 +314,33 @@ let recipeRemoval = (/** @type {Internal.RecipesEventJS} */ event) => { event.remove({ id: `/^iceandfire:.*copper.*/`}) + + let only_hotworked = (mineral) => { + event.remove({ id: "gtceu:shaped/plate_" + mineral }) + event.remove({ id: "gtceu:shaped/plate_double_" + mineral }) + } + + + only_hotworked("bismuth") + only_hotworked("copper") + only_hotworked("gold") + only_hotworked("nickel") + only_hotworked("silver") + only_hotworked("tin") + only_hotworked("zinc") + only_hotworked("brass") + only_hotworked("bronze") + only_hotworked("invar") + only_hotworked("sterling_silver") + only_hotworked("rose_gold") + only_hotworked("black_bronze") + only_hotworked("bismuth_bronze") + only_hotworked("steel") + only_hotworked("rose_gold") + only_hotworked("wrought_iron") + only_hotworked("black_steel") + only_hotworked("red_steel") + only_hotworked("blue_steel") + only_hotworked("wrought_iron") + } From 0d603cb35d05962a019a5d5d60aad6d4f342c838 Mon Sep 17 00:00:00 2001 From: Tatjam Date: Sat, 3 Feb 2024 13:35:54 +0100 Subject: [PATCH 2/6] Wood drum without iron fix The item id was incorrect --- kubejs/server_scripts/mods/gtceu/gtceuAdd.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/mods/gtceu/gtceuAdd.js b/kubejs/server_scripts/mods/gtceu/gtceuAdd.js index 8dadf935..c4c6426d 100644 --- a/kubejs/server_scripts/mods/gtceu/gtceuAdd.js +++ b/kubejs/server_scripts/mods/gtceu/gtceuAdd.js @@ -274,8 +274,8 @@ let gtceuAdd = (/** @type {Internal.RecipesEventJS} */ event) => { .EUt(LV) }) - event.recipes.kubejs.shaped('gtceu:wood_drum', [ 'mRs', 'PWP', 'PWP' ], { m: '#forge:tools/mallets', R: 'gtceu:sticky_resin', s: '#forge:tools/saws', P: '#minecraft:planks', W: 'gtceu:wrought_iron_long_rod'}).damageIngredient(['#forge:tools']) - + event.recipes.kubejs.shaped('gtceu:wood_drum', [ 'mRs', 'PWP', 'PWP' ], { m: '#forge:tools/mallets', R: 'gtceu:sticky_resin', s: '#forge:tools/saws', P: '#minecraft:planks', W: '#forge:rods/long/wrought_iron'}).damageIngredient(['#forge:tools']) + event.recipes.kubejs.shaped('gtceu:lv_electric_motor', ['cwr', 'wmw', 'rwc'], { c: 'gtceu:tin_single_cable', w: 'gtceu:copper_single_wire', r: 'gtceu:wrought_iron_rod', m: 'gtceu:magnetic_wrought_iron_rod' }) event.recipes.kubejs.shaped('2x gtceu:pump_deck', [' ', 'SPS', 'sCh'], { S: 'gtceu:wrought_iron_screw', P: 'gtceu:treated_wood_planks', C: '#forge:slabs/cobblestone', s: '#forge:tools/screwdrivers', h: '#forge:tools/hammers' }).damageIngredient(['#forge:tools']) From 26bc6f39361e43579f83850666ca61e9fc1802f7 Mon Sep 17 00:00:00 2001 From: Tatjam Date: Fri, 9 Feb 2024 00:22:09 +0100 Subject: [PATCH 3/6] Fix screwdriver not craftable --- kubejs/server_scripts/recipes/gtceu_tools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/recipes/gtceu_tools.js b/kubejs/server_scripts/recipes/gtceu_tools.js index 51e21c3d..f341bae9 100644 --- a/kubejs/server_scripts/recipes/gtceu_tools.js +++ b/kubejs/server_scripts/recipes/gtceu_tools.js @@ -314,7 +314,7 @@ let tfcGregTools = (/** @type {Internal.RecipesEventJS} */ event) => { ] }) */ - event.shaped(`gtceu:${metal.id}_screwdriver`, ['sS', 'H'], {S: `gtceu:${metal.id}_screwdriver_tip`, H: 'gregitas:small_tool_handle'}).id(`gregitas:shaped/${metal.id}_screwdriver`) + event.shaped(`gtceu:${metal.id}_screwdriver`, ['S', 'H'], {S: `gtceu:${metal.id}_screwdriver_tip`, H: 'gregitas:small_tool_handle'}).id(`gregitas:shaped/${metal.id}_screwdriver`) }) //Hammer From 9c5790d5dc65a7fb271be603cfd2f5b2275c5016 Mon Sep 17 00:00:00 2001 From: Tatjam Date: Fri, 9 Feb 2024 19:14:42 +0100 Subject: [PATCH 4/6] Nerf gtceu ores --- kubejs/server_scripts/datapack/greg_ingots.js | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/kubejs/server_scripts/datapack/greg_ingots.js b/kubejs/server_scripts/datapack/greg_ingots.js index f0400113..caf7131d 100644 --- a/kubejs/server_scripts/datapack/greg_ingots.js +++ b/kubejs/server_scripts/datapack/greg_ingots.js @@ -202,117 +202,117 @@ let addGregTechIngotsToTFC = (/** @type {Internal.DataPackEventJS} */ event) => { ore: "gtceu:raw_lead", liquid: "gtceu:lead", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_silver", liquid: "tfc:metal/silver", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_tin", liquid: "tfc:metal/tin", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_hematite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_goethite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_cassiterite", liquid: "tfc:metal/tin", - amount: 144 + amount: 36 }, { ore: "gtceu:raw_cassiterite_sand", liquid: "tfc:metal/tin", - amount: 144 + amount: 36 }, { ore: "gtceu:raw_galena", liquid: "gtceu:lead", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_garnierite", liquid: "tfc:metal/nickel", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_magnetite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_pyrite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_sphalerite", liquid: "tfc:metal/zinc", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_tetrahedrite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_chalcopyrite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_yellow_limonite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_bornite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_chalcocite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_pentlandite", liquid: "tfc:metal/nickel", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_malachite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_basaltic_mineral_sand", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_granitic_mineral_sand", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_thorium", liquid: "gtceu:thorium", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_chromite", liquid: "gtceu:chromium", - amount: 72 + amount: 36 } From e516d5866480a870e2e8339c653dd9ad38a1c620 Mon Sep 17 00:00:00 2001 From: Tatjam Date: Fri, 9 Feb 2024 19:40:06 +0100 Subject: [PATCH 5/6] Fix wrought iron plate not anvil craftable (p1) --- kubejs/server_scripts/recipes/add.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/recipes/add.js b/kubejs/server_scripts/recipes/add.js index 6127e559..42d96eae 100644 --- a/kubejs/server_scripts/recipes/add.js +++ b/kubejs/server_scripts/recipes/add.js @@ -718,4 +718,5 @@ let recipeAdd = (/** @type {Internal.RecipesEventJS} */ event) => { smoking(`tfc:food\/${grain}_bread`,`firmalife:food\/${grain}_dough`) }) + event.recipes.tfc.anvil('gtceu:wrought_iron_plate', 'tfc:metal/double_ingot/wrought_iron', ['hit_last', 'hit_second_last', 'hit_third_last']) } From 6255d031c617e10b38f964f07e32301feba37527 Mon Sep 17 00:00:00 2001 From: Tatjam Date: Fri, 9 Feb 2024 19:40:34 +0100 Subject: [PATCH 6/6] (p2) of previous commit --- kubejs/server_scripts/recipes/removal.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/recipes/removal.js b/kubejs/server_scripts/recipes/removal.js index cdf3040a..7ae57ee1 100644 --- a/kubejs/server_scripts/recipes/removal.js +++ b/kubejs/server_scripts/recipes/removal.js @@ -315,6 +315,7 @@ let recipeRemoval = (/** @type {Internal.RecipesEventJS} */ event) => { event.remove({ id: `/^iceandfire:.*copper.*/`}) + event.remove({ id: 'tfc:anvil/wrought_iron_sheet'}) let only_hotworked = (mineral) => { event.remove({ id: "gtceu:shaped/plate_" + mineral })