diff options
Diffstat (limited to 'src/main/java')
9 files changed, 348 insertions, 4 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index bc43f21..55a31f5 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -19,6 +19,7 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; import net.fabricmc.fabric.api.networking.v1.PacketSender; +import net.minecraft.client.GuiMessageTag; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ConnectScreen; import net.minecraft.client.gui.screens.DisconnectedScreen; diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java index 371a16c..8c014f6 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java @@ -1,14 +1,19 @@ package com.aizistral.nochatreports.config; +import java.security.InvalidKeyException; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.encryption.AESChatEncryption; +import com.aizistral.nochatreports.encryption.ChatEncryption; import com.aizistral.nochatreports.gui.UnsafeServerScreen; import com.aizistral.nochatreports.mixins.client.MixinChatListener; import com.aizistral.nochatreports.mixins.client.MixinToastComponent; import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraft.util.StringUtil; public final class NCRConfigClient extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Client.json"; @@ -17,7 +22,8 @@ public final class NCRConfigClient extends JSONConfig { hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, whitelistAllServers = false, verifiedIconEnabled = true, showNCRButton = true, - enableMod = true; + enableMod = true, enableChatEncryption = false; + protected String chatEncryptionKey = "", chatEncryptionAlgorithm = "AES+Base64"; protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0; protected NCRConfigClient() { @@ -33,6 +39,10 @@ public final class NCRConfigClient extends JSONConfig { this.enableMod = !this.enableMod; } + public void toggleEncryption() { + this.enableChatEncryption = !this.enableChatEncryption; + } + /** * @return True if client with No Chat Reports installed should demand that mod is present on * every server that it tries to join. In that case client will not be able to join servers that @@ -195,4 +205,43 @@ public final class NCRConfigClient extends JSONConfig { return this.enableMod; } + /** + * @return Whether or not chat encryption is enabled. + */ + + public boolean enableChatEncryption() { + return this.enableChatEncryption; + } + + /** + * @return Current chat encryption algorithm. + */ + + public String chatEncryptionAlgorithm() { + return this.chatEncryptionAlgorithm; + } + + /** + * @return Base64-encoded AES encryption key (hopefully). + */ + + public String chatEncryptionKey() { + return this.chatEncryptionKey; + } + + /** + * @return Chat encryption, if such is enabled and user specified valid key in config. + */ + + public Optional<ChatEncryption> chatEncryption() { + if (!this.enableChatEncryption() || StringUtil.isNullOrEmpty(this.chatEncryptionKey)) + return Optional.empty(); + + try { + return Optional.of(new AESChatEncryption(this.chatEncryptionKey)); + } catch (InvalidKeyException ex) { + return Optional.empty(); + } + } + } diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESChatEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESChatEncryption.java new file mode 100644 index 0000000..fd3b7e5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESChatEncryption.java @@ -0,0 +1,84 @@ +package com.aizistral.nochatreports.encryption; + +import java.nio.charset.StandardCharsets; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; + +import net.minecraft.server.network.ServerLoginPacketListenerImpl; + +public class AESChatEncryption extends ChatEncryption { + private final SecretKey key; + private final Cipher encryptor, decryptor; + + public AESChatEncryption(String key) throws InvalidKeyException { + this(new SecretKeySpec(BASE64_DECODER.decode(key), "AES")); + } + + public AESChatEncryption(SecretKey key) throws InvalidKeyException { + try { + this.key = key; + + Cipher encryptor = Cipher.getInstance(this.key.getAlgorithm() + "/CFB8/NoPadding"); + encryptor.init(Cipher.ENCRYPT_MODE, this.key, new IvParameterSpec(key.getEncoded())); + this.encryptor = encryptor; + + Cipher decryptor = Cipher.getInstance(this.key.getAlgorithm() + "/CFB8/NoPadding"); + decryptor.init(Cipher.DECRYPT_MODE, this.key, new IvParameterSpec(key.getEncoded())); + this.decryptor = decryptor; + } catch (InvalidAlgorithmParameterException | NoSuchAlgorithmException | NoSuchPaddingException ex) { + throw new RuntimeException(ex); + } + } + + @Override + public String encrypt(String message) { + try { + return BASE64_ENCODER.encodeToString(this.encryptor.doFinal(message.getBytes())); + } catch (IllegalBlockSizeException | BadPaddingException ex) { + throw new RuntimeException(ex); + } + } + + @Override + public String decrypt(String message) { + try { + return new String(this.decryptor.doFinal(BASE64_DECODER.decode(message)), StandardCharsets.UTF_8); + } catch (IllegalBlockSizeException | BadPaddingException ex) { + throw new RuntimeException(ex); + } + } + + @Override + public String getAlgorithm() { + return this.key.getAlgorithm() + "+Base64"; + } + + @Override + public String getKey() { + return BASE64_ENCODER.encodeToString(this.key.getEncoded()); + } + + public static AESChatEncryption withRandomKey() { + try { + KeyGenerator keyGenerator = KeyGenerator.getInstance("AES"); + keyGenerator.init(128); + SecretKey key = keyGenerator.generateKey(); + + return new AESChatEncryption(key); + } catch (NoSuchAlgorithmException | InvalidKeyException ex) { + throw new RuntimeException(ex); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/encryption/ChatEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/ChatEncryption.java new file mode 100644 index 0000000..44a50bc --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/encryption/ChatEncryption.java @@ -0,0 +1,22 @@ +package com.aizistral.nochatreports.encryption; + +import java.util.Base64; +import java.util.List; + +public abstract class ChatEncryption { + protected static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder(); + protected static final Base64.Decoder BASE64_DECODER = Base64.getDecoder(); + + protected ChatEncryption() { + // NO-OP + } + + public abstract String encrypt(String message); + + public abstract String decrypt(String message); + + public abstract String getAlgorithm(); + + public abstract String getKey(); + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java new file mode 100644 index 0000000..088d28d --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java @@ -0,0 +1,92 @@ +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.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyArgs; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.At.Shift; + +import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.config.NCRConfigClient; +import com.aizistral.nochatreports.encryption.ChatEncryption; + +import net.minecraft.ChatFormatting; +import net.minecraft.client.GuiMessage; +import net.minecraft.client.GuiMessageTag; +import net.minecraft.client.gui.components.ChatComponent; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentContents; +import net.minecraft.network.chat.FormattedText; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.contents.LiteralContents; +import net.minecraft.network.chat.contents.TranslatableContents; + +@Mixin(ChatComponent.class) +public class MixinChatComponent { + private static final GuiMessageTag.Icon ENCRYPTED_ICON = GuiMessageTag.Icon.valueOf("CHAT_NCR_ENCRYPTED"); + private boolean lastMessageEncrypted; + private Component lastMessageOriginal; + + @ModifyVariable(method = "addRecentChat", at = @At("HEAD"), argsOnly = true) + private String onAddRecentChat(String message) { + if (!message.startsWith("/")) + return NCRConfig.getClient().chatEncryption().map(e -> e.decrypt(message)).orElse(message); + else + return message; + } + + @ModifyVariable(method = "addMessage(Lnet/minecraft/network/chat/Component;" + + "Lnet/minecraft/network/chat/MessageSignature;ILnet/minecraft/client/GuiMessageTag;Z)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ComponentRenderUtils;" + + "wrapComponents(Lnet/minecraft/network/chat/FormattedText;ILnet/minecraft/client/gui/Font;" + + ")Ljava/util/List;", ordinal = 0, shift = Shift.AFTER), argsOnly = true) + private GuiMessageTag modifyGUITag(GuiMessageTag tag) { + if (this.lastMessageEncrypted) { + this.lastMessageEncrypted = false; + Component tooltip = Component.empty().append(Component.translatable("tag.nochatreports.encrypted", + Component.literal(NCRConfig.getClient().chatEncryptionAlgorithm()) + .withStyle(ChatFormatting.BOLD))).append(CommonComponents.NEW_LINE).append( + Component.translatable("tag.nochatreports.encrypted_original", + this.lastMessageOriginal)); + return new GuiMessageTag(0x8B3EC7, ENCRYPTED_ICON, tooltip, "Encrypted"); + } else + return tag; + } + + @ModifyArg(index = 0, method = "addMessage(Lnet/minecraft/network/chat/Component;" + + "Lnet/minecraft/network/chat/MessageSignature;ILnet/minecraft/client/GuiMessageTag;Z)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ComponentRenderUtils;" + + "wrapComponents(Lnet/minecraft/network/chat/FormattedText;I" + + "Lnet/minecraft/client/gui/Font;)Ljava/util/List;", ordinal = 0)) + private FormattedText modifyGUIMessage(FormattedText msg) { + var optional = NCRConfig.getClient().chatEncryption(); + + if (optional.isEmpty()) + return msg; + ChatEncryption encryption = optional.get(); + this.lastMessageOriginal = Component.Serializer.fromJson(Component.Serializer.toStableJson(((Component) msg))); + ComponentContents contents = ((Component)msg).getContents(); + + if (contents instanceof TranslatableContents translatable) { + 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; + } + } + } + } + + return msg; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java index e5437b6..38816d9 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -7,8 +7,10 @@ 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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.config.NCRConfigClient; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; import com.mojang.blaze3d.systems.RenderSystem; @@ -20,12 +22,14 @@ import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexFormat; import com.mojang.math.Matrix4f; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.ChatScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.FormattedCharSequence; @@ -38,12 +42,23 @@ import net.minecraft.util.FormattedCharSequence; @Mixin(ChatScreen.class) public abstract class MixinChatScreen extends Screen { private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons.png"); + private static final ResourceLocation ENCRYPTION_BUTTON = new ResourceLocation("nochatreports", "textures/gui/encryption_toggle_button.png"); protected MixinChatScreen() { super(null); throw new IllegalStateException("Can't touch this"); } + @Inject(method = "normalizeChatMessage", at = @At("RETURN"), cancellable = true) + public void onBeforeMessage(String original, CallbackInfoReturnable<String> info) { + String message = info.getReturnValue(); + + if (!message.isEmpty() && !message.startsWith("/")) { + NCRConfig.getClient().chatEncryption().ifPresent(e -> + info.setReturnValue(e.encrypt("#%" + message))); + } + } + @Inject(method = "init", at = @At("HEAD")) private void onInit(CallbackInfo info) { if (!NCRConfig.getClient().showServerSafety() || !NCRConfig.getClient().enableMod()) @@ -54,11 +69,42 @@ public abstract class MixinChatScreen extends Screen { var button = new ImageButton(this.width - 23, this.height - 37, 20, 20, this.getXOffset(trust), 0, 20, CHAT_STATUS_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) -> this.renderTooltipNoGap(poseStack, this.minecraft.font.split(trust.getTooltip(), 250), i, j), - Component.translatable("gui.socialInteractions.report")); + Component.empty()); button.active = false; button.visible = true; this.addRenderableOnly(button); + + button = new ImageButton(this.width - 48, this.height - 37, 20, 20, NCRConfig.getClient().enableChatEncryption() ? 0 : 20, + 0, 20, ENCRYPTION_BUTTON, 64, 64, btn -> { + NCRConfig.getClient().toggleEncryption(); + ((ImageButton)btn).xTexStart = NCRConfig.getClient().enableChatEncryption() ? 0 : 20; + }, (btn, poseStack, i, j) -> + this.renderTooltip(poseStack, this.minecraft.font.split( + Component.translatable("gui.nochatreports.encryption_tooltip", Language.getInstance() + .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getClient() + .enableChatEncryption() ? "on" : "off")), 250), 250), i, j), + Component.empty()) { + + @Override + public boolean mouseClicked(double x, double y, int i) { + if (!this.active || !this.visible) + return false; + + if (i == 1 && this.clicked(x, y)) { + this.playDownSound(Minecraft.getInstance().getSoundManager()); + // TODO Open GUI + return true; + } + + return super.mouseClicked(x, y, i); + } + + }; + button.active = true; + button.visible = true; + + this.addRenderableWidget(button); } private int getXOffset(ServerSafetyLevel level) { @@ -80,7 +126,7 @@ public abstract class MixinChatScreen extends Screen { if (list.isEmpty()) return; int k = 0; - int l = list.size() == 1 ? -2 : 0; + int l = list.size() == 1 ? -2 : -2; for (ClientTooltipComponent clientTooltipComponent : list) { m = clientTooltipComponent.getWidth(this.font); if (m > k) { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java index f6baf82..1c18c61 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java @@ -7,7 +7,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.config.NCRConfig; +import net.minecraft.ChatFormatting; import net.minecraft.client.GuiMessageTag; +import net.minecraft.client.GuiMessageTag.Icon; +import net.minecraft.network.chat.Component; @Mixin(GuiMessageTag.class) public class MixinGuiMessageTag { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java new file mode 100644 index 0000000..6ef1488 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java @@ -0,0 +1,47 @@ +package com.aizistral.nochatreports.mixins.client; + +import java.util.Arrays; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.gen.Invoker; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; + +import net.minecraft.client.GuiMessageTag; +import net.minecraft.client.GuiMessageTag.Icon; +import net.minecraft.client.gui.GuiComponent; +import net.minecraft.resources.ResourceLocation; + +@Mixin(GuiMessageTag.Icon.class) +public abstract class MixinGuiMessageTagIcon { + private static final ResourceLocation TEXTURE_NCR = new ResourceLocation("nochatreports", "textures/gui/encrypted_tag.png"); + @Shadow(aliases = "field_39768") @Mutable static Icon[] $VALUES; + + @Invoker("<init>") + static Icon create(String name, int ordinal, int u, int v, int width, int height) { + throw new IllegalStateException("Invoker transformation failed"); + } + + @Inject(method = "draw", at = @At("HEAD"), cancellable = true) + public void onDraw(PoseStack stack, int x, int y, CallbackInfo info) { + if (((Icon)(Object)this).name().equals("CHAT_NCR_ENCRYPTED")) { + RenderSystem.setShaderTexture(0, TEXTURE_NCR); + GuiComponent.blit(stack, x, y, 0, 0, 9, 9, 9, 9); + info.cancel(); + } + } + + static { + var ordinal = $VALUES.length; + var values = Arrays.copyOf($VALUES, ordinal + 1); + values[ordinal] = create("CHAT_NCR_ENCRYPTED", ordinal, 9, 0, 9, 9); + $VALUES = values; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java index 872aee4..6c357c6 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java @@ -100,7 +100,7 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { if (list.isEmpty()) return; int k = 0; - int l = list.size() == 1 ? -2 : 0; + int l = list.size() == 1 ? -2 : -2; for (ClientTooltipComponent clientTooltipComponent : list) { m = clientTooltipComponent.getWidth(this.font); if (m > k) { |
