diff options
Diffstat (limited to 'src/Java')
10 files changed, 458 insertions, 349 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index 3a82b92d7b..2df2daa146 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -15,7 +15,8 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.RECIPES_Old_Circuits; -import gtPlusPlus.core.recipe.RECIPE_CONSTANTS; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.recipe.LOADER_Machine_Components; import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.debug.DEBUG_INIT; @@ -75,7 +76,7 @@ public class CommonProxy { } ModItems.init(); ModBlocks.init(); - RECIPE_CONSTANTS.initialise(); + CI.Init(); //Prevents my Safes being destroyed. MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler()); //Block Handler for all events. diff --git a/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java new file mode 100644 index 0000000000..72ca4375d6 --- /dev/null +++ b/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java @@ -0,0 +1,157 @@ +package gtPlusPlus.core.recipe; + +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; + +public class LOADER_Machine_Components { + + public static void initialise(){ + + if (!CORE.GTNH){ + if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + registerGTExperimentalComponents(); + } + else { + registerGTStandardComponents(); + } + } + else { + registerGTNHComponents(); + } + } + + private static void registerGTExperimentalComponents(){ + //Machine Components + CI.electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); + CI.electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1); + CI.electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1); + CI.electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1); + CI.electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1); + CI.electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1); + CI.electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1); + CI.electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1); + CI.electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1); + CI.robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1); + CI.robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1); + CI.robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1); + CI.conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1); + CI.conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1); + CI.conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1); + CI.emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1); + CI.emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1); + CI.emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1); + CI.fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1); + CI.fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1); + CI.fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1); + CI.sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); + CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); + CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); + + registerComponent_ULV(); + registerComponent_MAX(); + } + + private static void registerGTStandardComponents(){ + CI.electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); + CI.electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); + CI.electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1); + CI.electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); + CI.electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1); + CI.electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1); + CI.electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1); + CI.electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); + CI.electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1); + CI.electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1); + CI.electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1); + CI.electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); + CI.robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1); + CI.robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1); + CI.robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1); + CI.robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); + CI.conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1); + CI.conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1); + CI.conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1); + CI.conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); + CI.emitter_LuV = GregtechItemList.Emitter_LuV.get(1); + CI.emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1); + CI.emitter_UV = GregtechItemList.Emitter_UV.get(1); + CI.emitter_MAX = GregtechItemList.Emitter_MAX.get(1); + CI.fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1); + CI.fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1); + CI.fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1); + CI.fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); + CI.sensor_LuV = GregtechItemList.Sensor_LuV.get(1); + CI.sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1); + CI.sensor_UV = GregtechItemList.Sensor_UV.get(1); + CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1); + + registerComponent_ULV(); + } + + private static void registerGTNHComponents(){ + //Machine Components + CI.electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); + CI.electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1); + CI.electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1); + + CI.electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32615, 1); + CI.electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32616, 1); + CI.electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32617, 1); + + CI.electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1); + CI.electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1); + CI.electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1); + + CI.robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1); + CI.robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1); + CI.robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1); + + CI.conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32635, 1); + CI.conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1); + CI.conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1); + + CI.emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1); + CI.emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1); + CI.emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1); + + CI.fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1); + CI.fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1); + CI.fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1); + + CI.sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); + CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); + CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); + + registerComponent_ULV(); + registerComponent_MAX(); + } + + private static boolean registerComponent_ULV(){ + + CI.electricMotor_ULV = GregtechItemList.Electric_Motor_ULV.get(1); + CI.electricPump_ULV = GregtechItemList.Electric_Pump_ULV.get(1); + CI.electricPiston_ULV = GregtechItemList.Electric_Piston_ULV.get(1); + CI.robotArm_ULV = GregtechItemList.Robot_Arm_ULV.get(1); + CI.conveyorModule_ULV = GregtechItemList.Conveyor_Module_ULV.get(1); + CI.emitter_ULV = GregtechItemList.Emitter_ULV.get(1); + CI.fieldGenerator_ULV = GregtechItemList.Field_Generator_ULV.get(1); + CI.sensor_ULV = GregtechItemList.Sensor_ULV.get(1); + return true; + } + + private static boolean registerComponent_MAX(){ + //Max Tier Components Blood Never added... Useless, lol. + CI.electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); + CI.electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); + CI.electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); + CI.robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); + CI.conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); + CI.emitter_MAX = GregtechItemList.Emitter_MAX.get(1); + CI.fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); + CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1); + return true; + } + +} diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index 96cdcb738a..c6d03b345b 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -3,6 +3,7 @@ package gtPlusPlus.core.recipe; import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -114,176 +115,176 @@ public class RECIPES_MachineComponents { cableTier7, wireTier7, rodTier7a, wireTier7, rodTier7b, wireTier7, rodTier7a, wireTier7, cableTier7, - RECIPE_CONSTANTS.electricMotor_LuV); + CI.electricMotor_LuV); RecipeUtils.addShapedGregtechRecipe( cableTier8, wireTier8, rodTier8a, wireTier8, rodTier8b, wireTier8, rodTier8a, wireTier8, cableTier8, - RECIPE_CONSTANTS.electricMotor_ZPM); + CI.electricMotor_ZPM); RecipeUtils.addShapedGregtechRecipe( cableTier9, wireTier9, rodTier9a, wireTier9, rodTier9b, wireTier9, rodTier9a, wireTier9, cableTier9, - RECIPE_CONSTANTS.electricMotor_UV); + CI.electricMotor_UV); RecipeUtils.addShapedGregtechRecipe( cableTier10, wireTier10, rodTier10a, wireTier10, rodTier10b, wireTier10, rodTier10a, wireTier10, cableTier10, - RECIPE_CONSTANTS.electricMotor_MAX); + CI.electricMotor_MAX); //Electric Pump RecipeUtils.addShapedGregtechRecipe( cableTier7, rotorTier7, itemRubberRing, craftingToolScrewdriver, pipeTier7, craftingToolWrench, - itemRubberRing, RECIPE_CONSTANTS.electricMotor_LuV, cableTier7, - RECIPE_CONSTANTS.electricPump_LuV); + itemRubberRing, CI.electricMotor_LuV, cableTier7, + CI.electricPump_LuV); RecipeUtils.addShapedGregtechRecipe( cableTier8, rotorTier8, itemRubberRing, craftingToolScrewdriver, pipeTier8, craftingToolWrench, - itemRubberRing, RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8, - RECIPE_CONSTANTS.electricPump_ZPM); + itemRubberRing, CI.electricMotor_ZPM, cableTier8, + CI.electricPump_ZPM); RecipeUtils.addShapedGregtechRecipe( cableTier9, rotorTier9, itemRubberRing, craftingToolScrewdriver, pipeTier9, craftingToolWrench, - itemRubberRing, RECIPE_CONSTANTS.electricMotor_UV, cableTier9, - RECIPE_CONSTANTS.electricPump_UV); + itemRubberRing, CI.electricMotor_UV, cableTier9, + CI.electricPump_UV); RecipeUtils.addShapedGregtechRecipe( cableTier10, rotorTier10, itemRubberRing, craftingToolScrewdriver, pipeTier10, craftingToolWrench, - itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, - RECIPE_CONSTANTS.electricPump_MAX); + itemRubberRing, CI.electricMotor_MAX, cableTier10, + CI.electricPump_MAX); //Electric Pump RecipeUtils.addShapedGregtechRecipe( plateTier7, plateTier7, plateTier7, cableTier7, rodTier7a, rodTier7a, - cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, smallGearTier7, - RECIPE_CONSTANTS.electricPiston_LuV); + cableTier7, CI.electricMotor_LuV, smallGearTier7, + CI.electricPiston_LuV); RecipeUtils.addShapedGregtechRecipe( plateTier8, plateTier8, plateTier8, cableTier8, rodTier8a, rodTier8a, - cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, smallGearTier8, - RECIPE_CONSTANTS.electricPiston_ZPM); + cableTier8, CI.electricMotor_ZPM, smallGearTier8, + CI.electricPiston_ZPM); RecipeUtils.addShapedGregtechRecipe( plateTier9, plateTier9, plateTier9, cableTier9, rodTier9a, rodTier9a, - cableTier9, RECIPE_CONSTANTS.electricMotor_UV, smallGearTier9, - RECIPE_CONSTANTS.electricPiston_UV); + cableTier9, CI.electricMotor_UV, smallGearTier9, + CI.electricPiston_UV); RecipeUtils.addShapedGregtechRecipe( plateTier10, plateTier10, plateTier10, cableTier10, rodTier10a, rodTier10a, - cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10, - RECIPE_CONSTANTS.electricPiston_MAX); + cableTier10, CI.electricMotor_MAX, smallGearTier10, + CI.electricPiston_MAX); //Robot Arms RecipeUtils.addShapedGregtechRecipe( cableTier7, cableTier7, cableTier7, - RECIPE_CONSTANTS.electricMotor_LuV, rodTier7a, RECIPE_CONSTANTS.electricMotor_LuV, - RECIPE_CONSTANTS.electricPiston_LuV, circuitTier7, rodTier7a, - RECIPE_CONSTANTS.robotArm_LuV); + CI.electricMotor_LuV, rodTier7a, CI.electricMotor_LuV, + CI.electricPiston_LuV, circuitTier7, rodTier7a, + CI.robotArm_LuV); RecipeUtils.addShapedGregtechRecipe( cableTier8, cableTier8, cableTier8, - RECIPE_CONSTANTS.electricMotor_ZPM, rodTier8a, RECIPE_CONSTANTS.electricMotor_ZPM, - RECIPE_CONSTANTS.electricPiston_ZPM, circuitTier8, rodTier8a, - RECIPE_CONSTANTS.robotArm_ZPM); + CI.electricMotor_ZPM, rodTier8a, CI.electricMotor_ZPM, + CI.electricPiston_ZPM, circuitTier8, rodTier8a, + CI.robotArm_ZPM); RecipeUtils.addShapedGregtechRecipe( cableTier9, cableTier9, cableTier9, - RECIPE_CONSTANTS.electricMotor_UV, rodTier9a, RECIPE_CONSTANTS.electricMotor_UV, - RECIPE_CONSTANTS.electricPiston_UV, circuitTier9, rodTier9a, - RECIPE_CONSTANTS.robotArm_UV); + CI.electricMotor_UV, rodTier9a, CI.electricMotor_UV, + CI.electricPiston_UV, circuitTier9, rodTier9a, + CI.robotArm_UV); RecipeUtils.addShapedGregtechRecipe( cableTier10, cableTier10, cableTier10, - RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX, - RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a, - RECIPE_CONSTANTS.robotArm_MAX); + CI.electricMotor_MAX, rodTier10a, CI.electricMotor_MAX, + CI.electricPiston_MAX, circuitTier10, rodTier10a, + CI.robotArm_MAX); //Conveyor Modules RecipeUtils.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.electricMotor_LuV, cableTier7, RECIPE_CONSTANTS.electricMotor_LuV, + CI.electricMotor_LuV, cableTier7, CI.electricMotor_LuV, plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.conveyorModule_LuV); + CI.conveyorModule_LuV); RecipeUtils.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.electricMotor_ZPM, cableTier8, RECIPE_CONSTANTS.electricMotor_ZPM, + CI.electricMotor_ZPM, cableTier8, CI.electricMotor_ZPM, plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.conveyorModule_ZPM); + CI.conveyorModule_ZPM); RecipeUtils.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.electricMotor_UV, cableTier9, RECIPE_CONSTANTS.electricMotor_UV, + CI.electricMotor_UV, cableTier9, CI.electricMotor_UV, plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.conveyorModule_UV); + CI.conveyorModule_UV); RecipeUtils.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, + CI.electricMotor_MAX, cableTier10, CI.electricMotor_MAX, plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.conveyorModule_MAX); + CI.conveyorModule_MAX); //Emitter Modules RecipeUtils.addShapedGregtechRecipe( rodTier7c, rodTier7c, circuitTier7, cableTier7, circuitTier6, rodTier7c, circuitTier7, cableTier7, rodTier7c, - RECIPE_CONSTANTS.emitter_LuV); + CI.emitter_LuV); RecipeUtils.addShapedGregtechRecipe( rodTier8c, rodTier8c, circuitTier8, cableTier8, circuitTier7, rodTier8c, circuitTier8, cableTier8, rodTier8c, - RECIPE_CONSTANTS.emitter_ZPM); + CI.emitter_ZPM); RecipeUtils.addShapedGregtechRecipe( rodTier9c, rodTier9c, circuitTier9, cableTier9, circuitTier8, rodTier9c, circuitTier9, cableTier9, rodTier9c, - RECIPE_CONSTANTS.emitter_UV); + CI.emitter_UV); RecipeUtils.addShapedGregtechRecipe( rodTier10c, rodTier10c, circuitTier10, cableTier10, circuitTier9, rodTier10c, circuitTier10, cableTier10, rodTier10c, - RECIPE_CONSTANTS.emitter_MAX); + CI.emitter_MAX); //Field Generator Modules RecipeUtils.addShapedGregtechRecipe( wireTier7, circuitTier7, wireTier7, circuitTier7, circuitTier6, circuitTier7, wireTier7, circuitTier7, wireTier7, - RECIPE_CONSTANTS.fieldGenerator_LuV); + CI.fieldGenerator_LuV); RecipeUtils.addShapedGregtechRecipe( wireTier8, circuitTier8, wireTier8, circuitTier8, circuitTier7, circuitTier8, wireTier8, circuitTier8, wireTier8, - RECIPE_CONSTANTS.fieldGenerator_ZPM); + CI.fieldGenerator_ZPM); RecipeUtils.addShapedGregtechRecipe( wireTier9, circuitTier9, wireTier9, circuitTier9, circuitTier8, circuitTier9, wireTier9, circuitTier9, wireTier9, - RECIPE_CONSTANTS.fieldGenerator_UV); + CI.fieldGenerator_UV); RecipeUtils.addShapedGregtechRecipe( wireTier10, circuitTier10, wireTier10, circuitTier10, circuitTier9, circuitTier10, wireTier10, circuitTier10, wireTier10, - RECIPE_CONSTANTS.fieldGenerator_MAX); + CI.fieldGenerator_MAX); //Sensor Modules RecipeUtils.addShapedGregtechRecipe( plateTier7, null, circuitTier6, plateTier7, rodTier7c, null, circuitTier7, plateTier7, plateTier7, - RECIPE_CONSTANTS.sensor_LuV); + CI.sensor_LuV); RecipeUtils.addShapedGregtechRecipe( plateTier8, null, circuitTier7, plateTier8, rodTier8c, null, circuitTier8, plateTier8, plateTier8, - RECIPE_CONSTANTS.sensor_ZPM); + CI.sensor_ZPM); RecipeUtils.addShapedGregtechRecipe( plateTier9, null, circuitTier8, plateTier9, rodTier9c, null, circuitTier9, plateTier9, plateTier9, - RECIPE_CONSTANTS.sensor_UV); + CI.sensor_UV); RecipeUtils.addShapedGregtechRecipe( plateTier10, null, circuitTier9, plateTier10, rodTier10c, null, circuitTier10, plateTier10, plateTier10, - RECIPE_CONSTANTS.sensor_MAX); + CI.sensor_MAX); onlyULVComponents(); @@ -296,49 +297,49 @@ public class RECIPES_MachineComponents { cableTier1, wireTier0, rodTier0, wireTier0, rodTier2, wireTier0, rodTier0, wireTier0, cableTier1, - RECIPE_CONSTANTS.electricMotor_ULV); + CI.electricMotor_ULV); RecipeUtils.addShapedGregtechRecipe( cableTier0, rotorTier0, itemRubberRing, craftingToolScrewdriver, pipeTier0, craftingToolWrench, - itemRubberRing, RECIPE_CONSTANTS.electricMotor_ULV, cableTier0, - RECIPE_CONSTANTS.electricPump_ULV); + itemRubberRing, CI.electricMotor_ULV, cableTier0, + CI.electricPump_ULV); RecipeUtils.addShapedGregtechRecipe( plateTier0, plateTier0, plateTier0, cableTier0, rodTier1, rodTier1, - cableTier0, RECIPE_CONSTANTS.electricMotor_ULV, smallGearTier0, - RECIPE_CONSTANTS.electricPiston_ULV); + cableTier0, CI.electricMotor_ULV, smallGearTier0, + CI.electricPiston_ULV); RecipeUtils.addShapedGregtechRecipe( cableTier0, cableTier0, cableTier0, - RECIPE_CONSTANTS.electricMotor_ULV, rodTier1, RECIPE_CONSTANTS.electricMotor_ULV, - RECIPE_CONSTANTS.electricPiston_ULV, circuitTier0, rodTier1, - RECIPE_CONSTANTS.robotArm_ULV); + CI.electricMotor_ULV, rodTier1, CI.electricMotor_ULV, + CI.electricPiston_ULV, circuitTier0, rodTier1, + CI.robotArm_ULV); RecipeUtils.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.electricMotor_ULV, cableTier0, RECIPE_CONSTANTS.electricMotor_ULV, + CI.electricMotor_ULV, cableTier0, CI.electricMotor_ULV, plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.conveyorModule_ULV); + CI.conveyorModule_ULV); RecipeUtils.addShapedGregtechRecipe( rodTier2, rodTier2, circuitTier0, cableTier0, circuitTier1, rodTier2, circuitTier0, cableTier0, rodTier2, - RECIPE_CONSTANTS.emitter_ULV); + CI.emitter_ULV); RecipeUtils.addShapedGregtechRecipe( wireTier0, circuitTier0, wireTier0, circuitTier0, circuitTier1, circuitTier0, wireTier0, circuitTier0, wireTier0, - RECIPE_CONSTANTS.fieldGenerator_ULV); + CI.fieldGenerator_ULV); RecipeUtils.addShapedGregtechRecipe( plateTier0, null, circuitTier1, plateTier0, rodTier2, null, circuitTier0, plateTier0, plateTier0, - RECIPE_CONSTANTS.sensor_ULV); + CI.sensor_ULV); } private static void onlyMaxComponents(){ @@ -346,42 +347,42 @@ public class RECIPES_MachineComponents { cableTier10, wireTier10, rodTier10a, wireTier10, rodTier10b, wireTier10, rodTier10a, wireTier10, cableTier10, - RECIPE_CONSTANTS.electricMotor_MAX); + CI.electricMotor_MAX); RecipeUtils.addShapedGregtechRecipe( cableTier10, rotorTier10, itemRubberRing, craftingToolScrewdriver, pipeTier10, craftingToolWrench, - itemRubberRing, RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, - RECIPE_CONSTANTS.electricPump_MAX); + itemRubberRing, CI.electricMotor_MAX, cableTier10, + CI.electricPump_MAX); RecipeUtils.addShapedGregtechRecipe( plateTier10, plateTier10, plateTier10, cableTier10, rodTier10a, rodTier10a, - cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, smallGearTier10, - RECIPE_CONSTANTS.electricPiston_MAX); + cableTier10, CI.electricMotor_MAX, smallGearTier10, + CI.electricPiston_MAX); RecipeUtils.addShapedGregtechRecipe( cableTier10, cableTier10, cableTier10, - RECIPE_CONSTANTS.electricMotor_MAX, rodTier10a, RECIPE_CONSTANTS.electricMotor_MAX, - RECIPE_CONSTANTS.electricPiston_MAX, circuitTier10, rodTier10a, - RECIPE_CONSTANTS.robotArm_MAX); + CI.electricMotor_MAX, rodTier10a, CI.electricMotor_MAX, + CI.electricPiston_MAX, circuitTier10, rodTier10a, + CI.robotArm_MAX); RecipeUtils.addShapedGregtechRecipe( plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.electricMotor_MAX, cableTier10, RECIPE_CONSTANTS.electricMotor_MAX, + CI.electricMotor_MAX, cableTier10, CI.electricMotor_MAX, plateRubber, plateRubber, plateRubber, - RECIPE_CONSTANTS.conveyorModule_MAX); + CI.conveyorModule_MAX); RecipeUtils.addShapedGregtechRecipe( rodTier10c, rodTier10c, circuitTier10, cableTier10, circuitTier9, rodTier10c, circuitTier10, cableTier10, rodTier10c, - RECIPE_CONSTANTS.emitter_MAX); + CI.emitter_MAX); RecipeUtils.addShapedGregtechRecipe( wireTier10, circuitTier10, wireTier10, circuitTier10, circuitTier9, circuitTier10, wireTier10, circuitTier10, wireTier10, - RECIPE_CONSTANTS.fieldGenerator_MAX); + CI.fieldGenerator_MAX); RecipeUtils.addShapedGregtechRecipe( plateTier10, null, circuitTier9, plateTier10, rodTier10c, null, circuitTier10, plateTier10, plateTier10, - RECIPE_CONSTANTS.sensor_MAX); + CI.sensor_MAX); } private static void GregtechMachinePhase(){ diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 9097b585aa..b9fa7dedca 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -3,6 +3,7 @@ package gtPlusPlus.core.recipe; import gregtech.api.enums.*; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; @@ -203,18 +204,6 @@ public class RECIPES_Machines { public static ItemStack IC2MFE; public static ItemStack IC2MFSU; - //Circuits - public static ItemStack circuitPrimitive = ItemList.Circuit_Primitive.get(1); - public static ItemStack circuitTier1 = ItemList.Circuit_Basic.get(1);//"circuitGood"; - public static ItemStack circuitTier2 = ItemList.Circuit_Good.get(1);//"circuitAdvanced"; - public static ItemStack circuitTier3 = ItemList.Circuit_Advanced.get(1);//"circuitData"; - public static ItemStack circuitTier4 = ItemList.Circuit_Elite.get(1);//"circuitElite"; - public static ItemStack circuitTier5 = ItemList.Circuit_Master.get(1);//"circuitMaster"; - public static ItemStack circuitTier6 = ItemList.Circuit_Ultimate.get(1);//"circuitUltimate"; - public static String circuitTier7 = "circuitSuperconductor"; - public static String circuitTier8 = "circuitInfinite"; - public static String circuitTier9 = "circuitQuantum"; - //Machine Components public static ItemStack electricMotor_LV; public static ItemStack electricMotor_MV; @@ -382,60 +371,60 @@ public class RECIPES_Machines { "gearGtTungstenSteel", "cableGt02Platinum", "gearGtTungstenSteel", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 794, 1)); RecipeUtils.addShapedGregtechRecipe( - RECIPE_CONSTANTS.electricPiston_LuV, OrePrefixes.circuit.get(Materials.Infinite), RECIPE_CONSTANTS.electricPiston_LuV, - RECIPE_CONSTANTS.electricMotor_LuV, machineCasing_LuV, RECIPE_CONSTANTS.electricMotor_LuV, + CI.electricPiston_LuV, OrePrefixes.circuit.get(Materials.Infinite), CI.electricPiston_LuV, + CI.electricMotor_LuV, machineCasing_LuV, CI.electricMotor_LuV, "gearGtChrome", "cableGt02Tungsten", "gearGtChrome", ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 795, 1)); //Buffer Core RecipeUtils.addShapedGregtechRecipe( plateTier1, cableTier1, plateTier1, - circuitPrimitive, IC2MFE, circuitPrimitive, + CI.circuitPrimitive, IC2MFE, CI.circuitPrimitive, plateTier1, cableTier1, plateTier1, RECIPE_BufferCore_ULV); RecipeUtils.addShapedGregtechRecipe( plateTier2, cableTier2, plateTier2, - circuitTier1, IC2MFE, circuitTier1, + CI.circuitTier1, IC2MFE, CI.circuitTier1, plateTier2, cableTier2, plateTier2, RECIPE_BufferCore_LV); RecipeUtils.addShapedGregtechRecipe( plateTier3, cableTier3, plateTier3, - RECIPE_BufferCore_LV, circuitTier2, RECIPE_BufferCore_LV, + RECIPE_BufferCore_LV, CI.circuitTier2, RECIPE_BufferCore_LV, plateTier3, cableTier3, plateTier3, RECIPE_BufferCore_MV); RecipeUtils.addShapedGregtechRecipe( plateTier4, cableTier4, plateTier4, - RECIPE_BufferCore_MV, circuitTier3, RECIPE_BufferCore_MV, + RECIPE_BufferCore_MV, CI.circuitTier3, RECIPE_BufferCore_MV, plateTier4, cableTier4, plateTier4, RECIPE_BufferCore_HV); RecipeUtils.addShapedGregtechRecipe( plateTier5, cableTier5, plateTier5, - RECIPE_BufferCore_HV, circuitTier4, RECIPE_BufferCore_HV, + RECIPE_BufferCore_HV, CI.circuitTier4, RECIPE_BufferCore_HV, plateTier5, cableTier5, plateTier5, RECIPE_BufferCore_EV); RecipeUtils.addShapedGregtechRecipe( plateTier6, cableTier6, plateTier6, - RECIPE_BufferCore_EV, circuitTier5, RECIPE_BufferCore_EV, + RECIPE_BufferCore_EV, CI.circuitTier5, RECIPE_BufferCore_EV, plateTier6, cableTier6, plateTier6, RECIPE_BufferCore_IV); RecipeUtils.addShapedGregtechRecipe( plateTier7, cableTier7, plateTier7, - RECIPE_BufferCore_IV, circuitTier6, RECIPE_BufferCore_IV, + RECIPE_BufferCore_IV, CI.circuitTier6, RECIPE_BufferCore_IV, plateTier7, cableTier7, plateTier7, RECIPE_BufferCore_LuV); RecipeUtils.addShapedGregtechRecipe( plateTier8, cableTier8, plateTier8, - RECIPE_BufferCore_LuV, circuitTier7, RECIPE_BufferCore_LuV, + RECIPE_BufferCore_LuV, CI.circuitTier7, RECIPE_BufferCore_LuV, plateTier8, cableTier8, plateTier8, RECIPE_BufferCore_ZPM); RecipeUtils.addShapedGregtechRecipe( plateTier9, cableTier9, plateTier9, - RECIPE_BufferCore_ZPM, circuitTier8, RECIPE_BufferCore_ZPM, + RECIPE_BufferCore_ZPM, CI.circuitTier8, RECIPE_BufferCore_ZPM, plateTier9, cableTier9, plateTier9, RECIPE_BufferCore_UV); RecipeUtils.addShapedGregtechRecipe( plateTier10, cableTier10, plateTier10, - RECIPE_BufferCore_UV, circuitTier9, RECIPE_BufferCore_UV, + RECIPE_BufferCore_UV, CI.circuitTier9, RECIPE_BufferCore_UV, plateTier10, cableTier10, plateTier10, RECIPE_BufferCore_MAX); @@ -443,52 +432,52 @@ public class RECIPES_Machines { RecipeUtils.addShapedGregtechRecipe( wireTier1, RECIPE_BufferCore_ULV, wireTier1, wireTier1, machineCasing_ULV, wireTier1, - circuitPrimitive, circuitTier1, circuitPrimitive, + CI.circuitPrimitive, CI.circuitTier1, CI.circuitPrimitive, RECIPE_Buffer_ULV); RecipeUtils.addShapedGregtechRecipe( wireTier2, RECIPE_BufferCore_LV, wireTier2, wireTier2, machineCasing_LV, wireTier2, - circuitTier1, RECIPE_BufferCore_LV, circuitTier1, + CI.circuitTier1, RECIPE_BufferCore_LV, CI.circuitTier1, RECIPE_Buffer_LV); RecipeUtils.addShapedGregtechRecipe( wireTier3, RECIPE_BufferCore_MV, wireTier3, wireTier3, machineCasing_MV, wireTier3, - circuitTier2, RECIPE_BufferCore_MV, circuitTier2, + CI.circuitTier2, RECIPE_BufferCore_MV, CI.circuitTier2, RECIPE_Buffer_MV); RecipeUtils.addShapedGregtechRecipe( wireTier4, RECIPE_BufferCore_HV, wireTier4, wireTier4, machineCasing_HV, wireTier4, - circuitTier3, RECIPE_BufferCore_HV, circuitTier3, + CI.circuitTier3, RECIPE_BufferCore_HV, CI.circuitTier3, RECIPE_Buffer_HV); RecipeUtils.addShapedGregtechRecipe( wireTier5, RECIPE_BufferCore_EV, wireTier5, wireTier5, machineCasing_EV, wireTier5, - circuitTier4, RECIPE_BufferCore_EV, circuitTier4, + CI.circuitTier4, RECIPE_BufferCore_EV, CI.circuitTier4, RECIPE_Buffer_EV); RecipeUtils.addShapedGregtechRecipe( wireTier6, RECIPE_BufferCore_IV, wireTier6, wireTier6, machineCasing_IV, wireTier6, - circuitTier5, RECIPE_BufferCore_IV, circuitTier5, + CI.circuitTier5, RECIPE_BufferCore_IV, CI.circuitTier5, RECIPE_Buffer_IV); RecipeUtils.addShapedGregtechRecipe( wireTier7, RECIPE_BufferCore_LuV, wireTier7, wireTier7, machineCasing_LuV, wireTier7, - circuitTier6, RECIPE_BufferCore_LuV, circuitTier6, + CI.circuitTier6, RECIPE_BufferCore_LuV, CI.circuitTier6, RECIPE_Buffer_LuV); RecipeUtils.addShapedGregtechRecipe( wireTier8, RECIPE_BufferCore_ZPM, wireTier8, wireTier8, machineCasing_ZPM, wireTier8, - circuitTier7, RECIPE_BufferCore_ZPM, circuitTier7, + CI.circuitTier7, RECIPE_BufferCore_ZPM, CI.circuitTier7, RECIPE_Buffer_ZPM); RecipeUtils.addShapedGregtechRecipe( wireTier9, RECIPE_BufferCore_UV, wireTier9, wireTier9, machineCasing_UV, wireTier9, - circuitTier8, RECIPE_BufferCore_UV, circuitTier8, + CI.circuitTier8, RECIPE_BufferCore_UV, CI.circuitTier8, RECIPE_Buffer_UV); RecipeUtils.addShapedGregtechRecipe( plateTier11, RECIPE_BufferCore_MAX, plateTier11, wireTier10, machineCasing_MAX, wireTier10, - circuitTier9, RECIPE_BufferCore_MAX, circuitTier9, + CI.circuitTier9, RECIPE_BufferCore_MAX, CI.circuitTier9, RECIPE_Buffer_MAX); //Steam Condenser @@ -537,7 +526,7 @@ public class RECIPES_Machines { //Industrial Centrifuge RecipeUtils.addShapedGregtechRecipe( - circuitTier6, pipeHugeStainlessSteel, circuitTier6, + CI.circuitTier6, pipeHugeStainlessSteel, CI.circuitTier6, plateTier6, IV_MACHINE_Centrifuge, plateTier6, plateTier8, machineCasing_IV, plateTier8, RECIPE_IndustrialCentrifugeController); @@ -559,17 +548,17 @@ public class RECIPES_Machines { if (LoadedMods.Railcraft){ //Industrial Coke Oven RecipeUtils.addShapedGregtechRecipe( - plateCobalt, circuitTier4, plateCobalt, + plateCobalt, CI.circuitTier4, plateCobalt, machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV, - plateCobalt, circuitTier5, plateCobalt, + plateCobalt, CI.circuitTier5, plateCobalt, RECIPE_IndustrialCokeOvenController); } if (LoadedMods.ImmersiveEngineering){ //Industrial Coke Oven RecipeUtils.addShapedGregtechRecipe( - plateTier8, circuitTier4, plateTier8, + plateTier8, CI.circuitTier4, plateTier8, machineCasing_HV, INPUT_IECokeOvenBlock, machineCasing_HV, - plateTier8, circuitTier3, plateTier8, + plateTier8, CI.circuitTier3, plateTier8, RECIPE_IndustrialCokeOvenController); } //Coke Oven Frame Casing @@ -605,7 +594,7 @@ public class RECIPES_Machines { RECIPE_IndustrialElectrolyzerFrame); //Industrial Electrolyzer RecipeUtils.addShapedGregtechRecipe( - "plateStellite", circuitTier6, "plateStellite", + "plateStellite", CI.circuitTier6, "plateStellite", machineCasing_EV, IV_MACHINE_Electrolyzer, machineCasing_EV, "plateStellite", "rotorStellite", "plateStellite", RECIPE_IndustrialElectrolyzerController); @@ -624,9 +613,9 @@ public class RECIPES_Machines { RECIPE_IndustrialMaterialPressFrame); //Industrial Material Press RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", circuitTier5, "plateTitanium", + "plateTitanium", CI.circuitTier5, "plateTitanium", machineCasing_EV, IV_MACHINE_BendingMachine, machineCasing_EV, - "plateTitanium", circuitTier5, "plateTitanium", + "plateTitanium", CI.circuitTier5, "plateTitanium", RECIPE_IndustrialMaterialPressController); } @@ -644,7 +633,7 @@ public class RECIPES_Machines { //Industrial Maceration stack RecipeUtils.addShapedGregtechRecipe( "plateTungstenCarbide", IV_MACHINE_Macerator, "plateTungstenCarbide", - EV_MACHINE_Macerator, circuitTier7, EV_MACHINE_Macerator, + EV_MACHINE_Macerator, CI.circuitTier7, EV_MACHINE_Macerator, "plateTungstenCarbide", machineCasing_IV, "plateTungstenCarbide", RECIPE_IndustrialMacerationStackController); } @@ -663,7 +652,7 @@ public class RECIPES_Machines { //Industrial Wire Factory RecipeUtils.addShapedGregtechRecipe( "plateZeron100", machineCasing_IV, "plateZeron100", - circuitTier6, IV_MACHINE_Wiremill, circuitTier6, + CI.circuitTier6, IV_MACHINE_Wiremill, CI.circuitTier6, "plateZeron100", machineCasing_IV, "plateZeron100", RECIPE_IndustrialWireFactoryController); } @@ -707,29 +696,29 @@ public class RECIPES_Machines { RecipeUtils.addShapedGregtechRecipe( plateTier7, plateTier7, plateTier7, plateTier7, pipeTier7, plateTier7, - plateTier7, RECIPE_CONSTANTS.electricPump_LuV, plateTier7, + plateTier7, CI.electricPump_LuV, plateTier7, GregtechItemList.GT_FluidTank_LuV.get(1)); RecipeUtils.addShapedGregtechRecipe( plateTier8, plateTier8, plateTier8, plateTier8, pipeTier8, plateTier8, - plateTier8, RECIPE_CONSTANTS.electricPump_ZPM, plateTier8, + plateTier8, CI.electricPump_ZPM, plateTier8, GregtechItemList.GT_FluidTank_ZPM.get(1)); RecipeUtils.addShapedGregtechRecipe( plateTier9, plateTier9, plateTier9, plateTier9, pipeTier9, plateTier9, - plateTier9, RECIPE_CONSTANTS.electricPump_UV, plateTier9, + plateTier9, CI.electricPump_UV, plateTier9, GregtechItemList.GT_FluidTank_UV.get(1)); RecipeUtils.addShapedGregtechRecipe( plateTier10, plateTier10, plateTier10, plateTier10, pipeTier10, plateTier10, - plateTier10, RECIPE_CONSTANTS.electricPump_MAX, plateTier10, + plateTier10, CI.electricPump_MAX, plateTier10, GregtechItemList.GT_FluidTank_MAX.get(1)); } else { plateTier1 = "plateTin"; pipeTier1 = "pipeLargeClay"; - circuitTier1 = ItemList.Circuit_Primitive.get(1); + CI.circuitTier1 = ItemList.Circuit_Primitive.get(1); plateTier2 = "plateCopper"; pipeTier2 = "pipeHugeClay"; plateTier3 = "plateBronze"; @@ -765,9 +754,9 @@ public class RECIPES_Machines { plateTier6, electricPump_LV, plateTier6, GregtechItemList.GT_FluidTank_MV.get(1)); RecipeUtils.addShapedGregtechRecipe( - circuitTier1, plateTier8, circuitTier1, + CI.circuitTier1, plateTier8, CI.circuitTier1, plateTier4, pipeTier4, plateTier4, - circuitTier1, electricPump_LV, circuitTier1, + CI.circuitTier1, electricPump_LV, CI.circuitTier1, GregtechItemList.GT_FluidTank_HV.get(1)); } } @@ -786,7 +775,7 @@ public class RECIPES_Machines { //Industrial Multi Tank RecipeUtils.addShapedGregtechRecipe( "pipeHugeTantalloy60", "gearGrisium", "pipeHugeTantalloy60", - circuitTier4, RECIPE_IndustrialMultiTankFrame, circuitTier4, + CI.circuitTier4, RECIPE_IndustrialMultiTankFrame, CI.circuitTier4, "plateDoubleGrisium", "rotorGrisium", "plateDoubleGrisium", RECIPE_IndustrialMultiTankController); } @@ -799,9 +788,9 @@ public class RECIPES_Machines { //Blast Smelter RecipeUtils.addShapedGregtechRecipe( - "plateZirconiumCarbide", circuitTier4, "plateZirconiumCarbide", + "plateZirconiumCarbide", CI.circuitTier4, "plateZirconiumCarbide", cableTier4, machineCasing_EV, cableTier4, - "plateZirconiumCarbide", circuitTier3, "plateZirconiumCarbide", + "plateZirconiumCarbide", CI.circuitTier3, "plateZirconiumCarbide", RECIPE_IndustrialBlastSmelterController); //Blast Smelter Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -825,9 +814,9 @@ public class RECIPES_Machines { //Matter Fabricator CPU RecipeUtils.addShapedGregtechRecipe( - "plateDoubleQuantum", circuitTier5, "plateDoubleQuantum", + "plateDoubleQuantum", CI.circuitTier5, "plateDoubleQuantum", cableTier8, machineCasing_LuV, cableTier8, - "plateDoubleQuantum", circuitTier5, "plateDoubleQuantum", + "plateDoubleQuantum", CI.circuitTier5, "plateDoubleQuantum", RECIPE_IndustrialMatterFabController); //Matter Fabricator Frame Casing RecipeUtils.addShapedGregtechRecipe( @@ -851,9 +840,9 @@ public class RECIPES_Machines { //Industrial Sieve RecipeUtils.addShapedGregtechRecipe( - "plateEglinSteel", circuitTier2, "plateEglinSteel", + "plateEglinSteel", CI.circuitTier2, "plateEglinSteel", cableTier3, machineCasing_MV, cableTier3, - "plateEglinSteel", circuitTier2, "plateEglinSteel", + "plateEglinSteel", CI.circuitTier2, "plateEglinSteel", RECIPE_IndustrialSieveController); //Industrial Sieve Casing RecipeUtils.addShapedGregtechRecipe( diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java index 3d59742805..dcdd865bf9 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java @@ -2,6 +2,7 @@ package gtPlusPlus.core.recipe; import gregtech.api.enums.ItemList; import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -30,17 +31,17 @@ public class RECIPE_Batteries { RecipeUtils.addShapedGregtechRecipe( GT_Battery_Sodium, RECIPES_Machines.cableTier4, GT_Battery_Sodium, - RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, + CI.circuitTier3, machineTransformer_EV, CI.circuitTier3, GT_Battery_Sodium, RECIPES_Machines.cableTier4, GT_Battery_Sodium, RECIPE_Battery_Sodium); RecipeUtils.addShapedGregtechRecipe( GT_Battery_Cadmium, RECIPES_Machines.cableTier4, GT_Battery_Cadmium, - RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, + CI.circuitTier3, machineTransformer_EV, CI.circuitTier3, GT_Battery_Cadmium, RECIPES_Machines.cableTier4, GT_Battery_Cadmium, RECIPE_Battery_Cadmium); RecipeUtils.addShapedGregtechRecipe( GT_Battery_Lithium, RECIPES_Machines.cableTier4, GT_Battery_Lithium, - RECIPES_Machines.circuitTier3, machineTransformer_EV, RECIPES_Machines.circuitTier3, + CI.circuitTier3, machineTransformer_EV, CI.circuitTier3, GT_Battery_Lithium, RECIPES_Machines.cableTier4, GT_Battery_Lithium, RECIPE_Battery_Lithium); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java deleted file mode 100644 index 5d87dd3a20..0000000000 --- a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java +++ /dev/null @@ -1,199 +0,0 @@ -package gtPlusPlus.core.recipe; - -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.item.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import net.minecraft.item.ItemStack; - -public class RECIPE_CONSTANTS { - - //Machine Components - public static ItemStack electricMotor_ULV; - public static ItemStack electricMotor_LuV; - public static ItemStack electricMotor_ZPM; - public static ItemStack electricMotor_UV; - public static ItemStack electricMotor_MAX; - public static ItemStack electricPump_ULV; - public static ItemStack electricPump_LuV; - public static ItemStack electricPump_ZPM; - public static ItemStack electricPump_UV; - public static ItemStack electricPump_MAX; - public static ItemStack electricPiston_ULV; - public static ItemStack electricPiston_LuV; - public static ItemStack electricPiston_ZPM; - public static ItemStack electricPiston_UV ; - public static ItemStack electricPiston_MAX; - public static ItemStack robotArm_ULV; - public static ItemStack robotArm_LuV; - public static ItemStack robotArm_ZPM; - public static ItemStack robotArm_UV; - public static ItemStack robotArm_MAX; - public static ItemStack conveyorModule_ULV; - public static ItemStack conveyorModule_LuV; - public static ItemStack conveyorModule_ZPM; - public static ItemStack conveyorModule_UV; - public static ItemStack conveyorModule_MAX; - public static ItemStack emitter_ULV; - public static ItemStack emitter_LuV; - public static ItemStack emitter_ZPM; - public static ItemStack emitter_UV; - public static ItemStack emitter_MAX; - public static ItemStack fieldGenerator_ULV; - public static ItemStack fieldGenerator_LuV; - public static ItemStack fieldGenerator_ZPM; - public static ItemStack fieldGenerator_UV; - public static ItemStack fieldGenerator_MAX; - public static ItemStack sensor_ULV; - public static ItemStack sensor_LuV; - public static ItemStack sensor_ZPM; - public static ItemStack sensor_UV; - public static ItemStack sensor_MAX; - - public static void initialise(){ - - if (!CORE.GTNH){ - if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - registerGTExperimentalComponents(); - } - else { - registerGTStandardComponents(); - } - } - else { - registerGTNHComponents(); - } - } - - private static void registerGTExperimentalComponents(){ - //Machine Components - electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); - electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1); - electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1); - electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1); - electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1); - electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1); - electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1); - electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1); - electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1); - robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1); - robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1); - robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1); - conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1); - conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1); - conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1); - emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1); - emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1); - emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1); - fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1); - fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1); - fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1); - sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); - sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); - sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); - - registerComponent_ULV(); - registerComponent_MAX(); - } - - private static void registerGTStandardComponents(){ - electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); - electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); - electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1); - electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); - electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1); - electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1); - electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1); - electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); - electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1); - electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1); - electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1); - electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); - robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1); - robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1); - robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1); - robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); - conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1); - conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1); - conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1); - conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); - emitter_LuV = GregtechItemList.Emitter_LuV.get(1); - emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1); - emitter_UV = GregtechItemList.Emitter_UV.get(1); - emitter_MAX = GregtechItemList.Emitter_MAX.get(1); - fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1); - fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1); - fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1); - fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); - sensor_LuV = GregtechItemList.Sensor_LuV.get(1); - sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1); - sensor_UV = GregtechItemList.Sensor_UV.get(1); - sensor_MAX = GregtechItemList.Sensor_MAX.get(1); - - registerComponent_ULV(); - } - - private static void registerGTNHComponents(){ - //Machine Components - electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); - electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1); - electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1); - - electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32615, 1); - electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32616, 1); - electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32617, 1); - - electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1); - electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1); - electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1); - - robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1); - robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1); - robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1); - - conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32635, 1); - conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1); - conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1); - - emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1); - emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1); - emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1); - - fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1); - fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1); - fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1); - - sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); - sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); - sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); - - registerComponent_ULV(); - registerComponent_MAX(); - } - - private static boolean registerComponent_ULV(){ - - electricMotor_ULV = GregtechItemList.Electric_Motor_ULV.get(1); - electricPump_ULV = GregtechItemList.Electric_Pump_ULV.get(1); - electricPiston_ULV = GregtechItemList.Electric_Piston_ULV.get(1); - robotArm_ULV = GregtechItemList.Robot_Arm_ULV.get(1); - conveyorModule_ULV = GregtechItemList.Conveyor_Module_ULV.get(1); - emitter_ULV = GregtechItemList.Emitter_ULV.get(1); - fieldGenerator_ULV = GregtechItemList.Field_Generator_ULV.get(1); - sensor_ULV = GregtechItemList.Sensor_ULV.get(1); - return true; - } - - private static boolean registerComponent_MAX(){ - //Max Tier Components Blood Never added... Useless, lol. - electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); - electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); - electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); - robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); - conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); - emitter_MAX = GregtechItemList.Emitter_MAX.get(1); - fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); - sensor_MAX = GregtechItemList.Sensor_MAX.get(1); - return true; - } - -} diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java new file mode 100644 index 0000000000..f02e55aa87 --- /dev/null +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -0,0 +1,159 @@ +package gtPlusPlus.core.recipe.common; + +import gregtech.api.enums.ItemList; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.recipe.LOADER_Machine_Components; +import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import net.minecraft.item.ItemStack; + +public class CI { + + //null + public static ItemStack _NULL = ItemUtils.getSimpleStack(ModItems.AAA_Broken); + + //Circuits + public static Object circuitPrimitive; + public static Object circuitTier1; + public static Object circuitTier2; + public static Object circuitTier3; + public static Object circuitTier4; + public static Object circuitTier5; + public static Object circuitTier6; + public static Object circuitTier7; + public static Object circuitTier8; + public static Object circuitTier9; + + //Machine Components + public static ItemStack electricMotor_ULV; + public static ItemStack electricMotor_LuV; + public static ItemStack electricMotor_ZPM; + public static ItemStack electricMotor_UV; + public static ItemStack electricMotor_MAX; + public static ItemStack electricPump_ULV; + public static ItemStack electricPump_LuV; + public static ItemStack electricPump_ZPM; + public static ItemStack electricPump_UV; + public static ItemStack electricPump_MAX; + public static ItemStack electricPiston_ULV; + public static ItemStack electricPiston_LuV; + public static ItemStack electricPiston_ZPM; + public static ItemStack electricPiston_UV ; + public static ItemStack electricPiston_MAX; + public static ItemStack robotArm_ULV; + public static ItemStack robotArm_LuV; + public static ItemStack robotArm_ZPM; + public static ItemStack robotArm_UV; + public static ItemStack robotArm_MAX; + public static ItemStack conveyorModule_ULV; + public static ItemStack conveyorModule_LuV; + public static ItemStack conveyorModule_ZPM; + public static ItemStack conveyorModule_UV; + public static ItemStack conveyorModule_MAX; + public static ItemStack emitter_ULV; + public static ItemStack emitter_LuV; + public static ItemStack emitter_ZPM; + public static ItemStack emitter_UV; + public static ItemStack emitter_MAX; + public static ItemStack fieldGenerator_ULV; + public static ItemStack fieldGenerator_LuV; + public static ItemStack fieldGenerator_ZPM; + public static ItemStack fieldGenerator_UV; + public static ItemStack fieldGenerator_MAX; + public static ItemStack sensor_ULV; + public static ItemStack sensor_LuV; + public static ItemStack sensor_ZPM; + public static ItemStack sensor_UV; + public static ItemStack sensor_MAX; + + public static void Init(){ + //Circuits + circuitPrimitive = getTieredCircuit(0); + circuitTier1 = getTieredCircuit(1); + circuitTier2 = getTieredCircuit(2); + circuitTier3 = getTieredCircuit(3); + circuitTier4 = getTieredCircuit(4); + circuitTier5 = getTieredCircuit(5); + circuitTier6 = getTieredCircuit(6); + circuitTier7 = getTieredCircuit(7); + circuitTier8 = getTieredCircuit(8); + circuitTier9 = getTieredCircuit(9); + + //Machine Components + LOADER_Machine_Components.initialise(); + } + + public static Object getTieredCircuit(int tier){ + if (CORE.configSwitches.enableOldGTcircuits){ + if (tier == 0){ + return GregtechItemList.Old_Circuit_Primitive.get(1); + } + else if (tier == 1){ + return GregtechItemList.Old_Circuit_Basic.get(1); + } + else if (tier == 2){ + return GregtechItemList.Old_Circuit_Good.get(1); + } + else if (tier == 3){ + return GregtechItemList.Old_Circuit_Advanced.get(1); + } + else if (tier == 4){ + return GregtechItemList.Old_Circuit_Elite.get(1); + } + else if (tier == 5){ + return GregtechItemList.Old_Circuit_Master.get(1); + } + else if (tier == 6){ + return GregtechItemList.Old_Circuit_Ultimate.get(1); + } + else if (tier == 7){ + return GregtechItemList.Circuit_IV.get(1); + } + else if (tier == 8){ + return GregtechItemList.Circuit_LuV.get(1); + } + else if (tier == 9){ + return GregtechItemList.Circuit_ZPM.get(1); + } + } + else { + if (tier == 0){ + return ItemList.Circuit_Primitive.get(1); + } + else if (tier == 1){ + return ItemList.Circuit_Basic.get(1); + } + else if (tier == 2){ + return ItemList.Circuit_Good.get(1); + } + else if (tier == 3){ + return ItemList.Circuit_Advanced.get(1); + } + else if (tier == 4){ + return ItemList.Circuit_Elite.get(1); + } + else if (tier == 5){ + return ItemList.Circuit_Master.get(1); + } + else if (tier == 6){ + return ItemList.Circuit_Ultimate.get(1); + } + else if (tier == 7){ + return "circuitSuperconductor"; + } + else if (tier == 8){ + return "circuitInfinite"; + } + else if (tier == 9){ + return "circuitQuantum"; + } + } + return _NULL; + } + + public static ItemStack getNumberedCircuit(int Meta){ + return ItemUtils.getGregtechCircuit(Meta); + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 5c1c7bd174..63621c627e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -7,7 +7,7 @@ import gregtech.api.util.Recipe_GT; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.RECIPE_CONSTANTS; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; @@ -164,7 +164,7 @@ public class GregtechDehydrator GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LuV, - Character.valueOf('P'), RECIPE_CONSTANTS.robotArm_LuV, + Character.valueOf('P'), CI.robotArm_LuV, Character.valueOf('E'), coilT3, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Naquadah), @@ -175,7 +175,7 @@ public class GregtechDehydrator GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_ZPM, - Character.valueOf('P'), RECIPE_CONSTANTS.robotArm_ZPM, + Character.valueOf('P'), CI.robotArm_ZPM, Character.valueOf('E'), coilT4, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Osmium), diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index a5b36a0589..b7b89d4aba 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -5,7 +5,7 @@ import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.RECIPE_CONSTANTS; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator; @@ -50,8 +50,8 @@ public class GregtechGeothermalThermalGenerator { Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum), Character.valueOf('G'), ALLOY.STELLITE.getGear(1)}); - final ItemStack INGREDIENT_1 = RECIPE_CONSTANTS.electricPiston_LuV; - final ItemStack INGREDIENT_2 = RECIPE_CONSTANTS.electricMotor_LuV; + final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; + final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CEC", "GMG", "PWP", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 788618a660..3c80717c32 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java @@ -5,7 +5,7 @@ import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.RECIPE_CONSTANTS; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; @@ -50,8 +50,8 @@ public class GregtechRocketFuelGenerator { Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'), ALLOY.STELLITE.getGear(1)}); - final ItemStack INGREDIENT_1 = RECIPE_CONSTANTS.electricPiston_LuV; - final ItemStack INGREDIENT_2 = RECIPE_CONSTANTS.electricMotor_LuV; + final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; + final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", |