Merge pull request #1 from GlodBlock/fix-crack-recipe-check

Fix crack recipe check

1 files changed, 30 insertions, 8 deletions

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 5bee44aa03..204ec4c104 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
@@ -3,6 +3,7 @@ package gregtech.common.tools;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.GT_ToolHarvestHelper;
 import gregtech.common.items.behaviors.Behaviour_SoftHammer;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
@@ -12,97 +13,118 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
-public class GT_Tool_SoftHammer
-        extends GT_Tool {
+public class GT_Tool_SoftHammer extends GT_Tool {
+    @Override
     public int getToolDamagePerBlockBreak() {
         return 50;
     }
 
+    @Override
     public int getToolDamagePerDropConversion() {
         return 100;
     }
 
+    @Override
     public int getToolDamagePerContainerCraft() {
         return 800;
     }
 
+    @Override
     public int getToolDamagePerEntityAttack() {
         return 200;
     }
 
+    @Override
     public int getBaseQuality() {
         return 0;
     }
 
+    @Override
     public float getBaseDamage() {
         return 3.0F;
     }
 
+    @Override
     public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {
         return aOriginalHurtResistance * 2;
     }
 
+    @Override
     public float getSpeedMultiplier() {
         return 0.1F;
     }
 
+    @Override
     public float getMaxDurabilityMultiplier() {
         return 8.0F;
     }
 
+    @Override
     public String getCraftingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
+        return (String) GregTech_API.sSoundList.get(101);
     }
 
+    @Override
     public String getEntityHitSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
+        return (String) GregTech_API.sSoundList.get(101);
     }
 
+    @Override
     public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
+        return (String) GregTech_API.sSoundList.get(0);
     }
 
+    @Override
     public String getMiningSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));
+        return (String) GregTech_API.sSoundList.get(101);
     }
 
+    @Override
     public boolean canBlock() {
         return true;
     }
 
+    @Override
     public boolean isCrowbar() {
         return false;
     }
 
+    @Override
     public boolean isMiningTool() {
         return false;
     }
 
+    @Override
     public boolean isWeapon() {
         return true;
     }
 
+    @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        String tTool = aBlock.getHarvestTool(aMetaData);
-        return aBlock.getHarvestLevel(aMetaData) != -1 &&  (tTool == null || tTool.isEmpty() || tTool.equals("softhammer"));
+        return GT_ToolHarvestHelper.isAppropriateTool(aBlock , aMetaData ,"softhammer");
     }
 
+    @Override
     public ItemStack getBrokenItem(ItemStack aStack) {
         return null;
     }
 
+    @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadMallet.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.handleMallet.mTextureIndex];
     }
 
+    @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
     }
 
+    @Override
     public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
         aItem.addItemBehavior(aID, new Behaviour_SoftHammer(100));
     }
 
+    @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
         return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was hammered to death by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
     }