summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java12
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java2
4 files changed, 17 insertions, 3 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index e3b671a..fb261d8 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -51,6 +51,18 @@ public final class NoChatReportsClient implements ClientModInitializer {
}
ClientPlayConnectionEvents.JOIN.register(this::onPlayReady);
+ ClientPlayConnectionEvents.DISCONNECT.register(this::onDisconnect);
+ }
+
+ private void onDisconnect(ClientPacketListener handler, Minecraft client) {
+ if (!NCRConfig.getClient().enableMod())
+ return;
+
+ if (NCRConfig.getCommon().enableDebugLog()) {
+ NoChatReports.LOGGER.info("Disconnected from server, resetting safety state!");
+ }
+
+ ServerSafetyState.reset();
}
private void onPlayReady(ClientPacketListener handler, PacketSender sender, Minecraft client) {
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index de80bfb..f9ab691 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -26,8 +26,8 @@ import net.minecraft.network.chat.SignedMessageChain.Encoder;
@Environment(EnvType.CLIENT)
public final class ServerSafetyState {
- private static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED;
- private static ServerAddress lastServer = null;
+ private volatile static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED;
+ private volatile static ServerAddress lastServer = null;
private static AtomicBoolean allowChatSigning = new AtomicBoolean(false);
public static void updateCurrent(ServerSafetyLevel level) {
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 91375c3..d514150 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
@@ -46,7 +46,7 @@ public class MixinChatListener {
ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
}
- if (UnsafeServerScreen.hideThisSession())
+ if (UnsafeServerScreen.hideThisSession() || ServerSafetyState.allowChatSigning())
return;
Minecraft.getInstance().setScreen(new UnsafeServerScreen(Minecraft.getInstance().screen
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
index 4343db8..16d23bf 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
@@ -108,6 +108,8 @@ public abstract class MixinChatScreen extends Screen {
if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) {
signing = "gui.nochatreports.status_signing_allowed_realms";
+ } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE) {
+ signing = "gui.nochatreports.status_signing_denied_secure";
} else if (NCRConfig.getServerWhitelist().isWhitelisted(address)) {
signing = "gui.nochatreports.status_signing_allowed_whitelisted";
} else if (ServerSafetyState.allowChatSigning()) {