% Migrated machine components to CI.

4 files changed, 101 insertions, 96 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
index 72ca4375d6..e4b8a302a8 100644
--- a/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.recipe;
 
+import gregtech.api.enums.ItemList;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.item.ItemUtils;
@@ -9,6 +10,8 @@ public class LOADER_Machine_Components {
 
 	public static void initialise(){
 
+		registerDefaultComponents();
+		
 		if (!CORE.GTNH){					
 			if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 				registerGTExperimentalComponents();
@@ -21,9 +24,53 @@ public class LOADER_Machine_Components {
 			registerGTNHComponents();
 		}
 	}
+	
+	private static void registerDefaultComponents(){
+		//Machine Components
+				CI.electricMotor_LV = ItemList.Electric_Motor_LV.get(1);
+				CI.electricMotor_MV = ItemList.Electric_Motor_MV.get(1);
+				CI.electricMotor_HV = ItemList.Electric_Motor_HV.get(1);
+				CI.electricMotor_EV = ItemList.Electric_Motor_EV.get(1);
+				CI.electricMotor_IV = ItemList.Electric_Motor_IV.get(1);
+				CI.electricPump_LV = ItemList.Electric_Pump_LV.get(1);
+				CI.electricPump_MV = ItemList.Electric_Pump_MV.get(1);
+				CI.electricPump_HV = ItemList.Electric_Pump_HV.get(1);
+				CI.electricPump_EV = ItemList.Electric_Pump_EV.get(1);
+				CI.electricPump_IV = ItemList.Electric_Pump_IV.get(1);
+				CI.electricPiston_LV = ItemList.Electric_Piston_LV.get(1);
+				CI.electricPiston_MV = ItemList.Electric_Piston_MV.get(1);
+				CI.electricPiston_HV = ItemList.Electric_Piston_HV.get(1);
+				CI.electricPiston_EV = ItemList.Electric_Piston_EV.get(1);
+				CI.electricPiston_IV = ItemList.Electric_Piston_IV.get(1);
+				CI.robotArm_LV = ItemList.Robot_Arm_LV.get(1);
+				CI.robotArm_MV = ItemList.Robot_Arm_MV.get(1);
+				CI.robotArm_HV = ItemList.Robot_Arm_HV.get(1);
+				CI.robotArm_EV = ItemList.Robot_Arm_EV.get(1);
+				CI.robotArm_IV = ItemList.Robot_Arm_IV.get(1);
+				CI.conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1);
+				CI.conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1);
+				CI.conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1);
+				CI.conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1);
+				CI.conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1);
+				CI.emitter_LV = ItemList.Emitter_LV.get(1);
+				CI.emitter_MV = ItemList.Emitter_MV.get(1);
+				CI.emitter_HV = ItemList.Emitter_HV.get(1);
+				CI.emitter_EV = ItemList.Emitter_EV.get(1);
+				CI.emitter_IV = ItemList.Emitter_IV.get(1);
+				CI.fieldGenerator_LV = ItemList.Field_Generator_LV.get(1);
+				CI.fieldGenerator_MV = ItemList.Field_Generator_MV.get(1);
+				CI.fieldGenerator_HV = ItemList.Field_Generator_HV.get(1);
+				CI.fieldGenerator_EV = ItemList.Field_Generator_EV.get(1);
+				CI.fieldGenerator_IV = ItemList.Field_Generator_IV.get(1);
+				CI.sensor_LV = ItemList.Sensor_LV.get(1);
+				CI.sensor_MV = ItemList.Sensor_MV.get(1);
+				CI.sensor_HV = ItemList.Sensor_HV.get(1);
+				CI.sensor_EV = ItemList.Sensor_EV.get(1);
+				CI.sensor_IV = ItemList.Sensor_IV.get(1);
+	}
 
 	private static void registerGTExperimentalComponents(){
-		//Machine Components
+		//GT++ 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);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index b9fa7dedca..8e442ec270 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -204,48 +204,6 @@ public class RECIPES_Machines {
 	public static ItemStack IC2MFE;
 	public static ItemStack IC2MFSU;
 
-	//Machine Components
-	public static ItemStack electricMotor_LV;
-	public static ItemStack electricMotor_MV;
-	public static ItemStack electricMotor_HV;
-	public static ItemStack electricMotor_EV;
-	public static ItemStack electricMotor_IV;
-	public static ItemStack electricPump_LV;
-	public static ItemStack electricPump_MV;
-	public static ItemStack electricPump_HV;
-	public static ItemStack electricPump_EV;
-	public static ItemStack electricPump_IV;
-	public static ItemStack electricPiston_LV;
-	public static ItemStack electricPiston_MV;
-	public static ItemStack electricPiston_HV;
-	public static ItemStack electricPiston_EV;
-	public static ItemStack electricPiston_IV;
-	public static ItemStack robotArm_LV;
-	public static ItemStack robotArm_MV;
-	public static ItemStack robotArm_HV;
-	public static ItemStack robotArm_EV;
-	public static ItemStack robotArm_IV;
-	public static ItemStack conveyorModule_LV;
-	public static ItemStack conveyorModule_MV;
-	public static ItemStack conveyorModule_HV;
-	public static ItemStack conveyorModule_EV;
-	public static ItemStack conveyorModule_IV;
-	public static ItemStack emitter_LV;
-	public static ItemStack emitter_MV;
-	public static ItemStack emitter_HV;
-	public static ItemStack emitter_EV;
-	public static ItemStack emitter_IV;
-	public static ItemStack fieldGenerator_LV;
-	public static ItemStack fieldGenerator_MV;
-	public static ItemStack fieldGenerator_HV;
-	public static ItemStack fieldGenerator_EV;
-	public static ItemStack fieldGenerator_IV;
-	public static ItemStack sensor_LV;
-	public static ItemStack sensor_MV;
-	public static ItemStack sensor_HV;
-	public static ItemStack sensor_EV;
-	public static ItemStack sensor_IV;
-
 	//Misc
 	public static ItemStack INPUT_RCCokeOvenBlock;
 	public static ItemStack INPUT_IECokeOvenBlock;
@@ -290,49 +248,6 @@ public class RECIPES_Machines {
 			//Lava Boiler
 			boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
 
-			//Machine Components
-			electricMotor_LV = ItemList.Electric_Motor_LV.get(1);
-			electricMotor_MV = ItemList.Electric_Motor_MV.get(1);
-			electricMotor_HV = ItemList.Electric_Motor_HV.get(1);
-			electricMotor_EV = ItemList.Electric_Motor_EV.get(1);
-			electricMotor_IV = ItemList.Electric_Motor_IV.get(1);
-			electricPump_LV = ItemList.Electric_Pump_LV.get(1);
-			electricPump_MV = ItemList.Electric_Pump_MV.get(1);
-			electricPump_HV = ItemList.Electric_Pump_HV.get(1);
-			electricPump_EV = ItemList.Electric_Pump_EV.get(1);
-			electricPump_IV = ItemList.Electric_Pump_IV.get(1);
-			electricPiston_LV = ItemList.Electric_Piston_LV.get(1);
-			electricPiston_MV = ItemList.Electric_Piston_MV.get(1);
-			electricPiston_HV = ItemList.Electric_Piston_HV.get(1);
-			electricPiston_EV = ItemList.Electric_Piston_EV.get(1);
-			electricPiston_IV = ItemList.Electric_Piston_IV.get(1);
-			robotArm_LV = ItemList.Robot_Arm_LV.get(1);
-			robotArm_MV = ItemList.Robot_Arm_MV.get(1);
-			robotArm_HV = ItemList.Robot_Arm_HV.get(1);
-			robotArm_EV = ItemList.Robot_Arm_EV.get(1);
-			robotArm_IV = ItemList.Robot_Arm_IV.get(1);
-			conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1);
-			conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1);
-			conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1);
-			conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1);
-			conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1);
-			emitter_LV = ItemList.Emitter_LV.get(1);
-			emitter_MV = ItemList.Emitter_MV.get(1);
-			emitter_HV = ItemList.Emitter_HV.get(1);
-			emitter_EV = ItemList.Emitter_EV.get(1);
-			emitter_IV = ItemList.Emitter_IV.get(1);
-			fieldGenerator_LV = ItemList.Field_Generator_LV.get(1);
-			fieldGenerator_MV = ItemList.Field_Generator_MV.get(1);
-			fieldGenerator_HV = ItemList.Field_Generator_HV.get(1);
-			fieldGenerator_EV = ItemList.Field_Generator_EV.get(1);
-			fieldGenerator_IV = ItemList.Field_Generator_IV.get(1);
-			sensor_LV = ItemList.Sensor_LV.get(1);
-			sensor_MV = ItemList.Sensor_MV.get(1);
-			sensor_HV = ItemList.Sensor_HV.get(1);
-			sensor_EV = ItemList.Sensor_EV.get(1);
-			sensor_IV = ItemList.Sensor_IV.get(1);
-
-
 			//IV MACHINES
 			IV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1);
 			IV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1);
