From 0c1b82c9d81f86baff499c8e0d7028898daaf196 Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Mon, 4 May 2020 21:40:39 +0100
Subject: [PATCH] Fix /iteminfo coloring

---
 src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java    | 4 ++--
 .../java/com/Acrobot/ChestShop/Configuration/Messages.java    | 2 +-
 .../com/Acrobot/ChestShop/Listeners/ItemInfoListener.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java b/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java
index 641a778..8505cea 100644
--- a/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java
+++ b/src/main/java/com/Acrobot/ChestShop/Commands/ItemInfo.java
@@ -44,7 +44,7 @@ public class ItemInfo implements CommandExecutor {
             return false;
         }
 
-        sender.sendMessage(iteminfo);
+        sender.sendMessage(replace(iteminfo));
         try {
             sender.sendMessage(replace(iteminfo_fullname, "item", MaterialUtil.getName(item)));
         } catch (IllegalArgumentException e) {
@@ -54,7 +54,7 @@ public class ItemInfo implements CommandExecutor {
         }
 
         try {
-            sender.sendMessage(Messages.replace(iteminfo_shopname, "item", MaterialUtil.getSignName(item)));
+            sender.sendMessage(replace(iteminfo_shopname, "item", MaterialUtil.getSignName(item)));
         } catch (IllegalArgumentException e) {
             sender.sendMessage(ChatColor.RED + "Error while generating shop sign name. Please contact an admin or take a look at the console/log!");
             ChestShop.getPlugin().getLogger().log(Level.SEVERE, "Error while generating shop sign item name", e);
diff --git a/src/main/java/com/Acrobot/ChestShop/Configuration/Messages.java b/src/main/java/com/Acrobot/ChestShop/Configuration/Messages.java
index 1cc3345..5ab892c 100644
--- a/src/main/java/com/Acrobot/ChestShop/Configuration/Messages.java
+++ b/src/main/java/com/Acrobot/ChestShop/Configuration/Messages.java
@@ -104,6 +104,6 @@ public class Messages {
         for (int i = 0; i + 1 < replacements.length; i+=2) {
             message = message.replace("%" + replacements[i], replacements[i+1]);
         }
-        return message;
+        return Configuration.getColoured(message);
     }
 }
diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/ItemInfoListener.java b/src/main/java/com/Acrobot/ChestShop/Listeners/ItemInfoListener.java
index e98df9f..7ba0f03 100644
--- a/src/main/java/com/Acrobot/ChestShop/Listeners/ItemInfoListener.java
+++ b/src/main/java/com/Acrobot/ChestShop/Listeners/ItemInfoListener.java
@@ -121,7 +121,7 @@ public class ItemInfoListener implements Listener {
     public static void addLoreInfo(ItemInfoEvent event) {
         ItemMeta meta = event.getItem().getItemMeta();
         if (meta.hasLore()) {
-            event.getSender().sendMessage(Messages.replace(iteminfo_lore, "lore", String.join("\n", meta.getLore())));
+            event.getSender().sendMessage(replace(iteminfo_lore, "lore", String.join("\n", meta.getLore())));
         }
     }
 }