diff options
| author | Caedis <Caedis@users.noreply.github.com> | 2023-12-27 03:57:32 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-27 11:57:32 +0200 |
| commit | f2f2b52d4bccf7ec7fe6a46fd0ef78526fec161b (patch) | |
| tree | b8efc9d757fb9670f5e011ffb50bb60ce377c92e /src/main/java/gregtech/api/items | |
| parent | 2ecca7202e74acfbfe8dacf2932c3ed51e7d400c (diff) | |
| download | GT5-Unofficial-f2f2b52d4bccf7ec7fe6a46fd0ef78526fec161b.tar.gz GT5-Unofficial-f2f2b52d4bccf7ec7fe6a46fd0ef78526fec161b.tar.bz2 GT5-Unofficial-f2f2b52d4bccf7ec7fe6a46fd0ef78526fec161b.zip | |
Add default impl to getToolTypeName and add a null check (#2430)
Diffstat (limited to 'src/main/java/gregtech/api/items')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 5 |
1 files changed, 4 insertions, 1 deletions
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) + ")"; } |