From 4fd0bb64f33d83e0322e88f4a887ef907bae1ae2 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Thu, 22 Aug 2024 11:54:02 -0400 Subject: Remove some more collisions (#2940) * Changed conflicting recipe in mass fabricator to a new circuit * Added circuit 1 to assembler recipes for vanilla tools * Removed redundant windmill shaft recipes in gt++. These are loaded in coremod already --- .../gregtech/GregtechIndustrialMassFabricator.java | 2 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 52 ---------------------- 2 files changed, 1 insertion(+), 53 deletions(-) (limited to 'src/main/java/gtPlusPlus') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index c3cfd04418..ec9e3ccc97 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -90,7 +90,7 @@ public class GregtechIndustrialMassFabricator { // Advanced UUM GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3)) + .itemInputs(GT_Utility.getIntegratedCircuit(4)) .fluidInputs(Materials.UUAmplifier.getFluid(256)) .fluidOutputs(Materials.UUMatter.getFluid(256)) .duration(40 * SECONDS) diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java index 921feffbd0..dddcab86e6 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java @@ -170,58 +170,6 @@ public class RECIPE_IC2 { OrePrefixes.screw.get(Materials.Molybdenum) }); Logger.INFO("Added recipe item for GT5 Extruder: Shaft Shape"); - // Custm Recipes for Iron and Steel - ItemStack mShaftIron = ItemList.IC2_ShaftIron.get(1); - ItemStack mShaftSteel = ItemList.IC2_ShaftSteel.get(1); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(9L, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L)), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(mShaftIron) - .duration(32 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L)), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(mShaftIron) - .duration(32 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(9L, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.WroughtIron, 1L)), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(mShaftIron) - .duration(32 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L)), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(mShaftIron) - .duration(32 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(9L, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L)), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(mShaftSteel) - .duration(1 * MINUTES + 4 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Steel, 1L)), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(mShaftSteel) - .duration(1 * MINUTES + 4 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(extruderRecipes); - // Shaft Recipes GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9L, block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) -- cgit