diff options
| author | Sphyix <masifede2@gmail.com> | 2021-11-21 12:58:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-21 12:58:56 +0100 |
| commit | abeecd2da02c7d38cb1c5b6e2fd5517c6f8a994b (patch) | |
| tree | 64c5960fc9a0e9c7a4bb368adfb6fa6e9b5aa071 /src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java | |
| parent | 01c243ee9f58c3f64fc883f931ad9a81813f894f (diff) | |
| parent | 81f0b4801dfb0bd2d2a863e7a60f27af0daba463 (diff) | |
| download | GT5-Unofficial-abeecd2da02c7d38cb1c5b6e2fd5517c6f8a994b.tar.gz GT5-Unofficial-abeecd2da02c7d38cb1c5b6e2fd5517c6f8a994b.tar.bz2 GT5-Unofficial-abeecd2da02c7d38cb1c5b6e2fd5517c6f8a994b.zip | |
Merge branch 'GTNewHorizons:experimental' into experimental
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 |