diff options
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/NoChatReports.java | 1 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java | 27 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index 828e73b..7ea17d2 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -18,6 +18,7 @@ import net.fabricmc.loader.api.FabricLoader; import net.minecraft.DetectedVersion; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.PlayerChatMessage; import net.minecraft.network.protocol.login.ServerboundHelloPacket; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; 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 9ca7bef..2226193 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -3,15 +3,18 @@ package com.aizistral.nochatreports.mixins.server; import com.aizistral.nochatreports.core.NoReportsConfig; import net.minecraft.core.Registry; +import net.minecraft.network.PacketSendListener; import net.minecraft.network.chat.ChatTypeDecoration; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.game.ClientboundPlayerChatHeaderPacket; import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.server.network.ServerPlayerConnection; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -30,10 +33,12 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC * @author Aizistral */ - @Inject(method = "send", at = @At("HEAD"), cancellable = true) + @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, CallbackInfo info) { if (NoReportsConfig.convertToGameMessage()) { - if (packet instanceof ClientboundPlayerChatPacket chat) { + if (packet instanceof ClientboundPlayerChatHeaderPacket) { + info.cancel(); + } else if (packet instanceof ClientboundPlayerChatPacket chat) { packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level.registryAccess()) .get().decorate(chat.message().serverContent()), false); @@ -44,4 +49,22 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC } } + /** + * @reason Ensure conversion works regardless of which send method is used. + * @author Aizistral + */ + + @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketSendListener;)V", + at = @At("HEAD"), cancellable = true) + private void onSend(Packet<?> packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) { + if (NoReportsConfig.convertToGameMessage()) { + if (packet instanceof ClientboundPlayerChatHeaderPacket) { + info.cancel(); + } else if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) { + info.cancel(); + ((ServerGamePacketListenerImpl) (Object) this).send(chat); + } + } + } + } |
