From d8f503a506d94fc671fce9d296ea5074233475b8 Mon Sep 17 00:00:00 2001 From: Madis Date: Sun, 31 Jul 2022 22:01:24 +0300 Subject: Skip whitelist --- .../com/aizistral/nochatreports/NoChatReportsClient.java | 2 +- .../com/aizistral/nochatreports/core/NoReportsConfig.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/aizistral/nochatreports') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 7f1d28d..9021812 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -70,7 +70,7 @@ public class NoChatReportsClient implements ClientModInitializer { return; } else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) { if (ServerSafetyState.getLastConnectedServer() != null) { - if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastConnectedServer())) { + if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastConnectedServer()) && !NoReportsConfig.skipWhitelist()) { client.setScreen(new UnsafeServerScreen()); } else { if (ServerSafetyState.getReconnectCount() <= 0) { diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index 20491e5..01ee847 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -43,7 +43,7 @@ public class NoReportsConfig { convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true, hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true, - showReloadButton = true; + showReloadButton = true, skipWhitelist = false; private List whitelistedServers; private static NoReportsConfig getInstance() { @@ -278,4 +278,16 @@ public class NoReportsConfig { return getInstance().showReloadButton; } + /** + * @return True if the full-screen warning should be skipped, letting users simply join the server with + * signing. Because of that, servers will no longer be added to the whitelist. + *

+ * + * This is false by default. + */ + + public static boolean skipWhitelist() { + return getInstance().skipWhitelist; + } + } -- cgit v1.2.3 From 871ecb8e789a96fd8d21f069b8cf3003a4e51e73 Mon Sep 17 00:00:00 2001 From: Madis Date: Sun, 31 Jul 2022 23:54:38 +0300 Subject: Renamed the variable --- .../java/com/aizistral/nochatreports/NoChatReportsClient.java | 2 +- .../java/com/aizistral/nochatreports/core/NoReportsConfig.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/aizistral/nochatreports') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 9021812..e94e9b1 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -70,7 +70,7 @@ public class NoChatReportsClient implements ClientModInitializer { return; } else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) { if (ServerSafetyState.getLastConnectedServer() != null) { - if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastConnectedServer()) && !NoReportsConfig.skipWhitelist()) { + if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastConnectedServer()) && !NoReportsConfig.whitelistAllServers()) { client.setScreen(new UnsafeServerScreen()); } else { if (ServerSafetyState.getReconnectCount() <= 0) { diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index 01ee847..5849882 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -43,7 +43,7 @@ public class NoReportsConfig { convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true, hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true, - showReloadButton = true, skipWhitelist = false; + showReloadButton = true, whitelistAllServers = false; private List whitelistedServers; private static NoReportsConfig getInstance() { @@ -279,15 +279,15 @@ public class NoReportsConfig { } /** - * @return True if the full-screen warning should be skipped, letting users simply join the server with - * signing. Because of that, servers will no longer be added to the whitelist. + * @return True if the full-screen warning should be skipped for servers that require chat signing, + * letting users simply join the server. Because of that, servers will no longer be added to the whitelist. *

