From c040ccbb4f0d614518abe5d0f8d5bdab65d666ca Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Wed, 10 Aug 2022 23:51:37 +0100 Subject: [PATCH] remove DEFC controller recipe if the right mods are loaded (#42) --- .../common/loader/EMT_GT_Loader.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java index 50901d1..5549338 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java @@ -65,17 +65,21 @@ public class EMT_GT_Loader implements Runnable { DECC = new DE_Fusion_Crafter(5001, "de_fusion_crafter", "Draconic Evolution Fusion Crafter").getStackForm(1L); - GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10780), 144000, new Object[]{ - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10780), - ItemList.Robot_Arm_LuV.get(2L), - ItemList.Electric_Motor_LuV.get(2L), - ItemList.Field_Generator_LuV.get(1L), - new Object[]{OrePrefixes.circuit.get(Materials.Master), 2}, - ItemList.Casing_Coil_Naquadah.get(8L), - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2304L), - Materials.Thaumium.getMolten(1440L), - }, DECC, 1500, 16384); +/* New DECF controller recipe moved to TT. only create the old one here if tectech or blood magic is not around.*/ + + if(!(Loader.isModLoaded("tectech")&&Loader.isModLoaded("AWWayofTime"))){ + GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10780), 144000, new Object[]{ + GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10780), + ItemList.Robot_Arm_LuV.get(2L), + ItemList.Electric_Motor_LuV.get(2L), + ItemList.Field_Generator_LuV.get(1L), + new Object[]{OrePrefixes.circuit.get(Materials.Master), 2}, + ItemList.Casing_Coil_Naquadah.get(8L), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2304L), + Materials.Thaumium.getMolten(1440L), + }, DECC, 1500, 16384); + } for (int i = 0; i < ItemList.HATCHES_INPUT.length; i++) {