summaryrefslogtreecommitdiffstats
path: root/src/main/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java11
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/JSONConfig.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java5
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java5
4 files changed, 21 insertions, 2 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 62c4185..df919d2 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -3,6 +3,7 @@ package com.aizistral.nochatreports;
import java.util.List;
import com.aizistral.nochatreports.config.NCRConfig;
+import com.aizistral.nochatreports.core.ServerDataExtension;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
import com.aizistral.nochatreports.gui.UnsafeServerScreen;
@@ -96,9 +97,15 @@ public final class NoChatReportsClient implements ClientModInitializer {
if (canSend) {
ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE);
+ } else if (ServerSafetyState.forceSignedMessages()) {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
} else {
- ServerSafetyState.updateCurrent(ServerSafetyState.forceSignedMessages() ?
- ServerSafetyLevel.INSECURE : ServerSafetyLevel.UNINTRUSIVE);
+ if (ServerSafetyState.getLastServerData() instanceof ServerDataExtension ext
+ && ext.preventsChatReports()) {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE);
+ } else {
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE);
+ }
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
index 69f3ef3..3369439 100644
--- a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
@@ -52,6 +52,8 @@ public abstract class JSONConfig {
// NO-OP
}
+ public abstract JSONConfig getDefault();
+
public static <T extends JSONConfig> T loadConfig(Class<T> configClass, Supplier<T> freshInstance, String fileName) {
NoChatReports.LOGGER.info("Reading config file {}...", fileName);
T config = readFile(fileName, configClass).orElseGet(freshInstance);
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java
index 0ab4db9..a07c92d 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java
@@ -25,6 +25,11 @@ public final class NCRClientConfig extends JSONConfig {
super(FILE_NAME);
}
+ @Override
+ public NCRClientConfig getDefault() {
+ return new NCRClientConfig();
+ }
+
/**
* @return True if client with No Chat Reports installed should demand that mod is present on
* every server that it tries to join. In that case client will not be able to join servers that
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java
index 65bbfc6..509100f 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java
@@ -17,6 +17,11 @@ public final class NCRCommonConfig extends JSONConfig {
super(FILE_NAME);
}
+ @Override
+ public NCRCommonConfig getDefault() {
+ return new NCRCommonConfig();
+ }
+
/**
* @return True if server with No Chat Reports installed should demand that mod is present on
* every client that tries to join. Mod's installation on client is optional otherwise.<br><br>