summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java8
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java6
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json1
-rw-r--r--src/main/resources/assets/nochatreports/lang/et_ee.json1
4 files changed, 14 insertions, 2 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
index a12b10c..0808f4f 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
@@ -37,6 +37,14 @@ public enum ServerSafetyLevel {
INSECURE,
/**
+ * Servers that don't require signatures but the user gave them anyway by whitelisting.
+ * The state is only displayed after the player toggles the whitelist for a server, because
+ * it is not possible to determine whether a server requires signatures if they are already given.
+ */
+
+ INSECURE_WHITELISTED,
+
+ /**
* For Realms specifically, as these are a whole new level of unsafe.
*/
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 a77d81c..53b7149 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
@@ -86,7 +86,9 @@ public abstract class MixinChatScreen extends Screen {
if (ServerSafetyState.getCurrent() != ServerSafetyLevel.SECURE) {
ServerSafetyState.setAllowChatSigning(true);
- ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
+ if(ServerSafetyState.getCurrent() != ServerSafetyLevel.INSECURE){
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE_WHITELISTED);
+ }
}
} else {
whitelist.remove(address);
@@ -183,7 +185,7 @@ public abstract class MixinChatScreen extends Screen {
return switch (level) {
case SECURE -> 21;
case UNINTRUSIVE -> 42;
- case INSECURE -> 0;
+ case INSECURE, INSECURE_WHITELISTED -> 0;
case REALMS -> 63;
case UNKNOWN -> 84;
case UNDEFINED -> 105;
diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json
index 4bb1131..005d740 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -6,6 +6,7 @@
"gui.nochatreports.status_secure": "This server has No Chat Reports installed, or prevents your messages from being reportable in some other known way. You can chat safely.",
"gui.nochatreports.status_unintrusive": "This server allows you to send unsigned messages which cannot be reported to Mojang. Unless some kind of plugin is installed on server that prevents chat reports - vanilla clients will still send signed messages, display unsigned messages as \"Unverified\" and not show them if \"Only Show Secure Chat\" is enabled in chat options.",
"gui.nochatreports.status_insecure": "This server currently demands all chat messages to be signed. All signed messages are a potentially incriminating evidence that can be used against you in the report.",
+ "gui.nochatreports.status_insecure_whitelisted": "This server does not require chat signing, but you enabled it anyway via whitelisting. All signed messages are a potentially incriminating evidence that can be used against you in the report.",
"gui.nochatreports.status_realms": "This is a Realms server. Not only there is no way to prevent chat reports here, but Mojang also employ automated chat monitoring to identify potential \"online harms\" and escalate them for human review, whether owner of the realm likes it or not. Your only hope is chat encryption.",
"gui.nochatreports.status_unknown": "No Chat Reports is not sure about safety of this server yet. Try to send a message in chat in order to evaluate it.",
"gui.nochatreports.status_undefined": "No Chat Reports could not evaluate the safety of this server. This should never happen, please report it as a bug to the mod developer.",
diff --git a/src/main/resources/assets/nochatreports/lang/et_ee.json b/src/main/resources/assets/nochatreports/lang/et_ee.json
index bd0566b..cecb65f 100644
--- a/src/main/resources/assets/nochatreports/lang/et_ee.json
+++ b/src/main/resources/assets/nochatreports/lang/et_ee.json
@@ -6,6 +6,7 @@
"gui.nochatreports.status_secure": "Sellele serverile on paigaldatud mod No Chat Reports või see piirab sinu sõnumitest teatamist mõnel muul teadaoleval viisil. Sa saad turvaliselt vestelda.",
"gui.nochatreports.status_unintrusive": "See server võimaldab saata signeerimata sõnumeid, mida ei saa Mojangile teatada. Kui serveris pole mõnda vestlusest teatamise piiramise pluginat, saadavad vanillikliendid siiski signeeritud sõnumeid, kuvavad signeerimata sõnumeid \"kinnitamata sõnumitena\" ning ei kuva neid üldse, kui vestlusseadetes on lubatud \"Vaid turvaline vestlus\".",
"gui.nochatreports.status_insecure": "See server nõuab hetkel kõikide mängijasõnumite signeerimist. Kõik signeeritud sõnumid on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada.",
+ "gui.nochatreports.status_insecure_whitelisted": "See server ei nõua mängijasõnumite signeerimist, aga sa lubasid selle lubamisloendisse lisamisega siiski. Kõik signeeritud sõnumid on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada.",
"gui.nochatreports.status_realms": "See on Realmsi server. Lisaks sellele, et siin ei saa vestlusest teatamist keelata, kasutab Mojang ka automaatset vestlusseiret, et tuvastada potentsiaalsed \"võrgukäitumise rikkumised\" ning saata need edasi inimkontrolli, olenemata sellest, kas see meeldib realmi omanikule või mitte. Sinu ainus lootus on vestluse krüpteerimine.",
"gui.nochatreports.status_unknown": "No Chat Reports ei ole veel selle serveri turvalisuses kindel. Proovi selle tuvastamiseks vestlusesse üks sõnum saata.",
"gui.nochatreports.status_undefined": "No Chat Reports ei suutnud selle serveri turvalisust hinnata. Seda ei tohiks kunagi juhtuda, palun teata sellest veast modi arendajale.",