Fix json serialize bug.

Author: Rollczi

chat-formatter/src/com/eternalcode/formatter/ChatController.java

@@ -11,6 +11,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -72,11 +73,11 @@ void onChat(AsyncPlayerChatEvent event) {
         String withMessage = String.format(withFormat, player.getDisplayName(), "<message>");
         String decolor = Legacy.deColor(withMessage);
 
-        String shadowed = player.hasPermission("eternalmc.chat.color")
-            ? event.getMessage()
-            : Legacy.shadow(event.getMessage());
+        TagResolver.Single shadowed = player.hasPermission("eternalmc.chat.color")
+            ? Placeholder.parsed("message", event.getMessage())
+            : Placeholder.unparsed("message", Legacy.shadow(event.getMessage()));
 
-        Component message = miniMessage.deserialize(decolor, Placeholder.unparsed("message", shadowed));
+        Component message = miniMessage.deserialize(decolor, shadowed);
 
         Set<Player> recipients = event.getRecipients();
 

chat-formatter/src/com/eternalcode/formatter/preparatory/ChatPreparatoryService.java

@@ -17,8 +17,8 @@ public boolean isEmpty() {
         return this.preparations.isEmpty();
     }
 
-    public ChatPrepareResult prepare(Player player, Set<Player> receivers, String json, String message) {
-        ChatPrepareResult result = new ChatPrepareResult(json, receivers, false);
+    public ChatPrepareResult prepare(Player player, Set<Player> receivers, String jsonFormat, String message) {
+        ChatPrepareResult result = new ChatPrepareResult(jsonFormat, receivers, false);
 
         for (ChatPreparatory preparation : preparations) {
             result = preparation.prepare(player, result.getReceivers(), result.getRawMessage(), message, result.isCancelled());

paper-support/src/com/eternalcode/formatter/paper/ChatPaperPreparatory.java

@@ -24,9 +24,9 @@ class ChatPaperPreparatory implements ChatPreparatory {
     }
 
     @Override
-    public ChatPrepareResult prepare(Player player, Set<Player> receivers, String rawJson, String message, boolean canceled) {
-        ChatRenderer renderer = (source, sourceDisplayName, ignoredMessage, viewer) -> GSON.deserialize(rawJson);
-        Component messageComponent = GSON.deserialize(message);
+    public ChatPrepareResult prepare(Player player, Set<Player> receivers, String jsonFormat, String message, boolean canceled) {
+        ChatRenderer renderer = (source, sourceDisplayName, ignoredMessage, viewer) -> GSON.deserialize(jsonFormat);
+        Component messageComponent = Component.text(message);
         HashSet<Audience> audiences = new HashSet<>(receivers);
         AsyncChatEvent event = new AsyncChatEvent(true, player, audiences, renderer, messageComponent, messageComponent);