From e08c5a4a3b91233938f44a1d45af330ff762abeb Mon Sep 17 00:00:00 2001
From: destro174 <40720638+destro174@users.noreply.github.com>
Date: Sat, 5 Feb 2022 21:16:20 +0100
Subject: [PATCH] Update minimessage to 4.10.0

---
 api/build.gradle.kts                          |  2 +-
 .../java/com/alttd/chat/util/Utility.java     | 26 ++---
 build.gradle.kts                              |  2 +-
 galaxy/build.gradle.kts                       |  1 +
 .../main/java/com/alttd/chat/ChatPlugin.java  |  5 +-
 .../com/alttd/chat/handler/ChatHandler.java   | 64 ++++++-------
 .../alttd/chat/listeners/ChatListener.java    | 38 ++++----
 .../alttd/chat/listeners/PlayerListener.java  |  5 +-
 .../com/alttd/chat/util/GalaxyUtility.java    | 23 +++--
 velocity/build.gradle.kts                     |  2 +-
 .../velocitychat/commands/PartyCommand.java   |  8 +-
 .../commands/partysubcommands/Create.java     | 13 ++-
 .../commands/partysubcommands/Disband.java    | 14 ++-
 .../commands/partysubcommands/Info.java       | 14 ++-
 .../commands/partysubcommands/Invite.java     | 22 ++---
 .../commands/partysubcommands/Join.java       |  5 +-
 .../commands/partysubcommands/Leave.java      | 10 +-
 .../commands/partysubcommands/Name.java       |  9 +-
 .../commands/partysubcommands/Owner.java      | 16 ++--
 .../commands/partysubcommands/Remove.java     | 26 ++---
 .../velocitychat/handlers/ChatHandler.java    | 95 ++++++++-----------
 .../velocitychat/listeners/ChatListener.java  | 19 ++--
 .../listeners/ProxyPlayerListener.java        | 52 +++++-----
 23 files changed, 219 insertions(+), 252 deletions(-)

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 4a0f174..2c41d59 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT")
-    compileOnly("net.kyori:adventure-text-minimessage:4.2.0-SNAPSHOT") // Minimessage
+    compileOnly("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT") // Minimessage
     compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate
     compileOnly("net.luckperms:api:5.3") // Luckperms
 }
diff --git a/api/src/main/java/com/alttd/chat/util/Utility.java b/api/src/main/java/com/alttd/chat/util/Utility.java
index 9e4710f..9d050c0 100755
--- a/api/src/main/java/com/alttd/chat/util/Utility.java
+++ b/api/src/main/java/com/alttd/chat/util/Utility.java
@@ -3,19 +3,15 @@ package com.alttd.chat.util;
 import com.alttd.chat.ChatAPI;
 import com.alttd.chat.config.Config;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.format.Style;
-import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.template.TemplateResolver;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
+import net.kyori.adventure.text.minimessage.placeholder.PlaceholderResolver;
+import net.kyori.adventure.text.minimessage.placeholder.Replacement;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.model.group.Group;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.node.Node;
-import net.md_5.bungee.api.ChatColor;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -245,14 +241,22 @@ public class Utility {
     }
 
     public static Component parseMiniMessage(String message) {
-        return parseMiniMessage(message, null);
+        return getMiniMessage().deserialize(message);
     }
 
