From 466ac321072c60930ddbfff03bda4a1eba3b5445 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 7 Jul 2025 19:12:34 +0100 Subject: [PATCH] removed power tool recycling recipes because of duping, fixed crafting table spring recipes --- .../gregtech/recipes.materials.js | 36 +++++++++++++++++++ .../server_scripts/tfc/recipes.materials.js | 3 -- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 9156f20b6..50074bdd9 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -971,6 +971,37 @@ function registerGTCEUMetalRecipes(event) { event.remove({ id: `gtceu:shaped/buzzsaw_blade_${material.getName()}` }) } + const removePowerToolRecycling = (material) => { + removeMaceratorRecipe(`macerate_lv_${material.getName()}_wrench`) + event.remove({ id: `gtceu:arc_furnace/arc_lv_${material.getName()}_wrench` }) + removeMaceratorRecipe(`macerate_hv_${material.getName()}_wrench`) + event.remove({ id: `gtceu:arc_furnace/arc_hv_${material.getName()}_wrench` }) + removeMaceratorRecipe(`macerate_iv_${material.getName()}_wrench`) + event.remove({ id: `gtceu:arc_furnace/arc_iv_${material.getName()}_wrench` }) + removeMaceratorRecipe(`macerate_lv_${material.getName()}_chainsaw`) + event.remove({ id: `gtceu:arc_furnace/arc_lv_${material.getName()}_chainsaw` }) + removeMaceratorRecipe(`macerate_lv_${material.getName()}_buzzsaw`) + event.remove({ id: `gtceu:arc_furnace/arc_lv_${material.getName()}_buzzsaw` }) + removeMaceratorRecipe(`macerate_lv_${material.getName()}_drill`) + event.remove({ id: `gtceu:arc_furnace/arc_lv_${material.getName()}_drill` }) + removeMaceratorRecipe(`macerate_mv_${material.getName()}_drill`) + event.remove({ id: `gtceu:arc_furnace/arc_mv_${material.getName()}_drill` }) + removeMaceratorRecipe(`macerate_hv_${material.getName()}_drill`) + event.remove({ id: `gtceu:arc_furnace/arc_hv_${material.getName()}_drill` }) + removeMaceratorRecipe(`macerate_ev_${material.getName()}_drill`) + event.remove({ id: `gtceu:arc_furnace/arc_ev_${material.getName()}_drill` }) + removeMaceratorRecipe(`macerate_iv_${material.getName()}_drill`) + event.remove({ id: `gtceu:arc_furnace/arc_iv_${material.getName()}_drill` }) + removeMaceratorRecipe(`macerate_lv_${material.getName()}_screwdriver`) + event.remove({ id: `gtceu:arc_furnace/arc_lv_${material.getName()}_screwdriver` }) + removeMaceratorRecipe(`macerate_lv_${material.getName()}_wirecutter`) + event.remove({ id: `gtceu:arc_furnace/arc_lv_${material.getName()}_wirecutter` }) + removeMaceratorRecipe(`macerate_hv_${material.getName()}_wirecutter`) + event.remove({ id: `gtceu:arc_furnace/arc_hv_${material.getName()}_wirecutter` }) + removeMaceratorRecipe(`macerate_iv_${material.getName()}_wirecutter`) + event.remove({ id: `gtceu:arc_furnace/arc_iv_${material.getName()}_wirecutter` }) + } + forEachMaterial(material => { const toolProperty = material.getProperty(PropertyKey.TOOL) const ingotProperty = material.getProperty(PropertyKey.INGOT) @@ -1002,6 +1033,8 @@ function registerGTCEUMetalRecipes(event) { processToolHead(TFGTagPrefix.toolHeadMace, 'tfg:mace_head_extruder_mold', circuit++, material) processToolHead(TFGTagPrefix.toolHeadMattock, 'tfg:mattock_head_extruder_mold', circuit++, material) processToolHead(TFGTagPrefix.toolHeadHook, 'tfg:fish_hook_extruder_mold', circuit++, material) + + removePowerToolRecycling(material) } if (ingotProperty != null) { @@ -1020,6 +1053,9 @@ function registerGTCEUMetalRecipes(event) { processBell(material) processBars(material) processBuzzsawBlade(material) + + event.remove({ id: `gtceu:shaped/spring_${material.getName()}` }) + event.remove({ id: `gtceu:shaped/spring_small_${material.getName()}` }) } if (oreProperty != null) { diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 5d358ff4e..d7e0cb962 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -581,8 +581,6 @@ function registerTFCMaterialsRecipes(event) { .id(`tfc:anvil/${material.getName()}_spring`) } - event.remove({ id: `gtceu:shaped/spring_${material.getName()}` }) - // Small spring let smallSpringItem = ChemicalHelper.get(TagPrefix.springSmall, material, 1) if (!smallSpringItem.isEmpty() && !rodItem.isEmpty()) { @@ -596,7 +594,6 @@ function registerTFCMaterialsRecipes(event) { .id(`tfc:anvil/${material.getName()}_small_spring`) } - event.remove({ id: `gtceu:shaped/spring_small_${material.getName()}` }) } // Tools (From Ingot)