$ Cleaned up the entire project.

> Much neat, very nices.

8 files changed, 303 insertions, 179 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
index 3c29b34e27..6503ba0a42 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
@@ -5,20 +5,35 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public interface GregtechItemContainer {
-	public Item getItem();
-	public Block getBlock();
-	public boolean isStackEqual(Object aStack);
-	public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT);
 	public ItemStack get(long aAmount, Object... aReplacements);
-	public ItemStack getWildcard(long aAmount, Object... aReplacements);
-	public ItemStack getUndamaged(long aAmount, Object... aReplacements);
+
 	public ItemStack getAlmostBroken(long aAmount, Object... aReplacements);
-	public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements);
-	public GregtechItemContainer set(Item aItem);
-	public GregtechItemContainer set(ItemStack aStack);
-	public GregtechItemContainer registerOre(Object... aOreNames);
-	public GregtechItemContainer registerWildcardAsOre(Object... aOreNames);
+
+	public Block getBlock();
+
+	public Item getItem();
+
+	public ItemStack getUndamaged(long aAmount, Object... aReplacements);
+
+	public ItemStack getWildcard(long aAmount, Object... aReplacements);
+
 	public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements);
+
+	public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements);
+
 	public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements);
+
 	public boolean hasBeenSet();
+
+	public boolean isStackEqual(Object aStack);
+
+	public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT);
+
+	public GregtechItemContainer registerOre(Object... aOreNames);
+
+	public GregtechItemContainer registerWildcardAsOre(Object... aOreNames);
+
+	public GregtechItemContainer set(Item aItem);
+
+	public GregtechItemContainer set(ItemStack aStack);
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 62b3aa9bcc..472808f9b2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -5,90 +5,133 @@ import net.minecraftforge.fluids.FluidStack;
 
 public interface IGregtech_RecipeAdder {
 	/**
-	 * Adds a Coke Oven Recipe
+	 * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
 	 *
-	 * @param aInput1       = first Input (not null, and respects StackSize)
-	 * @param aInputb       = second Input (can be null, and respects StackSize)
-	 * @param aFluidOutput      = Output of the Creosote (not null, and respects StackSize)
-	 * @param aFluidInput   = fluid Input (can be null, and respects StackSize)
-	 * @param aOutput       = Output of the Coal/coke (can be null, and respects StackSize)
-	 * @param aDuration 	= Duration (must be >= 0)
-	 * @param aEUt			= EU needed for heating up (must be >= 0)
+	 * @param aInput
+	 *            = ItemStack[] (not null, and respects StackSize)
+	 * @param aFluidOutput
+	 *            = Output of the UU-Matter (not null, and respects StackSize)
+	 * @param aChances
+	 *            = Output Change (can be == 0)
+	 * @param aDuration
+	 *            = Duration (must be >= 0)
+	 * @param aEUt
+	 *            = EU needed for heating up (must be >= 0)
 	 * @return true if the Recipe got added, otherwise false.
 	 */
-	//public boolean addCokeOvenRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue);
-	public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2,	FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput,	int aDuration, int aEUt);
-
-	public boolean addFuel(ItemStack aInput1, ItemStack aOutput1, int aEU, int aType);
-
+	public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
 
 	/**
-	 * Adds a Matter Fabricator Recipe
+	 * Adds a Coke Oven Recipe
 	 *
-	 * @param aFluidOutput   = Output of the UU-Matter (not null, and respects StackSize)
-	 * @param aFluidInput   = fluid Input (can be UU_Amp or null, and respects StackSize)
-	 * @param aDuration 	= Duration (must be >= 0)
-	 * @param aEUt			= EU needed for heating up (must be >= 0)
+	 * @param aInput1
+	 *            = first Input (not null, and respects StackSize)
+	 * @param aInputb
+	 *            = second Input (can be null, and respects StackSize)
+	 * @param aFluidOutput
+	 *            = Output of the Creosote (not null, and respects StackSize)
+	 * @param aFluidInput
+	 *            = fluid Input (can be null, and respects StackSize)
+	 * @param aOutput
+	 *            = Output of the Coal/coke (can be null, and respects
+	 *            StackSize)
+	 * @param aDuration
+	 *            = Duration (must be >= 0)
+	 * @param aEUt
+	 *            = EU needed for heating up (must be >= 0)
 	 * @return true if the Recipe got added, otherwise false.
 	 */