-    public static Component parseMiniMessage(String message, List<Template> templates) {
-        if (templates == null) {
+    public static Component parseMiniMessage(String message, Map<String, Replacement<?>> placeholders) {
+        if (placeholders == null) {
             return getMiniMessage().deserialize(message);
         } else {
-            return getMiniMessage().deserialize(message, TemplateResolver.templates(templates));
+            return getMiniMessage().deserialize(message, PlaceholderResolver.map(placeholders));
+        }
+    }
+
+    public static Component parseMiniMessage(String message, Placeholder<?> ... placeholders) {
+        if (placeholders == null) {
+            return getMiniMessage().deserialize(message);
+        } else {
+            return getMiniMessage().deserialize(message, PlaceholderResolver.placeholders(placeholders));
         }
     }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 2c5a683..392305e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
 //    implementation(project(":api"))
     implementation(project(":galaxy"))
     implementation(project(":velocity"))
-//    implementation("net.kyori", "adventure-text-minimessage", "4.2.0-SNAPSHOT") {
+//    implementation("net.kyori", "adventure-text-minimessage", "4.10.0-SNAPSHOT") {
 //        exclude("net.kyori")
 //        exclude("net.kyori.examination")
 //    }
diff --git a/galaxy/build.gradle.kts b/galaxy/build.gradle.kts
index 249b56e..98cbe67 100644
--- a/galaxy/build.gradle.kts
+++ b/galaxy/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 dependencies {
     implementation(project(":api")) // API
     compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") // Galaxy
+    compileOnly("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT") // Minimessage
     compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") // move to proxy
 }
 
diff --git a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
index 7c4aaaf..09f23de 100755
--- a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
+++ b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
@@ -11,8 +11,7 @@ import com.alttd.chat.listeners.PluginMessage;
 import com.alttd.chat.objects.channels.Channel;
 import com.alttd.chat.objects.channels.CustomChannel;
 import com.alttd.chat.util.ALogger;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
+import com.alttd.chat.util.Utility;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.PluginCommand;
@@ -111,7 +110,7 @@ public class ChatPlugin extends JavaPlugin {
         chatAPI.ReloadConfig();
         chatAPI.ReloadChatFilters();
         serverConfig = new ServerConfig(Bukkit.getServerName());
-        Bukkit.broadcast("Reloaded ChatPlugin Config.", "command.chat.reloadchat");
+        Bukkit.broadcast(Utility.parseMiniMessage("Reloaded ChatPlugin Config."), "command.chat.reloadchat");
         ALogger.info("Reloaded ChatPlugin config.");
     }
 }
diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
index 440ab04..81a40a0 100755
--- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
+++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
@@ -12,16 +12,14 @@ import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Replacement;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 public class ChatHandler {
@@ -55,16 +53,16 @@ public class ChatHandler {
 
         updatedMessage = Utility.formatText(updatedMessage);
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("message", updatedMessage),
-                Template.template("sendername", player.getName()),
-                Template.template("receivername", target),
-                Template.template("[i]", itemComponent(player.getInventory().getItemInMainHand()))));
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("message", Replacement.miniMessage(updatedMessage));
+        placeholders.put("sendername", Replacement.miniMessage(player.getName()));
+        placeholders.put("receivername", Replacement.miniMessage(target));
+        placeholders.put("[i]", Replacement.component(itemComponent(player.getInventory().getItemInMainHand())));
 
-        Component component = Utility.parseMiniMessage("<message>", templates);
+        Component component = Utility.parseMiniMessage("<message>", placeholders);
 
         sendPrivateMessage(player, target, "privatemessage", component);
-        Component spymessage = Utility.parseMiniMessage(Config.MESSAGESPY, templates);
+        Component spymessage = Utility.parseMiniMessage(Config.MESSAGESPY, placeholders);
         for(Player pl : Bukkit.getOnlinePlayers()) {
             if(pl.hasPermission(Config.SPYPERMISSION) && ChatUserManager.getChatUser(pl.getUniqueId()).isSpy() && !pl.equals(player) && !pl.getName().equalsIgnoreCase(target)) {
                 pl.sendMessage(spymessage);
@@ -85,7 +83,9 @@ public class ChatHandler {
 
         long timeLeft = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - user.getGcCooldown());
         if(timeLeft <= Config.GCCOOLDOWN && !player.hasPermission("chat.globalchat.cooldownbypass")) { // player is on cooldown and should wait x seconds
-            player.sendMessage(Utility.parseMiniMessage(Config.GCONCOOLDOWN, List.of(Template.template("cooldown", Config.GCCOOLDOWN-timeLeft+""))));
+            Map<String, Replacement<?>> placeholders = new HashMap<>();
+            placeholders.put("cooldown", Replacement.miniMessage(Config.GCCOOLDOWN-timeLeft+""));
+            player.sendMessage(Utility.parseMiniMessage(Config.GCONCOOLDOWN, placeholders));
             return;
         }
 
@@ -109,14 +109,14 @@ public class ChatHandler {
 
         updatedMessage = Utility.formatText(updatedMessage);
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("sender", senderName),
-                Template.template("prefix", prefix),
-                Template.template("message", updatedMessage),
-                Template.template("server", Bukkit.getServerName()),
-                Template.template("[i]", itemComponent(player.getInventory().getItemInMainHand()))));
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("sender", Replacement.component(senderName));
+        placeholders.put("prefix", Replacement.component(prefix));
+        placeholders.put("message", Replacement.miniMessage(updatedMessage));
+        placeholders.put("server", Replacement.miniMessage(Bukkit.getServerName()));
+        placeholders.put("[i]", Replacement.component(itemComponent(player.getInventory().getItemInMainHand())));
 
-        Component component = Utility.parseMiniMessage(Config.GCFORMAT, templates);
+        Component component = Utility.parseMiniMessage(Config.GCFORMAT, placeholders);
         user.setGcCooldown(System.currentTimeMillis());
         sendPluginMessage(player, "globalchat", component);
     }
@@ -146,14 +146,14 @@ public class ChatHandler {
 
         updatedMessage = Utility.formatText(updatedMessage);
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("sender", senderName),
-                Template.template("message", updatedMessage),
-                Template.template("server", Bukkit.getServerName()),
-                Template.template("channel", channel.getChannelName()),
-                Template.template("[i]", itemComponent(player.getInventory().getItemInMainHand()))));
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("sender", Replacement.component(senderName));
+        placeholders.put("message", Replacement.miniMessage(updatedMessage));
+        placeholders.put("server", Replacement.miniMessage(Bukkit.getServerName()));
+        placeholders.put("channel", Replacement.miniMessage(channel.getChannelName()));
+        placeholders.put("[i]", Replacement.component(itemComponent(player.getInventory().getItemInMainHand())));
 
