diff options
Diffstat (limited to 'src/main/java/com')
6 files changed, 28 insertions, 10 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 8fdc00f..4d9f194 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -52,7 +52,6 @@ public final class NoChatReportsClient implements ClientModInitializer { client.execute(() -> { if (!client.isLocalServer()) { - if (ServerSafetyState.isOnRealms()) { // NO-OP } else if (!handler.getConnection().isEncrypted()) { @@ -68,14 +67,14 @@ public final class NoChatReportsClient implements ClientModInitializer { ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); } } else { - ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + ServerSafetyState.updateCurrent(ServerSafetyLevel.SINGLEPLAYER); } if (NCRConfig.getCommon().enableDebugLog()) { NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent()); } - if (NCRConfig.getClient().demandOnServer() && ServerSafetyState.getCurrent() != ServerSafetyLevel.SECURE) { + if (NCRConfig.getClient().demandOnServer() && !ServerSafetyState.getCurrent().isSecure()) { handler.getConnection().disconnect(Component.translatable("disconnect.nochatreports.client")); } }); diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java index a3eafd3..0abd98c 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java @@ -8,6 +8,7 @@ import java.util.Optional; import org.jetbrains.annotations.Nullable; import com.aizistral.nochatreports.NoChatReportsClient; +import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; import com.aizistral.nochatreports.core.SigningMode; import com.aizistral.nochatreports.gui.UnsafeServerScreen; @@ -34,6 +35,8 @@ public class NCRServerPreferences extends JSONConfig { public SigningMode getModeUnresolved(@Nullable ServerAddress address) { if (!NoChatReportsClient.areSigningKeysPresent()) return SigningMode.NEVER_FORCED; + else if (ServerSafetyState.isInSingleplayer()) + return SigningMode.NEVER; else if (address == null) return SigningMode.DEFAULT; diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java index 302a1a3..69e69aa 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -19,6 +19,12 @@ public enum ServerSafetyLevel { */ SECURE, + /** + * For singleplayer specifically. Pretty much identical to {@link #SECURE} since client needs + * NCR installed on it to display any safety level to begin with. + */ + SINGLEPLAYER, + /** * For servers that do not make any effort to remove signatures from chat messages themselves, @@ -58,4 +64,8 @@ public enum ServerSafetyLevel { return Component.translatable("gui.nochatreports.safety_status." + this.name().toLowerCase()); } + public boolean isSecure() { + return this == SECURE || this == SINGLEPLAYER; + } + } diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java index b55e059..ced4281 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java @@ -65,6 +65,10 @@ public final class ServerSafetyState { return current == ServerSafetyLevel.REALMS; } + public static boolean isInSingleplayer() { + return current == ServerSafetyLevel.SINGLEPLAYER; + } + public static boolean isDetermined() { return current != ServerSafetyLevel.UNINTRUSIVE && current != ServerSafetyLevel.UNDEFINED && current != ServerSafetyLevel.UNKNOWN; 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 3fb0864..a8bb100 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -106,13 +106,15 @@ public abstract class MixinChatScreen extends Screen { }, Component.empty(), this); this.safetyStatusButton.setTooltip(new AdvancedTooltip(() -> { MutableComponent tooltip = this.getSafetyLevel().getTooltip(); - ServerAddress address = ServerSafetyState.getLastServer(); - SigningMode mode = NCRConfig.getServerPreferences().getModeUnresolved(address); - String signing = "gui.nochatreports.signing_status."; if (ServerSafetyState.allowChatSigning()) { tooltip = Component.translatable("gui.nochatreports.safety_status.insecure_signing"); - } + } else if (ServerSafetyState.isInSingleplayer()) + return tooltip; + + ServerAddress address = ServerSafetyState.getLastServer(); + SigningMode mode = NCRConfig.getServerPreferences().getModeUnresolved(address); + String signing = "gui.nochatreports.signing_status."; if (!this.minecraft.getConnection().getConnection().isEncrypted()) { signing += "disabled_offline"; @@ -188,7 +190,7 @@ public abstract class MixinChatScreen extends Screen { } private ServerSafetyLevel getSafetyLevel() { - return this.minecraft.isLocalServer() ? ServerSafetyLevel.SECURE : ServerSafetyState.getCurrent(); + return ServerSafetyState.getCurrent(); } private int getXOffset() { @@ -197,7 +199,7 @@ public abstract class MixinChatScreen extends Screen { private int getXOffset(ServerSafetyLevel level) { return switch (level) { - case SECURE -> 21; + case SECURE, SINGLEPLAYER -> 21; case UNINTRUSIVE -> 42; case INSECURE -> 0; case REALMS -> 63; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java index 16d56e4..59348f1 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java @@ -45,7 +45,7 @@ public class MixinPlayerEntry { if (NCRConfig.getClient().alwaysHideReportButton()) { this.reportButton = new InvisibleButton(); this.reportButton.active = this.reportButton.visible = false; - } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE && this.reportButton != null) { + } else if (ServerSafetyState.getCurrent().isSecure() && this.reportButton != null) { this.reportButton = new AdvancedImageButton(0, 0, 20, 20, 0, 0, 20, REPORT_BUTTON_LOCATION, 64, 64, button -> {}, Component.translatable("gui.socialInteractions.report"), screen); this.reportButton.setTooltip(Tooltip.create(NCR_BUTTON_TOOLTIP)); |