-	public boolean addMatterFabricatorRecipe(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt);
+	// public boolean addCokeOvenRecipe(boolean aOptimize, ItemStack[] aInputs,
+	// ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs,
+	// FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue);
+	public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
+			FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt);
 
 	/**
-	 * Adds a Matter Fabricator Recipe
+	 * Adds a Recipe for the Dehydrator. (up to 9 Outputs)
 	 *
-	 * @param aItemInput = ItemStack Input, can be null I assume.
-	 * @param aFluidInput   = fluid Input (can be UU_Amp or null, and respects StackSize)
-	 * @param aFluidOutput   = Output of the UU-Matter (not null, and respects StackSize)
-	 * @param aDuration 	= Duration (must be >= 0)
-	 * @param aEUt			= EU needed for heating up (must be >= 0)
+	 * @param aInput
+	 *            = Input itemstack (not null, and respects StackSize)
+	 * @param aFluidInput
+	 *            = fluid Input (can be UU_Amp or null, and respects StackSize)
+	 * @param aOutputItems
+	 *            = Itemstack[] (not null, and respects StackSize)
+	 * @param aDuration
+	 *            = Duration (must be >= 0)
+	 * @param aEUt
+	 *            = EU needed for heating up (must be >= 0)
 	 * @return true if the Recipe got added, otherwise false.
 	 */
-	public boolean addMatterFabricatorRecipe(ItemStack aItemInput, FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt);
-
-
 
+	public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration,
+			int aEUt);
+	/*
+	 * public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack
+	 * aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
+	 */
+	/*
+	 * public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB,
+	 * ItemStack[] aOutputItems, int aDuration, int aEUt); public boolean
+	 * addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack
+	 * aFluid, ItemStack[] aOutputItems, FluidStack aOutputFluid, int aDuration,
+	 * int aEUt);
+	 */
 
 	/**
 	 * Adds a Recipe for the Dehydrator. (up to 9 Outputs)
 	 *
-	 * @param aInput   = Input itemstack (not null, and respects StackSize)
-	 * @param aFluidInput   = fluid Input (can be UU_Amp or null, and respects StackSize)
-	 * @param aOutputItems   = Itemstack[] (not null, and respects StackSize)
-	 * @param aDuration 	= Duration (must be >= 0)
-	 * @param aEUt			= EU needed for heating up (must be >= 0)
+	 * @param aInput
+	 *            = ItemStack[] (not null, and respects StackSize)
+	 * @param aFluidInput
+	 *            = fluid Input (can be UU_Amp or null, and respects StackSize)
+	 * @param aFluidOutput
+	 *            = Output of the UU-Matter (not null, and respects StackSize)
+	 * @param aOutputItems
+	 *            = ItemStack[] (not null, and respects StackSize)
+	 * @param aChances
+	 *            = Output Change (can be == 0)
+	 * @param aDuration
+	 *            = Duration (must be >= 0)
+	 * @param aEUt
+	 *            = EU needed for heating up (must be >= 0)
 	 * @return true if the Recipe got added, otherwise false.
 	 */
+	public boolean addDehydratorRecipe(ItemStack[] aInput, FluidStack aFluidInput, FluidStack aFluidOutput,
+			ItemStack[] aOutputItems, int[] aChances, int aDuration, int aEUt);
 
