% Moved more components to CI.

1 files changed, 166 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 29b23542a1..e7aa8f831e 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -1,8 +1,12 @@
 package gtPlusPlus.core.recipe.common;
 
 import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.recipe.LOADER_Machine_Components;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -107,7 +111,86 @@ public class CI {
 	public static ItemStack sensor_UV;
 	public static ItemStack sensor_MAX;
 
+	//Machine Casings
+	public static ItemStack machineCasing_ULV;
+	public static ItemStack machineCasing_LV;
+	public static ItemStack machineCasing_MV;
+	public static ItemStack machineCasing_HV;
+	public static ItemStack machineCasing_EV;
+	public static ItemStack machineCasing_IV;
+	public static ItemStack machineCasing_LuV;
+	public static ItemStack machineCasing_ZPM;
+	public static ItemStack machineCasing_UV;
+	public static ItemStack machineCasing_MAX;
+
+	//Machine Hulls
+	public static ItemStack machineHull_ULV;
+	public static ItemStack machineHull_LV;
+	public static ItemStack machineHull_MV;
+	public static ItemStack machineHull_HV;
+	public static ItemStack machineHull_EV;
+	public static ItemStack machineHull_IV;
+	public static ItemStack machineHull_LuV;
+	public static ItemStack machineHull_ZPM;
+	public static ItemStack machineHull_UV;
+	public static ItemStack machineHull_MAX;
+
+	//Gearbox Casings
+	public static ItemStack gearboxCasing_Tier_1;
+	public static ItemStack gearboxCasing_Tier_2;
+	public static ItemStack gearboxCasing_Tier_3;
+	public static ItemStack gearboxCasing_Tier_4;
+
+	public static ItemStack[] component_Plate;
+	public static ItemStack[] component_Rod;
+	public static ItemStack[] component_Ingot;
+
 	public static void Init(){
+
+		//Tiered Components
+		component_Plate = new ItemStack[]{
+				getTieredComponent(OrePrefixes.plate, 0),
+				getTieredComponent(OrePrefixes.plate, 1),
+				getTieredComponent(OrePrefixes.plate, 2),
+				getTieredComponent(OrePrefixes.plate, 3),
+				getTieredComponent(OrePrefixes.plate, 4),
+				getTieredComponent(OrePrefixes.plate, 5),
+				getTieredComponent(OrePrefixes.plate, 6),
+				getTieredComponent(OrePrefixes.plate, 7),
+				getTieredComponent(OrePrefixes.plate, 8),
+				getTieredComponent(OrePrefixes.plate, 9),
+				getTieredComponent(OrePrefixes.plate, 10),
+				getTieredComponent(OrePrefixes.plate, 11)	
+		};
+		component_Rod = new ItemStack[]{
+				getTieredComponent(OrePrefixes.stick, 0),
+				getTieredComponent(OrePrefixes.stick, 1),
+				getTieredComponent(OrePrefixes.stick, 2),
+				getTieredComponent(OrePrefixes.stick, 3),
+				getTieredComponent(OrePrefixes.stick, 4),
+				getTieredComponent(OrePrefixes.stick, 5),
+				getTieredComponent(OrePrefixes.stick, 6),
+				getTieredComponent(OrePrefixes.stick, 7),
+				getTieredComponent(OrePrefixes.stick, 8),
+				getTieredComponent(OrePrefixes.stick, 9),
+				getTieredComponent(OrePrefixes.stick, 10),
+				getTieredComponent(OrePrefixes.stick, 11)					
+		};
+		component_Ingot = new ItemStack[]{
+				getTieredComponent(OrePrefixes.ingot, 0),
+				getTieredComponent(OrePrefixes.ingot, 1),
+				getTieredComponent(OrePrefixes.ingot, 2),
+				getTieredComponent(OrePrefixes.ingot, 3),
+				getTieredComponent(OrePrefixes.ingot, 4),
+				getTieredComponent(OrePrefixes.ingot, 5),
+				getTieredComponent(OrePrefixes.ingot, 6),
+				getTieredComponent(OrePrefixes.ingot, 7),
+				getTieredComponent(OrePrefixes.ingot, 8),
+				getTieredComponent(OrePrefixes.ingot, 9),
+				getTieredComponent(OrePrefixes.ingot, 10),
+				getTieredComponent(OrePrefixes.ingot, 11)					
+		};
+
 		//Circuits
 		circuitPrimitive = getTieredCircuit(0);
 		circuitTier1 = getTieredCircuit(1);
@@ -122,6 +205,36 @@ public class CI {
 
 		//Machine Components
 		LOADER_Machine_Components.initialise();
+
+		//Machine Casings
+		machineCasing_ULV = ItemList.Casing_ULV.get(1);
+		machineCasing_LV = ItemList.Casing_LV.get(1);
+		machineCasing_MV = ItemList.Casing_MV.get(1);
+		machineCasing_HV = ItemList.Casing_HV.get(1);
+		machineCasing_EV = ItemList.Casing_EV.get(1);
+		machineCasing_IV = ItemList.Casing_IV.get(1);
+		machineCasing_LuV = ItemList.Casing_LuV.get(1);
+		machineCasing_ZPM = ItemList.Casing_ZPM.get(1);
+		machineCasing_UV = ItemList.Casing_UV.get(1);
+		machineCasing_MAX = ItemList.Casing_MAX.get(1);
+
+		//Machine Hulls
+		machineHull_ULV = ItemList.Hull_ULV.get(1);
+		machineHull_LV = ItemList.Hull_LV.get(1);
+		machineHull_MV = ItemList.Hull_MV.get(1);
+		machineHull_HV = ItemList.Hull_HV.get(1);
+		machineHull_EV = ItemList.Hull_EV.get(1);
+		machineHull_IV = ItemList.Hull_IV.get(1);
+		machineHull_LuV = ItemList.Hull_LuV.get(1);
+		machineHull_ZPM = ItemList.Hull_ZPM.get(1);
+		machineHull_UV = ItemList.Hull_UV.get(1);
+		machineHull_MAX = ItemList.Hull_MAX.get(1);
+
+		//Gear box Casings
+		gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
+		gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1);
+		gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1);
+		gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1);
 	}	
 
 	public static Object getTieredCircuit(int tier){
@@ -196,6 +309,58 @@ public class CI {
 		return ItemUtils.getGregtechCircuit(Meta);
 	}
 
-	
+	private static Object getMaterialFromTier(int tier){
+		if (tier == 0){
+			return Materials.Wood;
+		}
+		else if (tier == 1){
+			return Materials.Lead;
+		}
+		else if (tier == 2){
+			return Materials.Bronze;
+		}
+		else if (tier == 3){
+			return Materials.Steel;
+		}
+		else if (tier == 4){
+			return ALLOY.EGLIN_STEEL;
+		}
+		else if (tier == 5){
+			return Materials.Aluminium;
+		}
+		else if (tier == 6){
+			return ALLOY.MARAGING250;
+		}
+		else if (tier == 7){
+			return ALLOY.TANTALLOY_61;
+		}
+		else if (tier == 8){
+			return ALLOY.INCONEL_792;
+		}
+		else if (tier == 9){
+			return ALLOY.ZERON_100;
+		}
+		else if (tier == 10){
+			return Materials.NaquadahEnriched;
+		}
+		else if (tier == 11){
+			return Materials.Neutronium;
+		}
+		return Materials._NULL;
+	}
+
+	public static ItemStack getTieredComponent(OrePrefixes type, int tier){
+		Object material = getMaterialFromTier(tier);
+		if (material instanceof Materials){
+			type.get(material);
+		}
+		else {
+			if (material instanceof Material){
+				String materialName = ((Material) material).getLocalizedName();
+				ItemUtils.getItemStackOfAmountFromOreDict(type.mRegularLocalName+materialName, 1);
+			}
+		}
+		return null;
+	}
 
 }