From f2f2b52d4bccf7ec7fe6a46fd0ef78526fec161b Mon Sep 17 00:00:00 2001 From: Caedis Date: Wed, 27 Dec 2023 03:57:32 -0600 Subject: Add default impl to getToolTypeName and add a null check (#2430) --- src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/items') 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) + ")"; } -- cgit