-	public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
-	/*public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);*/
-	/*public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt);
-    public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt);*/
+	public boolean addFuel(ItemStack aInput1, ItemStack aOutput1, int aEU, int aType);
 
 	/**
-	 * Adds a Recipe for the Dehydrator. (up to 9 Outputs)
+	 * Adds a Matter Fabricator Recipe
 	 *
-	 * @param aInput   = ItemStack[] (not null, and respects StackSize)
-	 * @param aFluidInput   = fluid Input (can be UU_Amp or null, and respects StackSize)
-	 * @param aFluidOutput   = Output of the UU-Matter (not null, and respects StackSize)
-	 * @param aOutputItems   = ItemStack[] (not null, and respects StackSize)
-	 * @param aChances 	= Output Change (can be == 0)
-	 * @param aDuration 	= Duration (must be >= 0)
-	 * @param aEUt			= EU needed for heating up (must be >= 0)
+	 * @param aFluidOutput
+	 *            = Output of the UU-Matter (not null, and respects StackSize)
+	 * @param aFluidInput
+	 *            = fluid Input (can be UU_Amp or null, and respects StackSize)
+	 * @param aDuration
+	 *            = Duration (must be >= 0)
+	 * @param aEUt
+	 *            = EU needed for heating up (must be >= 0)
 	 * @return true if the Recipe got added, otherwise false.
 	 */
-	public boolean addDehydratorRecipe(ItemStack[] aInput, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack[] aOutputItems, int[] aChances, int aDuration, int aEUt);
-
+	public boolean addMatterFabricatorRecipe(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt);
 
 	/**
-	 * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
+	 * Adds a Matter Fabricator Recipe
 	 *
-	 * @param aInput   = ItemStack[] (not null, and respects StackSize)
-	 * @param aFluidOutput   = Output of the UU-Matter (not null, and respects StackSize)
-	 * @param aChances 	= Output Change (can be == 0)
-	 * @param aDuration 	= Duration (must be >= 0)
-	 * @param aEUt			= EU needed for heating up (must be >= 0)
+	 * @param aItemInput
+	 *            = ItemStack Input, can be null I assume.
+	 * @param aFluidInput
+	 *            = fluid Input (can be UU_Amp or null, and respects StackSize)
+	 * @param aFluidOutput
+	 *            = Output of the UU-Matter (not null, and respects StackSize)
+	 * @param aDuration
+	 *            = Duration (must be >= 0)
+	 * @param aEUt
+	 *            = EU needed for heating up (must be >= 0)
 	 * @return true if the Recipe got added, otherwise false.
 	 */
-	public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
+	public boolean addMatterFabricatorRecipe(ItemStack aItemInput, FluidStack aFluidInput, FluidStack aFluidOutput,
+			int aDuration, int aEUt);
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
index 8e1715caf5..b6c36483af 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
@@ -4,18 +4,18 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
 public interface Interface_IconContainer {
-    /**
-     * @return A regular Icon.
-     */
-    public IIcon getIcon();
+	/**
+	 * @return A regular Icon.
+	 */
+	public IIcon getIcon();
 
-    /**
-     * @return Icon of the Overlay (or null if there is no Icon)
-     */
-    public IIcon getOverlayIcon();
+	/**
+	 * @return Icon of the Overlay (or null if there is no Icon)
+	 */
+	public IIcon getOverlayIcon();
 
-    /**
-     * @return the Default Texture File for this Icon.
-     */
-    public ResourceLocation getTextureFile();
+	/**
+	 * @return the Default Texture File for this Icon.
+	 */
+	public ResourceLocation getTextureFile();
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
index 478880795e..31a97604e7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
@@ -14,27 +14,31 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public interface Interface_ItemBehaviour<E extends Item> {
-    public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
+	public boolean canDispense(E aItem, IBlockSource aSource, ItemStack aStack);
 
-    public boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ);
+	public List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack);
 
-    public boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ);
+	public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX,
+			double aY, double aZ);
 
-    public ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer);
+	public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
+			EntityLivingBase aEntity, float aSpeed);
 
-    public List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack);
+	public boolean hasProjectile(Gregtech_MetaItem_Base aItem, SubTag aProjectileType, ItemStack aStack);
 
