From 7de83f536b67ea5d7757ac60723612cf388a6e5a Mon Sep 17 00:00:00 2001
From: Len <40720638+destro174@users.noreply.github.com>
Date: Mon, 3 Oct 2022 17:42:28 +0200
Subject: [PATCH] Show correct nickname in previews

---
 .../java/com/alttd/chat/nicknames/Nicknames.java     |  6 +++---
 .../java/com/alttd/chat/nicknames/NicknamesGui.java  | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java b/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
index 73d9337..99f779a 100644
--- a/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
+++ b/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
@@ -191,8 +191,8 @@ public class Nicknames implements CommandExecutor, TabCompleter {
             if (timeSinceLastChange > waitTime || player.hasPermission("utility.nick.admin")) {
                 if (nick.hasRequest()) {
                     player.sendMessage(Utility.parseMiniMessage(Config.NICK_REQUEST_PLACED,
-                             Placeholder.unparsed("oldrequestednick", nick.getNewNick()),
-                             Placeholder.unparsed("newrequestednick", nickName)));
+                             Placeholder.component("oldrequestednick", Utility.applyColor(nick.getNewNick())),
+                             Placeholder.component("newrequestednick", Utility.applyColor(nickName))));
                 }
                 nick.setNewNick(nickName);
                 nick.setRequestedDate(new Date().getTime());
@@ -207,7 +207,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
         Queries.newNicknameRequest(uniqueId, nickName);
         bungeeMessageRequest(player);
         player.sendMessage(Utility.parseMiniMessage(Config.NICK_REQUESTED,
-                Placeholder.unparsed("nick", nickName)));
+                Placeholder.component("nick", Utility.applyColor(nickName))));
     }
 
     private void bungeeMessageRequest(Player player) {
diff --git a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
index ec24b40..bd191ee 100644
--- a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
+++ b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
@@ -98,8 +98,8 @@ public class NicknamesGui implements Listener {
             meta.displayName(miniMessage.deserialize(offlinePlayer.getName()));
 
         TagResolver resolver = TagResolver.resolver(
-                Placeholder.unparsed("newnick", nick.getNewNick()),
-                Placeholder.unparsed("oldnick", nick.getCurrentNick() == null ? "None" : nick.getCurrentNick()),
+                Placeholder.component("newnick", Utility.applyColor(nick.getNewNick())),
+                Placeholder.component("oldnick", Utility.applyColor(nick.getCurrentNick() == null ? "None" : nick.getCurrentNick())),
                 Placeholder.unparsed("lastchanged", nick.getLastChangedDate() == 0 ? "Not Applicable" : nick.getLastChangedDateFormatted()));
         meta.lore(lore.stream().map(a -> miniMessage.deserialize(a, resolver)).collect(Collectors.toList()));
         playerHead.setItemMeta(meta);
@@ -194,8 +194,8 @@ public class NicknamesGui implements Listener {
 
                             p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_ACCEPTED,
                                     Placeholder.component("targetplayer", clickedItem.getItemMeta().displayName()),
-                                    Placeholder.unparsed("newnick", nick.getNewNick()),
-                                    Placeholder.unparsed("oldnick", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick())));
+                                    Placeholder.component("newnick", Utility.applyColor(nick.getNewNick())),
+                                    Placeholder.component("oldnick", Utility.applyColor(nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick()))));
 
                             if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
                                 Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getNewNick());
@@ -241,8 +241,8 @@ public class NicknamesGui implements Listener {
 
                             p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_DENIED,
                                     Placeholder.unparsed("targetplayer", owningPlayer.getName()),
-                                    Placeholder.unparsed("newnick", nick.getNewNick()),
-                                    Placeholder.unparsed("oldnick", nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick())));
+                                    Placeholder.component("newnick", Utility.applyColor(nick.getNewNick())),
+                                    Placeholder.component("oldnick", Utility.applyColor(nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick()))));
 
                             if (Nicknames.getInstance().NickCache.containsKey(uniqueId)
                                     && Nicknames.getInstance().NickCache.get(uniqueId).getCurrentNick() != null) {