$ Cleaned up the entire project.

> Much neat, very nices.

7 files changed, 329 insertions, 347 deletions

diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
index b481e20ace..96c61d65b5 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
@@ -9,31 +9,25 @@ import gtPlusPlus.core.item.base.CoreItem;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.*;
 
-public class IC2_ItemGradual
-extends CoreItem
-{
-	public IC2_ItemGradual(String internalName)
-	{
+public class IC2_ItemGradual extends CoreItem {
+	public IC2_ItemGradual(final String internalName) {
 		super(internalName, AddToCreativeTab.tabMachines, 1, 10000, "", EnumRarity.uncommon);
-		setNoRepair();
+		this.setNoRepair();
 	}
 
 	@Override
-	public boolean isDamaged(ItemStack stack)
-	{
-		return getDamage(stack) > 1;
+	@SideOnly(Side.CLIENT)
+	public void getSubItems(final Item item, final CreativeTabs tabs, final List itemList) {
+		itemList.add(new ItemStack(this, 1, 1));
 	}
 
 	@Override
-	public boolean showDurabilityBar(ItemStack stack)
-	{
-		return true;
+	public boolean isDamaged(final ItemStack stack) {
+		return this.getDamage(stack) > 1;
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubItems(Item item, CreativeTabs tabs, List itemList)
-	{
-		itemList.add(new ItemStack(this, 1, 1));
+	public boolean showDurabilityBar(final ItemStack stack) {
+		return true;
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
index 4922e0f806..54e8ae855e 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
@@ -6,48 +6,41 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-public class IC2_ItemGradualInteger
-  extends IC2_ItemGradual
-  implements ICustomDamageItem
-{
-  private final int maxDmg;
-  
-  public IC2_ItemGradualInteger(String internalName, int maxdmg)
-  {
-    super(internalName);
-    
-    this.maxDmg = maxdmg;
-  }
-  
-  @Override
-public int getCustomDamage(ItemStack stack)
-  {
-    NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
-    return nbt.getInteger("advDmg");
-  }
-  
-  @Override
-public int getMaxCustomDamage(ItemStack stack)
-  {
-    return this.maxDmg;
-  }
-  
-  @Override
-public void setCustomDamage(ItemStack stack, int damage)
-  {
-    NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
-    nbt.setInteger("advDmg", 0);
-    
-    int maxStackDamage = stack.getMaxDamage();
-    if (maxStackDamage > 2) {
-      //stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2));
-    }
-  }
-  
-  @Override
-public boolean applyCustomDamage(ItemStack stack, int damage, EntityLivingBase src)
-  {
-    setCustomDamage(stack, getCustomDamage(stack) + damage);
-    return true;
-  }
+public class IC2_ItemGradualInteger extends IC2_ItemGradual implements ICustomDamageItem {
+	private final int maxDmg;
+
+	public IC2_ItemGradualInteger(final String internalName, final int maxdmg) {
+		super(internalName);
+
+		this.maxDmg = maxdmg;
+	}
+
+	@Override
+	public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) {
+		this.setCustomDamage(stack, this.getCustomDamage(stack) + damage);
+		return true;
+	}
+
+	@Override
+	public int getCustomDamage(final ItemStack stack) {
+		final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
+		return nbt.getInteger("advDmg");
+	}
+
+	@Override
+	public int getMaxCustomDamage(final ItemStack stack) {
+		return this.maxDmg;
+	}
+
+	@Override
+	public void setCustomDamage(final ItemStack stack, final int damage) {
+		final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
+		nbt.setInteger("advDmg", 0);
+
+		final int maxStackDamage = stack.getMaxDamage();
+		if (maxStackDamage > 2) {
+			// stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg,
+			// maxStackDamage - 2));
+		}
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
index e18455d69b..d7cb77ee40 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
@@ -9,94 +9,68 @@ import net.minecraft.item.*;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
 
-public class IC2_ItemIC2
-extends Item
-{
-	public IC2_ItemIC2(String internalName)
-	{
-		setUnlocalizedName(internalName);
-		setCreativeTab(AddToCreativeTab.tabMachines);
-		setTextureName(CORE.MODID + ":" + internalName);
+public class IC2_ItemIC2 extends Item {
+	private int			rarity	= 0;
 
-		GameRegistry.registerItem(this, internalName);
-	}
-
-	public String getTextureFolder()
-	{
-		return null;
-	}
-
-	/*  public String getTextureName(int index)
-  {
-    if ((!this.hasSubtypes) && (index > 0)) {
-      return null;
-    }
-    String name = getUnlocalizedName(new ItemStack(this, 1, index));
-    if ((name != null) && (name.length() > 4)) {
-      return name.substring(4);
-    }
-    return name;
-  }
+	protected IIcon[]	textures;
 
-  @Override
-@SideOnly(Side.CLIENT)
-  public void registerIcons(IIconRegister iconRegister)
-  {
-    int indexCount = 0;
-    while (getTextureName(indexCount) != null)
-    {
-      indexCount++;
-      if (indexCount > 32767) {
-        throw new RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName());
-      }
-    }
-    this.textures = new IIcon[indexCount];
-    for (int index = 0; index < indexCount; index++) {
-      this.textures[index] = iconRegister.registerIcon(CORE.MODID + ":" + getUnlocalizedName());
-    }
-  }
+	/*
+	 * public String getTextureName(int index) { if ((!this.hasSubtypes) &&
+	 * (index > 0)) { return null; } String name = getUnlocalizedName(new
+	 * ItemStack(this, 1, index)); if ((name != null) && (name.length() > 4)) {
+	 * return name.substring(4); } return name; }
+	 * 
+	 * @Override
+	 * 
+	 * @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister
+	 * iconRegister) { int indexCount = 0; while (getTextureName(indexCount) !=
+	 * null) { indexCount++; if (indexCount > 32767) { throw new
+	 * RuntimeException("More Item Icons than actually possible @ " +
+	 * getUnlocalizedName()); } } this.textures = new IIcon[indexCount]; for
+	 * (int index = 0; index < indexCount; index++) { this.textures[index] =
+	 * iconRegister.registerIcon(CORE.MODID + ":" + getUnlocalizedName()); } }
+	 * 
+	 * @Override
+	 * 
+	 * @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int meta) { if
+	 * (meta < this.textures.length) { return this.textures[meta]; } return
+	 * this.textures.length < 1 ? null : this.textures[0]; }
+	 */
 
-  @Override
-@SideOnly(Side.CLIENT)
-  public IIcon getIconFromDamage(int meta)
-  {
-    if (meta < this.textures.length) {
-      return this.textures[meta];
-    }
-    return this.textures.length < 1 ? null : this.textures[0];
-  }*/
+	public IC2_ItemIC2(final String internalName) {
+		this.setUnlocalizedName(internalName);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		this.setTextureName(CORE.MODID + ":" + internalName);
 
-	@Override
-	public String getUnlocalizedName()
-	{
-		return super.getUnlocalizedName();
+		GameRegistry.registerItem(this, internalName);
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack itemStack)
-	{
-		return getUnlocalizedName();
+	public String getItemStackDisplayName(final ItemStack itemStack) {
+		return StatCollector.translateToLocal(this.getUnlocalizedName(itemStack));
 	}
 
 	@Override
-	public String getItemStackDisplayName(ItemStack itemStack)
-	{
-		return StatCollector.translateToLocal(getUnlocalizedName(itemStack));
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(final ItemStack stack) {
+		return EnumRarity.values()[this.rarity];
 	}
 
-	public IC2_ItemIC2 setRarity(int aRarity)
-	{
-		this.rarity = aRarity;
-		return this;
+	public String getTextureFolder() {
+		return null;
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
-	public EnumRarity getRarity(ItemStack stack)
-	{
-		return EnumRarity.values()[this.rarity];
+	public String getUnlocalizedName() {
+		return super.getUnlocalizedName();
 	}
 
-	private int rarity = 0;
-	protected IIcon[] textures;
+	@Override
+	public String getUnlocalizedName(final ItemStack itemStack) {
+		return this.getUnlocalizedName();
+	}
+	public IC2_ItemIC2 setRarity(final int aRarity) {
+		this.rarity = aRarity;
+		return this;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
index bf6f3bc1cd..c7645d309e 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
@@ -10,62 +10,98 @@ 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_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	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 blockRTG;
-	public static ItemStack blockKineticGenerator;
+	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(){
+	public static ItemStack	blockRTG;
+	public static ItemStack	blockKineticGenerator;
 
-		if(LoadedMods.EnderIO){
-			//Tier 1
-			rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemEnergeticRotorBlade", 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_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"));
+	public static void register() {
+
+		if (LoadedMods.EnderIO) {
+			// Tier 1
+			IC2_Items.rotor_Blade_Material_1 = new ItemStack(new CoreItem("itemEnergeticRotorBlade",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.shaft_Material_1 = new ItemStack(new CoreItem("itemEnergeticShaft", AddToCreativeTab.tabMachines,
+					16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.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
+			IC2_Items.rotor_Blade_Material_2 = new ItemStack(new CoreItem("itemTungstenSteelRotorBlade",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.shaft_Material_2 = new ItemStack(new CoreItem("itemTungstenSteelShaft",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.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
+			IC2_Items.rotor_Blade_Material_3 = new ItemStack(new CoreItem("itemVibrantRotorBlade",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.shaft_Material_3 = new ItemStack(new CoreItem("itemVibrantShaft", AddToCreativeTab.tabMachines,
+					16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.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
+			IC2_Items.rotor_Blade_Material_4 = new ItemStack(new CoreItem("itemIridiumRotorBlade",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.shaft_Material_4 = new ItemStack(new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines,
+					16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.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"));
 
 		}
 		else {
-			//Tier 1 - Magnalium
-			rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemMagnaliumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_1 = new ItemStack (new CoreItem("itemMagnaliumShaft", 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/rotorMagnaliumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemMagnaliumRotor"));
-			//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 - Ultimet
-			rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemUltimetRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-			shaft_Material_3 = new ItemStack (new CoreItem("itemUltimetShaft", 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/rotorUltimetModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemUltimetRotor"));
-			//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_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"));
+			// Tier 1 - Magnalium
+			IC2_Items.rotor_Blade_Material_1 = new ItemStack(new CoreItem("itemMagnaliumRotorBlade",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.shaft_Material_1 = new ItemStack(new CoreItem("itemMagnaliumShaft", AddToCreativeTab.tabMachines,
+					16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.rotor_Material_1 = new ItemStack(new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12,
+					80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png"))
+							.setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemMagnaliumRotor"));
+			// Tier 2
+			IC2_Items.rotor_Blade_Material_2 = new ItemStack(new CoreItem("itemTungstenSteelRotorBlade",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.shaft_Material_2 = new ItemStack(new CoreItem("itemTungstenSteelShaft",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.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 - Ultimet
+			IC2_Items.rotor_Blade_Material_3 = new ItemStack(new CoreItem("itemUltimetRotorBlade",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.shaft_Material_3 = new ItemStack(new CoreItem("itemUltimetShaft", AddToCreativeTab.tabMachines,
+					16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.rotor_Material_3 = new ItemStack(new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16,
+					160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png"))
+							.setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemUltimetRotor"));
+			// Tier 4
+			IC2_Items.rotor_Blade_Material_4 = new ItemStack(new CoreItem("itemIridiumRotorBlade",
+					AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.shaft_Material_4 = new ItemStack(new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines,
+					16, "A part for an advanced Kinetic Rotor"));
+			IC2_Items.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/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
index 5967aeba49..38f259b578 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
@@ -8,47 +8,42 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 
-public class ItemGenerators
-  extends ItemBlockIC2
-{
-  public ItemGenerators(Block block)
-  {
-    super(block);
-    
-    setMaxDamage(0);
-    setHasSubtypes(true);
-  }
-  
-  @Override
-public int getMetadata(int i)
-  {
-    return i;
-  }
-  
-  @Override
-public String getUnlocalizedName(ItemStack itemstack)
-  {
-    int meta = itemstack.getItemDamage();
-    switch (meta)
-    {
-    case 0: 
-      return "ic2.blockRTGenerator2";
-    case 1: 
-      return "ic2.blockKineticGenerator2";
-    }
-    return null;
-  }
-  
-  @Override
-public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b)
-  {
-    int meta = itemStack.getItemDamage();
-    switch (meta)
-    {    
-    case 0: 
-      info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-32 EU/t " + StatCollector.translateToLocal("ic2.item.tooltip.max")); break;
-    case 1: 
-      info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t " + StatCollector.translateToLocal("ic2.item.tooltip.max"));
-    }
-  }
+public class ItemGenerators extends ItemBlockIC2 {
+	public ItemGenerators(final Block block) {
+		super(block);
+
+		this.setMaxDamage(0);
+		this.setHasSubtypes(true);
+	}
+
+	@Override
+	public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) {
+		final int meta = itemStack.getItemDamage();
+		switch (meta) {
+			case 0:
+				info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-32 EU/t "
+						+ StatCollector.translateToLocal("ic2.item.tooltip.max"));
+				break;
+			case 1:
+				info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t "
+						+ StatCollector.translateToLocal("ic2.item.tooltip.max"));
+		}
+	}
+
+	@Override
+	public int getMetadata(final int i) {
+		return i;
+	}
+
+	@Override
+	public String getUnlocalizedName(final ItemStack itemstack) {
+		final int meta = itemstack.getItemDamage();
+		switch (meta) {
+			case 0:
+				return "ic2.blockRTGenerator2";
+			case 1:
+				return "ic2.blockKineticGenerator2";
+		}
+		return null;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
index 3ebd9682e0..8f1dd7f479 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
@@ -13,86 +13,82 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
-public class RotorBase extends ItemWindRotor{
+public class RotorBase extends ItemWindRotor {
 
-	private final int maxWindStrength;
-	private final int minWindStrength;
-	private final int radius;
-	private final float efficiency;
-	private final ResourceLocation renderTexture;
-	private final boolean water;	
+	private final int				maxWindStrength;
+	private final int				minWindStrength;
+	private final int				radius;
+	private final float				efficiency;
+	private final ResourceLocation	renderTexture;
+	private final boolean			water;
 
-	public RotorBase(InternalName internalName, int Radius, int durability, float efficiency, int minWindStrength, int maxWindStrength, ResourceLocation RenderTexture)
-	{
+	public RotorBase(final InternalName internalName, final int Radius, final int durability, final float efficiency,
+			final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) {
 		super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture);
 
-
-
-		setMaxStackSize(1);
-		setMaxDamage(durability);
+		this.setMaxStackSize(1);
+		this.setMaxDamage(durability);
 
 		this.radius = Radius;
 		this.efficiency = efficiency;
 		this.renderTexture = RenderTexture;
 		this.minWindStrength = minWindStrength;
 		this.maxWindStrength = maxWindStrength;
-		this.water = (internalName != InternalName.itemwoodrotor);
+		this.water = internalName != InternalName.itemwoodrotor;
 	}
 
 	@Override
-	public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b)
-	{
-		info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info", new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) }));
+	public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) {
+		info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info", new Object[] {
+				Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength)
+		}));
 		IKineticRotor.GearboxType type = null;
-		if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) {
+		if (Minecraft.getMinecraft().currentScreen != null
+				&& Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator) {
 			type = IKineticRotor.GearboxType.WATER;
-		} else if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) {
+		}
+		else if (Minecraft.getMinecraft().currentScreen != null
+				&& Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator) {
 			type = IKineticRotor.GearboxType.WIND;
 		}
 		if (type != null) {
-			//info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type)));
+			// info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." +
+			// isAcceptedType(itemStack, type)));
 		}
 	}
 
 	@Override
-	public String getTextureFolder()
-	{
-		return "rotors";
+	public int getDiameter(final ItemStack stack) {
+		return this.radius;
 	}
 
 	@Override
-	public int getDiameter(ItemStack stack)
-	{
-		return this.radius;
+	public float getEfficiency(final ItemStack stack) {
+		return this.efficiency;
 	}
 
 	@Override
-	public ResourceLocation getRotorRenderTexture(ItemStack stack)
-	{
-		return this.renderTexture;
+	public int getMaxWindStrength(final ItemStack stack) {
+		return this.maxWindStrength;
 	}
 
 	@Override
-	public float getEfficiency(ItemStack stack)
-	{
-		return this.efficiency;
+	public int getMinWindStrength(final ItemStack stack) {
+		return this.minWindStrength;
 	}
 
 	@Override
-	public int getMinWindStrength(ItemStack stack)
-	{
-		return this.minWindStrength;
+	public ResourceLocation getRotorRenderTexture(final ItemStack stack) {
+		return this.renderTexture;
 	}
 
 	@Override
-	public int getMaxWindStrength(ItemStack stack)
-	{
-		return this.maxWindStrength;
+	public String getTextureFolder() {
+		return "rotors";
 	}
 
-	public boolean isAcceptedType(ItemStack stack, IKineticRotor.GearboxType type)
-	{
-		return (type == IKineticRotor.GearboxType.WIND) || (this.water);
+	@Override
+	public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type) {
+		return type == IKineticRotor.GearboxType.WIND || this.water;
 	}
 }
-
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
index b4b40fda37..2aa89bd868 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
@@ -15,106 +15,100 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
-public class RotorIridium extends RotorBase{
+public class RotorIridium extends RotorBase {
 
-	private final int maxWindStrength;
-	private final int minWindStrength;
-	private final int radius;
-	private final float efficiency;
-	private final ResourceLocation renderTexture;
-	private final boolean water;	
+	private final int				maxWindStrength;
+	private final int				minWindStrength;
+	private final int				radius;
+	private final float				efficiency;
+	private final ResourceLocation	renderTexture;
+	private final boolean			water;
 
-	public RotorIridium(InternalName internalName, int Radius, int durability, float efficiency, int minWindStrength, int maxWindStrength, ResourceLocation RenderTexture)
-	{
+	public RotorIridium(final InternalName internalName, final int Radius, final int durability, final float efficiency,
+			final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) {
 		super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture);
 
-		
-		
-		setMaxStackSize(1);
-		setMaxDamage(Integer.MAX_VALUE);
+		this.setMaxStackSize(1);
+		this.setMaxDamage(Integer.MAX_VALUE);
 
 		this.radius = Radius;
 		this.efficiency = efficiency;
 		this.renderTexture = RenderTexture;
 		this.minWindStrength = minWindStrength;
 		this.maxWindStrength = maxWindStrength;
-		this.water = (internalName != InternalName.itemwoodrotor);
+		this.water = internalName != InternalName.itemwoodrotor;
 	}
 
 	@Override
-	public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b)
-	{
-		info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info", new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) }));
+	public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) {
+		info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info", new Object[] {
+				Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength)
+		}));
 		IKineticRotor.GearboxType type = null;
-		if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) {
+		if (Minecraft.getMinecraft().currentScreen != null
+				&& Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator) {
 			type = IKineticRotor.GearboxType.WATER;
-		} else if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) {
+		}
+		else if (Minecraft.getMinecraft().currentScreen != null
+				&& Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator) {
 			type = IKineticRotor.GearboxType.WIND;
 		}
 		if (type != null) {
-			//info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type)));
+			// info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." +
+			// isAcceptedType(itemStack, type)));
 		}
 	}
 
 	@Override
-	public String getTextureFolder()
-	  {
-	    return "rotors";
-	  }
-	  
-	  @Override
-	public int getDiameter(ItemStack stack)
-	  {
-	    return this.radius;
-	  }
-	  
-	  @Override
-	public ResourceLocation getRotorRenderTexture(ItemStack stack)
-	  {
-	    return this.renderTexture;
-	  }
-	  
-	  @Override
-	public float getEfficiency(ItemStack stack)
-	  {
-	    return this.efficiency;
-	  }
-	  
-	  @Override
-	public int getMinWindStrength(ItemStack stack)
-	  {
-	    return this.minWindStrength;
-	  }
-	  
-	  @Override
-	public int getMaxWindStrength(ItemStack stack)
-	  {
-	    return this.maxWindStrength;
-	  }
-	  
-	  public boolean isAcceptedType(ItemStack stack, IKineticRotor.GearboxType type)
-	  {
-	    return (type == IKineticRotor.GearboxType.WIND) || (this.water);
-	  }
-	
-	    
-	    @Override
-	  public void setCustomDamage(ItemStack stack, int damage)
-	    {
-	      NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
-	      nbt.setInteger("advDmg", 0);
-	      
-	      int maxStackDamage = stack.getMaxDamage();
-	      if (maxStackDamage > 2) {
-	        //stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2));
-	      }
-	    }
-	    
-	    @Override
-	  public boolean applyCustomDamage(ItemStack stack, int damage, EntityLivingBase src)
-	    {
-	      setCustomDamage(stack, getCustomDamage(stack) + damage);
-	      return true;
-	    }
+	public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) {
+		this.setCustomDamage(stack, this.getCustomDamage(stack) + damage);
+		return true;
+	}
+
+	@Override
+	public int getDiameter(final ItemStack stack) {
+		return this.radius;
+	}
+
+	@Override
+	public float getEfficiency(final ItemStack stack) {
+		return this.efficiency;
+	}
+
+	@Override
+	public int getMaxWindStrength(final ItemStack stack) {
+		return this.maxWindStrength;
+	}
+
+	@Override
+	public int getMinWindStrength(final ItemStack stack) {
+		return this.minWindStrength;
+	}
+
+	@Override
+	public ResourceLocation getRotorRenderTexture(final ItemStack stack) {
+		return this.renderTexture;
+	}
+
+	@Override
+	public String getTextureFolder() {
+		return "rotors";
+	}
+
+	@Override
+	public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type) {
+		return type == IKineticRotor.GearboxType.WIND || this.water;
+	}
+
+	@Override
+	public void setCustomDamage(final ItemStack stack, final int damage) {
+		final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
+		nbt.setInteger("advDmg", 0);
+
+		final int maxStackDamage = stack.getMaxDamage();
+		if (maxStackDamage > 2) {
+			// stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg,
+			// maxStackDamage - 2));
+		}
 	}
-	
+}