+ Added Shaft components for all 4 Rotors.

6 files changed, 21 insertions, 4 deletions

diff --git a/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java b/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java
index 75f5c5bdf5..6626308cb4 100644
--- a/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java
@@ -18,6 +18,11 @@ public class IC2_Items {
 	  public static ItemStack rotor_Blade_Material_2;
 	  public static ItemStack rotor_Blade_Material_3;
 	  public static ItemStack rotor_Blade_Material_4;
+	  
+	  public static ItemStack shaft_Material_1; //Energetic Alloy
+	  public static ItemStack shaft_Material_2; //TungstenSteel
+	  public static ItemStack shaft_Material_3; //Vibrant Alloy
+	  public static ItemStack shaft_Material_4; //Iridium
 
 	public static void register(){
 		
@@ -26,6 +31,11 @@ public class IC2_Items {
 		rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemVibrantRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
 		rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
 		
+		shaft_Material_1 = new ItemStack (new CoreItem("itemEnergeticShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		shaft_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		shaft_Material_3 = new ItemStack (new CoreItem("itemVibrantShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		shaft_Material_4 = new ItemStack (new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		
 		rotor_Material_1 = new ItemStack(new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12, 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemEnergeticRotor"));
 		rotor_Material_2 = new ItemStack(new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14, 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
 		rotor_Material_3 = new ItemStack(new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16, 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemVibrantRotor"));
diff --git a/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java b/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java
index e0cc41ef17..68ca5d382d 100644
--- a/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java
@@ -1,7 +1,9 @@
 package miscutil.core.xmod.ic2.recipe;
 
+import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
 import miscutil.core.xmod.ic2.item.IC2_Items;
+import net.minecraft.item.ItemStack;
 
 public class RECIPE_IC2 {
 	
@@ -14,31 +16,36 @@ public class RECIPE_IC2 {
 	public static String ingot_T2 = "ore:ingotTungstenSteel";
 	public static String ingot_T3 = "ore:ingotVibrantAlloy";
 	public static String ingot_T4 = "ore:ingotIridium";
+	
+	private static ItemStack rotor_T1 = UtilsItems.getSimpleStack(IC2_Items.rotor_Blade_Material_1.getItem());
+	private static ItemStack rotor_T2 = UtilsItems.getSimpleStack(IC2_Items.rotor_Blade_Material_2.getItem());
+	private static ItemStack rotor_T3 = UtilsItems.getSimpleStack(IC2_Items.rotor_Blade_Material_3.getItem());
+	private static ItemStack rotor_T4 = UtilsItems.getSimpleStack(IC2_Items.rotor_Blade_Material_4.getItem());
 
 	public static void initRecipes(){
 		UtilsRecipe.recipeBuilder(
 				plate_T1, ingot_T1, plate_T1,
 				plate_T1, ingot_T1, plate_T1,
 				plate_T1, ingot_T1, plate_T1,
-				IC2_Items.rotor_Blade_Material_1);
+				rotor_T1);
 		
 		UtilsRecipe.recipeBuilder(
 				plate_T2, ingot_T2, plate_T2,
 				plate_T2, ingot_T2, plate_T2,
 				plate_T2, ingot_T2, plate_T2,
-				IC2_Items.rotor_Blade_Material_2);
+				rotor_T2);
 		
 		UtilsRecipe.recipeBuilder(
 				plate_T3, ingot_T3, plate_T3,
 				plate_T3, ingot_T3, plate_T3,
 				plate_T3, ingot_T3, plate_T3,
-				IC2_Items.rotor_Blade_Material_3);
+				rotor_T3);
 		
 		UtilsRecipe.recipeBuilder(
 				plate_T4, ingot_T4, plate_T4,
 				plate_T4, ingot_T4, plate_T4,
 				plate_T4, ingot_T4, plate_T4,
-				IC2_Items.rotor_Blade_Material_4);
+				rotor_T4);
 	}
 	
 }
diff --git a/src/resources/assets/miscutils/textures/items/itemEnergeticShaft.png b/src/resources/assets/miscutils/textures/items/itemEnergeticShaft.png
new file mode 100644
index 0000000000..14cda0df64
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemEnergeticShaft.png
diff --git a/src/resources/assets/miscutils/textures/items/itemIridiumShaft.png b/src/resources/assets/miscutils/textures/items/itemIridiumShaft.png
new file mode 100644
index 0000000000..22943db314
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemIridiumShaft.png
diff --git a/src/resources/assets/miscutils/textures/items/itemTungstenSteelShaft.png b/src/resources/assets/miscutils/textures/items/itemTungstenSteelShaft.png
new file mode 100644
index 0000000000..faf755dc1c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemTungstenSteelShaft.png
diff --git a/src/resources/assets/miscutils/textures/items/itemVibrantShaft.png b/src/resources/assets/miscutils/textures/items/itemVibrantShaft.png
new file mode 100644
index 0000000000..ec996f66df
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemVibrantShaft.png