Bugfixes 5

19 files changed, 41 insertions, 42 deletions

diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index d45825155f..79061be22e 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -894,7 +894,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
         if ((aEvent.entityPlayer == null) || (aEvent.entityPlayer.worldObj == null) || (aEvent.action == null) || (aEvent.world.provider == null)) {
             return;
         }
-        if ((!aEvent.entityPlayer.worldObj.isRemote) && (aEvent.action != null) && (aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR)
+        if ((!aEvent.entityPlayer.worldObj.isRemote) && (aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR)
                 && (GT_Log.pal != null)) {
             this.mBufferedPlayerActivity.add(getDataAndTime() + ";" + aEvent.action.name() + ";" + aEvent.entityPlayer.getDisplayName() + ";DIM:"
                     + aEvent.world.provider.dimensionId + ";" + aEvent.x + ";" + aEvent.y + ";" + aEvent.z + ";|;" + aEvent.x / 10 + ";" + aEvent.y / 10 + ";"
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 e03cabe783..35ac55e1b7 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -38,7 +38,7 @@ public class GT_Item_Machines
                 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) {

+                //if (temp != null) {

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

                     temp.xCoord = 0;

                     temp.yCoord = 0;

@@ -67,7 +67,7 @@ public class GT_Item_Machines
                             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) {

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
index 489381873e..0168228bc5 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
@@ -24,7 +24,7 @@ public class GT_Cover_Conveyor
         }

         TileEntity tTileEntity = aTileEntity.getTileEntityAtSide(aSide);

         //aTileEntity.decreaseStoredEnergyUnits(1L, true);

-        if (((aCoverVariable % 2 != 1) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= 128L)) {

+        if (((aCoverVariable % 2 == 0) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= 128L)) {

             if (aTileEntity.isUniversalEnergyStored(256L)) {

                 aTileEntity.decreaseStoredEnergyUnits(4 * GT_Utility.moveOneItemStack(aCoverVariable % 2 == 0 ? aTileEntity : tTileEntity, aCoverVariable % 2 != 0 ? aTileEntity : tTileEntity, aCoverVariable % 2 != 0 ? GT_Utility.getOppositeSide(aSide) : aSide, aCoverVariable % 2 == 0 ? GT_Utility.getOppositeSide(aSide) : aSide, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1), true);

             }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
index 570d73e601..2bae554b76 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
@@ -35,7 +35,7 @@ public class GT_Cover_Pump
                         tLiquid = tLiquid.copy();

                         tLiquid.amount = tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid, false);

                         if (tLiquid.amount > 0) {

-                            if (((aCoverVariable % 2 != 1) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= Math.min(1, tLiquid.amount / 10))) {

+                            if (((aCoverVariable % 2 == 0) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= Math.min(1, tLiquid.amount / 10))) {

                                 if (aTileEntity.isUniversalEnergyStored(Math.min(1, tLiquid.amount / 10))) {

                                     aTileEntity.decreaseStoredEnergyUnits(Math.min(1, tLiquid.amount / 10), true);

                                     tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tTank1.drain(ForgeDirection.getOrientation(aSide), tLiquid.amount, true), true);

@@ -51,7 +51,7 @@ public class GT_Cover_Pump
                         tLiquid = tLiquid.copy();

                         tLiquid.amount = tTank1.fill(ForgeDirection.getOrientation(aSide), tLiquid, false);

                         if (tLiquid.amount > 0) {

-                            if (((aCoverVariable % 2 != 1) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= Math.min(1, tLiquid.amount / 10))) {

+                            if (((aCoverVariable % 2 == 0) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= Math.min(1, tLiquid.amount / 10))) {

                                 if (aTileEntity.isUniversalEnergyStored(Math.min(1, tLiquid.amount / 10))) {

                                     aTileEntity.decreaseStoredEnergyUnits(Math.min(1, tLiquid.amount / 10), true);

                                     tTank1.fill(ForgeDirection.getOrientation(aSide), tTank2.drain(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid.amount, true), true);

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 6d5b1721d8..a39b7f35d2 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
@@ -34,9 +34,9 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi
                     fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255);
                 }
             }
-            if (this.mContainer != null) {
+            //if (this.mContainer != null) {
                 fontRendererObj.drawString(GT_Utility.formatNumbers(this.mContainer.mEnergy) + " EU", 50, 155, 0x00ff0000);
-            }
+            //}
         }
     }
 
diff --git a/src/main/java/gregtech/common/render/GT_CapeRenderer.java b/src/main/java/gregtech/common/render/GT_CapeRenderer.java
index 26ffc282ca..cf72032c53 100644
--- a/src/main/java/gregtech/common/render/GT_CapeRenderer.java
+++ b/src/main/java/gregtech/common/render/GT_CapeRenderer.java
@@ -58,17 +58,17 @@ public class GT_CapeRenderer
                 bindTexture(tResource);

                 GL11.glPushMatrix();

                 GL11.glTranslatef(glf0, glf0, 0.125F);

-                double var1f = (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks);

-                double d0 = aPlayer.field_71091_bM + var1f;

-                double d1 = aPlayer.field_71096_bN + var1f;

-                double d2 = aPlayer.field_71097_bO + var1f;

-                float f6 = aPlayer.prevRenderYawOffset + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks;

+                float var1f = (float) (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks);

+                float d0 = (float) aPlayer.field_71091_bM + var1f;

+                float d1 = (float) aPlayer.field_71096_bN + var1f;

+                float d2 = (float) aPlayer.field_71097_bO + var1f;

+                float f6 = (float) (aPlayer.prevRenderYawOffset + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks);

                 float var2f = f6 * 3.141593F / 180.0F;

-                double d3 = MathHelper.sin(var2f);

-                double d4 = -MathHelper.cos(var2f);

-                float f7 = (float) d1 * 10.0F;

-                float f8 = (float) (d0 * d3 + d2 * d4) * 100.0F;

-                float f9 = (float) (d0 * d4 - d2 * d3) * 100.0F;

+                float d3 = MathHelper.sin(var2f);

+                float d4 = -MathHelper.cos(var2f);

+                float f7 = /*(float) */d1 * 10.0F;

+                float f8 = /*(float) */(d0 * d3 + d2 * d4) * 100.0F;

+                float f9 = /*(float) */(d0 * d4 - d2 * d3) * 100.0F;

                 if (f7 < -6.0F) {

                     f7 = -6.0F;

                 }

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;

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
index f74aeca505..ee409418fb 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
@@ -80,7 +80,7 @@ public class GT_Tool_Axe
 

     public boolean isMinableBlock(Block aBlock, byte aMetaData) {

         String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);

+        return (/*(tTool != null) && */(tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);

     }

 

     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
index 7cefcdfd8d..d60fec6ec6 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
@@ -60,7 +60,7 @@ public class GT_Tool_BranchCutter
 

     public boolean isMinableBlock(Block aBlock, byte aMetaData) {

         String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves);

+        return (/*(tTool != null) && */(tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves);

     }

 

     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_File.java b/src/main/java/gregtech/common/tools/GT_Tool_File.java
index 5bb07c0614..61b84fd4f9 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_File.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_File.java
@@ -75,7 +75,7 @@ public class GT_Tool_File
 

     public boolean isMinableBlock(Block aBlock, byte aMetaData) {

         String tTool = aBlock.getHarvestTool(aMetaData);

-        return (tTool != null) && (tTool.equals("file"));

+        return /*(tTool != null) && */(tTool.equals("file"));

     }

 

     public ItemStack getBrokenItem(ItemStack aStack) {

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
index a7666d34c8..9a33882140 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
@@ -31,7 +31,7 @@ public class GT_Tool_Plow
 

     public boolean isMinableBlock(Block aBlock, byte aMetaData) {

         String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("plow"))) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.craftedSnow);

+        return (/*(tTool != null) && */(tTool.equals("plow"))) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.craftedSnow);

     }

 

     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
index ba615a39a1..1e63187163 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
@@ -43,7 +43,7 @@ public class GT_Tool_Plunger
 

     public boolean isMinableBlock(Block aBlock, byte aMetaData) {

         String tTool = aBlock.getHarvestTool(aMetaData);

-        return (tTool != null) && (tTool.equals("plunger"));

+        return /*(tTool != null) && */(tTool.equals("plunger"));

     }

 

     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
index 55fb257c66..b06ebd933f 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
@@ -31,7 +31,7 @@ public class GT_Tool_Sense
 

     public boolean isMinableBlock(Block aBlock, byte aMetaData) {

         String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && ((tTool.equals("sense")) || (tTool.equals("scythe")))) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.leaves);

+        return (/*(tTool != null) && */((tTool.equals("sense")) || (tTool.equals("scythe")))) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.leaves);

     }

 

     public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