-    public void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand);
+	public boolean isItemStackUsable(E aItem, ItemStack aStack);
 
-    public boolean isItemStackUsable(E aItem, ItemStack aStack);
+	public ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
 
-    public boolean canDispense(E aItem, IBlockSource aSource, ItemStack aStack);
+	public ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer);
 
-    public ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
+	public boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
+			int aSide, float hitX, float hitY, float hitZ);
 
-    public boolean hasProjectile(Gregtech_MetaItem_Base aItem, SubTag aProjectileType, ItemStack aStack);
+	public boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
+			int aSide, float hitX, float hitY, float hitZ);
 
-    public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ);
+	public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
 
-    public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed);
+	public void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand);
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
index d4e37ee476..99348d1900 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
@@ -6,14 +6,21 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator {
-    /**
-     * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did before.
-     *
-     * @param aPrefix   always != null
-     * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
-     * @param aStack    always != null
-     */
-    public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack);
+	/**
+	 * Contains a Code Fragment, used in the OrePrefix to register Recipes.
+	 * Better than using a switch/case, like I did before.
+	 *
+	 * @param aPrefix
+	 *            always != null
+	 * @param aMaterial
+	 *            always != null, and can be == _NULL if the Prefix is Self
+	 *            Referencing or not Material based!
+	 * @param aStack
+	 *            always != null
+	 */
+	public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName,
+			ItemStack aStack);
 
-	public void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack copyAmount);
+	public void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
+			ItemStack copyAmount);
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
index ed276ad3f9..8a06d5ae7a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
@@ -5,12 +5,18 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator_GT {
-    /**
-     * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did before.
-     *
-     * @param aPrefix   always != null
-     * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
-     * @param aStack    always != null
-     */
-    public void registerOre(OrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack);
+	/**
+	 * Contains a Code Fragment, used in the OrePrefix to register Recipes.
+	 * Better than using a switch/case, like I did before.
+	 *
+	 * @param aPrefix
+	 *            always != null
+	 * @param aMaterial
+	 *            always != null, and can be == _NULL if the Prefix is Self
+	 *            Referencing or not Material based!
+	 * @param aStack
+	 *            always != null
+	 */
+	public void registerOre(OrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName,
+			ItemStack aStack);
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
index 76c5113186..f0845eb751 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
@@ -4,17 +4,17 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 
 public interface Interface_Texture {
-    public void renderXPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public boolean isValidTexture();
 
-    public void renderXNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderXNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public void renderYPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderXPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public void renderZPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderYPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public void renderZNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderZNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public boolean isValidTexture();
+	public void renderZPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
index ceaee371df..41e9d7f640 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
@@ -18,144 +18,193 @@ import net.minecraftforge.event.world.BlockEvent;
 /**
  * The Stats for GT Tools. Not including any Material Modifiers.
  * <p/>
- * And this is supposed to not have any ItemStack Parameters as these are generic Stats.
+ * And this is supposed to not have any ItemStack Parameters as these are
+ * generic Stats.
  */
-public interface Interface_ToolStats extends IToolStats{
+public interface Interface_ToolStats extends IToolStats {
 	/**
-	 * Called when aPlayer crafts this Tool
+	 * @return If this Tool can be used for blocking Damage like a Sword.
 	 */
-	public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer);
+	@Override
+	public boolean canBlock();
 
 	/**
-	 * Called when this gets added to a Tool Item
+	 * This lets you modify the Drop List, when this type of Tool has been used.
+	 *
+	 * @return the Amount of modified Items.
 	 */
-	public void onStatsAddedToTool(Gregtech_MetaTool gregtech_MetaTool, int aID);
+	@Override
+	public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
+			int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent);
 
 	/**
-	 * @return Damage the Tool receives when breaking a Block. 100 is one Damage Point (or 100 EU).
+	 * @return The Damage Bonus for this Type of Tool against Mobs. 1.0F is
+	 *         normal punch.
 	 */
-	public int getToolDamagePerBlockBreak();
+	@Override
+	public float getBaseDamage();
 
 	/**
-	 * @return Damage the Tool receives when converting the drops of a Block. 100 is one Damage Point (or 100 EU).
+	 * @return Basic Quality of the Tool, 0 is normal. If increased, it will
+	 *         increase the general quality of all Tools of this Type.
+	 *         Decreasing is also possible.
 	 */
-	public int getToolDamagePerDropConversion();
+	@Override
+	public int getBaseQuality();
 
-	/**
-	 * @return Damage the Tool receives when being used as Container Item. 100 is one use, however it is usually 8 times more than normal.
-	 */
-	public int getToolDamagePerContainerCraft();
+	@Override
+	public String getBreakingSound();
 
 	/**
-	 * @return Damage the Tool receives when being used as Weapon, 200 is the normal Value, 100 for actual Weapons.
+	 * @return Returns a broken Version of the Item.
 	 */
-	public int getToolDamagePerEntityAttack();
+	@Override
+	public ItemStack getBrokenItem(ItemStack aStack);
 
-	/**
-	 * @return Basic Quality of the Tool, 0 is normal. If increased, it will increase the general quality of all Tools of this Type. Decreasing is also possible.
-	 */
-	public int getBaseQuality();
+	@Override
+	public String getCraftingSound();
 
-	/**
-	 * @return The Damage Bonus for this Type of Tool against Mobs. 1.0F is normal punch.
-	 */
-	public float getBaseDamage();
+	@Override
+	public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity);
+
+	@Override
+	public int[] getEnchantmentLevels(ItemStack aStack);
+
+	@Override
+	public Enchantment[] getEnchantments(ItemStack aStack);
+
+	@Override
+	public String getEntityHitSound();
 
 	/**
-	 * @return This gets the Hurt Resistance time for Entities getting hit. (always does 1 as minimum)
+	 * @return This gets the Hurt Resistance time for Entities getting hit.
+	 *         (always does 1 as minimum)
 	 */
+	@Override
 	public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity);
 
