From 9fd883cadab1672118cce36887ceee2181fef5a2 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 5 Oct 2022 22:59:43 +0200 Subject: Add special safety status for Realms Closes #189 --- src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java | 4 +++- .../java/com/aizistral/nochatreports/core/ServerSafetyLevel.java | 6 ++++++ .../com/aizistral/nochatreports/mixins/client/MixinChatScreen.java | 5 +++-- .../aizistral/nochatreports/mixins/client/MixinRealmsConnect.java | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index ea1bdb4..f67821d 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -148,7 +148,9 @@ public final class NoChatReportsClient implements ClientModInitializer { if (!client.isLocalServer()) { boolean canSend = ClientPlayNetworking.canSend(NoChatReports.CHANNEL); - if (canSend) { + if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) { + // NO-OP + } else if (canSend) { ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); } else if (ServerSafetyState.forceSignedMessages()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java index 7454c45..6494dbc 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -37,6 +37,12 @@ public enum ServerSafetyLevel { INSECURE, + /** + * For Realms specifically, as these are a whole new level of unsafe. + */ + + REALMS, + /** * Transient status for when evaluation of safety level is not yet complete for current server. */ 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 433e183..a05152c 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -44,7 +44,7 @@ import net.minecraft.util.FormattedCharSequence; @Mixin(ChatScreen.class) public abstract class MixinChatScreen extends Screen { - private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons.png"); + private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons_extended.png"); private static final ResourceLocation ENCRYPTION_BUTTON = new ResourceLocation("nochatreports", "textures/gui/encryption_toggle_button.png"); protected MixinChatScreen() { @@ -78,7 +78,7 @@ public abstract class MixinChatScreen extends Screen { ServerSafetyLevel trust = this.minecraft.isLocalServer() ? ServerSafetyLevel.SECURE : ServerSafetyState.getCurrent(); var button = new ImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(trust), - 0, 20, CHAT_STATUS_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) -> + 0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> {}, (btn, poseStack, i, j) -> this.renderTooltipNoGap(poseStack, this.minecraft.font.split(trust.getTooltip(), 250), i, j), Component.empty()); button.active = false; @@ -129,6 +129,7 @@ public abstract class MixinChatScreen extends Screen { case SECURE -> 21; case UNINTRUSIVE, UNKNOWN -> 42; case INSECURE -> 0; + case REALMS -> 63; }; } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java index 351c43f..5fd58dd 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java @@ -27,7 +27,7 @@ public class MixinRealmsConnect { return; ServerSafetyState.setLastConnectedServer(serverAddress, null); - ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); + ServerSafetyState.updateCurrent(ServerSafetyLevel.REALMS); ServerSafetyState.setAllowsUnsafeServer(true); } -- cgit v1.2.3