-        Component component = Utility.parseMiniMessage(channel.getFormat(), templates);
+        Component component = Utility.parseMiniMessage(channel.getFormat(), placeholders);
 
         if (channel.isProxy()) {
             sendChatChannelMessage(player, channel.getChannelName(), "chatchannel", component);
@@ -193,12 +193,12 @@ public class ChatHandler {
 //        updatedMessage = Utility.formatText(updatedMessage);
 //
 //        List<Template> templates = new ArrayList<>(List.of(
-//                Template.template("sender", senderName),
-//                Template.template("sendername", senderName),
-//                Template.template("partyname", party.getPartyName()),
-//                Template.template("message", updatedMessage),
-//                Template.template("server", Bukkit.getServerName()),
-//                Template.template("[i]", itemComponent(player.getInventory().getItemInMainHand()))));
+//                Placeholder.miniMessage("sender", senderName),
+//                Placeholder.miniMessage("sendername", senderName),
+//                Placeholder.miniMessage("partyname", party.getPartyName()),
+//                Placeholder.miniMessage("message", updatedMessage),
+//                Placeholder.miniMessage("server", Bukkit.getServerName()),
+//                Placeholder.miniMessage("[i]", itemComponent(player.getInventory().getItemInMainHand()))));
 //
 //        Component component = Utility.parseMiniMessage(Config.PARTY_FORMAT, templates);
 ////        sendPartyMessage(player, party.getPartyId(), component);
diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
index f09ecb6..4d1b578 100755
--- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
+++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
@@ -10,20 +10,18 @@ import com.alttd.chat.util.GalaxyUtility;
 import com.alttd.chat.util.Utility;
 import io.papermc.paper.chat.ChatRenderer;
 import io.papermc.paper.event.player.AsyncChatEvent;
-import litebans.api.Database;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Replacement;
 import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
-import org.bukkit.Bukkit;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ChatListener implements Listener, ChatRenderer {
 
@@ -45,7 +43,7 @@ public class ChatListener implements Listener, ChatRenderer {
                 && ChatUserManager.getChatUser(receiver.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId()));
 
         Component input = event.message();
-        String message = PlainComponentSerializer.plain().serialize(input);
+        String message = PlainTextComponentSerializer.plainText().serialize(input);
 
         message = RegexManager.replaceText(player.getName(), player.getUniqueId(), message); // todo a better way for this
         if(message == null) {
@@ -65,12 +63,11 @@ public class ChatListener implements Listener, ChatRenderer {
 
         message = Utility.formatText(message);
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("message", message),
-                Template.template("[i]", ChatHandler.itemComponent(player.getInventory().getItemInMainHand()))
-        ));
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("message", Replacement.miniMessage(message));
+        placeholders.put("[i]", Replacement.component(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())));
 
-        Component component = Utility.parseMiniMessage("<message>", templates);
+        Component component = Utility.parseMiniMessage("<message>", placeholders);
 
         event.message(component);
         event.renderer(this);
@@ -80,16 +77,15 @@ public class ChatListener implements Listener, ChatRenderer {
     public @NotNull Component render(@NotNull Player player, @NotNull Component sourceDisplayName, @NotNull Component message, @NotNull Audience viewer) {
         ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("sender", user.getDisplayName()),
-                Template.template("sendername", player.getName()),
-                Template.template("prefix", user.getPrefix()),
-                Template.template("prefixall", user.getPrefixAll()),
-                Template.template("staffprefix", user.getStaffPrefix()),
-                Template.template("message", message)
-        ));
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("sender", Replacement.component(user.getDisplayName()));
+        placeholders.put("sendername", Replacement.component(player.name()));
+        placeholders.put("prefix", Replacement.component(user.getPrefix()));
+        placeholders.put("prefixall", Replacement.component(user.getPrefixAll()));
+        placeholders.put("staffprefix", Replacement.component(user.getStaffPrefix()));
+        placeholders.put("message", Replacement.component(message));
 
-        return Utility.parseMiniMessage(Config.CHATFORMAT, templates);
+        return Utility.parseMiniMessage(Config.CHATFORMAT, placeholders);
     }
 
 }
