diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-09-21 17:56:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-21 17:56:14 +0200 |
| commit | e1f94bee22ea862e7c4f24821986e9e1f342cc9f (patch) | |
| tree | 9247c913e22670e801b1b923b35149b09d863f00 /src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java | |
| parent | d0a9f79708361beb426f8cdd67d396e0c2fc415b (diff) | |
| parent | bf4510ad135645fe42a100a646e1828f06727c07 (diff) | |
| download | GT5-Unofficial-e1f94bee22ea862e7c4f24821986e9e1f342cc9f.tar.gz GT5-Unofficial-e1f94bee22ea862e7c4f24821986e9e1f342cc9f.tar.bz2 GT5-Unofficial-e1f94bee22ea862e7c4f24821986e9e1f342cc9f.zip | |
Merge pull request #660 from Minepolz320/experimental
Gregtech tools Fix
Diffstat (limited to 'src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java')
| -rw-r--r-- | src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java index f76170963a..3a37e4d3e3 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java @@ -4,6 +4,7 @@ import gregtech.GT_Mod; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_ToolHarvestHelper; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -60,8 +61,14 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV { @Override public boolean isMinableBlock(Block aBlock, byte aMetaData) { - String tTool = aBlock.getHarvestTool(aMetaData); - return aBlock.getHarvestLevel(aMetaData) != -1 && (tTool == null || tTool.isEmpty() || (tTool.equals("pickaxe"))) || (aBlock.getMaterial() == Material.rock) || (aBlock.getMaterial() == Material.glass) || (aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce); + return GT_ToolHarvestHelper.isAppropriateTool(aBlock , aMetaData ,"pickaxe")// + || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock,// + Material.rock,// + Material.glass,// + Material.ice,// + Material.packedIce// + ); + } @Override |