+	@Override
+	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack);
+
 	/**
-	 * @return This is a multiplier for the Tool Speed. 1.0F = no special Speed.
+	 * @return the Damage actually done to the Mob.
 	 */
-	public float getSpeedMultiplier();
+	@Override
+	public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
+			EntityPlayer aPlayer);
 
 	/**
-	 * @return This is a multiplier for the Tool Speed. 1.0F = no special Durability.
+	 * @return This is a multiplier for the Tool Speed. 1.0F = no special
+	 *         Durability.
 	 */
+	@Override
 	public float getMaxDurabilityMultiplier();
 
-	public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity);
-
+	@Override
 	public String getMiningSound();
 
-	public String getCraftingSound();
-
-	public String getEntityHitSound();
-
-	public String getBreakingSound();
-
-	public Enchantment[] getEnchantments(ItemStack aStack);
+	/**
+	 * @return the Damage actually done to the Mob.
+	 */
+	@Override
+	public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
+			EntityPlayer aPlayer);
 
-	public int[] getEnchantmentLevels(ItemStack aStack);
+	@Override
+	public short[] getRGBa(boolean aIsToolHead, ItemStack aStack);
 
 	/**
-	 * @return If this Tool can be used for blocking Damage like a Sword.
+	 * @return This is a multiplier for the Tool Speed. 1.0F = no special Speed.
 	 */
-	public boolean canBlock();
+	@Override
+	public float getSpeedMultiplier();
 
 	/**
-	 * @return If this Tool can be used as an RC Crowbar.
+	 * @return Damage the Tool receives when breaking a Block. 100 is one Damage
+	 *         Point (or 100 EU).
 	 */
-	public boolean isCrowbar();
+	@Override
+	public int getToolDamagePerBlockBreak();
 
 	/**
-	 * @return If this Tool can be used as an BC Wrench.
+	 * @return Damage the Tool receives when being used as Container Item. 100
+	 *         is one use, however it is usually 8 times more than normal.
 	 */
