From 46f9967dbaed9e2a2e518c283fc3edd6c2f479d1 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Tue, 7 May 2019 11:48:57 +0200 Subject: [PATCH] Update text usage for latest Velocity build --- velocity/pom.xml | 2 +- .../src/main/java/us/myles/ViaVersion/VelocityPlugin.java | 8 ++++---- .../velocity/command/VelocityCommandSender.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/velocity/pom.xml b/velocity/pom.xml index a001fcfa9..cade95e88 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -54,7 +54,7 @@ com.velocitypowered velocity-api - 1.0-SNAPSHOT + 1.0.0-SNAPSHOT provided diff --git a/velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java b/velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java index 94b131740..44c7ca459 100644 --- a/velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java +++ b/velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java @@ -11,7 +11,7 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import lombok.Getter; -import net.kyori.text.serializer.ComponentSerializers; +import net.kyori.text.serializer.gson.GsonComponentSerializer; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.chat.ComponentSerializer; import org.slf4j.Logger; @@ -148,7 +148,7 @@ public class VelocityPlugin implements ViaPlatform { @Override public void sendMessage(UUID uuid, String message) { PROXY.getPlayer(uuid).ifPresent(it -> it.sendMessage( - ComponentSerializers.JSON.deserialize( + GsonComponentSerializer.INSTANCE.deserialize( ComponentSerializer.toString(TextComponent.fromLegacyText(message)) // Fixes links ) )); @@ -158,8 +158,8 @@ public class VelocityPlugin implements ViaPlatform { public boolean kickPlayer(UUID uuid, String message) { return PROXY.getPlayer(uuid).map(it -> { it.disconnect( - ComponentSerializers.JSON.deserialize( - ComponentSerializer.toString(TextComponent.fromLegacyText(message)) // ComponentSerializers.LEGACY is deprecated + GsonComponentSerializer.INSTANCE.deserialize( + ComponentSerializer.toString(TextComponent.fromLegacyText(message)) ) ); return true; diff --git a/velocity/src/main/java/us/myles/ViaVersion/velocity/command/VelocityCommandSender.java b/velocity/src/main/java/us/myles/ViaVersion/velocity/command/VelocityCommandSender.java index 1a61f8b5c..0abdf161b 100644 --- a/velocity/src/main/java/us/myles/ViaVersion/velocity/command/VelocityCommandSender.java +++ b/velocity/src/main/java/us/myles/ViaVersion/velocity/command/VelocityCommandSender.java @@ -3,7 +3,7 @@ package us.myles.ViaVersion.velocity.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; import lombok.AllArgsConstructor; -import net.kyori.text.serializer.ComponentSerializers; +import net.kyori.text.serializer.gson.GsonComponentSerializer; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.chat.ComponentSerializer; import us.myles.ViaVersion.api.command.ViaCommandSender; @@ -22,7 +22,7 @@ public class VelocityCommandSender implements ViaCommandSender { @Override public void sendMessage(String msg) { source.sendMessage( - ComponentSerializers.JSON.deserialize( + GsonComponentSerializer.INSTANCE.deserialize( ComponentSerializer.toString(TextComponent.fromLegacyText(msg)) // Fixes links ) );