From f93888e211bc32dc7ed06c5f40ab9c902f82f9a1 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 24 Oct 2022 14:05:48 +0200 Subject: Improve server safety status icons Fixes #229, closes #233 --- .../com/aizistral/nochatreports/config/ModMenuIntegration.java | 7 ++++++- .../java/com/aizistral/nochatreports/core/ServerSafetyLevel.java | 8 +++++++- .../java/com/aizistral/nochatreports/core/ServerSafetyState.java | 4 ++-- .../aizistral/nochatreports/mixins/client/MixinChatScreen.java | 4 +++- .../aizistral/nochatreports/mixins/client/MixinConnectScreen.java | 2 +- 5 files changed, 19 insertions(+), 6 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java index d0ee316..aac62a4 100644 --- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java @@ -3,6 +3,8 @@ package com.aizistral.nochatreports.config; import java.util.ArrayList; import java.util.List; +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; import com.aizistral.nochatreports.gui.FontHelper; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; @@ -174,7 +176,10 @@ public final class ModMenuIntegration implements ModMenuApi { technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod) .setDefaultValue(true) .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().enableMod = newValue) + .setSaveConsumer(newValue -> { + NCRConfig.getClient().enableMod = newValue; + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); + }) .build()); // Instructions for adding servers diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java index 6494dbc..586d828 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -43,11 +43,17 @@ public enum ServerSafetyLevel { REALMS, + /** + * Reserved for when mod is toggled mid-session and cannot evaluate safety status. + */ + + UNKNOWN, + /** * Transient status for when evaluation of safety level is not yet complete for current server. */ - UNKNOWN; + UNDEFINED; @Environment(EnvType.CLIENT) public Component getTooltip() { diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java index 0d5b591..21f8f75 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java @@ -21,7 +21,7 @@ import net.minecraft.client.multiplayer.resolver.ServerAddress; @Environment(EnvType.CLIENT) public final class ServerSafetyState { - private static ServerSafetyLevel current = ServerSafetyLevel.UNKNOWN; + private static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED; private static ServerAddress lastServerAddress = null; private static ServerData lastServerData = null; private static AtomicBoolean allowUnsafeServer = new AtomicBoolean(false), @@ -102,7 +102,7 @@ public final class ServerSafetyState { } public static void reset() { - current = ServerSafetyLevel.UNKNOWN; + current = ServerSafetyLevel.UNDEFINED; allowUnsafeServer.set(false); sessionRequestedKey.set(false); isOnServer.set(false); 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 a05152c..8280d7b 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -127,9 +127,11 @@ public abstract class MixinChatScreen extends Screen { private int getXOffset(ServerSafetyLevel level) { return switch (level) { case SECURE -> 21; - case UNINTRUSIVE, UNKNOWN -> 42; + case UNINTRUSIVE -> 42; case INSECURE -> 0; case REALMS -> 63; + case UNKNOWN -> 84; + case UNDEFINED -> 105; }; } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java index 86101bf..947729d 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java @@ -33,7 +33,7 @@ public class MixinConnectScreen { if (!NCRConfig.getClient().enableMod()) return; - ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); // just to be 100% sure + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNDEFINED); // just to be 100% sure ServerSafetyState.setLastConnectedServer(serverAddress, serverData); if (NCRConfig.getServerWhitelist().isWhitelisted(serverAddress)) { -- cgit v1.2.3