+ Added a EV Battery

% Changed Item Registration for Rotors & Components

2 files changed, 36 insertions, 28 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 6626308cb4..334119252b 100644
--- a/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java
@@ -8,38 +8,40 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 public class IC2_Items {
-	
-	  public static ItemStack rotor_Material_1; //Energetic Alloy
-	  public static ItemStack rotor_Material_2; //TungstenSteel
-	  public static ItemStack rotor_Material_3; //Vibrant Alloy
-	  public static ItemStack rotor_Material_4; //Iridium
-	  
-	  public static ItemStack rotor_Blade_Material_1;
-	  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 ItemStack rotor_Material_1; //Energetic Alloy
+	public static ItemStack rotor_Material_2; //TungstenSteel
+	public static ItemStack rotor_Material_3; //Vibrant Alloy
+	public static ItemStack rotor_Material_4; //Iridium
+
+	public static ItemStack rotor_Blade_Material_1;
+	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(){
-		
+
+		//Tier 1
 		rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemEnergeticRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		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"));
+		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"));
+		//Tier 2
+		rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", 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"));
+		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"));
+		//Tier 3
+		rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemVibrantRotorBlade", 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"));
+		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"));
+		//Tier 4
+		rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", 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"));
-		rotor_Material_4 = new ItemStack(new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor"));
-		   }
-	
+		rotor_Material_4 = new ItemStack (new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor"));
+	}
+
 }
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 21389547fa..a871f5c513 100644
--- a/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java
@@ -7,6 +7,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
 import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
@@ -18,7 +19,7 @@ public class RECIPE_IC2 {
 	public static String plate_T1 = "plateEnergeticAlloy";
 	public static String plate_T2 = "plateTungstenSteel";
 	public static String plate_T3 = "plateVibrantAlloy";
-	public static String plate_T4 = "plateIridium";
+	public static String plate_T4 = "plateAlloyIridium";
 	
 	public static ItemStack block_T1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.EnergeticAlloy, 1L);
 	public static ItemStack block_T2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L);
@@ -74,12 +75,17 @@ public class RECIPE_IC2 {
 		
 		//Shaft Extruder Recipe
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.DarkIron), Character.valueOf('S'), OrePrefixes.screw.get(Materials.DarkIron)});
+		Utils.LOG_INFO("Added recipe item for GT5 Extruder: Shaft Shape");
 		
 		//Shaft Recipes
 		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T1, 2560, 250);
+		Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]");
 		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T2, 5120, 500);
+		Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [TungstenSteel]");
 		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T3, 10240, 2000);
+		Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]");
 		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T4, 20480, 4000);
+		Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Iridium]");
 		
 		//Rotor Recipes
 		UtilsRecipe.recipeBuilder(