From 8cc92ff83634dffacfe1f25a135bc9ac665ff68b Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sat, 7 Nov 2020 17:41:39 +0000
Subject: Update from text to adventure

---
 spark-fabric/build.gradle                                           | 2 +-
 .../src/main/java/me/lucko/spark/fabric/FabricCommandSender.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'spark-fabric')

diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
index 2ae99f6..513f59e 100644
--- a/spark-fabric/build.gradle
+++ b/spark-fabric/build.gradle
@@ -52,7 +52,7 @@ shadowJar {
 
     relocate 'okio', 'me.lucko.spark.lib.okio'
     relocate 'okhttp3', 'me.lucko.spark.lib.okhttp3'
-    relocate 'net.kyori.text', 'me.lucko.spark.lib.text'
+    relocate 'net.kyori.adventure', 'me.lucko.spark.lib.adventure'
     relocate 'org.tukaani.xz', 'me.lucko.spark.lib.xz'
     relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf'
     relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm'
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java
index dc6be44..c2c5c77 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java
@@ -22,8 +22,8 @@ package me.lucko.spark.fabric;
 
 import me.lucko.spark.common.command.sender.AbstractCommandSender;
 import me.lucko.spark.fabric.plugin.FabricSparkPlugin;
-import net.kyori.text.Component;
-import net.kyori.text.serializer.gson.GsonComponentSerializer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.command.CommandOutput;
 import net.minecraft.server.dedicated.DedicatedServer;
@@ -62,7 +62,7 @@ public class FabricCommandSender extends AbstractCommandSender<CommandOutput> {
 
     @Override
     public void sendMessage(Component message) {
-        Text component = Text.Serializer.fromJson(GsonComponentSerializer.INSTANCE.serialize(message));
+        Text component = Text.Serializer.fromJson(GsonComponentSerializer.gson().serialize(message));
         super.delegate.sendSystemMessage(component, NIL_UUID);
     }
 
-- 
cgit