From 01aeedb917b59ff6ef800b2f736ef3536f16082d Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 4 Nov 2022 12:33:29 +0100 Subject: Improve missing profile key message Closes #261 --- .../com/aizistral/nochatreports/config/NCRConfigClient.java | 6 +++++- .../nochatreports/mixins/client/MixinChatListener.java | 11 +++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java index 7e13c7d..c1915ca 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java @@ -26,7 +26,7 @@ public final class NCRConfigClient extends JSONConfig { hideModifiedMessageIndicators = true, hideSystemMessageIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, whitelistAllServers = false, verifiedIconEnabled = true, showNCRButton = true, - enableMod = true, skipRealmsWarning = false; + enableMod = true, skipRealmsWarning = false, hideSigningRequestMessage = false; protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0; @@ -217,4 +217,8 @@ public final class NCRConfigClient extends JSONConfig { this.skipRealmsWarning = skipRealmsWarning; } + public boolean hideSigningRequestMessage() { + return this.hideSigningRequestMessage; + } + } 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 d514150..18369d8 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -27,6 +27,7 @@ import net.minecraft.client.multiplayer.PlayerInfo; import net.minecraft.client.multiplayer.chat.ChatListener; import net.minecraft.client.multiplayer.chat.ChatTrustLevel; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.PlayerChatMessage; import net.minecraft.network.chat.contents.TranslatableContents; @@ -38,10 +39,12 @@ public class MixinChatListener { throw new IllegalStateException("@Shadow transformation failed. Should never happen."); } - @Inject(method = "handleSystemMessage", at = @At("HEAD")) + @Inject(method = "handleSystemMessage", at = @At("HEAD"), cancellable = true) private void onHandleSystemMessage(Component message, boolean overlay, CallbackInfo info) { - if (message.getContents() instanceof TranslatableContents translatable) { + if (message instanceof MutableComponent mutable && message.getContents() instanceof TranslatableContents translatable) { if (translatable.getKey().equals("chat.disabled.missingProfileKey")) { + mutable.contents = new TranslatableContents("chat.nochatreports.disabled.signingRequested"); + if (!ServerSafetyState.isOnRealms()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); } @@ -51,6 +54,10 @@ public class MixinChatListener { Minecraft.getInstance().setScreen(new UnsafeServerScreen(Minecraft.getInstance().screen instanceof ChatScreen chat ? chat : new ChatScreen(""))); + + if (NCRConfig.getClient().hideSigningRequestMessage()) { + info.cancel(); + } } } } -- cgit v1.2.3