summaryrefslogtreecommitdiffstats
path: root/src/main/java/com
diff options
context:
space:
mode:
authorAizistral2022-10-05 22:59:43 +0200
committerAizistral2022-10-05 23:05:48 +0200
commit9fd883cadab1672118cce36887ceee2181fef5a2 (patch)
tree82fb0f2c093abc59e9d5542a7243354012f5987d /src/main/java/com
parentb0df62e7ddfecbbcbd2685245764502b1eeee92f (diff)
Add special safety status for Realms
Closes #189
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java5
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java2
4 files changed, 13 insertions, 4 deletions
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
@@ -38,6 +38,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);
}