From 78668b68e3020e06e2ff8dfcc1955987c4087288 Mon Sep 17 00:00:00 2001 From: ghostflyby Date: Sat, 13 Jan 2024 03:12:01 +0800 Subject: GT wrench capabilities for AE2 blocks and others (#2395) * GT wrench capabilities for ae blocks * Fix grid array out of bounds * Fix shift right ae block disappear for an instant --- .../java/gregtech/api/util/GT_ToolHarvestHelper.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/util') diff --git a/src/main/java/gregtech/api/util/GT_ToolHarvestHelper.java b/src/main/java/gregtech/api/util/GT_ToolHarvestHelper.java index 7416289c79..4263b77be6 100644 --- a/src/main/java/gregtech/api/util/GT_ToolHarvestHelper.java +++ b/src/main/java/gregtech/api/util/GT_ToolHarvestHelper.java @@ -3,6 +3,13 @@ package gregtech.api.util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import ic2.core.block.BlockMultiID; +import ic2.core.block.BlockScaffold; +import ic2.core.block.machine.BlockMiningPipe; +import ic2.core.block.machine.BlockMiningTip; +import ic2.core.block.wiring.BlockCable; +import ic2.core.crop.BlockCrop; + public class GT_ToolHarvestHelper { public static boolean isAppropriateTool(Block aBlock, byte aMetaData, String... tTools) { @@ -43,7 +50,14 @@ public class GT_ToolHarvestHelper { } public static boolean isStringEmpty(String s) { - return s == null || s.length() == 0; + return s == null || s.isEmpty(); + } + + public static boolean isIC2Wrenchable(Block block) { + return (block instanceof BlockMultiID && !(block instanceof BlockCable) && !(block instanceof BlockCrop)) + || block instanceof BlockScaffold + || block instanceof BlockMiningPipe + || block instanceof BlockMiningTip; } public static boolean hasNull(Object... obj) { -- cgit