Add default impl to getToolTypeName and add a null check (#2430)

3 files changed, 10 insertions, 8 deletions

diff --git a/src/main/java/gregtech/api/interfaces/IToolStats.java b/src/main/java/gregtech/api/interfaces/IToolStats.java
index ac17e327e3..c92a0ef05c 100644
--- a/src/main/java/gregtech/api/interfaces/IToolStats.java
+++ b/src/main/java/gregtech/api/interfaces/IToolStats.java
@@ -195,7 +195,11 @@ public interface IToolStats {
     float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj, int aX,
         int aY, int aZ);
 
-    String getToolTypeName();
+    default String getToolTypeName() {
+        return null;
+    };
 
-    byte getMaxMode();
+    default byte getMaxMode() {
+        return 1;
+    }
 }
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
index acf62e0661..bff7a36201 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -941,7 +941,10 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
         String result = super.getItemStackDisplayName(aStack);
         IToolStats toolStats = getToolStats(aStack);
         if (toolStats != null) {
-            String key = "gt." + toolStats.getToolTypeName() + ".mode." + getToolMode(aStack);
+            String toolName = toolStats.getToolTypeName();
+            if (toolName == null) return result;
+
+            String key = "gt." + toolName + ".mode." + getToolMode(aStack);
             if (StatCollector.canTranslate(key)) {
                 result += " (" + StatCollector.translateToLocal(key) + ")";
             }
diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java
index 89c0a79ed0..cb637a1bd5 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool.java
@@ -193,9 +193,4 @@ public abstract class GT_Tool implements IToolStats {
     public String getToolTypeName() {
         return "tool";
     }
-
-    @Override
-    public byte getMaxMode() {
-        return 1;
-    }
 }