diff options
| author | Aizistral | 2022-07-22 13:44:25 +0200 |
|---|---|---|
| committer | Aizistral | 2022-07-22 13:44:25 +0200 |
| commit | 4ff632bc7305859075edfc81ef7c8677c3da92b2 (patch) | |
| tree | 5d1ac82291a074366e837ca4e71d0522ecae298f /src | |
| parent | 1c39636dde7b12479e3bb27c6bba2f97845c4517 (diff) | |
Commence work on RC2 port
Diffstat (limited to 'src')
3 files changed, 4 insertions, 4 deletions
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(); diff --git a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java index 96edcc4..e7894d6 100644 --- a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java +++ b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java @@ -65,7 +65,7 @@ public class UnrealPlayer { ServerPlayer player = this.getPlayer(server); ClientboundPlayerChatPacket packet = new ClientboundPlayerChatPacket(new PlayerChatMessage( new SignedMessageHeader(MessageSignature.EMPTY, this.id), MessageSignature.EMPTY, - new SignedMessageBody(new ChatMessageContent(Component.literal(message)), Instant.now(), 0, + new SignedMessageBody(new ChatMessageContent(message, Component.literal(message)), Instant.now(), 0, LastSeenMessages.EMPTY), unsigned != null ? Optional.of(Component.literal(unsigned)) : Optional.empty()), ChatType.bind(ChatType.CHAT, player).toNetwork(server.registryAccess())); |
