Merge remote-tracking branch 'origin/stats' into dev

GTNewHorizons · Jul 30, 2024 · b4a9d83 · b4a9d83
2 parents aaf8d39 + addddec
commit b4a9d83
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/fml/MixinGameRegistry.java b/src/main/java/com/mitchej123/hodgepodge/mixins/early/fml/MixinGameRegistry.java
@@ -13,6 +13,7 @@
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
+import com.mitchej123.hodgepodge.Common;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 
@@ -58,9 +59,20 @@ public class MixinGameRegistry {
 
     @Unique
     private static StatCrafting hodgepodge$createAndRegisterStat(String key, Item item) {
+        String unlocalizedName;
+        try {
+            unlocalizedName = item.getUnlocalizedName();
+        } catch (Exception e) {
+            String registryName = item.delegate.name();
+            unlocalizedName = "item." + registryName + ".name";
+            Common.log.warn(
+                    "An Exception occured while invoking Item.getUnlocalizedName() after registering the item {} ({})! Using fallback unlocalized name.",
+                    registryName,
+                    item.getClass().getName());
+        }
         StatCrafting stat = new StatCrafting(
-                key + '.' + item.delegate.name(),
-                new ChatComponentTranslation(key, new ChatComponentTranslation(item.getUnlocalizedName())),
+                key + ".autogen." + item.delegate.name(),
+                new ChatComponentTranslation(key, new ChatComponentTranslation(unlocalizedName)),
                 item);
         stat.registerStat();
         return stat;