Bugfixes 3/2/1 fix: Remove commented code

5 files changed, 3 insertions, 12 deletions

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 574b111039..b9cae3e0b3 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java
@@ -29,8 +29,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer {
         super.drawGuiContainerBackgroundLayer(par1, par2, par3);
         if (GregTech_API.sColoredGUI && mContainer != null && mContainer.mTileEntity != null) {
             int tColor = mContainer.mTileEntity.getColorization() & 15;
-            /* Bug kind and pattern: INT - INT_BAD_COMPARISON_WITH_NONNEGATIVE_VALUE */
-            if (/*tColor >= 0 && */tColor < ItemDye.field_150922_c.length) {
+            if (tColor < ItemDye.field_150922_c.length) {
                 tColor = ItemDye.field_150922_c[tColor];
                 GL11.glColor4f(((tColor >> 16) & 255) / 255.0F, ((tColor >> 8) & 255) / 255.0F, (tColor & 255) / 255.0F, 1.0F);
             } else GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
index e7acfb8549..552d98f50b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
@@ -112,10 +112,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
         }
         if (mSolderingTool && aPlayer instanceof EntityPlayerMP) {
             EntityPlayerMP tPlayer = (EntityPlayerMP) aPlayer;
-            //try {
-                GT_Mod.instance.achievements.issueAchievement(tPlayer, "maintainance");
-            //} catch (Exception e) {
-            //}
+            GT_Mod.instance.achievements.issueAchievement(tPlayer, "maintainance");
         }
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 823790b98b..276f8aa02e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -238,10 +238,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
                                 if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime) {
                                     if (mOutputItems != null) for (ItemStack tStack : mOutputItems)
                                         if (tStack != null) {
-                                            //try {
-                                                GT_Mod.instance.achievements.issueAchivementHatch(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), tStack);
-                                            //} catch (Exception e) {
-                                            //}
+                                            GT_Mod.instance.achievements.issueAchivementHatch(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), tStack);
                                             addOutput(tStack);
                                         }
                                     if (mOutputFluids != null && mOutputFluids.length == 1) {
diff --git a/src/main/java/gregtech/api/objects/ElementStack.java b/src/main/java/gregtech/api/objects/ElementStack.java
index 207d77f744..e406461d9a 100644
--- a/src/main/java/gregtech/api/objects/ElementStack.java
+++ b/src/main/java/gregtech/api/objects/ElementStack.java
@@ -18,7 +18,6 @@ public class ElementStack implements Cloneable {
     @Override
     public ElementStack clone() {
         try { Object cloneES = super.clone();
-        //return new ElementStack(mElement, mAmount);
         return (ElementStack) cloneES; } catch (Exception e) { return new ElementStack(mElement, mAmount); }
     }
 
diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index 60808ab639..bba0753df1 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -18,7 +18,6 @@ public class MaterialStack implements Cloneable {
     @Override
     public MaterialStack clone() {
         try { Object cloneMS = super.clone();
-        //return new MaterialStack(mMaterial, mAmount);
         return (MaterialStack) cloneMS;} catch (Exception e) { return new MaterialStack(mMaterial, mAmount); }
     }