\ No newline at end of file
diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java
index 7bbf150..5f73526 100755
--- a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java
+++ b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java
@@ -8,6 +8,7 @@ import com.alttd.chat.util.GalaxyUtility;
 import com.alttd.chat.util.Utility;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -46,12 +47,12 @@ public class PlayerListener implements Listener {
         for (int i = 0; i < 4; i++) {
             Component component = event.line(i);
             if (component != null) {
-                String message = PlainComponentSerializer.plain().serialize(component);
+                String message = PlainTextComponentSerializer.plainText().serialize(component);
                 Player player = event.getPlayer();
                 message = RegexManager.replaceText(player.getName(), player.getUniqueId(), message, false); // todo a better way for this
 
                 if (message == null) {
-                    GalaxyUtility.sendBlockedNotification("Sign Language" , player, PlainComponentSerializer.plain().serialize(component), "");
+                    GalaxyUtility.sendBlockedNotification("Sign Language" , player, PlainTextComponentSerializer.plainText().serialize(component), "");
                 }
 
                 component = message == null ? Component.empty() : Component.text(message);
diff --git a/galaxy/src/main/java/com/alttd/chat/util/GalaxyUtility.java b/galaxy/src/main/java/com/alttd/chat/util/GalaxyUtility.java
index 9220357..68c6ede 100644
--- a/galaxy/src/main/java/com/alttd/chat/util/GalaxyUtility.java
+++ b/galaxy/src/main/java/com/alttd/chat/util/GalaxyUtility.java
@@ -2,24 +2,23 @@ package com.alttd.chat.util;
 
 import com.alttd.chat.config.Config;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Replacement;
 import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 public class GalaxyUtility {
     public static void sendBlockedNotification(String prefix, Player player, String input, String target) {
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("prefix", prefix),
-                Template.template("displayname", Utility.getDisplayName(player.getUniqueId(), player.getName())),
-                Template.template("target", (target.isEmpty() ? " tried to say: " : " -> " + target + ": ")),
-                Template.template("input", input)
-        ));
-        Component blockedNotification = Utility.parseMiniMessage(Config.NOTIFICATIONFORMAT, templates);
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("prefix", Replacement.miniMessage(prefix));
+        placeholders.put("displayname", Replacement.miniMessage(Utility.getDisplayName(player.getUniqueId(), player.getName())));
+        placeholders.put("target", Replacement.miniMessage((target.isEmpty() ? " tried to say: " : " -> " + target + ": ")));
+        placeholders.put("input", Replacement.miniMessage(input));
+        Component blockedNotification = Utility.parseMiniMessage(Config.NOTIFICATIONFORMAT, placeholders);
 
         Bukkit.getOnlinePlayers().forEach(a ->{
             if (a.hasPermission("chat.alert-blocked")) {
@@ -31,6 +30,6 @@ public class GalaxyUtility {
     }
 
     public static void sendBlockedNotification(String prefix, Player player, Component input, String target) {
-        sendBlockedNotification(prefix, player, PlainComponentSerializer.plain().serialize(input), target);
+        sendBlockedNotification(prefix, player, PlainTextComponentSerializer.plainText().serialize(input), target);
     }
 }
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index af4daa1..d9ff64e 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     annotationProcessor("com.velocitypowered:velocity-api:3.0.0")
     implementation("mysql:mysql-connector-java:8.0.27") // mysql
     implementation("org.spongepowered", "configurate-yaml", "4.1.2")
-    implementation("net.kyori", "adventure-text-minimessage", "4.2.0-SNAPSHOT") {
+    implementation("net.kyori", "adventure-text-minimessage", "4.10.0-SNAPSHOT") {
         exclude("net.kyori")
         exclude("net.kyori.examination")
     }
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/PartyCommand.java b/velocity/src/main/java/com/alttd/velocitychat/commands/PartyCommand.java
index 797c02f..74f6462 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/PartyCommand.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/PartyCommand.java
@@ -8,7 +8,7 @@ import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.command.SimpleCommand;
 import com.velocitypowered.api.proxy.Player;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -112,8 +112,8 @@ public class PartyCommand implements SimpleCommand {
         if (stringBuilder.length() != 0)
             stringBuilder.replace(stringBuilder.length() - 1, stringBuilder.length(), "");
 
-        return Utility.parseMiniMessage(Config.PARTY_HELP_WRAPPER, List.of(
-                Template.template("commands", Utility.parseMiniMessage(stringBuilder.toString()))
-        ));
+        return Utility.parseMiniMessage(Config.PARTY_HELP_WRAPPER,
+                Placeholder.component("commands", Utility.parseMiniMessage(stringBuilder.toString()))
+        );
     }
 }
\ No newline at end of file
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Create.java b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Create.java
index 785b7cc..d133e92 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Create.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Create.java
@@ -9,8 +9,7 @@ import com.alttd.chat.util.Utility;
 import com.alttd.velocitychat.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,9 +37,9 @@ public class Create implements SubCommand {
             return;
         }
         if (PartyManager.getParty(args[1]) != null) {
-            source.sendMessage(Utility.parseMiniMessage(Config.PARTY_EXISTS, List.of(
-                    Template.template("party", args[1])
-            )));
+            source.sendMessage(Utility.parseMiniMessage(Config.PARTY_EXISTS,
+                    Placeholder.miniMessage("party", args[1])
+            ));
             return;
         }
         Party party = Queries.addParty(player.getUniqueId(), args[1], args[2]);
@@ -48,8 +47,8 @@ public class Create implements SubCommand {
         party.addUser(ChatUserManager.getChatUser(player.getUniqueId()), player.getUsername());
         PartyManager.addParty(party);
         source.sendMessage(Utility.parseMiniMessage(Config.CREATED_PARTY,
-                List.of(Template.template("party_name", party.getPartyName()),
-                        Template.template("party_password", party.getPartyPassword()))));
+                Placeholder.miniMessage("party_name", party.getPartyName()),
+                Placeholder.miniMessage("party_password", party.getPartyPassword())));
     }
 
     @Override
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Disband.java b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Disband.java
index 9ebefca..b27239c 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Disband.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Disband.java
@@ -8,7 +8,7 @@ import com.alttd.velocitychat.VelocityChat;
 import com.alttd.velocitychat.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,9 +39,7 @@ public class Disband implements SubCommand {
             return;
         }
         if (args.length == 1) {
-            source.sendMessage(Utility.parseMiniMessage(Config.DISBAND_PARTY_CONFIRM, List.of(
-                    Template.template("party", party.getPartyName())
-            )));
+            source.sendMessage(Utility.parseMiniMessage(Config.DISBAND_PARTY_CONFIRM, Placeholder.miniMessage("party", party.getPartyName())));
             return;
         }
         if (!args[1].equalsIgnoreCase("confirm") || !args[2].equals(party.getPartyName())) {
@@ -49,10 +47,10 @@ public class Disband implements SubCommand {
             return;
         }
         VelocityChat.getPlugin().getChatHandler().sendPartyMessage(party,
-                Utility.parseMiniMessage(Config.DISBANDED_PARTY, List.of(
-                        Template.template("owner", player.getUsername()),
-                        Template.template("party", party.getPartyName())
-                )), null);
+                Utility.parseMiniMessage(Config.DISBANDED_PARTY,
+                        Placeholder.miniMessage("owner", player.getUsername()),
+                        Placeholder.miniMessage("party", party.getPartyName())
+                ), null);
         party.delete();
     }
 
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Info.java b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Info.java
index c61847b..5cd9f7b 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Info.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Info.java
@@ -9,7 +9,7 @@ import com.alttd.velocitychat.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,14 +37,12 @@ public class Info implements SubCommand {
             displayNames.add(partyUser.getDisplayName());
         }
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("party", party.getPartyName()),
-                Template.template("password", party.getPartyPassword()),
-                Template.template("owner", party.getPartyUser(party.getOwnerUuid()).getDisplayName()),
-                Template.template("members", Component.join(Component.text(", "), displayNames))
+        source.sendMessage(Utility.parseMiniMessage(Config.PARTY_INFO,
+                Placeholder.miniMessage("party", party.getPartyName()),
+                Placeholder.miniMessage("password", party.getPartyPassword()),
+                Placeholder.component("owner", party.getPartyUser(party.getOwnerUuid()).getDisplayName()),
+                Placeholder.component("members", Component.join(Component.text(", "), displayNames))
         ));
-
-        source.sendMessage(Utility.parseMiniMessage(Config.PARTY_INFO, templates));
     }
 
     @Override
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Invite.java b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Invite.java
index b0adff0..e007a8e 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Invite.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Invite.java
@@ -8,7 +8,7 @@ import com.alttd.velocitychat.VelocityChat;
 import com.alttd.velocitychat.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,19 +49,19 @@ public class Invite implements SubCommand {
         Player target = optional.get();
 
         if (!target.isActive()) {
-            source.sendMessage(Utility.parseMiniMessage(Config.NOT_ONLINE, List.of(
-                    Template.template("player", target.getUsername())
-            )));
+            source.sendMessage(Utility.parseMiniMessage(Config.NOT_ONLINE,
+                    Placeholder.miniMessage("player", target.getUsername())
+            ));
             return;
         }
 
-        target.sendMessage(Utility.parseMiniMessage(Config.JOIN_PARTY_CLICK_MESSAGE, List.of(
-                Template.template("party", party.getPartyName()),
-                Template.template("party_password", party.getPartyPassword())
-        )));
-        source.sendMessage(Utility.parseMiniMessage(Config.SENT_PARTY_INV, List.of(
-                Template.template("player", target.getUsername())
-        )));
+        target.sendMessage(Utility.parseMiniMessage(Config.JOIN_PARTY_CLICK_MESSAGE,
+                Placeholder.miniMessage("party", party.getPartyName()),
+                Placeholder.miniMessage("party_password", party.getPartyPassword())
+        ));
+        source.sendMessage(Utility.parseMiniMessage(Config.SENT_PARTY_INV,
+                Placeholder.miniMessage("player", target.getUsername())
+        ));
     }
 
     @Override
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Join.java b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Join.java
index 3298c35..4b346ed 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Join.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Join.java
@@ -8,7 +8,7 @@ import com.alttd.chat.util.Utility;
 import com.alttd.velocitychat.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,8 +43,7 @@ public class Join implements SubCommand {
 
 //      party.addUser(ChatUserManager.getChatUser(player.getUniqueId())); //Removed until we can get nicknames to translate to colors correctly
         party.addUser(ChatUserManager.getChatUser(player.getUniqueId()), player.getUsername());
-        source.sendMessage(Utility.parseMiniMessage(Config.JOINED_PARTY, List.of(
-                Template.template("party_name", party.getPartyName()))));
+        source.sendMessage(Utility.parseMiniMessage(Config.JOINED_PARTY, Placeholder.miniMessage("party_name", party.getPartyName())));
     }
 
     @Override
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Leave.java b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Leave.java
index 57126ce..def827b 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Leave.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Leave.java
@@ -9,7 +9,7 @@ import com.alttd.velocitychat.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,10 +44,10 @@ public class Leave implements SubCommand {
                 UUID uuid = party.setNewOwner();
                 source.sendMessage(Utility.parseMiniMessage(Config.NOTIFY_FINDING_NEW_OWNER));
                 VelocityChat.getPlugin().getChatHandler().sendPartyMessage(party,
-                        Utility.parseMiniMessage(Config.OWNER_LEFT_PARTY, List.of(
-                                Template.template("old_owner", player.getUsername()),
-                                Template.template("new_owner", party.getPartyUser(uuid).getPlayerName())
-                        )), null);
+                        Utility.parseMiniMessage(Config.OWNER_LEFT_PARTY,
+                                Placeholder.miniMessage("old_owner", player.getUsername()),
+                                Placeholder.miniMessage("new_owner", party.getPartyUser(uuid).getPlayerName())
+                        ), null);
             } else {
                 party.delete();
             }
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Name.java b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Name.java
index 5d16c88..8261aff 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Name.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Name.java
@@ -8,8 +8,7 @@ import com.alttd.velocitychat.VelocityChat;
 import com.alttd.velocitychat.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
