summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java11
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json1
3 files changed, 15 insertions, 3 deletions
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();
+ }
}
}
}
diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json
index c438b19..3c42513 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -63,6 +63,7 @@
"gui.nochatreports.signing_required.whitelist_server": "Whitelist Server",
"gui.nochatreports.signing_required.cancel": "Dismiss",
"gui.nochatreports.signing_required.check": "Don't show again during this session",
+ "chat.nochatreports.disabled.signingRequested": "Server refused to deliver unsigned message. You can enable chat signing by allowing it for one session in a pop-up screen or whitelisting the server. Without signing you can still use most commands.",
"configuration.NoChatReports.config": "No Chat Reports",
"configuration.NoChatReports.category.visual": "Visual",