diff options
| author | Aizistral | 2022-10-05 22:21:54 +0200 |
|---|---|---|
| committer | Aizistral | 2022-10-05 22:21:54 +0200 |
| commit | c52766dc64e8fbef15ee1ee174972c76ac44cbfc (patch) | |
| tree | 2be157decbc279de66d84b58627621fa3e53a076 | |
| parent | 9bb9b39a6d128aa2c30a26622cc3744ec96a5423 (diff) | |
Decrypt chat for narration
Fixes #208
3 files changed, 103 insertions, 64 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java new file mode 100644 index 0000000..6eecd07 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java @@ -0,0 +1,86 @@ +package com.aizistral.nochatreports.core; + +import java.util.Optional; + +import javax.annotation.Nullable; + +import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.encryption.Encryptor; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentContents; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.contents.LiteralContents; +import net.minecraft.network.chat.contents.TranslatableContents; + +public class EncryptionUtil { + + public static Optional<Component> tryDecrypt(Component component) { + var optional = NCRConfig.getEncryption().getEncryptor(); + if (optional.isEmpty()) + return Optional.empty(); + + Encryptor<?> encryption = optional.get(); + Component copy = recreate(component); + ComponentContents contents = copy.getContents(); + boolean decryptedSomething = false; + + if (contents instanceof TranslatableContents translatable) { + for (Object arg : translatable.args) { + if (arg instanceof MutableComponent mutable + && mutable.getContents() instanceof LiteralContents literal) { + var decrypted = tryDecrypt(literal.text(), encryption); + if (decrypted.isPresent()) { + mutable.contents = new LiteralContents(decrypted.get()); + decryptedSomething = true; + } + } + } + } else { + decryptedSomething = tryDecrypt(copy, encryption); + } + + return Optional.ofNullable(decryptedSomething ? copy : null); + } + + public static boolean tryDecrypt(Component component, Encryptor<?> encryptor) { + boolean decryptedSiblings = false; + for (Component sibling : component.getSiblings()) { + if (tryDecrypt(sibling, encryptor)) { + decryptedSiblings = true; + } + } + + if (component.getContents() instanceof LiteralContents literal) { + var decrypted = tryDecrypt(literal.text(), encryptor); + + if (decrypted.isPresent()) { + ((MutableComponent)component).contents = new LiteralContents(decrypted.get()); + return true; + } + } + + return decryptedSiblings; + } + + public static Optional<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 Optional.of(message.substring(0, message.length() - decryptable.length()) + decrypted.substring(2, decrypted.length())); + else + return Optional.empty(); + } catch (Exception ex) { + return Optional.empty(); + } + } + + public static Component recreate(Component component) { + return Component.Serializer.fromJson(Component.Serializer.toStableJson(component)); + } + +} 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 67ce83e..ce6d522 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java @@ -12,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.At.Shift; import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.config.NCRConfigClient; +import com.aizistral.nochatreports.core.EncryptionUtil; import com.aizistral.nochatreports.encryption.Encryptor; import net.minecraft.ChatFormatting; @@ -71,72 +72,14 @@ public class MixinChatComponent { Component.Serializer.toStableJson((Component) msg)); } - var optional = NCRConfig.getEncryption().getEncryptor(); - if (optional.isEmpty()) - return msg; + var decrypted = EncryptionUtil.tryDecrypt((Component) msg); - Encryptor<?> encryption = optional.get(); - Component copy = this.recreate((Component) msg); - this.lastMessageOriginal = this.recreate(copy); - ComponentContents contents = copy.getContents(); + decrypted.ifPresentOrElse(component -> { + this.lastMessageOriginal = EncryptionUtil.recreate((Component) msg); + this.lastMessageEncrypted = true; + }, () -> this.lastMessageEncrypted = false); - if (contents instanceof TranslatableContents translatable) { - for (Object arg : translatable.args) { - if (arg instanceof MutableComponent mutable - && mutable.getContents() instanceof LiteralContents literal) { - 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)); + return this.lastMessageEncrypted ? decrypted.get() : msg; } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java index 05453c7..3cbd89a 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -8,11 +8,15 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.At.Shift; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.core.EncryptionUtil; +import net.minecraft.client.GuiMessageTag; import net.minecraft.client.multiplayer.PlayerInfo; import net.minecraft.client.multiplayer.chat.ChatListener; import net.minecraft.client.multiplayer.chat.ChatTrustLevel; @@ -65,4 +69,10 @@ public class MixinChatListener { } } + @ModifyVariable(method = "narrateChatMessage(Lnet/minecraft/network/chat/ChatType$Bound;" + + "Lnet/minecraft/network/chat/Component;)V", at = @At("HEAD"), argsOnly = true) + private Component decryptNarratedMessage(Component msg) { + return EncryptionUtil.tryDecrypt(msg).orElse(msg); + } + } |
