diff options
4 files changed, 57 insertions, 8 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java index 2144c1a..71ca2f6 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java @@ -12,6 +12,7 @@ import com.aizistral.nochatreports.encryption.Encryptor; import com.aizistral.nochatreports.gui.UnsafeServerScreen; import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraft.network.chat.Component; import net.minecraft.util.StringUtil; public class NCRConfigEncryption extends JSONConfig { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java index 9b4b06b..67ce83e 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java @@ -1,5 +1,7 @@ package com.aizistral.nochatreports.mixins.client; +import javax.annotation.Nullable; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyArg; @@ -82,22 +84,57 @@ public class MixinChatComponent { for (Object arg : translatable.args) { if (arg instanceof MutableComponent mutable && mutable.getContents() instanceof LiteralContents literal) { - try { - String decrypted = encryption.decrypt(literal.text()); - if (decrypted.startsWith("#%")) { - mutable.contents = new LiteralContents(decrypted.substring(2, decrypted.length())); - this.lastMessageEncrypted = true; - } - } catch (Exception ex) { - continue; + String decrypted = this.tryDecrypt(literal.text(), encryption); + if (decrypted != null) { + mutable.contents = new LiteralContents(decrypted); + this.lastMessageEncrypted = true; } } } + } else { + this.lastMessageEncrypted = this.tryDecrypt(copy, encryption); } return copy; } + private boolean tryDecrypt(Component component, Encryptor<?> encryptor) { + boolean decryptedSiblings = false; + for (Component sibling : component.getSiblings()) { + if (this.tryDecrypt(sibling, encryptor)) { + decryptedSiblings = true; + } + } + + if (component.getContents() instanceof LiteralContents literal) { + String decrypted = this.tryDecrypt(literal.text(), encryptor); + + if (decrypted != null) { + ((MutableComponent)component).contents = new LiteralContents(decrypted); + return true; + } + } + + return decryptedSiblings; + } + + @Nullable + private String tryDecrypt(String message, Encryptor<?> encryptor) { + try { + String[] splat = message.contains(" ") ? message.split(" ") : new String[] { message }; + String decryptable = splat[splat.length-1]; + + String decrypted = encryptor.decrypt(decryptable); + + if (decrypted.startsWith("#%")) + return message.substring(0, message.length() - decryptable.length()) + decrypted.substring(2, decrypted.length()); + else + return null; + } catch (Exception ex) { + return null; + } + } + private Component recreate(Component component) { return Component.Serializer.fromJson(Component.Serializer.toStableJson(component)); } diff --git a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java index af85897..33fc158 100644 --- a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java +++ b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java @@ -8,6 +8,7 @@ import com.mojang.authlib.minecraft.BanDetails; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import net.minecraft.network.chat.Component; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerGamePacketListenerImpl; @@ -21,6 +22,9 @@ public final class NoChatReportsDebug implements ModInitializer { server.execute(() -> { UnrealPlayer player = new UnrealPlayer(UUID.fromString("069a79f4-44e9-4726-a5be-fca90e38aaf5"), "Notch"); player.join(server, handler); + Component component = Component.Serializer.fromJson("{\"extra\":[{\"text\":\"<\"},{\"color\":\"red\",\"text\":\"Karen\"},{\"text\":\"> Hey! G/AFdTa5SR37oes6mBNagdo=\"}],\"text\":\"\"}"); + player.sendSystem(server, handler, component); + //player.sendMessage(server, handler, "This message is so real and legit", null); //UnrealPlayer.DEFAULT.join(server, handler); diff --git a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java index 8f9cf4e..3b000d9 100644 --- a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java +++ b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java @@ -19,6 +19,7 @@ import net.minecraft.network.chat.SignedMessageBody; import net.minecraft.network.chat.SignedMessageHeader; import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket; +import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket.Action; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -60,6 +61,12 @@ public class UnrealPlayer { return new ServerPlayer(server, server.overworld(), new GameProfile(this.id, this.name), null); } + public void sendSystem(MinecraftServer server, ServerGamePacketListenerImpl connection, Component message) { + ServerPlayer player = this.getPlayer(server); + ClientboundSystemChatPacket packet = new ClientboundSystemChatPacket(message, false); + connection.send(packet); + } + public void sendMessage(MinecraftServer server, ServerGamePacketListenerImpl connection, String message, @Nullable String unsigned) { ServerPlayer player = this.getPlayer(server); ClientboundPlayerChatPacket packet = new ClientboundPlayerChatPacket(new PlayerChatMessage( |
