From 3be53703bede5a81973dab89bb00d30beee9b162 Mon Sep 17 00:00:00 2001
From: Len <40720638+destro174@users.noreply.github.com>
Date: Thu, 25 Aug 2022 17:45:11 +0200
Subject: [PATCH] Small tweaks

---
 .../playershops/gui/ShopManagementGui.java    |  3 +-
 .../alttd/playershops/shop/PlayerShop.java    |  2 +-
 .../com/alttd/playershops/utils/ShopUtil.java | 29 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/alttd/playershops/gui/ShopManagementGui.java b/src/main/java/com/alttd/playershops/gui/ShopManagementGui.java
index dadfc36..c793129 100644
--- a/src/main/java/com/alttd/playershops/gui/ShopManagementGui.java
+++ b/src/main/java/com/alttd/playershops/gui/ShopManagementGui.java
@@ -4,6 +4,7 @@ import com.alttd.playershops.PlayerShops;
 import com.alttd.playershops.conversation.ConversationManager;
 import com.alttd.playershops.conversation.ConversationType;
 import com.alttd.playershops.shop.PlayerShop;
+import com.alttd.playershops.utils.ShopUtil;
 import com.alttd.playershops.utils.Util;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
@@ -35,7 +36,7 @@ public class ShopManagementGui extends AbstractGui {
         ItemMeta meta = shopIcon.getItemMeta();
         List<Component> lore = new ArrayList<>();
         lore.add(Util.parseMiniMessage("Balance: " + shop.getBalance(), null));
-        lore.add(Util.parseMiniMessage("item: " + shop.getItemStack(), null));
+        lore.add(Util.parseMiniMessage("item: " + ShopUtil.itemNameComponent(shop.getItemStack()), null));
         lore.add(Util.parseMiniMessage("amount: " + shop.getAmount(), null));
         lore.add(Util.parseMiniMessage("Type: " + shop.getType(), null));
         lore.add(Util.parseMiniMessage("Price: " + shop.getPrice(), null));
diff --git a/src/main/java/com/alttd/playershops/shop/PlayerShop.java b/src/main/java/com/alttd/playershops/shop/PlayerShop.java
index b18f0a5..ed2e30d 100644
--- a/src/main/java/com/alttd/playershops/shop/PlayerShop.java
+++ b/src/main/java/com/alttd/playershops/shop/PlayerShop.java
@@ -155,7 +155,7 @@ public class PlayerShop {
                         Placeholder.unparsed("ownername", getOwnerName()),
                         Placeholder.unparsed("price", String.valueOf(getPrice())),
                         Placeholder.unparsed("amount", String.valueOf(getAmount())),
-                        Placeholder.unparsed("item", ShopUtil.getItemName(getItemStack()))
+                        Placeholder.component("itemname", ShopUtil.itemNameComponent(getItemStack()))
                 );
                 for (int i = 0; i < 4; i++) {
                     signBlock.line(i, miniMessage.deserialize(signLines.get(i), tagResolver));
diff --git a/src/main/java/com/alttd/playershops/utils/ShopUtil.java b/src/main/java/com/alttd/playershops/utils/ShopUtil.java
index ac6af14..6a57a92 100644
--- a/src/main/java/com/alttd/playershops/utils/ShopUtil.java
+++ b/src/main/java/com/alttd/playershops/utils/ShopUtil.java
@@ -1,10 +1,11 @@
 package com.alttd.playershops.utils;
 
 import com.alttd.playershops.shop.PlayerShop;
-import com.destroystokyo.paper.profile.PlayerProfile;
-import org.bukkit.*;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
@@ -155,20 +156,18 @@ public class ShopUtil {
         return false;
     }
 
-    public static String getItemName(ItemStack item) {
-        if (item == null || !item.getType().equals(Material.AIR))
-            return "Nothing";
-
-        String NAME = "{item}";
+    public static Component itemNameComponent(ItemStack item) {
+        Component component = Component.empty();
+        if(item == null || item.getType().equals(Material.AIR))
+            return Component.text("Nothing");
         boolean dname = item.hasItemMeta() && item.getItemMeta().hasDisplayName();
-        String replacer = ChatColor.translateAlternateColorCodes('&',NAME+"&r");
-        if (dname) {
-            String trp = item.getItemMeta().getDisplayName();
-            replacer = replacer.replace(NAME, trp);
+        if(dname) {
+            component = component.append(item.getItemMeta().displayName());
         } else {
-            replacer = replacer.replace(NAME, materialToName(item.getType()));
+            component = component.append(Component.text(materialToName(item.getType()), NamedTextColor.WHITE));
         }
-        return replacer;
+
+        return component;
     }
 
     private static String materialToName(Material m) {