+ New texture for the slow builders ring.

+ Added the Alkalus Disk.
$ Fixed Frame Box Assembler Recipes.
$ Fixed Missing 7Li material.
$ Fixed Tiered Tanks not showing their capacity in the tooltip.
$ Fixed tooltips for alloys containing Bronze or Steel.
$ Fixed Clay Pipe Extruder Recipes.
- Removed a handful of Plasma cells for misc. materials.
% Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements.
% Cleaned up The Entire Project.

7 files changed, 191 insertions, 193 deletions

diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
index e258d437d3..5aecd9c5ec 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
@@ -1,39 +1,38 @@
 package gtPlusPlus.xmod.ic2.item;
 
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.CoreItem;
-
 import java.util.List;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.*;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+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 IC2_ItemGradual(final String internalName)
 	{
 		super(internalName, AddToCreativeTab.tabMachines, 1, 10000, "", EnumRarity.uncommon);
-		setNoRepair();
+		this.setNoRepair();
 	}
 
 	@Override
-	public boolean isDamaged(ItemStack stack)
+	public boolean isDamaged(final ItemStack stack)
 	{
-		return getDamage(stack) > 1;
+		return this.getDamage(stack) > 1;
 	}
 
 	@Override
-	public boolean showDurabilityBar(ItemStack stack)
+	public boolean showDurabilityBar(final ItemStack stack)
 	{
 		return true;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void getSubItems(Item item, CreativeTabs tabs, List itemList)
+	public void getSubItems(final Item item, final CreativeTabs tabs, final List itemList)
 	{
 		itemList.add(new ItemStack(this, 1, 1));
 	}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
index 4922e0f806..004713f092 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
@@ -7,47 +7,47 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class IC2_ItemGradualInteger
-  extends IC2_ItemGradual
-  implements ICustomDamageItem
+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;
-  }
+	private final int maxDmg;
+
+	public IC2_ItemGradualInteger(final String internalName, final int maxdmg)
+	{
+		super(internalName);
+
+		this.maxDmg = maxdmg;
+	}
+
+	@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));
+		}
+	}
+
+	@Override
+	public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src)
+	{
+		this.setCustomDamage(stack, this.getCustomDamage(stack) + damage);
+		return true;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
index b257124345..9d4990e76c 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
@@ -1,22 +1,22 @@
 package gtPlusPlus.xmod.ic2.item;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import net.minecraft.item.*;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class IC2_ItemIC2
 extends Item
 {
-	public IC2_ItemIC2(String internalName)
+	public IC2_ItemIC2(final String internalName)
 	{
-		setUnlocalizedName(internalName);
-		setCreativeTab(AddToCreativeTab.tabMachines);
-		setTextureName(CORE.MODID + ":" + internalName);
+		this.setUnlocalizedName(internalName);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		this.setTextureName(CORE.MODID + ":" + internalName);
 
 		GameRegistry.registerItem(this, internalName);
 	}
@@ -73,18 +73,18 @@ extends Item
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack itemStack)
+	public String getUnlocalizedName(final ItemStack itemStack)
 	{
-		return getUnlocalizedName();
+		return this.getUnlocalizedName();
 	}
 
 	@Override
-	public String getItemStackDisplayName(ItemStack itemStack)
+	public String getItemStackDisplayName(final ItemStack itemStack)
 	{
-		return StatCollector.translateToLocal(getUnlocalizedName(itemStack));
+		return StatCollector.translateToLocal(this.getUnlocalizedName(itemStack));
 	}
 
-	public IC2_ItemIC2 setRarity(int aRarity)
+	public IC2_ItemIC2 setRarity(final int aRarity)
 	{
 		this.rarity = aRarity;
 		return this;
@@ -92,7 +92,7 @@ extends Item
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public EnumRarity getRarity(ItemStack stack)
+	public EnumRarity getRarity(final ItemStack stack)
 	{
 		return EnumRarity.values()[this.rarity];
 	}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
index bf6f3bc1cd..2e9cec3c33 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
@@ -24,7 +24,7 @@ public class IC2_Items {
 	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;
 
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
index 2d73638ce9..046324a4ac 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
@@ -1,55 +1,54 @@
 package gtPlusPlus.xmod.ic2.item;
 
-import ic2.core.item.block.ItemBlockIC2;
-
 import java.util.List;
 
+import ic2.core.item.block.ItemBlockIC2;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 
 public class ItemGenerators
-  extends ItemBlockIC2
+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 ItemGenerators(final Block block)
+	{
+		super(block);
+
+		this.setMaxDamage(0);
+		this.setHasSubtypes(true);
+	}
+
+	@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;
+	}
+
+	@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"));
+		}
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
index dbea1dc299..9a8cdd5df1 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java
@@ -1,13 +1,12 @@
 package gtPlusPlus.xmod.ic2.item;
 
+import java.util.List;
+
 import ic2.api.item.IKineticRotor;
 import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
 import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
 import ic2.core.init.InternalName;
 import ic2.core.item.resources.ItemWindRotor;
-
-import java.util.List;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -21,16 +20,16 @@ public class RotorBase extends ItemWindRotor{
 	private final int radius;
 	private final float efficiency;
 	private final ResourceLocation renderTexture;
-	private final boolean water;	
+	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;
@@ -41,7 +40,7 @@ public class RotorBase extends ItemWindRotor{
 	}
 
 	@Override
-	public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b)
+	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;
@@ -62,36 +61,37 @@ public class RotorBase extends ItemWindRotor{
 	}
 
 	@Override
-	public int getDiameter(ItemStack stack)
+	public int getDiameter(final ItemStack stack)
 	{
 		return this.radius;
 	}
 
 	@Override
-	public ResourceLocation getRotorRenderTexture(ItemStack stack)
+	public ResourceLocation getRotorRenderTexture(final ItemStack stack)
 	{
 		return this.renderTexture;
 	}
 
 	@Override
-	public float getEfficiency(ItemStack stack)
+	public float getEfficiency(final ItemStack stack)
 	{
 		return this.efficiency;
 	}
 
 	@Override
-	public int getMinWindStrength(ItemStack stack)
+	public int getMinWindStrength(final ItemStack stack)
 	{
 		return this.minWindStrength;
 	}
 
 	@Override
-	public int getMaxWindStrength(ItemStack stack)
+	public int getMaxWindStrength(final ItemStack stack)
 	{
 		return this.maxWindStrength;
 	}
 
-	public boolean isAcceptedType(ItemStack stack, IKineticRotor.GearboxType type)
+	@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 f35b1e88f0..e76d689533 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
@@ -1,13 +1,12 @@
 package gtPlusPlus.xmod.ic2.item;
 
+import java.util.List;
+
 import ic2.api.item.IKineticRotor;
 import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
 import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
 import ic2.core.init.InternalName;
 import ic2.core.util.StackUtil;
-
-import java.util.List;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -23,16 +22,16 @@ public class RotorIridium extends RotorBase{
 	private final int radius;
 	private final float efficiency;
 	private final ResourceLocation renderTexture;
-	private final boolean water;	
+	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;
@@ -43,7 +42,7 @@ public class RotorIridium extends RotorBase{
 	}
 
 	@Override
-	public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b)
+	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;
@@ -59,63 +58,64 @@ public class RotorIridium extends RotorBase{
 
 	@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;
-	    }
+	{
+		return "rotors";
+	}
+
+	@Override
+	public int getDiameter(final ItemStack stack)
+	{
+		return this.radius;
+	}
+
+	@Override
+	public ResourceLocation getRotorRenderTexture(final ItemStack stack)
+	{
+		return this.renderTexture;
+	}
+
+	@Override
+	public float getEfficiency(final ItemStack stack)
+	{
+		return this.efficiency;
+	}
+
+	@Override
+	public int getMinWindStrength(final ItemStack stack)
+	{
+		return this.minWindStrength;
+	}
+
+	@Override
+	public int getMaxWindStrength(final ItemStack stack)
+	{
+		return this.maxWindStrength;
+	}
+
+	@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));
+		}
 	}
-	
+
+	@Override
+	public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src)
+	{
+		this.setCustomDamage(stack, this.getCustomDamage(stack) + damage);
+		return true;
+	}
+}
+