From d879d57baf6fb4ee3eeea0efdca0aeaa574d1ad0 Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Wed, 1 Jul 2020 18:00:45 -0300
Subject: [PATCH] fix legacy text in NMSCommandSender

---
 .../viafabric/commands/NMSCommandSender.java          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/creeper123123321/viafabric/commands/NMSCommandSender.java b/src/main/java/com/github/creeper123123321/viafabric/commands/NMSCommandSender.java
index 231636e..d6992c2 100644
--- a/src/main/java/com/github/creeper123123321/viafabric/commands/NMSCommandSender.java
+++ b/src/main/java/com/github/creeper123123321/viafabric/commands/NMSCommandSender.java
@@ -31,7 +31,8 @@ import net.minecraft.server.command.CommandSource;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
 import us.myles.ViaVersion.api.command.ViaCommandSender;
-import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter;
+import us.myles.viaversion.libs.bungeecordchat.api.chat.TextComponent;
+import us.myles.viaversion.libs.bungeecordchat.chat.ComponentSerializer;
 
 import java.util.UUID;
 
@@ -51,12 +52,16 @@ public class NMSCommandSender implements ViaCommandSender {
     @Override
     public void sendMessage(String s) {
         if (source instanceof ServerCommandSource) {
-            ((ServerCommandSource) source).sendFeedback(Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(s)), false);
+            ((ServerCommandSource) source).sendFeedback(Text.Serializer.fromJson(legacyToJson(s)), false);
         } else if (source instanceof CottonClientCommandSource) {
-            ((CottonClientCommandSource) source).sendFeedback(Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(s)), false);
+            ((CottonClientCommandSource) source).sendFeedback(Text.Serializer.fromJson(legacyToJson(s)), false);
         }
     }
 
+    private String legacyToJson(String legacy) {
+        return ComponentSerializer.toString(TextComponent.fromLegacyText(legacy));
+    }
+
     @Override
     public UUID getUUID() {
         if (source instanceof ServerCommandSource) {