From d1df551f35b98f49dda77c787a9823a82dbcac23 Mon Sep 17 00:00:00 2001
From: Len <40720638+destro174@users.noreply.github.com>
Date: Mon, 3 Oct 2022 10:30:27 +0200
Subject: [PATCH] Update minimessage tags to be lowercase

---
 .../java/com/alttd/chat/config/Config.java     | 10 +++++-----
 .../com/alttd/chat/nicknames/Nicknames.java    |  4 ++--
 .../alttd/chat/nicknames/NicknamesEvents.java  |  2 +-
 .../com/alttd/chat/nicknames/NicknamesGui.java | 18 +++++++++---------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java
index c297c44..af38df0 100755
--- a/api/src/main/java/com/alttd/chat/config/Config.java
+++ b/api/src/main/java/com/alttd/chat/config/Config.java
@@ -492,12 +492,12 @@ public final class Config {
     public static String NICK_PLAYER_NOT_ONLINE = "<red>That player is not online.";
     public static String NICK_BLOCKED_COLOR_CODES = "<yellow>You have blocked color codes in that nickname.";
     public static String NICK_USER_NOT_FOUND = "<red>Failed to set nickname from player, try again from a server this player has been on before.";
-    public static String NICK_ACCEPTED = "<green>You accepted <targetPlayer><green>'s nickname. They are now called <newNick><green>.";
-    public static String NICK_DENIED = "<green>You denied <targetPlayer><green>'s nickname. They are still called <oldNick><green>.";
-    public static String NICK_ALREADY_HANDLED = "<red><targetPlayer><red>'s nickname was already accepted or denied.";
+    public static String NICK_ACCEPTED = "<green>You accepted <targetplayer><green>'s nickname. They are now called <newnick><green>.";
+    public static String NICK_DENIED = "<green>You denied <targetplayer><green>'s nickname. They are still called <oldnick><green>.";
+    public static String NICK_ALREADY_HANDLED = "<red><targetplayer><red>'s nickname was already accepted or denied.";
     public static String NICK_NO_LUCKPERMS = "<red>Due to an issue with LuckPerms /nick try won't work at the moment.";
     public static String NICK_TOO_SOON = "<red>Please wait <time><red> until requesting a new nickname";
-    public static String NICK_REQUEST_PLACED = "<green>Replaced your previous request <oldRequestedNick><green> with <newRequestedNick<green>.";
+    public static String NICK_REQUEST_PLACED = "<green>Replaced your previous request <oldrequestednick><green> with <newrequestednick><green>.";
     public static String NICK_REQUEST_NEW = "<green>New nickname request by <player><green>!";
     public static String NICK_TRYOUT = "<white><prefix><white> <nick><gray>: <white>Hi, this is what my new nickname could look like!";
     public static String NICK_REQUESTED = "<green>Your requested to be nicknamed <nick><green> has been received. Staff will accept or deny this request asap!";
@@ -534,7 +534,7 @@ public final class Config {
         NICK_TAKEN = getString("nicknames.messages.nick-taken", NICK_TAKEN);
         NICK_REQUESTS_ON_LOGIN = getString("nicknames.messages.nick-reauests-on-login", NICK_REQUESTS_ON_LOGIN);
         NICK_WAIT_TIME = getLong("nicknames.wait-time", NICK_WAIT_TIME);
-        NICK_ITEM_LORE = getList("nicknames.item-lore", List.of("&bNew nick: %newNick%", "&bOld nick: %oldNick%", "&bLast changed: %lastChanged%", "&aLeft click to Accept &d| &cRight click to Deny"));
+        NICK_ITEM_LORE = getList("nicknames.item-lore", List.of("<aqua>New nick: <newnick>", "<aqua>Old nick: <oldnick>", "<aqua>Last changed: <lastChanged>", "<green>Left click to Accept <light_purple>| <red>Right click to Deny"));
         NICK_BLOCKED_COLOR_CODESLIST = getList("nicknames.blocked-color-codes", List.of("&k", "&l", "&n", "&m", "&o"));
         NICK_ALLOWED_COLOR_CODESLIST = getList("nicknames.allowed-color-codes", List.of("&0", "&1", "&2", "&3", "&4", "&5", "&6", "&7", "&8", "&9", "&a", "&b", "&c", "&d", "&e", "&f", "&r"));
         NICK_CURRENT = getString("nicknames.messages.nick-current", NICK_CURRENT);
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 9e91517..78a2e86 100644
--- a/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
+++ b/galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
@@ -190,8 +190,8 @@ public class Nicknames implements CommandExecutor, TabCompleter {
             if (timeSinceLastChange > waitTime || player.hasPermission("utility.nick.admin")) {
                 if (nick.hasRequest()) {
                     player.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_REQUEST_PLACED,
-                             Placeholder.unparsed("oldRequestedNick", nick.getNewNick()),
-                             Placeholder.unparsed("newRequestedNick", nickName)));
+                             Placeholder.unparsed("oldrequestednick", nick.getNewNick()),
+                             Placeholder.unparsed("newrequestednick", nickName)));
                 }
                 nick.setNewNick(nickName);
                 nick.setRequestedDate(new Date().getTime());
diff --git a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
index ef3ff36..40a78ed 100644
--- a/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
+++ b/galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
@@ -121,7 +121,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
                         .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND,
                                 "/nick review"))
                         .hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT,
-                                miniMessage.deserialize("<orange>Click this text to review the request!")));
+                                miniMessage.deserialize("<gold>Click this text to review the request!")));
 
                 ChatPlugin.getInstance().getServer().getOnlinePlayers().forEach(p -> {
                     if (p.hasPermission("utility.nick.review")) {
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 afc1542..d7090d9 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.unparsed("newnick", nick.getNewNick()),
+                Placeholder.unparsed("oldnick", 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);
@@ -174,7 +174,7 @@ public class NicknamesGui implements Listener {
 
                     if (nick == null || !nick.hasRequest()) {
                         p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_ALREADY_HANDLED,
-                                Placeholder.component("targetPlayer", clickedItem.getItemMeta().displayName())));
+                                Placeholder.component("targetplayer", clickedItem.getItemMeta().displayName())));
                         return;
                     }
 
@@ -193,9 +193,9 @@ public class NicknamesGui implements Listener {
                             }.runTask(ChatPlugin.getInstance());
 
                             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("targetplayer", clickedItem.getItemMeta().displayName()),
+                                    Placeholder.unparsed("newnick", nick.getNewNick()),
+                                    Placeholder.unparsed("oldnick", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick())));
 
                             if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
                                 Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getNewNick());
@@ -240,9 +240,9 @@ public class NicknamesGui implements Listener {
                             }.runTask(ChatPlugin.getInstance());
 
                             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.unparsed("targetplayer", owningPlayer.getName()),
+                                    Placeholder.unparsed("newnick", nick.getNewNick()),
+                                    Placeholder.unparsed("oldnick", nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick())));
 
                             if (Nicknames.getInstance().NickCache.containsKey(uniqueId)
                                     && Nicknames.getInstance().NickCache.get(uniqueId).getCurrentNick() != null) {