From bad74589dfe03e600d0f7b6655699a170c9e01f9 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 2 Nov 2022 21:53:11 +0100 Subject: Fix conversion --- .../mixins/server/MixinServerGamePacketListenerImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/aizistral') 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 ec3caa8..395f317 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -11,6 +11,7 @@ import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; import net.minecraft.network.PacketSendListener; +import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; @@ -33,13 +34,15 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true) private void onSend(Packet packet, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent()); + NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + : chat.body().content()); } if (NCRConfig.getCommon().convertToGameMessage()) { if (packet instanceof ClientboundPlayerChatPacket chat) { packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level.registryAccess()) - .get().decorate(chat.unsignedContent()), false); + .get().decorate(chat.unsignedContent() != null ? chat.unsignedContent() + : Component.literal(chat.body().content())), false); info.cancel(); this.send(packet); @@ -56,7 +59,8 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC at = @At("HEAD"), cancellable = true) private void onSend(Packet packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent()); + NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + : chat.body().content()); } if (NCRConfig.getCommon().convertToGameMessage()) { -- cgit v1.2.3