From eefbbab7ee303ffb39a839ab946771fac641462b Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Mon, 9 Jun 2025 18:39:11 +0200
Subject: [PATCH] remove legacy chars before minimessage deserialization

---
 .../volmit/iris/util/decree/DecreeSystem.java |  5 +++--
 .../java/com/volmit/iris/util/format/C.java   | 22 +++++++++++++++++++
 .../volmit/iris/util/plugin/VolmitSender.java | 10 ++++-----
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java b/core/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java
index e76f62965..d22a8b822 100644
--- a/core/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java
+++ b/core/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java
@@ -160,7 +160,8 @@ public interface DecreeSystem extends CommandExecutor, TabCompleter {
         }
 
         J.aBukkit(() -> {
-            if (!call(new VolmitSender(sender), args)) {
+            var volmit = new VolmitSender(sender);
+            if (!call(volmit, args)) {
 
                 if (IrisSettings.get().getGeneral().isCommandSounds()) {
                     if (sender instanceof Player) {
@@ -169,7 +170,7 @@ public interface DecreeSystem extends CommandExecutor, TabCompleter {
                     }
                 }
 
-                sender.sendMessage(C.RED + "Unknown Iris Command");
+                volmit.sendMessage(C.RED + "Unknown Iris Command");
             } else {
                 if (IrisSettings.get().getGeneral().isCommandSounds()) {
                     if (sender instanceof Player) {
diff --git a/core/src/main/java/com/volmit/iris/util/format/C.java b/core/src/main/java/com/volmit/iris/util/format/C.java
index de1893c8f..85deb3cac 100644
--- a/core/src/main/java/com/volmit/iris/util/format/C.java
+++ b/core/src/main/java/com/volmit/iris/util/format/C.java
@@ -376,6 +376,28 @@ public enum C {
         return "#" + Integer.toHexString(spin(color.awtColor(), h, s, b).getRGB()).substring(2);
     }
 
+    public static String mini(String s) {
+        String msg = compress(s);
+        StringBuilder b = new StringBuilder();
+        boolean c = false;
+
+        for (char i : msg.toCharArray()) {
+            if (!c) {
+                if (i == C.COLOR_CHAR) {
+                    c = true;
+                    continue;
+                }
+                b.append(i);
+            } else {
+                c = false;
+                C o = C.getByChar(i);
+                b.append(o.token);
+            }
+        }
+
+        return b.toString();
+    }
+
     public static String aura(String s, int hrad, int srad, int vrad) {
         return aura(s, hrad, srad, vrad, 0.3D);
     }
diff --git a/core/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/core/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
index 217b44054..dccb95ce7 100644
--- a/core/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
+++ b/core/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
@@ -264,7 +264,7 @@ public class VolmitSender implements CommandSender {
     private Component createNoPrefixComponent(String message) {
         if (!IrisSettings.get().getGeneral().canUseCustomColors(this)) {
             String t = C.translateAlternateColorCodes('&', MiniMessage.miniMessage().stripTags(message));
-            return MiniMessage.miniMessage().deserialize(t);
+            return MiniMessage.miniMessage().deserialize(C.mini(t));
         }
 
         String t = C.translateAlternateColorCodes('&', message);
@@ -273,13 +273,13 @@ public class VolmitSender implements CommandSender {
     }
 
     private Component createNoPrefixComponentNoProcessing(String message) {
-        return MiniMessage.builder().postProcessor(c -> c).build().deserialize(message);
+        return MiniMessage.builder().postProcessor(c -> c).build().deserialize(C.mini(message));
     }
 
     private Component createComponent(String message) {
         if (!IrisSettings.get().getGeneral().canUseCustomColors(this)) {
             String t = C.translateAlternateColorCodes('&', MiniMessage.miniMessage().stripTags(getTag() + message));
-            return MiniMessage.miniMessage().deserialize(t);
+            return MiniMessage.miniMessage().deserialize(C.mini(t));
         }
 
         String t = C.translateAlternateColorCodes('&', getTag() + message);
@@ -290,11 +290,11 @@ public class VolmitSender implements CommandSender {
     private Component createComponentRaw(String message) {
         if (!IrisSettings.get().getGeneral().canUseCustomColors(this)) {
             String t = C.translateAlternateColorCodes('&', MiniMessage.miniMessage().stripTags(getTag() + message));
-            return MiniMessage.miniMessage().deserialize(t);
+            return MiniMessage.miniMessage().deserialize(C.mini(t));
         }
 
         String t = C.translateAlternateColorCodes('&', getTag() + message);
-        return MiniMessage.miniMessage().deserialize(t);
+        return MiniMessage.miniMessage().deserialize(C.mini(t));
     }
 
     public <T> void showWaiting(String passive, CompletableFuture<T> f) {