diff options
Diffstat (limited to 'src/main/java/com/aizistral')
4 files changed, 61 insertions, 6 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/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index bcd1a84..7f1d28d 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -29,6 +29,8 @@ import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.realms.RealmsConnect; +import net.minecraft.realms.RealmsScreen; /** * Client initializer for the mod. Some networking setup here, as well as few screen-related events. diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java new file mode 100644 index 0000000..9d8a3a5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java @@ -0,0 +1,30 @@ +package com.aizistral.nochatreports.mixins.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.mojang.realmsclient.dto.RealmsServer; + +import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraft.realms.RealmsConnect; + +@Mixin(RealmsConnect.class) +public class MixinRealmsConnect { + + /** + * @reason Always treat Realms servers as insecure, there is nothing we can do about them. + * @author Aizistral + */ + + @Inject(method = "connect", at = @At("HEAD")) + private void onConnect(RealmsServer realmsServer, ServerAddress serverAddress, CallbackInfo info) { + ServerSafetyState.setLastConnectedServer(serverAddress); + ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); + ServerSafetyState.setAllowsUnsafeServer(true); + } + +} 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 a29f24b..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,14 +33,15 @@ 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) { - 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.resolveChatType(this.player.level.registryAccess()).get()); - packet = new ClientboundSystemChatPacket(component, false); + 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); + info.cancel(); this.send(packet); @@ -45,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); + } + } + } + } |
