diff options
| author | Aizistral | 2024-11-08 19:14:03 +0100 |
|---|---|---|
| committer | Aizistral | 2024-11-08 19:14:03 +0100 |
| commit | 0f36233dea17565d767eb94e5a2506a0f271789d (patch) | |
| tree | 3b1bafcd3a688bdbfb150f85428e730570b68699 /src/main/java | |
| parent | cb05b3ccfdfcf95ee94c3ba0373e4de6107f29b0 (diff) | |
Fix network protocol error thing
Fixes #492, fixes #493, fixes #495
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java index 42ed761..a525d95 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java @@ -43,16 +43,22 @@ public class MixinChatComponent { at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ChatComponent;" + "logChatMessage(Lnet/minecraft/client/GuiMessage;)V", ordinal = 0, shift = Shift.BEFORE)) private GuiMessage modifyGUIMessage(GuiMessage msg) { + if (!NCRConfig.getEncryption().isEnabledAndValid()) + return msg; + else if (this.minecraft.level == null) { + NCRCore.LOGGER.warn("Chat message cannot be decrypted since level didn't load in yet!"); + return msg; + } + if (NCRConfig.getCommon().enableDebugLog()) { NCRCore.LOGGER.info("Adding chat message, structure: " + Component.Serializer.toJson(msg.content(), RegistryAccess.EMPTY)); } - assert minecraft.level != null; - var decrypted = EncryptionUtil.tryDecrypt(minecraft.level.registryAccess(), msg.content()); + var decrypted = EncryptionUtil.tryDecrypt(this.minecraft.level.registryAccess(), msg.content()); decrypted.ifPresentOrElse(component -> { - this.lastMessageOriginal = EncryptionUtil.recreate(minecraft.level.registryAccess(), msg.content()); + this.lastMessageOriginal = EncryptionUtil.recreate(this.minecraft.level.registryAccess(), msg.content()); this.lastMessageEncrypted = true; }, () -> this.lastMessageEncrypted = false); |