-	public boolean isWrench();
+	@Override
+	public int getToolDamagePerContainerCraft();
 
 	/**
-	 * @return If this Tool can be used as Weapon i.e. if that is the main purpose.
+	 * @return Damage the Tool receives when converting the drops of a Block.
+	 *         100 is one Damage Point (or 100 EU).
 	 */
-	public boolean isWeapon();
+	@Override
+	public int getToolDamagePerDropConversion();
 
 	/**
-	 * @return If this Tool is a Ranged Weapon. Return false at isWeapon unless you have a Blade attached to your Bow/Gun or something
+	 * @return Damage the Tool receives when being used as Weapon, 200 is the
+	 *         normal Value, 100 for actual Weapons.
 	 */
-	public boolean isRangedWeapon();
+	@Override
+	public int getToolDamagePerEntityAttack();
 
 	/**
-	 * @return If this Tool can be used as Weapon i.e. if that is the main purpose.
+	 * @return If this Tool can be used as an RC Crowbar.
 	 */
-	public boolean isMiningTool();
+	@Override
+	public boolean isCrowbar();
 
 	/**
-	 * aBlock.getHarvestTool(aMetaData) can return the following Values for example.
-	 * "axe", "pickaxe", "sword", "shovel", "hoe", "grafter", "saw", "wrench", "crowbar", "file", "hammer", "plow", "plunger", "scoop", "screwdriver", "sense", "scythe", "softhammer", "cutter", "plasmatorch"
+	 * aBlock.getHarvestTool(aMetaData) can return the following Values for
+	 * example. "axe", "pickaxe", "sword", "shovel", "hoe", "grafter", "saw",
+	 * "wrench", "crowbar", "file", "hammer", "plow", "plunger", "scoop",
+	 * "screwdriver", "sense", "scythe", "softhammer", "cutter", "plasmatorch"
 	 *
-	 * @return If this is a minable Block. Tool Quality checks (like Diamond Tier or something) are separate from this check.
+	 * @return If this is a minable Block. Tool Quality checks (like Diamond
+	 *         Tier or something) are separate from this check.
 	 */
+	@Override
 	public boolean isMinableBlock(Block aBlock, byte aMetaData);
 
 	/**
-	 * This lets you modify the Drop List, when this type of Tool has been used.
-	 *
-	 * @return the Amount of modified Items.
+	 * @return If this Tool can be used as Weapon i.e. if that is the main
+	 *         purpose.
 	 */
-	public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent);
+	@Override
+	public boolean isMiningTool();
 
 	/**
-	 * @return Returns a broken Version of the Item.
+	 * @return If this Tool is a Ranged Weapon. Return false at isWeapon unless
+	 *         you have a Blade attached to your Bow/Gun or something
 	 */
-	public ItemStack getBrokenItem(ItemStack aStack);
+	@Override
+	public boolean isRangedWeapon();
 
 	/**
-	 * @return the Damage actually done to the Mob.
+	 * @return If this Tool can be used as Weapon i.e. if that is the main
+	 *         purpose.
 	 */
-	public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer);
+	@Override
+	public boolean isWeapon();
 
 	/**
-	 * @return the Damage actually done to the Mob.
+	 * @return If this Tool can be used as an BC Wrench.
 	 */
-	public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer);
+	public boolean isWrench();
 
-	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack);
+	/**
+	 * Called when this gets added to a Tool Item
+	 */
+	public void onStatsAddedToTool(Gregtech_MetaTool gregtech_MetaTool, int aID);
 
-	public short[] getRGBa(boolean aIsToolHead, ItemStack aStack);
-	
 	/**
 	 * Called when this gets added to a Tool Item
 	 */
+	@Override
 	public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID);
+
+	/**
+	 * Called when aPlayer crafts this Tool
+	 */
+	@Override
+	public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer);
 }
\ No newline at end of file