diff options
| author | Sphyix <masifede2@gmail.com> | 2021-11-21 12:59:39 +0100 |
|---|---|---|
| committer | Sphyix <masifede2@gmail.com> | 2021-11-21 12:59:39 +0100 |
| commit | 2901426a3fbaee614e245bc3d7f68dce9b1fd4a6 (patch) | |
| tree | 5b7717983e0f53f94c1c67cb6d2186f452bb7e69 /src/main/java/gregtech/common/tools/GT_Tool_Axe.java | |
| parent | 8b9f24202072698748cad0b5f6d0b6c9f9ce2a42 (diff) | |
| parent | abeecd2da02c7d38cb1c5b6e2fd5517c6f8a994b (diff) | |
| download | GT5-Unofficial-2901426a3fbaee614e245bc3d7f68dce9b1fd4a6.tar.gz GT5-Unofficial-2901426a3fbaee614e245bc3d7f68dce9b1fd4a6.tar.bz2 GT5-Unofficial-2901426a3fbaee614e245bc3d7f68dce9b1fd4a6.zip | |
Merge branch 'experimental' of https://github.com/Sphyix/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/common/tools/GT_Tool_Axe.java')
| -rw-r--r-- | src/main/java/gregtech/common/tools/GT_Tool_Axe.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 edbdb3b61b..15240341c5 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java @@ -4,6 +4,7 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.util.GT_ToolHarvestHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -95,8 +96,8 @@ public class GT_Tool_Axe extends GT_Tool { @Override public boolean isMinableBlock(Block aBlock, byte aMetaData) { - String tTool = aBlock.getHarvestTool(aMetaData); - return aBlock.getHarvestLevel(aMetaData) != -1 && (tTool == null || tTool.isEmpty() || (tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood); + return GT_ToolHarvestHelper.isAppropriateTool(aBlock,aMetaData ,"axe") + || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock ,Material.wood); } @Override |