improve localized item name in iteminfo command

Brokkonaut · Mar 27, 2023 · 581df4c · 581df4c
1 parent cfa415c
commit 581df4c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java b/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java
@@ -55,7 +55,7 @@ public static void showItemInfo(CommandSender sender, ItemStack item) {
         String signName = MaterialUtil.getSignName(item);
         TextComponent tc = new TextComponent("  ");
         tc.setColor(net.md_5.bungee.api.ChatColor.DARK_GRAY);
-        BaseComponent tcName = ComponentUtils.getLocalizedItemName(item.getType());
+        BaseComponent tcName = ComponentUtils.getLocalizedItemName(item);
         tcName.setColor(net.md_5.bungee.api.ChatColor.WHITE);
         tc.addExtra(tcName);
         tc.addExtra(" " + signName);

diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionMessageSender.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionMessageSender.java
@@ -90,7 +90,7 @@ private static BaseComponent[] parseItemInformation(ItemStack item) {
         // Joiner joiner = Joiner.on(' ');
 
         message.add(new TextComponent(item.getAmount() + " "));
-        message.add(ComponentUtils.getLocalizedItemName(item.getType()));
+        message.add(ComponentUtils.getLocalizedItemName(item));
 
         return message.toArray(new BaseComponent[message.size()]);
     }

diff --git a/src/main/java/com/Acrobot/ChestShop/Utils/ComponentUtils.java b/src/main/java/com/Acrobot/ChestShop/Utils/ComponentUtils.java
@@ -6,17 +6,34 @@
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.chat.TranslatableComponent;
 import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 
 public class ComponentUtils {
     private ComponentUtils() {
         // prevent instances
     }
 
-    public static BaseComponent getLocalizedItemName(Material m) {
+    public static BaseComponent getLocalizedItemName(ItemStack stack) {
+        if (stack == null) {
+            stack = new ItemStack(Material.AIR);
+        }
         if (Properties.SHOW_TRANSLATED_ITEM_NAMES) {
-            return new TranslatableComponent((m.isBlock() ? "block.minecraft." : "item.minecraft.") + m.getKey().getKey());
+            TranslatableComponent suffix = null;
+            String materialName = stack.getType().name();
+            if (stack.getType() == Material.NETHERITE_UPGRADE_SMITHING_TEMPLATE) {
+                suffix = new TranslatableComponent("upgrade.minecraft.netherite_upgrade");
+            } else if (materialName.endsWith("_SMITHING_TEMPLATE")) {
+                suffix = new TranslatableComponent("trim_pattern.minecraft." + materialName.replace("_ARMOR_TRIM_SMITHING_TEMPLATE", "").toLowerCase());
+            } else if (materialName.startsWith("MUSIC_DISC_")) {
+                suffix = new TranslatableComponent("item.minecraft." + materialName.toLowerCase() + ".desc");
+            }
+            TranslatableComponent main = new TranslatableComponent(stack.getTranslationKey());
+            if (suffix == null) {
+                return main;
+            }
+            return new TextComponent(main, new TextComponent(" "), suffix);
         } else {
-            return new TextComponent(StringUtil.capitalizeFirstLetter(m.name(), '_'));
+            return new TextComponent(StringUtil.capitalizeFirstLetter(stack.getType().name(), '_'));
         }
     }
 }