aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
diff options
context:
space:
mode:
authorSphyix <masifede2@gmail.com>2021-11-21 12:58:56 +0100
committerGitHub <noreply@github.com>2021-11-21 12:58:56 +0100
commitabeecd2da02c7d38cb1c5b6e2fd5517c6f8a994b (patch)
tree64c5960fc9a0e9c7a4bb368adfb6fa6e9b5aa071 /src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
parent01c243ee9f58c3f64fc883f931ad9a81813f894f (diff)
parent81f0b4801dfb0bd2d2a863e7a60f27af0daba463 (diff)
downloadGT5-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_BranchCutter.java')
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java5
1 files changed, 3 insertions, 2 deletions
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 1ba110252a..a123ff1ff6 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
@@ -4,6 +4,7 @@ import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.items.GT_MetaGenerated_Tool;
import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_ToolHarvestHelper;
import gregtech.api.util.GT_Utility;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -64,8 +65,8 @@ public class GT_Tool_BranchCutter 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("grafter"))) || (aBlock.getMaterial() == Material.leaves);
+ return GT_ToolHarvestHelper.isAppropriateTool(aBlock , aMetaData ,"grafter")
+ || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock ,Material.leaves);
}
@Override