Bugfixes 5

5 files changed, 15 insertions, 16 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 50e60f00b3..b791e58485 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -16,7 +16,6 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.items.behaviors.Behaviour_DataOrb;

-import gregtech.common.items.behaviors.Behaviour_DataStick;

 import net.minecraft.init.Items;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

@@ -207,12 +206,12 @@ public class GT_MetaTileEntity_Scanner
     @Override

     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

         if (mProgresstime >= (mMaxProgresstime - 1)) {

-            try {

+            //try {

                 if (this.mOutputItems[0].getUnlocalizedName().equals("gt.metaitem.01.32707")) {

                     GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning");

                 }

-            } catch (Exception e) {

-            }

+            //} catch (Exception e) {

+            //}

         }

         super.onPostTick(aBaseMetaTileEntity, aTick);

     }

diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
index c62b795adb..96030205e5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
@@ -34,13 +34,13 @@ public class GT_MetaTileEntity_AlloySmelter_Bronze
         GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[1], null, getAllInputs());

         if ((tRecipe != null) && (canOutput(tRecipe.mOutputs)) && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {

             this.mOutputItems[0] = tRecipe.getOutput(0);

-            if (tRecipe.mEUt <= 16) {

+            //if (tRecipe.mEUt <= 16) {

                 this.mEUt = tRecipe.mEUt;

                 this.mMaxProgresstime = (tRecipe.mDuration * 2);

-            } else {

+            /*} else {

                 this.mEUt = tRecipe.mEUt;

                 this.mMaxProgresstime = (tRecipe.mDuration * 2);

-            }

+            }*/

             return 2;

         }

         return 0;

diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
index fe32ca8bce..7ed2c86396 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
@@ -34,13 +34,13 @@ public class GT_MetaTileEntity_AlloySmelter_Steel
         GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[2], null, getAllInputs());

         if ((tRecipe != null) && (canOutput(tRecipe.mOutputs)) && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {

             this.mOutputItems[0] = tRecipe.getOutput(0);

-            if (tRecipe.mEUt <= 16) {

+            //if (tRecipe.mEUt <= 16) {

                 this.mEUt = (tRecipe.mEUt * 3);

                 this.mMaxProgresstime = tRecipe.mDuration;

-            } else {

+            /*} else {

                 this.mEUt = (tRecipe.mEUt * 3);

                 this.mMaxProgresstime = tRecipe.mDuration;

-            }

+            }*/

             return 2;

         }

         return 0;

diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
index 5b0877a3f1..f66cd809d4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
@@ -34,13 +34,13 @@ public class GT_MetaTileEntity_ForgeHammer_Bronze
         GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[1], null, getAllInputs());

         if ((tRecipe != null) && (canOutput(tRecipe.mOutputs)) && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {

             this.mOutputItems[0] = tRecipe.getOutput(0);

-            if (tRecipe.mEUt <= 16) {

+            //if (tRecipe.mEUt <= 16) {

                 this.mEUt = tRecipe.mEUt;

                 this.mMaxProgresstime = (tRecipe.mDuration * 2);

-            } else {

+            /*} else {

                 this.mEUt = tRecipe.mEUt;

                 this.mMaxProgresstime = (tRecipe.mDuration * 2);

-            }

+            }*/

             return 2;

         }

         return 0;

diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
index 6d2c7d48a8..49345506f2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
@@ -34,13 +34,13 @@ public class GT_MetaTileEntity_ForgeHammer_Steel
         GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[2], null, getAllInputs());

         if ((tRecipe != null) && (canOutput(tRecipe.mOutputs)) && (tRecipe.isRecipeInputEqual(true, null, getAllInputs()))) {

             this.mOutputItems[0] = tRecipe.getOutput(0);

-            if (tRecipe.mEUt <= 16) {

+            //if (tRecipe.mEUt <= 16) {

                 this.mEUt = (tRecipe.mEUt * 3);

                 this.mMaxProgresstime = tRecipe.mDuration;

-            } else {

+            /*} else {

                 this.mEUt = (tRecipe.mEUt * 3);

                 this.mMaxProgresstime = tRecipe.mDuration;

-            }

+            }*/

             return 2;

         }

         return 0;