-import net.kyori.adventure.text.minimessage.Template;
-import org.checkerframework.checker.units.qual.A;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,9 +43,9 @@ public class Name implements SubCommand {
             return;
         }
         if (PartyManager.getParty(args[1]) != null) {
-            source.sendMessage(Utility.parseMiniMessage(Config.PARTY_EXISTS, List.of(
-                    Template.template("party", args[1])
-            )));
+            source.sendMessage(Utility.parseMiniMessage(Config.PARTY_EXISTS,
+                    Placeholder.miniMessage("party", args[1])
+            ));
             return;
         }
         party.setPartyName(args[1]);
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Owner.java b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Owner.java
index cb147b6..dfa19ba 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Owner.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Owner.java
@@ -9,7 +9,7 @@ import com.alttd.velocitychat.VelocityChat;
 import com.alttd.velocitychat.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,17 +43,17 @@ public class Owner implements SubCommand {
         }
         PartyUser partyUser = party.getPartyUser(args[1]);
         if (partyUser == null) {
-            source.sendMessage(Utility.parseMiniMessage(Config.NOT_A_PARTY_MEMBER, List.of(
-                    Template.template("player", args[1])
-            )));
+            source.sendMessage(Utility.parseMiniMessage(Config.NOT_A_PARTY_MEMBER,
+                    Placeholder.miniMessage("player", args[1])
+            ));
             return;
         }
         party.setNewOwner(partyUser.getUuid());
         VelocityChat.getPlugin().getChatHandler().sendPartyMessage(party,
-                Utility.parseMiniMessage(Config.NEW_PARTY_OWNER, List.of(
-                        Template.template("old_owner", player.getUsername()),
-                        Template.template("new_owner", partyUser.getPlayerName())
-                )), null);
+                Utility.parseMiniMessage(Config.NEW_PARTY_OWNER,
+                        Placeholder.miniMessage("old_owner", player.getUsername()),
+                        Placeholder.miniMessage("new_owner", partyUser.getPlayerName())
+                ), null);
     }
 
     @Override
diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Remove.java b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Remove.java
index a773c72..7fb9226 100644
--- a/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Remove.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/commands/partysubcommands/Remove.java
@@ -10,7 +10,7 @@ import com.alttd.velocitychat.VelocityChat;
 import com.alttd.velocitychat.commands.SubCommand;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,18 +49,18 @@ public class Remove implements SubCommand {
         if (optionalPlayer.isEmpty()) {
             partyUser = party.getPartyUser(args[1]);
             if (partyUser == null) {
-                source.sendMessage(Utility.parseMiniMessage(Config.NOT_A_PARTY_MEMBER, List.of(
-                        Template.template("player", args[1])
-                )));
+                source.sendMessage(Utility.parseMiniMessage(Config.NOT_A_PARTY_MEMBER,
+                        Placeholder.miniMessage("player", args[1])
+                ));
                 return;
             }
         } else {
             onlinePlayer = optionalPlayer.get();
             partyUser = party.getPartyUser(onlinePlayer.getUniqueId());
             if (partyUser == null) {
-                source.sendMessage(Utility.parseMiniMessage(Config.NOT_A_PARTY_MEMBER, List.of(
-                        Template.template("player", onlinePlayer.getUsername())
-                )));
+                source.sendMessage(Utility.parseMiniMessage(Config.NOT_A_PARTY_MEMBER,
+                        Placeholder.miniMessage("player", onlinePlayer.getUsername())
+                ));
                 return;
             }
         }
@@ -72,14 +72,14 @@ public class Remove implements SubCommand {
         }
 
         if (onlinePlayer != null && onlinePlayer.isActive()) {
-            onlinePlayer.sendMessage(Utility.parseMiniMessage(Config.REMOVED_FROM_PARTY, List.of(
-                    Template.template("party", party.getPartyName())
-            )));
+            onlinePlayer.sendMessage(Utility.parseMiniMessage(Config.REMOVED_FROM_PARTY,
+                    Placeholder.miniMessage("party", party.getPartyName())
+            ));
         }
 
-        source.sendMessage(Utility.parseMiniMessage(Config.REMOVED_USER_FROM_PARTY, List.of(
-                Template.template("player", onlinePlayer == null ? partyUser.getPlayerName() : onlinePlayer.getUsername())
-        )));
+        source.sendMessage(Utility.parseMiniMessage(Config.REMOVED_USER_FROM_PARTY,
+                Placeholder.miniMessage("player", onlinePlayer == null ? partyUser.getPlayerName() : onlinePlayer.getUsername())
+        ));
     }
 
     @Override
