Par, var, begone! (#1104)

* Renamed parameters of ItemBlock subclasses

* Renamed damageDropped and getDamageValue method parameters of Block subclasses

* Removed trivially superfluous overrides of Block::quantityDropped, Block::isOpaqueCube and Block::renderAsNormalBlock

* Removed trivially superfluous overrides of Block::getItemDropped

* Cleaned up a few more block subclass method parameters

* Cleaned up obsolete Javadoc

* par1 -> block in ItemBlock Constructors

* Renamed arguments to drawGuiContainerForegroundLayer

* Cleaned up redundant casts

* Renamed arguments to drawGuiContainerBackgroundLayer

* Renamed arguments to Slot subclass constructors

* Renamed arguments to World subclass GT_DummyWorld

* Renamed parameters of updateProgressBar

* Renamed the rest of the par* parameters outside of GT_MinableOreGenerator which should be deleted

* Renamed most var1-var10 and a few more in generally non-dead code

* Renamed last varSomething variables

* Removed 3 fully dead classes used nowhere in the codebase, with obsolete unused code

89 files changed, 580 insertions, 921 deletions

diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java
index cc09b5768e..f6088caab3 100644
--- a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java
+++ b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java
@@ -40,7 +40,7 @@ public class Enchantment_Radioactivity extends EnchantmentDamage {
     }
 
     @Override
-    public boolean canApply(ItemStack par1ItemStack) {
+    public boolean canApply(ItemStack itemStack) {
         return false;
     }
 
diff --git a/src/main/java/gregtech/api/gui/GT_Container.java b/src/main/java/gregtech/api/gui/GT_Container.java
index 0f788d543b..2b7959d6cb 100644
--- a/src/main/java/gregtech/api/gui/GT_Container.java
+++ b/src/main/java/gregtech/api/gui/GT_Container.java
@@ -119,6 +119,9 @@ public class GT_Container extends Container {
             e.printStackTrace(GT_Log.err);
         }
 
+        // It looks like the rest of this code should ideally never be
+        // called, and might in fact never be called.
+
         ItemStack rStack = null;
         InventoryPlayer aPlayerInventory = aPlayer.inventory;
         Slot aSlot;
@@ -158,24 +161,24 @@ public class GT_Container extends Container {
                 aSlot = (Slot) this.inventorySlots.get(aSlotIndex);
                 if (aSlot != null) {
                     tTempStack = aSlot.getStack();
-                    ItemStack var13 = aPlayerInventory.getItemStack();
+                    ItemStack mouseStack = aPlayerInventory.getItemStack();
                     if (tTempStack != null) {
                         rStack = GT_Utility.copyOrNull(tTempStack);
                     }
                     if (tTempStack == null) {
-                        if (var13 != null && aSlot.isItemValid(var13)) {
-                            tTempStackSize = aMouseclick == 0 ? var13.stackSize : 1;
+                        if (mouseStack != null && aSlot.isItemValid(mouseStack)) {
+                            tTempStackSize = aMouseclick == 0 ? mouseStack.stackSize : 1;
                             if (tTempStackSize > aSlot.getSlotStackLimit()) {
                                 tTempStackSize = aSlot.getSlotStackLimit();
                             }
-                            aSlot.putStack(var13.splitStack(tTempStackSize));
+                            aSlot.putStack(mouseStack.splitStack(tTempStackSize));
 
-                            if (var13.stackSize == 0) {
+                            if (mouseStack.stackSize == 0) {
                                 aPlayerInventory.setItemStack(null);
                             }
                         }
                     } else if (aSlot.canTakeStack(aPlayer)) {
-                        if (var13 == null) {
+                        if (mouseStack == null) {
                             tTempStackSize = aMouseclick == 0 ? tTempStack.stackSize : (tTempStack.stackSize + 1) / 2;
                             aHoldStack = aSlot.decrStackSize(tTempStackSize);
                             aPlayerInventory.setItemStack(aHoldStack);
@@ -183,29 +186,29 @@ public class GT_Container extends Container {
                                 aSlot.putStack(null);
                             }
                             aSlot.onPickupFromSlot(aPlayer, aPlayerInventory.getItemStack());
-                        } else if (aSlot.isItemValid(var13)) {
-                            if (tTempStack.getItem() == var13.getItem() && tTempStack.getItemDamage() == var13.getItemDamage() && ItemStack.areItemStackTagsEqual(tTempStack, var13)) {
-                                tTempStackSize = aMouseclick == 0 ? var13.stackSize : 1;
+                        } else if (aSlot.isItemValid(mouseStack)) {
+                            if (tTempStack.getItem() == mouseStack.getItem() && tTempStack.getItemDamage() == mouseStack.getItemDamage() && ItemStack.areItemStackTagsEqual(tTempStack, mouseStack)) {
+                                tTempStackSize = aMouseclick == 0 ? mouseStack.stackSize : 1;
                                 if (tTempStackSize > aSlot.getSlotStackLimit() - tTempStack.stackSize) {
                                     tTempStackSize = aSlot.getSlotStackLimit() - tTempStack.stackSize;
                                 }
-                                if (tTempStackSize > var13.getMaxStackSize() - tTempStack.stackSize) {
-                                    tTempStackSize = var13.getMaxStackSize() - tTempStack.stackSize;
+                                if (tTempStackSize > mouseStack.getMaxStackSize() - tTempStack.stackSize) {
+                                    tTempStackSize = mouseStack.getMaxStackSize() - tTempStack.stackSize;
                                 }
-                                var13.splitStack(tTempStackSize);
-                                if (var13.stackSize == 0) {
+                                mouseStack.splitStack(tTempStackSize);
+                                if (mouseStack.stackSize == 0) {
                                     aPlayerInventory.setItemStack(null);
                                 }
                                 tTempStack.stackSize += tTempStackSize;
-                            } else if (var13.stackSize <= aSlot.getSlotStackLimit()) {
-                                aSlot.putStack(var13);
+                            } else if (mouseStack.stackSize <= aSlot.getSlotStackLimit()) {
+                                aSlot.putStack(mouseStack);
                                 aPlayerInventory.setItemStack(tTempStack);
                             }
-                        } else if (tTempStack.getItem() == var13.getItem() && var13.getMaxStackSize() > 1 && (!tTempStack.getHasSubtypes() || tTempStack.getItemDamage() == var13.getItemDamage()) && ItemStack.areItemStackTagsEqual(tTempStack, var13)) {
+                        } else if (tTempStack.getItem() == mouseStack.getItem() && mouseStack.getMaxStackSize() > 1 && (!tTempStack.getHasSubtypes() || tTempStack.getItemDamage() == mouseStack.getItemDamage()) && ItemStack.areItemStackTagsEqual(tTempStack, mouseStack)) {
                             tTempStackSize = tTempStack.stackSize;
 
-                            if (tTempStackSize > 0 && tTempStackSize + var13.stackSize <= var13.getMaxStackSize()) {
-                                var13.stackSize += tTempStackSize;
+                            if (tTempStackSize > 0 && tTempStackSize + mouseStack.stackSize <= mouseStack.getMaxStackSize()) {
+                                mouseStack.stackSize += tTempStackSize;
                                 tTempStack = aSlot.decrStackSize(tTempStackSize);
 
                                 if (tTempStack.stackSize == 0) {
@@ -219,20 +222,24 @@ public class GT_Container extends Container {
                     aSlot.onSlotChanged();
                 }
             }
+            // Did the player try to swap a slot with his hotbar using a
+            // number key from 1 to 9
+            // aMouseclick == 0 means number 1, aMouseclick == 8 means number 9
         } else if (aShifthold == 2 && aMouseclick >= 0 && aMouseclick < 9) {
             aSlot = (Slot) this.inventorySlots.get(aSlotIndex);
 
             if (aSlot.canTakeStack(aPlayer)) {
+                // get the stack at the specified hotbar slot.
                 tTempStack = aPlayerInventory.getStackInSlot(aMouseclick);
-                boolean var9 = tTempStack == null || aSlot.inventory == aPlayerInventory && aSlot.isItemValid(tTempStack);
+                boolean canSwap = tTempStack == null || aSlot.inventory == aPlayerInventory && aSlot.isItemValid(tTempStack);
                 tTempStackSize = -1;
 
-                if (!var9) {
+                if (!canSwap) {
                     tTempStackSize = aPlayerInventory.getFirstEmptyStack();
-                    var9 = tTempStackSize > -1;
+                    canSwap = tTempStackSize > -1;
                 }
 
-                if (var9 && aSlot.getHasStack()) {
+                if (canSwap && aSlot.getHasStack()) {
                     aHoldStack = aSlot.getStack();
                     aPlayerInventory.setInventorySlotContents(aMouseclick, aHoldStack);
 
@@ -300,92 +307,92 @@ public class GT_Container extends Container {
      * merges provided ItemStack with the first avaliable one in the container/player inventory
      */
     @Override
-    protected boolean mergeItemStack(ItemStack aStack, int aStartIndex, int aSlotCount, boolean par4) {
-        boolean var5 = false;
-        int var6 = aStartIndex;
+    protected boolean mergeItemStack(ItemStack aStack, int aStartIndex, int aSlotCount, boolean reverseOrder) {
+        boolean transferredStack = false;
+        int slotIndex = aStartIndex;
 
         mTileEntity.markDirty();
 
-        if (par4) {
-            var6 = aSlotCount - 1;
+        if (reverseOrder) {
+            slotIndex = aSlotCount - 1;
         }
 
-        Slot var7;
-        ItemStack var8;
+        Slot slot;
+        ItemStack itemStack;
 
         if (aStack.isStackable()) {
-            while (aStack.stackSize > 0 && (!par4 && var6 < aSlotCount || par4 && var6 >= aStartIndex)) {
-                var7 = (Slot) this.inventorySlots.get(var6);
-                var8 = var7.getStack();
-                if (!(var7 instanceof GT_Slot_Holo) && !(var7 instanceof GT_Slot_Output) && var7.isItemValid(aStack) && var8 != null && var8.getItem() == aStack.getItem() && (!aStack.getHasSubtypes() || aStack.getItemDamage() == var8.getItemDamage()) && ItemStack.areItemStackTagsEqual(aStack, var8)) {
-                    int var9 = var8.stackSize + aStack.stackSize;
-                    if (var8.stackSize < mTileEntity.getInventoryStackLimit()) {
-                        if (var9 <= aStack.getMaxStackSize()) {
+            while (aStack.stackSize > 0 && (!reverseOrder && slotIndex < aSlotCount || reverseOrder && slotIndex >= aStartIndex)) {
+                slot = (Slot) this.inventorySlots.get(slotIndex);
+                itemStack = slot.getStack();
+                if (!(slot instanceof GT_Slot_Holo) && !(slot instanceof GT_Slot_Output) && slot.isItemValid(aStack) && itemStack != null && itemStack.getItem() == aStack.getItem() && (!aStack.getHasSubtypes() || aStack.getItemDamage() == itemStack.getItemDamage()) && ItemStack.areItemStackTagsEqual(aStack, itemStack)) {
+                    int combinedStackSize = itemStack.stackSize + aStack.stackSize;
+                    if (itemStack.stackSize < mTileEntity.getInventoryStackLimit()) {
+                        if (combinedStackSize <= aStack.getMaxStackSize()) {
                             aStack.stackSize = 0;
-                            var8.stackSize = var9;
-                            var7.onSlotChanged();
-                            var5 = true;
-                        } else if (var8.stackSize < aStack.getMaxStackSize()) {
-                            aStack.stackSize -= aStack.getMaxStackSize() - var8.stackSize;
-                            var8.stackSize = aStack.getMaxStackSize();
-                            var7.onSlotChanged();
-                            var5 = true;
+                            itemStack.stackSize = combinedStackSize;
+                            slot.onSlotChanged();
+                            transferredStack = true;
+                        } else if (itemStack.stackSize < aStack.getMaxStackSize()) {
+                            aStack.stackSize -= aStack.getMaxStackSize() - itemStack.stackSize;
+                            itemStack.stackSize = aStack.getMaxStackSize();
+                            slot.onSlotChanged();
+                            transferredStack = true;
                         }
                     }
                 }
 
-                if (par4) {
-                    --var6;
+                if (reverseOrder) {
+                    --slotIndex;
                 } else {
-                    ++var6;
+                    ++slotIndex;
                 }
             }
         }
         if (aStack.stackSize > 0) {
-            if (par4) {
-                var6 = aSlotCount - 1;
+            if (reverseOrder) {
+                slotIndex = aSlotCount - 1;
             } else {
-                var6 = aStartIndex;
+                slotIndex = aStartIndex;
             }
 
-            while (!par4 && var6 < aSlotCount || par4 && var6 >= aStartIndex) {
-                var7 = (Slot) this.inventorySlots.get(var6);
-                var8 = var7.getStack();
+            while (!reverseOrder && slotIndex < aSlotCount || reverseOrder && slotIndex >= aStartIndex) {
+                slot = (Slot) this.inventorySlots.get(slotIndex);
+                itemStack = slot.getStack();
 
-                if (var7.isItemValid(aStack) && var8 == null) {
-                    int var10 = Math.min(aStack.stackSize, mTileEntity.getInventoryStackLimit());
-                    var7.putStack(GT_Utility.copyAmount(var10, aStack));
-                    var7.onSlotChanged();
-                    aStack.stackSize -= var10;
-                    var5 = true;
+                if (slot.isItemValid(aStack) && itemStack == null) {
+                    int quantityToTransfer = Math.min(aStack.stackSize, mTileEntity.getInventoryStackLimit());
+                    slot.putStack(GT_Utility.copyAmount(quantityToTransfer, aStack));
+                    slot.onSlotChanged();
+                    aStack.stackSize -= quantityToTransfer;
+                    transferredStack = true;
                     break;
                 }
 
-                if (par4) {
-                    --var6;
+                if (reverseOrder) {
+                    --slotIndex;
                 } else {
-                    ++var6;
+                    ++slotIndex;
                 }
             }
         }
 
-        return var5;
+        return transferredStack;
     }
 
     @Override
-    protected Slot addSlotToContainer(Slot par1Slot) {
+    protected Slot addSlotToContainer(Slot slot) {
         try {
-            return super.addSlotToContainer(par1Slot);
+            return super.addSlotToContainer(slot);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
-        return par1Slot;
+        return slot;
     }
 
     @Override
-    public void addCraftingToCrafters(ICrafting par1ICrafting) {
+    public void addCraftingToCrafters(ICrafting player) {
         try {
-            super.addCraftingToCrafters(par1ICrafting);
+            super.addCraftingToCrafters(player);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
@@ -402,9 +409,9 @@ public class GT_Container extends Container {
     }
 
     @Override
-    public void removeCraftingFromCrafters(ICrafting par1ICrafting) {
+    public void removeCraftingFromCrafters(ICrafting player) {
         try {
-            super.removeCraftingFromCrafters(par1ICrafting);
+            super.removeCraftingFromCrafters(player);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
@@ -420,9 +427,9 @@ public class GT_Container extends Container {
     }
 
     @Override
-    public boolean enchantItem(EntityPlayer par1EntityPlayer, int par2) {
+    public boolean enchantItem(EntityPlayer player, int slotIndex) {
         try {
-            return super.enchantItem(par1EntityPlayer, par2);
+            return super.enchantItem(player, slotIndex);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
@@ -430,9 +437,9 @@ public class GT_Container extends Container {
     }
 
     @Override
-    public Slot getSlotFromInventory(IInventory par1IInventory, int par2) {
+    public Slot getSlotFromInventory(IInventory inventory, int slotIndex) {
         try {
-            return super.getSlotFromInventory(par1IInventory, par2);
+            return super.getSlotFromInventory(inventory, slotIndex);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
@@ -440,9 +447,9 @@ public class GT_Container extends Container {
     }
 
     @Override
-    public Slot getSlot(int par1) {
+    public Slot getSlot(int slotIndex) {
         try {
-            if (this.inventorySlots.size() > par1) return super.getSlot(par1);
+            if (this.inventorySlots.size() > slotIndex) return super.getSlot(slotIndex);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
@@ -450,9 +457,9 @@ public class GT_Container extends Container {
     }
 
     @Override
-    public boolean func_94530_a(ItemStack par1ItemStack, Slot par2Slot) {
+    public boolean func_94530_a(ItemStack itemStack, Slot slot) {
         try {
-            return super.func_94530_a(par1ItemStack, par2Slot);
+            return super.func_94530_a(itemStack, slot);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
@@ -460,18 +467,18 @@ public class GT_Container extends Container {
     }
 
     @Override
-    protected void retrySlotClick(int par1, int par2, boolean par3, EntityPlayer par4EntityPlayer) {
+    protected void retrySlotClick(int slotIndex, int mouseButton, boolean aShifthold, EntityPlayer player) {
         try {
-            super.retrySlotClick(par1, par2, par3, par4EntityPlayer);
+            super.retrySlotClick(slotIndex, mouseButton, aShifthold, player);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
     }
 
     @Override
-    public void onContainerClosed(EntityPlayer par1EntityPlayer) {
+    public void onContainerClosed(EntityPlayer player) {
         try {
-            super.onContainerClosed(par1EntityPlayer);
+            super.onContainerClosed(player);
             mTileEntity.closeInventory();
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
@@ -479,45 +486,45 @@ public class GT_Container extends Container {
     }
 
     @Override
-    public void onCraftMatrixChanged(IInventory par1IInventory) {
+    public void onCraftMatrixChanged(IInventory inventory) {
         try {
-            super.onCraftMatrixChanged(par1IInventory);
+            super.onCraftMatrixChanged(inventory);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
     }
 
     @Override
-    public void putStackInSlot(int par1, ItemStack par2ItemStack) {
+    public void putStackInSlot(int slotIndex, ItemStack itemStack) {
         try {
-            super.putStackInSlot(par1, par2ItemStack);
+            super.putStackInSlot(slotIndex, itemStack);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
     }
 
     @Override
-    public void putStacksInSlots(ItemStack[] par1ArrayOfItemStack) {
+    public void putStacksInSlots(ItemStack[] itemStacks) {
         try {
-            super.putStacksInSlots(par1ArrayOfItemStack);
+            super.putStacksInSlots(itemStacks);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
     }
 
     @Override
-    public void updateProgressBar(int par1, int par2) {
+    public void updateProgressBar(int id, int value) {
         try {
-            super.updateProgressBar(par1, par2);
+            super.updateProgressBar(id, value);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
     }
 
     @Override
-    public short getNextTransactionID(InventoryPlayer par1InventoryPlayer) {
+    public short getNextTransactionID(InventoryPlayer inventoryPlayer) {
         try {
-            return super.getNextTransactionID(par1InventoryPlayer);
+            return super.getNextTransactionID(inventoryPlayer);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
@@ -525,9 +532,9 @@ public class GT_Container extends Container {
     }
 
     @Override
-    public boolean isPlayerNotUsingContainer(EntityPlayer par1EntityPlayer) {
+    public boolean isPlayerNotUsingContainer(EntityPlayer player) {
         try {
-            return super.isPlayerNotUsingContainer(par1EntityPlayer);
+            return super.isPlayerNotUsingContainer(player);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
@@ -535,9 +542,9 @@ public class GT_Container extends Container {
     }
 
     @Override
-    public void setPlayerIsPresent(EntityPlayer par1EntityPlayer, boolean par2) {
+    public void setPlayerIsPresent(EntityPlayer player, boolean value) {
         try {
-            super.setPlayerIsPresent(par1EntityPlayer, par2);
+            super.setPlayerIsPresent(player, value);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
@@ -553,9 +560,9 @@ public class GT_Container extends Container {
     }
 
     @Override
-    public boolean canDragIntoSlot(Slot par1Slot) {
+    public boolean canDragIntoSlot(Slot slot) {
         try {
-            return super.canDragIntoSlot(par1Slot);
+            return super.canDragIntoSlot(slot);
         } catch (Throwable e) {
             e.printStackTrace(GT_Log.err);
         }
diff --git a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
index 7c7e6ec38a..a6a6064976 100644
--- a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
+++ b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
@@ -87,45 +87,45 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
         mTimer++;
 
         for (Object crafter : this.crafters) {
-            ICrafting var1 = (ICrafting) crafter;
+            ICrafting player = (ICrafting) crafter;
             if (mTimer % 500 == 10 || oEnergy != mEnergy) {
-                var1.sendProgressBarUpdate(this, 0, mEnergy & 65535);
-                var1.sendProgressBarUpdate(this, 1, mEnergy >>> 16);
+                player.sendProgressBarUpdate(this, 0, mEnergy & 65535);
+                player.sendProgressBarUpdate(this, 1, mEnergy >>> 16);
             }
             if (mTimer % 500 == 10 || oStorage != mStorage) {
-                var1.sendProgressBarUpdate(this, 2, mStorage & 65535);
-                var1.sendProgressBarUpdate(this, 3, mStorage >>> 16);
+                player.sendProgressBarUpdate(this, 2, mStorage & 65535);
+                player.sendProgressBarUpdate(this, 3, mStorage >>> 16);
             }
             if (mTimer % 500 == 10 || oOutput != mOutput) {
-                var1.sendProgressBarUpdate(this, 4, mOutput);
+                player.sendProgressBarUpdate(this, 4, mOutput);
             }
             if (mTimer % 500 == 10 || oInput != mInput) {
-                var1.sendProgressBarUpdate(this, 5, mInput);
+                player.sendProgressBarUpdate(this, 5, mInput);
             }
             if (mTimer % 500 == 10 || oDisplayErrorCode != mDisplayErrorCode) {
-                var1.sendProgressBarUpdate(this, 6, mDisplayErrorCode);
+                player.sendProgressBarUpdate(this, 6, mDisplayErrorCode);
             }
             if (mTimer % 500 == 10 || oProgressTime != mProgressTime) {
-                var1.sendProgressBarUpdate(this, 11, mProgressTime & 65535);
-                var1.sendProgressBarUpdate(this, 12, mProgressTime >>> 16);
+                player.sendProgressBarUpdate(this, 11, mProgressTime & 65535);
+                player.sendProgressBarUpdate(this, 12, mProgressTime >>> 16);
             }
             if (mTimer % 500 == 10 || oMaxProgressTime != mMaxProgressTime) {
-                var1.sendProgressBarUpdate(this, 13, mMaxProgressTime & 65535);
-                var1.sendProgressBarUpdate(this, 14, mMaxProgressTime >>> 16);
+                player.sendProgressBarUpdate(this, 13, mMaxProgressTime & 65535);
+                player.sendProgressBarUpdate(this, 14, mMaxProgressTime >>> 16);
             }
             if (mTimer % 500 == 10 || oID != mID) {
-                var1.sendProgressBarUpdate(this, 15, mID);
+                player.sendProgressBarUpdate(this, 15, mID);
             }
             if (mTimer % 500 == 10 || oActive != mActive) {
-                var1.sendProgressBarUpdate(this, 16, mActive);
+                player.sendProgressBarUpdate(this, 16, mActive);
             }
             if (mTimer % 500 == 10 || oSteam != mSteam) {
-                var1.sendProgressBarUpdate(this, 17, mSteam & 65535);
-                var1.sendProgressBarUpdate(this, 18, mSteam >>> 16);
+                player.sendProgressBarUpdate(this, 17, mSteam & 65535);
+                player.sendProgressBarUpdate(this, 18, mSteam >>> 16);
             }
             if (mTimer % 500 == 10 || oSteamStorage != mSteamStorage) {
-                var1.sendProgressBarUpdate(this, 19, mSteamStorage & 65535);
-                var1.sendProgressBarUpdate(this, 20, mSteamStorage >>> 16);
+                player.sendProgressBarUpdate(this, 19, mSteamStorage & 65535);
+                player.sendProgressBarUpdate(this, 20, mSteamStorage >>> 16);
             }
         }
 
@@ -144,59 +144,59 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
 
     @SideOnly(Side.CLIENT)
     @Override
-    public void updateProgressBar(int par1, int par2) {
-        super.updateProgressBar(par1, par2);
-        switch (par1) {
+    public void updateProgressBar(int id, int value) {
+        super.updateProgressBar(id, value);
+        switch (id) {
             case 0:
-                mEnergy = mEnergy & 0xffff0000 | par2 & 0x0000ffff;
+                mEnergy = mEnergy & 0xffff0000 | value & 0x0000ffff;
                 break;
             case 1:
-                mEnergy = mEnergy & 0x0000ffff | par2 << 16;
+                mEnergy = mEnergy & 0x0000ffff | value << 16;
                 break;
             case 2:
-                mStorage = mStorage & 0xffff0000 | par2 & 0x0000ffff;
+                mStorage = mStorage & 0xffff0000 | value & 0x0000ffff;
                 break;
             case 3:
-                mStorage = mStorage & 0x0000ffff | par2 << 16;
+                mStorage = mStorage & 0x0000ffff | value << 16;
                 break;
             case 4:
-                mOutput = par2;
+                mOutput = value;
                 break;
             case 5:
-                mInput = par2;
+                mInput = value;
                 break;
             case 6:
-                mDisplayErrorCode = par2;
+                mDisplayErrorCode = value;
                 break;
             case 11:
-                mProgressTime = mProgressTime & 0xffff0000 | par2;
+                mProgressTime = mProgressTime & 0xffff0000 | value;
                 break;
             case 12:
-                mProgressTime = mProgressTime & 0x0000ffff | par2 << 16;
+                mProgressTime = mProgressTime & 0x0000ffff | value << 16;
                 break;
             case 13:
-                mMaxProgressTime = mMaxProgressTime & 0xffff0000 | par2 & 0x0000ffff;
+                mMaxProgressTime = mMaxProgressTime & 0xffff0000 | value & 0x0000ffff;
                 break;
             case 14:
-                mMaxProgressTime = mMaxProgressTime & 0x0000ffff | par2 << 16;
+                mMaxProgressTime = mMaxProgressTime & 0x0000ffff | value << 16;
                 break;
             case 15:
-                mID = par2;
+                mID = value;
                 break;
             case 16:
-                mActive = par2;
+                mActive = value;
                 break;
             case 17:
-                mSteam = mSteam & 0xffff0000 | par2 & 0x0000ffff;
+                mSteam = mSteam & 0xffff0000 | value & 0x0000ffff;
                 break;
             case 18:
-                mSteam = mSteam & 0x0000ffff | par2 << 16;
+                mSteam = mSteam & 0x0000ffff | value << 16;
                 break;
             case 19:
-                mSteamStorage = mSteamStorage & 0xffff0000 | par2 & 0x0000ffff;
+                mSteamStorage = mSteamStorage & 0xffff0000 | value & 0x0000ffff;
                 break;
             case 20:
-                mSteamStorage = mSteamStorage & 0x0000ffff | par2 << 16;
+                mSteamStorage = mSteamStorage & 0x0000ffff | value << 16;
                 break;
         }
     }
diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
index e26f86f746..78378a52c7 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
@@ -287,31 +287,31 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank {
         mStuttering = getMachine().mStuttering;
 
         for (Object crafter : this.crafters) {
-            ICrafting var1 = (ICrafting) crafter;
-            var1.sendProgressBarUpdate(this, 102, mFluidTransfer ? 1 : 0);
-            var1.sendProgressBarUpdate(this, 103, mItemTransfer ? 1 : 0);
-            var1.sendProgressBarUpdate(this, 104, mStuttering ? 1 : 0);
+            ICrafting player = (ICrafting) crafter;
+            player.sendProgressBarUpdate(this, 102, mFluidTransfer ? 1 : 0);
+            player.sendProgressBarUpdate(this, 103, mItemTransfer ? 1 : 0);
+            player.sendProgressBarUpdate(this, 104, mStuttering ? 1 : 0);
         }
     }
 
     @Override
-    public void addCraftingToCrafters(ICrafting par1ICrafting) {
-        super.addCraftingToCrafters(par1ICrafting);
+    public void addCraftingToCrafters(ICrafting player) {
+        super.addCraftingToCrafters(player);
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void updateProgressBar(int par1, int par2) {
-        super.updateProgressBar(par1, par2);
-        switch (par1) {
+    public void updateProgressBar(int id, int value) {
+        super.updateProgressBar(id, value);
+        switch (id) {
             case 102:
-                mFluidTransfer = (par2 != 0);
+                mFluidTransfer = (value != 0);
                 break;
             case 103:
-                mItemTransfer = (par2 != 0);
+                mItemTransfer = (value != 0);
                 break;
             case 104:
-                mStuttering = (par2 != 0);
+                mStuttering = (value != 0);
                 break;
         }
     }
diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
index b78f829282..4d533f76c3 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
@@ -68,10 +68,10 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine {
         else
             mContent = 0;
         for (Object crafter : this.crafters) {
-            ICrafting var1 = (ICrafting) crafter;
+            ICrafting player = (ICrafting) crafter;
             if (mTimer % 500 == 0 || oContent != mContent) {
-                var1.sendProgressBarUpdate(this, 100, mContent & 65535);
-                var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
+                player.sendProgressBarUpdate(this, 100, mContent & 65535);
+                player.sendProgressBarUpdate(this, 101, mContent >>> 16);
             }
         }
 
@@ -80,14 +80,14 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void updateProgressBar(int par1, int par2) {
-        super.updateProgressBar(par1, par2);
-        switch (par1) {
+    public void updateProgressBar(int id, int value) {
+        super.updateProgressBar(id, value);
+        switch (id) {
             case 100:
-                mContent = mContent & 0xffff0000 | par2 & 0x0000ffff;
+                mContent = mContent & 0xffff0000 | value & 0x0000ffff;
                 break;
             case 101:
-                mContent = mContent & 0xffff | par2 << 16;
+                mContent = mContent & 0xffff | value << 16;
                 break;
         }
     }
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer.java b/src/main/java/gregtech/api/gui/GT_GUIContainer.java
index af6c37a8dd..1f1ae9037e 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer.java
@@ -36,19 +36,19 @@ public class GT_GUIContainer extends GuiContainer {
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         //
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
         mc.renderEngine.bindTexture(mGUIbackground);
     }
 
     @Override
-    public void drawScreen(int par1, int par2, float par3) {
+    public void drawScreen(int mouseX, int mouseY, float parTicks) {
         try {
-            super.drawScreen(par1, par2, par3);
+            super.drawScreen(mouseX, mouseY, parTicks);
         } catch (Throwable e) {
             try {
                 Tessellator.instance.draw();
@@ -86,9 +86,9 @@ public class GT_GUIContainer extends GuiContainer {
 
     /*
     @Override
-    protected void drawSlotInventory(Slot par1Slot) {
+    protected void drawSlotInventory(Slot slot) {
         try {
-        	super.drawSlotInventory(par1Slot);
+        	super.drawSlotInventory(slot);
         } catch(Throwable e) {
             try {
             	Tessellator.instance.draw();
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java
index defa392b07..d25abd9137 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java
@@ -30,7 +30,7 @@ import org.lwjgl.opengl.GL11;
 public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements GT_IToolTipRenderer, GT_ITabRenderer {
 
     public final GT_ContainerMetaTile_Machine mContainer;
-    
+
     protected GT_GuiTooltipManager mTooltipManager = new GT_GuiTooltipManager();
     protected GT_TooltipDataCache mTooltipCache = new GT_TooltipDataCache();
 
@@ -53,7 +53,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements
     public GT_GUIContainerMetaTile_Machine(GT_ContainerMetaTile_Machine aContainer, String aGUIbackground) {
         super(aContainer, aGUIbackground);
         mContainer = aContainer;
-        
+
         DisplayStyle preferredDisplayStyle = GT_Mod.gregtechproxy.mCoverTabsVisible
         ? (GT_Mod.gregtechproxy.mCoverTabsFlipped ? DisplayStyle.INVERSE : DisplayStyle.NORMAL)
         : DisplayStyle.NONE;
@@ -148,7 +148,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements
         // Check for clicked tabs
         coverTabs.onMouseClicked(mouseX, mouseY, mouseButton);
     }
-    
+
     @Override
     public void initGui() {
         super.initGui();
@@ -173,8 +173,8 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements
 
     // GT_IToolTipRenderer and GT_ITabRenderer implementations
     @Override
-    public void drawHoveringText(List text, int x, int y, FontRenderer font) {
-        super.drawHoveringText(text, x, y, font);
+    public void drawHoveringText(List text, int mouseX, int mouseY, FontRenderer font) {
+        super.drawHoveringText(text, mouseX, mouseY, font);
     }
     @Override
     public int getGuiTop() {
@@ -191,7 +191,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements
     @Override
     public FontRenderer getFontRenderer() {
         return fontRendererObj;
-    }    
+    }
     @Override
     public RenderItem getItemRenderer() {
         return itemRender;
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java
index 15b23634c4..0a25c6fb9a 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java
@@ -20,13 +20,13 @@ public class GT_GUIContainer_1by1 extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString(mName, 8, 4, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java
index ae17087670..faa8e4a14f 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java
@@ -20,13 +20,13 @@ public class GT_GUIContainer_2by2 extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString(mName, 8, 4, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2_Fluid.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2_Fluid.java
index b6c00046f7..355914cc00 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2_Fluid.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2_Fluid.java
@@ -16,14 +16,14 @@ public class GT_GUIContainer_2by2_Fluid extends GT_GUIContainerMetaTile_Machine
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
         fontRendererObj.drawString(mName, 8, 6, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java
index 2c95e415d9..f53ee8a975 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java
@@ -20,13 +20,13 @@ public class GT_GUIContainer_3by3 extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString(mName, 8, 4, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java
index 0e94990a99..6c28653c0f 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java
@@ -20,13 +20,13 @@ public class GT_GUIContainer_4by4 extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString(mName, 8, 4, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java
index b8b33ebb15..b44b6280ae 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java
@@ -17,7 +17,7 @@ public class GT_GUIContainer_BasicTank extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
         fontRendererObj.drawString(mName, 8, 6, 4210752);
         if (mContainer != null) {
@@ -27,8 +27,8 @@ public class GT_GUIContainer_BasicTank extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MaintenanceHatch.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MaintenanceHatch.java
index e827e21fab..7f98e8b86a 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MaintenanceHatch.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MaintenanceHatch.java
@@ -12,14 +12,14 @@ public class GT_GUIContainer_MaintenanceHatch extends GT_GUIContainerMetaTile_Ma
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString("Maintenance Hatch", 8, 4, 4210752);
         fontRendererObj.drawString("Click with Tool to repair.", 8, 12, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
index f84b8547bc..8a1987df83 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
@@ -29,7 +29,7 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
 
         // If text is drawn iterate down GUI 8 pixels (height of characters).
         int line_counter = 7;
@@ -73,43 +73,43 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin
 
 
         if (mContainer != null) {//(mWrench ? 0 : 1) | (mScrewdriver ? 0 : 2) | (mSoftHammer ? 0 : 4) | (mHardHammer ? 0 : 8) | (mSolderingTool ? 0 : 16) | (mCrowbar ? 0 : 32) | (mMachine ? 0 : 64));
-            if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 1) != 0) {
+            if ((mContainer.mDisplayErrorCode & 1) != 0) {
                 fontRendererObj.drawString(GT_Utility.trans("132", "Pipe is loose."), 10, line_counter, 16448255);
                 line_counter += 8;
             }
 
-            if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 2) != 0) {
+            if ((mContainer.mDisplayErrorCode & 2) != 0) {
                 fontRendererObj.drawString(GT_Utility.trans("133", "Screws are loose."), 10, line_counter, 16448255);
                 line_counter += 8;
             }
 
-            if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 4) != 0) {
+            if ((mContainer.mDisplayErrorCode & 4) != 0) {
                 fontRendererObj.drawString(GT_Utility.trans("134", "Something is stuck."), 10, line_counter, 16448255);
                 line_counter += 8;
             }
 
-            if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 8) != 0) {
+            if ((mContainer.mDisplayErrorCode & 8) != 0) {
                 fontRendererObj.drawString(GT_Utility.trans("135", "Platings are dented."), 10, line_counter, 16448255);
                 line_counter += 8;
             }
 
-            if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 16) != 0) {
+            if ((mContainer.mDisplayErrorCode & 16) != 0) {
                 fontRendererObj.drawString(GT_Utility.trans("136", "Circuitry burned out."), 10, line_counter, 16448255);
                 line_counter += 8;
             }
 
-            if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 32) != 0) {
+            if ((mContainer.mDisplayErrorCode & 32) != 0) {
                 fontRendererObj.drawString(GT_Utility.trans("137", "That doesn't belong there."), 10, line_counter, 16448255);
                 line_counter += 8;
             }
 
-            if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 64) != 0) {
+            if ((mContainer.mDisplayErrorCode & 64) != 0) {
                 fontRendererObj.drawString(GT_Utility.trans("138", "Incomplete Structure."), 10, line_counter, 16448255);
                 line_counter += 8;
             }
 
-            if (((GT_Container_MultiMachine) mContainer).mDisplayErrorCode == 0) {
-                if (((GT_Container_MultiMachine) mContainer).mActive == 0) {
+            if (mContainer.mDisplayErrorCode == 0) {
+                if (mContainer.mActive == 0) {
                     fontRendererObj.drawString(GT_Utility.trans("139", "Hit with Soft Mallet"), 10, line_counter, 16448255);
                     line_counter += 8;
                     fontRendererObj.drawString(GT_Utility.trans("140", "to (re-)start the Machine"), 10, line_counter, 16448255);
@@ -141,8 +141,8 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_SpecialFilter.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_SpecialFilter.java
index 84f6ae68ea..8f43dffffa 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_SpecialFilter.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_SpecialFilter.java
@@ -9,8 +9,8 @@ public class GT_GUIContainer_SpecialFilter extends GT_GUIContainerMetaTile_Machi
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/api/gui/GT_GUIScreen.java b/src/main/java/gregtech/api/gui/GT_GUIScreen.java
index a7ab6e269b..0c2dbb0481 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIScreen.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIScreen.java
@@ -266,8 +266,8 @@ public abstract class GT_GUIScreen extends GuiScreen implements GT_IToolTipRende
 	 * GT_IToolTipRenderer
 	 */
 	@Override
-	public void drawHoveringText(List par1List, int par2, int par3, FontRenderer render) {
-		super.drawHoveringText(par1List, par2, par3, render);
+	public void drawHoveringText(List text, int mouseX, int mouseY, FontRenderer render) {
+		super.drawHoveringText(text, mouseX, mouseY, render);
 	}
 	@Override
 	public FontRenderer getFontRenderer() {
diff --git a/src/main/java/gregtech/api/gui/GT_Slot_Armor.java b/src/main/java/gregtech/api/gui/GT_Slot_Armor.java
index 0359884a5e..3b454aee0e 100644
--- a/src/main/java/gregtech/api/gui/GT_Slot_Armor.java
+++ b/src/main/java/gregtech/api/gui/GT_Slot_Armor.java
@@ -9,9 +9,9 @@ public class GT_Slot_Armor extends Slot {
     final int mArmorType;
     final EntityPlayer mPlayer;
 
-    public GT_Slot_Armor(IInventory par2IInventory, int par3, int par4, int par5, int par6, EntityPlayer aPlayer) {
-        super(par2IInventory, par3, par4, par5);
-        mArmorType = par6;
+    public GT_Slot_Armor(IInventory inventory, int slotIndex, int xPos, int yPos, int armorType, EntityPlayer aPlayer) {
+        super(inventory, slotIndex, xPos, yPos);
+        mArmorType = armorType;
         mPlayer = aPlayer;
     }
 
diff --git a/src/main/java/gregtech/api/gui/GT_Slot_DataOrb.java b/src/main/java/gregtech/api/gui/GT_Slot_DataOrb.java
index ae30f3a5bb..0a78e3f0b3 100644
--- a/src/main/java/gregtech/api/gui/GT_Slot_DataOrb.java
+++ b/src/main/java/gregtech/api/gui/GT_Slot_DataOrb.java
@@ -6,8 +6,8 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 public class GT_Slot_DataOrb extends Slot {
-    public GT_Slot_DataOrb(IInventory par1iInventory, int par2, int par3, int par4) {
-        super(par1iInventory, par2, par3, par4);
+    public GT_Slot_DataOrb(IInventory inventory, int slotIndex, int xPos, int yPos) {
+        super(inventory, slotIndex, xPos, yPos);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_Slot_Holo.java b/src/main/java/gregtech/api/gui/GT_Slot_Holo.java
index 403745bc03..ea1b8b82f8 100644
--- a/src/main/java/gregtech/api/gui/GT_Slot_Holo.java
+++ b/src/main/java/gregtech/api/gui/GT_Slot_Holo.java
@@ -15,16 +15,16 @@ public class GT_Slot_Holo extends Slot {
             mCanStackItem;
     public int mMaxStacksize = 127;
 
-    public GT_Slot_Holo(IInventory par1iInventory, int par2, int par3, int par4, boolean aCanInsertItem, boolean aCanStackItem, int aMaxStacksize) {
-        super(par1iInventory, par2, par3, par4);
+    public GT_Slot_Holo(IInventory inventory, int slotIndex, int xPos, int yPos, boolean aCanInsertItem, boolean aCanStackItem, int aMaxStacksize) {
+        super(inventory, slotIndex, xPos, yPos);
         mCanInsertItem = aCanInsertItem;
         mCanStackItem = aCanStackItem;
         mMaxStacksize = aMaxStacksize;
-        mSlotIndex = par2;
+        mSlotIndex = slotIndex;
     }
 
     @Override
-    public boolean isItemValid(ItemStack par1ItemStack) {
+    public boolean isItemValid(ItemStack itemStack) {
         return mCanInsertItem;
     }
 
@@ -39,14 +39,14 @@ public class GT_Slot_Holo extends Slot {
     }
 
     @Override
-    public ItemStack decrStackSize(int par1) {
+    public ItemStack decrStackSize(int amount) {
         if (!mCanStackItem)
             return null;
-        return super.decrStackSize(par1);
+        return super.decrStackSize(amount);
     }
 
     @Override
-    public boolean canTakeStack(EntityPlayer par1EntityPlayer) {
+    public boolean canTakeStack(EntityPlayer player) {
         return false;
     }
 
diff --git a/src/main/java/gregtech/api/gui/GT_Slot_Output.java b/src/main/java/gregtech/api/gui/GT_Slot_Output.java
index bf10769f55..d348e4e236 100644
--- a/src/main/java/gregtech/api/gui/GT_Slot_Output.java
+++ b/src/main/java/gregtech/api/gui/GT_Slot_Output.java
@@ -5,12 +5,12 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 public class GT_Slot_Output extends Slot {
-    public GT_Slot_Output(IInventory par1iInventory, int par2, int par3, int par4) {
-        super(par1iInventory, par2, par3, par4);
+    public GT_Slot_Output(IInventory inventory, int slotIndex, int xPos, int yPos) {
+        super(inventory, slotIndex, xPos, yPos);
     }
 
     @Override
-    public boolean isItemValid(ItemStack par1ItemStack) {
+    public boolean isItemValid(ItemStack itemStack) {
         return false;
     }
 }
diff --git a/src/main/java/gregtech/api/gui/GT_Slot_Render.java b/src/main/java/gregtech/api/gui/GT_Slot_Render.java
index 270c758536..dd11aa6305 100644
--- a/src/main/java/gregtech/api/gui/GT_Slot_Render.java
+++ b/src/main/java/gregtech/api/gui/GT_Slot_Render.java
@@ -5,8 +5,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
 public class GT_Slot_Render extends GT_Slot_Holo {
-    public GT_Slot_Render(IInventory par1iInventory, int par2, int par3, int par4) {
-        super(par1iInventory, par2, par3, par4, false, false, 0);
+    public GT_Slot_Render(IInventory inventory, int slotIndex, int xPos, int yPos) {
+        super(inventory, slotIndex, xPos, yPos, false, false, 0);
     }
 
     /**
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java
index e2ea65c482..abee1774f9 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java
@@ -11,7 +11,7 @@ public class GT_GuiTooltipManager {
         int getGuiTop();
         int getXSize();
         FontRenderer getFontRenderer();
-        void drawHoveringText(List<String> par1List, int par2, int par3, FontRenderer font);
+        void drawHoveringText(List<String> text, int mouseX, int mouseY, FontRenderer font);
     }
 
     private static final long DELAY = 5;
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
index 8c6da608fd..f92a403b60 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
@@ -119,7 +119,7 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil
     /**
      * Called when rightclicking the TileEntity
      */
-    boolean onRightclick(EntityPlayer aPlayer, byte aSide, float par1, float par2, float par3);
+    boolean onRightclick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ);
 
     float getBlastResistance(byte aSide);
 
diff --git a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
index 12d69cd0ec..2a20ac4972 100644
--- a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
+++ b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
@@ -23,7 +23,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import java.util.List;
-import java.util.Random;
 
 public class GT_Block_LongDistancePipe extends GT_Generic_Block {
     public IIconContainer[] mIcons;
@@ -32,11 +31,11 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
         setStepSound(soundTypeMetal);
         setCreativeTab(GregTech_API.TAB_GREGTECH);
         GregTech_API.registerMachineBlock(this, -1);
-        
+
         GT_LanguageManager.addStringLocalization(getUnlocalizedName()+".0.name", "Long Distance Fluid Pipeline Pipe");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName()+".1.name", "Long Distance Item Pipeline Pipe");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
-        
+
         ItemList.Long_Distance_Pipeline_Fluid_Pipe.set(new ItemStack(this, 1, 0));
         ItemList.Long_Distance_Pipeline_Item_Pipe.set(new ItemStack(this, 1, 1));
         mIcons = new IIconContainer[]{Textures.BlockIcons.LONG_DISTANCE_PIPE_FLUID, Textures.BlockIcons.LONG_DISTANCE_PIPE_ITEM};
@@ -49,9 +48,9 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
         }
     }
     @Override
-    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) {
+    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
         GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
-        super.breakBlock(aWorld, aX, aY, aZ, par5, par6);
+        super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetaData);
     }
     @Override
     public String getHarvestTool(int aMeta) {
@@ -83,7 +82,7 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
     public String getLocalizedName() {
         return StatCollector.translateToLocal(this.mUnlocalizedName + ".name");
     }
-    
+
     @Override
     public IIcon getIcon(int aSide, int aMeta) {
         return mIcons[aMeta % mIcons.length].getIcon();
@@ -91,7 +90,7 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
+    public void registerBlockIcons(IIconRegister aIconRegister) {
     }
 
     @Override
@@ -100,28 +99,18 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
     }
 
     @Override
-    public int quantityDropped(Random par1Random) {
-        return 1;
-    }
-
-    @Override
-    public Item getItemDropped(int par1, Random par2Random, int par3) {
-        return Item.getItemFromBlock(this);
-    }
-
-    @Override
-    public int damageDropped(int par1) {
-        return par1;
+    public int damageDropped(int metadata) {
+        return metadata;
     }
 
     @Override
-    public int getDamageValue(World par1World, int par2, int par3, int par4) {
-        return par1World.getBlockMetadata(par2, par3, par4);
+    public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
+        return aWorld.getBlockMetadata(aX, aY, aZ);
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
+    public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) {
         for (int i = 0; i < 3; i++) {
             ItemStack aStack = new ItemStack(aItem, 1, i);
             if (!aStack.getDisplayName().contains(".name")) aList.add(aStack);
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
index 7debf4e424..12a075d181 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
@@ -40,12 +40,12 @@ public class GT_CoolantCell_Item
         }
         tNBT.setInteger("heat", aHeat);
         if (this.heatStorage > 0) {
-            double var4 = (double) aHeat / (double) this.heatStorage;
-            int var6 = (int) (aStack.getMaxDamage() * var4);
-            if (var6 >= aStack.getMaxDamage()) {
-                var6 = aStack.getMaxDamage() - 1;
+            double heatRatio = (double) aHeat / (double) this.heatStorage;
+            int damage = (int) (aStack.getMaxDamage() * heatRatio);
+            if (damage >= aStack.getMaxDamage()) {
+                damage = aStack.getMaxDamage() - 1;
             }
-            aStack.setItemDamage(var6);
+            aStack.setItemDamage(damage);
         }
     }
 
diff --git a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java
index 78814803e4..904215b68a 100644
--- a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java
+++ b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java
@@ -104,9 +104,9 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         if (mSpecials == 0) return;
 
         if (!aPlayer.worldObj.isRemote && (mSpecials & 1) != 0) {
-            int var4 = aPlayer.getAir();
-            if (GT_ModHandler.canUseElectricItem(aStack, 1000) && var4 < 50) {
-                aPlayer.setAir(var4 + 250);
+            int airSupply = aPlayer.getAir();
+            if (GT_ModHandler.canUseElectricItem(aStack, 1000) && airSupply < 50) {
+                aPlayer.setAir(airSupply + 250);
                 GT_ModHandler.useElectricItem(aStack, 1000, aPlayer);
             }
         }
@@ -134,38 +134,38 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
         }
 
         if (!aPlayer.worldObj.isRemote && (mSpecials & 128) != 0) {
-            float var6 = jumpChargeMap.containsKey(aPlayer) ? ((Float) jumpChargeMap.get(aPlayer)).floatValue() : 1.0F;
+            float jumpCharge = jumpChargeMap.containsKey(aPlayer) ? ((Float) jumpChargeMap.get(aPlayer)).floatValue() : 1.0F;
 
-            if (GT_ModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && var6 < 1.0F) {
-                var6 = 1.0F;
+            if (GT_ModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && jumpCharge < 1.0F) {
+                jumpCharge = 1.0F;
                 GT_ModHandler.useElectricItem(aStack, 1000, aPlayer);
             }
 
-            if (aPlayer.motionY >= 0.0D && var6 > 0.0F && !aPlayer.isInWater()) {
+            if (aPlayer.motionY >= 0.0D && jumpCharge > 0.0F && !aPlayer.isInWater()) {
                 if (GT_ModHandler.getJumpKeyDown(aPlayer) && GT_ModHandler.getBoostKeyDown(aPlayer)) {
-                    if (var6 == 1.0F) {
+                    if (jumpCharge == 1.0F) {
                         aPlayer.motionX *= 3.5D;
                         aPlayer.motionZ *= 3.5D;
                     }
 
-                    aPlayer.motionY += (var6 * 0.3F);
-                    var6 = (float) (var6 * 0.75D);
-                } else if (var6 < 1.0F) {
-                    var6 = 0.0F;
+                    aPlayer.motionY += (jumpCharge * 0.3F);
+                    jumpCharge = (float) (jumpCharge * 0.75D);
+                } else if (jumpCharge < 1.0F) {
+                    jumpCharge = 0.0F;
                 }
             }
 
-            jumpChargeMap.put(aPlayer, Float.valueOf(var6));
+            jumpChargeMap.put(aPlayer, Float.valueOf(jumpCharge));
         }
 
         if ((mSpecials & 256) != 0) {
             if (GT_ModHandler.canUseElectricItem(aStack, 100) && aPlayer.isSprinting() && (aPlayer.onGround && Math.abs(aPlayer.motionX) + Math.abs(aPlayer.motionZ) > 0.10000000149011612D || aPlayer.isInWater())) {
                 GT_ModHandler.useElectricItem(aStack, 100, aPlayer);
-                float var7 = 0.22F;
+                float bonus = 0.22F;
 
                 if (aPlayer.isInWater()) {
                     GT_ModHandler.useElectricItem(aStack, 100, aPlayer);
-                    var7 = 0.1F;
+                    bonus = 0.1F;
 
 
                     if (aPlayer.motionY > 0) {
@@ -173,8 +173,8 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
                     }
                 }
 
-                if (var7 > 0.0F) {
-                    aPlayer.moveFlying(0.0F, 1.0F, var7);
+                if (bonus > 0.0F) {
+                    aPlayer.moveFlying(0.0F, 1.0F, bonus);
                 }
             }
         }
@@ -224,11 +224,11 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item aItem, CreativeTabs var2, List var3) {
+    public void getSubItems(Item aItem, CreativeTabs creativeTab, List outputSubItems) {
         ItemStack tCharged = new ItemStack(this, 1), tUncharged = new ItemStack(this, 1, getMaxDamage());
         GT_ModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false);
-        var3.add(tCharged);
-        var3.add(tUncharged);
+        outputSubItems.add(tCharged);
+        outputSubItems.add(tUncharged);
     }
 
     public boolean canProvideEnergy(ItemStack aStack) {
@@ -267,27 +267,27 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
     }
 
     @Override
-    public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
+    public boolean isBookEnchantable(ItemStack ingredient, ItemStack bookEnchant) {
         return false;
     }
 
     @Override
-    public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
+    public boolean getIsRepairable(ItemStack toBeRepaired, ItemStack repairWith) {
         return false;
     }
 
     // TODO: @ForgeSubscribe
-    public void onEntityLivingFallEvent(LivingFallEvent var1) {
-        if (!var1.entity.worldObj.isRemote && var1.entity instanceof EntityPlayer) {
-            EntityPlayer var2 = (EntityPlayer) var1.entity;
+    public void onEntityLivingFallEvent(LivingFallEvent event) {
+        if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer) {
+            EntityPlayer player = (EntityPlayer) event.entity;
             for (int i = 0; i < 4; i++) {
-                ItemStack var3 = var2.inventory.armorInventory[i];
-                if (var3 != null && var3.getItem() == this && (mSpecials & 2) != 0) {
-                    int var4 = (int) var1.distance - 3;
-                    int var5 = (this.mDamageEnergyCost * var4) / 4;
-                    if (var5 <= GT_ModHandler.dischargeElectricItem(var3, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)) {
-                        GT_ModHandler.dischargeElectricItem(var3, var5, Integer.MAX_VALUE, true, false, true);
-                        var1.setCanceled(true);
+                ItemStack armor = player.inventory.armorInventory[i];
+                if (armor != null && armor.getItem() == this && (mSpecials & 2) != 0) {
+                    int distanceFactor = (int) event.distance - 3;
+                    int energyCost = (this.mDamageEnergyCost * distanceFactor) / 4;
+                    if (energyCost <= GT_ModHandler.dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)) {
+                        GT_ModHandler.dischargeElectricItem(armor, energyCost, Integer.MAX_VALUE, true, false, true);
+                        event.setCanceled(true);
                         break;
                     }
                 }
@@ -296,18 +296,18 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
     }
 
     @Override
-    public ISpecialArmor.ArmorProperties getProperties(EntityLivingBase var1, ItemStack var2, DamageSource var3, double var4, int var6) {
-        return new ISpecialArmor.ArmorProperties((var3 == DamageSource.fall && (mSpecials & 2) != 0) ? 10 : 0, getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage, mDamageEnergyCost > 0 ? 25 * GT_ModHandler.dischargeElectricItem(var2, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true) / mDamageEnergyCost : 0);
+    public ISpecialArmor.ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slotIndex) {
+        return new ISpecialArmor.ArmorProperties((source == DamageSource.fall && (mSpecials & 2) != 0) ? 10 : 0, getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage, mDamageEnergyCost > 0 ? 25 * GT_ModHandler.dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true) / mDamageEnergyCost : 0);
     }
 
     @Override
-    public int getArmorDisplay(EntityPlayer var1, ItemStack var2, int var3) {
+    public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slotIndex) {
         return (int) Math.round(20.0D * getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage);
     }
 
     @Override
-    public void damageArmor(EntityLivingBase var1, ItemStack var2, DamageSource var3, int var4, int var5) {
-        GT_ModHandler.dischargeElectricItem(var2, var4 * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true);
+    public void damageArmor(EntityLivingBase entity, ItemStack itemStack, DamageSource source, int damage, int slotIndex) {
+        GT_ModHandler.dischargeElectricItem(itemStack, damage * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true);
     }
 
     private double getBaseAbsorptionRatio() {
diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GT_Generic_Item.java
index 06bc25844e..796a414c78 100644
--- a/src/main/java/gregtech/api/items/GT_Generic_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Generic_Item.java
@@ -81,7 +81,7 @@ public class GT_Generic_Item extends Item implements IProjectileItem {
     }
 
     @Override
-    public IIcon getIconFromDamage(int par1) {
+    public IIcon getIconFromDamage(int aMetaData) {
         return mIcon;
     }
 
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
index 38b065f2aa..9e38518607 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
@@ -98,7 +98,6 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
      * @param aID           The Id of the assigned Item [0 - mItemAmount] (The MetaData gets auto-shifted by +mOffset)
      * @param aEnglish      The Default Localized Name of the created Item
      * @param aToolTip      The Default ToolTip of the created Item, you can also insert null for having no ToolTip
-     * @param aFoodBehavior The Food Value of this Item. Can be null aswell. Just a convenience thing.
      * @param aRandomData   The OreDict Names you want to give the Item. Also used for TC Aspects and some other things.
      * @return An ItemStack containing the newly created Item.
      */
@@ -220,14 +219,10 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
     }
 
     /**
+     *
      * @param aMetaValue     the Meta Value of the Item you want to set it to. [0 - 32765]
-     * @param aMaxCharge     Maximum Charge. (if this is == 0 it will remove the Electric Behavior)
-     * @param aTransferLimit Transfer Limit.
-     * @param aTier          The electric Tier.
-     * @param aSpecialData   If this Item has a Fixed Charge, like a SingleUse Battery (if > 0).
-     *                       Use -1 if you want to make this Battery chargeable (the use and canUse Functions will still discharge if you just use this)
-     *                       Use -2 if you want to make this Battery dischargeable.
-     *                       Use -3 if you want to make this Battery charge/discharge-able.
+     * @param aCapacity      fluid capacity in L or mb
+     * @param aStacksize     item stack size
      * @return the Item itself for convenience in constructing.
      */
     public final GT_MetaGenerated_Item setFluidContainerStats(int aMetaValue, long aCapacity, long aStacksize) {
@@ -257,7 +252,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
     public IIconContainer getIconContainer(int aMetaData) {
         return null;
     }
-	
+
 	/* ---------- INTERNAL OVERRIDES ---------- */
 
     @Override
@@ -302,7 +297,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+    public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
         int j = mEnabledItems.length();
         for (int i = 0; i < j; i++)
             if (mVisibleItems.get(i) || (D1 && mEnabledItems.get(i))) {
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
index f9f54b5219..f04b4a3345 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
@@ -109,7 +109,7 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item {
     public IIconContainer getIconContainer(int aMetaData, Materials aMaterial) {
         return aMaterial.mIconSet.mTextures[mIconSetIndex];
     }
-	
+
 	/* ---------- INTERNAL OVERRIDES ---------- */
 
     @Override
@@ -146,14 +146,14 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+    public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
         for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++)
             if (mPrefix.doGenerateItem(GregTech_API.sGeneratedMaterials[i]) && doesShowInCreative(mPrefix, GregTech_API.sGeneratedMaterials[i], GregTech_API.sDoShowAllItemsInCreative)) {
                 ItemStack tStack = new ItemStack(this, 1, i);
                 isItemStackUsable(tStack);
                 aList.add(tStack);
             }
-        super.getSubItems(var1, aCreativeTab, aList);
+        super.getSubItems(aItem, aCreativeTab, aList);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
index 7cae9dffdd..ca93a85eea 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
@@ -162,7 +162,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+    public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
         for (int i = 0; i < 32000; i++) {
             OrePrefixes aPrefix = mGeneratedPrefixList[i / 1000];
             Materials aMaterial = GregTech_API.sGeneratedMaterials[i % 1000];
@@ -174,7 +174,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
                 }
             }
         }
-        super.getSubItems(var1, aCreativeTab, aList);
+        super.getSubItems(aItem, aCreativeTab, aList);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
index 10b2abe682..e8019ee975 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -320,7 +320,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
 
     @Override
     @SideOnly(Side.CLIENT)
-    public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+    public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
         for (int i = 0; i < 32766; i += 2) {
             if (getToolStats(new ItemStack(this, 1, i)) != null) {
                 ItemStack tStack = new ItemStack(this, 1, i);
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
index 16c6870cb0..e9c48991de 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
@@ -40,7 +40,7 @@ public class GT_RadioactiveCell_Item
         }
         return b;
     }
-    
+
     protected static int triangularNumber(int x)
     {
       return (x * x + x) / 2;
@@ -73,15 +73,6 @@ public class GT_RadioactiveCell_Item
             aStack.setTagCompound(tNBT);
         }
         tNBT.setInteger("durability", aDurability);
-//    if (this.maxDelay > 0)
-//    {
-//      double var4 = (this.maxDelay - aDurability) / this.maxDelay;
-//      int var6 = (int)(aStack.getMaxDamage() * var4);
-//      if (var6 >= aStack.getMaxDamage()) {
-//        var6 = aStack.getMaxDamage() - 1;
-//      }
-//      aStack.setItemDamage(aStack.getMaxDamage() - var6);
-//    }
     }
 
     public int getMaxNuclearDurability() {
@@ -93,11 +84,12 @@ public class GT_RadioactiveCell_Item
     }
 
     @Override
-    public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
+    public boolean isBookEnchantable(ItemStack ingredient, ItemStack bookEnchant) {
         return false;
     }
 
-    public boolean func_82789_a(ItemStack par1ItemStack, ItemStack par2ItemStack) {
+    // getIsRepairable
+    public boolean func_82789_a(ItemStack toBeRepaired, ItemStack repairWith) {
         return false;
     }
 
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index e1e5184b60..febcb4ba32 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -1215,7 +1215,7 @@ public class GT_ModHandler {
         ItemStack rReturn = null;
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
@@ -1246,7 +1246,7 @@ public class GT_ModHandler {
 
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
@@ -1356,7 +1356,7 @@ public class GT_ModHandler {
         if (!temp) return null;
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
@@ -1427,7 +1427,7 @@ public class GT_ModHandler {
 
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
@@ -1555,7 +1555,7 @@ public class GT_ModHandler {
             return rList;
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 76f45295f5..ef0b194ace 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -344,12 +344,11 @@ public class GT_Utility {
         try {
             Field tPotionHashmap = null;
 
-            Field[] var3 = EntityLiving.class.getDeclaredFields();
-            int var4 = var3.length;
+            Field[] fields = EntityLiving.class.getDeclaredFields();
 
-            for (Field var6 : var3) {
-                if (var6.getType() == HashMap.class) {
-                    tPotionHashmap = var6;
+            for (Field field : fields) {
+                if (field.getType() == HashMap.class) {
+                    tPotionHashmap = field;
                     tPotionHashmap.setAccessible(true);
                     break;
                 }
@@ -372,12 +371,11 @@ public class GT_Utility {
         try {
             Field tPotionHashmap = null;
 
-            Field[] var3 = EntityLiving.class.getDeclaredFields();
-            int var4 = var3.length;
+            Field[] fields = EntityLiving.class.getDeclaredFields();
 
-            for (Field var6 : var3) {
-                if (var6.getType() == HashMap.class) {
-                    tPotionHashmap = var6;
+            for (Field field : fields) {
+                if (field.getType() == HashMap.class) {
+                    tPotionHashmap = field;
                     tPotionHashmap.setAccessible(true);
                     break;
                 }
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Boulder.java b/src/main/java/gregtech/api/world/GT_Worldgen_Boulder.java
deleted file mode 100644
index 5fe54af782..0000000000
--- a/src/main/java/gregtech/api/world/GT_Worldgen_Boulder.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package gregtech.api.world;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.IChunkProvider;
-
-import java.util.Collection;
-import java.util.Random;
-
-public class GT_Worldgen_Boulder extends GT_Worldgen_Ore {
-    public GT_Worldgen_Boulder(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
-        super(aName, aDefault, aBlock, aBlockMeta, aDimensionType, aAmount, aSize, aProbability, aMinY, aMaxY, aBiomeList, aAllowToGenerateinVoid);
-    }
-
-    @Override
-    public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
-        if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome)) && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
-            for (int i = 0; i < mAmount; i++) {
-                int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16);
-                Block tBlock = aWorld.getBlock(tX, tY - 7, tZ);
-                if (tBlock != null && tBlock.isOpaqueCube() && aWorld.getBlock(tX, tY - 6, tZ).isAir(aWorld, tX, tY - 6, tZ)) {
-                    float math_pi = 3.141593F;
-                    float var6 = aRandom.nextFloat() * math_pi;
-                    float var1b = mSize / 8.0F;
-                    float var3b = MathHelper.sin(var6) * var1b; float var4b = MathHelper.cos(var6) * var1b;
-                    float var8b = -2*var3b;float var9b = -2*var4b;
-                    int var10b = (tX + 8);int var11b = (tZ + 8);
-                    float var7 = (var10b + var3b);
-                    float var11 = (var11b + var4b);
-                    int var5b = aRandom.nextInt(3);int var6b = aRandom.nextInt(3);int var7b = var6b - var5b;
-                    float var15 = (tY + var5b - 2);
-                    float var12b = math_pi / mSize;
-
-                    for (int var19 = 0; var19 <= mSize; ++var19) {
-                        float var2b = var19 / mSize;
-                        float var20 = var7 + var8b * var2b;
-                        float var22 = var15 + var7b * var2b;
-                        float var24 = var11 + var9b * var2b;
-                        float var26 = aRandom.nextFloat() * mSize / 16.0F;
-                        float var28 = ((MathHelper.sin(var19 * var12b) + 1.0F) * var26 + 1.0F) / 2.0F;
-                        int var32 = MathHelper.floor_float(var20 - var28);
-                        int var33 = MathHelper.floor_float(var22 - var28);
-                        int var34 = MathHelper.floor_float(var24 - var28);
-                        int var35 = MathHelper.floor_float(var20 + var28);
-                        int var36 = MathHelper.floor_float(var22 + var28);
-                        int var37 = MathHelper.floor_float(var24 + var28);
-
-                        for (int var38 = var32; var38 <= var35; ++var38) {
-                            float var39 = (var38 + 0.5F - var20) / (var28);
-                            float var13b = var39 * var39;
-                            if (var13b < 1.0F) {
-                                for (int var41 = var33; var41 <= var36; ++var41) {
-                                    float var42 = (var41 + 0.5F - var22) / (var28);
-                                    float var14b = var13b + var42 * var42;
-                                    if (var14b < 1.0F) {
-                                        for (int var44 = var34; var44 <= var37; ++var44) {
-                                            float var45 = (var44 + 0.5F - var24) / (var28);
-                                            Block block = aWorld.getBlock(var38, var41, var44);
-                                            if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld.getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44)) || (block != null && !(block instanceof BlockContainer)))) {
-                                                aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_Normal.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_Normal.java
deleted file mode 100644
index 035b6fa28e..0000000000
--- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_Normal.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package gregtech.api.world;
-
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.IChunkProvider;
-
-import java.util.Collection;
-import java.util.Random;
-
-public class GT_Worldgen_Ore_Normal extends GT_Worldgen_Ore {
-    public GT_Worldgen_Ore_Normal(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
-        super(aName, aDefault, aBlock, aBlockMeta, aDimensionType, aAmount, aSize, aProbability, aMinY, aMaxY, aBiomeList, aAllowToGenerateinVoid);
-    }
-
-    @Override
-    public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
-        if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome)) && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
-            for (int i = 0; i < mAmount; i++) {
-                int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16);
-                if (mAllowToGenerateinVoid || aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ)) {
-                    float math_pi = 3.141593F;float var1b = mSize / 8.0F;
-                    float var6 = aRandom.nextFloat() * math_pi;
-                    float var3b = MathHelper.sin(var6) * var1b; float var4b = MathHelper.cos(var6) * var1b;
-                    float var8b = -2*var3b;float var9b = -2*var4b;
-                    int var10b = (tX + 8);int var11b = (tZ + 8);
-                    float var7 = (var10b + var3b);
-                    float var11 = (var11b + var4b);
-                    int var5b = aRandom.nextInt(3);int var6b = aRandom.nextInt(3);int var7b = var6b - var5b;
-                    float var15 = (tY + var5b - 2);
-                    float var12b = math_pi / mSize;
-
-                    for (int var19 = 0; var19 <= mSize; ++var19) {
-                        float var2b = var19 / mSize;
-                        float var20 = var7 + var8b * var2b;
-                        float var22 = var15 + var7b * var2b;
-                        float var24 = var11 + var9b * var2b;
-                        float var26 = aRandom.nextFloat() * mSize / 16.0F;
-                        float var28 = ((MathHelper.sin(var19 * var12b) + 1.0F) * var26 + 1.0F) / 2.0F;
-                        int var32 = MathHelper.floor_float(var20 - var28);
-                        int var33 = MathHelper.floor_float(var22 - var28);
-                        int var34 = MathHelper.floor_float(var24 - var28);
-                        int var35 = MathHelper.floor_float(var20 + var28);
-                        int var36 = MathHelper.floor_float(var22 + var28);
-                        int var37 = MathHelper.floor_float(var24 + var28);
-
-                        for (int var38 = var32; var38 <= var35; ++var38) {
-                            float var39 = (var38 + 0.5F - var20) / (var28);
-                            float var13b = var39 * var39;
-                            if (var13b < 1.0F) {
-                                for (int var41 = var33; var41 <= var36; ++var41) {
-                                    float var42 = (var41 + 0.5F - var22) / (var28);
-                                    float var14b = var13b + var42 * var42;
-                                    if (var14b < 1.0F) {
-                                        for (int var44 = var34; var44 <= var37; ++var44) {
-                                            float var45 = (var44 + 0.5F - var24) / (var28);
-                                            Block block = aWorld.getBlock(var38, var41, var44);
-                                            if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld.getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44)) || (block != null && (block.isReplaceableOreGen(aWorld, var38, var41, var44, Blocks.stone) || block.isReplaceableOreGen(aWorld, var38, var41, var44, Blocks.end_stone) || block.isReplaceableOreGen(aWorld, var38, var41, var44, Blocks.netherrack))))) {
-                                                aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/gregtech/common/GT_DummyWorld.java b/src/main/java/gregtech/common/GT_DummyWorld.java
index baab96510a..756e35863f 100644
--- a/src/main/java/gregtech/common/GT_DummyWorld.java
+++ b/src/main/java/gregtech/common/GT_DummyWorld.java
@@ -22,19 +22,19 @@ public class GT_DummyWorld extends World {
     public GT_IteratorRandom mRandom = new GT_IteratorRandom();
     public ItemStack mLastSetBlock = null;
 
-    public GT_DummyWorld(ISaveHandler par1iSaveHandler, String par2Str, WorldProvider par3WorldProvider, WorldSettings par4WorldSettings, Profiler par5Profiler) {
-        super(par1iSaveHandler, par2Str, par4WorldSettings, par3WorldProvider, par5Profiler);
+    public GT_DummyWorld(ISaveHandler saveHandler, String name, WorldProvider worldProvider, WorldSettings worldSettings, Profiler profiler) {
+        super(saveHandler, name, worldSettings, worldProvider, profiler);
         this.rand = this.mRandom;
     }
 
     public GT_DummyWorld() {
         this(new ISaveHandler() {
                  @Override
-                 public void saveWorldInfoWithPlayer(WorldInfo var1, NBTTagCompound var2) {
+                 public void saveWorldInfoWithPlayer(WorldInfo worldInfo, NBTTagCompound nbtTagCompound) {
                  }
 
                  @Override
-                 public void saveWorldInfo(WorldInfo var1) {
+                 public void saveWorldInfo(WorldInfo worldInfo) {
                  }
 
                  @Override
@@ -48,12 +48,12 @@ public class GT_DummyWorld extends World {
                  }
 
                  @Override
-                 public File getMapFileFromName(String var1) {
+                 public File getMapFileFromName(String mapName) {
                      return null;
                  }
 
                  @Override
-                 public IChunkLoader getChunkLoader(WorldProvider var1) {
+                 public IChunkLoader getChunkLoader(WorldProvider worldProvider) {
                      return null;
                  }
 
diff --git a/src/main/java/gregtech/common/GT_MinableOreGenerator.java b/src/main/java/gregtech/common/GT_MinableOreGenerator.java
deleted file mode 100644
index 2a1191b07e..0000000000
--- a/src/main/java/gregtech/common/GT_MinableOreGenerator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package gregtech.common;
-
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
-
-import java.util.Random;
-
-public class GT_MinableOreGenerator extends WorldGenerator {
-    private Block minableBlockId;
-    private Block mBlock;
-    private int minableBlockMeta = 0;
-    private int numberOfBlocks;
-    private boolean allowVoid = false;
-
-    public GT_MinableOreGenerator(Block par1, int par2) {
-        this.minableBlockId = par1;
-        this.numberOfBlocks = par2;
-    }
-
-    public GT_MinableOreGenerator(Block id, int meta, int number, boolean aAllowVoid, Block aBlock) {
-        this(id, number);
-        this.minableBlockMeta = meta;
-        this.allowVoid = aAllowVoid;
-        this.mBlock = aBlock;
-    }
-
-    @Override
-    public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) {
-        float math_pi = 3.141593F;//FB: CNT - CNT_ROUGH_CONSTANT_VALUE
-        float var6 = par2Random.nextFloat() * math_pi;
-        float var1s = this.numberOfBlocks / 8.0F;
-        int var4s = par4 - 2;int var5s = par3 + 8;int var6s = par5 + 8;
-        float var7s = this.numberOfBlocks / 16.0F;
-        float var8s = math_pi / this.numberOfBlocks;
-        float mh_s_0 = MathHelper.sin(var6) * var1s;float mh_c_0 = MathHelper.cos(var6) * var1s;
-        float var7 = var5s + mh_s_0;
-        float var11 = var6s + mh_c_0;
-        int var15r = par2Random.nextInt(3);int var17r = par2Random.nextInt(3);
-        int mh_n_4=var17r - var15r;
-        int var15 = var4s + var15r;
-        float mh_n_0 = -2*mh_s_0;float mh_n_1 = -2*mh_c_0;
-        for (int var19 = 0; var19 <= this.numberOfBlocks; var19++) {
-            float mh_n_2 = var19 / this.numberOfBlocks;
-            float var20 = var7 + mh_n_0 * mh_n_2;
-            float var22 = var15 + mh_n_4 * mh_n_2;
-            float var24 = var11 + mh_n_1 * mh_n_2;
-            float var26 = par2Random.nextFloat() * var7s;
-            float var1c = var19 * var8s;
-            float var28 = ((MathHelper.sin(var1c) + 1.0F) * var26 + 1.0F) / 2.0F;
-            int var32 = MathHelper.floor_float(var20 - var28);
-            int var33 = MathHelper.floor_float(var22 - var28);
-            int var34 = MathHelper.floor_float(var24 - var28);
-            int var35 = MathHelper.floor_float(var20 + var28);
-            int var36 = MathHelper.floor_float(var22 + var28);
-            int var37 = MathHelper.floor_float(var24 + var28);
-            for (int var38 = var32; var38 <= var35; var38++) {
-                float var39 = (var38 + 0.5F - var20) / (var28);
-                float var5c = var39 * var39;
-                if (var5c < 1.0F) {
-                    for (int var41 = var33; var41 <= var36; var41++) {
-                        float var42 = (var41 + 0.5F - var22) / (var28);
-                        float var7c = var5c + var42 * var42;
-                        if (var7c < 1.0F) {
-                            for (int var44 = var34; var44 <= var37; var44++) {
-                                float var45 = (var44 + 0.5F - var24) / (var28);
-                                Block block = par1World.getBlock(var38, var41, var44);
-                                if ((var7c + var45 * var45 < 1.0F) && (((this.allowVoid) && (par1World.getBlock(var38, var41, var44) == Blocks.air)) || ((block != null) && (block.isReplaceableOreGen(par1World, var38, var41, var44, this.mBlock))))) {
-                                    par1World.setBlock(var38, var41, var44, this.minableBlockId, this.minableBlockMeta, 0);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java
index 0911f257b4..aa6dfa2a41 100644
--- a/src/main/java/gregtech/common/GT_Worldgenerator.java
+++ b/src/main/java/gregtech/common/GT_Worldgenerator.java
@@ -61,9 +61,9 @@ public class GT_Worldgenerator implements IWorldGenerator {
             mList.add(new WorldGenContainer(new XSTR(Math.abs(aRandom.nextInt()) +1), aX, aZ, aWorld.provider.dimensionId, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName));
             if (debugWorldGen) GT_Log.out.println(
                 "ADD WorldSeed:"+aWorld.getSeed() +
-                " DimId" + aWorld.provider.dimensionId + 
-                " chunk x:" + aX + 
-                " z:" + aZ + 
+                " DimId" + aWorld.provider.dimensionId +
+                " chunk x:" + aX +
+                " z:" + aZ +
                 " SIZE: " + mList.size()
             );
         }
@@ -76,11 +76,11 @@ public class GT_Worldgenerator implements IWorldGenerator {
                 WorldGenContainer toRun = (WorldGenContainer) mList.get(0);
                 if (debugWorldGen) GT_Log.out.println(
                     "RUN WorldSeed:"+aWorld.getSeed()+
-                    " DimId" + aWorld.provider.dimensionId + 
-                    " chunk x:" + toRun.mX + 
-                    " z:" + toRun.mZ + 
-                    " SIZE: " + mList.size() + 
-                    " i: " + i 
+                    " DimId" + aWorld.provider.dimensionId +
+                    " chunk x:" + toRun.mX +
+                    " z:" + toRun.mZ +
+                    " SIZE: " + mList.size() +
+                    " i: " + i
                 );
                 synchronized (listLock)
                 {
@@ -379,7 +379,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
             for( ; seedList.size() != 0; seedList.remove(0) ) {
                 if (debugWorldGen) GT_Log.out.println(
                     "Processing seed x="+seedList.get(0).mX+
-                    " z="+seedList.get(0).mZ 
+                    " z="+seedList.get(0).mZ
                 );
                 worldGenFindVein( seedList.get(0).mX, seedList.get(0).mZ );
             }
@@ -431,35 +431,35 @@ public class GT_Worldgenerator implements IWorldGenerator {
                     //    mSize = aRandom.nextInt((int) (gcMaxSize - gcMinSize));
                 }
                 if ((mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) {
-                    float var6 = aRandom.nextFloat() * 3.141593F;
-                    double var7 = tX + 8 + MathHelper.sin(var6) * mSize / 8.0F;
-                    double var9 = tX + 8 - MathHelper.sin(var6) * mSize / 8.0F;
-                    double var11 = tZ + 8 + MathHelper.cos(var6) * mSize / 8.0F;
-                    double var13 = tZ + 8 - MathHelper.cos(var6) * mSize / 8.0F;
-                    double var15 = tY + aRandom.nextInt(3) - 2;
-                    double var17 = tY + aRandom.nextInt(3) - 2;
-                    for (int var19 = 0; var19 <= mSize; var19++) {
-                        double var20 = var7 + (var9 - var7) * var19 / mSize;
-                        double var22 = var15 + (var17 - var15) * var19 / mSize;
-                        double var24 = var11 + (var13 - var11) * var19 / mSize;
-                        double var26 = aRandom.nextDouble() * mSize / 16.0D;
-                        double var28 = (MathHelper.sin(var19 * 3.141593F / mSize) + 1.0F) * var26 + 1.0D;
-                        double var30 = (MathHelper.sin(var19 * 3.141593F / mSize) + 1.0F) * var26 + 1.0D;
-                        int tMinX = MathHelper.floor_double(var20 - var28 / 2.0D);
-                        int tMinY = MathHelper.floor_double(var22 - var30 / 2.0D);
-                        int tMinZ = MathHelper.floor_double(var24 - var28 / 2.0D);
-                        int tMaxX = MathHelper.floor_double(var20 + var28 / 2.0D);
-                        int tMaxY = MathHelper.floor_double(var22 + var30 / 2.0D);
-                        int tMaxZ = MathHelper.floor_double(var24 + var28 / 2.0D);
+                    float randomRadian = aRandom.nextFloat() * 3.141593F;
+                    double xBase = tX + 8 + MathHelper.sin(randomRadian) * mSize / 8.0F;
+                    double xFactor = tX + 8 - MathHelper.sin(randomRadian) * mSize / 8.0F;
+                    double zBase = tZ + 8 + MathHelper.cos(randomRadian) * mSize / 8.0F;
+                    double zFactor = tZ + 8 - MathHelper.cos(randomRadian) * mSize / 8.0F;
+                    double yBase = tY + aRandom.nextInt(3) - 2;
+                    double yFactor = tY + aRandom.nextInt(3) - 2;
+                    for (int i = 0; i <= mSize; i++) {
+                        double xCenter = xBase + (xFactor - xBase) * i / mSize;
+                        double yCenter = yBase + (yFactor - yBase) * i / mSize;
+                        double zCenter = zBase + (zFactor - zBase) * i / mSize;
+                        double randomDistance = aRandom.nextDouble() * mSize / 16.0D;
+                        double halfLength = (MathHelper.sin(i * 3.141593F / mSize) + 1.0F) * randomDistance + 1.0D;
+                        double halfHeight = (MathHelper.sin(i * 3.141593F / mSize) + 1.0F) * randomDistance + 1.0D;
+                        int tMinX = MathHelper.floor_double(xCenter - halfLength / 2.0D);
+                        int tMinY = MathHelper.floor_double(yCenter - halfHeight / 2.0D);
+                        int tMinZ = MathHelper.floor_double(zCenter - halfLength / 2.0D);
+                        int tMaxX = MathHelper.floor_double(xCenter + halfLength / 2.0D);
+                        int tMaxY = MathHelper.floor_double(yCenter + halfHeight / 2.0D);
+                        int tMaxZ = MathHelper.floor_double(zCenter + halfLength / 2.0D);
                         for (int eX = tMinX; eX <= tMaxX; eX++) {
-                            double var39 = (eX + 0.5D - var20) / (var28 / 2.0D);
-                            if (var39 * var39 < 1.0D) {
+                            double xChance = (eX + 0.5D - xCenter) / (halfLength / 2.0D);
+                            if (xChance * xChance < 1.0D) {
                                 for (int eY = tMinY; eY <= tMaxY; eY++) {
-                                    double var42 = (eY + 0.5D - var22) / (var30 / 2.0D);
-                                    if (var39 * var39 + var42 * var42 < 1.0D) {
+                                    double yChance = (eY + 0.5D - yCenter) / (halfHeight / 2.0D);
+                                    if (xChance * xChance + yChance * yChance < 1.0D) {
                                         for (int eZ = tMinZ; eZ <= tMaxZ; eZ++) {
-                                            double var45 = (eZ + 0.5D - var24) / (var28 / 2.0D);
-                                            if ((var39 * var39 + var42 * var42 + var45 * var45 < 1.0D) && (mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) {
+                                            double zChance = (eZ + 0.5D - zCenter) / (halfLength / 2.0D);
+                                            if ((xChance * xChance + yChance * yChance + zChance * zChance < 1.0D) && (mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) {
                                                 int ranOre = aRandom.nextInt(50);
                                                 if (ranOre < 3) {
                                                     GT_TileEntity_Ores.setOreBlock(mWorld, eX, eY, eZ, primaryMeta, false);
@@ -494,7 +494,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                 GT_Log.out.println(
                     " Oregen took " + (oregenTime-leftOverTime)+
                     " Leftover gen took " + (leftOverTime - startTime) +
-                    " Worldgen took " + duration + 
+                    " Worldgen took " + duration +
                     " nanoseconds"
                     );
             }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
index 49f15e328c..072259f2ee 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
@@ -20,7 +20,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import java.util.List;
-import java.util.Random;
 
 public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block {
     public GT_Block_Casings_Abstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
@@ -84,16 +83,6 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block {
     }
 
     @Override
-    public boolean renderAsNormalBlock() {
-        return true;
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return true;
-    }
-
-    @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
         if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
             GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
@@ -106,23 +95,13 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block {
     }
 
     @Override
-    public int damageDropped(int par1) {
-        return par1;
-    }
-
-    @Override
-    public int getDamageValue(World par1World, int par2, int par3, int par4) {
-        return par1World.getBlockMetadata(par2, par3, par4);
-    }
-
-    @Override
-    public int quantityDropped(Random par1Random) {
-        return 1;
+    public int damageDropped(int metadata) {
+        return metadata;
     }
 
     @Override
-    public Item getItemDropped(int par1, Random par2Random, int par3) {
-        return Item.getItemFromBlock(this);
+    public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
+        return aWorld.getBlockMetadata(aX, aY, aZ);
     }
 
     @Override
@@ -132,7 +111,7 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
+    public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) {
         for (int i = 0; i < 16; i++) {
             ItemStack aStack = new ItemStack(aItem, 1, i);
             if (!aStack.getDisplayName().contains(".name")) aList.add(aStack);
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
index 851b84b5c3..24b8635c86 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -156,7 +156,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     }
 
     @Override
-    public boolean canConnectRedstone(IBlockAccess var1, int var2, int var3, int var4, int var5) {
+    public boolean canConnectRedstone(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
         return true;
     }
 
@@ -339,7 +339,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     }
 
     @Override
-    public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) {
+    public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float aOffsetX, float aOffsetY, float aOffsetZ) {
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity == null) {
             return false;
@@ -361,7 +361,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
             if ((!aWorld.isRemote) && !((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer)) {
                 return true;
             }
-            return ((IGregTechTileEntity) tTileEntity).onRightclick(aPlayer, (byte) aSide, par1, par2, par3);
+            return ((IGregTechTileEntity) tTileEntity).onRightclick(aPlayer, (byte) aSide, aOffsetX, aOffsetY, aOffsetZ);
         }
         return false;
     }
@@ -394,7 +394,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     }
 
     @Override
-    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) {
+    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) {
         GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity instanceof IGregTechTileEntity) {
@@ -423,7 +423,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
                 }
             }
         }
-        super.breakBlock(aWorld, aX, aY, aZ, par5, par6);
+        super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata);
         aWorld.removeTileEntity(aX, aY, aZ);
     }
 
@@ -490,7 +490,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     }
 
     @Override
-    public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int par5, float chance, int par7) {
+    public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int aMetadata, float chance, int aFortune) {
         if (!aWorld.isRemote) {
             final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
             if (tTileEntity != null && (chance < 1.0F)) {
@@ -500,7 +500,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
                     ((BaseMetaTileEntity) tTileEntity).doEnergyExplosion();
                 }
             } else {
-                super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, par5, chance, par7);
+                super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, aMetadata, chance, aFortune);
             }
         }
     }
@@ -568,7 +568,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
 
     @Override
     public float getExplosionResistance(
-            Entity par1Entity, World aWorld, int aX, int aY, int aZ,
+            Entity entity, World aWorld, int aX, int aY, int aZ,
             double explosionX, double explosionY, double explosionZ) {
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity instanceof IGregTechTileEntity) {
@@ -580,10 +580,10 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     @SideOnly(Side.CLIENT)
     @Override
     @SuppressWarnings("unchecked") // Old API uses raw List type
-    public void getSubBlocks(Item par1Item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubBlocks(Item item, CreativeTabs aCreativeTab, List outputSubBlocks) {
         for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
             if (GregTech_API.METATILEENTITIES[i] != null) {
-                par3List.add(new ItemStack(par1Item, 1, i));
+                outputSubBlocks.add(new ItemStack(item, 1, i));
             }
         }
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
index 6c2ebed490..3a7f231761 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
@@ -138,7 +138,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     }
 
     @Override
-    public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) {
+    public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float aOffsetX, float aOffsetY, float aOffsetZ) {
         if (!aPlayer.isSneaking() || !aPlayer.capabilities.isCreativeMode) {
             return false;
         }
@@ -181,7 +181,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     }
 
     @Override
-    public float getExplosionResistance(Entity par1Entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) {
+    public float getExplosionResistance(Entity entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) {
         return 1.0F + getHarvestLevel(aWorld.getBlockMetadata(aX, aY, aZ)) * 1.0F;
     }
 
@@ -222,16 +222,6 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     }
 
     @Override
-    public boolean renderAsNormalBlock() {
-        return true;
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return true;
-    }
-
-    @Override
     public TileEntity createNewTileEntity(World aWorld, int aMeta) {
         return createTileEntity(aWorld, aMeta);
     }
@@ -277,12 +267,12 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     }
 
     @Override
-    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) {
+    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if ((tTileEntity instanceof GT_TileEntity_Ores)) {
             mTemporaryTileEntity.set((GT_TileEntity_Ores) tTileEntity);
         }
-        super.breakBlock(aWorld, aX, aY, aZ, par5, par6);
+        super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata);
         aWorld.removeTileEntity(aX, aY, aZ);
     }
 
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
index fc49ecc597..79087b8ae4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
@@ -31,7 +31,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import java.util.List;
-import java.util.Random;
 
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 
@@ -72,7 +71,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
         ItemList.Block_BedrockiumCompressed.set(new ItemStack(this.setHardness(1500.0f).setResistance(5000.0f), 1, 12));
         GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(Items.coal, 1, 1), new Object[]{ItemList.Block_BrittleCharcoal.get(1)});
         GT_ModHandler.addCraftingRecipe(ItemList.Block_Powderbarrel.get(1L),GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WSW","GGG","WGW", 'W', OrePrefixes.plate.get(Materials.Wood), 'G', new ItemStack(Items.gunpowder,1),'S',new ItemStack(Items.string,1)});
-        
+
     }
 
     @Override
@@ -166,7 +165,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
     }
 
     @Override
-    public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) {
+    public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) {
         if (world == null) {
             return 0.0F;
         }
@@ -202,7 +201,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
             return 2500.0F;
 
         }
-        return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ);
+        return super.getExplosionResistance(entity, world, x, y, z, explosionX, explosionY, explosionZ);
     }
 
     @Override
@@ -226,49 +225,29 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
     }
 
     @Override
-    public boolean renderAsNormalBlock() {
-        return true;
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return true;
-    }
-
-    @Override
     public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
         return false;
     }
 
     @Override
-    public int damageDropped(int par1) {
-        return par1;
-    }
-
-    @Override
-    public int getDamageValue(World par1World, int par2, int par3, int par4) {
-        return par1World.getBlockMetadata(par2, par3, par4);
-    }
-
-    @Override
-    public int quantityDropped(Random par1Random) {
-        return 1;
+    public int damageDropped(int metadata) {
+        return metadata;
     }
 
     @Override
-    public Item getItemDropped(int par1, Random par2Random, int par3) {
-        return Item.getItemFromBlock(this);
+    public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
+        return aWorld.getBlockMetadata(aX, aY, aZ);
     }
 
     @Override
-    public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int par5, float chance, int par7) {
-        if (par5 == 4) {
+    public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int aMetadata, float chance, int aFortune) {
+        if (aMetadata == 4) {
             this.dropBlockAsItem(aWorld, aX, aY, aZ, new ItemStack(Items.coal, XSTR_INSTANCE.nextInt(2) + 1, 1));
         } else {
-            super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, par5, chance, par7);
+            super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, aMetadata, chance, aFortune);
         }
     }
-    
+
     @Override
     public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z)
     {
@@ -287,7 +266,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
       }
       return super.removedByPlayer(world, player, x, y, z);
     }
-    
+
     @Override
     public void onBlockAdded(World world, int x, int y, int z)
     {
@@ -296,7 +275,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
         removedByPlayer(world, null, x, y, z);
       }
     }
-    
+
     @Override
     public void onNeighborBlockChange(World world, int x, int y, int z, Block neighbor)
     {
@@ -304,7 +283,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
         removedByPlayer(world, null, x, y, z);
       }
     }
-    
+
     @Override
     public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) {
       if (!world.isRemote && world.getBlockMetadata(x, y, z)==5){
@@ -314,17 +293,17 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
       }
       super.onBlockExploded(world, x, y, z, explosion);
     }
-    
+
     @Override
-    public boolean onBlockActivated(World par1World, int x, int y, int z, EntityPlayer player, int side, float xOffset, float yOffset, float zOffset)
+    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float xOffset, float yOffset, float zOffset)
     {
-      if ((player.getCurrentEquippedItem() != null) && (player.getCurrentEquippedItem().getItem() == Items.flint_and_steel)&&par1World.getBlockMetadata(x, y, z)==5)
+      if ((player.getCurrentEquippedItem() != null) && (player.getCurrentEquippedItem().getItem() == Items.flint_and_steel)&&world.getBlockMetadata(x, y, z)==5)
       {
-        removedByPlayer(par1World, player, x, y, z);
-        
+        removedByPlayer(world, player, x, y, z);
+
         return true;
       }
-      return super.onBlockActivated(par1World, x, y, z, player, side, xOffset, yOffset, zOffset);
+      return super.onBlockActivated(world, x, y, z, player, side, xOffset, yOffset, zOffset);
     }
 
     @Override
@@ -334,13 +313,13 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
+    public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) {
         for (int i = 0; i < 16; i++) {
             ItemStack aStack = new ItemStack(aItem, 1, i);
             if (!aStack.getDisplayName().contains(".name")) aList.add(aStack);
         }
     }
-    
+
     @Override
     public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) {
         return !(entity instanceof EntityWither);
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
index 2f816b93c0..b3c0a1811c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
@@ -22,7 +22,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import java.util.List;
-import java.util.Random;
 
 public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRecipeRegistrator {
     public GT_Block_Stones_Abstract(Class<? extends ItemBlock> aItemClass, String aName) {
@@ -100,14 +99,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe
         return true;
     }
     @Override
-    public boolean renderAsNormalBlock() {
-        return true;
-    }
-    @Override
-    public boolean isOpaqueCube() {
-        return true;
-    }
-    @Override
     public IIcon getIcon(int aSide, int aMeta) {
         if ((aMeta >= 0) && (aMeta < 16)) {
             return gregtech.api.enums.Textures.BlockIcons.GRANITES[aMeta].getIcon();
@@ -120,21 +111,12 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe
         return world.getBlockMetadata(x, y, z) % 8 < 3;
     }
     @Override
-    public int damageDropped(int par1) {
-        return par1 % 8 == 0 ? par1 + 1 : par1;
+    public int damageDropped(int metadata) {
+        return metadata % 8 == 0 ? metadata + 1 : metadata;
     }
     @Override
-    public int getDamageValue(World par1World, int par2, int par3, int par4) {
-        return par1World.getBlockMetadata(par2, par3, par4);
-    }
-    @Override
-    public int quantityDropped(Random par1Random) {
-        return 1;
-    }
-
-    @Override
-    public Item getItemDropped(int par1, Random par2Random, int par3) {
-        return Item.getItemFromBlock(this);
+    public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
+        return aWorld.getBlockMetadata(aX, aY, aZ);
     }
 
     @Override
@@ -144,7 +126,7 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
+    public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) {
         for (int i = 0; i < 16; i++) {
             aList.add(new ItemStack(aItem, 1, i));
         }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java
index 0a05ab300c..7c1fd49db1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java
@@ -18,7 +18,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import java.util.List;
-import java.util.Random;
 
 public class GT_Block_Storage extends GT_Generic_Block {
 
@@ -69,38 +68,18 @@ public class GT_Block_Storage extends GT_Generic_Block {
     }
 
     @Override
-    public boolean renderAsNormalBlock() {
-        return true;
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return true;
-    }
-
-    @Override
     public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
         return true;
     }
 
     @Override
-    public int damageDropped(int par1) {
-        return par1;
-    }
-
-    @Override
-    public int getDamageValue(World par1World, int par2, int par3, int par4) {
-        return par1World.getBlockMetadata(par2, par3, par4);
-    }
-
-    @Override
-    public int quantityDropped(Random par1Random) {
-        return 1;
+    public int damageDropped(int metadata) {
+        return metadata;
     }
 
     @Override
-    public Item getItemDropped(int par1, Random par2Random, int par3) {
-        return Item.getItemFromBlock(this);
+    public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
+        return aWorld.getBlockMetadata(aX, aY, aZ);
     }
 
     @Override
@@ -110,7 +89,7 @@ public class GT_Block_Storage extends GT_Generic_Block {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
+    public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) {
         for (int i = 0; i < 16; i++) {
             if (!(new ItemStack(aItem, 1, i).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i));
         }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
index 98b0c24c61..f61f8360fa 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
@@ -10,7 +10,7 @@ import net.minecraft.util.EnumChatFormatting;
 import java.util.List;
 
 public class GT_Item_Casings1 extends GT_Item_Casings_Abstract {
-    public GT_Item_Casings1(Block par1) {
-        super(par1);
+    public GT_Item_Casings1(Block block) {
+        super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java
index ed705d0c57..11a3aed3af 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java
@@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack;
 import java.util.List;
 
 public class GT_Item_Casings2 extends GT_Item_Casings_Abstract {
-    public GT_Item_Casings2(Block par1) {
-        super(par1);
+    public GT_Item_Casings2(Block block) {
+        super(block);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java
index b9eac8252a..d80d88d2d1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java
@@ -3,7 +3,7 @@ package gregtech.common.blocks;
 import net.minecraft.block.Block;
 
 public class GT_Item_Casings3 extends GT_Item_Casings_Abstract {
-    public GT_Item_Casings3(Block par1) {
-        super(par1);
+    public GT_Item_Casings3(Block block) {
+        super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
index 10b39e3ea8..7848398a0b 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
@@ -3,7 +3,7 @@ package gregtech.common.blocks;
 import net.minecraft.block.Block;
 
 public class GT_Item_Casings4 extends GT_Item_Casings_Abstract {
-    public GT_Item_Casings4(Block par1) {
-        super(par1);
+    public GT_Item_Casings4(Block block) {
+        super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
index c93f8bb38c..a0890ce154 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
@@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack;
 import java.util.List;
 
 public class GT_Item_Casings5 extends GT_Item_Casings_Abstract {
-    public GT_Item_Casings5(Block par1) {
-        super(par1);
+    public GT_Item_Casings5(Block block) {
+        super(block);
     }
 
     protected static final String mCoilHeatTooltip = GT_LanguageManager.addStringLocalization("gt.coilheattooltip", "Base Heating Capacity = ");
@@ -26,4 +26,4 @@ public class GT_Item_Casings5 extends GT_Item_Casings_Abstract {
         HeatingCoilLevel coilLevel = GT_Block_Casings5.getCoilHeatFromDamage(aStack.getItemDamage());
         aList.add(mCoilHeatTooltip + coilLevel.getHeat() + mCoilUnitTooltip);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java
index ebeab2f0aa..f4a8d38ba6 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java
@@ -3,7 +3,7 @@ package gregtech.common.blocks;
 import net.minecraft.block.Block;
 
 public class GT_Item_Casings6 extends GT_Item_Casings_Abstract {
-    public GT_Item_Casings6(Block par1) {
-        super(par1);
+    public GT_Item_Casings6(Block block) {
+        super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java
index 19ca06d5ac..0d87b5d906 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java
@@ -3,7 +3,7 @@ package gregtech.common.blocks;
 import net.minecraft.block.Block;
 
 public class GT_Item_Casings8 extends GT_Item_Casings_Abstract {
-    public GT_Item_Casings8(Block par1) {
-        super(par1);
+    public GT_Item_Casings8(Block block) {
+        super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
index 6a4b6e0695..33b428772d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
@@ -23,8 +23,8 @@ public abstract class GT_Item_Casings_Abstract extends ItemBlock {
     protected final String mCoil09Tooltip = GT_LanguageManager.addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 10800 Kelvin");
     protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof");
 
-    public GT_Item_Casings_Abstract(Block par1) {
-        super(par1);
+    public GT_Item_Casings_Abstract(Block block) {
+        super(block );
         setMaxDamage(0);
         setHasSubtypes(true);
         setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java
index bf8957afb4..1417aa4c39 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java
@@ -10,8 +10,8 @@ import java.util.List;
 public class GT_Item_Concretes extends GT_Item_Stones_Abstract {
     private final String mRunFasterToolTip = GT_LanguageManager.addStringLocalization("gt.runfastertooltip", "You can walk faster on this Block");
 
-    public GT_Item_Concretes(Block par1) {
-        super(par1);
+    public GT_Item_Concretes(Block block) {
+        super(block);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java b/src/main/java/gregtech/common/blocks/GT_Item_Granites.java
index d14474c17f..e0df50d07b 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Granites.java
@@ -3,7 +3,7 @@ package gregtech.common.blocks;
 import net.minecraft.block.Block;
 
 public class GT_Item_Granites extends GT_Item_Stones_Abstract {
-    public GT_Item_Granites(Block par1) {
-        super(par1);
+    public GT_Item_Granites(Block block) {
+        super(block);
     }
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java
index e376933623..c63f10b8f4 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java
@@ -13,13 +13,13 @@ public class GT_Item_LongDistancePipe extends ItemBlock {
     protected final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
     protected final String mNoTileEntityToolTip = GT_LanguageManager.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!");
 
-    public GT_Item_LongDistancePipe(Block par1) {
-        super(par1);
+    public GT_Item_LongDistancePipe(Block block) {
+        super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
         setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
     }
-    
+
     @Override
     public int getMetadata(int aMeta) {
         return aMeta;
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
index 18b1d073e5..2a108aca71 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -40,8 +40,8 @@ import java.util.List;
 import static gregtech.GT_Mod.GT_FML_LOGGER;
 
 public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
-    public GT_Item_Machines(Block par1) {
-        super(par1);
+    public GT_Item_Machines(Block block) {
+        super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
         setCreativeTab(GregTech_API.TAB_GREGTECH);
@@ -59,7 +59,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
 
     @Override
     @SuppressWarnings("unchecked")
-    public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean par4) {
+    public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
         try {
             final int tDamage = getDamage(aStack);
             if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
index ab31233abc..63c3babfbb 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java
@@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public class GT_Item_Ores extends ItemBlock {
-    public GT_Item_Ores(Block par1) {
-        super(par1);
+    public GT_Item_Ores(Block block) {
+        super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
         setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java
index 5170b1cbeb..b75743e110 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java
@@ -12,8 +12,8 @@ import java.util.List;
 public class GT_Item_Stones_Abstract extends ItemBlock {
     private final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
 
-    public GT_Item_Stones_Abstract(Block par1) {
-        super(par1);
+    public GT_Item_Stones_Abstract(Block block) {
+        super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
         setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java
index 3696cd4fc2..10cc3ea1ac 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java
@@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack;
 import java.util.List;
 
 public class GT_Item_Storage extends ItemBlock {
-    public GT_Item_Storage(Block par1) {
-        super(par1);
+    public GT_Item_Storage(Block block) {
+        super(block);
         setMaxDamage(0);
         setHasSubtypes(true);
         setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS);
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java
index 0bed5423dd..bd3003f39f 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java
@@ -20,7 +20,7 @@ public class GT_Cover_Crafting extends GT_CoverBehavior {
             ((EntityPlayerMP) aPlayer).playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(((EntityPlayerMP) aPlayer).currentWindowId, 1, "Crafting", 9, true));
             ((EntityPlayerMP) aPlayer).openContainer = new ContainerWorkbench(((EntityPlayerMP) aPlayer).inventory, ((EntityPlayerMP) aPlayer).worldObj, aTileEntity.getXCoord(), aTileEntity.getYCoord(), aTileEntity.getZCoord()) {
                 @Override
-                public boolean canInteractWith(EntityPlayer par1EntityPlayer) {
+                public boolean canInteractWith(EntityPlayer player) {
                     return true;
                 }
             };
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Boiler.java b/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
index afceed249b..d534c2e8ba 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Boiler.java
@@ -57,30 +57,30 @@ public class GT_Container_Boiler extends GT_ContainerMetaTile_Machine {
         this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));
 
         for (Object crafter : this.crafters) {
-            ICrafting var1 = (ICrafting) crafter;
-            var1.sendProgressBarUpdate(this, 100, this.mTemperature);
-            var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);
-            var1.sendProgressBarUpdate(this, 102, this.mSteamAmount);
-            var1.sendProgressBarUpdate(this, 103, this.mWaterAmount);
+            ICrafting player = (ICrafting) crafter;
+            player.sendProgressBarUpdate(this, 100, this.mTemperature);
+            player.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);
+            player.sendProgressBarUpdate(this, 102, this.mSteamAmount);
+            player.sendProgressBarUpdate(this, 103, this.mWaterAmount);
         }
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void updateProgressBar(int par1, int par2) {
-        super.updateProgressBar(par1, par2);
-        switch (par1) {
+    public void updateProgressBar(int id, int value) {
+        super.updateProgressBar(id, value);
+        switch (id) {
             case 100:
-                this.mTemperature = par2;
+                this.mTemperature = value;
                 break;
             case 101:
-                this.mProcessingEnergy = par2;
+                this.mProcessingEnergy = value;
                 break;
             case 102:
-                this.mSteamAmount = par2;
+                this.mSteamAmount = value;
                 break;
             case 103:
-                this.mWaterAmount = par2;
+                this.mWaterAmount = value;
         }
     }
 }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
index 96e918e27b..4e88c8088e 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
@@ -119,50 +119,50 @@ public class GT_Container_MicrowaveEnergyTransmitter extends GT_ContainerMetaTil
         this.mEgg = (((GT_MetaTileEntity_MicrowaveEnergyTransmitter) this.mTileEntity.getMetaTileEntity()).hasDimensionalTeleportCapability() ? 1 : 0);
 
         for (Object crafter : this.crafters) {
-            ICrafting var1 = (ICrafting) crafter;
-            var1.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16);
-            var1.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16);
-            var1.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16);
-            var1.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16);
-            var1.sendProgressBarUpdate(this, 108, this.mEgg);
+            ICrafting aPlayer = (ICrafting) crafter;
+            aPlayer.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF);
+            aPlayer.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16);
+            aPlayer.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF);
+            aPlayer.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16);
+            aPlayer.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF);
+            aPlayer.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16);
+            aPlayer.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF);
+            aPlayer.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16);
+            aPlayer.sendProgressBarUpdate(this, 108, this.mEgg);
         }
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void updateProgressBar(int par1, int par2) {
-        super.updateProgressBar(par1, par2);
-        switch (par1) {
+    public void updateProgressBar(int id, int value) {
+        super.updateProgressBar(id, value);
+        switch (id) {
             case 100:
-                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF);
+                this.mTargetX = (this.mTargetX & 0xFFFF0000 | value & 0xFFFF);
                 break;
             case 101:
-                this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16);
+                this.mTargetX = (this.mTargetX & 0xFFFF | value << 16);
                 break;
             case 102:
-                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF);
+                this.mTargetY = (this.mTargetY & 0xFFFF0000 | value & 0xFFFF);
                 break;
             case 103:
-                this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16);
+                this.mTargetY = (this.mTargetY & 0xFFFF | value << 16);
                 break;
             case 104:
-                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF);
+                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | value & 0xFFFF);
                 break;
             case 105:
-                this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16);
+                this.mTargetZ = (this.mTargetZ & 0xFFFF | value << 16);
                 break;
             case 106:
-                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF);
+                this.mTargetD = (this.mTargetD & 0xFFFF0000 | value & 0xFFFF);
                 break;
             case 107:
-                this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16);
+                this.mTargetD = (this.mTargetD & 0xFFFF | value << 16);
                 break;
             case 108:
-                this.mEgg = par2;
+                this.mEgg = value;
         }
     }
 }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
index 22098a0350..731db03613 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
@@ -41,22 +41,22 @@ public class GT_Container_QuantumChest extends GT_ContainerMetaTile_Machine {
         }
 
         for (Object crafter : this.crafters) {
-            ICrafting var1 = (ICrafting) crafter;
-            var1.sendProgressBarUpdate(this, 100, mContent & 65535);
-            var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
+            ICrafting aPlayer = (ICrafting) crafter;
+            aPlayer.sendProgressBarUpdate(this, 100, mContent & 65535);
+            aPlayer.sendProgressBarUpdate(this, 101, mContent >>> 16);
         }
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void updateProgressBar(int par1, int par2) {
-        super.updateProgressBar(par1, par2);
-        switch (par1) {
+    public void updateProgressBar(int id, int value) {
+        super.updateProgressBar(id, value);
+        switch (id) {
             case 100:
-                mContent = mContent & 0xffff0000 | par2 & 0x0000ffff;
+                mContent = mContent & 0xffff0000 | value & 0x0000ffff;
                 break;
             case 101:
-                mContent = mContent & 0x0000ffff | par2 << 16;
+                mContent = mContent & 0x0000ffff | value << 16;
                 break;
         }
     }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
index 909e1a04a5..c6a7bdbdec 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
@@ -116,44 +116,44 @@ public class GT_Container_Regulator extends GT_ContainerMetaTile_Machine {
             this.mTargetSlots[i] = ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[i];
         }
         for (Object crafter : this.crafters) {
-            ICrafting var1 = (ICrafting) crafter;
+            ICrafting player = (ICrafting) crafter;
             for (int i = 0; i < 9; i++) {
-                var1.sendProgressBarUpdate(this, 100 + i, this.mTargetSlots[i]);
+                player.sendProgressBarUpdate(this, 100 + i, this.mTargetSlots[i]);
             }
         }
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void updateProgressBar(int par1, int par2) {
-        super.updateProgressBar(par1, par2);
-        switch (par1) {
+    public void updateProgressBar(int id, int value) {
+        super.updateProgressBar(id, value);
+        switch (id) {
             case 100:
-                this.mTargetSlots[0] = par2;
+                this.mTargetSlots[0] = value;
                 break;
             case 101:
-                this.mTargetSlots[1] = par2;
+                this.mTargetSlots[1] = value;
                 break;
             case 102:
-                this.mTargetSlots[2] = par2;
+                this.mTargetSlots[2] = value;
                 break;
             case 103:
-                this.mTargetSlots[3] = par2;
+                this.mTargetSlots[3] = value;
                 break;
             case 104:
-                this.mTargetSlots[4] = par2;
+                this.mTargetSlots[4] = value;
                 break;
             case 105:
-                this.mTargetSlots[5] = par2;
+                this.mTargetSlots[5] = value;
                 break;
             case 106:
-                this.mTargetSlots[6] = par2;
+                this.mTargetSlots[6] = value;
                 break;
             case 107:
-                this.mTargetSlots[7] = par2;
+                this.mTargetSlots[7] = value;
                 break;
             case 108:
-                this.mTargetSlots[8] = par2;
+                this.mTargetSlots[8] = value;
         }
     }
 
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
index 2b1bc3b584..d5013d9504 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
@@ -120,52 +120,52 @@ public class GT_Container_Teleporter extends GT_ContainerMetaTile_Machine {
         this.mTargetD = ((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).mTargetD;
         this.mEgg = (((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).hasDimensionalTeleportCapability() ? 1 : 0);
 
-        Iterator var2 = this.crafters.iterator();
-        while (var2.hasNext()) {
-            ICrafting var1 = (ICrafting) var2.next();
-            var1.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16);
-            var1.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16);
-            var1.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16);
-            var1.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16);
-            var1.sendProgressBarUpdate(this, 108, this.mEgg);
+        Iterator playerIterator = this.crafters.iterator();
+        while (playerIterator.hasNext()) {
+            ICrafting player = (ICrafting) playerIterator.next();
+            player.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF);
+            player.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16);
+            player.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF);
+            player.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16);
+            player.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF);
+            player.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16);
+            player.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF);
+            player.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16);
+            player.sendProgressBarUpdate(this, 108, this.mEgg);
         }
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void updateProgressBar(int par1, int par2) {
-        super.updateProgressBar(par1, par2);
-        switch (par1) {
+    public void updateProgressBar(int id, int value) {
+        super.updateProgressBar(id, value);
+        switch (id) {
             case 100:
-                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF);
+                this.mTargetX = (this.mTargetX & 0xFFFF0000 | value & 0xFFFF);
                 break;
             case 101:
-                this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16);
+                this.mTargetX = (this.mTargetX & 0xFFFF | value << 16);
                 break;
             case 102:
-                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF);
+                this.mTargetY = (this.mTargetY & 0xFFFF0000 | value & 0xFFFF);
                 break;
             case 103:
-                this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16);
+                this.mTargetY = (this.mTargetY & 0xFFFF | value << 16);
                 break;
             case 104:
-                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF);
+                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | value & 0xFFFF);
                 break;
             case 105:
-                this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16);
+                this.mTargetZ = (this.mTargetZ & 0xFFFF | value << 16);
                 break;
             case 106:
-                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF);
+                this.mTargetD = (this.mTargetD & 0xFFFF0000 | value & 0xFFFF);
                 break;
             case 107:
-                this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16);
+                this.mTargetD = (this.mTargetD & 0xFFFF | value << 16);
                 break;
             case 108:
-                this.mEgg = par2;
+                this.mEgg = value;
         }
     }
 }
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java
index 4af4826f93..879c803702 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java
@@ -10,13 +10,13 @@ public class GT_GUIContainer_Boiler extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         this.fontRendererObj.drawString("Boiler", 8, 4, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
index a43de53e2f..d60977104e 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
@@ -10,13 +10,13 @@ public class GT_GUIContainer_BronzeBlastFurnace extends GT_GUIContainerMetaTile_
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         this.fontRendererObj.drawString("Bronze Blast Furnace", 8, 4, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java
index 149f120771..2f993140ac 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java
@@ -10,8 +10,8 @@ public class GT_GUIContainer_ChestBuffer extends GT_GUIContainerMetaTile_Machine
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java
index 20a8f59894..2ad3ea3018 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java
@@ -10,8 +10,8 @@ public class GT_GUIContainer_Filter extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
index 9d597c7f30..d6fd5da3ce 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
@@ -23,15 +23,15 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString(mName, 8, -10, 16448255);
 
         if (mContainer != null) {
-            if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 64) != 0)
+            if ((mContainer.mDisplayErrorCode & 64) != 0)
                 fontRendererObj.drawString("Incomplete Structure.", 10, 8, 16448255);
 
-            if (((GT_Container_MultiMachine) mContainer).mDisplayErrorCode == 0) {
-                if (((GT_Container_MultiMachine) mContainer).mActive == 0) {
+            if (mContainer.mDisplayErrorCode == 0) {
+                if (mContainer.mActive == 0) {
                     fontRendererObj.drawString("Hit with Soft Mallet to (re-)start the Machine if it doesn't start.", -70, 170, 16448255);
                 } else {
                     fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255);
@@ -49,8 +49,8 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java
index ca94379c5a..d4a2484a88 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java
@@ -10,8 +10,8 @@ public class GT_GUIContainer_ItemDistributor extends GT_GUIContainerMetaTile_Mac
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java
index db27fb8016..6d580bad11 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java
@@ -13,7 +13,7 @@ public class GT_GUIContainer_MicrowaveEnergyTransmitter extends GT_GUIContainerM
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         this.fontRendererObj.drawString("Teleporter", 46, 8, 16448255);
         if (this.mContainer != null) {
             this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetX), 46, 16, 16448255);
@@ -27,8 +27,8 @@ public class GT_GUIContainer_MicrowaveEnergyTransmitter extends GT_GUIContainerM
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
index 0ee4b0fd9f..5e009ef428 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
@@ -31,7 +31,7 @@ public class GT_GUIContainer_OutputHatch extends GT_GUIContainerMetaTile_Machine
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
         fontRendererObj.drawString(mName, 8, 6, 4210752);
         if (mContainer != null) {
@@ -45,8 +45,8 @@ public class GT_GUIContainer_OutputHatch extends GT_GUIContainerMetaTile_Machine
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java
index 08ee0d125c..1a709c8129 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java
@@ -17,23 +17,23 @@ public class GT_GUIContainer_PrimitiveBlastFurnace extends GT_GUIContainerMetaTi
         GT_GuiIcon.TAB_NORMAL_BRICK,
         GT_GuiIcon.TAB_HIGHLIGHT_BRICK,
         GT_GuiIcon.TAB_DISABLED_BRICK);
-    
+
     public GT_GUIContainer_PrimitiveBlastFurnace(InventoryPlayer inventoryPlayer, IGregTechTileEntity tileEntity,
             String name, String aNEI) {
-        super(new GT_Container_PrimitiveBlastFurnace(inventoryPlayer, tileEntity), 
+        super(new GT_Container_PrimitiveBlastFurnace(inventoryPlayer, tileEntity),
                 String.format("gregtech:textures/gui/%s.png", name.replace(" ", "")));
         this.name = name;
         this.mNEI = aNEI;
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         this.fontRendererObj.drawString(name, 8, 4, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java
index 9f557d43af..e4a98ac14b 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java
@@ -18,7 +18,7 @@ public class GT_GUIContainer_QuantumChest extends GT_GUIContainerMetaTile_Machin
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
         fontRendererObj.drawString(mName, 8, 6, 4210752);
         if (mContainer != null) {
@@ -28,8 +28,8 @@ public class GT_GUIContainer_QuantumChest extends GT_GUIContainerMetaTile_Machin
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java
index 9a237a517f..06b1ddb00e 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java
@@ -10,7 +10,7 @@ public class GT_GUIContainer_Regulator extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[0]), 120, 9, 16448255);
         this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[1]), 137, 9, 16448255);
         this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[2]), 155, 9, 16448255);
@@ -23,8 +23,8 @@ public class GT_GUIContainer_Regulator extends GT_GUIContainerMetaTile_Machine {
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java
index f4cb165cf9..e7b7730d75 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java
@@ -10,8 +10,8 @@ public class GT_GUIContainer_SuperBuffer extends GT_GUIContainerMetaTile_Machine
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java
index 8c02897738..786cb6b5b3 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java
@@ -13,7 +13,7 @@ public class GT_GUIContainer_Teleporter extends GT_GUIContainerMetaTile_Machine
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         this.fontRendererObj.drawString("Teleporter", 46, 8, 16448255);
         if (this.mContainer != null) {
             this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetX), 46, 16, 16448255);
@@ -27,8 +27,8 @@ public class GT_GUIContainer_Teleporter extends GT_GUIContainerMetaTile_Machine
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+    protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) {
+        super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY);
         int x = (this.width - this.xSize) / 2;
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index 55e10bd62e..a2879844aa 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -65,8 +65,8 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
     }
 
     @Override
-    public IIcon getIconFromDamage(int aMeta) {
-        return Stream.of(FluidRegistry.getFluid(aMeta), FluidRegistry.WATER)
+    public IIcon getIconFromDamage(int aMetaData) {
+        return Stream.of(FluidRegistry.getFluid(aMetaData), FluidRegistry.WATER)
                 .filter(Objects::nonNull)
                 .map(Fluid::getStillIcon)
                 .filter(Objects::nonNull)
diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
index b68a6974e4..052e5ed1b6 100644
--- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
+++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
@@ -125,7 +125,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
 
     @Override
     @SideOnly(Side.CLIENT)
-    public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+    public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
         aList.add(new ItemStack(this, 1, 0));
     }
 
@@ -151,8 +151,8 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
     }
 
     @Override
-    public IIcon getIconFromDamage(int damage) {
-        byte circuitMode = ((byte) (damage & 0xFF)); // Mask out the MSB Comparison Mode Bits. See: getModeString
+    public IIcon getIconFromDamage(int aMetaData) {
+        byte circuitMode = ((byte) (aMetaData & 0xFF)); // Mask out the MSB Comparison Mode Bits. See: getModeString
         return mIconDamage[circuitMode < mIconDamage.length ? circuitMode : 0];
     }
 
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
index b78d4e567b..34f01c7165 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
@@ -300,7 +300,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+    public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
         Arrays.stream(FluidCell.values())
                 .map(FluidCell::get)
                 .filter(Objects::nonNull)
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java
index 1c27310d99..820c28fea3 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java
@@ -161,7 +161,7 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+    public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
         enabled.stream()
                 .mapToObj(i -> new ItemStack(this, 1, i))
                 .forEach(aList::add);
diff --git a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
index ddc523239a..b2f73d304f 100644
--- a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
+++ b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
@@ -94,6 +94,6 @@ public class GT_SensorCard_Item extends GT_Generic_Item implements IRemoteSensor
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item var1, CreativeTabs aTab, List aList) {
+    public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aOutputSubItems) {
     }
 }
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 4599382063..a6030b0cd8 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -73,9 +73,9 @@ public class ItemComb extends Item {
 
 	@Override
     @SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		this.itemIcon = par1IconRegister.registerIcon("forestry:beeCombs.0");
-		this.secondIcon = par1IconRegister.registerIcon("forestry:beeCombs.1");
+	public void registerIcons(IIconRegister iconRegister) {
+		this.itemIcon = iconRegister.registerIcon("forestry:beeCombs.0");
+		this.secondIcon = iconRegister.registerIcon("forestry:beeCombs.1");
 	}
 
 	@Override
diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java
index d9b5db5bc7..b48072dbd1 100644
--- a/src/main/java/gregtech/common/items/ItemDrop.java
+++ b/src/main/java/gregtech/common/items/ItemDrop.java
@@ -65,9 +65,9 @@ public class ItemDrop extends Item {
 
 	@Override
     @SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		this.itemIcon = par1IconRegister.registerIcon("forestry:honeyDrop.0");
-		this.secondIcon = par1IconRegister.registerIcon("forestry:honeyDrop.1");
+	public void registerIcons(IIconRegister iconRegister) {
+		this.itemIcon = iconRegister.registerIcon("forestry:honeyDrop.0");
+		this.secondIcon = iconRegister.registerIcon("forestry:honeyDrop.1");
 	}
 
 	@Override
diff --git a/src/main/java/gregtech/common/items/ItemPollen.java b/src/main/java/gregtech/common/items/ItemPollen.java
index eaef49e02a..bc41b1c83d 100644
--- a/src/main/java/gregtech/common/items/ItemPollen.java
+++ b/src/main/java/gregtech/common/items/ItemPollen.java
@@ -57,9 +57,9 @@ public class ItemPollen extends Item {
 
 	@Override
     @SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		this.itemIcon = par1IconRegister.registerIcon("forestry:pollen.0");
-		this.secondIcon = par1IconRegister.registerIcon("forestry:pollen.1");
+	public void registerIcons(IIconRegister iconRegister) {
+		this.itemIcon = iconRegister.registerIcon("forestry:pollen.0");
+		this.secondIcon = iconRegister.registerIcon("forestry:pollen.1");
 	}
 
 	@Override
diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java
index b6fe8b242e..729958a72e 100644
--- a/src/main/java/gregtech/common/items/ItemPropolis.java
+++ b/src/main/java/gregtech/common/items/ItemPropolis.java
@@ -54,8 +54,8 @@ public class ItemPropolis extends Item {
 
 	@Override
     @SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		this.itemIcon = par1IconRegister.registerIcon("forestry:propolis.0");
+	public void registerIcons(IIconRegister iconRegister) {
+		this.itemIcon = iconRegister.registerIcon("forestry:propolis.0");
 	}
 
 	@Override