index 0b77a45ecd..15b7f020dc 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
@@ -84,7 +84,7 @@ public class GT_Tool_SoftHammer
 
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
         String tTool = aBlock.getHarvestTool(aMetaData);
-        return (tTool != null) && (tTool.equals("softhammer"));
+        return /*(tTool != null) && */(tTool.equals("softhammer"));
     }
 
     public ItemStack getBrokenItem(ItemStack aStack) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java b/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java
index 03fd6a97a1..af9e5c62e1 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java
@@ -79,7 +79,7 @@ public class GT_Tool_UniversalSpade
 

     public boolean isMinableBlock(Block aBlock, byte aMetaData) {

         String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && ((tTool.equals("shovel")) || (tTool.equals("axe")) || (tTool.equals("saw")) || (tTool.equals("sword")) || (tTool.equals("crowbar")))) || (aBlock.getMaterial() == Material.sand) || (aBlock.getMaterial() == Material.grass) || (aBlock.getMaterial() == Material.ground) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.clay) || (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.wood) || (aBlock.getMaterial() == Material.cactus) || (aBlock.getMaterial() == Material.circuits) || (aBlock.getMaterial() == Material.gourd) || (aBlock.getMaterial() == Material.web) || (aBlock.getMaterial() == Material.cloth) || (aBlock.getMaterial() == Material.carpet) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.cake) || (aBlock.getMaterial() == Material.tnt) || (aBlock.getMaterial() == Material.sponge);

+        return (/*(tTool != null) && */((tTool.equals("shovel")) || (tTool.equals("axe")) || (tTool.equals("saw")) || (tTool.equals("sword")) || (tTool.equals("crowbar")))) || (aBlock.getMaterial() == Material.sand) || (aBlock.getMaterial() == Material.grass) || (aBlock.getMaterial() == Material.ground) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.clay) || (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.wood) || (aBlock.getMaterial() == Material.cactus) || (aBlock.getMaterial() == Material.circuits) || (aBlock.getMaterial() == Material.gourd) || (aBlock.getMaterial() == Material.web) || (aBlock.getMaterial() == Material.cloth) || (aBlock.getMaterial() == Material.carpet) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.cake) || (aBlock.getMaterial() == Material.tnt) || (aBlock.getMaterial() == Material.sponge);

     }

 

     public ItemStack getBrokenItem(ItemStack aStack) {