From 6d9f02dbbb4766895563deb4916655960045e9e1 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Sat, 29 Oct 2022 13:50:34 +0200 Subject: More support for custom chat formatting Fixes #248 --- .../nochatreports/core/EncryptionUtil.java | 26 ++++++++-------------- .../nochatreports/encryption/Encryptor.java | 2 +- 2 files changed, 10 insertions(+), 18 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java index 6eecd07..f0bcf4d 100644 --- a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java +++ b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java @@ -23,24 +23,8 @@ public class EncryptionUtil { 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); + return Optional.ofNullable(tryDecrypt(copy, encryption) ? copy : null); } public static boolean tryDecrypt(Component component, Encryptor encryptor) { @@ -58,6 +42,14 @@ public class EncryptionUtil { ((MutableComponent)component).contents = new LiteralContents(decrypted.get()); return true; } + } else if (component.getContents() instanceof TranslatableContents translatable) { + for (Object arg : translatable.args) { + if (arg instanceof MutableComponent mutable) { + if (tryDecrypt(mutable, encryptor)) { + decryptedSiblings = true; + } + } + } } return decryptedSiblings; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java index 7ced16a..220874d 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java @@ -119,7 +119,7 @@ public abstract class Encryptor { map.put('C', '#'); map.put('D', '$'); map.put('E', '%'); - map.put('F', '&'); + map.put('F', 'ΒΌ'); map.put('G', '\''); map.put('H', '('); map.put('I', ')'); -- cgit v1.2.3