diff --git a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
index 490b6be..aede833 100755
--- a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
@@ -17,7 +17,7 @@ import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Replacement;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.jetbrains.annotations.Nullable;
 
@@ -38,19 +38,19 @@ public class ChatHandler {
         Player player2 = optionalPlayer2.get();
         ChatUser targetUser = ChatUserManager.getChatUser(player2.getUniqueId());
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("sender", senderUser.getDisplayName()),
-                Template.template("sendername", player.getUsername()),
-                Template.template("receiver", targetUser.getDisplayName()),
-                Template.template("receivername", player2.getUsername()),
-                Template.template("message", GsonComponentSerializer.gson().deserialize(message)),
-                Template.template("server", player.getCurrentServer().isPresent() ? player.getCurrentServer().get().getServerInfo().getName() : "Altitude")));
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("sender", Replacement.component(senderUser.getDisplayName()));
+        placeholders.put("sendername", Replacement.miniMessage(player.getUsername()));
+        placeholders.put("receiver", Replacement.component(targetUser.getDisplayName()));
+        placeholders.put("receivername", Replacement.miniMessage(player2.getUsername()));
+        placeholders.put("message", Replacement.component(GsonComponentSerializer.gson().deserialize(message)));
+        placeholders.put("server", Replacement.miniMessage(player.getCurrentServer().isPresent() ? player.getCurrentServer().get().getServerInfo().getName() : "Altitude"));
 
         ServerConnection serverConnection;
         if(player.getCurrentServer().isPresent() && player2.getCurrentServer().isPresent()) {
             // redirect to the sender
             serverConnection = player.getCurrentServer().get();
-            Component component = Utility.parseMiniMessage(Config.MESSAGESENDER, templates);
+            Component component = Utility.parseMiniMessage(Config.MESSAGESENDER, placeholders);
             ByteArrayDataOutput buf = ByteStreams.newDataOutput();
             buf.writeUTF("privatemessageout");
             buf.writeUTF(player.getUniqueId().toString());
@@ -61,7 +61,7 @@ public class ChatHandler {
 
             //redirect to the receiver
             serverConnection = player2.getCurrentServer().get();
-            component = Utility.parseMiniMessage(Config.MESSAGERECIEVER, templates);
+            component = Utility.parseMiniMessage(Config.MESSAGERECIEVER, placeholders);
             buf = ByteStreams.newDataOutput();
             buf.writeUTF("privatemessagein");
             buf.writeUTF(player2.getUniqueId().toString());
@@ -71,29 +71,15 @@ public class ChatHandler {
             serverConnection.sendPluginMessage(VelocityChat.getPlugin().getChannelIdentifier(), buf.toByteArray());
         }
 
-//        ChatUser targetUser = ChatUserManager.getChatUser(player2.getUniqueId());
-//
-//        List<Template> templates = new ArrayList<>(List.of(
-//                Template.template("sender", senderUser.getDisplayName()),
-//                Template.template("receiver", targetUser.getDisplayName()),
-//                Template.template("message", message),
-//                Template.template("server", player.getCurrentServer().isPresent() ? player.getCurrentServer().get().getServerInfo().getName() : "Altitude")));
-//
-//        Component senderMessage = Utility.parseMiniMessage(Config.MESSAGESENDER, templates);
-//        Component receiverMessage = Utility.parseMiniMessage(Config.MESSAGERECIEVER, templates);
-//
-//        player.sendMessage(senderMessage);
-//        player2.sendMessage(receiverMessage);
     }
 
     public static void sendBlockedNotification(String prefix, Player player, String input, String target, ServerConnection serverConnection) {
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("prefix", prefix),
-                Template.template("displayname", Utility.getDisplayName(player.getUniqueId(), player.getUsername())),
-                Template.template("target", (target.isEmpty() ? " tried to say: " : " -> " + target + ": ")),
-                Template.template("input", input)
-        ));
-        Component blockedNotification = Utility.parseMiniMessage(Config.NOTIFICATIONFORMAT, templates);
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("prefix", Replacement.miniMessage(prefix));
+        placeholders.put("displayname", Replacement.miniMessage(Utility.getDisplayName(player.getUniqueId(), player.getUsername())));
+        placeholders.put("target", Replacement.miniMessage((target.isEmpty() ? " tried to say: " : " -> " + target + ": ")));
+        placeholders.put("input", Replacement.miniMessage(input));
+        Component blockedNotification = Utility.parseMiniMessage(Config.NOTIFICATIONFORMAT, placeholders);
 
         serverConnection.getServer().getPlayersConnected().forEach(pl ->{
             if (pl.hasPermission("chat.alert-blocked")) {
@@ -143,18 +129,17 @@ public class ChatHandler {
 
         updatedMessage = Utility.formatText(updatedMessage);
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("sender", senderName),
-                Template.template("party", party.getPartyName()),
-                Template.template("message", updatedMessage),
-                Template.template("server", serverConnection.getServer().getServerInfo().getName()),
-                Template.template("[i]", item)
-        ));
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("sender", Replacement.component(senderName));
+        placeholders.put("party", Replacement.miniMessage(party.getPartyName()));
+        placeholders.put("message", Replacement.miniMessage(updatedMessage));
+        placeholders.put("server", Replacement.miniMessage(serverConnection.getServer().getServerInfo().getName()));
+        placeholders.put("[i]", Replacement.component(item));
 
-        Component partyMessage = Utility.parseMiniMessage(Config.PARTY_FORMAT, templates);
+        Component partyMessage = Utility.parseMiniMessage(Config.PARTY_FORMAT, placeholders);
         sendPartyMessage(party, partyMessage, user.getIgnoredBy());
 
-        Component spyMessage = Utility.parseMiniMessage(Config.PARTY_SPY, templates);
+        Component spyMessage = Utility.parseMiniMessage(Config.PARTY_SPY, placeholders);
         for(Player pl : serverConnection.getServer().getPlayersConnected()) {
             if(pl.hasPermission(Config.SPYPERMISSION) && !party.getPartyUsersUuid().contains(pl.getUniqueId())) {
                 pl.sendMessage(spyMessage);
@@ -181,12 +166,12 @@ public class ChatHandler {
             serverName = sender.getCurrentServer().isPresent() ? sender.getCurrentServer().get().getServerInfo().getName() : "Altitude";
         }
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("message", Utility.formatText(message)),
-                Template.template("sender", senderName),
-                Template.template("server", serverName)));
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("message", Replacement.miniMessage(Utility.formatText(message)));
+        placeholders.put("sender", Replacement.component(senderName));
+        placeholders.put("server", Replacement.miniMessage(serverName));
 
-        Component component = Utility.parseMiniMessage(Config.GACFORMAT, templates);
+        Component component = Utility.parseMiniMessage(Config.GACFORMAT, placeholders);
 
         VelocityChat.getPlugin().getProxy().getAllPlayers().stream().filter(target -> target.hasPermission("command.chat.globaladminchat")/*TODO permission*/).forEach(target -> {
             target.sendMessage(component);
@@ -215,10 +200,9 @@ public class ChatHandler {
         ChatUser chatUser = ChatUserManager.getChatUser(targetUUID);
         chatUser.addMail(mail);
         // TODO load from config
-        String finalSenderName = senderName;
-        optionalPlayer.ifPresent(player -> player.sendMessage(Utility.parseMiniMessage(Config.mailReceived, List.of(
-                Template.template("sender", finalSenderName))
-        )));
+        Map<String, Replacement<?>> placeholders = new HashMap<>();
+        placeholders.put("sender", Replacement.miniMessage(senderName));
+        optionalPlayer.ifPresent(player -> player.sendMessage(Utility.parseMiniMessage(Config.mailReceived, placeholders)));
     }
 
     public void readMail(CommandSource commandSource, String targetPlayer) {
@@ -247,14 +231,13 @@ public class ChatHandler {
             }
             ChatUser chatUser = ChatUserManager.getChatUser(mail.getSender());
             Date sentTime = new Date(mail.getSendTime());
-            List<Template> templates = new ArrayList<>(List.of(
-                    Template.template("staffprefix", chatUser.getStaffPrefix()),
-                    Template.template("sender", chatUser.getDisplayName()),
-                    Template.template("message", mail.getMessage()),
-                    Template.template("date", sentTime.toString()),
-                    Template.template("time_ago", String.valueOf(TimeUnit.MILLISECONDS.toDays(new Date().getTime() - sentTime.getTime())))
-            ));
-            Component mailMessage = Utility.parseMiniMessage(Config.mailBody, templates);
+            Map<String, Replacement<?>> placeholders = new HashMap<>();
+            placeholders.put("staffprefix", Replacement.component(chatUser.getStaffPrefix()));
+            placeholders.put("sender", Replacement.component(chatUser.getDisplayName()));
+            placeholders.put("message", Replacement.miniMessage(mail.getMessage()));
+            placeholders.put("date", Replacement.miniMessage(sentTime.toString()));
+            placeholders.put("time_ago", Replacement.miniMessage(String.valueOf(TimeUnit.MILLISECONDS.toDays(new Date().getTime() - sentTime.getTime()))));
+            Component mailMessage = Utility.parseMiniMessage(Config.mailBody, placeholders);
             component = component.append(Component.newline()).append(mailMessage);
         }
         component = component.append(Component.newline()).append(Utility.parseMiniMessage(Config.mailFooter));
diff --git a/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java b/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java
index 10fc9d8..5572e75 100755
--- a/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java
@@ -1,21 +1,18 @@
 package com.alttd.velocitychat.listeners;
 
+import com.alttd.chat.config.Config;
 import com.alttd.chat.util.Utility;
 import com.alttd.velocitychat.VelocityChat;
 import com.alttd.velocitychat.events.GlobalAdminChatEvent;
-import com.alttd.chat.config.Config;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.proxy.Player;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 // TODO code CLEANUP
 public class ChatListener {
 
@@ -36,13 +33,11 @@ public class ChatListener {
             serverName = sender.getCurrentServer().isPresent() ? sender.getCurrentServer().get().getServerInfo().getName() : "Altitude";
         }
 
-        List<Template> templates = new ArrayList<>(List.of(
-                Template.template("sender", senderName),
-                Template.template("message", event.getMessage()),
-                Template.template("server", serverName)
-        ));
-
-        Component message = Utility.parseMiniMessage(Config.GACFORMAT, templates);
+        Component message = Utility.parseMiniMessage(Config.GACFORMAT,
+                Placeholder.miniMessage("sender", senderName),
+                Placeholder.miniMessage("message", event.getMessage()),
+                Placeholder.miniMessage("server", serverName)
+        );
 
         plugin.getProxy().getAllPlayers().stream().filter(target -> target.hasPermission("command.chat.globaladminchat")).forEach(target -> {
             target.sendMessage(message);
diff --git a/velocity/src/main/java/com/alttd/velocitychat/listeners/ProxyPlayerListener.java b/velocity/src/main/java/com/alttd/velocitychat/listeners/ProxyPlayerListener.java
index 23bf6c1..f1af0d1 100755
--- a/velocity/src/main/java/com/alttd/velocitychat/listeners/ProxyPlayerListener.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/listeners/ProxyPlayerListener.java
@@ -18,11 +18,10 @@ import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.event.player.ServerPostConnectEvent;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.placeholder.Placeholder;
+import net.kyori.adventure.text.minimessage.placeholder.Replacement;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 public class ProxyPlayerListener {
 
@@ -36,9 +35,9 @@ public class ProxyPlayerListener {
         if (chatUser == null)
             return;
         VelocityChat.getPlugin().getChatHandler().sendPartyMessage(party,
-                Utility.parseMiniMessage(Config.PARTY_MEMBER_LOGGED_ON, List.of(
-                        Template.template("player", chatUser.getDisplayName())
-                )),
+                Utility.parseMiniMessage(Config.PARTY_MEMBER_LOGGED_ON,
+                        Placeholder.component("player", chatUser.getDisplayName())
+                ),
                 chatUser.getIgnoredPlayers());
         // TODO setup ChatUser on Proxy
         //VelocityChat.getPlugin().getChatHandler().addPlayer(new ChatPlayer(event.getPlayer().getUniqueId()));
@@ -55,9 +54,9 @@ public class ProxyPlayerListener {
         List<Mail> unReadMail = chatUser.getUnReadMail();
         if (unReadMail.isEmpty())
             return;
-        player.sendMessage(Utility.parseMiniMessage(Config.mailUnread, List.of(
-                Template.template("amount", String.valueOf(unReadMail.size()))
-        )));
+        player.sendMessage(Utility.parseMiniMessage(Config.mailUnread,
+                Placeholder.miniMessage("amount", String.valueOf(unReadMail.size()))
+        ));
     }
 
     @Subscribe
@@ -69,9 +68,9 @@ public class ProxyPlayerListener {
         if (chatUser == null)
             return;
         VelocityChat.getPlugin().getChatHandler().sendPartyMessage(party,
-                Utility.parseMiniMessage(Config.PARTY_MEMBER_LOGGED_OFF, List.of(
-                        Template.template("player", chatUser.getDisplayName())
-                )),
+                Utility.parseMiniMessage(Config.PARTY_MEMBER_LOGGED_OFF,
+                        Placeholder.component("player", chatUser.getDisplayName())
+                ),
                 chatUser.getIgnoredPlayers());
         // TODO setup ChatUser on Proxy
         //VelocityChat.getPlugin().getChatHandler().removePlayer(event.getPlayer().getUniqueId());
@@ -86,25 +85,23 @@ public class ProxyPlayerListener {
 
             Player player = event.getPlayer();
 
-            List<Template> templates = new ArrayList<>(List.of(
-                    Template.template("player", player.getUsername()),
-                    Template.template("from_server", previousServer.getServerInfo().getName()),
-                    Template.template("to_server", event.getServer().getServerInfo().getName())));
+            Map<String, Replacement<?>> placeholders = new HashMap<>();
+            placeholders.put("player", Replacement.miniMessage(player.getUsername()));
+            placeholders.put("from_server", Replacement.miniMessage(previousServer.getServerInfo().getName()));
+            placeholders.put("to_server", Replacement.miniMessage(event.getServer().getServerInfo().getName()));
+
             ServerWrapper wrapper = serverHandler.getWrapper(previousServer.getServerInfo().getName());
             if(wrapper != null) {
-                wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), Utility.parseMiniMessage(Config.SERVERSWTICHMESSAGETO, templates));
+                wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), Utility.parseMiniMessage(Config.SERVERSWTICHMESSAGETO, placeholders));
             }
             wrapper = serverHandler.getWrapper(event.getServer().getServerInfo().getName());
             if(wrapper != null) {
-                wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), Utility.parseMiniMessage(Config.SERVERSWTICHMESSAGEFROM, templates));
+                wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), Utility.parseMiniMessage(Config.SERVERSWTICHMESSAGEFROM, placeholders));
             }
         } else {
-            List<Template> templates = new ArrayList<>(List.of(
-                    Template.template("player", event.getPlayer().getUsername())
-            ));
             ServerWrapper wrapper = serverHandler.getWrapper(event.getServer().getServerInfo().getName());
             if(wrapper != null) {
-                wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), Utility.parseMiniMessage(Config.SERVERJOINMESSAGE, templates));
+                wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), Utility.parseMiniMessage(Config.SERVERJOINMESSAGE, Placeholder.miniMessage("player", event.getPlayer().getUsername())));
             }
         }
     }
@@ -115,13 +112,12 @@ public class ProxyPlayerListener {
         if (event.getLoginStatus().equals(DisconnectEvent.LoginStatus.SUCCESSFUL_LOGIN) && event.getPlayer().getCurrentServer().isPresent()) {
             RegisteredServer registeredServer = event.getPlayer().getCurrentServer().get().getServer();
 
-            List<Template> templates = new ArrayList<>(List.of(
-                    Template.template("player", event.getPlayer().getUsername()),
-                    Template.template("from_server", registeredServer.getServerInfo().getName())));
-
             ServerWrapper wrapper = serverHandler.getWrapper(registeredServer.getServerInfo().getName());
             if(wrapper != null) {
-                wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), Utility.parseMiniMessage(Config.SERVERLEAVEMESSAGE, templates));
+                wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), Utility.parseMiniMessage(Config.SERVERLEAVEMESSAGE,
+                        Placeholder.miniMessage("player", event.getPlayer().getUsername()),
+                        Placeholder.miniMessage("from_server", registeredServer.getServerInfo().getName())
+                ));
             }
         }
     }