* * This is false by default. */ - public static boolean skipWhitelist() { - return getInstance().skipWhitelist; + public static boolean whitelistAllServers() { + return getInstance().whitelistAllServers; } } -- cgit v1.2.3 From 6e8e743b17e547593d02ff6b80ae860ac27287fd Mon Sep 17 00:00:00 2001 From: Madis Date: Mon, 1 Aug 2022 19:33:35 +0300 Subject: Different warning tooltip --- .../java/com/aizistral/nochatreports/core/ServerSafetyLevel.java | 2 ++ src/main/resources/assets/nochatreports/lang/en_us.json | 1 + src/main/resources/assets/nochatreports/lang/et_ee.json | 7 ++++--- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/aizistral/nochatreports') diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java index 141116d..2897c5a 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -47,6 +47,8 @@ public enum ServerSafetyLevel { @Environment(EnvType.CLIENT) public Component getTooltip() { + if(NoReportsConfig.whitelistAllServers() && this.equals(ServerSafetyLevel.INSECURE)) + return Component.translatable("gui.nochatreports.status_insecure_whitelist_all_servers"); return Component.translatable("gui.nochatreports.status_" + this.name().toLowerCase()); } } diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index ef7e613..b881a0d 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -5,6 +5,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 does not prevent chat reports, but allows you to send unsigned messages which cannot be reported to Mojang. Vanilla clients will still send signed messages, display unsigned messages as \"Not Secure\" and not show them if \"Only Show Secure Chat\" is enabled in chat options.", "gui.nochatreports.status_insecure": "This server demands all chat messages to be signed and you agreed to proceed with this arrangement. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can manually remove this server from NoChatReports.json in your config folder to get warned again.", + "gui.nochatreports.status_insecure_whitelist_all_servers": "This server demands all chat messages to be signed and you disabled the full-screen warning for it. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can disable \"whitelistAllServers\" from NoChatReports.json in your config folder to get warned again.", "gui.nochatreports.status_unknown": "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.", "gui.nochatreports.unsafe_server.header": "Caution: Unsafe Server", "gui.nochatreports.unsafe_server.contents": "This server requires all chat messages to be signed, which means they can be reported to Mojang, which may result in a ban from all multiplayer servers. This likely means that the server owner kept \"enforce-secure-profile\" enabled in the server.properties, which is the default since 1.19.1. You can choose to play anyway, but No Chat Reports will not be able to protect you.", diff --git a/src/main/resources/assets/nochatreports/lang/et_ee.json b/src/main/resources/assets/nochatreports/lang/et_ee.json index 048c7d7..611f3df 100644 --- a/src/main/resources/assets/nochatreports/lang/et_ee.json +++ b/src/main/resources/assets/nochatreports/lang/et_ee.json @@ -2,9 +2,10 @@ "gui.nochatreport.secureChat": "See funktsioon ei saa töötada modiga No Chat Reports, kuna kinnitatavad signatuurid puuduvad.", "gui.nochatreport.noReporting": "Selles serveris on mängijast teatamine keelatud modi No Chat Reports olemasolu tõttu.", "disconnect.nochatreports.client": "Sellest serverist puudub mod No Chat Reports ning sinu seadistused nõuavad selle olemasolu serveris.", - "gui.nochatreports.status_secure": "Sellele serverile on paigaldatud mod No Chat Reports või see piirab kõigi sõnumitest teatamist mõnel muul teadaoleval viisil. Keegi ei näe punast riba, (!)-sümbolit ega saa sõnumeid peita valikuga \"Vaid turvaline vestlus\". Sa saad turvaliselt vestelda.", - "gui.nochatreports.status_unintrusive": "See server võimaldab saata signeerimata sõnumeid, mida ei saa Mojangile teatada. Siiski, vanilliklientidele kuvavad need sõnumid vasakul punast riba, paremal (!)-sümbolit ning igaüks, kes lubab valiku \"Vaid turvaline vestlus\" ei näe su sõnumeid üldse.", - "gui.nochatreports.status_insecure": "See server nõuab kõikide mängijasõnumite signeerimist ning sa nõustusid selle korraldusega. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid selle serveri käsitsi config kaustas olevast NoChatReports.json failist eemaldada.", + "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 ei piira sõnumitest teatamist, kuid võimaldab saata signeerimata sõnumeid, mida ei saa Mojangile teatada. Vanillikliendid saadavad siiski signeeritud sõnumeid, kuvavad signeerimata sõnumeid \"ebaturvalistena\" ning ei kuva neid üldse, kui vestlusseadetes on lubatud \"Vaid turvaline vestlus\".", + "gui.nochatreports.status_insecure": "See server nõuab kõikide mängijasõnumite signeerimist ning sa nõustusid selle korraldusega. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid selle serveri config kaustas olevast NoChatReports.json failist eemaldada.", + "gui.nochatreports.status_insecure_whitelist_all_servers": "See server nõuab kõikide mängijasõnumite signeerimist ning sa keelasid seda tähistava täisekraanis hoiatuse. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid keelata config kaustas olevas NoChatReports.json failis \"whitelistAllServers\".", "gui.nochatreports.status_unknown": "No Chat Reports ei suutnud selle serveri turvalisust hinnata. Seda ei tohiks kunagi juhtuda, palun teata sellest veast modi arendajale.", "gui.nochatreports.unsafe_server.header": "Hoiatus: ebaturvaline server", "gui.nochatreports.unsafe_server.contents": "See server nõuab kõikide vestlussõnumite signeerimist, seega neid saab Mojangile raporteerida ning tagajärjeks võib olla blokeering kõigist mitmikmängu serveritest. See tõenäoliselt tähendab, et serveri omanik jättis failis server.properties valiku \"enforce-secure-profile\" lubatuks, mis on ka vaikeväärtus alates versioonist 1.19.1. Sa võid siiski seal mängida, kuid No Chat Reports ei saa sind kaitsta.", -- cgit v1.2.3