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);