From 653557bc6509045f075a3a03bbd846ff990a7ab4 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Sat, 7 Jan 2023 18:25:31 -0300 Subject: [PATCH] wip. auto-crafting still broken --- .../integration/modules/gregtech/ToolClass.java | 11 ++++++++--- src/main/java/appeng/util/Platform.java | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/appeng/integration/modules/gregtech/ToolClass.java b/src/main/java/appeng/integration/modules/gregtech/ToolClass.java index 5be582e29..22f370ab4 100644 --- a/src/main/java/appeng/integration/modules/gregtech/ToolClass.java +++ b/src/main/java/appeng/integration/modules/gregtech/ToolClass.java @@ -9,10 +9,14 @@ import java.lang.reflect.Method; public class ToolClass { private static Class GTToolClass; + private static Method getMaxItemDamage = null; + private static Method getItemDamage = null; static { try { GTToolClass = Class.forName("gregtech.api.items.IToolItem", false, Launch.classLoader); + getItemDamage = ReflectionHelper.findMethod(GTToolClass, "getItemDamage", null, ItemStack.class); + getMaxItemDamage = ReflectionHelper.findMethod(GTToolClass, "getMaxItemDamage", null, ItemStack.class); } catch (ClassNotFoundException ignored) { try { GTToolClass = Class.forName("gregtech.api.items.toolitem.IGTTool", false, Launch.classLoader); @@ -23,10 +27,11 @@ public class ToolClass { } private static final Enum GTToolInterface = getGTToolInterface(); - private static final Method getMaxItemDamage = ReflectionHelper.findMethod(GTToolClass, "getMaxItemDamage", null, ItemStack.class); - private static final Method getItemDamage = ReflectionHelper.findMethod(GTToolClass, "getItemDamage", null, ItemStack.class); public static Class getGTToolClass() { + if (GTToolClass == null) { + System.out.printf("TToolClass == null"); + } return GTToolClass; } @@ -58,7 +63,7 @@ public class ToolClass { throw new RuntimeException(e); } } else { - return itemStack.getMaxDamage(); + return itemStack.getItemDamage(); } } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index a12085b73..f81f132b0 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -1416,7 +1416,7 @@ public class Platform { //consider methods below moving to a compability class public static boolean isGTDamageableItem(Item item) { - return ((GTLoaded) && item.getClass().isInstance(ToolClass.getGTToolClass())); + return ((GTLoaded) && ToolClass.getGTToolClass().isAssignableFrom(item.getClass())); } public static MetaTileEntity getMetaTileEntity(IBlockAccess world, BlockPos pos) {