@@ -485,7 +400,7 @@ public class RECIPES_Machines {
 				RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1);
 				RecipeUtils.addShapedGregtechRecipe(
 				pipeLargeCopper, pipeHugeSteel, pipeLargeCopper,
-				plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy,
+				plateEnergeticAlloy, CI.electricPump_HV, plateEnergeticAlloy,
 				plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy,
 				RECIPE_SteamCondenser);
 			}
@@ -671,27 +586,27 @@ public class RECIPES_Machines {
 					RecipeUtils.addShapedGregtechRecipe(
 					plateTier2, plateTier2, plateTier2,
 					plateTier2, pipeTier2, plateTier2,
-					plateTier2, electricPump_LV, plateTier2,
+					plateTier2, CI.electricPump_LV, plateTier2,
 					GregtechItemList.GT_FluidTank_LV.get(1));
 					RecipeUtils.addShapedGregtechRecipe(
 					plateTier3, plateTier3, plateTier3,
 					plateTier3, pipeTier3, plateTier3,
-					plateTier3, electricPump_MV, plateTier3,
+					plateTier3, CI.electricPump_MV, plateTier3,
 					GregtechItemList.GT_FluidTank_MV.get(1));
 					RecipeUtils.addShapedGregtechRecipe(
 					plateTier4, plateTier4, plateTier4,
 					plateTier4, pipeTier4, plateTier4,
-					plateTier4, electricPump_HV, plateTier4,
+					plateTier4, CI.electricPump_HV, plateTier4,
 					GregtechItemList.GT_FluidTank_HV.get(1));
 					RecipeUtils.addShapedGregtechRecipe(
 					plateTier5, plateTier5, plateTier5,
 					plateTier5, pipeTier5, plateTier5,
-					plateTier5, electricPump_EV, plateTier5,
+					plateTier5, CI.electricPump_EV, plateTier5,
 					GregtechItemList.GT_FluidTank_EV.get(1));
 					RecipeUtils.addShapedGregtechRecipe(
 					plateTier6, plateTier6, plateTier6,
 					plateTier6, pipeTier6, plateTier6,
-					plateTier6, electricPump_IV, plateTier6,
+					plateTier6, CI.electricPump_IV, plateTier6,
 					GregtechItemList.GT_FluidTank_IV.get(1));
 					RecipeUtils.addShapedGregtechRecipe(
 					plateTier7, plateTier7, plateTier7,
@@ -746,17 +661,17 @@ public class RECIPES_Machines {
 					RecipeUtils.addShapedGregtechRecipe(
 					plateTier2, plateTier5, plateTier2,
 					plateTier2, pipeTier2, plateTier2,
-					plateTier2, electricPump_LV, plateTier2,
+					plateTier2, CI.electricPump_LV, plateTier2,
 					GregtechItemList.GT_FluidTank_LV.get(1));
 					RecipeUtils.addShapedGregtechRecipe(
 					plateTier6, plateTier7, plateTier6,
 					plateTier3, pipeTier3, plateTier3,
-					plateTier6, electricPump_LV, plateTier6,
+					plateTier6, CI.electricPump_LV, plateTier6,
 					GregtechItemList.GT_FluidTank_MV.get(1));
 					RecipeUtils.addShapedGregtechRecipe(
 					CI.circuitTier1, plateTier8, CI.circuitTier1,
 					plateTier4, pipeTier4, plateTier4,
-					CI.circuitTier1, electricPump_LV, CI.circuitTier1,
+					CI.circuitTier1, CI.electricPump_LV, CI.circuitTier1,
 					GregtechItemList.GT_FluidTank_HV.get(1));
 				}
 			}
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index f02e55aa87..29b23542a1 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -27,41 +27,81 @@ public class CI {
 
 	//Machine Components
 	public static ItemStack electricMotor_ULV;
+	public static ItemStack electricMotor_LV;
+	public static ItemStack electricMotor_MV;
+	public static ItemStack electricMotor_HV;
+	public static ItemStack electricMotor_EV;
+	public static ItemStack electricMotor_IV;
 	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_LV;
+	public static ItemStack electricPump_MV;
+	public static ItemStack electricPump_HV;
+	public static ItemStack electricPump_EV;
+	public static ItemStack electricPump_IV;
 	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_LV;
+	public static ItemStack electricPiston_MV;
+	public static ItemStack electricPiston_HV;
+	public static ItemStack electricPiston_EV;
+	public static ItemStack electricPiston_IV;
 	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_LV;
+	public static ItemStack robotArm_MV;
+	public static ItemStack robotArm_HV;
+	public static ItemStack robotArm_EV;
+	public static ItemStack robotArm_IV;
 	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_LV;
+	public static ItemStack conveyorModule_MV;
+	public static ItemStack conveyorModule_HV;
+	public static ItemStack conveyorModule_EV;
+	public static ItemStack conveyorModule_IV;
 	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_LV;
+	public static ItemStack emitter_MV;
+	public static ItemStack emitter_HV;
+	public static ItemStack emitter_EV;
+	public static ItemStack emitter_IV;
 	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_LV;
+	public static ItemStack fieldGenerator_MV;
+	public static ItemStack fieldGenerator_HV;
+	public static ItemStack fieldGenerator_EV;
+	public static ItemStack fieldGenerator_IV;
 	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_LV;
+	public static ItemStack sensor_MV;
+	public static ItemStack sensor_HV;
+	public static ItemStack sensor_EV;
+	public static ItemStack sensor_IV;
 	public static ItemStack sensor_LuV;
 	public static ItemStack sensor_ZPM;
 	public static ItemStack sensor_UV;
@@ -156,4 +196,6 @@ public class CI {
 		return ItemUtils.getGregtechCircuit(Meta);
 	}
 
+	
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
index 6494953fae..5a8d44766e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
@@ -5,6 +5,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.Recipe_GT;
 import gtPlusPlus.core.recipe.RECIPES_Machines;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.recipe.RecipeUtils;
@@ -46,7 +47,7 @@ public class GregtechSimpleWasher {
 		
 		//Add Recipe
 		RecipeUtils.addShapedGregtechRecipe(
-				plateWrought, RECIPES_Machines.electricPump_LV, plateWrought,
+				plateWrought, CI.electricPump_LV, plateWrought,
 				plateWrought, ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1), plateWrought,
 				plateWrought, RECIPES_Machines.machineCasing_ULV, plateWrought,
 				GregtechItemList.SimpleDustWasher.get(1));