diff options
| author | Aizistral | 2022-11-02 21:46:05 +0100 |
|---|---|---|
| committer | Aizistral | 2022-11-02 21:46:05 +0100 |
| commit | 5594a61b3a7bf858add77f30396069adb51d8bd9 (patch) | |
| tree | ff9ef4340f47530ad879b93bf67e5580bcade09c | |
| parent | 948cc0a91f5d9c7a43c7cf05788c6ef4e2c9ece8 (diff) | |
Bring back disconnect event :(
5 files changed, 18 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()) { diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 2139170..4c1cd7c 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -12,6 +12,7 @@ "gui.nochatreports.status_signing_allowed_realms": "Chat signing is always enabled on Realms, since it is always required and disabling it would yield no benefit anyways.", "gui.nochatreports.status_signing_allowed_whitelisted": "Message signing is enabled for this session. If you want to disable it - remove this server from whitelist and re-join. Keep in mind that there is no way to detect whether server allows to send unsigned messages without trying to send one, so you'll have to disable it to check whether current server configuration allows unsigned messages.", "gui.nochatreports.status_signing_allowed": "Message signing is enabled for this session. Re-join the server to disable it.", + "gui.nochatreports.status_signing_denied_secure": "Message signing is disabled since this server is secure.", "gui.nochatreports.status_signing_denied": "Message signing is disabled for this session. You can whitelist this server to always enable chat signing automatically on it.", "gui.nochatreports.status_whitelist_mode": "§lWhitelisted Server: %1$s", "gui.nochatreports.status_whitelist_all": "§a§lYes (All Servers)", |
