Bugfixes 6 fix: Removed commented code

11 files changed, 137 insertions, 164 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_Container.java b/src/main/java/gregtech/api/gui/GT_Container.java
index 304e215ad4..e2db969e1c 100644
--- a/src/main/java/gregtech/api/gui/GT_Container.java
+++ b/src/main/java/gregtech/api/gui/GT_Container.java
@@ -124,7 +124,7 @@ public class GT_Container extends Container {
 
         if ((aShifthold == 0 || aShifthold == 1) && (aMouseclick == 0 || aMouseclick == 1)) {
             if (aSlotIndex == -999) {
-                if (aPlayerInventory.getItemStack() != null/* && aSlotIndex == -999*/) {
+                if (aPlayerInventory.getItemStack() != null) {
                     if (aMouseclick == 0) {
                         aPlayer.dropPlayerItemWithRandomChoice(aPlayerInventory.getItemStack(), true);
                         aPlayerInventory.setItemStack(null);
diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
index ab11dbb690..e39d223830 100644
--- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
+++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
@@ -294,7 +294,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci
         chargeFromArmor(aStack, aPlayer);
         if (aPlayer instanceof EntityPlayer && ((EntityPlayer) aPlayer).capabilities.isCreativeMode) return true;
         double tTransfer = discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, true);
-        if (/*tTransfer == aAmount*/Math.abs(tTransfer - aAmount) < .0000001) {
+        if (Math.abs(tTransfer - aAmount) < .0000001) {
             discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false);
             chargeFromArmor(aStack, aPlayer);
             return true;
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index fa66ae8c1d..5f086895f4 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -159,13 +159,11 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
         if (aID <= 0 || aID >= GregTech_API.METATILEENTITIES.length || GregTech_API.METATILEENTITIES[aID] == null) {
             GT_Log.err.println("MetaID " + aID + " not loadable => locking TileEntity!");
         } else {
-            //if (aID != 0) {
-                if (hasValidMetaTileEntity()) mMetaTileEntity.setBaseMetaTileEntity(null);
-                GregTech_API.METATILEENTITIES[aID].newMetaEntity(this).setBaseMetaTileEntity(this);
-                mTickTimer = 0;
-                mID = aID;
-                return true;
-            //}
+            if (hasValidMetaTileEntity()) mMetaTileEntity.setBaseMetaTileEntity(null);
+            GregTech_API.METATILEENTITIES[aID].newMetaEntity(this).setBaseMetaTileEntity(this);
+            mTickTimer = 0;
+            mID = aID;
+            return true;
         }
         return false;
     }
@@ -182,121 +180,113 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
         long tTime = System.currentTimeMillis();
         int tCode = 0;
 
-        try { for (tCode = 0; hasValidMetaTileEntity() && tCode >= 0; ) {
-            //replace switch in if
-            //switch (tCode) {
-            //case 0:
-            if (tCode == 0) {
-                tCode++;
-                if (mTickTimer++ == 0) {
-                    oX = xCoord;
-                    oY = yCoord;
-                    oZ = zCoord;
-                    if (isServerSide()) for (byte i = 0; i < 6; i++)
-                        if (getCoverIDAtSide(i) != 0)
-                            if (!mMetaTileEntity.allowCoverOnSide(i, new GT_ItemStack(getCoverIDAtSide(i))))
-                                dropCover(i, i, true);
-                    worldObj.markTileEntityChunkModified(xCoord, yCoord, zCoord, this);
-                    mMetaTileEntity.onFirstTick(this);
-                    if (!hasValidMetaTileEntity()) return;
-                }}
-            //case 1:
-            if (tCode == 1) {
-                tCode++;
-                if (isClientSide()) {
-                    if (mColor != oColor) {
-                        mMetaTileEntity.onColorChangeClient(oColor = mColor);
-                        issueTextureUpdate();
+        try {
+            for (tCode = 0; hasValidMetaTileEntity() && tCode >= 0; ) {
+                if (tCode == 0) {
+                    tCode++;
+                    if (mTickTimer++ == 0) {
+                        oX = xCoord;
+                        oY = yCoord;
+                        oZ = zCoord;
+                        if (isServerSide()) for (byte i = 0; i < 6; i++)
+                            if (getCoverIDAtSide(i) != 0)
+                                if (!mMetaTileEntity.allowCoverOnSide(i, new GT_ItemStack(getCoverIDAtSide(i))))
+                                    dropCover(i, i, true);
+                        worldObj.markTileEntityChunkModified(xCoord, yCoord, zCoord, this);
+                        mMetaTileEntity.onFirstTick(this);
+                        if (!hasValidMetaTileEntity()) return;
                     }
+                }
+                if (tCode == 1) {
+                    tCode++;
+                    if (isClientSide()) {
+                        if (mColor != oColor) {
+                            mMetaTileEntity.onColorChangeClient(oColor = mColor);
+                            issueTextureUpdate();
+                        }
 
-                    if (mNeedsUpdate) {
-                        worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
-                        //worldObj.func_147479_m(xCoord, yCoord, zCoord);
-                        mNeedsUpdate = false;
+                        if (mNeedsUpdate) {
+                            worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
+                            //worldObj.func_147479_m(xCoord, yCoord, zCoord);
+                            mNeedsUpdate = false;
+                        }
                     }
-                }}
-                    /*case 2:
-                    case 3:
-                    case 4:
-                    case 5:
-                    case 6:
-                    case 7:*/
-            if (tCode >= 2 && tCode <= 7) {
-                if (isServerSide() && mTickTimer > 10) {
-                    for (byte i = (byte) (tCode - 2); i < 6; i++)
-                        if (getCoverIDAtSide(i) != 0) {
-                            tCode++;
-                            GT_CoverBehavior tCover = getCoverBehaviorAtSide(i);
-                            int tCoverTickRate = tCover.getTickRate(i, getCoverIDAtSide(i), mCoverData[i], this);
-                            if (tCoverTickRate > 0 && mTickTimer % tCoverTickRate == 0) {
-                                mCoverData[i] = tCover.doCoverThings(i, getInputRedstoneSignal(i), getCoverIDAtSide(i), mCoverData[i], this, mTickTimer);
-                                if (!hasValidMetaTileEntity()) return;
+                }
+                if (tCode >= 2 && tCode <= 7) {
+                    if (isServerSide() && mTickTimer > 10) {
+                        for (byte i = (byte) (tCode - 2); i < 6; i++)
+                            if (getCoverIDAtSide(i) != 0) {
+                                tCode++;
+                                GT_CoverBehavior tCover = getCoverBehaviorAtSide(i);
+                                int tCoverTickRate = tCover.getTickRate(i, getCoverIDAtSide(i), mCoverData[i], this);
+                                if (tCoverTickRate > 0 && mTickTimer % tCoverTickRate == 0) {
+                                    mCoverData[i] = tCover.doCoverThings(i, getInputRedstoneSignal(i), getCoverIDAtSide(i), mCoverData[i], this, mTickTimer);
+                                    if (!hasValidMetaTileEntity()) return;
+                                }
                             }
+                        mConnections = (byte) (mMetaTileEntity.mConnections | (mConnections & ~63));
+                        if ((mConnections & -64) == 64 && getRandomNumber(1000) == 0) {
+                            mConnections = (byte) ((mConnections & ~64) | -128);
                         }
-                    mConnections = (byte) (mMetaTileEntity.mConnections | (mConnections & ~63));
-                    if ((mConnections & -64) == 64 && getRandomNumber(1000) == 0) {
-                        mConnections = (byte) ((mConnections & ~64) | -128);
-                    }
-                }}
-            //case 8:
-            if (tCode == 8) {
-                tCode = 9;
-                mMetaTileEntity.onPreTick(this, mTickTimer);
-                if (!hasValidMetaTileEntity()) return;}
-            //case 9:
-            if (tCode == 9) {
-                tCode++;
-                if (isServerSide()) {
-                    if (mTickTimer == 10) {
-                        for (byte i = 0; i < 6; i++)
-                            mCoverBehaviors[i] = GregTech_API.getCoverBehavior(mCoverSides[i]);
-                        issueBlockUpdate();
                     }
+                }
+                if (tCode == 8) {
+                    tCode = 9;
+                    mMetaTileEntity.onPreTick(this, mTickTimer);
+                    if (!hasValidMetaTileEntity()) return;}
+                if (tCode == 9) {
+                    tCode++;
+                    if (isServerSide()) {
+                        if (mTickTimer == 10) {
+                            for (byte i = 0; i < 6; i++)
+                                mCoverBehaviors[i] = GregTech_API.getCoverBehavior(mCoverSides[i]);
+                            issueBlockUpdate();
+                        }
 
-                    if (xCoord != oX || yCoord != oY || zCoord != oZ) {
-                        oX = xCoord;
-                        oY = yCoord;
-                        oZ = zCoord;
-                        issueClientUpdate();
-                        clearTileEntityBuffer();
-                    }
-                }}
-            //case 10:
-            if (tCode == 10) {
-                tCode++;
-                mMetaTileEntity.onPostTick(this, mTickTimer);
-                if (!hasValidMetaTileEntity()) return;}
-            //case 11:
-            if (tCode == 11) {
-                tCode++;
-                if (isServerSide()) {
-                    if (mTickTimer % 10 == 0) {
-                        if (mSendClientData) {
-                            NW.sendPacketToAllPlayersInRange(worldObj, new GT_Packet_TileEntity(xCoord, (short) yCoord, zCoord, mID, mCoverSides[0], mCoverSides[1], mCoverSides[2], mCoverSides[3], mCoverSides[4], mCoverSides[5], oTextureData = mConnections, oUpdateData = hasValidMetaTileEntity() ? mMetaTileEntity.getUpdateData() : 0, oRedstoneData = (byte) (((mSidedRedstone[0] > 0) ? 1 : 0) | ((mSidedRedstone[1] > 0) ? 2 : 0) | ((mSidedRedstone[2] > 0) ? 4 : 0) | ((mSidedRedstone[3] > 0) ? 8 : 0) | ((mSidedRedstone[4] > 0) ? 16 : 0) | ((mSidedRedstone[5] > 0) ? 32 : 0)), oColor = mColor), xCoord, zCoord);
-                            mSendClientData = false;
+                        if (xCoord != oX || yCoord != oY || zCoord != oZ) {
+                            oX = xCoord;
+                            oY = yCoord;
+                            oZ = zCoord;
+                            issueClientUpdate();
+                            clearTileEntityBuffer();
                         }
                     }
+                }
+                if (tCode == 10) {
+                    tCode++;
+                    mMetaTileEntity.onPostTick(this, mTickTimer);
+                    if (!hasValidMetaTileEntity()) return;}
+                if (tCode == 11) {
+                    tCode++;
+                    if (isServerSide()) {
+                        if (mTickTimer % 10 == 0) {
+                            if (mSendClientData) {
+                                NW.sendPacketToAllPlayersInRange(worldObj, new GT_Packet_TileEntity(xCoord, (short) yCoord, zCoord, mID, mCoverSides[0], mCoverSides[1], mCoverSides[2], mCoverSides[3], mCoverSides[4], mCoverSides[5], oTextureData = mConnections, oUpdateData = hasValidMetaTileEntity() ? mMetaTileEntity.getUpdateData() : 0, oRedstoneData = (byte) (((mSidedRedstone[0] > 0) ? 1 : 0) | ((mSidedRedstone[1] > 0) ? 2 : 0) | ((mSidedRedstone[2] > 0) ? 4 : 0) | ((mSidedRedstone[3] > 0) ? 8 : 0) | ((mSidedRedstone[4] > 0) ? 16 : 0) | ((mSidedRedstone[5] > 0) ? 32 : 0)), oColor = mColor), xCoord, zCoord);
+                                mSendClientData = false;
+                            }
+                        }
 
-                    if (mTickTimer > 10) {
-                        if (mConnections != oTextureData) sendBlockEvent((byte) 0, oTextureData = mConnections);
-                        byte tData = mMetaTileEntity.getUpdateData();
-                        if (tData != oUpdateData) sendBlockEvent((byte) 1, oUpdateData = tData);
-                        if (mColor != oColor) sendBlockEvent((byte) 2, oColor = mColor);
-                        tData = (byte) (((mSidedRedstone[0] > 0) ? 1 : 0) | ((mSidedRedstone[1] > 0) ? 2 : 0) | ((mSidedRedstone[2] > 0) ? 4 : 0) | ((mSidedRedstone[3] > 0) ? 8 : 0) | ((mSidedRedstone[4] > 0) ? 16 : 0) | ((mSidedRedstone[5] > 0) ? 32 : 0));
-                        if (tData != oRedstoneData) sendBlockEvent((byte) 3, oRedstoneData = tData);
-                    }
+                        if (mTickTimer > 10) {
+                            if (mConnections != oTextureData) sendBlockEvent((byte) 0, oTextureData = mConnections);
+                            byte tData = mMetaTileEntity.getUpdateData();
+                            if (tData != oUpdateData) sendBlockEvent((byte) 1, oUpdateData = tData);
+                            if (mColor != oColor) sendBlockEvent((byte) 2, oColor = mColor);
+                            tData = (byte) (((mSidedRedstone[0] > 0) ? 1 : 0) | ((mSidedRedstone[1] > 0) ? 2 : 0) | ((mSidedRedstone[2] > 0) ? 4 : 0) | ((mSidedRedstone[3] > 0) ? 8 : 0) | ((mSidedRedstone[4] > 0) ? 16 : 0) | ((mSidedRedstone[5] > 0) ? 32 : 0));
+                            if (tData != oRedstoneData) sendBlockEvent((byte) 3, oRedstoneData = tData);
+                        }
 
-                    if (mNeedsBlockUpdate) {
-                        worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockOffset(0, 0, 0));
-                        mNeedsBlockUpdate = false;
+                        if (mNeedsBlockUpdate) {
+                            worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockOffset(0, 0, 0));
+                            mNeedsBlockUpdate = false;
+                        }
                     }
-                }}
-            //default:
-            if (tCode > 11) {
-                tCode = -1;
-                break;}
-            //}
-        }} catch (Throwable e) {
+                }
+                if (tCode > 11) {
+                    tCode = -1;
+                    break;
+                }
+            }
+        } catch (Throwable e) {
             gregtech.api.util.GT_Log.err.println("Encountered Exception while ticking MetaTileEntity in Step " + (tCode - 1) + ". The Game should've crashed now, but I prevented that. Please report immidietly to GregTech Intergalactical!!!");
             e.printStackTrace(GT_Log.err);
         }
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 10da0ac906..6fc5859d4e 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -206,13 +206,11 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
         if (aID <= 0 || aID >= GregTech_API.METATILEENTITIES.length || GregTech_API.METATILEENTITIES[aID] == null) {
             GT_Log.err.println("MetaID " + aID + " not loadable => locking TileEntity!");
         } else {
-            //if (aID != 0) {
-                if (hasValidMetaTileEntity()) mMetaTileEntity.setBaseMetaTileEntity(null);
-                GregTech_API.METATILEENTITIES[aID].newMetaEntity(this).setBaseMetaTileEntity(this);
-                mTickTimer = 0;
-                mID = aID;
-                return true;
-            //}
+            if (hasValidMetaTileEntity()) mMetaTileEntity.setBaseMetaTileEntity(null);
+            GregTech_API.METATILEENTITIES[aID].newMetaEntity(this).setBaseMetaTileEntity(this);
+            mTickTimer = 0;
+            mID = aID;
+            return true;
         }
         return false;
     }
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 e3992efce5..ddc89ecf49 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -33,42 +33,35 @@ public class GT_Item_Machines
             if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {

                 return;

             }

-            //if (tDamage == 0) {

-                //aList.add("WARNING, THE EXISTENCE OF THIS ITEM IS A BUG");

-                //aList.add("IF YOU GOT IT IN SURVIVAL THEN PLEASE REPORT IT");

-            //} else {

-                TileEntity temp = GregTech_API.sBlockMachines.createTileEntity(aPlayer == null ? GT_Values.DW : aPlayer.worldObj, GregTech_API.METATILEENTITIES[tDamage] == null ? 0 : GregTech_API.METATILEENTITIES[tDamage].getTileEntityBaseType());

-                //if (temp != null) {

-                    temp.setWorldObj(aPlayer == null ? GT_Values.DW : aPlayer.worldObj);

-                    temp.xCoord = 0;

-                    temp.yCoord = 0;

-                    temp.zCoord = 0;

-                    if ((temp instanceof IGregTechTileEntity)) {

-                        IGregTechTileEntity tTileEntity = (IGregTechTileEntity) temp;

-                        tTileEntity.setInitialValuesAsNBT(new NBTTagCompound(), (short) tDamage);

-                        if (tTileEntity.getDescription() != null) {

-                            int i = 0;

-                            for (String tDescription : tTileEntity.getDescription()) {

-                                if (GT_Utility.isStringValid(tDescription)) {

-                                    aList.add(GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++, tDescription, !GregTech_API.sPostloadFinished));

-                                }

-                            }

-                        }

-                        if (tTileEntity.getEUCapacity() > 0L) {

-                            if (tTileEntity.getInputVoltage() > 0L) {

-                                aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")" + EnumChatFormatting.GRAY);

-                            }

-                            if (tTileEntity.getOutputVoltage() > 0L) {

-                                aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")" + EnumChatFormatting.GRAY);

-                            }

-                            if (tTileEntity.getOutputAmperage() > 1L) {

-                                aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY);

-                            }

-                            aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.BLUE + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY);

+            TileEntity temp = GregTech_API.sBlockMachines.createTileEntity(aPlayer == null ? GT_Values.DW : aPlayer.worldObj, GregTech_API.METATILEENTITIES[tDamage] == null ? 0 : GregTech_API.METATILEENTITIES[tDamage].getTileEntityBaseType());

+            temp.setWorldObj(aPlayer == null ? GT_Values.DW : aPlayer.worldObj);

+            temp.xCoord = 0;

+            temp.yCoord = 0;

+            temp.zCoord = 0;

+            if ((temp instanceof IGregTechTileEntity)) {

+                IGregTechTileEntity tTileEntity = (IGregTechTileEntity) temp;

+                tTileEntity.setInitialValuesAsNBT(new NBTTagCompound(), (short) tDamage);

+                if (tTileEntity.getDescription() != null) {

+                    int i = 0;

+                    for (String tDescription : tTileEntity.getDescription()) {

+                        if (GT_Utility.isStringValid(tDescription)) {

+                            aList.add(GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++, tDescription, !GregTech_API.sPostloadFinished));

                         }

                     }

-                //}

-            //}

+                }

+                if (tTileEntity.getEUCapacity() > 0L) {

+                    if (tTileEntity.getInputVoltage() > 0L) {

+                        aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")" + EnumChatFormatting.GRAY);

+                    }

+                    if (tTileEntity.getOutputVoltage() > 0L) {

+                        aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")" + EnumChatFormatting.GRAY);

+                    }

+                    if (tTileEntity.getOutputAmperage() > 1L) {

+                        aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY);

+                    }

+                    aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ", !GregTech_API.sPostloadFinished) + EnumChatFormatting.BLUE + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY);

+                }

+            }

             NBTTagCompound aNBT = aStack.getTagCompound();

             if (aNBT != null) {

                 if (aNBT.getBoolean("mMuffler")) {

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
index eaf791e523..09a7a9a36b 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
@@ -72,8 +72,6 @@ public class GT_Cover_Drain
     }

 

     public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {

-        //if ((aCoverVariable > 1) && ((aTileEntity instanceof IMachineProgress))) {

-        //}

         return ((IMachineProgress) aTileEntity).isAllowedToWork() == aCoverVariable < 2;

     }

 

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java b/src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java
index d077e31389..2ab40531f3 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java
@@ -33,7 +33,7 @@ public class GT_Cover_EnergyOnly
 

     public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

         if ((aCoverVariable > 1) && ((aTileEntity instanceof IMachineProgress))) {

-            if (((IMachineProgress) aTileEntity).isAllowedToWork()/* != aCoverVariable < 2*/) {

+            if (((IMachineProgress) aTileEntity).isAllowedToWork()) {

                 return false;

             }

         }

@@ -42,7 +42,7 @@ public class GT_Cover_EnergyOnly
 

     public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

         if ((aCoverVariable > 1) && ((aTileEntity instanceof IMachineProgress))) {

-            if (((IMachineProgress) aTileEntity).isAllowedToWork()/* != aCoverVariable < 2*/) {

+            if (((IMachineProgress) aTileEntity).isAllowedToWork()) {

                 return false;

             }

         }

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 2aa12d8edb..805a7a8f2a 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
@@ -21,7 +21,7 @@ public class GT_GUIContainer_BronzeBlastFurnace
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);

         if ((this.mContainer != null) &&

                 (this.mContainer.mProgressTime > 0)) {

-            drawTexturedModalRect(x + 58, y + 28, 176, 0, Math.max(0, Math.min(20, (/*this.mContainer.mProgressTime > 0 ? */1/* : 0*/) + this.mContainer.mProgressTime * 20 / (this.mContainer.mMaxProgressTime < 1 ? 1 : this.mContainer.mMaxProgressTime))), 11);

+            drawTexturedModalRect(x + 58, y + 28, 176, 0, Math.max(0, Math.min(20, (1) + this.mContainer.mProgressTime * 20 / (this.mContainer.mMaxProgressTime < 1 ? 1 : this.mContainer.mMaxProgressTime))), 11);

         }

     }

 }

diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java
index 6a0ab85b3d..f256f036ca 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java
@@ -97,8 +97,6 @@ public class Behaviour_Sonictron
     }

 

     public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {

-        //if ((!aWorld.isRemote) && (aWorld.getBlock(aX, aY, aZ) == GregTech_API.sBlockMachines) && (aWorld.getBlockMetadata(aX, aY, aZ) == 6)) {

-        //}

         setCurrentIndex(aStack, -1);

         return false;

     }

diff --git a/src/main/java/gregtech/common/render/GT_MetaGenerated_Item_Renderer.java b/src/main/java/gregtech/common/render/GT_MetaGenerated_Item_Renderer.java
index 152ac12513..0db9e8be6d 100644
--- a/src/main/java/gregtech/common/render/GT_MetaGenerated_Item_Renderer.java
+++ b/src/main/java/gregtech/common/render/GT_MetaGenerated_Item_Renderer.java
@@ -23,8 +23,6 @@ public class GT_MetaGenerated_Item_Renderer
         GT_MetaGenerated_Item tItem;

         for (Iterator i$ = GT_MetaGenerated_Item.sInstances.values().iterator(); i$.hasNext(); MinecraftForgeClient.registerItemRenderer(tItem, this)) {

             tItem = (GT_MetaGenerated_Item) i$.next();

-            //if ((tItem == null) || (!tItem.useStandardMetaItemRenderer())) {

-            //}

         }

     }

 

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
index 995022f45d..b5dab73442 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
@@ -86,8 +86,6 @@ public class GT_MetaTileEntity_Replicator
             Materials tMaterial;

             for (Iterator i$ = Materials.VALUES.iterator(); i$.hasNext(); sHeaviestElementMass = Math.max(sHeaviestElementMass, (int) tMaterial.getMass())) {

                 tMaterial = (Materials) i$.next();

-                //if ((tMaterial.mElement == null) || (tMaterial.mElement.mIsIsotope)) {

-                //}

             }

         }

         return sHeaviestElementMass;