diff options
| author | LoganDark | 2022-08-14 06:53:21 -0700 |
|---|---|---|
| committer | GitHub | 2022-08-14 06:53:21 -0700 |
| commit | a57bda7fedd28900066e3c383cc4c9f0f1f069a8 (patch) | |
| tree | dbeb313079d59cbfc8d0762b04f0f5f54a2878ce /src/main | |
| parent | d2ab4db35342888743566bb68b8742ff4257b20b (diff) | |
| parent | 5ba2d3542d04c70552346c8698e242363341b262 (diff) | |
Merge branch '1.19.2-Fabric' into fabric-api
Diffstat (limited to 'src/main')
21 files changed, 88 insertions, 121 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 7f1d28d..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())) { + 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 20491e5..c0bd6e8 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -42,8 +42,8 @@ public class NoReportsConfig { private boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false, convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true, hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, - alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true, - showReloadButton = true; + alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, + whitelistAllServers = false; private List<String> whitelistedServers; private static NoReportsConfig getInstance() { @@ -135,7 +135,7 @@ public class NoReportsConfig { * do not feature signatures and look completely identical in the chat, with exception of gray line * next to them added in pre-release 3. They are also unselectable for chat reporting.<br><br> * - * This is true by default. + * This is false by default. */ public static boolean convertToGameMessage() { @@ -248,16 +248,6 @@ public class NoReportsConfig { } /** - * @return True if "1.19.1" should be changed to "1.19.84" on titlebar and title screen.<br><br> - * - * This is true by default. - */ - - public static boolean versionEasterEgg() { - return getInstance().versionEasterEgg; - } - - /** * @return True if sending telemetry to Mojang should be disabled.<br><br> * * This is true by default. @@ -278,4 +268,16 @@ public class NoReportsConfig { return getInstance().showReloadButton; } + /** + * @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. + * <br><br> + * + * This is false by default. + */ + + public static boolean whitelistAllServers() { + return getInstance().whitelistAllServers; + } + } 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/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java index 274e67e..654d44a 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -44,8 +44,12 @@ public class MixinChatListener { } else { var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, playerInfo, instant); - if ((evaluate == ChatTrustLevel.NOT_SECURE || evaluate == ChatTrustLevel.BROKEN_CHAIN) - && NoReportsConfig.hideRedChatIndicators()) { + if (evaluate == ChatTrustLevel.BROKEN_CHAIN) { + info.setReturnValue(evaluate); + return; + } + + if (evaluate == ChatTrustLevel.NOT_SECURE && NoReportsConfig.hideRedChatIndicators()) { info.setReturnValue(ChatTrustLevel.SECURE); } else if ((evaluate == ChatTrustLevel.FILTERED || evaluate == ChatTrustLevel.MODIFIED) && NoReportsConfig.hideYellowChatIndicators()) { @@ -62,16 +66,4 @@ public class MixinChatListener { } } - /** - * @reason Prevent client from disconnecting when chat chain is broken. - * Normal average user will not even understand what happened, so this is absolutely - * useless for them. - * @author Aizistral - */ - - @Inject(method = "onChatChainBroken", at = @At("HEAD"), cancellable = true) - private void stopUselessDisconnects(CallbackInfo info) { - info.cancel(); - } - } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java index 7a5aaf9..dc6f0e0 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java @@ -1,7 +1,13 @@ package com.aizistral.nochatreports.mixins.client; import com.aizistral.nochatreports.core.NoReportsConfig; +import com.mojang.authlib.minecraft.TelemetrySession; +import com.mojang.authlib.minecraft.UserApiService; + import net.minecraft.client.ClientTelemetryManager; + +import java.util.concurrent.Executor; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @@ -14,9 +20,14 @@ public class MixinClientTelemetryManager { * @author Aizistral */ - @Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/SharedConstants;IS_RUNNING_IN_IDE:Z")) - private boolean disableTelemetrySession() { - return NoReportsConfig.disableTelemetry(); + @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/UserApiService;" + + "newTelemetrySession(Ljava/util/concurrent/Executor;)Lcom/mojang/authlib/minecraft/TelemetrySession;", + remap = false)) + private TelemetrySession onCreateTelemetrySession(UserApiService service, Executor executor) { + if (NoReportsConfig.disableTelemetry()) + return TelemetrySession.DISABLED; + else + return service.newTelemetrySession(executor); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java deleted file mode 100644 index 1e7b920..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.aizistral.nochatreports.mixins.client; - -import java.time.Instant; -import java.util.UUID; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import com.aizistral.nochatreports.core.NoReportsConfig; -import com.mojang.authlib.minecraft.BanDetails; -import com.mojang.authlib.minecraft.UserApiService; - -import net.fabricmc.fabric.mixin.client.rendering.MixinInGameHud; -import net.minecraft.client.Minecraft; -import net.minecraft.client.Minecraft.ChatStatus; -import net.minecraft.world.entity.player.ChatVisiblity; - -@Mixin(Minecraft.class) -public class MixinMinecraft { - - /** - * @reason Replace "1.19.1" with "1.19.84" in game window title. No functional purpose. - * @author Aizistral - */ - - @Inject(method = "createTitle", at = @At("RETURN"), cancellable = true, require = 0) - private void onCreateTitle(CallbackInfoReturnable<String> info) { - if (!NoReportsConfig.versionEasterEgg()) - return; - - if (info.getReturnValue().contains("1.19.1")) { - info.setReturnValue(info.getReturnValue().replace("1.19.1", "1.19.84")); - } - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java index e1dc8f2..70fa9fa 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.mixins.client; +import com.aizistral.nochatreports.core.ServerSafetyState; import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; import net.minecraft.client.multiplayer.ProfileKeyPairManager; import net.minecraft.util.Signer; @@ -9,9 +10,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.core.ServerSafetyState; - import java.util.Optional; @Mixin(ProfileKeyPairManager.class) @@ -36,10 +34,10 @@ public class MixinProfileKeyPairManager { * @author Aizistral */ - @Inject(method = "profilePublicKeyData", at = @At("HEAD"), cancellable = true) - private void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) { + @Inject(method = "parsePublicKey", at = @At("HEAD"), cancellable = true) + private static void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) { if (!ServerSafetyState.allowsUnsafeServer()) { - info.setReturnValue(Optional.empty()); + info.setReturnValue(null); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java deleted file mode 100644 index 513c28c..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.aizistral.nochatreports.mixins.client; - -import com.aizistral.nochatreports.core.NoReportsConfig; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import com.mojang.bridge.game.GameVersion; - -import net.minecraft.WorldVersion; -import net.minecraft.client.gui.screens.TitleScreen; - -@Mixin(TitleScreen.class) -public class MixinTitleScreen { - - /** - * @reason Replace "1.19.1" with "1.19.84" in title screen. No functional purpose. - * @author Aizistral - */ - - @Redirect(method = "render", at = @At(value = "INVOKE", remap = true, target = - "Lnet/minecraft/WorldVersion;getName()Ljava/lang/String;"), require = 0) - private String onGetVersionName(WorldVersion version) { - String original = version.getName(); - if (!NoReportsConfig.versionEasterEgg()) return original; - return original.contains("1.19.1") ? original.replace("1.19.1", "1.19.84") : original; - } - -} diff --git a/src/main/resources/NCR_logo.png b/src/main/resources/NCR_logo.png Binary files differindex 433dc42..9427c0b 100644 --- a/src/main/resources/NCR_logo.png +++ b/src/main/resources/NCR_logo.png 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.", diff --git a/src/main/resources/assets/nochatreports/lang/fi_fi.json b/src/main/resources/assets/nochatreports/lang/fi_fi.json new file mode 100644 index 0000000..4f6cc98 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/fi_fi.json @@ -0,0 +1,13 @@ +{ + "gui.nochatreport.secureChat": "Tämä asetus ei toimi No Chat Reportsin kanssa, koska viestien sähköiset allekirjoitukset on poistettu.", + "gui.nochatreport.noReporting": "Pelaajien ilmiantaminen on mahdotonta tällä palvelimella, kiitos No Chat Reportsin.", + "disconnect.nochatreports.client": "Tällä palvelimella ei ole No Chat Reportsia ja olet määritellyt sen pakolliseksi pelaamillesi palvelimille.", + "gui.nochatreports.status_secure": "Tällä palvelimella on No Chat Reports tai palvelin muuten estää lähettämiesi viestien ilmiannon. Voit keskustella turvallisesti.", + "gui.nochatreports.status_unintrusive": "Tämä palvelin ei estä viestien ilmiantoa, mutta antaa sinun lähettää sähköisesti allekirjoittamattomia viestejä, joita ei voi ilmiantaa Mojangille. Vanilla-asiakasohjelmat lähettävät silti allekirjoitettuja viestejä sekä näyttävät allekirjoittamattomat viestit \"ei-suojattuina\" eivätkä näytä niitä ollenkaan, jos \"Vain suojattu keskustelu\" on valittu keskusteluasetuksista.", + "gui.nochatreports.status_insecure": "Tämä palvelin sallii vain sähköisesti allekirjoitetut viestit ja halusit jatkaa siitä huolimatta. Kaikkea keskusteluun kirjoittamaasi voidaan käyttää sinua vastaan todistusaineistona ilmiannettaessa. Voit manuaalisesti poistaa tämän palvelimen NoChatReports.json-asetustiedostosta, jos haluat, että sinua varoitetaan tulevaisuudessa uudelleen.", + "gui.nochatreports.status_unknown": "No Chat Reports ei pystynyt arvioimaan palvelimen turvallisuutta. Tämän ei pitäisi ikinä tapahtua. Kerro tästä viasta modin kehittäjälle, kiitos.", + "gui.nochatreports.unsafe_server.header": "Varoitus: ei-turvallinen palvelin", + "gui.nochatreports.unsafe_server.contents": "Tämä palvelin vaatii, että kaikki viestit ovat sähköisesti allekirjoitettuja, mikä tarkoittaa, että ne voidaan ilmoittaa Mojangille, mikä voi johtaa porttikieltoon kaikilta moninpelipalvelimilta. Palvelimen ylläpitäjä todennäköisesti pitää \"enforce-secure-profile\"-asetuksen käytössä palvelimen asetustiedostossa, mikä on oletus 1.19.1-versiosta lähtien. Voit pelata palvelimella silti, mutta No Chat Reports ei voi suojella sinua.", + "gui.nochatreports.unsafe_server.check": "Älä näytä uudelleen tällä palvelimella", + "gui.nochatrepords.reload_config_tooltip": "Lataa uudelleen No Chat Reportsin asetustiedosto. Käytä harkiten." +} diff --git a/src/main/resources/assets/nochatreports/lang/it_it.json b/src/main/resources/assets/nochatreports/lang/it_it.json index 835fd78..56a6b93 100644 --- a/src/main/resources/assets/nochatreports/lang/it_it.json +++ b/src/main/resources/assets/nochatreports/lang/it_it.json @@ -2,12 +2,12 @@ "gui.nochatreport.secureChat": "Questa opzione non può funzionare con No Chat Reports, dal momento che non ci sono firme da verificare.", "gui.nochatreport.noReporting": "Le segnalazioni della chat sono state disabilitate su questo server grazie a No Chat Reports.", "disconnect.nochatreports.client": "Questo server non ha No Chat Reports e tu hai configurato No Chat Reports in modo che richieda di essere installato anche sul server.", - "gui.nochatreports.status_secure": "Questo server ha installato No Chat Reports o impedisce a tutti i messaggi di essere segnalati con qualche altro metodo noto. Nessuno vedrà una barra rossa o un simbolo (!) a lato dei messaggi, né sarà possibile nascondere i messaggi con l'opzione \"Mostra solo chat sicura\". Puoi messaggiare in sicurezza.", - "gui.nochatreports.status_unintrusive": "Questo server ti permette di inviare messaggi non firmati che non possono essere segnalati a Mojang. Tuttavia, per i client vanilla i tuoi messaggi appariranno con una barra rossa a sinistra e un simbolo (!) a destra. Inoltre, chiunque abbia l'opzione \"Mostra solo chat sicura\" attiva non potrà vedere i tuoi messaggi.", - "gui.nochatreports.status_insecure": "Questo server richiede che tutti i messaggi inviati da un giocatore siano firmati e tu hai acconsentito a continuare in queste circostanze. Qualunque cosa invierai in chat sarà una prova potenzialmente incriminante che potrà essere usata contro di te in una segnalazione. Se vuoi essere avvertito di nuovo, puoi rimuovere manualmente questo server da NoChatReports.json nella tua cartella config.", + "gui.nochatreports.status_secure": "Questo server ha installato No Chat Reports o impedisce ai tuoi messaggi di essere segnalati con qualche altro metodo noto. Puoi messaggiare in sicurezza.", + "gui.nochatreports.status_unintrusive": "Questo server ti permette di inviare messaggi non firmati che non possono essere segnalati a Mojang. I client vanilla invieranno comumque messaggi firmati, mostreranno i messaggi non firmati come \"Non sicuri\" e li nasconderanno se l'opzione \"Mostra solo chat sicura\" è attiva nelle opzioni della chat.", + "gui.nochatreports.status_insecure": "Questo server richiede che tutti i messaggi della chat siano firmati e tu hai acconsentito a continuare in queste circostanze. Qualunque cosa invierai in chat sarà una prova potenzialmente incriminante che potrà essere usata contro di te in una segnalazione. Se vuoi essere avvertito di nuovo, puoi rimuovere manualmente questo server da NoChatReports.json nella tua cartella config.", "gui.nochatreports.status_unknown": "No Chat Reports non è stato in grado di valutare la sicurezza di questo server. Ciò non dovrebbe mai accadere: ti preghiamo di segnalarlo come un bug allo sviluppatore della mod.", "gui.nochatreports.unsafe_server.header": "Attenzione: server non sicuro", - "gui.nochatreports.unsafe_server.contents": "Questo server richiede che tutti i messaggi della chat siano firmati, il che significa che possono essere segnalati a Mojang. Probabilmente questo significa che il proprietario del server ha lasciato 'enforce-secure-profile' attivo nel file server.properties (dalla 1.19.1 lo è per impostazione predefinita). Puoi decidere di giocarci comunque, ma No Chat Reports non sarà in grado di proteggerti.", + "gui.nochatreports.unsafe_server.contents": "Questo server richiede che tutti i messaggi della chat siano firmati, il che significa che possono essere segnalati a Mojang, il che può comportare un ban da tutti i server multigiocatore. Probabilmente questo significa che il proprietario del server ha lasciato l'opzione \"enforce-secure-profile\" attiva nel file server.properties (dalla 1.19.1 lo è per impostazione predefinita). Puoi decidere di giocarci comunque, ma No Chat Reports non sarà in grado di proteggerti.", "gui.nochatreports.unsafe_server.check": "Non mostrare di nuovo per questo server", "gui.nochatrepords.reload_config_tooltip": "Ricarica file di configurazione di No Chat Reports. Da usare con cautela." } diff --git a/src/main/resources/assets/nochatreports/lang/pl_pl.json b/src/main/resources/assets/nochatreports/lang/pl_pl.json index 42dd7f3..bf1199c 100644 --- a/src/main/resources/assets/nochatreports/lang/pl_pl.json +++ b/src/main/resources/assets/nochatreports/lang/pl_pl.json @@ -2,9 +2,10 @@ "gui.nochatreport.secureChat": "Ta opcja nie działa z No Chat Reports, ponieważ nie ma podpisów do weryfikacji.", "gui.nochatreport.noReporting": "Raporty czatu są wyłączone na tym serwerze, dzięki No Chat Reports.", "disconnect.nochatreports.client": "Na tym serwerze nie ma No Chat Reports, a został skonfigurowany tak, aby był wymagany na serwerze." - "gui.nochatreports.status_secure": "Ten serwer ma zainstalowane No Chat Reports lub uniemożliwia raportowanie wiadomości w inny znany sposób. Nikt nie będzie widzieć czerwonego paska czy symbolu (!) lub może wyłączyć wiadomości przez opcję \"Tylko bezpieczny czat\". Możesz bezpiecznie chatować.", - "gui.nochatreports.status_unintrusive": "Ten serwer pozwala na wysyłanie nie podpisanych wiadomości, których nie można zgłosić do Mojangu. Jednakże u klientów Vanilla wiadomości będą mieć czerwony pasek po lewej i symbol (!) po prawej, a włączenie opcji \"Tylko bezpieczny czat\" przez kogokolwiek nie pokaże im twoich wiadomości w ogóle.", + "gui.nochatreports.status_secure": "Ten serwer ma zainstalowane No Chat Reports lub uniemożliwia raportowanie wiadomości w inny znany sposób. Możesz bezpiecznie chatować.", + "gui.nochatreports.status_unintrusive": "Ten serwer pozwala na wysyłanie nie podpisanych wiadomości, których nie można zgłosić do Mojangu. Klienci Vanilla dalej będą wysyłać podpisane wiadomości, pokazywać nie podpisane jako \"Nie zabezpieczone\" i nie pokaże ich przy włączonej opcji \"Tylko bezpieczny czat\".", "gui.nochatreports.status_insecure": "Ten serwer wymaga podpisania wszystkich wiadomości graczy, a ty zgodziłeś się kontynuować z tym. Wszystko, co wysyłasz na czacie, jest potencjalnie obciążającym dowodem, który można wykorzystać przeciwko tobie w zgłoszeniu. Możesz ręcznie usunąć ten serwer z NoChatReports.json w folderze konfiguracyjnym, aby ponownie otrzymać ostrzeżenie.", + "gui.nochatreports.status_insecure_whitelist_all_servers": "Ten serwer wymaga podpisania wszystkich wiadomości graczy, a ty wyłączyłeś pełno ekranowe ostrzeżenie o tym. Wszystko, co wysyłasz na czacie, jest potencjalnie obciążającym dowodem, który można wykorzystać przeciwko tobie w zgłoszeniu. Możesz wyłączyć \"whitelistAllServers\" w NoChatReports.json w folderze konfiguracyjnym, aby ponownie otrzymać ostrzeżenie.", "gui.nochatreports.status_unknown": "No Chat Reports nie może ocenić bezpieczeństwa tego serwera. To nigdy nie powinno się zdarzyć, zgłoś to jako błąd twórcy modów.", "gui.nochatreports.unsafe_server.header": "Uwaga: Niezabezpieczony serwer", "gui.nochatreports.unsafe_server.contents": "Ten serwer wymaga podpisania wszystkich wiadomości czatu, co oznacza, że można je zgłaszać do Mojang. Prawdopodobnie oznacza to, że właściciel serwera pozostawił włączony „enforce-secure-profile” w server.properties, co jest ustawieniem domyślnym od 1.19.1. Pomimo to możesz dalej zagrać, ale No Chat Reports nie będzie w stanie Cię ochronić.", diff --git a/src/main/resources/assets/nochatreports/lang/sk_sk.json b/src/main/resources/assets/nochatreports/lang/sk_sk.json new file mode 100644 index 0000000..ce20262 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/sk_sk.json @@ -0,0 +1,14 @@ +{ + "gui.nochatreport.secureChat": "Táto možnosť nemôže fungovať s No Chat Reports keďže nie sú podpisy na overenie.", + "gui.nochatreport.noReporting": "Nahlasovanie chatu je zakázané na tomto serveru vďaka No Chat Reports.", + "disconnect.nochatreports.client": "Tento server nemá No Chat Reports a nepovolil si pripájanie na takéto servery.", + "gui.nochatreports.status_secure": "Tento server má No Chat Reports nainštalované alebo zakazuje nahlasovanie chatu iným známym spôsobom. Môžeš chatovať bezpečne.", + "gui.nochatreports.status_unintrusive": "Tento server nezakazuje nahlasovanie správ ale povoľuje odosielanie správ bez podpisu, ktoré nemôžu byť použité ako dôkaz pre Mojang. Vanilla klienti stále budú odosielať podpisy a riskujú zákaz. Budú tiež vidieť varovania nepodpísaných správ alebo ich nebudú vidieť vôbec ak majú zapnuté \"Len zabezpečený chat\".", + "gui.nochatreports.status_insecure": "Tento server požaduje aby boli všetky správy podpísané a vy ste súhlasili s týmto nastavením. Všetko, čo napíšeš, môže byť použité proti tebe. Toto varovanie sa už nezobrazí pokým si manuálne neodstrániš adresu servera z NoChatReports.json v tvojom priečinku config.", + "gui.nochatreports.status_insecure_whitelist_all_servers": "Tento server požaduje aby boli všetky správy podpísané. Všetko, čo napíšeš, môže byť použité proti tebe. Pre zobrazenie varovania na celej obrazovke môžeš vypnúť \"whitelistAllServers\" z NoChatReports.json v tvojom priečinku config.", + "gui.nochatreports.status_unknown": "No Chat Reports nevie zistiť bezpečnosť tohto servera. Toto by sa nikdy nemalo stať, prosím nahlás to ako chybu vývojárovi módu.", + "gui.nochatreports.unsafe_server.header": "Pozor: nezabezpečený server", + "gui.nochatreports.unsafe_server.contents": "Tento server požaduje aby boli všetky správy podpísané, a teda nahlásené Mojangu. Toto znamená, že správca servera ponechal možnosť \"enforce-secure-profile\" zapnutú v server.properties. Je to tak predvolené vo verzii 1.19.1. Môžeš stále hrať ale No Chat Reports ťa nebude môcť chrániť.", + "gui.nochatreports.unsafe_server.check": "Už nikdy nezobrazovať pre tento server", + "gui.nochatrepords.reload_config_tooltip": "Znovu načítať nastavenia No Chat Reports. Používaj opatrne." +} diff --git a/src/main/resources/assets/nochatreports/lang/tr_tr.json b/src/main/resources/assets/nochatreports/lang/tr_tr.json index 2400d2a..da9bd37 100644 --- a/src/main/resources/assets/nochatreports/lang/tr_tr.json +++ b/src/main/resources/assets/nochatreports/lang/tr_tr.json @@ -2,12 +2,13 @@ "gui.nochatreport.secureChat": "Bu seçenek doğrulanacak imza olmadığından No Chat Reports ile çalışamaz.", "gui.nochatreport.noReporting": "No Chat Reports sayesinde bu sunucuda sohbet bildirileri devre dışı bırakıldı.", "disconnect.nochatreports.client": "Bu sunucuda No Chat Reports yok ve siz kendisini bu sunucuda gerektirecek şekilde ayarladınız.", - "gui.nochatreports.status_secure": "Bu sunucuda No Chat Reports yüklü ya da herkesin mesajlarının bilinen başka bir şekilde bildirilebilmesini engelliyor. Kimse kırmızı çubuk, (!) sembolü göremeyecek ya da \"Sadece Güvenli Sohbeti Göster\" ile mesajları gizleyemeyecek. Güvenli bir şekilde sohbet edebilirsiniz.", - "gui.nochatreports.status_unintrusive": "Bu sunucu, Mojang'a bildirilemeyen imzasız mesaj göndermenize izin veriyor. Ancak, vanilya istemcileri için mesajlar solda kırmızı bir çubuk, sağda (!) sembolü gösterecek ve \"Sadece Güvenli Sohbeti Göster\" seçeneğini etkinleştiren hiç kimse mesajlarınızı göremez.", - "gui.nochatreports.status_insecure": "Bu sunucu tüm oyuncu mesajlarının imzalanmasını talep ediyor ve siz de bu düzenlemeye uymayı kabul ettiniz. Sohbette gönderdiğiniz her şey, raporda aleyhinize kullanılabilecek potansiyel olarak suçlayıcı kanıtlardır. Yeniden uyarılmak için bu sunucuyu yapılandırma klasöründeki NoChatReports.json'dan manuel olarak kaldırabilirsiniz.", + "gui.nochatreports.status_secure": "Bu sunucuda No Chat Reports yüklü ya da mesajlarınızın bilinen başka bir şekilde bildirilebilmesini engelliyor. Güvenli bir şekilde sohbet edebilirsiniz.", + "gui.nochatreports.status_unintrusive": "Bu sunucu sohbet bildirilerini engellemez, ancak Mojang'a bildirilemeyen imzasız mesajlar göndermenize izin verir. Vanilya istemcileri imzalı mesajlar göndermeye devam edecek, imzasız mesajları \"Güvenli Değil\" olarak gösterecek ve sohbet seçeneklerinde \"Sadece Güvenli Sohbeti Göster\" etkinleştirilmişse bunları göstermeyecektir.", + "gui.nochatreports.status_insecure": "Bu sunucu tüm sohbet mesajlarının imzalanmasını talep ediyor ve siz de bu düzenlemeye uymayı kabul ettiniz. Sohbette gönderdiğiniz her şey, raporda aleyhinize kullanılabilecek potansiyel olarak suçlayıcı kanıtlardır. Yeniden uyarılmak için bu sunucuyu yapılandırma klasöründeki NoChatReports.json'dan manuel olarak kaldırabilirsiniz.", + "gui.nochatreports.status_insecure_whitelist_all_servers": "Bu sunucu, tüm sohbet mesajlarının imzalanmasını talep ediyor ve bu yüzden tam ekran uyarısını devre dışı bıraktınız. Sohbette gönderdiğiniz her şey, raporda aleyhinize kullanılabilecek potansiyel olarak suçlayıcı kanıtlardır. Yeniden uyarılmak için yapılandırma klasörünüzdeki NoChatReports.json'dan \"whitelistAllServers\" öğesini devre dışı bırakabilirsiniz.", "gui.nochatreports.status_unknown": "No Chat Reports bu sunucunun güvenliğini değerlendiremedi. Bu asla olmamalıydı, lütfen mod geliştiricisine bu hatayı bildirin.", "gui.nochatreports.unsafe_server.header": "Dikkat: Güvensiz Sunucu", - "gui.nochatreports.unsafe_server.contents": "Bu sunucu, tüm sohbet mesajlarının imzalanmasını gerektiriyor; bu, Mojang'a bildirilecekleri anlamına gelir. Bu muhtemelen sunucu sahibinin 1.19.1'den beri varsayılan olan server.properties'teki 'enforce-secure-profile' özelliğini etkin tuttuğu anlamına gelir. Yine de oynamayı deneyebilirsiniz, ancak No Chat Reports sizi koruyamaz.", + "gui.nochatreports.unsafe_server.contents": "Bu sunucu, tüm sohbet mesajlarının imzalanmasını gerektiriyor; bu, Mojang'a bildirilebilecekleri anlamına gelir; bu, tüm çok oyunculu sunuculardan yasaklanmayla sonuçlanabilir. Bu muhtemelen sunucu sahibinin 1.19.1'den beri varsayılan olan server.properties'teki \"enforce-secure-profile\" özelliğini etkin tuttuğu anlamına gelir. Yine de oynamayı deneyebilirsiniz, ancak No Chat Reports sizi koruyamaz.", "gui.nochatreports.unsafe_server.check": "Bu sunucu için asla gösterme", "gui.nochatrepords.reload_config_tooltip": "No Chat Reports'un yapılandırma klasörünü yenile. Dikkatli kullanın." } diff --git a/src/main/resources/assets/nochatreports/lang/zh_cn.json b/src/main/resources/assets/nochatreports/lang/zh_cn.json index c986469..465c606 100644 --- a/src/main/resources/assets/nochatreports/lang/zh_cn.json +++ b/src/main/resources/assets/nochatreports/lang/zh_cn.json @@ -5,6 +5,7 @@ "gui.nochatreports.status_secure": "此服务器安装了 No Chat Reports 或其他已知的方法避免消息被举报。这也会避免 \"仅显示安全的聊天\" 挡你的消息。你可以安全地聊天。", "gui.nochatreports.status_unintrusive": "此服务器不能防止聊天举报,但允许发送未签名的消息。这意味着你发的消息不能被举报给 Mojang,但其他人还可以用 \"仅显示安全的聊天\" 挡你的消息", "gui.nochatreports.status_insecure": "此服务器要求所有玩家的消息签名,你也同意在这设置下继续游戏。你所发送的任何消息都可能成为你被举报时潜在的违规证据。你可以在 NoChatReports.json 中手动移除此服务器,以再次获得相同的警告。", + "gui.nochatreports.status_insecure_whitelist_all_servers": "此服务器要求对所有聊天消息进行签名,并且你为其禁用了全屏警告。 你在聊天中发送的所有内容都可能是有罪的证据,可以在报告中用于对你不利。 你可以从配置文件夹中的 NoChatReports.json 禁用 \"whitelistAllServers\" 以再次收到警告。", "gui.nochatreports.status_unknown": "No Chat Reports 无法检测此服务器的安全性。这不应该发生,请将此错误反馈给模组作者。", "gui.nochatreports.unsafe_server.header": "警告:不安全的服务器", "gui.nochatreports.unsafe_server.contents": "此服务器要求所有消息签名,这意味着它们可以被举报给 Mojang。可能是服务器默认开启了 'enforce-secure-profile' 选项。你可以选择继续游玩,但 No Chat Reports 不能提供任何保护。", diff --git a/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons.png b/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons.png Binary files differindex a91f7d2..f3c48b3 100644 --- a/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons.png +++ b/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons.png diff --git a/src/main/resources/assets/nochatreports/textures/gui/config_reload_button.png b/src/main/resources/assets/nochatreports/textures/gui/config_reload_button.png Binary files differindex efe48d1..a741434 100644 --- a/src/main/resources/assets/nochatreports/textures/gui/config_reload_button.png +++ b/src/main/resources/assets/nochatreports/textures/gui/config_reload_button.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c5c0449..71989d3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -36,7 +36,7 @@ "fabric-screen-api-v1": "*", "fabric-rendering-v1": "*", "fabric-resource-loader-v0": "*", - "minecraft": "=1.19.1", + "minecraft": "=1.19.2", "java": ">=17" }, "suggests": {}, diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index 4e0f080..10f0fd2 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -18,8 +18,6 @@ "client.MixinChatOptionsScreen", "client.MixinProfileKeyPairManager", "client.MixinClientTelemetryManager", - "client.MixinTitleScreen", - "client.MixinMinecraft", "client.MixinPlayerEntry", "client.MixinChatScreen", "client.AccessorDisconnectedScreen", |
