From 4ff632bc7305859075edfc81ef7c8677c3da92b2 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 22 Jul 2022 13:44:25 +0200 Subject: Commence work on RC2 port --- .../com/aizistral/nochatreports/mixins/client/MixinChatListener.java | 2 +- .../mixins/server/MixinServerGamePacketListenerImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java index 49e1db8..9659f79 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -38,7 +38,7 @@ public class MixinChatListener { // Debug never dies if (NoReportsConfig.isDebugLogEnabled()) { NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}", - Component.Serializer.toStableJson(playerChatMessage.signedContent().plain()), + Component.Serializer.toStableJson(playerChatMessage.signedContent().decorated()), playerChatMessage.signer().profileId(), Base64.getEncoder().encodeToString(playerChatMessage.headerSignature().bytes())); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java index aea5ecc..ecc7906 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -34,9 +34,9 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC private void onSend(Packet packet, CallbackInfo info) { if (NoReportsConfig.convertToGameMessage()) { if (packet instanceof ClientboundPlayerChatPacket chat) { - Component component = chat.message().signedContent().plain(); + Component component = chat.message().signedContent().decorated(); ChatTypeDecoration decoration = this.player.level.registryAccess().registryOrThrow(Registry.CHAT_TYPE_REGISTRY).byId(chat.chatType().chatType()).chat(); - component = decoration.decorate(component, chat.chatType().resolve(this.player.level.registryAccess())); + component = decoration.decorate(component, chat.chatType().resolve(this.player.level.registryAccess()).get()); packet = new ClientboundSystemChatPacket(component, false); info.cancel(); -- cgit v1.2.3