feat: display resource name in item

Kai-Z-JP · Apr 5, 2024 · 5192f6b · 5192f6b
1 parent 3618a4e
commit 5192f6b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/main/java/jp/ngt/rtm/item/ItemRail.java b/src/main/java/jp/ngt/rtm/item/ItemRail.java
@@ -91,18 +91,15 @@ public void getSubItems(Item item, CreativeTabs tab, List list) {
     }
 
     @Override
-    public String getItemStackDisplayName(ItemStack itemStack) {
-        String s = super.getItemStackDisplayName(itemStack);
-        RailProperty prop = getProperty(itemStack);
-        if (prop == null) {
-            return s;
-        }
+    protected String getResourceName(ItemStack itemStack) {
+        String modelName = this.getModelName(itemStack);
 
-        String localizedName = "";
-        if (StatCollector.canTranslate(prop.unlocalizedName)) {
-            localizedName = ", " + StatCollector.translateToLocal(prop.unlocalizedName);
+        RailProperty prop = getProperty(itemStack);
+        if (prop == null || !StatCollector.canTranslate(prop.unlocalizedName)) {
+            return modelName;
+        } else {
+            return modelName + ", " + StatCollector.translateToLocal(prop.unlocalizedName);
         }
-        return s + "(" + prop.getModelSet().getConfig().getName() + localizedName + ")";
     }
 
     @Override

diff --git a/src/main/java/jp/ngt/rtm/item/ItemWithModel.java b/src/main/java/jp/ngt/rtm/item/ItemWithModel.java
@@ -202,4 +202,15 @@ public static void copyOffsetToItemStack(TileEntityPlaceable tileEntity, ItemSta
         ItemWithModel.setOffset(itemStack, tileEntity.getOffsetX(), tileEntity.getOffsetY(), tileEntity.getOffsetZ());
         ItemWithModel.setRotation(itemStack, tileEntity.getRotation());
     }
+
+    protected String getResourceName(ItemStack itemStack) {
+        return this.getModelName(itemStack);
+    }
+
+    @Override
+    public String getItemStackDisplayName(ItemStack itemStack) {
+        String itemStackName = super.getItemStackDisplayName(itemStack);
+        String resourceName = this.getResourceName(itemStack);
+        return String.format("%s (%s)", itemStackName, resourceName);
+    }
 }