Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2025-01-23 21:31:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix legacy text

Browse Source
This commit is contained in:
creeper123123321 2020-07-01 17:44:27 -03:00
parent c83411f7be
commit 4bf7c9c303
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/github/creeper123123321/viafabric/platform/VRPlatform.java
View File

@ -56,9 +56,10 @@ import us.myles.ViaVersion.api.platform.TaskId;
import us.myles.ViaVersion.api.platform.ViaConnectionManager; import us.myles.ViaVersion.api.platform.ViaConnectionManager;
import us.myles.ViaVersion.api.platform.ViaPlatform; import us.myles.ViaVersion.api.platform.ViaPlatform;
import us.myles.ViaVersion.dump.PluginInfo; import us.myles.ViaVersion.dump.PluginInfo;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter;
import us.myles.ViaVersion.sponge.VersionInfo; import us.myles.ViaVersion.sponge.VersionInfo;
import us.myles.ViaVersion.util.GsonUtil; import us.myles.ViaVersion.util.GsonUtil;
import us.myles.viaversion.libs.bungeecordchat.api.chat.TextComponent;
import us.myles.viaversion.libs.bungeecordchat.chat.ComponentSerializer;
import us.myles.viaversion.libs.gson.JsonObject; import us.myles.viaversion.libs.gson.JsonObject;
import java.io.File; import java.io.File;
@ -230,7 +231,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
runServerSync(() -> { runServerSync(() -> {
ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid); ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
if (player == null) return; if (player == null) return;
player.sendChatMessage(Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(s)), MessageType.SYSTEM); player.sendChatMessage(Text.Serializer.fromJson(legacyToJson(s)), MessageType.SYSTEM);
}); });
} }
@ -240,7 +241,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
if (handler != null) { if (handler != null) {
try { try {
handler.onChatMessage(new ChatMessageS2CPacket( handler.onChatMessage(new ChatMessageS2CPacket(
Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(s)) Text.Serializer.fromJson(legacyToJson(s))
)); ));
} catch (OffThreadException ignored) { } catch (OffThreadException ignored) {
} }
@ -263,7 +264,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
if (handler != null) { if (handler != null) {
try { try {
handler.onDisconnect(new DisconnectS2CPacket( handler.onDisconnect(new DisconnectS2CPacket(
Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(msg)) Text.Serializer.fromJson(legacyToJson(msg))
)); ));
} catch (OffThreadException ignored) { } catch (OffThreadException ignored) {
} }
@ -278,7 +279,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
Supplier<Boolean> kickTask = () -> { Supplier<Boolean> kickTask = () -> {
ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid); ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
if (player == null) return false; if (player == null) return false;
player.networkHandler.disconnect(Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(s))); player.networkHandler.disconnect(Text.Serializer.fromJson(legacyToJson(s)));
return true; return true;
}; };
if (server.isOnThread()) { if (server.isOnThread()) {
@ -349,4 +350,8 @@ public class VRPlatform implements ViaPlatform<UUID> {
public ViaConnectionManager getConnectionManager() { public ViaConnectionManager getConnectionManager() {
return connectionManager; return connectionManager;
} }
private String legacyToJson(String legacy) {
return ComponentSerializer.toString(TextComponent.fromLegacyText(legacy));
}
} }