From b3c30502160135a9f3f7482724c786301bfcf64c Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 2 Jan 2023 00:52:27 +0100 Subject: Restore parity with Fabric branch Target version 1.19.3-v1.19.0, commit: https://github.com/Aizistral-Studios/No-Chat-Reports/commit/6d61f99a1547eab58e88dcea7e3901511f0929d2 --- .../com/aizistral/nochatreports/NoChatReports.java | 62 +----- .../nochatreports/NoChatReportsClient.java | 142 ++++-------- .../aizistral/nochatreports/config/JSONConfig.java | 43 ++-- .../aizistral/nochatreports/config/NCRConfig.java | 24 +-- .../nochatreports/config/NCRConfigClient.java | 94 +++----- .../nochatreports/config/NCRConfigCommon.java | 9 +- .../nochatreports/config/NCRConfigEncryption.java | 14 +- .../nochatreports/config/NCRServerPreferences.java | 72 +++++++ .../nochatreports/config/NCRServerWhitelist.java | 49 ----- .../nochatreports/config/ServerAddressAdapter.java | 35 +++ .../nochatreports/core/EncryptionUtil.java | 7 +- .../nochatreports/core/ServerDataExtension.java | 3 + .../nochatreports/core/ServerSafetyLevel.java | 23 +- .../nochatreports/core/ServerSafetyState.java | 118 +++++----- .../aizistral/nochatreports/core/SigningMode.java | 105 +++++++++ .../encryption/AESCFB8Encryption.java | 15 -- .../nochatreports/encryption/AESCFB8Encryptor.java | 24 +-- .../nochatreports/encryption/AESECBEncryptor.java | 10 +- .../nochatreports/encryption/AESEncryption.java | 16 +- .../nochatreports/encryption/AESEncryptor.java | 24 +-- .../nochatreports/encryption/AESGCMEncryptor.java | 10 +- .../nochatreports/encryption/CaesarEncryptor.java | 4 - .../nochatreports/encryption/Encryption.java | 1 - .../nochatreports/encryption/Encryptor.java | 14 +- .../nochatreports/gui/AdaptiveWarningScreen.java | 83 ++++++++ .../nochatreports/gui/AdvancedImageButton.java | 40 ++++ .../nochatreports/gui/AdvancedTooltip.java | 177 +++++++++++++++ .../nochatreports/gui/AwaitConnectionScreen.java | 82 ------- .../nochatreports/gui/EncryptionButton.java | 11 +- .../nochatreports/gui/EncryptionConfigScreen.java | 86 +++----- .../nochatreports/gui/EncryptionWarningScreen.java | 20 +- .../nochatreports/gui/ExtendedWarningScreen.java | 97 --------- .../aizistral/nochatreports/gui/FontHelper.java | 1 - .../nochatreports/gui/InvisibleButton.java | 23 ++ .../nochatreports/gui/RealmsWarningScreen.java | 11 +- .../nochatreports/gui/TriageWarningScreen.java | 48 +++++ .../nochatreports/gui/UnsafeServerScreen.java | 76 +++---- .../mixins/client/AccessorDisconnectedScreen.java | 25 --- .../mixins/client/MixinChatComponent.java | 22 +- .../mixins/client/MixinChatListener.java | 97 ++++++--- .../mixins/client/MixinChatOptionsScreen.java | 55 ++--- .../mixins/client/MixinChatScreen.java | 237 +++++++++++---------- .../mixins/client/MixinClientPacketListener.java | 39 ++++ .../mixins/client/MixinClientTelemetryManager.java | 33 --- .../mixins/client/MixinClientboundHelloPacket.java | 33 --- .../mixins/client/MixinConnectScreen.java | 31 +-- .../mixins/client/MixinGuiMessageTag.java | 13 +- .../mixins/client/MixinGuiMessageTagIcon.java | 2 +- .../mixins/client/MixinJoinMultiplayerScreen.java | 105 ++------- .../mixins/client/MixinLocalPlayer.java | 57 ----- .../mixins/client/MixinMinecraft.java | 48 +++++ .../mixins/client/MixinOnlineServerEntry.java | 25 +-- .../nochatreports/mixins/client/MixinOptions.java | 10 +- .../mixins/client/MixinPlayerEntry.java | 40 +--- .../mixins/client/MixinProfileKeyPairManager.java | 89 -------- .../mixins/client/MixinRealmsConnect.java | 4 +- .../mixins/client/MixinRowHelper.java | 30 +++ .../mixins/client/MixinServerStatusPinger$1.java | 33 +-- .../mixins/client/MixinTitleScreen.java | 11 +- .../client/MixinYggdrasilUserApiService.java | 33 +++ .../mixins/common/MixinServerStatus.java | 6 + .../nochatreports/mixins/server/MixinPlayer.java | 25 --- .../mixins/server/MixinPlayerList.java | 3 +- .../server/MixinServerGamePacketListenerImpl.java | 19 +- .../mixins/server/MixinServerboundChatPacket.java | 2 +- .../MixinServerboundChatSessionUpdatePacket.java | 36 ++++ .../resources/assets/nochatreports/lang/ca_es.json | 12 +- .../resources/assets/nochatreports/lang/cs_cz.json | 12 +- .../resources/assets/nochatreports/lang/da_dk.json | 14 +- .../resources/assets/nochatreports/lang/de_de.json | 12 +- .../resources/assets/nochatreports/lang/en_pt.json | 14 +- .../resources/assets/nochatreports/lang/en_us.json | 121 ++++++----- .../resources/assets/nochatreports/lang/es_es.json | 14 +- .../resources/assets/nochatreports/lang/et_ee.json | 123 ++++++----- .../resources/assets/nochatreports/lang/fi_fi.json | 140 +++++++++++- .../resources/assets/nochatreports/lang/fr_fr.json | 12 +- .../resources/assets/nochatreports/lang/id_id.json | 12 +- .../resources/assets/nochatreports/lang/it_it.json | 16 +- .../resources/assets/nochatreports/lang/ko_kr.json | 14 +- .../resources/assets/nochatreports/lang/nl_nl.json | 12 +- .../resources/assets/nochatreports/lang/pl_pl.json | 94 +++++--- .../resources/assets/nochatreports/lang/pt_br.json | 16 +- .../resources/assets/nochatreports/lang/ro_ro.json | 12 +- .../resources/assets/nochatreports/lang/ru_ru.json | 14 +- .../resources/assets/nochatreports/lang/sk_sk.json | 14 +- .../resources/assets/nochatreports/lang/th_th.json | 16 +- .../resources/assets/nochatreports/lang/tr_tr.json | 14 +- .../resources/assets/nochatreports/lang/uk_ua.json | 12 +- .../resources/assets/nochatreports/lang/zh_cn.json | 163 ++++++++++---- .../resources/assets/nochatreports/lang/zh_tw.json | 12 +- .../textures/gui/chat_status_icons_extended.png | Bin 2329 -> 2331 bytes .../textures/gui/report_server_button.png | Bin 0 -> 900 bytes src/main/resources/nochatreports.mixins.json | 17 +- 93 files changed, 1918 insertions(+), 1830 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java delete mode 100644 src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java create mode 100644 src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java create mode 100644 src/main/java/com/aizistral/nochatreports/core/SigningMode.java create mode 100644 src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java create mode 100644 src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java delete mode 100644 src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java delete mode 100644 src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java create mode 100644 src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java create mode 100644 src/main/resources/assets/nochatreports/textures/gui/report_server_button.png (limited to 'src') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index 1d5f054..46d9a2e 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -29,75 +29,15 @@ import net.minecraftforge.network.event.EventNetworkChannel; import net.minecraftforge.network.simple.SimpleChannel; import net.minecraftforge.server.ServerLifecycleHooks; -@Mod(NoChatReports.MODID) +@Mod("nochatreports") public class NoChatReports { - public static final String MODID = "nochatreports"; public static final Logger LOGGER = LogManager.getLogger(); - private static final String PTC_VERSION = "1"; - private static final Predicate ANY = obj -> true; - private static SimpleChannel channel; - private static boolean detectedOnClient = false, detectedOnServer = false; public NoChatReports() { LOGGER.info("KONNICHIWA ZA WARUDO!"); LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onLoadComplete); - - MinecraftForge.EVENT_BUS.register(this); NCRConfig.load(); } - private void onLoadComplete(FMLLoadCompleteEvent event) { - // NO-OP - } - - private void setup(FMLCommonSetupEvent event) { - channel = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(MODID, "main")) - .networkProtocolVersion(() -> PTC_VERSION) - .clientAcceptedVersions(version -> { - if (!NCRConfig.getClient().enableMod()) - return true; - - detectedOnServer = !isAbsentOrVanilla(version); - return NCRConfig.getClient().demandOnServer() ? PTC_VERSION.equals(version) : true; - }) - .serverAcceptedVersions(version -> { - if (ServerLifecycleHooks.getCurrentServer().isSingleplayer()) - return true; - - detectedOnClient = !isAbsentOrVanilla(version); - return NCRConfig.getCommon().demandOnClient() ? PTC_VERSION.equals(version) : true; - }) - .simpleChannel(); - } - - private void doClientStuff(FMLClientSetupEvent event) { - // NO-OP - } - - private void enqueueIMC(InterModEnqueueEvent event) { - // NO-OP - } - - private void processIMC(InterModProcessEvent event) { - // NO-OP - } - - private static boolean isAbsentOrVanilla(String protocol) { - return NetworkRegistry.ABSENT.equals(protocol) || NetworkRegistry.ACCEPTVANILLA.equals(protocol); - } - - public static boolean isDetectedOnClient() { - return detectedOnClient; - } - - public static boolean isDetectedOnServer() { - return detectedOnServer; - } - } diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 27cdb64..40da754 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -6,18 +6,19 @@ 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.AwaitConnectionScreen; +import com.aizistral.nochatreports.core.SigningMode; import com.aizistral.nochatreports.gui.UnsafeServerScreen; -import com.aizistral.nochatreports.mixins.client.AccessorDisconnectedScreen; import com.google.common.collect.ImmutableList; import net.minecraft.Util; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ChatScreen; import net.minecraft.client.gui.screens.ConnectScreen; import net.minecraft.client.gui.screens.DisconnectedScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; +import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.contents.TranslatableContents; @@ -30,91 +31,14 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; -@EventBusSubscriber(modid = NoChatReports.MODID, bus = Bus.FORGE) +@EventBusSubscriber(modid = "nochatreports", bus = Bus.FORGE) public class NoChatReportsClient { - private static final List KEY_DISCONNECT_REASONS = ImmutableList.of( - "multiplayer.disconnect.missing_public_key", - "multiplayer.disconnect.invalid_public_key_signature", - "multiplayer.disconnect.invalid_public_key" - ); - private static final List STRING_DISCONNECT_REASONS = ImmutableList.of( - "A secure profile is required to join this server.", - "Secure profile expired.", - "Secure profile invalid." - ); - private static final Component CONNECT_FAILED_NCR = Component.translatable("connect.failed"); - private static boolean screenOverride = false; + private static boolean signingKeysPresent = false; private NoChatReportsClient() { throw new IllegalStateException("Can't touch this"); } - @SubscribeEvent - @OnlyIn(Dist.CLIENT) - public static void onScreenInit(ScreenEvent.Init.Post event) { - Minecraft client = Minecraft.getInstance(); - Screen screen = event.getScreen(); - - if (!NCRConfig.getClient().enableMod()) - return; - - if (screen instanceof AccessorDisconnectedScreen dsc) { - if (screenOverride || ServerSafetyState.isOnServer() || screen.getTitle() == CONNECT_FAILED_NCR) - return; - - screenOverride = true; - var disconnectReason = dsc.getReason(); - - if (disconnectReason != null) { - if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Disconnected with reason {}, reconnect count: {}", - Component.Serializer.toStableJson(disconnectReason), ServerSafetyState.getReconnectCount()); - } - - if (ServerSafetyState.allowsUnsafeServer()) { - screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()), - CONNECT_FAILED_NCR, dsc.getReason()); - client.setScreen(screen); - screenOverride = false; - return; - } else if (STRING_DISCONNECT_REASONS.contains(disconnectReason.getString()) - || (disconnectReason.getContents() instanceof TranslatableContents translatable && - KEY_DISCONNECT_REASONS.contains(translatable.getKey()))) { - if (ServerSafetyState.getLastServerAddress() != null) { - if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress())) { - if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Server {} evaluated as unsafe and is not whitelisted, displaying warning screen.", - ServerSafetyState.getLastServerAddress().getHost() + ":" + ServerSafetyState.getLastServerAddress().getPort()); - } - - client.setScreen(new UnsafeServerScreen()); - } else { - NCRConfig.getClient().updateSigningCheck(ServerSafetyState.getLastServerAddress()); - - if (ServerSafetyState.getReconnectCount() <= 0) { - ServerSafetyState.setAllowsUnsafeServer(true); - client.setScreen(new AwaitConnectionScreen(new JoinMultiplayerScreen(new TitleScreen()))); - screenOverride = false; - return; - } else { - ServerSafetyState.setReconnectCount(0); - screenOverride = false; - return; - } - } - } - } - } - screenOverride = false; - } else if (screen instanceof JoinMultiplayerScreen) { - if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Initialized JoinMultiplayerScreen screen, resetting safety state!"); - } - - ServerSafetyState.reset(); - } - } - @OnlyIn(Dist.CLIENT) public static void onDisconnect(Minecraft client) { if (!NCRConfig.getClient().enableMod()) @@ -125,51 +49,65 @@ public class NoChatReportsClient { } ServerSafetyState.reset(); - ServerSafetyState.setDisconnectMillis(Util.getMillis()); } @SubscribeEvent @OnlyIn(Dist.CLIENT) public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) { Minecraft client = Minecraft.getInstance(); + ClientPacketListener handler = client.getConnection(); if (!NCRConfig.getClient().enableMod()) return; client.execute(() -> { - ServerSafetyState.setReconnectCount(0); - ServerSafetyState.setOnServer(true); - if (!client.isLocalServer()) { - boolean canSend = NoChatReports.isDetectedOnServer(); - - if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) { + if (ServerSafetyState.isOnRealms()) { // NO-OP - } else if (canSend) { + } else if (!handler.getConnection().isEncrypted()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + } else if (client.getCurrentServer() instanceof ServerDataExtension ext && + ext.preventsChatReports()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); - } else if (ServerSafetyState.forceSignedMessages()) { + } else if (NCRConfig.getServerPreferences().hasMode(ServerSafetyState.getLastServer(), + SigningMode.ALWAYS)) { ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); + ServerSafetyState.setAllowChatSigning(true); } else { - if (ServerSafetyState.getLastServerData() instanceof ServerDataExtension ext - && ext.preventsChatReports()) { - ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); - } else { - ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); - } + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); } + } else { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SINGLEPLAYER); } if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}, reconnect count reset.", ServerSafetyState.getCurrent()); + NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent()); + } + + if (NCRConfig.getClient().demandOnServer() && !ServerSafetyState.getCurrent().isSecure()) { + handler.getConnection().disconnect(Component.translatable("disconnect.nochatreports.client")); } }); } - @OnlyIn(Dist.CLIENT) - public static void reconnectLastServer() { - ServerSafetyState.setReconnectCount(ServerSafetyState.getReconnectCount() + 1); - ConnectScreen.startConnecting(new JoinMultiplayerScreen(new TitleScreen()), Minecraft.getInstance(), - ServerSafetyState.getLastServerAddress(), ServerSafetyState.getLastServerData()); + public static boolean areSigningKeysPresent() { + return signingKeysPresent; + } + + public static void setSigningKeysPresent(boolean present) { + signingKeysPresent = present; + } + + public static void resendLastChatMessage() { + var mc = Minecraft.getInstance(); + var chatScr = mc.screen instanceof ChatScreen chat ? chat : null; + + if (chatScr == null) { + chatScr = new ChatScreen(""); + chatScr.init(mc, mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight()); + } + + chatScr.handleChatInput(NCRConfig.getEncryption().getLastMessage(), false); } diff --git a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java index e92a067..2556966 100644 --- a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java @@ -13,23 +13,16 @@ import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; +import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.fml.loading.FMLPaths; public abstract class JSONConfig { protected static final Path CONFIG_DIR = FMLPaths.CONFIGDIR.get(); - protected static final Gson GSON = new GsonBuilder().setPrettyPrinting() - .setExclusionStrategies(new ExclusionStrategy() { - @Override - public boolean shouldSkipField(FieldAttributes field) { - return field.getDeclaringClass() == JSONConfig.class; - } - - @Override - public boolean shouldSkipClass(Class theClass) { - return false; - } - }).create(); + protected static final Gson GSON = createGson(); protected final String fileName; protected final Path filePath; @@ -69,8 +62,10 @@ public abstract class JSONConfig { try (BufferedReader reader = Files.newBufferedReader(file)) { return Optional.of(GSON.fromJson(reader, configClass)); - } catch (IOException ex) { + } catch (Exception ex) { NoChatReports.LOGGER.fatal("Could not read config file: {}", file); + NoChatReports.LOGGER.fatal("This likely indicates the file is corrupted. " + + "You can try deleting it to fix this problem. Full stacktrace below:"); ex.printStackTrace(); return null; } @@ -90,4 +85,26 @@ public abstract class JSONConfig { } } + private static Gson createGson() { + GsonBuilder builder = new GsonBuilder(); + builder.setPrettyPrinting(); + builder.setExclusionStrategies(new ExclusionStrategy() { + @Override + public boolean shouldSkipField(FieldAttributes field) { + return field.getDeclaringClass() == JSONConfig.class; + } + + @Override + public boolean shouldSkipClass(Class theClass) { + return false; + } + }); + + if (FMLEnvironment.dist == Dist.CLIENT) { + builder.registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE); + } + + return builder.create(); + } + } diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java index e87421d..f9df833 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java @@ -1,24 +1,20 @@ package com.aizistral.nochatreports.config; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Objects; -import java.util.function.Supplier; - -import javax.annotation.Nullable; - import com.aizistral.nochatreports.NoChatReports; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.loading.FMLEnvironment; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.function.Supplier; + public final class NCRConfig { private static NCRConfigCommon common = null; private static NCRConfigClient client = null; - private static NCRServerWhitelist whitelist = null; + private static NCRServerPreferences serverPreferences = null; private static NCRConfigEncryption encryption = null; private NCRConfig() { @@ -35,8 +31,8 @@ public final class NCRConfig { } @OnlyIn(Dist.CLIENT) - public static NCRServerWhitelist getServerWhitelist() { - return checkLoaded(() -> whitelist); + public static NCRServerPreferences getServerPreferences() { + return checkLoaded(() -> serverPreferences); } @OnlyIn(Dist.CLIENT) @@ -57,7 +53,7 @@ public final class NCRConfig { if (FMLEnvironment.dist == Dist.CLIENT) { client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME); - whitelist = JSONConfig.loadConfig(NCRServerWhitelist.class, NCRServerWhitelist::new, NCRServerWhitelist.FILE_NAME); + serverPreferences = JSONConfig.loadConfig(NCRServerPreferences.class, NCRServerPreferences::new, NCRServerPreferences.FILE_NAME); encryption = JSONConfig.loadConfig(NCRConfigEncryption.class, NCRConfigEncryption::new, NCRConfigEncryption.FILE_NAME); } @@ -69,7 +65,7 @@ public final class NCRConfig { if (FMLEnvironment.dist == Dist.CLIENT) { checkLoaded(() -> client).saveFile(); - checkLoaded(() -> whitelist).saveFile(); + checkLoaded(() -> serverPreferences).saveFile(); checkLoaded(() -> encryption).saveFile(); } diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java index 9c4414c..6054f7e 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java @@ -1,34 +1,21 @@ package com.aizistral.nochatreports.config; -import java.security.InvalidKeyException; -import java.time.Instant; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import com.aizistral.nochatreports.core.ServerSafetyLevel; -import com.aizistral.nochatreports.encryption.AESCFB8Encryptor; -import com.aizistral.nochatreports.encryption.Encryptor; -import com.aizistral.nochatreports.gui.UnsafeServerScreen; - -import net.minecraft.Util; -import net.minecraft.client.multiplayer.resolver.ServerAddress; -import net.minecraft.util.StringUtil; +import com.aizistral.nochatreports.core.SigningMode; +import com.aizistral.nochatreports.mixins.client.MixinChatListener; +import com.aizistral.nochatreports.mixins.client.MixinToastComponent; public final class NCRConfigClient extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Client.json"; - protected boolean demandOnServer = false, showServerSafety = true, hideRedChatIndicators = true, - hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, - alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, - whitelistAllServers = false, verifiedIconEnabled = true, showNCRButton = true, - enableMod = true, skipRealmsWarning = false; - protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0, reconnectAwaitSeconds = 4, - postDisconnectAwaitSeconds = 10, signingCheckDelaySeconds = 43200; - - protected Map serverSigningChecks = new HashMap<>(); + protected SigningMode defaultSigningMode = SigningMode.PROMPT; + protected boolean enableMod = true, showNCRButton = true, showReloadButton = true, + verifiedIconEnabled = true, showServerSafety = true, hideInsecureMessageIndicators = true, + hideModifiedMessageIndicators = true, hideSystemMessageIndicators = true, + hideWarningToast = true, hideSigningRequestMessage = false, alwaysHideReportButton = false, + skipRealmsWarning = false, disableTelemetry = true, removeTelemetryButton = true, + demandOnServer = false; + protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0; protected NCRConfigClient() { super(FILE_NAME); @@ -76,8 +63,8 @@ public final class NCRConfigClient extends JSONConfig { * @see MixinChatListener#onEvaluateTrustLevel */ - public boolean hideRedChatIndicators() { - return this.hideRedChatIndicators; + public boolean hideInsecureMessageIndicators() { + return this.hideInsecureMessageIndicators; } /** @@ -88,8 +75,8 @@ public final class NCRConfigClient extends JSONConfig { * @see MixinChatListener#onEvaluateTrustLevel */ - public boolean hideYellowChatIndicators() { - return this.hideYellowChatIndicators; + public boolean hideModifiedMessageIndicators() { + return this.hideModifiedMessageIndicators; } /** @@ -100,8 +87,8 @@ public final class NCRConfigClient extends JSONConfig { * @see com.aizistral.nochatreports.mixins.client.MixinGuiMessageTag#onSystem */ - public boolean hideGrayChatIndicators() { - return this.hideGrayChatIndicators; + public boolean hideSystemMessageIndicators() { + return this.hideSystemMessageIndicators; } /** @@ -148,18 +135,6 @@ public final class NCRConfigClient extends JSONConfig { return this.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.

- * - * This is false by default. - */ - - public boolean whitelistAllServers() { - return this.whitelistAllServers; - } - /** * @return True if "Safe Server" icon should be displayed in multiplayer menu for servers that * declare themselves as preventing chat reports.

@@ -205,24 +180,6 @@ public final class NCRConfigClient extends JSONConfig { return this.enableMod; } - /** - * @return How many seconds No Chat Reports should wait before attemting automatic reconnects. - * @see Issue #190 - */ - - public int getReconnectAwaitSeconds() { - return this.reconnectAwaitSeconds; - } - - /** - * @return Same as reconnectAwaitSeconds, but countdown starts when user disconnects - * from server. If this delay is greater than reconnectAwaitSeconds then it will apply. - */ - - public int getPostDisconnectAwaitSeconds() { - return this.postDisconnectAwaitSeconds; - } - /** * @return Whether warning on entering Realms screen should not be displayed. */ @@ -235,19 +192,16 @@ public final class NCRConfigClient extends JSONConfig { this.skipRealmsWarning = skipRealmsWarning; } - public boolean doSigningCheck(ServerAddress serverAddress) { - String server = serverAddress.getHost() + ":" + serverAddress.getPort(); + public boolean hideSigningRequestMessage() { + return this.hideSigningRequestMessage; + } - if (!this.serverSigningChecks.containsKey(server)) - return true; - else - return Instant.now().getEpochSecond() - this.serverSigningChecks.get(server) >= this.signingCheckDelaySeconds; + public SigningMode defaultSigningMode() { + return this.defaultSigningMode; } - public void updateSigningCheck(ServerAddress serverAddress) { - String server = serverAddress.getHost() + ":" + serverAddress.getPort(); - this.serverSigningChecks.put(server, Instant.now().getEpochSecond()); - this.saveFile(); + public boolean removeTelemetryButton() { + return this.removeTelemetryButton; } } diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java index 7aa0322..38df30e 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java @@ -1,17 +1,12 @@ package com.aizistral.nochatreports.config; -import java.util.ArrayList; -import java.util.List; - -import com.google.common.base.Preconditions; - public final class NCRConfigCommon extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Common.json"; protected String demandOnClientMessage = "You do not have No Chat Reports, and this server is" + " configured to require it on client!"; - protected boolean demandOnClient = true, enableDebugLog = false, convertToGameMessage = false, - addQueryData = true; + protected boolean demandOnClient = false, convertToGameMessage = true, + addQueryData = true, enableDebugLog = false; protected NCRConfigCommon() { super(FILE_NAME); diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java index 9cf7671..525abff 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java @@ -1,19 +1,11 @@ package com.aizistral.nochatreports.config; -import java.nio.charset.StandardCharsets; -import java.security.InvalidKeyException; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import com.aizistral.nochatreports.encryption.AESCFB8Encryptor; import com.aizistral.nochatreports.encryption.Encryption; import com.aizistral.nochatreports.encryption.Encryptor; -import com.aizistral.nochatreports.gui.UnsafeServerScreen; -import net.minecraft.client.multiplayer.resolver.ServerAddress; -import net.minecraft.network.chat.Component; -import net.minecraft.util.StringUtil; +import java.security.InvalidKeyException; +import java.util.List; +import java.util.Optional; public class NCRConfigEncryption extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Encryption.json"; diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java new file mode 100644 index 0000000..d94be20 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java @@ -0,0 +1,72 @@ +package com.aizistral.nochatreports.config; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Optional; + +import org.jetbrains.annotations.Nullable; + +import com.aizistral.nochatreports.NoChatReportsClient; +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.core.SigningMode; +import com.aizistral.nochatreports.gui.UnsafeServerScreen; + +import net.minecraft.client.multiplayer.resolver.ServerAddress; + +public class NCRServerPreferences extends JSONConfig { + protected static final String FILE_NAME = "NoChatReports/NCR-ServerPreferences.json"; + protected HashMap signingModes = new HashMap<>(); + + protected NCRServerPreferences() { + super(FILE_NAME); + } + + @Override + public NCRServerPreferences getDefault() { + return new NCRServerPreferences(); + } + + public SigningMode getModeRaw(@Nullable ServerAddress address) { + return this.signingModes.get(address); + } + + public SigningMode getModeUnresolved(@Nullable ServerAddress address) { + if (!NoChatReportsClient.areSigningKeysPresent()) + return SigningMode.NEVER_FORCED; + else if (ServerSafetyState.isInSingleplayer()) + return SigningMode.NEVER; + else if (ServerSafetyState.isOnRealms()) + return SigningMode.ALWAYS; + else if (address == null) + return SigningMode.DEFAULT; + + SigningMode mode = this.getModeRaw(address); + return mode != null ? mode : SigningMode.DEFAULT; + } + + public SigningMode getMode(@Nullable ServerAddress address) { + return this.getModeUnresolved(address).resolve(); + } + + public boolean hasMode(@Nullable ServerAddress address, SigningMode mode) { + return this.getMode(address) == mode; + } + + public boolean hasModeCurrent(SigningMode mode) { + return this.hasMode(ServerSafetyState.getLastServer(), mode); + } + + public void setMode(@Nullable ServerAddress address, @Nullable SigningMode mode) { + if (address == null) + return; + + if (mode == null || mode == SigningMode.DEFAULT) { + this.signingModes.remove(address); + } else { + this.signingModes.put(address, mode); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java b/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java deleted file mode 100644 index 5d36cf5..0000000 --- a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.aizistral.nochatreports.config; - -import java.util.ArrayList; -import java.util.List; - -import com.aizistral.nochatreports.gui.UnsafeServerScreen; - -import net.minecraft.client.multiplayer.resolver.ServerAddress; - -public class NCRServerWhitelist extends JSONConfig { - protected static final String FILE_NAME = "NoChatReports/NCR-ServerWhitelist.json"; - protected static final List DEFAULT_WHITELISTED_SERVERS = new ArrayList<>(); - protected List whitelistedServers = DEFAULT_WHITELISTED_SERVERS; - - protected NCRServerWhitelist() { - super(FILE_NAME); - } - - @Override - public NCRServerWhitelist getDefault() { - return new NCRServerWhitelist(); - } - - /** - * @return Current list of whitelisted unsafe servers. Used on client to remember which servers - * user disabled unsafety warnings for.

- * - * This is empty by default. - * - * @see UnsafeServerScreen - */ - - public List getList() { - return this.whitelistedServers; - } - - /** - * @param address Address of the server to be check. - * @return Whether this server is in the whitelist of unsafe servers, as returned by - * {@link #getList()}. - * @see UnsafeServerScreen - */ - - public boolean isWhitelisted(ServerAddress address) { - return NCRConfig.getClient().whitelistAllServers() || - this.getList().contains(address.getHost() + ":" + address.getPort()); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java b/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java new file mode 100644 index 0000000..0815135 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java @@ -0,0 +1,35 @@ +package com.aizistral.nochatreports.config; + +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; + +import java.io.IOException; + +@OnlyIn(Dist.CLIENT) +public class ServerAddressAdapter extends TypeAdapter { + public static final ServerAddressAdapter INSTANCE = new ServerAddressAdapter(); + + private ServerAddressAdapter() { + // NO-OP + } + + @Override + public ServerAddress read(JsonReader reader) throws IOException { + String string = reader.nextString(); + + if (!ServerAddress.isValidAddress(string)) + throw new IOException("Incorrect server address format: " + string); + + return ServerAddress.parseString(string); + } + + @Override + public void write(JsonWriter writer, ServerAddress address) throws IOException { + writer.value(address.toString()); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java index f0bcf4d..39e9a11 100644 --- a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java +++ b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java @@ -1,18 +1,15 @@ package com.aizistral.nochatreports.core; -import java.util.Optional; - -import javax.annotation.Nullable; - import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.encryption.Encryptor; - import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentContents; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.contents.LiteralContents; import net.minecraft.network.chat.contents.TranslatableContents; +import java.util.Optional; + public class EncryptionUtil { public static Optional tryDecrypt(Component component) { diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java b/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java index 4841830..a92ea52 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java @@ -1,5 +1,8 @@ package com.aizistral.nochatreports.core; +import com.aizistral.nochatreports.mixins.client.MixinServerData; +import com.aizistral.nochatreports.mixins.common.MixinServerStatus; + import net.minecraft.client.multiplayer.ServerData; import net.minecraft.network.protocol.status.ServerStatus; diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java index 9af7e04..26a2802 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -1,10 +1,7 @@ package com.aizistral.nochatreports.core; -import com.aizistral.nochatreports.config.NCRConfig; - import net.minecraft.network.chat.Component; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.network.chat.MutableComponent; /** * Represents the level of "safety" of the given server, in the eyes of the client. @@ -20,6 +17,12 @@ public enum ServerSafetyLevel { */ SECURE, + /** + * For singleplayer specifically. Pretty much identical to {@link #SECURE} since client needs + * NCR installed on it to display any safety level to begin with. + */ + SINGLEPLAYER, + /** * For servers that do not make any effort to remove signatures from chat messages themselves, @@ -55,12 +58,12 @@ public enum ServerSafetyLevel { UNDEFINED; - @OnlyIn(Dist.CLIENT) - public Component getTooltip() { - if (NCRConfig.getClient().whitelistAllServers() && this.equals(ServerSafetyLevel.INSECURE)) - return Component.translatable("gui.nochatreports.status_insecure_whitelist_all_servers"); - else - return Component.translatable("gui.nochatreports.status_" + this.name().toLowerCase()); + public MutableComponent getTooltip() { + return Component.translatable("gui.nochatreports.safety_status." + this.name().toLowerCase()); + } + + public boolean isSecure() { + return this == SECURE || this == SINGLEPLAYER; } } diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java index 99e5f4a..1237cd0 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java @@ -1,19 +1,19 @@ package com.aizistral.nochatreports.core; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - -import javax.annotation.Nullable; - -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.config.NCRConfig; - -import net.minecraft.client.multiplayer.ServerData; +import com.aizistral.nochatreports.gui.UnsafeServerScreen; +import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraft.network.chat.LocalChatSession; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.jetbrains.annotations.Nullable; + /** * All this global state is questionable, but we have to... * @author Aizistral @@ -21,13 +21,11 @@ import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) public final class ServerSafetyState { - private static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED; - private static ServerAddress lastServerAddress = null; - private static ServerData lastServerData = null; - private static AtomicBoolean allowUnsafeServer = new AtomicBoolean(false), - sessionRequestedKey = new AtomicBoolean(false), isOnServer = new AtomicBoolean(false); - private static AtomicInteger reconnectCount = new AtomicInteger(0); - private static AtomicLong disconnectMillis = new AtomicLong(0); + private static final List RESET_ACTIONS = new ArrayList<>(); + private static final List SIGNING_ACTIONS = new ArrayList<>(); + private static final AtomicBoolean ALLOW_CHAT_SIGNING = new AtomicBoolean(false); + private volatile static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED; + private volatile static ServerAddress lastServer = null; public static void updateCurrent(ServerSafetyLevel level) { current = level; @@ -37,79 +35,71 @@ public final class ServerSafetyState { return current; } - public static boolean allowsUnsafeServer() { - return current != ServerSafetyLevel.SECURE ? allowUnsafeServer.get() : false; + public static boolean allowChatSigning() { + return ALLOW_CHAT_SIGNING.get(); } - public static void setAllowsUnsafeServer(boolean allows) { - if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Set allowUnsafeServer to: " + allows + ", value set in stacktrace:"); - NoChatReports.LOGGER.catching(new RuntimeException().fillInStackTrace()); + public static CompletableFuture setAllowChatSigning(boolean allow) { + if (ALLOW_CHAT_SIGNING.compareAndSet(!allow, allow)) { + if (Minecraft.getInstance().player != null) { + var connection = Minecraft.getInstance().player.connection; + + if (allow && connection.chatSession == null) + return Minecraft.getInstance().getProfileKeyPairManager().prepareKeyPair() + .thenAcceptAsync(optional -> optional.ifPresent(profileKeyPair -> { + connection.setKeyPair(profileKeyPair); + SIGNING_ACTIONS.forEach(Runnable::run); + SIGNING_ACTIONS.clear(); + }), Minecraft.getInstance()); + } } - allowUnsafeServer.set(allows); + return CompletableFuture.completedFuture(null); } - public static void setSessionRequestedKey(boolean requested) { - sessionRequestedKey.set(requested); + public static void toggleChatSigning() { + setAllowChatSigning(!ALLOW_CHAT_SIGNING.get()); } - public static boolean sessionRequestedKey() { - return current != ServerSafetyLevel.SECURE ? sessionRequestedKey.get() : false; + public static boolean isOnRealms() { + return current == ServerSafetyLevel.REALMS; } - public static boolean forceSignedMessages() { - return allowsUnsafeServer() && sessionRequestedKey(); + public static boolean isInSingleplayer() { + return current == ServerSafetyLevel.SINGLEPLAYER; } - @Nullable - public static ServerAddress getLastServerAddress() { - return lastServerAddress; + public static boolean isDetermined() { + return current != ServerSafetyLevel.UNINTRUSIVE && current != ServerSafetyLevel.UNDEFINED + && current != ServerSafetyLevel.UNKNOWN; } @Nullable - public static ServerData getLastServerData() { - return lastServerData; + public static ServerAddress getLastServer() { + return lastServer; } - public static void setLastConnectedServer(@Nullable ServerAddress address, @Nullable ServerData data) { - lastServerAddress = address; - lastServerData = data; + public static void setLastServer(@Nullable ServerAddress address) { + lastServer = address; } - public static int getReconnectCount() { - return reconnectCount.get(); + public static void scheduleResetAction(Runnable action) { + RESET_ACTIONS.add(action); } - public static void setReconnectCount(int count) { - reconnectCount.set(count); - } - - public static long getDisconnectMillis() { - return disconnectMillis.get(); - } - - public static void setDisconnectMillis(long millis) { - disconnectMillis.set(millis); - } - - public static boolean isOnServer() { - return isOnServer.get(); - } - - public static void setOnServer(boolean on) { - isOnServer.set(on); + public static void scheduleSigningAction(Runnable action) { + SIGNING_ACTIONS.add(action); } public static void reset() { + lastServer = null; current = ServerSafetyLevel.UNDEFINED; - allowUnsafeServer.set(false); - sessionRequestedKey.set(false); - isOnServer.set(false); + ALLOW_CHAT_SIGNING.set(false); + UnsafeServerScreen.setHideThisSession(false); - if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("allowUnsafeServer: {}", allowUnsafeServer.get()); - } + RESET_ACTIONS.forEach(Runnable::run); + RESET_ACTIONS.clear(); + SIGNING_ACTIONS.clear(); } } diff --git a/src/main/java/com/aizistral/nochatreports/core/SigningMode.java b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java new file mode 100644 index 0000000..b2ccdbb --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java @@ -0,0 +1,105 @@ +package com.aizistral.nochatreports.core; + +import org.jetbrains.annotations.Nullable; + +import com.aizistral.nochatreports.config.NCRConfig; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; + +/** + * Signing modes control how NCR behaves with respect to chat signing. + * These can be enabled globally or per-server. + * + * @author Aizistral + */ + +public enum SigningMode { + + /** + * Special value that indicates signing behavior should be controlled by overarching + * configuration. + */ + DEFAULT, + + /** + * Never sign any messages, ignore server demands. + */ + NEVER, + + /** + * Always sign messages, regardless of whether the server asked to. + */ + ALWAYS, + + /** + * Don't sign by default, if server refuses to accept unsigned message - show GUI + * prompt which allows the user to enable signing or ignore server warnings for one + * session. + */ + PROMPT, + + /** + * Don't sign by default, if server refuses to accept unsigned message - immediately + * enable signing for one session and re-send that message. + */ + ON_DEMAND, + + /** + * Same as {@link SigningMode#NEVER}, but additionally indicates that signing cannot be + * turned on at all for some reason (i.e. missing keys or offline account). + */ + NEVER_FORCED; + + public String getNameKey() { + return "gui.nochatreports.signing_mode." + this.name().toLowerCase(); + } + + public MutableComponent getName() { + if (this != DEFAULT) + return Component.translatable(this.getNameKey()); + else + return Component.translatable(this.getNameKey(), NCRConfig.getClient().defaultSigningMode().getName()); + } + + public String getTooltipKey() { + return "gui.nochatreports.signing_mode." + this.name().toLowerCase() + ".tooltip"; + } + + public MutableComponent getTooltip() { + return Component.translatable(this.getTooltipKey()); + } + + public SigningMode next() { + SigningMode result = null; + + if (this.ordinal() == values().length - 1) { + result = values()[0]; + } else { + result = values()[this.ordinal() + 1]; + } + + return result.isSelectable() ? result : result.next(); + } + + public SigningMode resolve() { + return switch(this) { + case DEFAULT -> NCRConfig.getClient().defaultSigningMode(); + case NEVER_FORCED -> NEVER; + default -> this; + }; + } + + public boolean isSelectable() { + return this != NEVER_FORCED; + } + + public boolean isSelectableGlobally() { + return this.isSelectable() && this != DEFAULT; + } + + public static SigningMode nullable(@Nullable SigningMode mode) { + return mode == null ? DEFAULT : mode; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java index 77adf4c..09b075c 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java @@ -1,21 +1,6 @@ package com.aizistral.nochatreports.encryption; import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.security.spec.InvalidKeySpecException; -import java.security.spec.KeySpec; -import java.util.Random; - -import javax.crypto.Cipher; -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.PBEKeySpec; -import javax.crypto.spec.SecretKeySpec; - -import net.minecraft.util.StringUtil; public class AESCFB8Encryption extends AESEncryption { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java index 5b32891..63476f3 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java @@ -1,30 +1,14 @@ package com.aizistral.nochatreports.encryption; +import net.minecraft.util.Tuple; + +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; import java.security.spec.AlgorithmParameterSpec; -import java.util.Base64; import java.util.Random; -import javax.crypto.AEADBadTagException; -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.KeyGenerator; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.SecretKey; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; - -import net.minecraft.server.network.ServerLoginPacketListenerImpl; -import net.minecraft.util.Tuple; - -import static com.aizistral.nochatreports.encryption.Encryption.*; -import static javax.crypto.Cipher.*; - public class AESCFB8Encryptor extends AESEncryptor { protected AESCFB8Encryptor(String key) throws InvalidKeyException { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java index bffc960..a853f0c 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java @@ -1,14 +1,10 @@ package com.aizistral.nochatreports.encryption; -import java.nio.ByteBuffer; -import java.security.InvalidKeyException; -import java.security.spec.AlgorithmParameterSpec; -import java.util.Random; +import net.minecraft.util.Tuple; import javax.crypto.SecretKey; -import javax.crypto.spec.IvParameterSpec; - -import net.minecraft.util.Tuple; +import java.security.InvalidKeyException; +import java.security.spec.AlgorithmParameterSpec; public class AESECBEncryptor extends AESEncryptor { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java index f7c53cd..f2c4922 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java @@ -1,21 +1,17 @@ package com.aizistral.nochatreports.encryption; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.security.spec.InvalidKeySpecException; -import java.security.spec.KeySpec; -import java.util.Optional; -import java.util.Random; +import net.minecraft.util.StringUtil; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.SecretKeySpec; - -import net.minecraft.util.StringUtil; -import net.minecraft.util.Tuple; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.KeySpec; +import java.util.Random; public abstract class AESEncryption extends Encryption { private final String mode, padding; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java index d7ec841..2094c5a8 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java @@ -1,31 +1,17 @@ package com.aizistral.nochatreports.encryption; -import static com.aizistral.nochatreports.encryption.Encryption.AES_CFB8; -import static com.aizistral.nochatreports.encryption.Encryption.BASE64_DECODER; -import static com.aizistral.nochatreports.encryption.Encryption.BASE64_ENCODER; -import static javax.crypto.Cipher.DECRYPT_MODE; -import static javax.crypto.Cipher.ENCRYPT_MODE; +import net.minecraft.util.Tuple; +import javax.crypto.*; +import javax.crypto.spec.SecretKeySpec; import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.spec.AlgorithmParameterSpec; -import java.util.Random; - -import javax.annotation.Nullable; -import javax.crypto.AEADBadTagException; -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.SecretKey; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import net.minecraft.SharedConstants; -import net.minecraft.util.Tuple; +import static javax.crypto.Cipher.DECRYPT_MODE; +import static javax.crypto.Cipher.ENCRYPT_MODE; public abstract class AESEncryptor extends Encryptor { private final T encryption; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java index 3d11a36..9ef7ed7 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java @@ -1,14 +1,12 @@ package com.aizistral.nochatreports.encryption; -import java.nio.ByteBuffer; -import java.security.InvalidKeyException; -import java.security.spec.AlgorithmParameterSpec; +import net.minecraft.util.Tuple; import javax.crypto.SecretKey; import javax.crypto.spec.GCMParameterSpec; -import javax.crypto.spec.IvParameterSpec; - -import net.minecraft.util.Tuple; +import java.nio.ByteBuffer; +import java.security.InvalidKeyException; +import java.security.spec.AlgorithmParameterSpec; public class AESGCMEncryptor extends AESEncryptor { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java index 8ed8cfe..926c657 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java @@ -2,10 +2,6 @@ package com.aizistral.nochatreports.encryption; import java.security.InvalidKeyException; -import com.aizistral.nochatreports.NoChatReports; - -import net.minecraft.SharedConstants; - public class CaesarEncryptor extends Encryptor { private static final char PARAGRAPH = '\u00a7', PARAGRAPH_PLACEHOLDER = '\uffef', DELETE = '\u007f', DELETE_PLACEHOLDER = '\ufff0'; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java b/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java index 826f521..0e32da8 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java @@ -1,6 +1,5 @@ package com.aizistral.nochatreports.encryption; -import java.nio.ByteBuffer; import java.security.InvalidKeyException; import java.util.ArrayList; import java.util.Base64; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java index 220874d..0ccd39c 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java @@ -1,17 +1,13 @@ package com.aizistral.nochatreports.encryption; -import java.nio.ByteBuffer; +import it.unimi.dsi.fastutil.chars.Char2CharArrayMap; +import it.unimi.dsi.fastutil.chars.Char2CharMap; +import it.unimi.dsi.fastutil.chars.Char2CharMaps; + import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; import java.security.SecureRandom; import java.util.Arrays; -import java.util.Base64; -import java.util.List; -import java.util.Map; - -import it.unimi.dsi.fastutil.chars.Char2CharArrayMap; -import it.unimi.dsi.fastutil.chars.Char2CharMap; -import it.unimi.dsi.fastutil.chars.Char2CharMaps; public abstract class Encryptor { protected static final SecureRandom RANDOM = new SecureRandom(); @@ -163,7 +159,7 @@ public abstract class Encryptor { map.put('u', 'µ'); map.put('v', '¶'); map.put('w', '·'); - map.put('x', '¸'); + map.put('x', '×'); map.put('y', '¹'); map.put('z', 'º'); map.put('0', '0'); diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java new file mode 100644 index 0000000..898b1f5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java @@ -0,0 +1,83 @@ +package com.aizistral.nochatreports.gui; + +import org.jetbrains.annotations.Nullable; + +import com.mojang.blaze3d.vertex.PoseStack; + +import net.minecraft.Util; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.Checkbox; +import net.minecraft.client.gui.components.MultiLineLabel; +import net.minecraft.client.gui.screens.ConfirmLinkScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; + +public abstract class AdaptiveWarningScreen extends Screen { + private final Component title; + private final Component content; + private final Component narration; + @Nullable + protected final Screen previous; + @Nullable + private final Component check; + @Nullable + protected Checkbox stopShowing = null; + protected MultiLineLabel message = MultiLineLabel.EMPTY; + + public AdaptiveWarningScreen(Component title, Component content, @Nullable Component check, + @Nullable Screen previous) { + super(title); + this.title = title; + this.content = content; + this.check = check; + this.narration = this.title.copy().append("\n").append(this.content); + this.previous = previous; + } + + @Override + protected void init() { + this.clearWidgets(); + super.init(); + this.message = MultiLineLabel.create(this.font, this.content, this.width - (this.hugeGUI() ? 65 : 100)); + int i = (this.message.getLineCount() + 1) * this.getLineHeight(); + if (this.check != null) { + int checkY = this.hugeGUI() ? 27 : 76; + int j = this.font.width(this.check); + + if (this.check != null) { + this.stopShowing = new Checkbox(this.width / 2 - j / 2 - 8, checkY + i, j + 24, 20, this.check, false); + this.addRenderableWidget(this.stopShowing); + } + } + this.initButtons(i + (this.hugeGUI() ? 55 : 100)); + } + + protected abstract void initButtons(int y); + + @Override + public void render(PoseStack poseStack, int i, int j, float f) { + this.renderBackground(poseStack); + this.renderTitle(poseStack); + int k = this.width / 2 - this.message.getWidth() / 2; + this.message.renderLeftAligned(poseStack, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFF); + super.render(poseStack, i, j, f); + } + + private void renderTitle(PoseStack poseStack) { + drawString(poseStack, this.font, this.title, 25, this.hugeGUI() ? 15 : 30, 0xFFFFFF); + } + + private boolean hugeGUI() { + return this.height <= 1080 / 4; + } + + protected int getLineHeight() { + if (this.hugeGUI()) + return (int) (this.minecraft.font.lineHeight * 1.5) + 1; + else + return this.minecraft.font.lineHeight * 2; + } + +} \ No newline at end of file diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java new file mode 100644 index 0000000..bf394ec --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java @@ -0,0 +1,40 @@ +package com.aizistral.nochatreports.gui; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.components.ImageButton; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +@OnlyIn(Dist.CLIENT) +public class AdvancedImageButton extends ImageButton { + protected final Screen parent; + + public AdvancedImageButton(int x, int y, int xSize, int ySize, int xTexStart, int yTexStart, int yStateDiff, + ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress, Component name, + Screen parent) { + super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress, name); + this.parent = parent; + } + + @Override + public void updateTooltip() { + if (this.tooltip instanceof AdvancedTooltip tooltip && tooltip.hasCustomRender()) + return; + + super.updateTooltip(); + } + + @Override + public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float delta) { + super.renderButton(poseStack, mouseX, mouseY, delta); + + if (this.isHovered) + if (this.tooltip instanceof AdvancedTooltip tooltip && tooltip.hasCustomRender()) { + tooltip.doCustomRender(this.parent, poseStack, mouseX, mouseY); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java new file mode 100644 index 0000000..ee963bc --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java @@ -0,0 +1,177 @@ +package com.aizistral.nochatreports.gui; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.*; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.Tooltip; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.network.chat.Component; +import net.minecraft.util.FormattedCharSequence; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +import org.jetbrains.annotations.Nullable; +import org.joml.Matrix4f; + +import java.util.List; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +@OnlyIn(Dist.CLIENT) +public class AdvancedTooltip extends Tooltip { + @Nullable + protected Supplier supplier; + protected int maxWidth = MAX_WIDTH; + protected boolean renderWithoutGap = false; + + public AdvancedTooltip(Component message, @Nullable Component narration) { + super(message, narration); + } + + public AdvancedTooltip(Component message) { + this(message, message); + } + + public AdvancedTooltip(Supplier message) { + this(message.get()); + this.supplier = message; + } + + public AdvancedTooltip setMaxWidth(int maxWidth) { + this.maxWidth = maxWidth; + return this; + } + + public AdvancedTooltip setRenderWithoutGap(boolean render) { + this.renderWithoutGap = render; + return this; + } + + public Component getMessage() { + return this.supplier != null ? this.supplier.get() : this.message; + } + + @Override + public List toCharSequence(Minecraft minecraft) { + if (this.supplier == null) { + if (this.cachedTooltip == null) { + this.cachedTooltip = splitTooltip(minecraft, this.getMessage(), this.maxWidth); + } + return this.cachedTooltip; + } else + return splitTooltip(minecraft, this.getMessage(), this.maxWidth); + } + + public boolean hasCustomRender() { + return this.renderWithoutGap; + } + + public void doCustomRender(Screen screen, PoseStack poseStack, int x, int y) { + if (this.renderWithoutGap) { + this.renderTooltipNoGap(screen, poseStack, splitTooltip(screen.minecraft, this.getMessage(), this.maxWidth), x, y); + } else + throw new UnsupportedOperationException("This tooltip doesn't support custom render!"); + } + + public static List splitTooltip(Minecraft minecraft, Component component, int maxWidth) { + return minecraft.font.split(component, maxWidth); + } + + protected void renderTooltipNoGap(Screen screen, PoseStack poseStack, List list, int x, int y) { + this.renderTooltipInternalNoGap(screen, poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), x, y); + } + + protected void renderTooltipInternalNoGap(Screen screen, PoseStack poseStack, List list, int x, int y) { + ClientTooltipComponent clientTooltipComponent2; + int v; + int m; + if (list.isEmpty()) + return; + int k = 0; + int l = list.size() == 1 ? -2 : -2; + for (ClientTooltipComponent clientTooltipComponent : list) { + m = clientTooltipComponent.getWidth(screen.font); + if (m > k) { + k = m; + } + l += clientTooltipComponent.getHeight(); + } + int n = x + 12; + int o = y - 12; + m = k; + int p = l; + if (n + k > screen.width) { + n -= 28 + k; + } + if (o + p + 6 > screen.height) { + o = screen.height - p - 6; + } + if (y - p - 8 < 0) { + o = y + 8; + } + poseStack.pushPose(); + int q = -267386864; + int r = 0x505000FF; + int s = 1344798847; + int t = 400; + float f = screen.itemRenderer.blitOffset; + screen.itemRenderer.blitOffset = 400.0f; + Tesselator tesselator = Tesselator.getInstance(); + BufferBuilder bufferBuilder = tesselator.getBuilder(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); + bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); + Matrix4f matrix4f = poseStack.last().pose(); + fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864); + fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864); + fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864); + fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864); + fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864); + fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847); + fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847); + fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF); + fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847); + RenderSystem.enableDepthTest(); + RenderSystem.disableTexture(); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + BufferUploader.drawWithShader(bufferBuilder.end()); + RenderSystem.disableBlend(); + RenderSystem.enableTexture(); + MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder()); + poseStack.translate(0.0, 0.0, 400.0); + int u = o; + for (v = 0; v < list.size(); ++v) { + clientTooltipComponent2 = list.get(v); + clientTooltipComponent2.renderText(screen.font, n, u, matrix4f, bufferSource); + u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/; + } + bufferSource.endBatch(); + poseStack.popPose(); + u = o; + for (v = 0; v < list.size(); ++v) { + clientTooltipComponent2 = list.get(v); + clientTooltipComponent2.renderImage(screen.font, n, u, poseStack, screen.itemRenderer, 400); + u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0); + } + screen.itemRenderer.blitOffset = f; + } + + protected static void fillGradient(Matrix4f matrix4f, BufferBuilder bufferBuilder, int i, int j, int k, int l, int m, int n, int o) { + float f = (n >> 24 & 0xFF) / 255.0f; + float g = (n >> 16 & 0xFF) / 255.0f; + float h = (n >> 8 & 0xFF) / 255.0f; + float p = (n & 0xFF) / 255.0f; + float q = (o >> 24 & 0xFF) / 255.0f; + float r = (o >> 16 & 0xFF) / 255.0f; + float s = (o >> 8 & 0xFF) / 255.0f; + float t = (o & 0xFF) / 255.0f; + bufferBuilder.vertex(matrix4f, k, j, m).color(g, h, p, f).endVertex(); + bufferBuilder.vertex(matrix4f, i, j, m).color(g, h, p, f).endVertex(); + bufferBuilder.vertex(matrix4f, i, l, m).color(r, s, t, q).endVertex(); + bufferBuilder.vertex(matrix4f, k, l, m).color(r, s, t, q).endVertex(); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java b/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java deleted file mode 100644 index 0727c00..0000000 --- a/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.aizistral.nochatreports.gui; - -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.NoChatReportsClient; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.mojang.blaze3d.vertex.PoseStack; - -import net.minecraft.Util; -import net.minecraft.client.GameNarrator; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.screens.ConnectScreen; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.network.chat.CommonComponents; -import net.minecraft.network.chat.Component; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) -public class AwaitConnectionScreen extends Screen { - private final Screen parent; - private boolean aborted = false; - private long millisAwaiting = 0; - - public AwaitConnectionScreen(Screen parent) { - super(GameNarrator.NO_TITLE); - this.parent = parent; - } - - @Override - protected void init() { - this.clearWidgets(); - this.millisAwaiting = Util.getMillis(); - - this.addRenderableWidget(new Button(this.width / 2 - 100, this.height / 4 + 120 + 12, 200, 20, CommonComponents.GUI_CANCEL, button -> { - if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Aborted reconnect await!"); - } - - this.aborted = true; - this.minecraft.setScreen(this.parent); - ServerSafetyState.reset(); - })); - } - - @Override - public void tick() { - if (!this.aborted) - if (this.getRemainingTime() <= 0) { - this.aborted = true; - NoChatReportsClient.reconnectLastServer(); - } - } - - @Override - public void render(PoseStack poseStack, int i, int j, float f) { - this.renderBackground(poseStack); - Component status = Component.translatable("nochatreports.connect.await", (this.getRemainingTime()) / 1000L); - ConnectScreen.drawCenteredString(poseStack, this.font, Component.translatable("nochatreports.connect.nokey_rejected"), this.width / 2, this.height / 2 - 50, 0xFFFFFF); - ConnectScreen.drawCenteredString(poseStack, this.font, status, this.width / 2, this.height / 2 - 36, 0xFFFFFF); - super.render(poseStack, i, j, f); - } - - private long getRemainingTime() { - long current = Util.getMillis(); - long disconnect = ServerSafetyState.getDisconnectMillis(); - - if (current - disconnect <= this.getDisconnectAwaitTime() + 100L) - return this.getDisconnectAwaitTime() - (current - disconnect); - else - return this.getAwaitTime() - (current - this.millisAwaiting); - } - - private long getDisconnectAwaitTime() { - return NCRConfig.getClient().getPostDisconnectAwaitSeconds() * 1000L; - } - - private long getAwaitTime() { - return NCRConfig.getClient().getReconnectAwaitSeconds() * 1000L; - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java index ad58e59..2b0d94a 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java +++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java @@ -1,22 +1,17 @@ package com.aizistral.nochatreports.gui; import com.aizistral.nochatreports.config.NCRConfig; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -public class EncryptionButton extends ImageButton { - private final Screen parent; +public class EncryptionButton extends AdvancedImageButton { public EncryptionButton(int x, int y, int xSize, int ySize, int xTexStart, int yTexStart, int yStateDiff, - ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress, OnTooltip onTooltip, - Component name, Screen parent) { - super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress, - onTooltip, name); - this.parent = parent; + ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress, Component name, Screen parent) { + super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress, name, parent); } @Override diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java index 9f63552..af7955c 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java @@ -1,36 +1,21 @@ package com.aizistral.nochatreports.gui; -import java.util.List; import java.util.Objects; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.config.NCRConfigEncryption; import com.aizistral.nochatreports.encryption.Encryption; -import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - -import net.minecraft.ChatFormatting; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.Checkbox; -import net.minecraft.client.gui.components.CycleButton; -import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.components.ImageButton; -import net.minecraft.client.gui.components.MultiLineLabel; -import net.minecraft.client.gui.components.TooltipAccessor; +import net.minecraft.client.gui.components.*; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen; +import net.minecraft.client.gui.screens.inventory.AnvilScreen; import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.FormattedText; -import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.FormattedCharSequence; import net.minecraft.util.StringUtil; -import net.minecraft.world.level.BaseCommandBlock; -import net.minecraft.world.level.block.entity.CommandBlockEntity; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -66,7 +51,6 @@ public class EncryptionConfigScreen extends Screen { @Override protected void init() { - this.minecraft.keyboardHandler.setSendRepeatsToGui(true); this.clearWidgets(); super.init(); @@ -86,31 +70,28 @@ public class EncryptionConfigScreen extends Screen { this.keyField.setResponder(this::onKeyUpdate); this.addWidget(this.keyField); - var button = new ImageButton(this.keyField.x + this.keyField.getWidth() - 15, this.keyField.y + 3, 12, - 12, 0, 0, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) -> - this.renderTooltip(poseStack, this.minecraft.font.split(this.validationIcon.yTexStart == 0 - ? VALIDATION_OK : VALIDATION_FAILED, 250), i, j), Component.empty()); + var button = new AdvancedImageButton(this.keyField.getX() + this.keyField.getWidth() - 15, this.keyField.getY() + 3, 12, + 12, 0, 0, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, Component.empty(), this); + button.setTooltip(new AdvancedTooltip(() -> this.validationIcon != null && + this.validationIcon.yTexStart == 0 ? VALIDATION_OK : VALIDATION_FAILED).setMaxWidth(250)); button.active = false; button.visible = true; this.addRenderableOnly(this.validationIcon = button); - button = new ImageButton(this.keyField.x - 22, this.keyField.y - 0, 18, 18, 0, - 28, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) -> - this.renderTooltip(poseStack, this.minecraft.font.split(CommonComponents.EMPTY, 250), i, j), - Component.empty()); + button = new AdvancedImageButton(this.keyField.getX() - 22, this.keyField.getY() - 0, 18, 18, 0, + 28, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, Component.empty(), this); button.active = false; button.visible = true; this.addRenderableOnly(button); - button = new ImageButton(this.keyField.x + this.keyField.getWidth() + 4, this.keyField.y - 1, 23, 20, 41, + button = new AdvancedImageButton(this.keyField.getX() + this.keyField.getWidth() + 4, this.keyField.getY() - 1, 23, 20, 41, 24, 20, ENCRYPTION_ICONS, 64, 64, btn -> { this.unfocusFields(); this.keyField.setValue(this.algorithmButton.getValue().getRandomKey()); - }, (btn, poseStack, i, j) -> - this.renderTooltip(poseStack, this.minecraft.font.split(DICE_TOOLTIP, 250), i, j), - Component.empty()); + }, Component.empty(), this); + button.setTooltip(new AdvancedTooltip(DICE_TOOLTIP).setMaxWidth(250)); button.active = true; button.visible = true; @@ -118,39 +99,36 @@ public class EncryptionConfigScreen extends Screen { w += 25; - this.passField = new CustomEditBox(this.font, (this.width - w)/2 + 11, this.keyField.y + + this.passField = new CustomEditBox(this.font, (this.width - w)/2 + 11, this.keyField.getY() + this.keyField.getHeight() + passDescSpace + (this.hugeGUI() ? -3 : 13), w, 18, CommonComponents.EMPTY); this.passField.setMaxLength(512); this.passField.setResponder(this::onPassphraseUpdate); this.addWidget(this.passField); - button = new ImageButton(this.passField.x - 22, this.passField.y - 0, 18, 18, 0, - 46, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) -> - this.renderTooltip(poseStack, this.minecraft.font.split(CommonComponents.EMPTY, 250), i, j), - Component.empty()); + button = new AdvancedImageButton(this.passField.getX() - 22, this.passField.getY() - 0, 18, 18, 0, + 46, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, Component.empty(), this); button.active = false; button.visible = true; this.addRenderableOnly(button); int checkWidth = this.font.width(ENCRYPT_PUBLIC); - this.encryptPublicCheck = new Checkbox(this.width / 2 - checkWidth / 2 - 8, this.passField.y + 24, checkWidth + 24, 20, + this.encryptPublicCheck = new Checkbox(this.width / 2 - checkWidth / 2 - 8, this.passField.getY() + 24, checkWidth + 24, 20, ENCRYPT_PUBLIC, NCRConfig.getEncryption().shouldEncryptPublic()); this.addRenderableWidget(this.encryptPublicCheck); - this.addRenderableWidget(new Button(this.width / 2 + 4, this.passField.y + 48, 219, 20, - CommonComponents.GUI_DONE, btn -> { - this.onDone(); - this.onClose(); - })); + this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, btn -> { + this.onDone(); + this.onClose(); + }).pos(this.width / 2 + 4, this.passField.getY() + 48).size(219, 20).build()); CycleButton cycle = CycleButton.builder(value -> { return Component.translatable("gui.nochatreports.encryption_config.algorithm", Component.translatable("algorithm.nochatreports." + value.getID() + ".name")); }).withValues(Encryption.getRegistered()).displayOnlyValue().withInitialValue(this.getConfig() - .getAlgorithm()).withTooltip(value -> this.minecraft.font.split( - Component.translatable("algorithm.nochatreports." + value.getID()), 250)) - .create(this.width / 2 - 4 - 218, this.passField.y + 48, 218, 20, CommonComponents.EMPTY, + .getAlgorithm()).withTooltip(value -> new AdvancedTooltip(Component.translatable( + "algorithm.nochatreports." + value.getID())).setMaxWidth(250)) + .create(this.width / 2 - 4 - 218, this.passField.getY() + 48, 218, 20, CommonComponents.EMPTY, (cycleButton, value) -> { this.unfocusFields(); this.onAlgorithmUpdate(value); @@ -184,34 +162,34 @@ public class EncryptionConfigScreen extends Screen { this.renderBackground(poseStack); Screen.drawCenteredString(poseStack, this.font, HEADER, this.width / 2, this.hugeGUI() ? 8 : 16, 0xFFFFFF); - this.keyDesc.renderLeftAligned(poseStack, this.keyField.x - 20, (this.hugeGUI() ? 25 : FIELDS_Y_START), this.getLineHeight(), 0xFFFFFF); + this.keyDesc.renderLeftAligned(poseStack, this.keyField.getX() - 20, (this.hugeGUI() ? 25 : FIELDS_Y_START), this.getLineHeight(), 0xFFFFFF); this.keyField.render(poseStack, i, j, f); - this.passDesc.renderLeftAligned(poseStack, this.passField.x - 20, this.keyField.y + this.keyField.getHeight() + (this.hugeGUI() ? 12 : 28), + this.passDesc.renderLeftAligned(poseStack, this.passField.getX() - 20, this.keyField.getY() + this.keyField.getHeight() + (this.hugeGUI() ? 12 : 28), this.getLineHeight(), 0xFFFFFF); this.passField.render(poseStack, i, j, f); - if (this.algorithmButton != null && this.algorithmButton.isMouseOver(i, j)) { - this.renderTooltip(poseStack, this.algorithmButton.getTooltip(), i, j); - } + // if (this.algorithmButton != null && this.algorithmButton.isMouseOver(i, j)) { + // this.renderTooltip(poseStack, this.algorithmButton.getTooltip(), i, j); + // } super.render(poseStack, i, j, f); if (StringUtil.isNullOrEmpty(this.keyField.getValue()) && !this.keyField.isFocused()) { Screen.drawString(poseStack, this.font, Component.translatable("gui.nochatreports.encryption_config.default_key", - this.algorithmButton.getValue().getDefaultKey()), this.keyField.x + 4, - this.keyField.y + 5, 0x999999); + this.algorithmButton.getValue().getDefaultKey()), this.keyField.getX() + 4, + this.keyField.getY() + 5, 0x999999); } if (!this.passField.active) { - Screen.drawString(poseStack, this.font, PASS_NOT_ALLOWED, this.passField.x + 4, - this.passField.y + 5, 0x999999); + Screen.drawString(poseStack, this.font, PASS_NOT_ALLOWED, this.passField.getX() + 4, + this.passField.getY() + 5, 0x999999); RenderSystem.setShaderTexture(0, ENCRYPTION_ICONS); RenderSystem.enableDepthTest(); - blit(poseStack, this.passField.x - 20, this.passField.y + 3, 50, 0, 14, 13, 64, 64); + blit(poseStack, this.passField.getX() - 20, this.passField.getY() + 3, 50, 0, 14, 13, 64, 64); } } diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java index 9b21101..1ef8bd9 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java @@ -1,33 +1,15 @@ package com.aizistral.nochatreports.gui; -import org.jetbrains.annotations.Nullable; - -import com.aizistral.nochatreports.NoChatReportsClient; import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.ChatFormatting; -import net.minecraft.Util; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.Checkbox; -import net.minecraft.client.gui.components.MultiLineLabel; -import net.minecraft.client.gui.screens.ConfirmLinkScreen; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.TitleScreen; -import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen; -import net.minecraft.client.gui.screens.multiplayer.WarningScreen; -import net.minecraft.client.multiplayer.resolver.ServerAddress; -import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.FormattedText; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - @OnlyIn(Dist.CLIENT) -public class EncryptionWarningScreen extends ExtendedWarningScreen { +public class EncryptionWarningScreen extends TriageWarningScreen { private static final Component TITLE = Component.translatable("gui.nochatreports.encryption_warning.header").withStyle(ChatFormatting.BOLD); private static final Component CONTENT = Component.translatable("gui.nochatreports.encryption_warning.contents"); private static final Component CHECK = Component.translatable("gui.nochatreports.encryption_warning.check"); diff --git a/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java deleted file mode 100644 index 39a7b86..0000000 --- a/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.aizistral.nochatreports.gui; - -import com.aizistral.nochatreports.config.NCRConfig; -import com.mojang.blaze3d.vertex.PoseStack; - -import net.minecraft.ChatFormatting; -import net.minecraft.Util; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.Checkbox; -import net.minecraft.client.gui.components.MultiLineLabel; -import net.minecraft.client.gui.screens.ConfirmLinkScreen; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.network.chat.CommonComponents; -import net.minecraft.network.chat.Component; - -public abstract class ExtendedWarningScreen extends Screen { - private final Component TITLE; - private final Component CONTENT; - private final Component CHECK; - private final Component NARRATION; - private final String WIKI_LINK; - protected final Screen previous; - protected MultiLineLabel message = MultiLineLabel.EMPTY; - protected Checkbox stopShowing = null; - - public ExtendedWarningScreen(Component title, Component content, Component check, String wikiLink, Screen previous) { - super(title); - this.TITLE = title; - this.CONTENT = content; - this.CHECK = check; - this.WIKI_LINK = wikiLink; - this.NARRATION = this.TITLE.copy().append("\n").append(this.CONTENT); - this.previous = previous; - } - - @Override - protected void init() { - this.clearWidgets(); - super.init(); - this.message = MultiLineLabel.create(this.font, this.CONTENT, this.width - (this.hugeGUI() ? 65 : 100)); - int i = (this.message.getLineCount() + 1) * this.getLineHeight(); - if (this.CHECK != null) { - int checkY = this.hugeGUI() ? 27 : 76; - int j = this.font.width(this.CHECK); - this.stopShowing = new Checkbox(this.width / 2 - j / 2 - 8, checkY + i, j + 24, 20, this.CHECK, false); - this.addRenderableWidget(this.stopShowing); - } - this.initButtons(i); - } - - private void initButtons(int i) { - int offset = 28; - int buttonY = this.hugeGUI() ? 55 : 100; - - this.addRenderableWidget(new Button(this.width / 2 - 260 + offset, buttonY + i, 150, 20, CommonComponents.GUI_PROCEED, this::onProceed)); - this.addRenderableWidget(new Button(this.width / 2 - 100 + offset, buttonY + i, 150, 20, Component.translatable("gui.nochatreports.encryption_warning.learn_more"), button -> { - Minecraft.getInstance().setScreen(new ConfirmLinkScreen(agree -> { - if (agree) { - Util.getPlatform().openUri(this.WIKI_LINK); - } - - Minecraft.getInstance().setScreen(this); - }, this.WIKI_LINK, true)); - })); - this.addRenderableWidget(new Button(this.width / 2 + 60 + offset, buttonY + i, 150, 20, CommonComponents.GUI_BACK, this::onBack)); - } - - protected abstract void onProceed(Button button); - - protected abstract void onBack(Button button); - - @Override - public void render(PoseStack poseStack, int i, int j, float f) { - this.renderBackground(poseStack); - this.renderTitle(poseStack); - int k = this.width / 2 - this.message.getWidth() / 2; - this.message.renderLeftAligned(poseStack, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFF); - super.render(poseStack, i, j, f); - } - - private void renderTitle(PoseStack poseStack) { - drawString(poseStack, this.font, this.title, 25, this.hugeGUI() ? 15 : 30, 0xFFFFFF); - } - - private boolean hugeGUI() { - return this.height <= 1080 / 4; - } - - protected int getLineHeight() { - if (this.hugeGUI()) - return (int) (this.minecraft.font.lineHeight * 1.5) + 1; - else - return this.minecraft.font.lineHeight * 2; - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java b/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java index 84f11b4..99fd8b3 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java +++ b/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java @@ -15,7 +15,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; * @author Aizistral */ - @OnlyIn(Dist.CLIENT) public final class FontHelper { diff --git a/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java b/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java new file mode 100644 index 0000000..2c7bcd2 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java @@ -0,0 +1,23 @@ +package com.aizistral.nochatreports.gui; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.Component; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +import java.util.function.Supplier; + +@OnlyIn(Dist.CLIENT) +public class InvisibleButton extends Button { + + public InvisibleButton() { + super(0, 0, 20, 20, Component.empty(), btn -> {}, Supplier::get); + } + + @Override + public void render(PoseStack poseStack, int i, int j, float f) { + // NO-OP + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java index 29f4d5d..3fb2b79 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java @@ -1,21 +1,12 @@ package com.aizistral.nochatreports.gui; -import org.jetbrains.annotations.Nullable; - import com.aizistral.nochatreports.config.NCRConfig; - import net.minecraft.ChatFormatting; -import net.minecraft.Util; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.screens.ConfirmLinkScreen; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.TitleScreen; -import net.minecraft.client.gui.screens.multiplayer.WarningScreen; -import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -public class RealmsWarningScreen extends ExtendedWarningScreen { +public class RealmsWarningScreen extends TriageWarningScreen { private static final Component TITLE = Component.translatable("gui.nochatreports.realms_warning.header").withStyle(ChatFormatting.BOLD); private static final Component CONTENT = Component.translatable("gui.nochatreports.realms_warning.contents"); private static final Component CHECK = Component.translatable("gui.nochatreports.realms_warning.check"); diff --git a/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java new file mode 100644 index 0000000..56817c6 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java @@ -0,0 +1,48 @@ +package com.aizistral.nochatreports.gui; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.Util; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.Checkbox; +import net.minecraft.client.gui.components.MultiLineLabel; +import net.minecraft.client.gui.screens.ConfirmLinkScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; + +public abstract class TriageWarningScreen extends AdaptiveWarningScreen { + private final String wikiLink; + + public TriageWarningScreen(Component title, Component content, Component check, String wikiLink, Screen previous) { + super(title, content, check, previous); + this.wikiLink = wikiLink; + } + + @Override + protected void initButtons(int y) { + int offset = 28; + + this.addRenderableWidget(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed) + .pos(this.width / 2 - 260 + offset, y).size(150, 20).build()); + + this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.encryption_warning.learn_more"), button -> { + Minecraft.getInstance().setScreen(new ConfirmLinkScreen(agree -> { + if (agree) { + Util.getPlatform().openUri(this.wikiLink); + } + + Minecraft.getInstance().setScreen(this); + }, this.wikiLink, true)); + }).pos(this.width / 2 - 100 + offset, y).size(150, 20).build()); + + + this.addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, this::onBack) + .pos(this.width / 2 + 60 + offset, y).size(150, 20).build()); + } + + protected abstract void onProceed(Button button); + + protected abstract void onBack(Button button); + +} diff --git a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java index e568231..82ead58 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java @@ -6,65 +6,65 @@ import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.ServerSafetyState; import net.minecraft.ChatFormatting; +import net.minecraft.Util; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.ChatScreen; +import net.minecraft.client.gui.screens.ConfirmLinkScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; +import net.minecraft.client.gui.screens.multiplayer.SafetyScreen; import net.minecraft.client.gui.screens.multiplayer.WarningScreen; +import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.resolver.ServerAddress; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -/** - * This is the screen user gets thrown into when they try to enter server that refuses to let them in - * without exposing account's public key. From here the user can choose not to play on the server, or - * agree to expose the key and send only signed messages. In the latter case they get reconnected to - * the server and mod will not prevent the key from being sent. Optional checkbox is provided to add - * the server to persistent whitelist in the config, to remove the need of going through this screen - * every time when entering that specific server. - * - * @author Aizistral - */ - @OnlyIn(Dist.CLIENT) -public final class UnsafeServerScreen extends WarningScreen { - private static final Component TITLE = Component.translatable("gui.nochatreports.unsafe_server.header").withStyle(ChatFormatting.BOLD); - private static final Component CONTENT = Component.translatable("gui.nochatreports.unsafe_server.contents"); - private static final Component CHECK = Component.translatable("gui.nochatreports.unsafe_server.check"); +public final class UnsafeServerScreen extends AdaptiveWarningScreen { + private static final Component TITLE = Component.translatable("gui.nochatreports.signing_required.header").withStyle(ChatFormatting.BOLD); + private static final Component CONTENT = Component.translatable("gui.nochatreports.signing_required.contents"); + private static final Component CHECK = Component.translatable("gui.nochatreports.signing_required.check"); private static final Component NARRATION = TITLE.copy().append("\n").append(CONTENT); + private static boolean hideThisSession = false; - private final Screen previous = new TitleScreen(); - private final Screen joinMultiplayer = new JoinMultiplayerScreen(new TitleScreen()); - - public UnsafeServerScreen() { - super(TITLE, CONTENT, CHECK, NARRATION); + public UnsafeServerScreen(Screen previous) { + super(TITLE, CONTENT, CHECK, previous); } @Override protected void initButtons(int i) { - this.addRenderableWidget(new Button(this.width / 2 - 155, 100 + i, 150, 20, CommonComponents.GUI_PROCEED, button -> { - ServerAddress address = ServerSafetyState.getLastServerAddress(); + this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.signing_required.allow_signing"), + button -> { + ServerSafetyState.setAllowChatSigning(true); + this.minecraft.setScreen(this.previous); + }).bounds(this.width / 2 - 155, i, 150, 20) + .build()); + + this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.signing_required.cancel"), + button -> { + if (this.stopShowing.selected()) { + hideThisSession = true; + } + this.minecraft.setScreen(this.previous); + }).bounds(this.width / 2 - 155 + 160, i, 150, 20).build()); + } - if (address != null) { - if (this.stopShowing.selected()) { - NCRConfig.getServerWhitelist().getList().add(address.getHost() + ":" + address.getPort()); - NCRConfig.getServerWhitelist().saveFile(); - } + private void resendLastMessage() { + if (this.previous instanceof ChatScreen chat) { + chat.handleChatInput(NCRConfig.getEncryption().getLastMessage(), false); + } + } - if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Proceeding with unsafe connection to {}, added to whitelist: {}", - address.getHost() + ":" + address.getPort(), this.stopShowing.selected()); - } + public static void setHideThisSession(boolean hide) { + hideThisSession = hide; + } - ServerSafetyState.setAllowsUnsafeServer(true); - this.minecraft.setScreen(new AwaitConnectionScreen(this.joinMultiplayer)); - } - })); - this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, 100 + i, 150, 20, CommonComponents.GUI_BACK, button -> { - this.minecraft.setScreen(this.joinMultiplayer); - })); + public static boolean hideThisSession() { + return hideThisSession; } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java deleted file mode 100644 index e6e5205..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.aizistral.nochatreports.mixins.client; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import com.aizistral.nochatreports.NoChatReportsClient; -import com.aizistral.nochatreports.gui.UnsafeServerScreen; - -import net.minecraft.client.gui.screens.DisconnectedScreen; -import net.minecraft.network.chat.Component; - -@Mixin(DisconnectedScreen.class) -public interface AccessorDisconnectedScreen { - - /** - * @return Disconnect reason of this screen. This is used in {@link NoChatReportsClient} to detect - * when player have been kicked out of server because client refused to send account's public key, - * and subsequently swap the screen for {@link UnsafeServerScreen} where player can choose to - * reconnect and expose their key. - */ - - @Accessor - public Component getReason(); - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java index cad93cd..b023769 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java @@ -1,31 +1,19 @@ package com.aizistral.nochatreports.mixins.client; -import javax.annotation.Nullable; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyArg; -import org.spongepowered.asm.mixin.injection.ModifyArgs; -import org.spongepowered.asm.mixin.injection.ModifyVariable; -import org.spongepowered.asm.mixin.injection.At.Shift; - import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.config.NCRConfigClient; import com.aizistral.nochatreports.core.EncryptionUtil; -import com.aizistral.nochatreports.encryption.Encryptor; - import net.minecraft.ChatFormatting; -import net.minecraft.client.GuiMessage; import net.minecraft.client.GuiMessageTag; import net.minecraft.client.gui.components.ChatComponent; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.ComponentContents; import net.minecraft.network.chat.FormattedText; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; -import net.minecraft.network.chat.contents.TranslatableContents; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.At.Shift; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; @Mixin(ChatComponent.class) public class MixinChatComponent { 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 3cbd89a..30ac570 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -1,27 +1,32 @@ package com.aizistral.nochatreports.mixins.client; -import java.time.Instant; -import java.util.Base64; -import java.util.UUID; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.ModifyVariable; -import org.spongepowered.asm.mixin.injection.At.Shift; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - import com.aizistral.nochatreports.NoChatReports; +import com.aizistral.nochatreports.NoChatReportsClient; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.EncryptionUtil; - -import net.minecraft.client.GuiMessageTag; -import net.minecraft.client.multiplayer.PlayerInfo; +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.core.SigningMode; +import com.aizistral.nochatreports.gui.UnsafeServerScreen; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ChatScreen; import net.minecraft.client.multiplayer.chat.ChatListener; import net.minecraft.client.multiplayer.chat.ChatTrustLevel; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.PlayerChatMessage; +import net.minecraft.network.chat.contents.TranslatableContents; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.time.Instant; +import java.util.Base64; +import java.util.UUID; @Mixin(ChatListener.class) public class MixinChatListener { @@ -31,6 +36,42 @@ public class MixinChatListener { throw new IllegalStateException("@Shadow transformation failed. Should never happen."); } + @Inject(method = "handleSystemMessage", at = @At("HEAD"), cancellable = true) + private void onHandleSystemMessage(Component message, boolean overlay, CallbackInfo info) { + if (message instanceof MutableComponent mutable && message.getContents() instanceof TranslatableContents translatable) { + if (translatable.getKey().equals("chat.disabled.missingProfileKey")) { + mutable.contents = new TranslatableContents("chat.nochatreports.disabled.signing_requested"); + + if (!ServerSafetyState.isOnRealms()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); + } + + if (UnsafeServerScreen.hideThisSession() || ServerSafetyState.allowChatSigning()) + return; + + if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ON_DEMAND)) { + ServerSafetyState.scheduleSigningAction(NoChatReportsClient::resendLastChatMessage); + ServerSafetyState.setAllowChatSigning(true); + + if (NCRConfig.getClient().hideSigningRequestMessage()) { + info.cancel(); + } + + return; + } + + if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.PROMPT)) { + Minecraft.getInstance().setScreen(new UnsafeServerScreen(Minecraft.getInstance().screen + instanceof ChatScreen chat ? chat : new ChatScreen(""))); + + if (NCRConfig.getClient().hideSigningRequestMessage()) { + info.cancel(); + } + } + } + } + } + /** * @reason Removes "Not Secure" and "Modified" statuses of chat messages. They ultimately * serve no purpose but to annoy the user and scare them away from servers that actually @@ -39,23 +80,19 @@ public class MixinChatListener { */ @Inject(method = "evaluateTrustLevel", at = @At("HEAD"), cancellable = true) - private void onEvaluateTrustLevel(PlayerChatMessage playerChatMessage, Component component, PlayerInfo playerInfo, - Instant instant, CallbackInfoReturnable info) { - - if (this.isSenderLocalPlayer(playerChatMessage.signer().profileId())) { + private void onEvaluateTrustLevel(PlayerChatMessage playerChatMessage, Component component, Instant instant, CallbackInfoReturnable info) { + if (this.isSenderLocalPlayer(playerChatMessage.sender())) { info.setReturnValue(ChatTrustLevel.SECURE); } else { - var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, playerInfo, instant); - - if (evaluate == ChatTrustLevel.BROKEN_CHAIN) { - info.setReturnValue(evaluate); - return; + if (playerChatMessage.hasSignature() && ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); } - if (evaluate == ChatTrustLevel.NOT_SECURE && NCRConfig.getClient().hideRedChatIndicators()) { + var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, instant); + + if (evaluate == ChatTrustLevel.NOT_SECURE && NCRConfig.getClient().hideInsecureMessageIndicators()) { info.setReturnValue(ChatTrustLevel.SECURE); - } else if ((evaluate == ChatTrustLevel.FILTERED || evaluate == ChatTrustLevel.MODIFIED) - && NCRConfig.getClient().hideYellowChatIndicators()) { + } else if (evaluate == ChatTrustLevel.MODIFIED && NCRConfig.getClient().hideModifiedMessageIndicators()) { info.setReturnValue(ChatTrustLevel.SECURE); } } @@ -63,9 +100,9 @@ public class MixinChatListener { // Debug never dies if (NCRConfig.getCommon().enableDebugLog()) { NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}", - Component.Serializer.toStableJson(playerChatMessage.serverContent()), - playerChatMessage.signer().profileId(), - Base64.getEncoder().encodeToString(playerChatMessage.headerSignature().bytes())); + Component.Serializer.toStableJson(playerChatMessage.unsignedContent()), + playerChatMessage.link().sender(), + Base64.getEncoder().encodeToString(playerChatMessage.signature() != null ? playerChatMessage.signature().bytes() : new byte[0])); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java index 6b3d0f5..9fff6d9 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java @@ -1,6 +1,7 @@ package com.aizistral.nochatreports.mixins.client; import java.util.List; +import java.util.Optional; import org.jetbrains.annotations.NotNull; import org.spongepowered.asm.mixin.Mixin; @@ -18,59 +19,29 @@ import net.minecraft.client.gui.screens.SimpleOptionsSubScreen; import net.minecraft.network.chat.Component; import net.minecraft.util.FormattedCharSequence; +/** + * Mixin responsible for graying out "Only Show Secure Chat" option. + * + * @author Kevinthegreat (original implementation) + * @author Aizistral (current version) + */ + @Mixin(ChatOptionsScreen.class) public class MixinChatOptionsScreen extends SimpleOptionsSubScreen { - private AbstractWidget onlyShowSecureChat; - - /** - * @implNote Using {@link net.minecraft.client.gui.Font#split} because - * {@link net.minecraft.client.OptionInstance#splitTooltip(Minecraft, Component)} is protected. - * Field {@link net.minecraft.client.gui.screens.Screen#minecraft} is not used because it can be null. - * @author Kevinthegreat - */ - @SuppressWarnings({"JavaDoc", "JavadocReference"}) - private List secureChatTooltip; - public MixinChatOptionsScreen(Screen screen, Options options, Component component, OptionInstance[] optionInstances) { + public MixinChatOptionsScreen(Screen screen, Options options, Component component, OptionInstance... optionInstances) { super(screen, options, component, optionInstances); throw new IllegalStateException("Can't touch this"); } - /** - * Gray out the only show secure chat option by deactivating the button when the screen is initialized. - * @author Kevinthegreat - */ - @Override protected void init() { super.init(); - if (!NCRConfig.getClient().enableMod()) - return; - - this.secureChatTooltip = Minecraft.getInstance().font.split(Component.translatable("gui.nochatreport.secureChat"), 200); - this.onlyShowSecureChat = this.list.findOption(Minecraft.getInstance().options.onlyShowSecureChat()); - - if (this.onlyShowSecureChat != null) { - this.onlyShowSecureChat.active = false; + if (NCRConfig.getClient().enableMod()) { + Optional.ofNullable(this.list.findOption(Minecraft.getInstance().options.onlyShowSecureChat())) + .ifPresent(option -> option.active = false); } } - /** - * Render the tooltip on mouseover for only show secure chat option. - * Minecraft only render tooltips when the widget is active. - * @author Kevinthegreat - */ - - @Override - public void render(@NotNull PoseStack poseStack, int x, int y, float f) { - super.render(poseStack, x, y, f); - - if (!NCRConfig.getClient().enableMod()) - return; - - if (this.onlyShowSecureChat != null && this.onlyShowSecureChat.visible && x >= (double) this.onlyShowSecureChat.x && y >= (double) this.onlyShowSecureChat.y && x < (double) (this.onlyShowSecureChat.x + this.onlyShowSecureChat.getWidth()) && y < (double) (this.onlyShowSecureChat.y + this.onlyShowSecureChat.getHeight())) { - this.renderTooltip(poseStack, this.secureChatTooltip, x, y); - } - } -} \ No newline at end of file +} 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 7b69957..18b673e 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -1,41 +1,42 @@ package com.aizistral.nochatreports.mixins.client; -import java.util.List; -import java.util.stream.Collectors; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - +import com.aizistral.nochatreports.NoChatReportsClient; import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.config.NCRConfigClient; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.core.SigningMode; +import com.aizistral.nochatreports.gui.AdvancedImageButton; +import com.aizistral.nochatreports.gui.AdvancedTooltip; import com.aizistral.nochatreports.gui.EncryptionButton; -import com.aizistral.nochatreports.gui.EncryptionConfigScreen; import com.aizistral.nochatreports.gui.EncryptionWarningScreen; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.BufferUploader; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.Tesselator; -import com.mojang.blaze3d.vertex.VertexFormat; -import com.mojang.math.Matrix4f; +import com.mojang.blaze3d.vertex.*; +import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.ChatScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.client.multiplayer.resolver.ServerAddress; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.FormattedCharSequence; +import org.joml.Matrix4f; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; /** * This is responsible for adding safety status indicator to the bottom-right corner of chat screen. @@ -46,12 +47,27 @@ import net.minecraft.util.FormattedCharSequence; public abstract class MixinChatScreen extends Screen { 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"); + private ImageButton safetyStatusButton; protected MixinChatScreen() { super(null); throw new IllegalStateException("Can't touch this"); } + @Inject(method = "handleChatInput", at = @At("HEAD"), cancellable = true) + public void handleChatInput(String string, boolean bl, CallbackInfoReturnable info) { + if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ALWAYS) && !ServerSafetyState.allowChatSigning()) { + if (this.minecraft.getConnection().getConnection().isEncrypted()) { + if (!this.normalizeChatMessage(string).isEmpty()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); + ServerSafetyState.scheduleSigningAction(NoChatReportsClient::resendLastChatMessage); + ServerSafetyState.setAllowChatSigning(true); + info.setReturnValue(true); + } + } + } + } + @Inject(method = "normalizeChatMessage", at = @At("RETURN"), cancellable = true) public void onBeforeMessage(String original, CallbackInfoReturnable info) { String message = info.getReturnValue(); @@ -75,16 +91,65 @@ public abstract class MixinChatScreen extends Screen { int buttonX = this.width - 23; if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) { - ServerSafetyLevel trust = this.minecraft.isLocalServer() ? ServerSafetyLevel.SECURE : ServerSafetyState.getCurrent(); + this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(), + 0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> { + if (!NoChatReportsClient.areSigningKeysPresent()) + return; + + var address = ServerSafetyState.getLastServer(); + + if (address != null) { + var preferences = NCRConfig.getServerPreferences(); + preferences.setMode(address, preferences.getModeUnresolved(address).next()); + preferences.saveFile(); + } + }, Component.empty(), this); + this.safetyStatusButton.setTooltip(new AdvancedTooltip(() -> { + MutableComponent tooltip = this.getSafetyLevel().getTooltip(); + + if (ServerSafetyState.allowChatSigning()) { + tooltip = Component.translatable("gui.nochatreports.safety_status.insecure_signing"); + } else if (ServerSafetyState.isInSingleplayer()) + return tooltip; + + ServerAddress address = ServerSafetyState.getLastServer(); + SigningMode mode = NCRConfig.getServerPreferences().getModeUnresolved(address); + String signing = "gui.nochatreports.signing_status."; + + if (!this.minecraft.getConnection().getConnection().isEncrypted()) { + signing += "disabled_offline"; + } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) { + signing += "allowed_realms"; + } else if (mode.resolve() == SigningMode.ALWAYS) { + if (ServerSafetyState.allowChatSigning()) { + signing += "allowed"; + } else { + signing += "disabled_allowance_pending"; + } + } else if (ServerSafetyState.allowChatSigning()) { + signing += "allowed_session"; + } else { + signing += "disabled"; + } - var button = new ImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(trust), - 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; - button.visible = true; + tooltip.append("\n\n"); + tooltip.append(Component.translatable(signing)); - this.addRenderableOnly(button); + if (ServerSafetyState.isOnRealms()) + return tooltip; + + tooltip.append("\n\n"); + tooltip.append(Component.translatable("gui.nochatreports.safety_status_button.controls")); + tooltip.append("\n\n"); + tooltip.append(Component.translatable("gui.nochatreports.signing_mode", + mode.getName().withStyle(ChatFormatting.BOLD, ChatFormatting.AQUA))); + tooltip.append("\n"); + tooltip.append((mode == SigningMode.DEFAULT ? mode.resolve() : mode).getTooltip()); + + return tooltip; + }).setMaxWidth(250).setRenderWithoutGap(true)); + + this.addRenderableWidget(this.safetyStatusButton); buttonX -= 25; } @@ -104,29 +169,41 @@ public abstract class MixinChatScreen extends Screen { } else { ((EncryptionButton)btn).openEncryptionConfig(); } - }, (btn, poseStack, i, j) -> { - if (NCRConfig.getEncryption().isValid()) { - this.renderTooltip(poseStack, this.minecraft.font.split( - Component.translatable("gui.nochatreports.encryption_tooltip", Language.getInstance() - .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption() - .isEnabledAndValid() ? "on" : "off")), 250), 250), i, j); - } else { - this.renderTooltip(poseStack, this.minecraft.font.split( - Component.translatable("gui.nochatreports.encryption_tooltip_invalid", Language.getInstance() - .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption() - .isEnabledAndValid() ? "on" : "off")), 250), 250), i, j); - - } }, Component.empty(), this); + button.setTooltip(new AdvancedTooltip(() -> { + if (NCRConfig.getEncryption().isValid()) + return Component.translatable("gui.nochatreports.encryption_tooltip", Language.getInstance() + .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption() + .isEnabledAndValid() ? "on" : "off"))); + else + return Component.translatable("gui.nochatreports.encryption_tooltip_invalid", Language.getInstance() + .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption() + .isEnabledAndValid() ? "on" : "off"))); + }).setMaxWidth(250)); button.active = true; button.visible = true; this.addRenderableWidget(button); } + @Inject(method = "tick", at = @At("RETURN")) + private void onTick(CallbackInfo info) { + if (this.safetyStatusButton != null) { + this.safetyStatusButton.xTexStart = this.getXOffset(); + } + } + + private ServerSafetyLevel getSafetyLevel() { + return ServerSafetyState.getCurrent(); + } + + private int getXOffset() { + return this.getXOffset(this.getSafetyLevel()); + } + private int getXOffset(ServerSafetyLevel level) { return switch (level) { - case SECURE -> 21; + case SECURE, SINGLEPLAYER -> 21; case UNINTRUSIVE -> 42; case INSECURE -> 0; case REALMS -> 63; @@ -135,83 +212,7 @@ public abstract class MixinChatScreen extends Screen { }; } - protected void renderTooltipNoGap(PoseStack poseStack, List list, int i, int j) { - this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j); - } - - protected void renderTooltipInternalNoGap(PoseStack poseStack, List list, int i, int j) { - ClientTooltipComponent clientTooltipComponent2; - int v; - int m; - if (list.isEmpty()) - return; - int k = 0; - int l = list.size() == 1 ? -2 : -2; - for (ClientTooltipComponent clientTooltipComponent : list) { - m = clientTooltipComponent.getWidth(this.font); - if (m > k) { - k = m; - } - l += clientTooltipComponent.getHeight(); - } - int n = i + 12; - int o = j - 12; - m = k; - int p = l; - if (n + k > this.width) { - n -= 28 + k; - } - if (o + p + 6 > this.height) { - o = this.height - p - 6; - } - if (j - p - 8 < 0) { - o = j + 8; - } - poseStack.pushPose(); - int q = -267386864; - int r = 0x505000FF; - int s = 1344798847; - int t = 400; - float f = this.itemRenderer.blitOffset; - this.itemRenderer.blitOffset = 400.0f; - Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder bufferBuilder = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); - bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); - Matrix4f matrix4f = poseStack.last().pose(); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847); - Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847); - RenderSystem.enableDepthTest(); - RenderSystem.disableTexture(); - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - BufferUploader.drawWithShader(bufferBuilder.end()); - RenderSystem.disableBlend(); - RenderSystem.enableTexture(); - MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder()); - poseStack.translate(0.0, 0.0, 400.0); - int u = o; - for (v = 0; v < list.size(); ++v) { - clientTooltipComponent2 = list.get(v); - clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource); - u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/; - } - bufferSource.endBatch(); - poseStack.popPose(); - u = o; - for (v = 0; v < list.size(); ++v) { - clientTooltipComponent2 = list.get(v); - clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400); - u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0); - } - this.itemRenderer.blitOffset = f; - } + @Shadow + public abstract String normalizeChatMessage(String string); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java new file mode 100644 index 0000000..2d3e697 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java @@ -0,0 +1,39 @@ +package com.aizistral.nochatreports.mixins.client; + +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.mojang.brigadier.ParseResults; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.commands.SharedSuggestionProvider; +import net.minecraft.network.chat.SignableCommand; +import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.game.ServerboundChatCommandPacket; +import net.minecraft.network.protocol.game.ServerboundChatPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ClientPacketListener.class) +public abstract class MixinClientPacketListener { + + @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD")) + private void onSend(Packet packet, CallbackInfo info) { + if (!ServerSafetyState.allowChatSigning() && !ServerSafetyState.isDetermined()) { + if (packet instanceof ServerboundChatPacket chat) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); // asume unintrusive until further notice + } else if (packet instanceof ServerboundChatCommandPacket command) { + if (!SignableCommand.of(this.parseCommand(command.command())).arguments().isEmpty()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); + } + } + } + } + + @Shadow + private ParseResults parseCommand(String command) { + throw new IllegalStateException("@Shadow transformation failed"); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java deleted file mode 100644 index efbd9ed..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.aizistral.nochatreports.mixins.client; - -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; - -import com.aizistral.nochatreports.config.NCRConfig; -import com.mojang.authlib.minecraft.TelemetrySession; -import com.mojang.authlib.minecraft.UserApiService; - -import net.minecraft.client.ClientTelemetryManager; - -@Mixin(ClientTelemetryManager.class) -public class MixinClientTelemetryManager { - - /** - * @reason Privacy. - * @author Aizistral - */ - - @Redirect(method = "", 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 (NCRConfig.getClient().disableTelemetry()) - return TelemetrySession.DISABLED; - else - return service.newTelemetrySession(executor); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java deleted file mode 100644 index 82df5af..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.aizistral.nochatreports.mixins.client; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyLevel; -import com.aizistral.nochatreports.core.ServerSafetyState; - -import net.minecraft.network.protocol.login.ClientLoginPacketListener; -import net.minecraft.network.protocol.login.ClientboundHelloPacket; - -@Mixin(ClientboundHelloPacket.class) -public class MixinClientboundHelloPacket { - - /** - * @reason If server is operated in the offline mode - we will never receive this type of packet - * from it, which allows us to conclude we have no necessity to expose account's public key. - * By acknowledging this we can update current {@link ServerSafetyLevel} accordingly. - * @author Aizistral - */ - - @Inject(method = "handle", at = @At("HEAD")) - private void onHandle(ClientLoginPacketListener listener, CallbackInfo info) { - if (!NCRConfig.getClient().enableMod()) - return; - - ServerSafetyState.setSessionRequestedKey(true); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java index 947729d..75e4705 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java @@ -1,29 +1,25 @@ package com.aizistral.nochatreports.mixins.client; -import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.config.NCRConfigClient; -import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ConnectScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.resolver.ServerAddress; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ConnectScreen.class) public class MixinConnectScreen { /** * @reason Intercept initiation of any new server connection. This way we can keep track of which - * server client currently tries to connect to + * server client currently tries to connect to. * @author Aizistral */ @@ -33,19 +29,12 @@ public class MixinConnectScreen { if (!NCRConfig.getClient().enableMod()) return; - ServerSafetyState.updateCurrent(ServerSafetyLevel.UNDEFINED); // just to be 100% sure - ServerSafetyState.setLastConnectedServer(serverAddress, serverData); - - if (NCRConfig.getServerWhitelist().isWhitelisted(serverAddress)) { - if (!NCRConfig.getClient().doSigningCheck(serverAddress)) { - ServerSafetyState.setAllowsUnsafeServer(true); - } - } + ServerSafetyState.reset(); + ServerSafetyState.setLastServer(serverAddress); if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Connecting to: {}, will expose public key: {}", - serverAddress.getHost() + ":" + serverAddress.getPort(), - ServerSafetyState.allowsUnsafeServer()); + NoChatReports.LOGGER.info("Connecting to: {}", + serverAddress.getHost() + ":" + serverAddress.getPort()); NoChatReports.LOGGER.info("Server Data IP: {}", serverData != null ? serverData.ip : "null"); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java index 1c18c61..754db1f 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java @@ -1,17 +1,12 @@ package com.aizistral.nochatreports.mixins.client; +import com.aizistral.nochatreports.config.NCRConfig; +import net.minecraft.client.GuiMessageTag; import org.spongepowered.asm.mixin.Mixin; 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.config.NCRConfig; - -import net.minecraft.ChatFormatting; -import net.minecraft.client.GuiMessageTag; -import net.minecraft.client.GuiMessageTag.Icon; -import net.minecraft.network.chat.Component; - @Mixin(GuiMessageTag.class) public class MixinGuiMessageTag { @@ -22,9 +17,9 @@ public class MixinGuiMessageTag { * @author Aizistral */ - @Inject(method = "system", at = @At("HEAD"), cancellable = true) + @Inject(method = { "system", "systemSinglePlayer" }, at = @At("HEAD"), cancellable = true) private static void onSystem(CallbackInfoReturnable info) { - if (NCRConfig.getClient().hideGrayChatIndicators()) { + if (NCRConfig.getClient().hideSystemMessageIndicators()) { info.setReturnValue(null); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java index 7c130bd..6ef1488 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java @@ -21,7 +21,7 @@ import net.minecraft.resources.ResourceLocation; @Mixin(GuiMessageTag.Icon.class) public abstract class MixinGuiMessageTagIcon { private static final ResourceLocation TEXTURE_NCR = new ResourceLocation("nochatreports", "textures/gui/encrypted_tag.png"); - @Shadow(aliases = "field_39768", remap = false) @Mutable static Icon[] $VALUES; + @Shadow(aliases = "field_39768") @Mutable static Icon[] $VALUES; @Invoker("") static Icon create(String name, int ordinal, int u, int v, int width, int height) { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java index 61fa83a..cf5f6be 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java @@ -3,6 +3,7 @@ package com.aizistral.nochatreports.mixins.client; import java.util.List; import java.util.stream.Collectors; +import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -10,6 +11,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.gui.AdvancedImageButton; +import com.aizistral.nochatreports.gui.AdvancedTooltip; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.BufferUploader; @@ -17,7 +20,6 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexFormat; -import com.mojang.math.Matrix4f; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; @@ -26,6 +28,7 @@ import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.locale.Language; +import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.FormattedCharSequence; @@ -49,17 +52,16 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { @Inject(method = "init", at = @At("HEAD")) private void onInit(CallbackInfo info) { if (NCRConfig.getClient().showReloadButton()) { - var button = new ImageButton(this.width/2 + 158, this.height - 52, 20, 20, 0, 0, 20, - RELOAD_TEXTURE, 64, 64, btn -> NCRConfig.load(), (btn, poseStack, i, j) -> - this.renderTooltipNoGap(poseStack, this.minecraft.font.split(RELOAD_TOOLTIP, 250), i, j), - Component.translatable("gui.nochatreports.reload_config")); + var button = new AdvancedImageButton(this.width/2 + 158, this.height - 52, 20, 20, 0, 0, 20, + RELOAD_TEXTURE, 64, 64, btn -> NCRConfig.load(), CommonComponents.EMPTY, this); + button.setTooltip(new AdvancedTooltip(RELOAD_TOOLTIP).setMaxWidth(250).setRenderWithoutGap(true)); button.active = true; button.visible = true; this.addRenderableWidget(button); } if (NCRConfig.getClient().showNCRButton()) { - var button = new ImageButton(this.width/2 + 158, this.height - 28, 20, 20, + var button = new AdvancedImageButton(this.width/2 + 158, this.height - 28, 20, 20, NCRConfig.getClient().enableMod() ? 0 : 20, 0, 20, TOGGLE_TEXTURE, 64, 64, btn -> { NCRConfig.getClient().toggleMod(); @@ -72,97 +74,14 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { } ServerSafetyState.reset(); - }, (btn, poseStack, i, j) -> this.renderTooltip(poseStack, - this.minecraft.font.split( - Component.translatable("gui.nochatreports.ncr_toggle_tooltip", - Language.getInstance() - .getOrDefault("gui.nochatreports.ncr_state_" - + (NCRConfig.getClient().enableMod() - ? "on" : "off"))), 250), i, j), - Component.translatable("gui.nochatreports.ncr_toggle")); + }, Component.translatable("gui.nochatreports.ncr_toggle"), this); + button.setTooltip(new AdvancedTooltip(() -> Component.translatable("gui.nochatreports.ncr_toggle_tooltip", + Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (NCRConfig.getClient() + .enableMod() ? "on" : "off")))).setMaxWidth(250)); button.active = true; button.visible = true; this.addRenderableWidget(button); } } - protected void renderTooltipNoGap(PoseStack poseStack, List list, int i, int j) { - this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j); - } - - protected void renderTooltipInternalNoGap(PoseStack poseStack, List list, int i, int j) { - ClientTooltipComponent clientTooltipComponent2; - int v; - int m; - if (list.isEmpty()) - return; - int k = 0; - int l = list.size() == 1 ? -2 : -2; - for (ClientTooltipComponent clientTooltipComponent : list) { - m = clientTooltipComponent.getWidth(this.font); - if (m > k) { - k = m; - } - l += clientTooltipComponent.getHeight(); - } - int n = i + 12; - int o = j - 12; - m = k; - int p = l; - if (n + k > this.width) { - n -= 28 + k; - } - if (o + p + 6 > this.height) { - o = this.height - p - 6; - } - if (j - p - 8 < 0) { - o = j + 8; - } - poseStack.pushPose(); - int q = -267386864; - int r = 0x505000FF; - int s = 1344798847; - int t = 400; - float f = this.itemRenderer.blitOffset; - this.itemRenderer.blitOffset = 400.0f; - Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder bufferBuilder = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); - bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); - Matrix4f matrix4f = poseStack.last().pose(); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847); - Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF); - Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847); - RenderSystem.enableDepthTest(); - RenderSystem.disableTexture(); - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - BufferUploader.drawWithShader(bufferBuilder.end()); - RenderSystem.disableBlend(); - RenderSystem.enableTexture(); - MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder()); - poseStack.translate(0.0, 0.0, 400.0); - int u = o; - for (v = 0; v < list.size(); ++v) { - clientTooltipComponent2 = list.get(v); - clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource); - u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/; - } - bufferSource.endBatch(); - poseStack.popPose(); - u = o; - for (v = 0; v < list.size(); ++v) { - clientTooltipComponent2 = list.get(v); - clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400); - u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0); - } - this.itemRenderer.blitOffset = f; - } - } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java deleted file mode 100644 index 9e43d68..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.aizistral.nochatreports.mixins.client; - -import javax.annotation.Nullable; - -import org.spongepowered.asm.mixin.Mixin; -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.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.mojang.brigadier.ParseResults; - -import net.minecraft.client.player.LocalPlayer; -import net.minecraft.commands.SharedSuggestionProvider; -import net.minecraft.commands.arguments.ArgumentSignatures; -import net.minecraft.network.chat.ChatMessageContent; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.LastSeenMessages; -import net.minecraft.network.chat.MessageSignature; -import net.minecraft.network.chat.MessageSigner; - -@Mixin(LocalPlayer.class) -public class MixinLocalPlayer { - - /** - * @reason Never sign messages, so that neither server nor other clients have - * proof of them being sent from your account. - * @author Aizistral - */ - - @Inject(method = "signMessage", at = @At("HEAD"), cancellable = true) - private void onSignMessage(MessageSigner signer, ChatMessageContent message, LastSeenMessages messages, CallbackInfoReturnable info) { - if (!NCRConfig.getClient().enableMod()) - return; - - if (!ServerSafetyState.forceSignedMessages()) { - info.setReturnValue(MessageSignature.EMPTY); - } - } - - /** - * @reason Same as above, except commands mostly concern only server. - * @author Aizistral - */ - - @Inject(method = "signCommandArguments", at = @At("HEAD"), cancellable = true) - private void onSignCommand(MessageSigner signer, ParseResults results, @Nullable Component component, LastSeenMessages messages, CallbackInfoReturnable info) { - if (!NCRConfig.getClient().enableMod()) - return; - - if (!ServerSafetyState.forceSignedMessages()) { - info.setReturnValue(ArgumentSignatures.EMPTY); - } - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java new file mode 100644 index 0000000..c6dc485 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java @@ -0,0 +1,48 @@ +package com.aizistral.nochatreports.mixins.client; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatreports.NoChatReportsClient; +import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.mojang.authlib.minecraft.TelemetrySession; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.main.GameConfig; +import net.minecraft.client.multiplayer.ProfileKeyPairManager; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + @Shadow @Final + private ProfileKeyPairManager profileKeyPairManager; + + @Inject(method = "(Lnet/minecraft/client/main/GameConfig;)V", at = @At("RETURN")) + private void onConstructed(GameConfig config, CallbackInfo info) { + NoChatReportsClient.setSigningKeysPresent(this.profileKeyPairManager.prepareKeyPair() + .join().isPresent()); + } + + @Inject(method = "getProfileKeyPairManager", at = @At("HEAD"), cancellable = true) + private void onGetProfileKeyPairManager(CallbackInfoReturnable info) { + if (!NCRConfig.getClient().enableMod()) + return; + + if (!ServerSafetyState.allowChatSigning()) { + info.setReturnValue(ProfileKeyPairManager.EMPTY_KEY_MANAGER); + } + } + + @Inject(method = "allowsTelemetry", at = @At("HEAD"), cancellable = true) + private void onAllowsTelemetry(CallbackInfoReturnable info) { + if (NCRConfig.getClient().disableTelemetry()) { + info.setReturnValue(false); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java index 5090b6c..0798ba1 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java @@ -1,25 +1,10 @@ package com.aizistral.nochatreports.mixins.client; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.NoChatReportsClient; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.ServerDataExtension; import com.aizistral.nochatreports.gui.FontHelper; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; @@ -28,7 +13,15 @@ import net.minecraft.client.multiplayer.ServerData; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.Tuple; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.ArrayList; +import java.util.stream.Collectors; @Mixin(ServerSelectionList.OnlineServerEntry.class) public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java index 8bbdbfb..7064ed6 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java @@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component; @Mixin(Options.class) public class MixinOptions { + private static final Component SECURE_CHAT_TOOLTIP = Component.translatable("gui.nochatreports.secure_chat"); private OptionInstance alternativeOption; /** @@ -31,12 +32,13 @@ public class MixinOptions { if (this.alternativeOption == null) { this.alternativeOption = new OptionInstance<>("options.onlyShowSecureChat", - OptionInstance.cachedConstantTooltip(Component.translatable("gui.nochatreport.secureChat")), - (component, value) -> value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF, - new OptionInstance.Enum<>(ImmutableList.of(Boolean.FALSE), Codec.BOOL), false, (value) -> {}); + OptionInstance.cachedConstantTooltip(SECURE_CHAT_TOOLTIP), + OptionInstance.BOOLEAN_TO_STRING, + new OptionInstance.Enum<>(ImmutableList.of(Boolean.FALSE), Codec.BOOL), + false, value -> {}); } cir.setReturnValue(this.alternativeOption); } -} \ No newline at end of file +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java index 03ae009..59348f1 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java @@ -15,11 +15,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.gui.AdvancedImageButton; +import com.aizistral.nochatreports.gui.InvisibleButton; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.ImageButton; +import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.screens.social.PlayerEntry; import net.minecraft.client.gui.screens.social.SocialInteractionsScreen; import net.minecraft.network.chat.Component; @@ -28,15 +31,9 @@ import net.minecraft.util.FormattedCharSequence; @Mixin(PlayerEntry.class) public class MixinPlayerEntry { - private static final Component NCR_BUTTON_TOOLTIP = Component.translatable("gui.nochatreport.noReporting"); + private static final Component NCR_BUTTON_TOOLTIP = Component.translatable("gui.nochatreports.no_reporting"); @Shadow @Final private static ResourceLocation REPORT_BUTTON_LOCATION; @Shadow private Button reportButton; - @Shadow float tooltipHoverTime; - - @Shadow - static void postRenderTooltip(SocialInteractionsScreen socialInteractionsScreen, PoseStack poseStack, List list, int i, int j) { - throw new IllegalStateException("@Shadow transformation failed. Should never happen."); - } /** * @reason Disable (or hide if configured respectively) chat report button on client. @@ -44,30 +41,15 @@ public class MixinPlayerEntry { */ @Inject(method = "", at = @At("RETURN")) - private void onConstructed(Minecraft minecraft, SocialInteractionsScreen socialInteractionsScreen, UUID uUID, String string, Supplier supplier, boolean reportable, CallbackInfo info) { + private void onConstructed(Minecraft minecraft, SocialInteractionsScreen screen, UUID uuid, String name, Supplier skinGetter, boolean reportable, CallbackInfo info) { if (NCRConfig.getClient().alwaysHideReportButton()) { - this.reportButton = new Button(0, 0, 20, 20, Component.empty(), button -> {}) { - @Override - public void render(PoseStack poseStack, int i, int j, float f) { - // NO-OP - } - }; + this.reportButton = new InvisibleButton(); this.reportButton.active = this.reportButton.visible = false; - } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE && this.reportButton != null) { - this.reportButton = new ImageButton(0, 0, 20, 20, 0, 0, 20, REPORT_BUTTON_LOCATION, 64, 64, button -> {}, new Button.OnTooltip() { - @Override - public void onTooltip(Button button, PoseStack poseStack, int i, int j) { - MixinPlayerEntry.this.tooltipHoverTime += minecraft.getDeltaFrameTime(); - if (MixinPlayerEntry.this.tooltipHoverTime >= 10.0f) { - socialInteractionsScreen.setPostRenderRunnable(() -> postRenderTooltip(socialInteractionsScreen, poseStack, minecraft.font.split(NCR_BUTTON_TOOLTIP, 150), i, j)); - } - } - - @Override - public void narrateTooltip(Consumer consumer) { - consumer.accept(NCR_BUTTON_TOOLTIP); - } - }, Component.translatable("gui.socialInteractions.report")); + } else if (ServerSafetyState.getCurrent().isSecure() && this.reportButton != null) { + this.reportButton = new AdvancedImageButton(0, 0, 20, 20, 0, 0, 20, REPORT_BUTTON_LOCATION, 64, 64, + button -> {}, Component.translatable("gui.socialInteractions.report"), screen); + this.reportButton.setTooltip(Tooltip.create(NCR_BUTTON_TOOLTIP)); + this.reportButton.setTooltipDelay(10); this.reportButton.active = false; } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java deleted file mode 100644 index 407a7ed..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.aizistral.nochatreports.mixins.client; - -import java.util.Optional; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Group; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.mojang.authlib.yggdrasil.response.KeyPairResponse; - -import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; -import net.minecraft.client.multiplayer.ProfileKeyPairManager; -import net.minecraft.util.Signer; -import net.minecraft.world.entity.player.ProfilePublicKey; - -@Mixin(ProfileKeyPairManager.class) -public class MixinProfileKeyPairManager { - - /** - * @reason Prevent the client from exposing its public key, unless it is necessary - * and user agreed to do so. - * @author Aizistral - */ - - @Inject(method = "profilePublicKey", at = @At("HEAD"), cancellable = true) - private void onProfilePublicKey(CallbackInfoReturnable> info) { - if (!NCRConfig.getClient().enableMod()) - return; - - if (!ServerSafetyState.allowsUnsafeServer()) { - info.setReturnValue(Optional.empty()); - } - } - - /** - * @reason Prevent the client from exposing its public key, unless it is necessary - * and user agreed to do so. - * @author Aizistral - */ - - @Group(min = 1, max = 2) - @Inject(method = "parsePublicKey", at = @At("HEAD"), cancellable = true) - private static void onParsePublicKey(KeyPairResponse response, CallbackInfoReturnable info) { - if (!NCRConfig.getClient().enableMod()) - return; - - if (!ServerSafetyState.allowsUnsafeServer()) { - info.setReturnValue(null); - } - } - - /** - * @reason Accomplishes the same thing as {@link #onParsePublicKey(KeyPairResponse, CallbackInfoReturnable)}, - * but only in 1.19.1. - * @author Aizistral - */ - - @Group(min = 1, max = 2) - @Inject(method = { "profilePublicKeyData", "method_43784" }, at = @At("HEAD"), cancellable = true, remap = false) - private void onProfilePublicKeyData(CallbackInfoReturnable> info) { - if (!NCRConfig.getClient().enableMod()) - return; - - if (!ServerSafetyState.allowsUnsafeServer()) { - info.setReturnValue(Optional.empty()); - } - } - - /** - * @reason Prevent client from trying to produce signature in - * {@link ClientHandshakePacketListenerImpl#handleHello}. - * @author Aizistral - */ - - @Inject(method = "signer", at = @At("HEAD"), cancellable = true) - private void onSigner(CallbackInfoReturnable> info) { - if (!NCRConfig.getClient().enableMod()) - return; - - if (!ServerSafetyState.allowsUnsafeServer()) { - info.setReturnValue(null); - } - } - -} 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 5fd58dd..7bcb9a8 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java @@ -26,9 +26,9 @@ public class MixinRealmsConnect { if (!NCRConfig.getClient().enableMod()) return; - ServerSafetyState.setLastConnectedServer(serverAddress, null); + ServerSafetyState.reset(); ServerSafetyState.updateCurrent(ServerSafetyLevel.REALMS); - ServerSafetyState.setAllowsUnsafeServer(true); + ServerSafetyState.setAllowChatSigning(true); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java new file mode 100644 index 0000000..1c1958b --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java @@ -0,0 +1,30 @@ +package com.aizistral.nochatreports.mixins.client; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +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.config.NCRConfig; + +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.GridWidget; +import net.minecraft.client.gui.screens.OptionsScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; + +@Mixin(GridWidget.RowHelper.class) +public abstract class MixinRowHelper { + + @Inject(method = "addChild(Lnet/minecraft/client/gui/components/AbstractWidget;)" + + "Lnet/minecraft/client/gui/components/AbstractWidget;", at = @At("HEAD"), cancellable = true) + private void onAddChild(AbstractWidget widget, CallbackInfoReturnable info) { + if (NCRConfig.getClient().disableTelemetry() && NCRConfig.getClient().removeTelemetryButton()) + if (OptionsScreen.TELEMETRY.equals(widget.getMessage())) { + info.setReturnValue(widget); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java index fb0d66b..7da207f 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java @@ -1,7 +1,5 @@ package com.aizistral.nochatreports.mixins.client; -import java.lang.reflect.Field; - import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -19,18 +17,8 @@ import net.minecraft.network.protocol.status.ServerStatus; @Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1") public class MixinServerStatusPinger$1 { - private static final Field SERVER_DATA_FIELD; - - static { - // We use reflection here because Mixin's AP dies when trying to process @Shadow of this lol - try { - Class pinger = Class.forName("net.minecraft.client.multiplayer.ServerStatusPinger$1"); - SERVER_DATA_FIELD = pinger.getDeclaredField("val$p_105460_"); - SERVER_DATA_FIELD.setAccessible(true); - } catch (Exception ex) { - throw new RuntimeException("Reflection failed in MixinServerStatusPinger$1", ex); - } - } + @Shadow @Final + private ServerData val$data; /** * @reason Ensure "preventsChatReports" property is transferred from {@link ServerStatus} to @@ -41,17 +29,14 @@ public class MixinServerStatusPinger$1 { @Inject(method = "handleStatusResponse(Lnet/minecraft/network/protocol/status/ClientboundStatusResponsePacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/status/ServerStatus;getPlayers()Lnet/minecraft/network/protocol/status/ServerStatus$Players;", ordinal = 0, shift = At.Shift.BEFORE)) private void getNoChatReports(ClientboundStatusResponsePacket packet, CallbackInfo info) { - try { - boolean preventsReports = ((ServerDataExtension) packet.getStatus()).preventsChatReports(); - ((ServerDataExtension) SERVER_DATA_FIELD.get(this)).setPreventsChatReports(preventsReports); - - if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Received status response packet from server, preventsChatReports: {}", - preventsReports); - } - } catch (IllegalArgumentException | IllegalAccessException ex) { - throw new RuntimeException("Failed to get ServerData field via reflection", ex); + boolean preventsReports = ((ServerDataExtension) packet.getStatus()).preventsChatReports(); + ((ServerDataExtension) this.val$data).setPreventsChatReports(preventsReports); + + if (NCRConfig.getCommon().enableDebugLog()) { + NoChatReports.LOGGER.info("Received status response packet from server, preventsChatReports: {}", + preventsReports); } + } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java index 39fe9e0..859743d 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java @@ -1,17 +1,14 @@ package com.aizistral.nochatreports.mixins.client; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - import com.aizistral.nochatreports.gui.RealmsWarningScreen; import com.mojang.realmsclient.RealmsMainScreen; - import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.network.chat.CommonComponents; -import net.minecraft.network.chat.Component; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(TitleScreen.class) public class MixinTitleScreen extends Screen { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java new file mode 100644 index 0000000..2bd51c6 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java @@ -0,0 +1,33 @@ +package com.aizistral.nochatreports.mixins.client; + +import java.util.concurrent.Executor; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatreports.config.NCRConfig; +import com.mojang.authlib.minecraft.TelemetrySession; +import com.mojang.authlib.minecraft.UserApiService; +import com.mojang.authlib.yggdrasil.YggdrasilUserApiService; + +import net.minecraft.client.telemetry.ClientTelemetryManager; + +@Mixin(value = YggdrasilUserApiService.class, remap = false) +public class MixinYggdrasilUserApiService { + + /** + * @reason Privacy. + * @author Aizistral + */ + + @Inject(method = "newTelemetrySession", at = @At("HEAD"), cancellable = true) + private void onCreateTelemetrySession(Executor executor, CallbackInfoReturnable info) { + if (NCRConfig.getClient().disableTelemetry()) { + info.setReturnValue(TelemetrySession.DISABLED); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java index 9268092..ebe1fbb 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java @@ -36,6 +36,12 @@ public class MixinServerStatus implements ServerDataExtension { @Override public boolean preventsChatReports() { + var self = (ServerStatus) (Object) this; + + if (self.getVersion() != null && self.getVersion().getProtocol() < 759 + && self.getVersion().getProtocol() > 0) + return true; + return this.preventsChatReports; } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java deleted file mode 100644 index 1065a5a..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.aizistral.nochatreports.mixins.server; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.player.ProfilePublicKey; - -@Mixin(Player.class) -public class MixinPlayer { - - /** - * @reason Prevents server from trying to validate signatures on incoming - * chat messages. Also prevents it from relaying public keys to other clients. - * @author Aizistral - */ - - @Inject(method = "getProfilePublicKey", at = @At("HEAD"), cancellable = true) - private void onGetProfileKey(CallbackInfoReturnable info) { - info.setReturnValue(null); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java index 79a6959..6cbafe2 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java @@ -5,7 +5,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import net.minecraft.network.chat.ChatSender; import net.minecraft.network.chat.PlayerChatMessage; import net.minecraft.server.players.PlayerList; @@ -18,7 +17,7 @@ public class MixinPlayerList { */ @Inject(method = "verifyChatTrusted", at = @At("HEAD"), cancellable = true) - private void onVerifyChatTrusted(PlayerChatMessage playerChatMessage, ChatSender chatSender, CallbackInfoReturnable info) { + private void onVerifyChatTrusted(PlayerChatMessage playerChatMessage, CallbackInfoReturnable info) { info.setReturnValue(true); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java index c6fcbe0..395f317 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -11,8 +11,8 @@ import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; import net.minecraft.network.PacketSendListener; +import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientboundPlayerChatHeaderPacket; import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; import net.minecraft.server.level.ServerPlayer; @@ -34,15 +34,15 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true) private void onSend(Packet packet, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.message().serverContent()); + NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + : chat.body().content()); } if (NCRConfig.getCommon().convertToGameMessage()) { - if (packet instanceof ClientboundPlayerChatHeaderPacket) { - info.cancel(); - } else if (packet instanceof ClientboundPlayerChatPacket chat) { + if (packet instanceof ClientboundPlayerChatPacket chat) { packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level.registryAccess()) - .get().decorate(chat.message().serverContent()), false); + .get().decorate(chat.unsignedContent() != null ? chat.unsignedContent() + : Component.literal(chat.body().content())), false); info.cancel(); this.send(packet); @@ -59,13 +59,12 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC at = @At("HEAD"), cancellable = true) private void onSend(Packet packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.message().serverContent()); + NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + : chat.body().content()); } if (NCRConfig.getCommon().convertToGameMessage()) { - if (packet instanceof ClientboundPlayerChatHeaderPacket) { - info.cancel(); - } else if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) { + if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) { info.cancel(); ((ServerGamePacketListenerImpl) (Object) this).send(chat); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java index d9332c1..44b3284 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java @@ -20,7 +20,7 @@ public class MixinServerboundChatPacket { @Inject(method = "signature", at = @At("RETURN"), cancellable = true) private void onGetSignature(CallbackInfoReturnable info) { - info.setReturnValue(MessageSignature.EMPTY); + info.setReturnValue(null); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java new file mode 100644 index 0000000..d88a2eb --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java @@ -0,0 +1,36 @@ +package com.aizistral.nochatreports.mixins.server; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.aizistral.nochatreports.config.NCRConfig; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.game.ServerGamePacketListener; +import net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket; +import net.minecraft.server.network.ServerGamePacketListenerImpl; + +@Mixin(ServerboundChatSessionUpdatePacket.class) +public class MixinServerboundChatSessionUpdatePacket { + + /** + * @reason Ignore chat sessions from client, since we throw away signatures anyways. + * @author Aizistral + */ + + @Inject(method = "handle", at = @At("HEAD"), cancellable = true) + private void onHandle(ServerGamePacketListener listener, CallbackInfo info) { + var impl = (ServerGamePacketListenerImpl) listener; + + if (!impl.getPlayer().getServer().isSingleplayerOwner(impl.getPlayer().getGameProfile())) { + if (NCRConfig.getCommon().demandOnClient()) { + impl.disconnect(Component.literal(NCRConfig.getCommon().demandOnClientMessage())); + } + } + + info.cancel(); + } + +} diff --git a/src/main/resources/assets/nochatreports/lang/ca_es.json b/src/main/resources/assets/nochatreports/lang/ca_es.json index a137fde..f2b0410 100644 --- a/src/main/resources/assets/nochatreports/lang/ca_es.json +++ b/src/main/resources/assets/nochatreports/lang/ca_es.json @@ -1,11 +1,11 @@ { - "gui.nochatreport.secureChat": "Aquesta opció no pot funcionar amb No Chat Reports, ja que no n'hi ha signatures per a verificar.", - "gui.nochatreport.noReporting": "Els reports del xat hi són deshabilitats en aquest servidor, cortesia de No Chat Reports.", + "gui.nochatreports.secure_chat": "Aquesta opció no pot funcionar amb No Chat Reports, ja que no n'hi ha signatures per a verificar.", + "gui.nochatreports.no_reporting": "Els reports del xat hi són deshabilitats en aquest servidor, cortesia de No Chat Reports.", "disconnect.nochatreports.client": "Aquest servidor no té No Chat Reports, i vostè el té configurat perquè sigui requerit al servidor.", - "gui.nochatreports.status_secure": "Aquest servidor té No Chat Reports instal·lat, o preveu que els seus missatges siguin reportats d'altra forma coneguda. Pots xatejar amb seguretat.", - "gui.nochatreports.status_unintrusive": "Aquest servidor no evita els reports de xat, però permet que enviïs missatges sense signatura. Tècnicament - encara poden ser reportats a Mojang, però generalment, no seran considerats evidencia vàlida, i és poc probable que es prengui alguna mesura sobre aquests.", - "gui.nochatreports.status_insecure": "Aquest servidor demana que tots els missatges enviats per jugadors tinguin signatura, i vostè ha estat d'acord amb aquests termes. Tot el que enviïs en el xat pot ser usat com a evidència incriminatòria en la seva contra en el report. Pots eliminar aquest servidor de NoChatReports.json en la teva carpeta de configuració manualment per a no ser advertit altra vegada.", - "gui.nochatreports.status_undefined": "No Chat Reports no ha pogut avaluar la seguretat d'aquest servidor. Això no deuria haver passat, si us plau informi d'aquest error al desenvolupador d'aquest mod.", + "gui.nochatreports.safety_status.secure": "Aquest servidor té No Chat Reports instal·lat, o preveu que els seus missatges siguin reportats d'altra forma coneguda. Pots xatejar amb seguretat.", + "gui.nochatreports.OLD_status_unintrusive": "Aquest servidor no evita els reports de xat, però permet que enviïs missatges sense signatura. Tècnicament - encara poden ser reportats a Mojang, però generalment, no seran considerats evidencia vàlida, i és poc probable que es prengui alguna mesura sobre aquests.", + "gui.nochatreports.OLD_status_insecure": "Aquest servidor demana que tots els missatges enviats per jugadors tinguin signatura, i vostè ha estat d'acord amb aquests termes. Tot el que enviïs en el xat pot ser usat com a evidència incriminatòria en la seva contra en el report. Pots eliminar aquest servidor de NoChatReports.json en la teva carpeta de configuració manualment per a no ser advertit altra vegada.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports no ha pogut avaluar la seguretat d'aquest servidor. Això no deuria haver passat, si us plau informi d'aquest error al desenvolupador d'aquest mod.", "gui.nochatreports.unsafe_server.header": "Precaució: Servidor insegur", "gui.nochatreports.unsafe_server.contents": "Aquest servidor requereix que tots els missatges tinguin signatura, això significa que poden ser reportats a Mojang. Això probablement significa que el propietari del servidor ha mantingut 'enforce-secure-profile' habilitat en server.properties, que és el valor per defecte des de 1.19.1. Pots escollir jugar de totes formes, però No Chat Reports podrà protegir-te.", "gui.nochatreports.unsafe_server.check": "No tornar a mostrar per aquest servidor.", diff --git a/src/main/resources/assets/nochatreports/lang/cs_cz.json b/src/main/resources/assets/nochatreports/lang/cs_cz.json index c3c8921..e21c7be 100644 --- a/src/main/resources/assets/nochatreports/lang/cs_cz.json +++ b/src/main/resources/assets/nochatreports/lang/cs_cz.json @@ -1,11 +1,11 @@ { - "gui.nochatreport.secureChat": "Tato možnost nemůže fungovat s No Chat Reports, protože nejsou žádné digitální podpisy pro ověření.", - "gui.nochatreport.noReporting": "Nahlašování v chatu je na tomto serveru zakázáno, díky No Chat Reports.", + "gui.nochatreports.secure_chat": "Tato možnost nemůže fungovat s No Chat Reports, protože nejsou žádné digitální podpisy pro ověření.", + "gui.nochatreports.no_reporting": "Nahlašování v chatu je na tomto serveru zakázáno, díky No Chat Reports.", "disconnect.nochatreports.client": "Tento server nemá No Chat Reports, ale nakonfigurovali jste jej tak, aby byl na serveru vyžadován.", - "gui.nochatreports.status_secure": "Tento server má naninstalované No Chat Reports, nebo zabraňuje aby vaše zprávy mohly být nahlašovatelné jiným známým způsobem. Můžete bezpečně chatovat.", - "gui.nochatreports.status_unintrusive": "Tento server nezabraňuje nahlašování zpráv, ale povoluje odesílání nepodepsaných zpráv. Technicky vzato - mohou stále být nahlášeny Mojangu, ale většinou nejsou považovány za platné důkazy, a je nepravděpodobné, že by na základě těchto zpráv byla přijata jakákoli opatření.", - "gui.nochatreports.status_insecure": "Tento server vyžaduje, aby všechny zprávy byly podepsané, a vy jste souhlasili s tímto nastavením. Všechno co odešlete do chatu je potenciálně usvědčující důkaz, který může být použit proti vám v hlášení. Můžete manuálně odebrat tento server z NoChatReports.json ve vaší 'config' složce, aby jste znovu dostali varování.", - "gui.nochatreports.status_undefined": "No Chat Reports nemůže vyhodnotit bezpečnost tohoto serveru. Toto by se nikdy nemělo stát, prosím nahlašte to jako chybu vývojáři modu.", + "gui.nochatreports.safety_status.secure": "Tento server má naninstalované No Chat Reports, nebo zabraňuje aby vaše zprávy mohly být nahlašovatelné jiným známým způsobem. Můžete bezpečně chatovat.", + "gui.nochatreports.OLD_status_unintrusive": "Tento server nezabraňuje nahlašování zpráv, ale povoluje odesílání nepodepsaných zpráv. Technicky vzato - mohou stále být nahlášeny Mojangu, ale většinou nejsou považovány za platné důkazy, a je nepravděpodobné, že by na základě těchto zpráv byla přijata jakákoli opatření.", + "gui.nochatreports.OLD_status_insecure": "Tento server vyžaduje, aby všechny zprávy byly podepsané, a vy jste souhlasili s tímto nastavením. Všechno co odešlete do chatu je potenciálně usvědčující důkaz, který může být použit proti vám v hlášení. Můžete manuálně odebrat tento server z NoChatReports.json ve vaší 'config' složce, aby jste znovu dostali varování.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports nemůže vyhodnotit bezpečnost tohoto serveru. Toto by se nikdy nemělo stát, prosím nahlašte to jako chybu vývojáři modu.", "gui.nochatreports.unsafe_server.header": "Pozor: Nezabezpečený Server", "gui.nochatreports.unsafe_server.contents": "Tento server vyžaduje, aby všechny zprávy v chatu byly podepsané, což znamená, že je lze nahlásit Mojangu. To pravděpodobně znamená, že majitel serveru ponechal volbu 'enforce-secure-profile' povolenou v server.properties, což je výchozí nastavení od verze 1.19.1. Můžete se rozhodnout hrát i tak, ale No Chat Reports vás nebude moci ochránit.", "gui.nochatreports.unsafe_server.check": "Znovu neukazovat pro tento server", diff --git a/src/main/resources/assets/nochatreports/lang/da_dk.json b/src/main/resources/assets/nochatreports/lang/da_dk.json index 7f0955d..520171f 100644 --- a/src/main/resources/assets/nochatreports/lang/da_dk.json +++ b/src/main/resources/assets/nochatreports/lang/da_dk.json @@ -1,12 +1,12 @@ { - "gui.nochatreport.secureChat": "Denne mulighed virker ikke med No Chat Reports, siden der ikke er nogle signaturer at verficere.", - "gui.nochatreport.noReporting": "Chat rapporter er slået fra på denne server, på grund af No Chat Reports.", + "gui.nochatreports.secure_chat": "Denne mulighed virker ikke med No Chat Reports, siden der ikke er nogle signaturer at verficere.", + "gui.nochatreports.no_reporting": "Chat rapporter er slået fra på denne server, på grund af No Chat Reports.", "disconnect.nochatreports.client": "Denne server har ikke No Chat Reports, men du har selv konfigurede det til at være påkrævet på serveren.", - "gui.nochatreports.status_secure": "Denne server har No Chat Reports installeret, eller forhindrer dine beskeder for at blive rapporteret på en anden kendt måde. Du kan chatte sikkert.", - "gui.nochatreports.status_unintrusive": "Denne server forhindrer ikke chat reports, men tillader stadig at sende usigneret beskeder, hvilke ikke kan blive rapporteret til Mojang. Almindelige klienter vil stadig sende signeret beskeder, vise usigneret beskeder som \"Ikke Sikker\" og ikke vise dem hvis \"Vis Kun Sikker Chat\" er slået til i chat indstillinger.", - "gui.nochatreports.status_insecure": "Denne server kræver alle chat beskeder er signeret, og du har accepteret det arrangement. Alt du sender i chatten er potentielt inkriminerende beviser, der kan blive brugt imod dig i rapporten. Du kan manuelt fjerne denne server fra NoChatReports.json i din konfigurations mappe for at blive advaret igen.", - "gui.nochatreports.status_insecure_whitelist_all_servers": "Denne server kræver alle chat beskeder er signeret og du har fjerne fuldskærms advarslen for det. Alt du sender i chatten er potentielt inkriminerende bevis, der kan blive brugt imod dig i rapporten. Du kan slå \"whitelistAllServers\" fra i NoChatReports.json i din konfigurations mappe, for at blive advaret igen.", - "gui.nochatreports.status_undefined": "No Chat Reports kunne ikke verificere sikkerheden af denne server. Dette burde aldrig ske, venligst rapporter det som en fejl til mod udvikleren.", + "gui.nochatreports.safety_status.secure": "Denne server har No Chat Reports installeret, eller forhindrer dine beskeder for at blive rapporteret på en anden kendt måde. Du kan chatte sikkert.", + "gui.nochatreports.OLD_status_unintrusive": "Denne server forhindrer ikke chat reports, men tillader stadig at sende usigneret beskeder, hvilke ikke kan blive rapporteret til Mojang. Almindelige klienter vil stadig sende signeret beskeder, vise usigneret beskeder som \"Ikke Sikker\" og ikke vise dem hvis \"Vis Kun Sikker Chat\" er slået til i chat indstillinger.", + "gui.nochatreports.OLD_status_insecure": "Denne server kræver alle chat beskeder er signeret, og du har accepteret det arrangement. Alt du sender i chatten er potentielt inkriminerende beviser, der kan blive brugt imod dig i rapporten. Du kan manuelt fjerne denne server fra NoChatReports.json i din konfigurations mappe for at blive advaret igen.", + "gui.nochatreports.OLD_status_insecure_whitelist_all_servers": "Denne server kræver alle chat beskeder er signeret og du har fjerne fuldskærms advarslen for det. Alt du sender i chatten er potentielt inkriminerende bevis, der kan blive brugt imod dig i rapporten. Du kan slå \"whitelistAllServers\" fra i NoChatReports.json i din konfigurations mappe, for at blive advaret igen.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports kunne ikke verificere sikkerheden af denne server. Dette burde aldrig ske, venligst rapporter det som en fejl til mod udvikleren.", "gui.nochatreports.unsafe_server.header": "Advarsel: Usikker Server", "gui.nochatreports.unsafe_server.contents": "Denne server kræver alle chat beskeder bliver signeret, hvilket betyder de kan blive rapporteret til Mojang, hvilket kan resultere i en bandlysning fra alle multiplayer servere. Dette betyder nok at server ejeren har beholdt \"enforce-secure-profile\" slået til i server.properties, hvilket er standarden siden 1.19.1. Du kan stadig vælge at spille, men No Chat Reports vil ikke være i stand til at beskytte dig.", "gui.nochatreports.unsafe_server.check": "Vis ikke igen for denne server", diff --git a/src/main/resources/assets/nochatreports/lang/de_de.json b/src/main/resources/assets/nochatreports/lang/de_de.json index 72ba05e..a42f438 100644 --- a/src/main/resources/assets/nochatreports/lang/de_de.json +++ b/src/main/resources/assets/nochatreports/lang/de_de.json @@ -1,11 +1,11 @@ { - "gui.nochatreport.secureChat": "Diese Option kann nicht mit No Chat Reports verwendet werden, da keine Signaturen zum Verifizieren vorhanden sind.", - "gui.nochatreport.noReporting": "Nachrichten melden ist auf diesem Server dank No Chat Reports deaktiviert.", + "gui.nochatreports.secure_chat": "Diese Option kann nicht mit No Chat Reports verwendet werden, da keine Signaturen zum Verifizieren vorhanden sind.", + "gui.nochatreports.no_reporting": "Nachrichten melden ist auf diesem Server dank No Chat Reports deaktiviert.", "disconnect.nochatreports.client": "Dieser Server hat No Chat Reports nicht installiert, aber du hast eingestellt, dass es auf Servern notwendig ist.", - "gui.nochatreports.status_secure": "Dieser Server hat No Chat Reports installiert oder verhindert das Melden von Nachrichten auf eine andere bekannte Weise. Niemand sieht einen roten Balken, ein (!) Symbol oder kann Nachrichten mit \"Nur sicheren Chat anzeigen\" verstecken. Du kannst sicher chatten.", - "gui.nochatreports.status_unintrusive": "Dieser Server erlaubt dir, unsignierte Nachrichten zu schicken, welche nicht an Mojang gemeldet werden können. Vanilla-Clients sehen jedoch einen roten Balken links sowie ein (!) Symbol rechts von deinen Nachrichten und Spieler, die die Option \"Nur sicheren Chat anzeigen\" aktivieren, sehen deine Nachrichten überhaupt nicht.", - "gui.nochatreports.status_insecure": "Dieser Server verlangt, dass alle Chatnachrichten signiert sind, und du hast dieser Anforderung zugestimmt. Alles, was du in den Chat schreibst, ist ein potenziell belastender Beweis und kann in Meldungen gegen dich verwendet werden. Du kannst den Server manuell aus der NoChatReports.json im config-Ordner entfernen, um wieder gewarnt zu werden.", - "gui.nochatreports.status_undefined": "No Chat Reports konnte die Sicherheit dieses Servers nicht einschätzen. Dies sollte niemals vorkommen, bitte melde es dem Mod-Entwickler als einen Bug.", + "gui.nochatreports.safety_status.secure": "Dieser Server hat No Chat Reports installiert oder verhindert das Melden von Nachrichten auf eine andere bekannte Weise. Niemand sieht einen roten Balken, ein (!) Symbol oder kann Nachrichten mit \"Nur sicheren Chat anzeigen\" verstecken. Du kannst sicher chatten.", + "gui.nochatreports.OLD_status_unintrusive": "Dieser Server erlaubt dir, unsignierte Nachrichten zu schicken, welche nicht an Mojang gemeldet werden können. Vanilla-Clients sehen jedoch einen roten Balken links sowie ein (!) Symbol rechts von deinen Nachrichten und Spieler, die die Option \"Nur sicheren Chat anzeigen\" aktivieren, sehen deine Nachrichten überhaupt nicht.", + "gui.nochatreports.OLD_status_insecure": "Dieser Server verlangt, dass alle Chatnachrichten signiert sind, und du hast dieser Anforderung zugestimmt. Alles, was du in den Chat schreibst, ist ein potenziell belastender Beweis und kann in Meldungen gegen dich verwendet werden. Du kannst den Server manuell aus der NoChatReports.json im config-Ordner entfernen, um wieder gewarnt zu werden.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports konnte die Sicherheit dieses Servers nicht einschätzen. Dies sollte niemals vorkommen, bitte melde es dem Mod-Entwickler als einen Bug.", "gui.nochatreports.unsafe_server.header": "Vorsicht: unsicherer Server", "gui.nochatreports.unsafe_server.contents": "Dieser Server verlangt, dass alle Chatnachrichten signiert sind, was bedeutet, dass sie an Mojang gemeldet werden können, was zu einem Bann aus dem gesamten Mehrspieler führen kann. Wahrscheinlich hat der Server-Besitzer \"enforce-secure-profile\" in der server.properties aktiviert gelassen, was seit der 1.19.1 der Standardwert ist. Du kannst trotzdem spielen, aber No Chat Reports kann dich nicht schützen.", "gui.nochatreports.unsafe_server.check": "Nicht nochmal anzeigen für diesen Server", diff --git a/src/main/resources/assets/nochatreports/lang/en_pt.json b/src/main/resources/assets/nochatreports/lang/en_pt.json index d323dfb..c8bad35 100644 --- a/src/main/resources/assets/nochatreports/lang/en_pt.json +++ b/src/main/resources/assets/nochatreports/lang/en_pt.json @@ -1,13 +1,13 @@ { "modmenu.descriptionTranslation.nochatreports": "Strips cryptographic signatures from player messages, makin' it impossible to track an' associate them with yer Mojang/Microsoft account, as well as use player chat reportin' feature.", - "gui.nochatreport.secureChat": "This here option cannot work with No Chat Reports, since there be no signatures to verify.", - "gui.nochatreport.noReporting": "Chat reports be disabled on this here server, courtesy o' No Chat Reports.", + "gui.nochatreports.secure_chat": "This here option cannot work with No Chat Reports, since there be no signatures to verify.", + "gui.nochatreports.no_reporting": "Chat reports be disabled on this here server, courtesy o' No Chat Reports.", "disconnect.nochatreports.client": "This here server does not 'ave No Chat Reports, an' ye 'ave it configured to require itself on server.", - "gui.nochatreports.status_secure": "This here server 'as No Chat Reports installed, or prevents yer messages from bein' reportable in some other known way. Ye can chat safely.", - "gui.nochatreports.status_unintrusive": "This here server does not prevent chat reports, but allows ye to send unsigned messages which cannot be reported to Mojang. Vanilla clients will still send signed messages, display unsigned messages as \"Not Secure\" an' not show them if \"Only Show Secure Chat\" be enabled in chat options.", - "gui.nochatreports.status_insecure": "This here server demands all chat messages to be signed an' ye yay to proceed with this here arrangement. Everythin' ye send in the chat be potentially incriminatin' evidence that there can be used against ye in the report. Ye can remove this here server from §oWhitelisted Servers§r in the mod config to get warned again.", - "gui.nochatreports.status_insecure_whitelist_all_servers": "This here server demands all chat messages to be signed an' ye disabled the full-screen warnin' fer it. Everythin' ye send in the chat be potentially incriminatin' evidence that there can be used against ye in the report. Ye can disable §oWhitelist all servers§r in the mod config to get warned again.", - "gui.nochatreports.status_undefined": "No Chat Reports could not evaluate the safety o' this here server. This here should ne'er 'appen, please report it as a bug to the mod developer.", + "gui.nochatreports.safety_status.secure": "This here server 'as No Chat Reports installed, or prevents yer messages from bein' reportable in some other known way. Ye can chat safely.", + "gui.nochatreports.OLD_status_unintrusive": "This here server does not prevent chat reports, but allows ye to send unsigned messages which cannot be reported to Mojang. Vanilla clients will still send signed messages, display unsigned messages as \"Not Secure\" an' not show them if \"Only Show Secure Chat\" be enabled in chat options.", + "gui.nochatreports.OLD_status_insecure": "This here server demands all chat messages to be signed an' ye yay to proceed with this here arrangement. Everythin' ye send in the chat be potentially incriminatin' evidence that there can be used against ye in the report. Ye can remove this here server from §oWhitelisted Servers§r in the mod config to get warned again.", + "gui.nochatreports.OLD_status_insecure_whitelist_all_servers": "This here server demands all chat messages to be signed an' ye disabled the full-screen warnin' fer it. Everythin' ye send in the chat be potentially incriminatin' evidence that there can be used against ye in the report. Ye can disable §oWhitelist all servers§r in the mod config to get warned again.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports could not evaluate the safety o' this here server. This here should ne'er 'appen, please report it as a bug to the mod developer.", "gui.nochatreports.unsafe_server.header": "Caution: Unsafe Server", "gui.nochatreports.unsafe_server.contents": "This here 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 here likely means that there the server owner kept \"enforce-secure-profile\" enabled in the server.properties, which be the default since 1.19.1. Ye can choose to play anyway, but No Chat Reports will not be able to protect ye.", "gui.nochatreports.unsafe_server.check": "Do not show again fer this here server", diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 776abb4..e91154e 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -1,18 +1,23 @@ { "modmenu.descriptionTranslation.nochatreports": "Strips cryptographic signatures from player messages, making it impossible to track and associate them with your Mojang/Microsoft account, as well as use Player Chat Reporting feature.", - "gui.nochatreport.secureChat": "This option cannot work with No Chat Reports, since there are no signatures to verify.", - "gui.nochatreport.noReporting": "Chat reports are disabled on this server, courtesy of No Chat Reports.", + "gui.nochatreports.secure_chat": "This option cannot work with No Chat Reports, since there are no signatures to verify.", + "gui.nochatreports.no_reporting": "Chat reports are disabled on this server, courtesy of No Chat Reports.", "disconnect.nochatreports.client": "This server does not have No Chat Reports, and you have it configured to require itself on server.", - "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 \"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 remove this server from §oWhitelisted Servers§r in the mod config to get warned again.", - "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_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 §oWhitelist all servers§r in the mod config to get warned again.", - "gui.nochatreports.status_unknown": "No Chat Reports was toggled mid-session. Server safety status can only be evaluated on login. Please re-join the server to evaluate its safety status.", - "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.", - "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.", - "gui.nochatreports.unsafe_server.check": "Do not show again for this server", + "gui.nochatreports.safety_status_button.controls": "Left-click to cycle between signing modes.", + "gui.nochatreports.safety_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.safety_status.singleplayer": "You can always chat safely in singleplayer.", + "gui.nochatreports.safety_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.safety_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.safety_status.insecure_signing": "You have enabled chat signing, which makes all your messages a potentially incriminating evidence that can be used against you in the report.", + "gui.nochatreports.safety_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.safety_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.safety_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.", + "gui.nochatreports.signing_status.allowed_realms": "Chat signing is always enabled on Realms, since it is always required and disabling it would yield no benefit anyways.", + "gui.nochatreports.signing_status.allowed": "Message signing is enabled for this session.", + "gui.nochatreports.signing_status.allowed_session": "Message signing is enabled for this session, but it will be disabled once you re-join.", + "gui.nochatreports.signing_status.disabled": "Message signing is disabled for this session.", + "gui.nochatreports.signing_status.disabled_allowance_pending": "Message signing is disabled for this session, but it will be enabled once you send any message.", + "gui.nochatreports.signing_status.disabled_offline": "Message signing is disabled since this is an offline server.", "gui.nochatreports.reload_config_tooltip": "Reload No Chat Reports config. Use carefully.", "gui.nochatreports.verified_server": "§a§lSafe Server§r\nWe could verify that this server has No Chat Reports installed, or prevents chat reports in some other known way. You can chat there safely.", "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nDisable or enable most of the mod's client-sided functionality. You may have to do this to join some Paper/Velocity servers, as they are known for causing issues with NCR.\nCertain networking-unrelated things, such as encryption, chat trust status tweaks and removal of vanilla's \"Chat messages can't be verified\" toast will still work; they can be disabled in config individually.", @@ -52,72 +57,72 @@ "gui.nochatreports.realms_warning.contents": "Realms servers are not private. Realm owners cannot disable chat reporting, and Mojang applies additional chat monitoring to identify potential \"online harms\" and escalate them to human review. If you are then found to violate Minecraft's Community Standards - even if chat participants did not get offended - you will be banned, temporarily or permanently, from all multiplayer services. Use of encryption is highly advised.", "gui.nochatreports.realms_warning.check": "Don't show again", "gui.nochatreports.realms_warning.learn_more": "Learn More", - "gui.NoChatReports.showEncryptionButtonWarning": "§cBelow does not disable encryption, it only hides the button!", + "gui.nochatreports.signing_required.header": "Caution: Chat Signing Requested", + "gui.nochatreports.signing_required.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.\n\nClick \"Allow Signing\" to enable message signing for this session. You can also use safety status button in chat screen to select signing mode for this server.", + "gui.nochatreports.signing_required.allow_signing": "Allow Signing", + "gui.nochatreports.signing_required.cancel": "Dismiss", + "gui.nochatreports.signing_required.check": "Don't show again during this session", + "chat.nochatreports.disabled.signing_requested": "Server refused to deliver unsigned message. You can enable chat signing by changing your signing mode or through prompt screen.", + "gui.nochatreports.signing_mode": "§lSigning Mode: %1$s", + "gui.nochatreports.signing_mode.default": "Default (%1$s)", + "gui.nochatreports.signing_mode.always": "Always", + "gui.nochatreports.signing_mode.never": "Never", + "gui.nochatreports.signing_mode.never_forced": "Cannot Enable", + "gui.nochatreports.signing_mode.prompt": "Prompt", + "gui.nochatreports.signing_mode.on_demand": "On Demand", + "gui.nochatreports.signing_mode.always.tooltip": "This mode automatically enables message signing as soon as you enter the server, identically to how vanilla client would.", + "gui.nochatreports.signing_mode.never.tooltip": "In this mode messages are never signed, and all server requests to sign them are ignored.", + "gui.nochatreports.signing_mode.never_forced.tooltip": "This mode indicates that your messages cannot be signed at all, either because you are using an offline account or client failed to fetch your signing keys from Mojang's service.", + "gui.nochatreports.signing_mode.prompt.tooltip": "In this mode messages are not signed by default, but if server demands signing - you will be shown a pop-up screen where you can enable signing for one session.", + "gui.nochatreports.signing_mode.on_demand.tooltip": "Similar to prompt mode, but instead of showing pop-up screen signing will just be enabled automatically as soon as server demands it.", "configuration.NoChatReports.config": "No Chat Reports", - - "configuration.NoChatReports.category.visual": "Visual", - - "option.NoChatReports.showServerSafety": "Show server safety", - "option.NoChatReports.showServerSafety.tooltip": "Allows the client to display server safety status in bottom-right corner of chat screen. The icon is hoverable for additional information.", - "option.NoChatReports.showServerSafety.moreInfo": "§bClick here to read more about server safety levels", + "configuration.NoChatReports.category.client": "Client", + "option.NoChatReports.enableMod": "Enable mod", + "option.NoChatReports.enableMod.tooltip": "Responsible for enabling most of the mod's client-sided functionality. Will require re-joining the server to take effect if toggled mid-session.", + "option.NoChatReports.showNCRButton": "Show NCR button", + "option.NoChatReports.showNCRButton.tooltip": "Adds a button that toggles most of the mod's client-sided functionality to multiplayer menu.", + "option.NoChatReports.defaultSigningMode": "Default signing mode", + "option.NoChatReports.defaultSigningMode.tooltip": "Sets the signing mode default for servers that force or allow chat signing.", + "option.NoChatReports.showReloadButton": "Show reload button", + "option.NoChatReports.showReloadButton.tooltip": "Adds a button for config reloading to multiplayer menu.", "option.NoChatReports.verifiedIconEnabled": "Verified icon enabled", "option.NoChatReports.verifiedIconEnabled.tooltip": "Allows the mod to display special icon in multiplayer menu for servers that have No Chat Reports or some other anti-chat-reporting measures installed.", "option.NoChatReports.verifiedIconOffsetX": "Verified icon X-offset", "option.NoChatReports.verifiedIconOffsetX.tooltip": "Defines X-axis offset for rendering of \"Safe Server\" icon.", "option.NoChatReports.verifiedIconOffsetY": "Verified icon Y-offset", "option.NoChatReports.verifiedIconOffsetY.tooltip": "Defines Y-axis offset for rendering of \"Safe Server\" icon.", - "option.NoChatReports.hideRedChatIndicators": "Hide red chat indicators", - "option.NoChatReports.hideRedChatIndicators.tooltip": "Prevents the client from displaying \"Not Secure\" indicators, in the form of red bar to the left and §c§l(§r§c!§c§l)§r icon to the right of chat message.", - "option.NoChatReports.hideYellowChatIndicators": "Hide yellow chat indicators", - "option.NoChatReports.hideYellowChatIndicators.tooltip": "Prevents the client from displaying \"Modified\" indicators, in the form of yellow bar to the left and §e§l(§r§e?§e§l)§r icon to the right of chat message.", - "option.NoChatReports.hideGrayChatIndicators": "Hide gray chat indicators", - "option.NoChatReports.hideGrayChatIndicators.tooltip": "Prevents the client from displaying special indicators for system messages, in the form of gray bar to the left.", + "gui.NoChatReports.showEncryptionButtonWarning": "§cBelow does not disable encryption, it only hides the button!", + "option.NoChatReports.showEncryptionButton": "Show encryption button", + "option.NoChatReports.showEncryptionButton.tooltip": "Setting this to false will simply prevent encryption button from being displayed in the chat screen. Be aware that encryption itself will not be automatically disabled along with the button.", + "option.NoChatReports.showEncryptionIndicators": "Show encryption indicators", + "option.NoChatReports.showEncryptionIndicators.tooltip": "Toggles the display of the encrypted message indicators, in the form of a purple bar to the left and §5§l(§r§5ȯ§5§l)§r on hover to the right of the chat message.", + "option.NoChatReports.showServerSafety": "Show server safety", + "option.NoChatReports.showServerSafety.tooltip": "Allows the client to display server safety status in bottom-right corner of chat screen. The icon is hoverable for additional information.", + "option.NoChatReports.showServerSafety.moreInfo": "§bClick here to read more about server safety levels", + "option.NoChatReports.hideInsecureMessageIndicators": "Hide unverified message indicators", + "option.NoChatReports.hideInsecureMessageIndicators.tooltip": "Prevents the client from displaying unverified message indicators, in the form of a gray bar to the left of the chat message.", + "option.NoChatReports.hideModifiedMessageIndicators": "Hide modified message indicators", + "option.NoChatReports.hideModifiedMessageIndicators.tooltip": "Prevents the client from displaying modified message indicators, in the form of a gray bar to the left and §7§l(§r§7?§7§l)§r on hover to the right of the chat message.", + "option.NoChatReports.hideSystemMessageIndicators": "Hide system message indicators", + "option.NoChatReports.hideSystemMessageIndicators.tooltip": "Prevents the client from displaying system message indicators, in the form of a gray bar to the left of the chat message.", "option.NoChatReports.hideWarningToast": "Hide warning toast", "option.NoChatReports.hideWarningToast.tooltip": "Removes a warning toast that is displayed when entering servers with disabled §oenforce-secure-profile§r.", + "option.NoChatReports.hideSigningRequestMessage": "Hide signing request message", + "option.NoChatReports.hideSigningRequestMessage.tooltip": "Hides the chat message that is shown when the server requests the client to sign messages.", "option.NoChatReports.alwaysHideReportButton": "Always hide report button", "option.NoChatReports.alwaysHideReportButton.tooltip": "Prevents the client from ever showing report button in Social Interactions screen. This is disabled by default, and mod simply makes button inactive on servers that have No Chat Reports installed, adding an explanation to the tooltip of the button.", - - "configuration.NoChatReports.category.technical": "Technical", - "option.NoChatReports.demandOnServer": "Demand on server", "option.NoChatReports.demandOnServer.tooltip": "Prevents the client from joining servers that don't have No Chat Reports installed.", "option.NoChatReports.enableDebugLog": "Enable debug log", "option.NoChatReports.enableDebugLog.tooltip": "Enables logging of certain debug information. This is generally useless for non-developers.", "option.NoChatReports.disableTelemetry": "Disable telemetry", "option.NoChatReports.disableTelemetry.tooltip": "Allows the mod to disable built-in telemetry, similar to how No Telemetry does.", - "option.NoChatReports.showReloadButton": "Show reload button", - "option.NoChatReports.showReloadButton.tooltip": "Adds a button for config reloading to multiplayer menu.", - "option.NoChatReports.whitelistAllServers": "Whitelist all servers", - "option.NoChatReports.whitelistAllServers.tooltip": "Makes the mod behave as if all servers were added to §oWhitelisted Servers§r list.", - "option.NoChatReports.showNCRButton": "Show NCR button", - "option.NoChatReports.showNCRButton.tooltip": "Adds a button that toggles most of the mod's client-sided functionality to multiplayer menu.", - "option.NoChatReports.enableMod": "Enable mod", - "option.NoChatReports.enableMod.tooltip": "Responsible for enabling most of the mod's client-sided functionality, see option above.", - "option.NoChatReports.reconnectAwaitSeconds": "Reconnect await seconds", - "option.NoChatReports.reconnectAwaitSeconds.tooltip": "Number of seconds which client should wait before automatic reconnect once server rejects connection without chat signing key, assuming user agreed to enter unsafe server.", - "option.NoChatReports.postDisconnectAwaitSeconds": "Post disconnect await seconds", - "option.NoChatReports.postDisconnectAwaitSeconds.tooltip": "Similar to §oreconnectAwaitSeconds§r, but countdown starts as soon as player disconnects from the server normally. If this delay is greater than §oreconnectAwaitSeconds§r when they try to re-join the server - then it will apply instead.", - "option.NoChatReports.signingCheckDelaySeconds": "Signing check delay seconds", - "option.NoChatReports.signingCheckDelaySeconds.tooltip": "Delay for checking whether whitelisted servers still enforce chat signing, in seconds. Setting this to 0 will cause check to be performed on every login attempt, similar to non-whitelisted servers.", - "option.NoChatReports.serverSigningChecks": "Server signing checks", - "option.NoChatReports.serverSigningChecks.tooltip": "Map of whitelisted servers to last signing enforcement check times, in epoch seconds. This typically does not have to be edited manually.", - "option.NoChatReports.showEncryptionButton": "Show encryption button", - "option.NoChatReports.showEncryptionButton.tooltip": "Setting this to false will simply prevent encryption button from being displayed in the chat screen. Be aware that encryption itself will not be automatically disabled along with the button.", - - "configuration.NoChatReports.category.whitelistedServers": "Whitelisted Servers", - - "option.NoChatReports.whitelistedServers": "Whitelisted Servers", - "option.NoChatReports.whitelistedServers.tooltip": "Contains servers for which \"Unsafe Server\" warning screen should never display. Servers are added to this list automatically when you check \"Do not show again for this server\" box in that screen.\nEach entry is a string that is formatted as §l:§r.", - "option.NoChatReports.whitelistedServers.addButtonTooltip": "Add server", - "option.NoChatReports.whitelistedServers.removeButtonTooltip": "Remove selected server", - "option.NoChatReports.whitelistedServers.instructions": "Click the + to add a server. Click the - to remove the selected server.", - "option.NoChatReports.whitelistedServers.serverAddress": "Click here to edit server address", - - "configuration.NoChatReports.category.lanOptions": "LAN Options", - + "configuration.NoChatReports.category.lan": "LAN", "option.NoChatReports.demandOnClient": "Demand on client", "option.NoChatReports.demandOnClient.tooltip": "Makes the server require all joining clients to have No Chat Reports installed.", + "option.NoChatReports.demandOnClientMessage": "Demand on client kick message", + "option.NoChatReports.demandOnClientMessage.tooltip": "Message that is displayed to the client when it tries to join the server without having No Chat Reports installed.", "option.NoChatReports.convertToGameMessage": "Convert to game message", "option.NoChatReports.convertToGameMessage.tooltip": "Makes the server convert all player messages into system messages. System messages don't have any signatures attached and cannot be reported; on unmodified clients they will display with gray bar to the left.", "option.NoChatReports.addQueryData": "Add query data", diff --git a/src/main/resources/assets/nochatreports/lang/es_es.json b/src/main/resources/assets/nochatreports/lang/es_es.json index b0c9043..be7148a 100644 --- a/src/main/resources/assets/nochatreports/lang/es_es.json +++ b/src/main/resources/assets/nochatreports/lang/es_es.json @@ -1,13 +1,13 @@ { "modmenu.descriptionTranslation.nochatreports": "Elimina las firmas criptográficas de los mensajes de los jugadores, lo que imposibilita rastrearlos y asociarlos con tu cuenta de Mojang/Microsoft, así como usar la función de reportes de chat.", - "gui.nochatreport.secureChat": "Esta opción no puede funcionar con No Chat Reports, ya que no hay firmas para verificar.", - "gui.nochatreport.noReporting": "Los reportes de chat están deshabilitados en este servidor, cortesía de No Chat Reports.", + "gui.nochatreports.secure_chat": "Esta opción no puede funcionar con No Chat Reports, ya que no hay firmas para verificar.", + "gui.nochatreports.no_reporting": "Los reportes de chat están deshabilitados en este servidor, cortesía de No Chat Reports.", "disconnect.nochatreports.client": "Este servidor no tiene No Chat Reports, y usted lo tiene configurado para que sea requerido en el servidor.", - "gui.nochatreports.status_secure": "Este servidor tiene No Chat Reports instalado, o previene que sus mensajes sean reportados de algún otro modo conocido. Puedes chatear con seguridad.", - "gui.nochatreports.status_unintrusive": "Este servidor no previene reportes de chat, pero permite que envíes mensajes sin firma. Clientes vanilla todavía enviaran mensajes firmados, mostrar mensajes sin firma como \"No Seguro\" y no mostrarlos si \"Mostrar Solo Chat Seguro\" está activado en las opciones de chat.", - "gui.nochatreports.status_insecure": "Este servidor demanda que todos los mensajes de chat estén firmados, y usted estuvo de acuerdo con estos términos. Todo lo que envíes en el chat puede ser usado como evidencia incriminativa en su contra en el reporte. Puedes remover este servidor de §oServidores Permitidos§r en la configuración del mod para ser advertido de vuelta.", - "gui.nochatreports.status_insecure_whitelist_all_servers": "Este servidor demanda que todos los mensajes de chat estén firmados y tu deshabilitaste la advertencia de pantalla completa para esto. Todo lo que envíes en el chat puede ser usado como evidencia incriminativa en su contra en el reporte. Puedes deshabilitar §oPermitir todos los servidores§r en la configuración del mod para ser advertido de vuelta.", - "gui.nochatreports.status_undefined": "No Chat Reports no pudo evaluar la seguridad de este servidor. Esto no debería pasar, por favor informe de este error al desarrollador de este mod.", + "gui.nochatreports.safety_status.secure": "Este servidor tiene No Chat Reports instalado, o previene que sus mensajes sean reportados de algún otro modo conocido. Puedes chatear con seguridad.", + "gui.nochatreports.OLD_status_unintrusive": "Este servidor no previene reportes de chat, pero permite que envíes mensajes sin firma. Clientes vanilla todavía enviaran mensajes firmados, mostrar mensajes sin firma como \"No Seguro\" y no mostrarlos si \"Mostrar Solo Chat Seguro\" está activado en las opciones de chat.", + "gui.nochatreports.OLD_status_insecure": "Este servidor demanda que todos los mensajes de chat estén firmados, y usted estuvo de acuerdo con estos términos. Todo lo que envíes en el chat puede ser usado como evidencia incriminativa en su contra en el reporte. Puedes remover este servidor de §oServidores Permitidos§r en la configuración del mod para ser advertido de vuelta.", + "gui.nochatreports.OLD_status_insecure_whitelist_all_servers": "Este servidor demanda que todos los mensajes de chat estén firmados y tu deshabilitaste la advertencia de pantalla completa para esto. Todo lo que envíes en el chat puede ser usado como evidencia incriminativa en su contra en el reporte. Puedes deshabilitar §oPermitir todos los servidores§r en la configuración del mod para ser advertido de vuelta.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports no pudo evaluar la seguridad de este servidor. Esto no debería pasar, por favor informe de este error al desarrollador de este mod.", "gui.nochatreports.unsafe_server.header": "Precaución: Servidor inseguro", "gui.nochatreports.unsafe_server.contents": "Este servidor requiere que todos los mensajes de chat estén firmados, lo que significa que pueden ser reportados a Mojang, lo que podría resultar en un ban de todos los servidores multijugador. Esto probablemente significa que el dueño del servidor mantuvo \"enforce-secure-profile\" habilitado en las propiedades del servidor (server.properties), el cual es el valor por defecto desde 1.19.1. Puedes elegir jugar de todas formas, pero No Chat Reports no será capaz de protegerte.", "gui.nochatreports.unsafe_server.check": "No mostrar de vuelta para este servidor.", diff --git a/src/main/resources/assets/nochatreports/lang/et_ee.json b/src/main/resources/assets/nochatreports/lang/et_ee.json index fa0a011..70b8614 100644 --- a/src/main/resources/assets/nochatreports/lang/et_ee.json +++ b/src/main/resources/assets/nochatreports/lang/et_ee.json @@ -1,18 +1,23 @@ { "modmenu.descriptionTranslation.nochatreports": "Eemaldab mängijasõnumitelt krüptograafilised signatuurid, mis muudab võimatuks nii nende jälgimise ja seostamise sinu Mojangi/Microsofti kontoga kui ka mängija vestlusest teatamise funktsiooni.", - "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.", + "gui.nochatreports.secure_chat": "See funktsioon ei saa töötada modiga No Chat Reports, kuna kinnitatavad signatuurid puuduvad.", + "gui.nochatreports.no_reporting": "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 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 \"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 modi seadistustes §olubamisloendis serverite§r nimekirjast eemaldada.", - "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_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 modi seadistustes keelata valiku §okõik serverid lubamisloendisse§r.", - "gui.nochatreports.status_unknown": "No Chat Reports funktsionaalsus lülitati sisse seansi ajal. Serveri turvalisuse olekut saab hinnata vaid sisselogimise hetkel. Palun liitu serveriga uuesti, et selle turvalisuse olekut hinnata.", - "gui.nochatreports.status_undefined": "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.", - "gui.nochatreports.unsafe_server.check": "Ära kuva selle serveri puhul uuesti", + "gui.nochatreports.safety_status_button.controls": "Signeerimisrežiimide vahel lülitamiseks tee vasakklõps.", + "gui.nochatreports.safety_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.safety_status.singleplayer": "Üksikmängus saad sa alati turvaliselt vestelda.", + "gui.nochatreports.safety_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.safety_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.safety_status.insecure_signing": "Oled lubanud vestluse signeerimise, mis teeb kõik su sõnumid potentsiaalselt süüdistavaks asitõendiks, mida saab raportis sinu vastu kasutada.", + "gui.nochatreports.safety_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.safety_status.unknown": "No Chat Reports ei ole veel selle serveri turvalisuses kindel. Proovi selle tuvastamiseks vestlusesse üks sõnum saata.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports ei suutnud selle serveri turvalisust hinnata. Seda ei tohiks kunagi juhtuda, palun teata sellest veast modi arendajale.", + "gui.nochatreports.signing_status.allowed_realms": "Vestluse signeerimine on Realmsis alati lubatud, kuna see on alati nõutud ning selle keelamine ei annaks nagunii eelist.", + "gui.nochatreports.signing_status.allowed": "Sõnumite signeerimine on selle seansi jaoks lubatud.", + "gui.nochatreports.signing_status.allowed_session": "Sõnumite signeerimine on selle seansi jaoks lubatud, ent taasliitumisel see keelatakse.", + "gui.nochatreports.signing_status.disabled": "Sõnumite signeerimine on selle seansi jaoks keelatud.", + "gui.nochatreports.signing_status.disabled_allowance_pending": "Sõnumite signeerimine on selle seansi jaoks keelatud, kuid lubatakse mistahes sõnumi saatmisel.", + "gui.nochatreports.signing_status.disabled_offline": "Sõnumite signeerimine on keelatud, kuna tegu on võrguta serveriga.", "gui.nochatreports.reload_config_tooltip": "Laadi No Chat Reports seadistus uuesti. Kasuta ettevaatlikult.", "gui.nochatreports.verified_server": "§a§lTurvaline server§r\nKinnitasime, et serverile on paigaldatud mod No Chat Reports või see piirab sõnumitest teatamist mõnel muul teadaoleval viisil. Sa saad turvaliselt vestelda.", "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nKeela või luba enamus modi kliendipoolsest funktsionaalsusest. See võib olla vajalik teatud Paper/Velocity serveritega ühendumiseks, kuna need on teadaolevalt NCRiga probleeme põhjustanud.\nTeatud võrguga mitteseonduvad asjad, nagu serveri turvataseme kuvamine ning vanilli \"Vestlussõnumeid ei saa kinnitada\" hüpiku eemaldus töötavad siiski; neid saab seadistustes individuaalselt lülitada.", @@ -52,72 +57,72 @@ "gui.nochatreports.realms_warning.contents": "Realms-serverid ei ole privaatsed. Realmide omanikud ei saa vestlusest teatamist keelata ning Mojang rakendab täiendavat vestlusseiret, et tuvastada võimalikud \"võrgukäitumise rikkumised\" ning saata need edasi inimkontrolli. Kui leitakse, et sa rikud Minecrafti Kogukonnastandardeid - isegi kui vestluses osalejad ei solvunud, blokeeritakse sind, ajutiselt või jäädavalt kõikidest mitmikmänguteenustest. Vestluse krüpteerimine on tungivalt soovitatav.", "gui.nochatreports.realms_warning.check": "Ära kuva uuesti", "gui.nochatreports.realms_warning.learn_more": "Lisateave", - "gui.NoChatReports.showEncryptionButtonWarning": "§cAllolev ei keela krüpteerimist, see vaid peidab nupu!", - + "gui.nochatreports.signing_required.header": "Hoiatus: taodeldi vestluse signeerimist", + "gui.nochatreports.signing_required.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.\n\nSelle seansi jaoks signeerimise lubamiseks klõpsa \"Luba signeerimine\". Võid kasutada ka vestluskuvas olevat serveri turvataseme nuppu, valimaks selle serveri jaoks signeerimisrežiimi.", + "gui.nochatreports.signing_required.allow_signing": "Luba signeerimine", + "gui.nochatreports.signing_required.cancel": "Loobu", + "gui.nochatreports.signing_required.check": "Ära kuva selle seansi puhul uuesti", + "chat.nochatreports.disabled.signing_requested": "Server keeldus signeerimata sõnumi edastamisest. Vestluse signeerimist saad käimasoleva seansi jaoks lubada hüpikaknas.", + "gui.nochatreports.signing_mode": "§lSigneerimisrežiim: %1$s", + "gui.nochatreports.signing_mode.default": "vaikimisi (%1$s)", + "gui.nochatreports.signing_mode.always": "alati", + "gui.nochatreports.signing_mode.never": "mitte kunagi", + "gui.nochatreports.signing_mode.never_forced": "ei saa lubada", + "gui.nochatreports.signing_mode.prompt": "küsimisega", + "gui.nochatreports.signing_mode.on_demand": "nõudmisel", + "gui.nochatreports.signing_mode.always.tooltip": "See režiim lubab sõnumite signeerimise kohe kui serverisse sisened, nii nagu vanilliklient seda teeb.", + "gui.nochatreports.signing_mode.never.tooltip": "Selles režiimis ei ole sõnumid kunagi signeeritud, ning kõiki serveri taotlusi neid signeerida ignoreeritakse.", + "gui.nochatreports.signing_mode.never_forced.tooltip": "See režiim näitab, et su sõnumeid ei saagi signeerida, seda kas võrguta konto kasutuse või Mojangi serveritest signeerimisvõtmete hankimise ebaõnnestumise tõttu.", + "gui.nochatreports.signing_mode.prompt.tooltip": "Selles režiimis ei ole sõnumid vaikimisi signeeritud, kuid kui server seda nõuab, kuvatakse hüpik, kus saad ühe seansi jaoks signeerimise lubada.", + "gui.nochatreports.signing_mode.on_demand.tooltip": "Sarnane küsimisrežiimile, kuid hüpiku asemel lubatakse signeerimine kohe, kui server seda nõuab.", + "configuration.NoChatReports.config": "No Chat Reports", - - "configuration.NoChatReports.category.visual": "Visuaalne", - - "option.NoChatReports.showServerSafety": "Kuva serveri turvatase", - "option.NoChatReports.showServerSafety.tooltip": "Lubab mängul kuvada serveri turvataset vestluskuva paremal all nurgas. Kursoriga ikooni juurde liikudes kuvatakse täpsem kirjeldus.", - "option.NoChatReports.showServerSafety.moreInfo": "§bKlõpsa siia, et lugeda serveri turvatasemete kohta", + "configuration.NoChatReports.category.client": "Klient", + "option.NoChatReports.enableMod": "Mod lubatud", + "option.NoChatReports.enableMod.tooltip": "Vastutab enamiku modi kliendipoolse funktsionaalsuse eest. Seansi ajal ümber lülitades on muudatuste rakendamiseks vajalik serveriga taasliitumine.", + "option.NoChatReports.showNCRButton": "Kuva NCRi nupp", + "option.NoChatReports.showNCRButton.tooltip": "Lisab mitmikmängumenüüsse nupu, mis lülitab enamikku modi kliendipoolsest funktsionaalsusest.", + "option.NoChatReports.defaultSigningMode": "Vaikimisi signeerimisrežiim", + "option.NoChatReports.defaultSigningMode.tooltip": "Määrab signeerimisrežiimi vaikeväärtuse serveritele, mis nõuavad või lubavad vestluse signeerimist.", + "option.NoChatReports.showReloadButton": "Kuva taaslaadimise nupp", + "option.NoChatReports.showReloadButton.tooltip": "Lisab mitmikmängu serverite loendisse seadistuste taaslaadimise nupu.", "option.NoChatReports.verifiedIconEnabled": "Kuva kinnitatuse ikoon", "option.NoChatReports.verifiedIconEnabled.tooltip": "Lubab modil kuvada mitmikmängumenüüs serverite juures ikooni, kui neil on No Chat Reports või mõni muu vestlusest teatamise vastane mehhanism paigaldatud.", "option.NoChatReports.verifiedIconOffsetX": "Kinnitatuse ikooni X-nihe", "option.NoChatReports.verifiedIconOffsetX.tooltip": "Määrab \"turvalise serveri\" ikooni renderdamise X-nihke.", "option.NoChatReports.verifiedIconOffsetY": "Kinnitatuse ikooni Y-nihe", "option.NoChatReports.verifiedIconOffsetY.tooltip": "Määrab \"turvalise serveri\" ikooni renderdamise Y-nihke.", - "option.NoChatReports.hideRedChatIndicators": "Peida punased vestlusindikaatorid", - "option.NoChatReports.hideRedChatIndicators.tooltip": "Keelab mängul kuvada \"ebaturvaline\" indikaatoreid vasakpoolse punase riba ning parempoolse §c§l(§r§c!§c§l)§r ikoonina vestlussõnumi kõrval.", - "option.NoChatReports.hideYellowChatIndicators": "Peida kollased vestlusindikaatorid", - "option.NoChatReports.hideYellowChatIndicators.tooltip": "Keelab mängul kuvada \"muudetud\" indikaatoreid vasakpoolse kollase riba ning parempoolse §e§l(§r§e?§e§l)§r ikoonina vestlussõnumi kõrval.", - "option.NoChatReports.hideGrayChatIndicators": "Peida hallid vestlusindikaatorid", - "option.NoChatReports.hideGrayChatIndicators.tooltip": "Keelab mängul kuvada spetsiaalseid süsteemisõnumite indikaatoreid vasakpoolse halli ribana.", + "gui.NoChatReports.showEncryptionButtonWarning": "§cAllolev ei keela krüpteerimist, see vaid peidab nupu!", + "option.NoChatReports.showEncryptionButton": "Kuva krüpteerimisnupp", + "option.NoChatReports.showEncryptionButton.tooltip": "Selle keelamisel peidetakse vaid vestluskuvalt vaid krüpteerimisnupp. Pane tähele, et krüpteerimist ennast ei keelata automaatselt koos nupuga.", + "option.NoChatReports.showEncryptionIndicators": "Kuva krüpteerimise indikaatorid", + "option.NoChatReports.showEncryptionIndicators.tooltip": "Lülitab krüpteeritud sõnumite indikaatorite kuvamist vasakpoolse lilla riba ning hõljumisel parempoolse §5§l(§r§5ȯ§5§l)§r ikoonina vestlussõnumi kõrval.", + "option.NoChatReports.showServerSafety": "Kuva serveri turvatase", + "option.NoChatReports.showServerSafety.tooltip": "Lubab mängul kuvada serveri turvataset vestluskuva paremal all nurgas. Kursoriga ikooni juurde liikudes kuvatakse täpsem kirjeldus.", + "option.NoChatReports.showServerSafety.moreInfo": "§bKlõpsa siia, et lugeda serveri turvatasemete kohta", + "option.NoChatReports.hideInsecureMessageIndicators": "Peida kinnitamata sõnumite indikaatorid", + "option.NoChatReports.hideInsecureMessageIndicators.tooltip": "Keelab mängul kuvada kinnitamata sõnumite indikaatoreid vasakpoolse halli ribana vestlussõnumi kõrval.", + "option.NoChatReports.hideModifiedMessageIndicators": "Peida muudetud sõnumite indikaatorid", + "option.NoChatReports.hideModifiedMessageIndicators.tooltip": "Keelab mängul kuvada muudetud sõnumite indikaatoreid vasakpoolse halli riba ning hõljumisel parempoolse §7§l(§r§7?§7§l)§r ikoonina vestlussõnumi kõrval.", + "option.NoChatReports.hideSystemMessageIndicators": "Peida süsteemisõnumite indikaatorid", + "option.NoChatReports.hideSystemMessageIndicators.tooltip": "Keelab mängul kuvada süsteemisõnumite indikaatoreid vasakpoolse halli ribana vestlussõnumi kõrval.", "option.NoChatReports.hideWarningToast": "Peida hoiatushüpik", "option.NoChatReports.hideWarningToast.tooltip": "Peidab hoiatushüpiku, mida kuvatakse serverites, kus on valik §oenforce-secure-profile§r keelatud.", + "option.NoChatReports.hideSigningRequestMessage": "Peida signeerimistaotluse sõnum", + "option.NoChatReports.hideSigningRequestMessage.tooltip": "Peidab vestlussõnumi, mida kuvatakse kui server taotleb kliendilt vestlussõnumite signeerimist.", "option.NoChatReports.alwaysHideReportButton": "Peida teatamisnupp alati", "option.NoChatReports.alwaysHideReportButton.tooltip": "Keelab mängul suhtlustegevuste kuval teatamisnupu kuvamise täielikult. See on vaikimisi keelatud, selle asemel muudab mod No Chat Reports'iga serverites teatamisnupu halliks, lisades nupule kirjeldava vihjeteksti.", - - "configuration.NoChatReports.category.technical": "Tehniline", - "option.NoChatReports.demandOnServer": "Nõua serveris", "option.NoChatReports.demandOnServer.tooltip": "Keelab mängul liitumast serveritesse, kus pole mod No Chat Reports paigaldatud.", "option.NoChatReports.enableDebugLog": "Luba silumislogi", "option.NoChatReports.enableDebugLog.tooltip": "Lubab teatud silumisteabe logimist. See on üldiselt mitte-arendajatele kasutu.", "option.NoChatReports.disableTelemetry": "Keela telemeetria", "option.NoChatReports.disableTelemetry.tooltip": "Lubab modil keelata sisse-ehitatud telemeetria, sarnaselt modile No Telemetry.", - "option.NoChatReports.showReloadButton": "Kuva taaslaadimise nupp", - "option.NoChatReports.showReloadButton.tooltip": "Lisab mitmikmängu serverite loendisse seadistuste taaslaadimise nupu.", - "option.NoChatReports.whitelistAllServers": "Kõik serverid lubamisloendisse", - "option.NoChatReports.whitelistAllServers.tooltip": "Sunnib modi käituma nii, nagu kõik serverid oleksid lisatud §olubamisloendis serverite§r loendisse.", - "option.NoChatReports.showNCRButton": "Kuva NCRi nupp", - "option.NoChatReports.showNCRButton.tooltip": "Lisab mitmikmängumenüüsse nupu, mis lülitab enamikku modi kliendipoolsest funktsionaalsusest.", - "option.NoChatReports.enableMod": "Mod lubatud", - "option.NoChatReports.enableMod.tooltip": "Vastutab enamiku modi kliendipoolse funktsionaalsuse eest, vaata ülalolevat valikut.", - "option.NoChatReports.reconnectAwaitSeconds": "Taasühendamise ooteaeg sekundites", - "option.NoChatReports.reconnectAwaitSeconds.tooltip": "Sekundite arv, mida klient peaks ootama enne automaatset taasühendumist, kui server lükkab ühenduse tagasi ilma vestluse allkirjastamise võtmeta, eeldades, et kasutaja on nõustunud sisenema ebaturvalisse serverisse.", - "option.NoChatReports.postDisconnectAwaitSeconds": "Pärast-lahtiühendamist ooteaeg", - "option.NoChatReports.postDisconnectAwaitSeconds.tooltip": "Sarnane valikule §otaasühendamise ooteaeg sekundites§r, kuid loendus algab kohe, kui mängija katkestab serveriühenduse tavapäraselt. Kui see viivitus hetkel, mil mängija proovib uuesti serveriga liituda, on suurem kui §otaasühendamise ooteaeg sekundites§r, siis rakendub hoopis eelnimetatud viivitus.", - "option.NoChatReports.signingCheckDelaySeconds": "Allkirjastamise kontrolli viivitus sekundites", - "option.NoChatReports.signingCheckDelaySeconds.tooltip": "Viivitus sekundites kontrollimaks, kas lubamisloendis olevad serverid jõustavad endiselt vestluse allkirjastamist. Selle väärtuse 0-ks määramine põhjustab kontrollimist iga sisselogimiskatse korral, sarnaselt serveritega, mis ei ole lubamisloendis.", - "option.NoChatReports.serverSigningChecks": "Serveri allkirjastamise kontrollid", - "option.NoChatReports.serverSigningChecks.tooltip": "Lubamisloendisse kantud serverite vastendus viimaste allkirjajõustamise kontrollimise aegade kohta, epohhisekundites. Seda ei pea tavaliselt käsitsi muutma.", - "option.NoChatReports.showEncryptionButton": "Kuva krüpteerimisnupp", - "option.NoChatReports.showEncryptionButton.tooltip": "Selle keelamisel peidetakse vaid vestluskuvalt vaid krüpteerimisnupp. Pane tähele, et krüpteerimist ennast ei keelata automaatselt koos nupuga.", - - "configuration.NoChatReports.category.whitelistedServers": "Lubamisloendis serverid", - - "option.NoChatReports.whitelistedServers": "Lubamisloendis serverid", - "option.NoChatReports.whitelistedServers.tooltip": "Sisaldab servereid, mille puhul \"ebaturvaline server\" hoiatuskuva ei kuvata. Serverid lisatakse siia loendisse automaatselt, kui märgid sellel kuval valiku \"Ära kuva selle serveri puhul uuesti\".\nIga kirje on §l:§r vormistusega string.", - "option.NoChatReports.whitelistedServers.addButtonTooltip": "Lisa server", - "option.NoChatReports.whitelistedServers.removeButtonTooltip": "Eemalda server", - "option.NoChatReports.whitelistedServers.instructions": "Serveri lisamiseks vajuta + nuppu. Valitud serveri eemaldamiseks vajuta - nuppu.", - "option.NoChatReports.whitelistedServers.serverAddress": "Klõpsa siia serveri aadressi muutmiseks", - - "configuration.NoChatReports.category.lanOptions": "LAN-valikud", - + "configuration.NoChatReports.category.lan": "LAN", "option.NoChatReports.demandOnClient": "Nõua kliendilt", "option.NoChatReports.demandOnClient.tooltip": "Sunnib serverit kõigilt liituvatelt klientidelt nõudma No Chat Reports modi.", + "option.NoChatReports.demandOnClientMessage": "Kliendilt nõudmise väljaviskamissõnum", + "option.NoChatReports.demandOnClientMessage.tooltip": "Sõnum, mida kliendile kuvatakse, kui see proovib serveriga liituda ilma, et No Chat Reports oleks paigaldatud.", "option.NoChatReports.convertToGameMessage": "Konverteeri mängusõnumiks", "option.NoChatReports.convertToGameMessage.tooltip": "Sunnib serverit konverteerima kõik mängijasõnumid süsteemisõnumiteks. Süsteemisõnumitel pole signatuure ning neid ei saa teatada; vanilliklientidel kuvavad need vasakus servas halli riba.", "option.NoChatReports.addQueryData": "Lisa päringuandmeid", diff --git a/src/main/resources/assets/nochatreports/lang/fi_fi.json b/src/main/resources/assets/nochatreports/lang/fi_fi.json index 8f13535..5ced9e2 100644 --- a/src/main/resources/assets/nochatreports/lang/fi_fi.json +++ b/src/main/resources/assets/nochatreports/lang/fi_fi.json @@ -1,13 +1,133 @@ { - "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.", + "gui.nochatreports.OLD_safety_status.secure": "Tällä palvelimella on No Chat Reports tai palvelin muuten estää lähettämiesi viestien ilmiannon. Voit keskustella turvallisesti.", + "gui.nochatreports.OLD_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.OLD_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.OLD_safety_status.undefined": "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.OLD_unsafe_server.header": "Varoitus: ei-turvallinen palvelin", + "gui.nochatreports.OLD_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.OLD_unsafe_server.check": "Älä näytä uudelleen tällä palvelimella", + + "modmenu.descriptionTranslation.nochatreports": "Poistaa sähköiset allekirjoitukset pelaajan viesteistä, tehden niiden seuraamisesta ja Mojang-/Microsoft-käyttäjään yhdistämisestä sekä keskustelun ilmiantotoiminnon käytöstä mahdotonta.", + "gui.nochatreports.secure_chat": "Tämä asetus ei toimi No Chat Reportsin kanssa, koska viesteissä ei ole sähköisiä allekirjoituksia.", + "gui.nochatreports.no_reporting": "Keskustelun ilmiantotoiminnon käyttö 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_undefined": "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.nochatreports.reload_config_tooltip": "Lataa uudelleen No Chat Reportsin asetustiedosto. Käytä harkiten." + "gui.nochatreports.safety_status_button.controls": "Vasenklikkaa selataksesi sähköisen allekirjoittamisen käytön vaihtoehtoja.", + "gui.nochatreports.safety_status_secure": "Tällä palvelimella on No Chat Reports tai palvelin estää lähettämiesi viestien ilmiannon muulla tunnetulla tavalla. Voit keskustella turvallisesti.", + "gui.nochatreports.safety_status.singleplayer": "Voit aina keskustella turvallisesti yksinpelissä.", + "gui.nochatreports.safety_status_unintrusive": "Tämä palvelin antaa sinun lähettää sähköisesti allekirjoittamattomia viestejä, joita ei voi ilmiantaa Mojangille. Jollei jokin palvelimella estä sitä – Vanilla-asiakasohjelmat lähettävät silti allekirjoitettuja viestejä sekä näyttävät allekirjoittamattomat viestit \"todentamattomina\" eivätkä näytä niitä ollenkaan, jos \"Vain suojattu keskustelu\" on valittu käyttäjän keskusteluasetuksista.", + "gui.nochatreports.safety_status_insecure": "Tämä palvelin vaatii kaikilta viesteiltä sähköisestä allekirjoitetusta. Kaikkia sähköisesti allekirjoitettuja viestejä voidaan käyttää sinua vastaan todistusaineistona ilmiannettaessa.", + "gui.nochatreports.safety_status.insecure_signing": "Olet ottanut käyttöön viestien sähköisen allekirjoittamisen, mikä tekee kaikista viesteistäsi mahdollista todistusaineistoa sinua vastaan ilmiannettaessa.", + "gui.nochatreports.safety_status_realms": "Tämä on Realms-palvelin. Realmsissa ei voi estää viestien ilmiantoa ja täällä Mojangilla on lisäksi myös automaattista valvontaa potentiaalisten \"verkkohaittojen\" tunnistamiseksi ja niiden välittämiseksi ihmisen arvioitavaksi, halusipa Realmin omistaja sitä tai ei. Ainoa toivosi on keskustelun salaaminen.", + "gui.nochatreports.safety_status_unknown": "No Chat Reports ei ole vielä varma tämän palvelimen turvallisuudesta. Yritä lähettää viesti keskusteluun turvallisuuden arviointia varten.", + "gui.nochatreports.safety_status_undefined": "No Chat Reports ei pystynyt arvioimaan palvelimen turvallisuutta. Tämän ei pitäisi ikinä tapahtua. Ilmoita tästä viasta modin kehittäjälle, kiitos.", + "gui.nochatreports.signing_status_allowed_realms": "Koska Realmsissa keskustelun sähköinen allekirjoittaminen on aina käytössä ja pakollista, sen estämisestä ei olisi mitään hyötyä.", + "gui.nochatreports.signing_status.allowed": "Viestien sähköinen allekirjoittaminen otettiin käyttöön täksi istunnoksi.", + "gui.nochatreports.signing_status.allowed_session": "Viestien sähköinen allekirjoittaminen otettiin käyttöön täksi istunnoksi, mutta otetaan pois taas, kun liityt uudelleen.", + "gui.nochatreports.signing_status.disabled": "Viestien sähköinen allekirjoittaminen otettiin pois käytöstä täksi istunnoksi.", + "gui.nochatreports.signing_status.disabled_allowance_pending": "Viestien sähköinen allekirjoittaminen poistettiin käytöstä täksi istunnoksi, mutta otetaan käyttöön, kun lähetät viestin.", + "gui.nochatreports.signing_status.disabled_offline": "Viestien sähköinen allekirjoittaminen on pois käytöstä, koska palvelin ei ole verkossa.", + "gui.nochatreports.reload_config_tooltip": "Lataa uudelleen No Chat Reportsin määritykset. Käytä harkiten.", + "gui.nochatreports.verified_server": "§a§lTurvallinen palvelin\nPystymme varmistamaan, että tällä palvelimella on No Chat Reports tai se estää viestien ilmiannon muulla tunnetulla tavalla. Voit keskustella siellä turvallisesti.", + "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports§r %1$s\nLaita suurin osa modin asiakasohjelman puoleisesta toiminnallisuudesta käyttöön tai pois käytöstä. Saatat joutua tekemään tämän liittyäksesi joillekin Paper- tai Velocity-palvelimille, sillä niiden tiedetään aiheuttavan ongelmia NCR:n kanssa.\nJotkin verkkotyöskentelyyn liittymättömät asiat, kuten salaus, keskustelun luotettavuustilan muokkaukset sekä \"Keskusteluviestejä ei voida todentaa\"-ilmoituksen poistaminen toimivat silti; ne voidaan laittaa pois määrityksistä yksitellen.", + "gui.nochatreports.ncr_state_on": "§a§lKäytössä§r", + "gui.nochatreports.ncr_state_off": "§c§lPois käytöstä§r", + "tag.nochatreports.encrypted": "Salattu käyttämällä: %1$s", + "tag.nochatreports.encrypted_original": "Salaamaton: %1$s", + "gui.nochatreports.encryption_tooltip": "§lSalaus:§r %1$s\nOikeaklikkaa määrittääksesi\n\nSalauksen ollessä käytössä, voit välttää salauksen käytön pitämällä §n§lCtrl§r-näppäintä pohjassa viestiä lähettäessäsi.", + "gui.nochatreports.encryption_tooltip_invalid": "Salaus:§r %1$s\n§cKelvottomat määritykset. Klikkaa muuttaaksesi määrityksiä.", + "gui.nochatreports.encryption_state_on": "§a§lKäytössä§r", + "gui.nochatreports.encryption_state_off": "§c§lPois käytöstä§r", + "gui.nochatreports.encryption_warning.header": "Tietoa salaamisesta", + "gui.nochatreports.encryption_warning.contents": "Voit salata viestisi käyttämällä salaista avainta. Vain he, jotka tietävät tämän avaimen, voivat purkaa salauksen. No Chat Reports purkaa salauksen kaikista viesteistä, kun sopiva avain annetaan ja ominaisuus on käytössä.\nHuomaa kuitenkin, että salaus ei ole taianomainen ratkaisu. Ulkopuolisille pelaajille salatut viestit näyttävät vain sekavalta sotkulta keskustelussa ja kolmannen osapuolen palvelimen valvojat voivat mykistää sinut tai antaa sinulle porttikiellon nähdessään viestisi. Suositellaan, että luot oman salausavaimen ja viestit toisille ihmisille vain turvallisilla kanavilla. Klikkaa \"Lue lisää\" saadaksesi lisätietoa siitä, miten ja milloin sinun pitäisi käyttää salaustoimintoa.", + "gui.nochatreports.encryption_warning.check": "Älä näytä tätä uudelleen", + "gui.nochatreports.encryption_warning.learn_more": "Lue lisää", + "gui.nochatreports.encryption_config.header": "Salaamisen asetukset", + "gui.nochatreports.encryption_config.key_desc": "§lSalausavain§r\nAvain, jota käytetään viestiesi salaukseen ja salauksen purkuun. Sen muoto riippuu algoritmista: AES:llä se on 128 bittiä Base64-koodattua binääridataa.", + "gui.nochatreports.encryption_config.passphrase_desc": "§lSalauksen tunnuslause§r\nSatunnaisen avaimen luomisen sijaan voit muodostaa sellaisen haluamastasi tunnuslauseesta. Jos käytät tätä – valitse vahva tunnuslause. Kaikki algoritmit eivät toimi tunnuslauseen kanssa.", + "gui.nochatreports.encryption_config.validation_ok": "Avaimen vahvistaminen: §a§lOnnistui", + "gui.nochatreports.encryption_config.validation_failed": "Avaimen vahvistaminen: §c§lEpäonnistui", + "gui.nochatreports.encryption_config.dice_tooltip": "Luo uusi satunnainen avain, joka on yhteensopiva valitun salausalgoritmin kanssa.", + "gui.nochatreports.encryption_config.pass_not_allowed": "", + "gui.nochatreports.encryption_config.algorithm": "Algoritmi: %1$s", + "gui.nochatreports.encryption_config.default_key": "", + "gui.nochatreports.encryption_config.encrypt_public": "Salaa julkiset viestit", + + "algorithm.nochatreports.caesar.name": "Caesarin salakirjoitus", + "algorithm.nochatreports.caesar": "§lCaesar§r\nMeemisalakirjoitus: käyttäessäsi tätä periaatteessa toivot ihmisten luovuttavan yrittämättä edes purkaa viestiesi salausta. Se voi olla totta monessa tapauksessa, joten tämän käyttökelpoisuus riippuu uhkakuvistasi.\nJoka merkille on luku välillä 1–1024. Kirjoittamasi merkki korvataan toisella merkillä tämän lukujärjestelmän avulla. Numerointia käytetään, koska aakkosjärjestys ei toimisi kaikkien kielien kanssa.", + "nochatreports.connect.nokey_rejected": "Palvelin kieltäytyi yhteydestä ilman keskustelun sähköistä allekirjoitusavainta.", + "nochatreports.connect.await": "Odotetaan uudelleenyhdistämistä: %1$s s...", + "gui.nochatreports.realms_warning.header": "Varoitus: Realms", + "gui.nochatreports.realms_warning.contents": "Realms-palvelimet eivät ole yksityisiä. Realmin omistaja ei voi estää viestien ilmiantoa ja Mojang valvoo keskustelua ylimääräisin keinoin tunnistaakseen potentiaalisia \"verkkohaittoja\" ja välittääkseen ne ihmisen arvioitavaksi. Jos sinun todetaan rikkoneen Minecraftin yhteisöstandardeja, – vaikka keskustelun osapuolet eivät tästä loukkaantuneetkaan –, saat väliaikaisen tai pysyvän porttikiellon kaikkiin moninpeleihin. Viestien salaus on erittäin suositeltavaa.", + "gui.nochatreports.realms_warning.check": "Älä näytä tätä uudelleen", + "gui.nochatreports.realms_warning.learn_more": "Lue lisää", + "gui.nochatreports.signing_required.header": "Varoitus: sähköinen allekirjoittaminen on pakollista", + "gui.nochatreports.signing_required.contents": "Tämä palvelin vaatii, että kaikki viestit ovat sähköisesti allekirjoitettuja. Tämä tarkoittaa, että ne voidaan ilmiantaa 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. Klikkaa \"Hyväksy\" ottaaksesi sähköisen allekirjoittamisen käyttöön täksi istunnoksi. Voit myös käyttää turvallisuustilapainiketta keskusteluikkunassa määritelläksesi allekirjoitusten käytön tällä palvelimella.", + "gui.nochatreports.signing_required.allow_signing": "Hyväksy", + "gui.nochatreports.signing_required.cancel": "Peruuta", + "gui.nochatreports.signing_required.check": "Älä näytä tätä uudelleen tällä istunnolla", + "chat.nochatreports.disabled.signing_requested": "Palvelin kieltäytyi välittämästä sähköisesti allekirjoittamatonta viestiä. Voit ottaa sähköisen allekirjoittamisen käyttöön ponnahdusikkunasta.", + + "gui.nochatreports.signing_mode": "§lSähköinen allekirjoittaminen: %1$s", + "gui.nochatreports.signing_mode.default": "Oletus (%1$s)", + "gui.nochatreports.signing_mode.always": "Aina", + "gui.nochatreports.signing_mode.never": "Ei koskaan", + "gui.nochatreports.signing_mode.never_forced": "Ei voi ottaa käyttöön", + "gui.nochatreports.signing_mode.prompt": "Kysy", + "gui.nochatreports.signing_mode.on_demand": "Vaadittaessa", + "gui.nochatreports.signing_mode.always.tooltip": "Viestien sähköinen allekirjoittaminen on käytössä heti palvelimelle liittyessäsi, kuten Vanillassakin.", + "gui.nochatreports.signing_mode.never.tooltip": "Viestien sähköinen allekirjoittaminen ei ikinä ole käytössä ja palvelimen pyynnöt ottaa se käyttöön sivuutetaan.", + "gui.nochatreports.signing_mode.never_forced.tooltip": "Viestejäsi ei voi allekirjoittaa sähköisesti asiakasohjelman allekirjoitusavaimen saamisessa Mojangilta tapahtuneen ongelman tai käyttäjäsi vuoksi.", + "gui.nochatreports.signing_mode.prompt.tooltip": "Sähköinen allekirjoitus on oletuksena pois käytöstä, mutta jos palvelin vaatii sähköistä allekirjoittamista, sinulle näytetään ponnahdusikkuna, jossa voit ottaa sähköisen allekirjoittamisen käyttöön yhdeksi istunnoksi kerrallaan.", + "gui.nochatreports.signing_mode.on_demand.tooltip": "Sama kuin \"kysy\", mutta sähköinen allekirjoittaminen otetaan käyttöön automaattisesti ilman ponnahdusikkunan näyttämistä, kun palvelin vaatii sähköistä allekirjoittamista.", + + "configuration.NoChatReports.config": "No Chat Reports", + "configuration.NoChatReports.category.client": "Asiakasohjelma", + "option.NoChatReports.enableMod": "Modin käyttö", + "option.NoChatReports.enableMod.tooltip": "Pitää käytössä suurimman osan modin asiakasohjelman puoleisesta toiminnallisuudesta. Vaatii palvelimelle uudelleen liittymistä muutosten voimaan astumiseksi kesken istunnon.", + "option.NoChatReports.showNCRButton": "Näytä NCR-painike", + "option.NoChatReports.showNCRButton.tooltip": "Lisää moninpelivalikkoon painikkeen, jolla voidaan valita suurin osa modin asiakasohjelman puoleisesta toiminnallisuudesta päälle ja pois.", + "option.NoChatReports.defaultSigningMode": "Sähköisen allekirjoittamisen oletusvalinta", + "option.NoChatReports.defaultSigningMode.tooltip": "Asettaa oletusvalinnan sähköisestä allekirjoittamisesta palvelimilla, jotka pakottavat tai sallivat sähköisen allekirjoittamisen.", + "option.NoChatReports.showReloadButton": "Näytä uudelleenlatauspainike", + "option.NoChatReports.showReloadButton.tooltip": "Lisää moninpelivalikkoon painikkeen määritysten uudelleenlataamiselle.", + "option.NoChatReports.verifiedIconEnabled": "Vahvistuskuvake päällä", + "option.NoChatReports.verifiedIconEnabled.tooltip": "Erityinen kuvake näytetään moninpelivalikossa palvelimilla, joilla on No Chat Reports tai joka muuten ehkäisee ilmiantojen tekemistä.", + "option.NoChatReports.verifiedIconOffsetX": "Vahvistuskuvakkeen siirto X-akselilla", + "option.NoChatReports.verifiedIconOffsetX.tooltip": "Määrittelee \"Turvallinen palvelin\" -kuvakkeen siirron X-akselilla.", + "option.NoChatReports.verifiedIconOffsetY": "Vahvistuskuvakkeen siirto Y-akselilla", + "option.NoChatReports.verifiedIconOffsetY.tooltip": "Määrittelee \"Turvallinen palvelin\" -kuvakkeen siirron Y-akselilla.", + "gui.NoChatReports.showEncryptionButtonWarning": "§cEi poista salausta käytöstä, ainoastaan piilottaa napin!", + "option.NoChatReports.showEncryptionButton": "Näytä salauspainike", + "option.NoChatReports.showEncryptionButton.tooltip": "Tämän pois käytöstä laittaminen yksinkertaisesti piilottaa salauspainikkeen keskusteluikkunasta. Huomaa, että salaus itsessään voi jäädä päälle, vaikka nappi piilotettaisiin.", + "option.NoChatReports.showEncryptionIndicators": "Näytä salausta symboloivat merkit", + "option.NoChatReports.showEncryptionIndicators.tooltip": "Laittaa salausta symboloivat merkit (purppuran palkin viestin vasemmalla puolelta ja §5§l(§r§5ȯ§5§l)§r)-merkin oikealta) näkyviin tai piiloon.", + "option.NoChatReports.showServerSafety": "Näytä palvelimen turvallisuus", + "option.NoChatReports.showServerSafety.tooltip": "Asiakasohjelma näyttää palvelimen turvallisuustilan keskusteluikkunan oikeassa alanurkassa. Osoittimen vieminen kuvakkeen päälle näyttää lisätietoja.", + "option.NoChatReports.showServerSafety.moreInfo": "§bKlikkaa tästä lukeaksesi lisää palvelimen turvallisuustasoista.", + "option.NoChatReports.hideInsecureMessageIndicators": "Piilota viestien vahvistamattomuutta symboloivat merkit", + "option.NoChatReports.hideInsecureMessageIndicators.tooltip": "Estää asiakasohjelmaa näyttämästä vahvistamattomien viestien symbolia: harmaata palkkia keskusteluviestin vasemmalla puolella.", + "option.NoChatReports.hideModifiedMessageIndicators": "Piilota viestien muokkausta symboloivat merkit", + "option.NoChatReports.hideModifiedMessageIndicators.tooltip": "Estää asiakasohjelmaa näyttämästä muokattujen viestien symboleita: harmaata palkkia keskusteluviestin vasemmalla puolella ja §7§l(§r§e?§e§l)§r-merkkiä oikealla.", + "option.NoChatReports.hideSystemMessageIndicators": "Piilota järjestelmäviestiä symboloivat merkit", + "option.NoChatReports.hideSystemMessageIndicators.tooltip": "Estää asiakasohjelmaa näyttämästä järjestelmäviestien symbolia: harmaata palkkia keskusteluviestin vasemmalla puolella.", + "option.NoChatReports.hideWarningToast": "Piilota varoitusilmoitus", + "option.NoChatReports.hideWarningToast.tooltip": "Poistaa ikkunan oikeaan ylänurkkaan tulevan varoituksen, joka näytetään palvelimilla, joilla §oenforce-secure-profile§r on pois päältä.", + "option.NoChatReports.hideSigningRequestMessage": "Piilota sähköisen allekirjoittamisen pyyntö", + "option.NoChatReports.hideSigningRequestMessage.tooltip": "Piilottaa keskusteluviestin, joka näytetään, kun palvelin pyytää asiakasohjelmaa allekirjoittamaan viestit sähköisesti.", + "option.NoChatReports.alwaysHideReportButton": "Piilota ilmiantopainike aina", + "option.NoChatReports.alwaysHideReportButton.tooltip": "Estää asiakasohjelmaa näyttämästä ilmiantopainiketta Sosiaaliset kanssakäymiset -ruudussa. Tämä on oletuksena pois päältä ja modi tekee ilmiantopainikkeen passiiviseksi palvelimilla, joilla on No Chat Reports ja lisää selostuksen, joka tulee näkyville osoittimen siirtyessä painikkeen päälle.", + "option.NoChatReports.demandOnServer": "Vaadi palvelimelta", + "option.NoChatReports.demandOnServer.tooltip": "Estää asiakasohjelmaa liittymästä palvelimille, joilla ei ole No Chat Reportsia.", + "option.NoChatReports.enableDebugLog": "Luo vianetsintälokeja", + "option.NoChatReports.enableDebugLog.tooltip": "Ottaa käyttöön tiettyjen virheenkorjaustietojen tallennuksen. Tämä on useimmiten tarpeetonta muille kuin kehittäjille.", + + "configuration.NoChatReports.category.lan": "Lähiverkko", + "option.NoChatReports.demandOnClient": "Vaadi asiakasohjelmalta", + "option.NoChatReports.demandOnClient.tooltip": "Palvelin vaatii liittyviltä asiakasohjelmilta No Chat Reportsia.", + "option.NoChatReports.demandOnClientMessage": "Potkimisviesti vaadittaessa No Chat Reportsia", + "option.NoChatReports.demandOnClientMessage.tooltip": "Viesti, joka näytetään asiakasohjelmalle, kun se yrittää liittyä palvelimelle ilman No Chat Reportsia.", + "option.NoChatReports.convertToGameMessage": "Muuta järjestelmäviestiksi.", + "option.NoChatReports.convertToGameMessage.tooltip": "Palvelin muuttaa kaikki pelaajien viestit järjestelmäviesteiksi. Järjestelmäviesteihin ei ole liitetty mitään sähköistä allekirjoitusta ja niitä ei voi ilmiantaa. Vanilla-asiakasohjelma näyttää harmaan palkin niiden vasemmalla puolella.", + + "option.NoChatReports.addQueryData.tooltip": "Palvelin lähettää ylimääräistä tietoa asiakasohjelmalle yhteyskokeilun yhteydessä. Tätä tarvitaan \"Turvallinen palvelin\"-kuvakkeen näyttämiseksi ja muihin teknisiin tarkoituksiin." } diff --git a/src/main/resources/assets/nochatreports/lang/fr_fr.json b/src/main/resources/assets/nochatreports/lang/fr_fr.json index e63112d..ef8e131 100644 --- a/src/main/resources/assets/nochatreports/lang/fr_fr.json +++ b/src/main/resources/assets/nochatreports/lang/fr_fr.json @@ -1,11 +1,11 @@ { - "gui.nochatreport.secureChat": "Cette option ne fonctionne pas avec No Chat Reports, puisqu'il n'y a pas de signature à vérifier.", - "gui.nochatreport.noReporting": "Les signalements sont désactivés sur ce serveur grâce à No Chat Reports.", + "gui.nochatreports.secure_chat": "Cette option ne fonctionne pas avec No Chat Reports, puisqu'il n'y a pas de signature à vérifier.", + "gui.nochatreports.no_reporting": "Les signalements sont désactivés sur ce serveur grâce à No Chat Reports.", "disconnect.nochatreports.client": "Ce serveur n'a pas No Chat Reports et vous avez configuré que vous le vouliez toujours.", - "gui.nochatreports.status_secure": "Ce serveur a No Chat Reports installé, ou empêche vos messages d'être signalés d'une autre manière. Vous pouvez discuter en toute sécurité.", - "gui.nochatreports.status_unintrusive": "Ce serveur n'empêche pas les signalements, mais vous permet d'envoyer des messages non signés. Techniquement, ils peuvent toujours être signalés à Mojang, mais ne sont généralement pas considérés comme des preuves valides. Il est peu probable que des mesures soient prises sur de tels signalements.", - "gui.nochatreports.status_insecure": "Ce serveur exige que tous les messages des joueurs soient signés et vous avez accepté ces conditions. Tout ce que vous envoyez dans le chat est potentiellement une preuve incriminante qui peut être utilisée contre vous dans un signalement. Vous pouvez supprimer manuellement ce serveur de NoChatReports.json dans votre dossier de configuration pour être averti à nouveau.", - "gui.nochatreports.status_undefined": "No Chat Reports n'a pas pu évaluer la sécurité de ce serveur. Cela ne devrait jamais arriver, veuillez le signaler comme un bug au développeur de ce mod.", + "gui.nochatreports.safety_status.secure": "Ce serveur a No Chat Reports installé, ou empêche vos messages d'être signalés d'une autre manière. Vous pouvez discuter en toute sécurité.", + "gui.nochatreports.OLD_status_unintrusive": "Ce serveur n'empêche pas les signalements, mais vous permet d'envoyer des messages non signés. Techniquement, ils peuvent toujours être signalés à Mojang, mais ne sont généralement pas considérés comme des preuves valides. Il est peu probable que des mesures soient prises sur de tels signalements.", + "gui.nochatreports.OLD_status_insecure": "Ce serveur exige que tous les messages des joueurs soient signés et vous avez accepté ces conditions. Tout ce que vous envoyez dans le chat est potentiellement une preuve incriminante qui peut être utilisée contre vous dans un signalement. Vous pouvez supprimer manuellement ce serveur de NoChatReports.json dans votre dossier de configuration pour être averti à nouveau.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports n'a pas pu évaluer la sécurité de ce serveur. Cela ne devrait jamais arriver, veuillez le signaler comme un bug au développeur de ce mod.", "gui.nochatreports.unsafe_server.header": "Attention : Serveur dangereux", "gui.nochatreports.unsafe_server.contents": "Ce serveur exige que tous les messages soient signés, ce qui signifie qu'ils peuvent être signalés à Mojang. Le propriétaire du serveur a probablement maintenu 'enforce-secure-profile' activé dans le fichier de configuration server.properties, qui est la valeur par défaut depuis 1.19.1. Vous pouvez quand même choisir de jouer sur ce serveur, mais No Chat Reports ne pourra pas vous protéger.", "gui.nochatreports.unsafe_server.check": "Ne plus afficher pour ce serveur", diff --git a/src/main/resources/assets/nochatreports/lang/id_id.json b/src/main/resources/assets/nochatreports/lang/id_id.json index 81aa10b..0e7e1d3 100644 --- a/src/main/resources/assets/nochatreports/lang/id_id.json +++ b/src/main/resources/assets/nochatreports/lang/id_id.json @@ -1,11 +1,11 @@ { - "gui.nochatreport.secureChat": "Opsi ini tidak bekerja dengan §oNo Chat Reports§r, karena tidak ada tanda untuk diverifikasi", - "gui.nochatreport.noReporting": "Melaporkan orang lain dinonaktifkan pada server ini karena adanya §oNo Chat Reports§r", + "gui.nochatreports.secure_chat": "Opsi ini tidak bekerja dengan §oNo Chat Reports§r, karena tidak ada tanda untuk diverifikasi", + "gui.nochatreports.no_reporting": "Melaporkan orang lain dinonaktifkan pada server ini karena adanya §oNo Chat Reports§r", "disconnect.nochatreports.client": "Server ini tidak memiliki §oNo Chat Reports§r, dan kamu memilih konfigurasi yang mewajibkan ada §oNo Chat Reports§r di servernya.", - "gui.nochatreports.status_secure": "Server ini memiliki §oNo Chat Reports§r atau cara lain yang membuat semua chatnya aman.", - "gui.nochatreports.status_unintrusive": "Server ini tidak memblokir laporan ke Mojang, tetapi mengizinkan untuk mengirim pesan tanpa tandanya. Jika pesan kamu dilaporkan, kemungkinan besar hanya akan diabaikan oleh Mojang.", - "gui.nochatreports.status_insecure": "Server ini mewajibkan semua orang mengirim pesan dengan tandanya, ini berarti jika pesan kamu dilaporkan dapat digunakan sebagai bukti untuk di§oban§r. Kamu dapat menghapus server ini dari §oNoChatReports.json§r untuk diperingatkan lagi tentang server ini.", - "gui.nochatreports.status_undefined": "§oNo Chat Reports§r tidak dapat mengevaluasi keamanan server ini. Ini seharusnya tidak dapat terjadi, mohon laporkan ke developer.", + "gui.nochatreports.safety_status.secure": "Server ini memiliki §oNo Chat Reports§r atau cara lain yang membuat semua chatnya aman.", + "gui.nochatreports.OLD_status_unintrusive": "Server ini tidak memblokir laporan ke Mojang, tetapi mengizinkan untuk mengirim pesan tanpa tandanya. Jika pesan kamu dilaporkan, kemungkinan besar hanya akan diabaikan oleh Mojang.", + "gui.nochatreports.OLD_status_insecure": "Server ini mewajibkan semua orang mengirim pesan dengan tandanya, ini berarti jika pesan kamu dilaporkan dapat digunakan sebagai bukti untuk di§oban§r. Kamu dapat menghapus server ini dari §oNoChatReports.json§r untuk diperingatkan lagi tentang server ini.", + "gui.nochatreports.safety_status.undefined": "§oNo Chat Reports§r tidak dapat mengevaluasi keamanan server ini. Ini seharusnya tidak dapat terjadi, mohon laporkan ke developer.", "gui.nochatreports.unsafe_server.header": "Perhatian: Server Tidak Aman", "gui.nochatreports.unsafe_server.contents": "Server ini mewajibkan semua orang mengirim pesan dengan tandanya, ini berarti laporan dapat dikirim ke Mojang. Kemungkinan besar ini berarti pemilik servernya memilih untuk menyalakan 'enforce-secure-profile' di konfigurasi servernya. Kamu masih bisa bermain tetapi §oNo Chat Reports§r tidak dapat melindungi kamu.", "gui.nochatreports.unsafe_server.check": "Jangan perlihatkan lagi untuk server ini", diff --git a/src/main/resources/assets/nochatreports/lang/it_it.json b/src/main/resources/assets/nochatreports/lang/it_it.json index 52d9967..ca98616 100644 --- a/src/main/resources/assets/nochatreports/lang/it_it.json +++ b/src/main/resources/assets/nochatreports/lang/it_it.json @@ -1,14 +1,14 @@ { "modmenu.descriptionTranslation.nochatreports": "Rimuove le firme digitali dai messaggi che invii, rendendo impossibile tracciarli e associarli al tuo account Mojang/Microsoft e impedendone dunque la segnalazione.", - "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.", + "gui.nochatreports.secure_chat": "Questa opzione non può funzionare con No Chat Reports, dal momento che non ci sono firme da verificare.", + "gui.nochatreports.no_reporting": "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 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. A meno che non sia stato installato qualche plug-in che impedisca la segnalazione della chat, 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 questo server dalla §owhitelist dei server§r nelle opzioni di configurazione della mod.", - "gui.nochatreports.status_realms": "Questo server è un realm. In questo server non solo è impossibile impedire la segnalazione della chat, ma Mojang si serve anche di un sistema automatico di monitoraggio per identificare \"pericoli online\" e riferirli a moderatori umani per la revisione, anche se il proprietario del server non vuole. La tua unica speranza è la crittografia.", - "gui.nochatreports.status_insecure_whitelist_all_servers": "Questo server richiede che tutti i messaggi della chat siano firmati e tu hai disattivato la relativa schermata di avvertimento. 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 disattivare l'opzione §oAggiungi tutti i server alla whitelist§r nelle opzioni di configurazione della mod.", - "gui.nochatreports.status_undefined": "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.safety_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.OLD_status_unintrusive": "Questo server ti permette di inviare messaggi non firmati che non possono essere segnalati a Mojang. A meno che non sia stato installato qualche plug-in che impedisca la segnalazione della chat, 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.OLD_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 questo server dalla §owhitelist dei server§r nelle opzioni di configurazione della mod.", + "gui.nochatreports.OLD_status_realms": "Questo server è un realm. In questo server non solo è impossibile impedire la segnalazione della chat, ma Mojang si serve anche di un sistema automatico di monitoraggio per identificare \"pericoli online\" e riferirli a moderatori umani per la revisione, anche se il proprietario del server non vuole. La tua unica speranza è la crittografia.", + "gui.nochatreports.OLD_status_insecure_whitelist_all_servers": "Questo server richiede che tutti i messaggi della chat siano firmati e tu hai disattivato la relativa schermata di avvertimento. 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 disattivare l'opzione §oAggiungi tutti i server alla whitelist§r nelle opzioni di configurazione della mod.", + "gui.nochatreports.safety_status.undefined": "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, 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", diff --git a/src/main/resources/assets/nochatreports/lang/ko_kr.json b/src/main/resources/assets/nochatreports/lang/ko_kr.json index 594a8d9..0b9156c 100644 --- a/src/main/resources/assets/nochatreports/lang/ko_kr.json +++ b/src/main/resources/assets/nochatreports/lang/ko_kr.json @@ -1,13 +1,13 @@ { "modmenu.descriptionTranslation.nochatreports": "플레이어 메시지에서 암호화 서명을 제거하여 추적 및 Mojang/Microsoft 계정과 연관짓기, 대화 신고 기능 사용을 불가능하게 만듭니다.", - "gui.nochatreport.secureChat": "확인할 서명이 없기 때문에 이 설정은 No Chat Reports와 작동하지 않습니다.", - "gui.nochatreport.noReporting": "이 서버는 No Chat Reports에 의해 신고가 비활성화되어있습니다.", + "gui.nochatreports.secure_chat": "확인할 서명이 없기 때문에 이 설정은 No Chat Reports와 작동하지 않습니다.", + "gui.nochatreports.no_reporting": "이 서버는 No Chat Reports에 의해 신고가 비활성화되어있습니다.", "disconnect.nochatreports.client": "이 서버는 No Chat Reports가 없으며 서버에 필요하도록 설정되어 있습니다.", - "gui.nochatreports.status_secure": "이 서버는 No Chat Reports가 설치되어 있거나 다른 알려진 방식으로 대화 메시지를 신고하는 것을 방지합니다. 아무도 빨간색 표시자나 (!) 기호를 보지 않으며 \"보안 대화만 표시\"는 메시지를 숨기지 않습니다. 안전하게 대화할 수 있습니다", - "gui.nochatreports.status_unintrusive": "이 서버는 Mojang에 신고될 수 없는 서명하지 않은 대화 메시지를 보내는 것을 허용합니다. 그러나 바닐라 클라이언트는 메시지 왼쪽에 빨간색 표시자가 표시되고 오른쪽에 (!) 기호가 표시되며 \"보안 대화만 표시\"가 켜진 경우 당신의 메시지를 볼 수 없습니다", - "gui.nochatreports.status_insecure": "이 서버는 모든 대화 메시지에 서명할 것을 요구하며, 당신은 이에 동의했습니다. 당신이 보낸 모든 대화는 잠재적으로 당신에게 불리하게 사용될 수 있는 증거가 될 수 있습니다. 다시 경고를 받으려면 모드 설정의 §o서버 화이트리스트§r 에서 이 서버를 제거하세요.", - "gui.nochatreports.status_insecure_whitelist_all_servers": "이 서버는 모든 대화 메시지에 서명할 것을 요구하며 당신은 이에 대한 전체 화면 경고를 비활성화 했습니다. 당신이 보낸 모든 대화는 잠재적으로 당신에게 불리하게 사용될 수 있는 증거가 될 수 있습니다. 다시 경고를 받으려면 모드 설정의 §o모든 서버를 화이트리스트에 추가§r 설정을 비활성화하세요", - "gui.nochatreports.status_undefined": "No Chat Reports는 이 서버의 안전성을 평가할 수 없습니다. 이것은 발생해서는 안됩니다. 모드 개발자에게 버그로 보고해주세요.", + "gui.nochatreports.safety_status.secure": "이 서버는 No Chat Reports가 설치되어 있거나 다른 알려진 방식으로 대화 메시지를 신고하는 것을 방지합니다. 아무도 빨간색 표시자나 (!) 기호를 보지 않으며 \"보안 대화만 표시\"는 메시지를 숨기지 않습니다. 안전하게 대화할 수 있습니다", + "gui.nochatreports.OLD_status_unintrusive": "이 서버는 Mojang에 신고될 수 없는 서명하지 않은 대화 메시지를 보내는 것을 허용합니다. 그러나 바닐라 클라이언트는 메시지 왼쪽에 빨간색 표시자가 표시되고 오른쪽에 (!) 기호가 표시되며 \"보안 대화만 표시\"가 켜진 경우 당신의 메시지를 볼 수 없습니다", + "gui.nochatreports.OLD_status_insecure": "이 서버는 모든 대화 메시지에 서명할 것을 요구하며, 당신은 이에 동의했습니다. 당신이 보낸 모든 대화는 잠재적으로 당신에게 불리하게 사용될 수 있는 증거가 될 수 있습니다. 다시 경고를 받으려면 모드 설정의 §o서버 화이트리스트§r 에서 이 서버를 제거하세요.", + "gui.nochatreports.OLD_status_insecure_whitelist_all_servers": "이 서버는 모든 대화 메시지에 서명할 것을 요구하며 당신은 이에 대한 전체 화면 경고를 비활성화 했습니다. 당신이 보낸 모든 대화는 잠재적으로 당신에게 불리하게 사용될 수 있는 증거가 될 수 있습니다. 다시 경고를 받으려면 모드 설정의 §o모든 서버를 화이트리스트에 추가§r 설정을 비활성화하세요", + "gui.nochatreports.safety_status.undefined": "No Chat Reports는 이 서버의 안전성을 평가할 수 없습니다. 이것은 발생해서는 안됩니다. 모드 개발자에게 버그로 보고해주세요.", "gui.nochatreports.unsafe_server.header": "주의: 안전하지 않은 서버", "gui.nochatreports.unsafe_server.contents": "이 서버는 모든 대화 메시지에 서명할 것을 요구하며, 이는 대화 메시지가 Mojang에 신고될 수 있다는 것을 의미합니다. 서버 소유자가 1.19.1 이후 기본값인 server.properties 내의 'enforce-secure-profile'을 켰을 수 있습니다. 이를 무시하고 플레이할 수 있지만 No Chat Reports는 당신을 보호할 수 없습니다.", "gui.nochatreports.unsafe_server.check": "이 서버에 대해 이 화면을 다시 보지 않기", diff --git a/src/main/resources/assets/nochatreports/lang/nl_nl.json b/src/main/resources/assets/nochatreports/lang/nl_nl.json index 7926750..9220d2c 100644 --- a/src/main/resources/assets/nochatreports/lang/nl_nl.json +++ b/src/main/resources/assets/nochatreports/lang/nl_nl.json @@ -1,11 +1,11 @@ { - "gui.nochatreport.secureChat": "Deze optie kan niet samenwerken met No Chat Reports, omdat er geen digitale handtekingen zijn om te verifiëren.", - "gui.nochatreport.noReporting": "Chat rapporten zijn uitgeschakeld op deze server, met dank aan No Chat Reports.", + "gui.nochatreports.secure_chat": "Deze optie kan niet samenwerken met No Chat Reports, omdat er geen digitale handtekingen zijn om te verifiëren.", + "gui.nochatreports.no_reporting": "Chat rapporten zijn uitgeschakeld op deze server, met dank aan No Chat Reports.", "disconnect.nochatreports.client": "Deze server heeft geen ondersteuning voor No Chat Reports, en je hebt de mod geconfigureerd om zichzelf te vereisen op de server.", - "gui.nochatreports.status_secure": "Deze server heeft No Chat Reports geïnstalleerd, of voorkomt het rapporteren van berichten op een andere bekende manier. Je kan de chat veilig gebruiken.", - "gui.nochatreports.status_unintrusive": "Deze server voorkomt niet dat chatberichten gerapporteerd worden, maar staat het versturen van berichten zonder digitale handtekening toe. Technisch gezien kunnen ze gerapporteerd worden aan Mojang, maar worden over het algemeen niet beschouwd als geldig bewijs. Het is onwaarschijnlijk dat er actie ondernomen wordt op deze rapporten.", - "gui.nochatreports.status_insecure": "Deze server vereist dat alle berichten van spelers digitaal ondertekend worden, en je bent met deze regeling akkoord gegaan. Elk bericht dat je in deze chat verstuurd is mogelijk belastend bewijs dat tegen je gebruikt kan worden in het rapport. Je kan deze server handmatig verwijderen uit je NoChatReports.json in je config folder om opnieuw gewaarschuwd te worden.", - "gui.nochatreports.status_undefined": "No Chat Reports kon de veiligheid van deze server niet evalueren. Dit zou nooit mogen gebeuren, rapporteer dit alsjeblieft als een bug aan de mod ontwikkelaar.", + "gui.nochatreports.safety_status.secure": "Deze server heeft No Chat Reports geïnstalleerd, of voorkomt het rapporteren van berichten op een andere bekende manier. Je kan de chat veilig gebruiken.", + "gui.nochatreports.OLD_status_unintrusive": "Deze server voorkomt niet dat chatberichten gerapporteerd worden, maar staat het versturen van berichten zonder digitale handtekening toe. Technisch gezien kunnen ze gerapporteerd worden aan Mojang, maar worden over het algemeen niet beschouwd als geldig bewijs. Het is onwaarschijnlijk dat er actie ondernomen wordt op deze rapporten.", + "gui.nochatreports.OLD_status_insecure": "Deze server vereist dat alle berichten van spelers digitaal ondertekend worden, en je bent met deze regeling akkoord gegaan. Elk bericht dat je in deze chat verstuurd is mogelijk belastend bewijs dat tegen je gebruikt kan worden in het rapport. Je kan deze server handmatig verwijderen uit je NoChatReports.json in je config folder om opnieuw gewaarschuwd te worden.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports kon de veiligheid van deze server niet evalueren. Dit zou nooit mogen gebeuren, rapporteer dit alsjeblieft als een bug aan de mod ontwikkelaar.", "gui.nochatreports.unsafe_server.header": "Opgelet: Onveilige Server", "gui.nochatreports.unsafe_server.contents": "Deze server vereist dat alle berichten van spelers digitaal ondertekend worden, wat betekent dat ze aan Mojang gerapporteerd kunnen worden. Waarschijnlijk komt dit omdat de eigenaar van de server de 'enforce-secure-profile' optie ingeschakeld gehouden heeft in de server.properties, wat sinds 1.19.1 de standaard is. Je kan ervoor kiezen om toch op deze server te spelen, echter zal No Chat Reports niet in staat zijn om je te beschermen.", "gui.nochatreports.unsafe_server.check": "Niet meer tonen voor deze server", diff --git a/src/main/resources/assets/nochatreports/lang/pl_pl.json b/src/main/resources/assets/nochatreports/lang/pl_pl.json index a1afeda..4afc9d8 100644 --- a/src/main/resources/assets/nochatreports/lang/pl_pl.json +++ b/src/main/resources/assets/nochatreports/lang/pl_pl.json @@ -1,29 +1,37 @@ { "modmenu.descriptionTranslation.nochatreports": "Usuwa podpisy kryptograficzne z wiadomości graczy, uniemożliwiając ich śledzenie i powiązanie z kontem Mojang/Microsoft, a także korzystanie z funkcji raportowania czatu gracza.", - "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.", + "gui.nochatreports.secure_chat": "Ta opcja nie działa z No Chat Reports, ponieważ nie ma podpisów do weryfikacji.", + "gui.nochatreports.no_reporting": "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. 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_undefined": "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ć.", - "gui.nochatreports.unsafe_server.check": "Nie pokazuj ponownie dla tego serwera", + "gui.nochatreports.safety_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.safety_status.unintrusive": "Ten serwer umożliwia wysyłanie niepodpisanych wiadomości, których nie można zgłosić do Mojang. O ile na serwerze nie jest zainstalowana jakaś wtyczka, która zapobiega raportom czatu - klienci vanilla nadal będą wysyłać podpisane wiadomości, wyświetlać niepodpisane wiadomości jako \"Niezweryfikowane\" i nie wyświetlać ich, jeśli w opcjach czatu włączona jest opcja \"Pokazuj tylko bezpieczny czat\".", + "gui.nochatreports.safety_status.insecure": "Ten serwer obecnie wymaga podpisania wszystkich wiadomości czatu. Wszystkie podpisane wiadomości są potencjalnie obciążającym dowodem, który można wykorzystać przeciwko tobie w zgłoszeniu.", + "gui.nochatreports.status_insecure_whitelisted": "Ten serwer nie wymaga podpisania wiadomości czatu, ale mimo to włączyłeś to poprzez białą listę. Wszystkie podpisane wiadomości są potencjalnie obciążającymi dowodami, które można wykorzystać przeciwko tobie w raporcie.", + "gui.nochatreports.safety_status.realms": "To jest serwer Realms. Nie tylko nie ma sposobu, aby zapobiec raportom na czacie, ale Mojang stosuje również automatyczne monitorowanie czatu, aby zidentyfikować potencjalne \"szkody online\" i przekazywać je do oceny przez człowieka, niezależnie od tego, czy właścicielowi królestwa się to podoba, czy nie. Twoją jedyną nadzieją jest szyfrowanie czatu.", + "gui.nochatreports.safety_status.unknown": "Brak raportów czatu nie jest jeszcze pewien co do bezpieczeństwa tego serwera. Spróbuj wysłać wiadomość na czacie, aby ją ocenić.", + "gui.nochatreports.safety_status.undefined": "Brak raportów z czatu nie może ocenić bezpieczeństwa tego serwera. To nigdy nie powinno się zdarzyć, zgłoś to jako błąd do twórcy modyfikacji.", + "gui.nochatreports.signing_status.allowed_realms": "Podpisywanie czatu jest zawsze włączone w Realms, ponieważ jest zawsze wymagane, a jego wyłączenie i tak nie przyniosłoby żadnych korzyści.", + "gui.nochatreports.status_signing_allowed_whitelisted": "Podpisywanie wiadomości jest włączone dla tej sesji. Możesz spróbować go wyłączyć, usuwając serwer z białej listy, ponownie dołączając i wysyłając wiadomość na czacie. Po tym czasie raporty z czatu nie będą w stanie określić, czy podpisanie jest wymagane.", + "gui.nochatreports.status_signing_allowed": "Podpisywanie wiadomości jest włączone dla tej sesji. Dołącz ponownie do serwera, aby go wyłączyć.", + "gui.nochatreports.status_signing_denied_secure": "Podpisywanie wiadomości jest wyłączone, ponieważ ten serwer jest bezpieczny.", + "gui.nochatreports.status_signing_denied": "Podpisywanie wiadomości jest wyłączone w tej sesji. Możesz umieścić ten serwer na białej liście, aby zawsze umożliwiać na nim podpisywanie czatu.", + "gui.nochatreports.status_whitelist_mode": "§lSerwery w białej liście: %1$s", + "gui.nochatreports.status_whitelist_all": "§a§lTak (Wszystkie serwery)", + "gui.nochatreports.status_whitelist_yes": "§a§lTak", + "gui.nochatreports.status_whitelist_no": "§c§lNie", "gui.nochatreports.reload_config_tooltip": "Przeładuj konfigurację No Chat Reports. Używaj ostrożnie.", - "gui.nochatreports.verified_server": "§a§lBezpieczny serwer§r\nMożemy sprawdzić, czy na tym serwerze zainstalowano No Chat Reports lub w inny znany sposób zapobiec raportowaniu z czatu. Możesz tam bezpiecznie czatować.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nWyłącz lub włącz większość funkcji po stronie klienta moda. Być może będziesz musiał to zrobić, aby dołączyć do niektórych serwerów Paper/Velocity, ponieważ są one znane z powodowania problemów z NCR.\nNiektóre rzeczy niezwiązane z siecią, takie jak szyfrowanie, poprawianie stanu zaufania czatu i usuwanie wanilii „Wiadomości na czacie nie mogą być zweryfikowane\" toasty nadal będą działać; można je wyłączyć w konfiguracji indywidualnie.", + "gui.nochatreports.verified_server": "§a§lBezpieczny serwer§r\nSprawdziliśmy, czy na tym serwerze zainstalowano No Chat Reports lub w inny znany sposób zapobiega się raportowaniu czatu. Możesz tam bezpiecznie czatować.", + "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nWyłącz lub włącz większość funkcji po stronie klienta moda. Być może będziesz musiał to zrobić, aby dołączyć do niektórych serwerów Paper/Velocity, ponieważ są one znane z powodowania problemów z NCR.\nNiektóre rzeczy niezwiązane z siecią, takie jak szyfrowanie, poprawianie stanu zaufania czatu i usuwane z vanilii \"Wiadomości na czacie nie mogą być zweryfikowane\" toasty nadal będą działać; można je wyłączyć w konfiguracji indywidualnie.", "gui.nochatreports.ncr_state_on": "§a§lWłączony§r", "gui.nochatreports.ncr_state_off": "§c§lWyłączony§r", "tag.nochatreports.encrypted": "Zaszyfrowany używając: %1$s", "tag.nochatreports.encrypted_original": "Nieodszyfrowane: %1$s", - "gui.nochatreports.encryption_tooltip": "§lSzyfrowanie:§r %1$s\nKliknij prawym przyciskiem, aby skonfigurować.", + "gui.nochatreports.encryption_tooltip": "§lSzyfrowanie:§r %1$s\nKliknij prawym przyciskiem, aby skonfigurować.\n\nGdy szyfrowanie jest włączone, możesz zapobiec jego zastosowaniu do wiadomości, przytrzymując §n§lCtrl§r podczas wysyłania.", "gui.nochatreports.encryption_tooltip_invalid": "§lSzyfrowanie:§r %1$s\n§cNie prawidłowa konfiguracja. Kliknij, aby skonfigurować.", "gui.nochatreports.encryption_state_on": "§a§lWłączone§r", "gui.nochatreports.encryption_state_off": "§c§lWyłączone§r", "gui.nochatreports.encryption_warning.header": "O Szyfrowaniu", - "gui.nochatreports.encryption_warning.contents": "Możesz zaszyfrować swoje wiadomości za pomocą tajnego klucza. Tylko osoby znające ten klucz będą mogły je odszyfrować. No Chat Reports automatycznie odszyfruje wszystkie zaszyfrowane wiadomości po podaniu odpowiedniego klucza i włączeniu funkcji.\nJednakże należy pamiętać, że szyfrowanie nie jest rozwiązaniem typu „magicznej różdżki”. Moderatorzy na serwerach stron trzecich mogą wyciszyć lub zablokować Cię za wysyłanie tego, co będzie im się wydawać zniekształconym bałaganem na czacie. Ponadto zaleca się wygenerowanie niestandardowego klucza szyfrowania i przekazywanie go innym osobom wyłącznie za pośrednictwem bezpiecznych kanałów. Kliknij „Więcej informacji”, aby dowiedzieć się więcej o tym, jak i kiedy należy używać szyfrowania.", + "gui.nochatreports.encryption_warning.contents": "Możesz zaszyfrować swoje wiadomości za pomocą tajnego klucza. Tylko osoby znające ten klucz będą mogły je odszyfrować. No Chat Reports automatycznie odszyfruje wszystkie zaszyfrowane wiadomości po podaniu odpowiedniego klucza i włączeniu funkcji.\nJednakże należy pamiętać, że szyfrowanie nie jest rozwiązaniem typu \"magicznej różdżki\". Moderatorzy na serwerach stron trzecich mogą wyciszyć lub zablokować Cię za wysyłanie tego, co będzie im się wydawać zniekształconym bałaganem na czacie. Ponadto zaleca się wygenerowanie niestandardowego klucza szyfrowania i przekazywanie go innym osobom wyłącznie za pośrednictwem bezpiecznych kanałów. Kliknij \"Więcej informacji\", aby dowiedzieć się więcej o tym, jak i kiedy należy używać szyfrowania.", "gui.nochatreports.encryption_warning.check": "Nie pokazuj ponownie", "gui.nochatreports.encryption_warning.learn_more": "Dowiedz się więcej", "gui.nochatreports.encryption_config.header": "Ustawienia Szyfrowania", @@ -36,17 +44,32 @@ "gui.nochatreports.encryption_config.algorithm": "Algorytm: %1$s", "gui.nochatreports.encryption_config.default_key": "", "gui.nochatreports.encryption_config.encrypt_public": "Szyfruj wiadomości publiczne", + "algorithm.nochatreports.aes_cfb8_base64.name": "AES/CFB8+Base64R", "algorithm.nochatreports.aes_cfb8_base64": "§lAES/CFB8+Base64R§r\nStandardowy algorytm szyfrowania symetrycznego. Używa 128-bitowych kluczy, dane wyjściowe są zakodowane w Base64, aby umożliwić przesyłanie za pośrednictwem czatu Minecrafta. Wadą - wiadomości zyskają około 30% długości, a serwer może je skrócić, jeśli przekroczą limit rozmiaru.", + "algorithm.nochatreports.aes_gcm_base64.name": "AES/GCM+Base64R", "algorithm.nochatreports.aes_gcm_base64": "§lAES/GCM+Base64R§r\nWiększe bezpieczeństwo w zamian za znaczny wzrost rozmiaru wiadomości (12 bajtów na wektor inicjujący i 12 na znacznik uwierzytelniania, kodowanie Base64 na górze). Wybierz, jeśli cenisz bezpieczeństwo ponad wszystko inne.", + "algorithm.nochatreports.aes_ecb_base64.name": "AES/ECB+Base64R", "algorithm.nochatreports.aes_ecb_base64": "§lAES/ECB+Base64R§r\nZnacznie mniej bezpieczny niż tryb CFB, ale oszczędza kilka bajtów, ponieważ nie wymaga wektora inicjalizacji. Wciąż lepsze od Cezara.", + "algorithm.nochatreports.caesar.name": "Cazar", "algorithm.nochatreports.caesar": "§lCezar§r\nSzyfr dla memu. Dzięki temu masz zasadniczo nadzieję, że ludzie zrezygnują, nawet nie próbując odszyfrować twoich wiadomości. Może to być prawdą w wielu przypadkach, więc opłacalność jego użycia zależy od modelu zagrożenia.\nKlucz powinien być liczbą całkowitą od 1 do 1024. Przesunięcie odbywa się za pomocą kodu znakowego, a nie alfabetycznego, aby zapewnić zgodność z dowolnym językiem.", + "nochatreports.connect.nokey_rejected": "Serwer odrzucił połączenie bez klucza podpisywania czatu.", + "nochatreports.connect.await": "Oczekiwanie na ponowne połączenie: %1$s sekund...", + "gui.nochatreports.realms_warning.header": "Uwaga: Realms", + "gui.nochatreports.realms_warning.contents": "Serwery Realms nie są prywatne. Właściciele domen nie mogą wyłączyć raportowania czatu, a Mojang stosuje dodatkowe monitorowanie czatu, aby zidentyfikować potencjalne \"szkody online\" i przekazać je do weryfikacji przez człowieka. Jeśli następnie okaże się, że naruszasz Standardy społeczności Minecrafta – nawet jeśli uczestnicy czatu nie poczuli się urażeni – zostaniesz tymczasowo lub na stałe zablokowany we wszystkich usługach dla wielu graczy. Zaleca się stosowanie szyfrowania.", + "gui.nochatreports.realms_warning.check": "Nie pokazuj ponownie", + "gui.nochatreports.realms_warning.learn_more": "Dowiedz się więcej", + "gui.nochatreports.signing_required.header": "Uwaga: Prośba o podpisanie czatu", + "gui.nochatreports.signing_required.contents_OUTDATED": "Ten serwer wymaga podpisania wszystkich wiadomości na czacie, co oznacza, że można je zgłaszać do Mojang, co może skutkować zablokowaniem wszystkich serwerów dla wielu graczy. Prawdopodobnie oznacza to, że właściciel serwera pozostawił włączony \"enforce-secure-profile\" w server.properties, co jest ustawieniem domyślnym od wersji 1.19.1. Kliknij opcję \"Zezwalaj na podpisywanie\", aby włączyć podpisywanie wiadomości w tej sesji, lub \"Serwer białej listy\", aby zawsze włączać podpisywanie na tym serwerze.", + "gui.nochatreports.signing_required.allow_signing": "Zezwól na podpisywanie", + "gui.nochatreports.signing_required.whitelist_server": "Dodaj serwer do Białej listy", + "gui.nochatreports.signing_required.cancel": "Odrzuć", + "gui.nochatreports.signing_required.check": "Nie pokazuj ponownie podczas tej sesji", + "chat.nochatreports.disabled.signingRequested": "Serwer odmówił dostarczenia niepodpisanej wiadomości. Możesz włączyć podpisywanie czatu, zezwalając na jedną sesję na wyskakującym ekranie lub umieszczając serwer na białej liście. Bez podpisywania nadal możesz używać większości poleceń.", "configuration.NoChatReports.config": "No Chat Reports", - "configuration.NoChatReports.category.visual": "Wizualne", - "option.NoChatReports.showServerSafety": "Pokaż bezpieczeństwo serwera", - "option.NoChatReports.showServerSafety.tooltip": "Umożliwia klientowi wyświetlanie stanu bezpieczeństwa serwera w prawym dolnym rogu ekranu czatu. Ikonę można przesunąć, aby uzyskać dodatkowe informacje.", + "option.NoChatReports.showServerSafety.tooltip": "Umożliwia klientowi wyświetlanie stanu bezpieczeństwa serwera w prawym dolnym rogu ekranu czatu. Ikonę można najechać, aby uzyskać dodatkowe informacje.", "option.NoChatReports.showServerSafety.moreInfo": "§bKliknij tutaj, aby przeczytać więcej o poziomach bezpieczeństwa serwerów", "option.NoChatReports.verifiedIconEnabled": "Zweryfikowana ikona włączona", "option.NoChatReports.verifiedIconEnabled.tooltip": "Pozwala modowi wyświetlać specjalną ikonę w menu gry wieloosobowej dla serwerów, na których zainstalowano No Chat Reports lub inne środki zapobiegające zgłaszaniu czatów.", @@ -54,19 +77,17 @@ "option.NoChatReports.verifiedIconOffsetX.tooltip": "Definiuje przesunięcie osi X dla renderowania ikony \"Bezpieczny serwer\".", "option.NoChatReports.verifiedIconOffsetY": "Przesunięcie Y zweryfikowanej ikony", "option.NoChatReports.verifiedIconOffsetY.tooltip": "Definiuje przesunięcie osi Y dla renderowania ikony \"Bezpieczny serwer\".", - "option.NoChatReports.hideRedChatIndicators": "Ukryj czerwone wskaźniki czatu", - "option.NoChatReports.hideRedChatIndicators.tooltip": "Zapobiega wyświetlaniu przez klienta wskaźników \"Niezabezpieczonych\" w postaci czerwonego paska po lewej stronie i ikony §c§l(§r§c!§c§l)§r po prawej stronie wiadomości czatu.", - "option.NoChatReports.hideYellowChatIndicators": "Ukryj żółte wskaźniki czatu", - "option.NoChatReports.hideYellowChatIndicators.tooltip": "Zapobiega wyświetlaniu przez klienta wskaźników \"Zmodyfikowano\" w postaci żółtego paska po lewej stronie i ikony §e§l(§r§e?§e§l)§r po prawej stronie wiadomości czatu.", - "option.NoChatReports.hideGrayChatIndicators": "Ukryj szare wskaźniki czatu", - "option.NoChatReports.hideGrayChatIndicators.tooltip": "Zapobiega wyświetlaniu przez klienta specjalnych wskaźników komunikatów systemowych w postaci szarego paska po lewej stronie.", + "option.NoChatReports.hideInsecureMessageIndicators": "Ukryj niezweryfikowane wskaźniki czatu", + "option.NoChatReports.hideInsecureMessageIndicators.tooltip": "Zapobiega wyświetlaniu przez klienta wskaźników \"Niezabezpieczonych\" w postaci szarego paska po lewej stronie.", + "option.NoChatReports.hideModifiedMessageIndicators": "Ukryj zmodyfikowane wskaźniki czatu", + "option.NoChatReports.hideModifiedMessageIndicators.tooltip": "Zapobiega wyświetlaniu przez klienta wskaźników \"Zmodyfikowano\" w postaci szarego paska po lewej stronie i §7§l(§r§7?§7§l)§r po najechaniu kursorem na prawo od wiadomości czatu.", + "option.NoChatReports.hideSystemMessageIndicators": "Ukryj systemowe wskaźniki czatu", + "option.NoChatReports.hideSystemMessageIndicators.tooltip": "Zapobiega wyświetlaniu przez klienta specjalnych wskaźników komunikatów systemowych w postaci szarego paska po lewej stronie.", "option.NoChatReports.hideWarningToast": "Ukryj toast ostrzegawczy", "option.NoChatReports.hideWarningToast.tooltip": "Usuwa ostrzeżenie wyświetlane podczas wchodzenia na serwery z wyłączonym §oenforce-secure-profile§r.", "option.NoChatReports.alwaysHideReportButton": "Zawsze ukrywaj przycisk raportu", "option.NoChatReports.alwaysHideReportButton.tooltip": "Zapobiega wyświetlaniu przez klienta przycisku raportu na ekranie interakcji społecznościowych. Domyślnie jest to wyłączone, a mod po prostu dezaktywuje przycisk na serwerach, na których nie zainstalowano żadnych raportów czatu, dodając wyjaśnienie do podpowiedzi przycisku.", - "configuration.NoChatReports.category.technical": "Techniczne", - "option.NoChatReports.demandOnServer": "Wymagaj na serwerze", "option.NoChatReports.demandOnServer.tooltip": "Uniemożliwia klientowi dołączanie do serwerów, na których nie zainstalowano No Chat Reports.", "option.NoChatReports.enableDebugLog": "Włącz dziennik debugowania", @@ -77,26 +98,35 @@ "option.NoChatReports.showReloadButton.tooltip": "Dodaje przycisk przeładowania konfiguracji do menu gry wieloosobowej.", "option.NoChatReports.whitelistAllServers": "Dodaj wszystkie serwery do białej listy", "option.NoChatReports.whitelistAllServers.tooltip": "Sprawia, że mod zachowuje się tak, jakby wszystkie serwery zostały dodane do §oBiałej listy serwerów§r.", + "option.NoChatReports.skipSigningWarning": "Podpisz automatycznie na żądanie", + "option.NoChatReports.skipSigningWarning.tooltip": "Pomija ostrzeżenie \"Prośba o podpisanie czatu\" i automatycznie podpisuje czat, gdy wymaga tego serwer.", "option.NoChatReports.showNCRButton": "Pokaż przycisk NCR", "option.NoChatReports.showNCRButton.tooltip": "Dodaje przycisk, który przełącza większość funkcjonalności moda po stronie klienta do menu gry wieloosobowej.", "option.NoChatReports.enableMod": "Włącz modyfikacje", "option.NoChatReports.enableMod.tooltip": "Odpowiedzialny za włączenie większości funkcjonalności modów po stronie klienta, patrz opcja powyżej.", - + "option.NoChatReports.reconnectAwaitSeconds": "Sekundy przed ponownym połączeniem", + "option.NoChatReports.reconnectAwaitSeconds.tooltip": "Liczba sekund, przez które klient powinien czekać przed automatycznym ponownym połączeniem, gdy serwer odrzuci połączenie bez klucza podpisywania czatu, zakładając, że użytkownik zgodził się wejść na niebezpieczny serwer.", + "option.NoChatReports.postDisconnectAwaitSeconds": "Po rozłączeniu czekaj sekund", + "option.NoChatReports.postDisconnectAwaitSeconds.tooltip": "Podobny do §oreconnectAwaitSeconds§r, ale odliczanie rozpoczyna się, gdy tylko gracz normalnie rozłączy się z serwerem. Jeśli to opóźnienie jest większe niż §oreconnectAwaitSeconds§r, gdy próbują ponownie dołączyć do serwera - zostanie zastosowane zamiast tego.", + "option.NoChatReports.signingCheckDelaySeconds": "Sekundy opóźnienia sprawdzania podpisu", + "option.NoChatReports.signingCheckDelaySeconds.tooltip": "Opóźnienie w sekundach na sprawdzenie, czy serwery na białej liście nadal wymagają podpisów czatu. Ustawienie na 0 spowoduje sprawdzanie przy każdej próbie logowania, podobnie jak przy serwerach nie na białej liście.", + "option.NoChatReports.serverSigningChecks": "Kontrole podpisywania serwera", + "option.NoChatReports.serverSigningChecks.tooltip": "Mapa serwerów z białej listy do czasów sprawdzania wymuszania ostatniego podpisywania, w sekundach epoki. Zwykle nie trzeba tego edytować ręcznie.", + "option.NoChatReports.showEncryptionButton": "Pokaż przycisk szyfrowania", + "option.NoChatReports.showEncryptionButton.tooltip": "Ustawienie tego na false po prostu uniemożliwi wyświetlanie przycisku szyfrowania na ekranie czatu. Należy pamiętać, że samo szyfrowanie nie zostanie automatycznie wyłączone wraz z przyciskiem.", "configuration.NoChatReports.category.whitelistedServers": "Serwery w białej liście", - "option.NoChatReports.whitelistedServers": "Serwery w białej liście", - "option.NoChatReports.whitelistedServers.tooltip": "Zawiera serwery, dla których ekran ostrzeżenia \"Niebezpieczny serwer\" nigdy nie powinien być wyświetlany. Serwery są dodawane do tej listy automatycznie po zaznaczeniu pola \"Nie pokazuj ponownie dla tego serwera\" na tym ekranie.\nKażdy wpis jest łańcuchem w formacie §l:§r.", + "option.NoChatReports.whitelistedServers.tooltip": "Zawiera serwery, dla których ekran ostrzeżenia \"Żądane podpisy czatu\" nie powinien nigdy być wyświetlany. Serwery są dodawane do tej listy po kliknięciu \"Dodaj serwer do Białej listy\" na tym ekranie.\nKażdy wpis jest ciągiem znaków w formacie §l:§r.", "option.NoChatReports.whitelistedServers.addButtonTooltip": "Dodaj serwer", "option.NoChatReports.whitelistedServers.removeButtonTooltip": "Usuń serwer", "option.NoChatReports.whitelistedServers.instructions": "Kliknij +, aby dodać serwer. Kliknij -, aby usunąć wybrany serwer.", "option.NoChatReports.whitelistedServers.serverAddress": "Kliknij tutaj, aby edytować adres serwera", - - "configuration.NoChatReports.category.lanOptions": "LAN Options", - + "configuration.NoChatReports.category.lanOptions": "Opcje LAN", "option.NoChatReports.demandOnClient": "Wymagaj na kliencie", "option.NoChatReports.demandOnClient.tooltip": "Sprawia, że serwer wymaga, aby wszyscy dołączający klienci mieli zainstalowany No Chat Reports.", "option.NoChatReports.convertToGameMessage": "Konwertuj na wiadomość z gry", "option.NoChatReports.convertToGameMessage.tooltip": "Sprawia, że serwer konwertuje wszystkie wiadomości gracza na wiadomości systemowe. Wiadomości systemowe nie mają żadnych podpisów i nie mogą być raportowane; na niezmodyfikowanych klientach będą wyświetlane z szarym paskiem po lewej stronie.", "option.NoChatReports.addQueryData": "Dodaj dane zapytania", - "option.NoChatReports.addQueryData.tooltip": "Umożliwia serwerowi wysyłanie dodatkowych danych do klienta podczas obsługi pingów. Służy do wyświetlania ikony \"Bezpieczny serwer\", a także do innych celów technicznych." + "option.NoChatReports.addQueryData.tooltip": "Umożliwia serwerowi wysyłanie dodatkowych danych do klienta podczas obsługi pingów. Służy do wyświetlania ikony \"Bezpieczny serwer\", a także do innych celów technicznych.", + "gui.NoChatReports.showEncryptionButtonWarning": "§cPoniższe nie wyłącza szyfrowania, tylko ukrywa przycisk!" } diff --git a/src/main/resources/assets/nochatreports/lang/pt_br.json b/src/main/resources/assets/nochatreports/lang/pt_br.json index b85a632..70b19cd 100644 --- a/src/main/resources/assets/nochatreports/lang/pt_br.json +++ b/src/main/resources/assets/nochatreports/lang/pt_br.json @@ -1,15 +1,15 @@ { "modmenu.descriptionTranslation.nochatreports": "STRIPS Assinaturas criptográficas de mensagens de jogador, tornando impossível rastreá-las e associá-las à sua conta Mojang/Microsoft, além de usar o recurso de relatório de bate-papo de jogador.", - "gui.nochatreport.secureChat": "Esta opção não pode funcionar sem relatórios de bate-papo, pois não há assinaturas a serem verificadas.", - "gui.nochatreport.noReporting": "Os relatórios de bate-papo estão desativados neste servidor, cortesia de relatórios sem bate-papo.", + "gui.nochatreports.secure_chat": "Esta opção não pode funcionar sem relatórios de bate-papo, pois não há assinaturas a serem verificadas.", + "gui.nochatreports.no_reporting": "Os relatórios de bate-papo estão desativados neste servidor, cortesia de relatórios sem bate-papo.", "disconnect.nochatreports.client": "Este servidor não possui relatórios de bate-papo e você o configurou para exigir-se no servidor.", - "gui.nochatreports.status_secure": "Este servidor não possui relatórios de bate-papo instalados ou impede que suas mensagens sejam relatáveis de outra maneira conhecida.Você pode conversar com segurança.", - "gui.nochatreports.status_unintrusive": "Este servidor permite enviar mensagens não assinadas que não podem ser relatadas ao Mojang.A menos que algum tipo de plug-in seja instalado no servidor que impeça relatórios de bate-papo - os clientes de baunilha ainda enviarão mensagens assinadas, exibirá mensagens não assinadas como \"Não é seguro\" e não mostrar a eles se \"Só mostre chat seguro\" Está Ativado Nas OpÇões de bate-papo. ", -"Gui.nochatreports.status_insecure": "Este servidor exige que todas as mensagens de bate-papo sejam assinadas e você concordou em prosseguir com esse acordo. Tudo o que você envia no bate-papo é potencialmente incriminador evidência que pode ser usada contra você no relatório. Você pode removerEste servidor de §Whitelisted Servers§r na configuração do mod para ser avisado novamente.", - "gui.nochatreports.status_realms": "Este é um servidor realms.Não apenas não há como evitar relatórios de bate-papo aqui, mas a Mojang também emprega monitoramento automatizado de bate-papo para identificar potencial \"danos online\" e escalá-los para revisão humana, seja proprietário do reino, gosta ou não.Sua única esperança é a criptografia de bate-papo.", + "gui.nochatreports.safety_status.secure": "Este servidor não possui relatórios de bate-papo instalados ou impede que suas mensagens sejam relatáveis de outra maneira conhecida.Você pode conversar com segurança.", + "gui.nochatreports.safety_status.unintrusive": "Este servidor permite enviar mensagens não assinadas que não podem ser relatadas ao Mojang.A menos que algum tipo de plug-in seja instalado no servidor que impeça relatórios de bate-papo - os clientes de baunilha ainda enviarão mensagens assinadas, exibirá mensagens não assinadas como \"Não é seguro\" e não mostrar a eles se \"Só mostre chat seguro\" Está Ativado Nas OpÇões de bate-papo. ", + "gui.nochatreports.safety_status.insecure": "Este servidor exige que todas as mensagens de bate-papo sejam assinadas e você concordou em prosseguir com esse acordo. Tudo o que você envia no bate-papo é potencialmente incriminador evidência que pode ser usada contra você no relatório. Você pode removerEste servidor de §Whitelisted Servers§r na configuração do mod para ser avisado novamente.", + "gui.nochatreports.safety_status.realms": "Este é um servidor realms.Não apenas não há como evitar relatórios de bate-papo aqui, mas a Mojang também emprega monitoramento automatizado de bate-papo para identificar potencial \"danos online\" e escalá-los para revisão humana, seja proprietário do reino, gosta ou não.Sua única esperança é a criptografia de bate-papo.", "gui.nochatreports.status_insecure_whitelist_all_servers": "Este servidor exige que todas as mensagens de bate-papo sejam assinadas e você desativou o aviso de tela cheia para ele.Tudo o que você envia no bate-papo é uma evidência potencialmente incriminadora que pode ser usada contra você no relatório.Você pode desativar §oWhitelist todos os servidores§r na configuração do mod para ser avisado novamente.", - "gui.nochatreports.status_unknown": "Nenhum relatório de bate-papo foi alterado no meio da sessão.O status de segurança do servidor só pode ser avaliado no login.Por favor, lembre-se do servidor para avaliar seu status de segurança.", - "gui.nochatreports.status_undefined": "Nenhum relatório de bate-papo não pôde avaliar a segurança deste servidor.Isso nunca deve acontecer, denuncie-o como um bug para o desenvolvedor do mod.", + "gui.nochatreports.safety_status.unknown": "Nenhum relatório de bate-papo foi alterado no meio da sessão.O status de segurança do servidor só pode ser avaliado no login.Por favor, lembre-se do servidor para avaliar seu status de segurança.", + "gui.nochatreports.safety_status.undefined": "Nenhum relatório de bate-papo não pôde avaliar a segurança deste servidor.Isso nunca deve acontecer, denuncie-o como um bug para o desenvolvedor do mod.", "gui.nochatreports.unsafe_server.header": "Cuidado: servidor inseguro", "gui.nochatreports.unsafe_server.contents": "Este servidor exige que todas as mensagens de bate-papo sejam assinadas, o que significa que elas podem ser relatadas ao Mojang, o que pode resultar em uma proibição de todos os servidores multiplayer.Isso provavelmente significa que o proprietário do servidor manteve \"enforce-secure-profile\" ativado no server.properties, que é o padrão desde 1.19.1.Você pode optar por jogar de qualquer maneira, mas nenhum relatório de bate-papo não será capaz de protegê -lo.", "gui.nochatreports.unsafe_server.check": "Não mostre novamente para este servidor", diff --git a/src/main/resources/assets/nochatreports/lang/ro_ro.json b/src/main/resources/assets/nochatreports/lang/ro_ro.json index a009063..c903535 100644 --- a/src/main/resources/assets/nochatreports/lang/ro_ro.json +++ b/src/main/resources/assets/nochatreports/lang/ro_ro.json @@ -1,11 +1,11 @@ { - "gui.nochatreport.secureChat": "Această opțiune nu poate funcționa cu No Chat Reports, deoarece nu există semnături de verificat.", - "gui.nochatreport.noReporting": "Rapoartele de chat sunt dezactivate pe acest server, folosind No Chat Reports.", + "gui.nochatreports.secure_chat": "Această opțiune nu poate funcționa cu No Chat Reports, deoarece nu există semnături de verificat.", + "gui.nochatreports.no_reporting": "Rapoartele de chat sunt dezactivate pe acest server, folosind No Chat Reports.", "disconnect.nochatreports.client": "Acest server nu are No Chat Reports, iar tu îl ai configurat să fie necesar pe server.", - "gui.nochatreports.status_secure": "Acest server are No Chat Reports instalat sau previne mesajele tuturor de la a fi raportate în alt mod. Nimeni nu va vedea o bară roșie, simbol (!) sau să poată ascunde mesajele cu „Only Show Secure Chat”. Poți să trimiți mesaje în siguranță.", - "gui.nochatreports.status_unintrusive": "Acest server îți permite să trimiți mesaje nesemnate, care nu pot fi raportate la Micro$oft. Cu toate acestea, pentru clienți vanilla mesajele vor avea o bară roșie în stânga, un simbol (!) în dreapta și orcine activează „Only Show Secure Chat” nu-ți va vedea mesajele deloc.", - "gui.nochatreports.status_insecure": "Acest server cere ca toate mesajele să fie semnate, și ai fost de acord cu asta. Orice trimiți poate fi folosit împotriva ta. Poți să ștergi acest server din NoChatReports.json în folderul tău de config pentru a fi atenționat iar.", - "gui.nochatreports.status_undefined": "No Chat Reports nu a putut evalua siguranța acestui server. Aceasta nu ar trebui să se întâmple niciodată, te rog trimite-l ca un bug la dezvoltatorul modului..", + "gui.nochatreports.safety_status.secure": "Acest server are No Chat Reports instalat sau previne mesajele tuturor de la a fi raportate în alt mod. Nimeni nu va vedea o bară roșie, simbol (!) sau să poată ascunde mesajele cu „Only Show Secure Chat”. Poți să trimiți mesaje în siguranță.", + "gui.nochatreports.OLD_status_unintrusive": "Acest server îți permite să trimiți mesaje nesemnate, care nu pot fi raportate la Micro$oft. Cu toate acestea, pentru clienți vanilla mesajele vor avea o bară roșie în stânga, un simbol (!) în dreapta și orcine activează „Only Show Secure Chat” nu-ți va vedea mesajele deloc.", + "gui.nochatreports.OLD_status_insecure": "Acest server cere ca toate mesajele să fie semnate, și ai fost de acord cu asta. Orice trimiți poate fi folosit împotriva ta. Poți să ștergi acest server din NoChatReports.json în folderul tău de config pentru a fi atenționat iar.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports nu a putut evalua siguranța acestui server. Aceasta nu ar trebui să se întâmple niciodată, te rog trimite-l ca un bug la dezvoltatorul modului..", "gui.nochatreports.unsafe_server.header": "Atenție: server nesigur", "gui.nochatreports.unsafe_server.contents": "Acest server cere ca toate mesajele să fie semnate, ceea ce înseamnă că pot fi raportate la Micro$oft. Aceasta probabil înseamnă că proprietarul serverului a lăsat „enforce-secure-profile” activat pe server.properties, care este implicit din 1.19.1. Poți alege să joci, dar No Chat Reports nu va putea să te protejeze.", "gui.nochatreports.unsafe_server.check": "Nu afișa din nou pentru acest server", diff --git a/src/main/resources/assets/nochatreports/lang/ru_ru.json b/src/main/resources/assets/nochatreports/lang/ru_ru.json index a643ba2..6baf196 100644 --- a/src/main/resources/assets/nochatreports/lang/ru_ru.json +++ b/src/main/resources/assets/nochatreports/lang/ru_ru.json @@ -1,14 +1,14 @@ { "modmenu.summaryTranslation.nochatreports": "Чат, (по возможности) свободный от жалоб.", "modmenu.descriptionTranslation.nochatreports": "Удаляет криптографические подписи у сообщений игроков, из-за чего их отслеживание и сопоставление с вашим аккаунтом Mojang/Microsoft становится невозможным, ровно как и использование функции жалобы.", - "gui.nochatreport.secureChat": "Этот параметр не работает с No Chat Reports ввиду отсутствия криптографических подписей.", - "gui.nochatreport.noReporting": "No Chat Reports защищает этот сервер от отправки жалоб.", + "gui.nochatreports.secure_chat": "Этот параметр не работает с No Chat Reports ввиду отсутствия криптографических подписей.", + "gui.nochatreports.no_reporting": "No Chat Reports защищает этот сервер от отправки жалоб.", "disconnect.nochatreports.client": "Ваши текущие настройки требуют наличия No Chat Reports на сервере, однако здесь этот мод отсутствует.", - "gui.nochatreports.status_secure": "Сервер либо содержит No Chat Reports, либо предотвращает возможность отправки жалоб иным известным способом. Вы можете общаться безопасно.", - "gui.nochatreports.status_unintrusive": "Сервер не отключает жалобы, но позволяет вам отправлять неподписанные сообщения, которые не могут быть получены Mojang. Другие игроки без No Chat Reports всё ещё будут отправлять сообщения с подписями, помечать неподписанные как \"Небезопасные\" и блокировать их, если \"Защищённый чат\" включён.", - "gui.nochatreports.status_insecure": "Сервер требует, чтобы все сообщения игроков были подписаны, и вы согласились с этим условием. Всё, что вы скажете, может быть использовано против вас. Этот сервер можно удалить из §oбелого списка§r в настройках No Chat Reports, чтобы снова просмотреть предупреждение.", - "gui.nochatreports.status_insecure_whitelist_all_servers": "Сервер требует, чтобы все сообщения игроков были подписаны, но вы проигнорировали предупреждение об этом. Всё, что вы скажете, может быть использовано против вас. Вернуть предупреждение можно путём отключения §oWhitelist all servers§r в настройках No Chat Reports.", - "gui.nochatreports.status_undefined": "No Chat Reports не смог оценить безопасность этого сервера. Такого быть не должно. Пожалуйста, сообщите разработчику мода об этой ошибке.", + "gui.nochatreports.safety_status.secure": "Сервер либо содержит No Chat Reports, либо предотвращает возможность отправки жалоб иным известным способом. Вы можете общаться безопасно.", + "gui.nochatreports.OLD_status_unintrusive": "Сервер не отключает жалобы, но позволяет вам отправлять неподписанные сообщения, которые не могут быть получены Mojang. Другие игроки без No Chat Reports всё ещё будут отправлять сообщения с подписями, помечать неподписанные как \"Небезопасные\" и блокировать их, если \"Защищённый чат\" включён.", + "gui.nochatreports.OLD_status_insecure": "Сервер требует, чтобы все сообщения игроков были подписаны, и вы согласились с этим условием. Всё, что вы скажете, может быть использовано против вас. Этот сервер можно удалить из §oбелого списка§r в настройках No Chat Reports, чтобы снова просмотреть предупреждение.", + "gui.nochatreports.OLD_status_insecure_whitelist_all_servers": "Сервер требует, чтобы все сообщения игроков были подписаны, но вы проигнорировали предупреждение об этом. Всё, что вы скажете, может быть использовано против вас. Вернуть предупреждение можно путём отключения §oWhitelist all servers§r в настройках No Chat Reports.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports не смог оценить безопасность этого сервера. Такого быть не должно. Пожалуйста, сообщите разработчику мода об этой ошибке.", "gui.nochatreports.unsafe_server.header": "Внимание: Небезопасный сервер", "gui.nochatreports.unsafe_server.contents": "Сервер требует, чтобы все сообщения игроков были подписаны, поэтому они могут быть отправлены в Mojang, что может для вас обернуться §lглобальным баном§r. Скорее всего, владелец сервера не отключил \"enforce-secure-profile\" в \"server.properties\" (включено по умолчанию с 1.19.1). Это предупреждение можно проигнорировать, но тогда No Chat Reports не сможет защитить вас.", "gui.nochatreports.unsafe_server.check": "Больше не предупреждать об этом сервере", diff --git a/src/main/resources/assets/nochatreports/lang/sk_sk.json b/src/main/resources/assets/nochatreports/lang/sk_sk.json index 00a2941..1601327 100644 --- a/src/main/resources/assets/nochatreports/lang/sk_sk.json +++ b/src/main/resources/assets/nochatreports/lang/sk_sk.json @@ -1,12 +1,12 @@ { - "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.", + "gui.nochatreports.secure_chat": "Táto možnosť nemôže fungovať s No Chat Reports keďže nie sú podpisy na overenie.", + "gui.nochatreports.no_reporting": "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_undefined": "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.safety_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.OLD_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.OLD_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.OLD_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.safety_status.undefined": "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", diff --git a/src/main/resources/assets/nochatreports/lang/th_th.json b/src/main/resources/assets/nochatreports/lang/th_th.json index 9650526..46bc901 100644 --- a/src/main/resources/assets/nochatreports/lang/th_th.json +++ b/src/main/resources/assets/nochatreports/lang/th_th.json @@ -1,14 +1,14 @@ { "modmenu.descriptionTranslation.nochatreports": "ยับยั้งลายนามทางวิทยาการเข้ารหัสลับให้ไม่สามารถติดตามบัญชี Mojang หรือ Microsoft รวมถึงป้องกันการใช้ฟีเจอร์การรายงานผู้เล่นได้", - "gui.nochatreport.secureChat": "ตัวเลือกนี้ไม่สามารถใช้ร่วมกับ No Chat Reports ได้ เนื่องจากไม่มีลายนามให้ยืนยันตัวตนได้", - "gui.nochatreport.noReporting": "การรายงานแช็ตถูกปิดบนเซิร์ฟเวอร์นี้ จากการป้องกันของ No Chat Reports", + "gui.nochatreports.secure_chat": "ตัวเลือกนี้ไม่สามารถใช้ร่วมกับ No Chat Reports ได้ เนื่องจากไม่มีลายนามให้ยืนยันตัวตนได้", + "gui.nochatreports.no_reporting": "การรายงานแช็ตถูกปิดบนเซิร์ฟเวอร์นี้ จากการป้องกันของ No Chat Reports", "disconnect.nochatreports.client": "เซิร์ฟเวอร์นี่้ไม่มีม็อด No Chat Reports โดยเมื่อก่อนหน้านี้ คุณได้ตั้งค่าให้ตัวม็อดเองต้องมีการใช้ม็อดดังกล่าวในเซิร์ฟเวอร์", - "gui.nochatreports.status_secure": "เซิร์ฟเวอร์นี้ไม่มีม็อด No Chat Reports ติดตั้งไว้ และป้องกันไม่ให้ข้อความของคุณถูกรายงานได้ทางใดทางหนึ่ง ดังนั้นคุณสามารถพูดคุยผ่านแช็ตได้อย่างปลอดภัย", - "gui.nochatreports.status_unintrusive": "เซิร์ฟเวอร์นี้อนุญาตให้คุณส่งข้อความที่ไม่ได้รับการลงนามซึ่งไม่สามารถรายงานข้อความดังกล่าวไปยัง Mojang ได้ ยกเว้นหากเซิร์ฟเวอร์มีปลั๊กอินติดตั้งไว้เพื่อป้องกันไม่ให้รายงานข้อความ หากเป็นเช่นนั้น ระบบไคลเอนต์ของวานิลลาจะยังส่งข้อความที่มีการลงนามแล้วอยู่ และแสดงข้อความที่ไม่ได้ลงนามไว้ว่า \"ไม่ปลอดภัย\" และจะไม่แสดงข้อความเหล่านั้นเมื่อตัวเลือก \"เปิดเฉพาะแช็ตที่ปลอดภัย\" ถูกเปิดไว้ในการตั้งค่าแช็ต", - "gui.nochatreports.status_insecure": "เซิร์ฟเวอร์นี้ต้องการให้ข้อความแช็ตได้รับการลงนามอย่างถูกต้องและคุณก็ได้ตกลงที่จะให้มีการกำหนดตามนี้ ทุกข้อความที่คุณส่งเข้าไปในแช็ตจะเป็นหลักฐานให้ใช้ในการรายงานคุณอย่างชัดเจน คุณสามารถลบเซิร์ฟเวอร์นี้ออกจากตัวเลือก §oเซิรฟ์เวอร์ที่ได้รับอนุญาต§r ในการตั้งค่าม็อดเพื่อให้ได้รับคำเตือนอีกครั้ง", - "gui.nochatreports.status_realms": "เซิร์ฟเวอร์นี้เป็นเซิร์ฟเวอร์ Realms นอกจากไม่มีวิธีที่จะป้องกันการรายงานแช็ตในเซิร์ฟเวอร์นี้แล้ว ทาง Mojang ยังสามารถใช้การตรวจจับแช็ตอัตโนมัติเพื่อค้นหา \"การคุกคามทางออนไลน์\" และส่งไปให้ผู้คนตรวจสอบและพิจารณาได้ แล้วแต่ว่าเจ้าของ ๆ Realm ต้องการที่จะให้เป็นแบบนั้นหรือไม่ หนทางเดียวที่คุณจะเลี่ยงได้ก็คือการเข้ารหัสแช็ตของคุณเท่านั้น", - "gui.nochatreports.status_insecure_whitelist_all_servers": "เซิร์ฟเวอร์นี้ต้องการให้ข้อความแช็ตทุกข้อความมีการลงนาม และคุณได้ปิดการแสดงแบบเต็มหน้าจอให้กับมัน ทุกสิ่งที่คุณได้พิมพ์ลงไปในแช็ตจะเป็นหลักฐานประณามอย่างชัดแจ้งที่จะสามารถใช้ในการรายงานคุณได้ คุณสามารถปิดตัวเลือก §oเซิร์ฟเวอร์ที่ได้รับอนุญาต§r ในการตั้งค่าม็อดเพื่อให้ได้รับคำเตือนอีกครั้ง", - "gui.nochatreports.status_undefined": "ม็อด No Chat Reports ไม่สามารถประเมินความปลอดภัยของเซิร์ฟเวอร์นี้ได้ ซึ่งสิ่งนี้ไม่ควรที่จะเกิดขึ้นเป็นอย่างยิ่ง เมื่อพบ โปรดรายงานปัญหานี้ในรูปแบบของบักให้กับผู้พัฒนาม็อดเพื่อทำการแก้ไขต่อไป", + "gui.nochatreports.safety_status.secure": "เซิร์ฟเวอร์นี้ไม่มีม็อด No Chat Reports ติดตั้งไว้ และป้องกันไม่ให้ข้อความของคุณถูกรายงานได้ทางใดทางหนึ่ง ดังนั้นคุณสามารถพูดคุยผ่านแช็ตได้อย่างปลอดภัย", + "gui.nochatreports.OLD_status_unintrusive": "เซิร์ฟเวอร์นี้อนุญาตให้คุณส่งข้อความที่ไม่ได้รับการลงนามซึ่งไม่สามารถรายงานข้อความดังกล่าวไปยัง Mojang ได้ ยกเว้นหากเซิร์ฟเวอร์มีปลั๊กอินติดตั้งไว้เพื่อป้องกันไม่ให้รายงานข้อความ หากเป็นเช่นนั้น ระบบไคลเอนต์ของวานิลลาจะยังส่งข้อความที่มีการลงนามแล้วอยู่ และแสดงข้อความที่ไม่ได้ลงนามไว้ว่า \"ไม่ปลอดภัย\" และจะไม่แสดงข้อความเหล่านั้นเมื่อตัวเลือก \"เปิดเฉพาะแช็ตที่ปลอดภัย\" ถูกเปิดไว้ในการตั้งค่าแช็ต", + "gui.nochatreports.OLD_status_insecure": "เซิร์ฟเวอร์นี้ต้องการให้ข้อความแช็ตได้รับการลงนามอย่างถูกต้องและคุณก็ได้ตกลงที่จะให้มีการกำหนดตามนี้ ทุกข้อความที่คุณส่งเข้าไปในแช็ตจะเป็นหลักฐานให้ใช้ในการรายงานคุณอย่างชัดเจน คุณสามารถลบเซิร์ฟเวอร์นี้ออกจากตัวเลือก §oเซิรฟ์เวอร์ที่ได้รับอนุญาต§r ในการตั้งค่าม็อดเพื่อให้ได้รับคำเตือนอีกครั้ง", + "gui.nochatreports.OLD_status_realms": "เซิร์ฟเวอร์นี้เป็นเซิร์ฟเวอร์ Realms นอกจากไม่มีวิธีที่จะป้องกันการรายงานแช็ตในเซิร์ฟเวอร์นี้แล้ว ทาง Mojang ยังสามารถใช้การตรวจจับแช็ตอัตโนมัติเพื่อค้นหา \"การคุกคามทางออนไลน์\" และส่งไปให้ผู้คนตรวจสอบและพิจารณาได้ แล้วแต่ว่าเจ้าของ ๆ Realm ต้องการที่จะให้เป็นแบบนั้นหรือไม่ หนทางเดียวที่คุณจะเลี่ยงได้ก็คือการเข้ารหัสแช็ตของคุณเท่านั้น", + "gui.nochatreports.OLD_status_insecure_whitelist_all_servers": "เซิร์ฟเวอร์นี้ต้องการให้ข้อความแช็ตทุกข้อความมีการลงนาม และคุณได้ปิดการแสดงแบบเต็มหน้าจอให้กับมัน ทุกสิ่งที่คุณได้พิมพ์ลงไปในแช็ตจะเป็นหลักฐานประณามอย่างชัดแจ้งที่จะสามารถใช้ในการรายงานคุณได้ คุณสามารถปิดตัวเลือก §oเซิร์ฟเวอร์ที่ได้รับอนุญาต§r ในการตั้งค่าม็อดเพื่อให้ได้รับคำเตือนอีกครั้ง", + "gui.nochatreports.safety_status.undefined": "ม็อด No Chat Reports ไม่สามารถประเมินความปลอดภัยของเซิร์ฟเวอร์นี้ได้ ซึ่งสิ่งนี้ไม่ควรที่จะเกิดขึ้นเป็นอย่างยิ่ง เมื่อพบ โปรดรายงานปัญหานี้ในรูปแบบของบักให้กับผู้พัฒนาม็อดเพื่อทำการแก้ไขต่อไป", "gui.nochatreports.unsafe_server.header": "คำเตือน: เซิร์ฟเวอร์ดังกล่าวไม่ปลอดภัย", "gui.nochatreports.unsafe_server.contents": "เซิร์ฟเวอร์นี้ต้องการการลงนามข้อความแช็ตทุกข้อความ หมายความว่าข้อความเหล่านั้นมีสิทธิ์ที่จะถูกรายงานไปยัง Mojang ได้ ซึ่งอาจส่งผลให้ถูกแบนจากเซิร์ฟเวอร์ผู้เล่นหลายคนทุกเซิร์ฟเวอร์ สิ่งนี้มีความเป็นไปได้ว่าเจ้าของเซิร์ฟเวอร์ได้เปิดคุณสมบัติ \"enforce-secure-profile\" ไว้ในไฟล์ที่ชื่อว่า server.properties ซึ่งเป็นค่าเริ่มต้นตั้งแต่เวอร์ชั่น 1.19.1 ของเกม คุณสามารถเลือกที่จะเล่นต่อไปได้ แต่ม็อด No Chat Reports จะไม่สามารถปกป้องคุณได้ทุกกรณี", "gui.nochatreports.unsafe_server.check": "ไม่ต้องแสดงอีกสำหรับเซิร์ฟเวอร์นี้", diff --git a/src/main/resources/assets/nochatreports/lang/tr_tr.json b/src/main/resources/assets/nochatreports/lang/tr_tr.json index f11111e..fb06244 100644 --- a/src/main/resources/assets/nochatreports/lang/tr_tr.json +++ b/src/main/resources/assets/nochatreports/lang/tr_tr.json @@ -1,12 +1,12 @@ { - "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ı.", + "gui.nochatreports.secure_chat": "Bu seçenek doğrulanacak imza olmadığından No Chat Reports ile çalışamaz.", + "gui.nochatreports.no_reporting": "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 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_undefined": "No Chat Reports bu sunucunun güvenliğini değerlendiremedi. Bu asla olmamalıydı, lütfen mod geliştiricisine bu hatayı bildirin.", + "gui.nochatreports.safety_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.OLD_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.OLD_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.OLD_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.safety_status.undefined": "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 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", diff --git a/src/main/resources/assets/nochatreports/lang/uk_ua.json b/src/main/resources/assets/nochatreports/lang/uk_ua.json index 1710c2a..ef168c4 100644 --- a/src/main/resources/assets/nochatreports/lang/uk_ua.json +++ b/src/main/resources/assets/nochatreports/lang/uk_ua.json @@ -1,11 +1,11 @@ { - "gui.nochatreport.secureChat": "Ця опція не сумісна із модом No Chat Reports, бо підписів для перевірки не буде.", - "gui.nochatreport.noReporting": "Завдяки No Chat Reports, на цьому сервері неможливо скаржитися на повідомлення в чаті.", + "gui.nochatreports.secure_chat": "Ця опція не сумісна із модом No Chat Reports, бо підписів для перевірки не буде.", + "gui.nochatreports.no_reporting": "Завдяки No Chat Reports, на цьому сервері неможливо скаржитися на повідомлення в чаті.", "disconnect.nochatreports.client": "Цей сервер не може забезпечети можливість вільної комунікації у чаті. Ваші налаштування не дозволяють приєднуватися до таких серверів, запропонуйте адміністратору встановити No Chat Reports.", - "gui.nochatreports.status_secure": "Цей сервер є безпечним: на ньому встановлено мод No Chat Reports або використувуються відомі методи для унеможливлювання скарг на повідомлення. Спілкуйтесь на здоров'я!", - "gui.nochatreports.status_unintrusive": "Цей сервер не забороняє гравцям скаржитися на повідомлення в чаті, але одночасно відмова від підпису повідомлень дозволена. Теоретично на вас ще можуть поскаржитися до Mojang, але довести вашу провину буде надто складно, що робить вірогідність блокування або інших санкцій дуже, дуже малою.", - "gui.nochatreports.status_insecure": "Цей сервер вимогає від усіх гравців підписувати повідомлення у чаті. Ваші налаштування не забороняють приєднуватись до цього серверу, але на кожне з ваших повідомлень зможуть поскаржитись. Будь-що сказане вами може бути використано як беззаперечні докази порушення правил Mojang. Ви можете видалити цей сервер із файлу NoChatReports.json, щоб повернути попередження.", - "gui.nochatreports.status_undefined": "No Chat Reports не вдалося зробити висновок про безпечність цього серверу. Ця поведінка не нормальна та є ознакою помилки, будь ласка, повідомте автора модифікації про це.", + "gui.nochatreports.safety_status.secure": "Цей сервер є безпечним: на ньому встановлено мод No Chat Reports або використувуються відомі методи для унеможливлювання скарг на повідомлення. Спілкуйтесь на здоров'я!", + "gui.nochatreports.OLD_status_unintrusive": "Цей сервер не забороняє гравцям скаржитися на повідомлення в чаті, але одночасно відмова від підпису повідомлень дозволена. Теоретично на вас ще можуть поскаржитися до Mojang, але довести вашу провину буде надто складно, що робить вірогідність блокування або інших санкцій дуже, дуже малою.", + "gui.nochatreports.OLD_status_insecure": "Цей сервер вимогає від усіх гравців підписувати повідомлення у чаті. Ваші налаштування не забороняють приєднуватись до цього серверу, але на кожне з ваших повідомлень зможуть поскаржитись. Будь-що сказане вами може бути використано як беззаперечні докази порушення правил Mojang. Ви можете видалити цей сервер із файлу NoChatReports.json, щоб повернути попередження.", + "gui.nochatreports.safety_status.undefined": "No Chat Reports не вдалося зробити висновок про безпечність цього серверу. Ця поведінка не нормальна та є ознакою помилки, будь ласка, повідомте автора модифікації про це.", "gui.nochatreports.unsafe_server.header": "Увага: небезпечний сервер", "gui.nochatreports.unsafe_server.contents": "Цей сервер вимогає від вас підписувати усі повідомлення, які ви надсилаєте у чат. Це значить, що на них можна буде поскаржитись у Mojang. Скоріш за все, адміністратор серверу не вимкнув опцію 'enforce-secure-profile' у своєму server.properties (ця опція є увімкненою за умовчанням у версіях 1.19.1+). Ви можете під'єднатись все одно, але No Chat Reports не буде працювати тут. Вас попередили.", "gui.nochatreports.unsafe_server.check": "Не показувати знов (тільки для цього серверу)", diff --git a/src/main/resources/assets/nochatreports/lang/zh_cn.json b/src/main/resources/assets/nochatreports/lang/zh_cn.json index 5551df3..a5e113d 100644 --- a/src/main/resources/assets/nochatreports/lang/zh_cn.json +++ b/src/main/resources/assets/nochatreports/lang/zh_cn.json @@ -1,50 +1,131 @@ { - "modmenu.descriptionTranslation.nochatreports": "从玩家的消息中删除加密签名,使其无法追踪并且无法与您的 Mojang 或 Microsoft 帐户关联,以及无法使用聊天举报功能。", - "gui.nochatreport.secureChat": "此选项不适用于 No Chat Reports,因为没有签名可以验证。", - "gui.nochatreport.noReporting": "聊天举报在此服务器上已被 No Chat Reports 禁用。", - "disconnect.nochatreports.client": "此服务器未安装 No Chat Reports,但您已配置要求在服务器上安装。", - "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_undefined": "No Chat Reports 无法检测此服务器的安全性。这不应该发生,请将此错误反馈给此模组作者。", - "gui.nochatreports.unsafe_server.header": "警告:不安全的服务器", - "gui.nochatreports.unsafe_server.contents": "此服务器要求对所有消息进行签名,这意味着可以向 Mojang 举报他们,这可能导致您的账号的多人游戏功能被封禁。这可能意味着此服务器的所有者在 server.properties 中启用了“enforce-secure-profile”,这是自 1.19.1 以来的默认设置。无论如何,您都可以选择继续游戏,但 No Chat Reports 将无法保护您。", - "gui.nochatreports.unsafe_server.check": "不再为此服务器显示", - "gui.nochatreports.reload_config_tooltip": "重新加载 No Chat Reports 的配置,请小心使用。", + "modmenu.descriptionTranslation.nochatreports": "从玩家消息中剥离加密签名,使其无法跟踪并与您的 Microsoft 帐户关联,以及使用聊天举报功能。", + "gui.nochatreports.secure_chat": "此选项被 No Chat Reports 禁用。", + "gui.nochatreports.no_reporting": "聊天举报在此服务器上被 No Chat Reports 禁用。", + "disconnect.nochatreports.client": "此服务器没有安装 No Chat Reports,但您已将其配置为要求服务器上安装。", + "gui.nochatreports.safety_status.secure": "此服务器安装了 No Chat Reports 或采取了其他已知的措施防止聊天举报。您可以安全地聊天。", + "gui.nochatreports.safety_status.unintrusive": "此服务器没有安装 No Chat Reports,但允许发送不能被举报给 Mojang 的未签名消息。这意味着你的消息不能被举报,但其他人可以通过打开“仅显示安全的聊天”屏蔽你的消息。", + "gui.nochatreports.safety_status.insecure": "此服务器要求对所有聊天消息进行签名。所有签名的消息都是潜在的罪证,可能在举报中对你不利。使用聊天加密是一种防止被举报的有效方法。", + "gui.nochatreports.status_insecure_whitelisted": "此服务器不要求聊天签名,但您还是通过白名单启用了它。所有签名的消息都是潜在的罪证,可能在举报中对你不利。使用聊天加密是一种防止被举报的有效方法。", + "gui.nochatreports.safety_status.realms": "这是 Realms 服务器。这里不仅无法阻止聊天举报,Mojang 还使用自动聊天监控来识别潜在的“在线危害”,并将其升级以供人类审查,无论该 Realm 的所有者是否愿意。使用聊天加密是一种有效方法。", + "gui.nochatreports.safety_status.unknown": "No Chat Reports 尚不确定此服务器的安全性。尝试在聊天中发送消息以进行测试。", + "gui.nochatreports.safety_status.undefined": "No Chat Reports 无法检测此服务器的安全性。这不该发生,请将其作为 Bug 反馈给模组开发人员。", + "gui.nochatreports.signing_status.allowed_realms": "聊天签名始终在 Realms 上启用,因为它始终是必需的,禁用它不会带来任何好处。", + "gui.nochatreports.status_signing_allowed_whitelisted": "已为此会话启用消息签名。您可以尝试通过从白名单中删除服务器、重新加入并发送聊天消息来禁用它。之后,无聊天报告将能够确定是否需要签名。", + "gui.nochatreports.status_signing_allowed": "已为此会话启用消息签名。重新加入服务器以禁用它。", + "gui.nochatreports.status_signing_denied_secure": "消息签名已禁用,因为此服务器是安全的。", + "gui.nochatreports.status_signing_denied": "此会话已禁用消息签名。您可以将此服务器列入白名单,以便始终在其上启用聊天签名。", + "gui.nochatreports.status_whitelist_mode": "§l已加入白名单的服务器:%1$s", + "gui.nochatreports.status_whitelist_all": "§a§l是(所有服务器)", + "gui.nochatreports.status_whitelist_yes": "§a§l是", + "gui.nochatreports.status_whitelist_no": "§c§l否", + "gui.nochatreports.reload_config_tooltip": "重新加载 No Chat Reports 配置。请小心使用。", + "gui.nochatreports.verified_server": "§a§l安全的服务器§\r\n我们可以确定此服务器安装了 No Chat Reports,或者以其他已知方式阻止聊天举报。你可以安全地聊天。", + "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r%1$s \n禁用或启用模组的大部分客户端功能。您可能必须这样做才能加入一些 Paper/Velocity 服务器,因为它们会导致 NCR 问题。\某些与网络无关的事情,如加密、聊天信任状态调整和删除原版的“聊天消息无法验证”警告弹窗仍然有效;它们可以在配置中单独禁用。", + "gui.nochatreports.ncr_state_on": "§a§l启用§r", + "gui.nochatreports.ncr_state_off": "§c§l禁用§r", + "tag.nochatreports.encrypted": "Encrypted using: %1$s", + "tag.nochatreports.encrypted_original": "无法解密消息的人看起来就像这样: %1$s", + "gui.nochatreports.encryption_tooltip": "§lEncryption:§r %1$s\n右击以配置。\n\n当启用加密时,您可以通过在发送消息时按住 Ctrl 来暂时关闭。", + "gui.nochatreports.encryption_tooltip_invalid": "§lEncryption:§r %1$s\n§c无效配置。单击以配置。", + "gui.nochatreports.encryption_state_on": "§a§l启用§r", + "gui.nochatreports.encryption_state_off": "§c§l禁用§r", + "gui.nochatreports.encryption_warning.header": "关于加密", + "gui.nochatreports.encryption_warning.contents": "您可以使用密钥加密消息,只有知道此密钥的人才能解密它们。当提供合适的密钥并启用该功能时,No Chat Reports 将自动解密所有加密消息。\n然而,请注意,加密不是一种万能的解决方案。第三方服务器的所有者可以禁止你发送聊天中看起来乱糟糟的内容。此外,建议您生成自定义加密密钥,并仅通过安全通道将其传递给其他人。单击“了解更多信息”以了解有关如何以及何时使用加密的更多信息。", + "gui.nochatreports.encryption_warning.check": "不再提示", + "gui.nochatreports.encryption_warning.learn_more": "了解更多", + "gui.nochatreports.encryption_config.header": "加密设置", + "gui.nochatreports.encryption_config.key_desc": "§l加密密钥§\r\n用于加密和解密消息的密钥。它的格式取决于算法;对于 AES,它将是 128 位的 Base64 编码二进制数据。", + "gui.nochatreports.encryption_config.passphrase_desc": "§l加密密码短语§\r\n您可以从自己选择的密码中导出一个密钥,而不是生成随机密钥。如果你使用这个-选择一个强大的。并非所有算法都支持密码短语。", + "gui.nochatreports.encryption_config.validation_ok": "密钥检测:§a§l正常", + "gui.nochatreports.encryption_config.validation_failed": "密钥检测:§c§l失败", + "gui.nochatreports.encryption_config.dice_tooltip": "针对所选加密算法生成新的随机密钥。", + "gui.nochatreports.encryption_config.pass_not_allowed": "<不支持>", + "gui.nochatreports.encryption_config.algorithm": "算法:%1$s", + "gui.nochatreports.encryption_config.default_key": "<默认:%1$s>", + "gui.nochatreports.encryption_config.encrypt_public": "加密公共消息", + "algorithm.nochatreports.aes_cfb8_base64.name": "AES/CFB8+Base64R", + "algorithm.nochatreports.aes_cfb8_base64": "§lAES/CFB8+Base64R§r\n标准对称加密算法。使用 128 位密钥,输出以 Base64 的特殊版本编码,以允许通过 Minecraft 的聊天进行传输。有一个缺点是,消息长度将增加大约 30%,如果超过长度限制,服务器可能会截断它们。", + "algorithm.nochatreports.aes_gcm_base64.name": "AES/GCM+Base64R", + "algorithm.nochatreports.aes_gcm_base64": "§lAES/GCM+Base64R§r\n更高的安全性,但是消息大小严重增加(12 字节用于初始化向量,12 字节用于身份验证标签,顶部为 Base64 编码)。是否选择取决于您是否重视安全而不是其他。", + "algorithm.nochatreports.aes_ecb_base64.name": "AES/ECB+Base64R", + "algorithm.nochatreports.aes_ecb_base64": "§lAES/ECB+Base64R§r\n与 CFB 模式相比,安全性大大降低,但不需要初始化向量,从而节省了一些字节。仍然比 Caesar 安全。", + "algorithm.nochatreports.caesar.name": "Caesar", + "algorithm.nochatreports.caesar": "§lCaesar§r\n数字密码。有了这个,你基本上是希望人们会放弃,甚至不尝试解密你的消息。这在很多情况下可能是正确的,所以使用它的可行性取决于您的威胁模型。\nKey应该是从1到1024 的整数。移位是按字符代码而不是按字母顺序进行的,以确保与任何语言兼容。", + "nochatreports.connect.nokey_rejected": "服务器拒绝没有聊天签名密钥的连接。", + "nochatreports.connect.await": "等待重连:%1$s 秒...", + "gui.nochatreports.realms_warning.header": "警告:Realms", + "gui.nochatreports.realms_warning.contents": "Realms 服务器不是私有的。Realm 所有者不能禁用聊天举报,Mojang 应用额外的聊天监控来识别潜在的“在线危害”,并将其上报给人类审查。如果你被发现违反了 Minecraft 的社区标准-即使聊天参与者没有受到冒犯-你将被暂时或永久禁止使用所有多人游戏服务。强烈建议使用加密。", + "gui.nochatreports.realms_warning.check": "不再提示", + "gui.nochatreports.realms_warning.learn_more": "了解更多", + "gui.nochatreports.signing_required.header": "警告:聊天签名要求", + "gui.nochatreports.signing_required.contents_OUTDATED": "该服务器要求所有聊天消息都必须签名,这意味着它们可以被举报给 Mojang,这可能会导致被禁止多人游戏。这可能意味着服务器在 server.properties 中启用了“enforce-secure-profile”,这是自 1.19.1 以来的默认设置。单击“允许签名”可启用此会话的消息签名,或单击“白名单服务器”可始终启用此服务器上的签名。", + "gui.nochatreports.signing_required.allow_signing": "允许签名", + "gui.nochatreports.signing_required.whitelist_server": "将服务器加入白名单", + "gui.nochatreports.signing_required.cancel": "取消", + "gui.nochatreports.signing_required.check": "在此会话期间不再显示", + "chat.nochatreports.disabled.signingRequested": "服务器拒绝传递未签名的消息。您可以通过在弹出屏幕中允许一个会话或将服务器列入白名单来启用聊天签名。没有签名,您仍然可以使用大多数命令。", "configuration.NoChatReports.config": "No Chat Reports", - "configuration.NoChatReports.category.visual": "视觉", - "configuration.NoChatReports.category.technical": "技术", - "configuration.NoChatReports.category.whitelistedServers": "whitelistAllServers", + "configuration.NoChatReports.category.visual": "视觉的", "option.NoChatReports.showServerSafety": "显示服务器安全性", - "option.NoChatReports.showServerSafety.tooltip": "允许客户端在聊天屏幕右下角显示服务器安全状态图标。可以将鼠标光标悬浮在图标上以获取更多信息。", - "option.NoChatReports.showServerSafety.moreInfo": "§b点击此处阅读有关服务器安全级别的更多信息", - "option.NoChatReports.hideRedChatIndicators": "隐藏红色聊天指示器", - "option.NoChatReports.hideRedChatIndicators.tooltip": "防止客户端以左侧红条和聊天消息右侧的 §c§l(§r§c!§c§l)§r 图标的形式显示“不安全”指示器。", - "option.NoChatReports.hideYellowChatIndicators": "隐藏黄色聊天指示器", - "option.NoChatReports.hideYellowChatIndicators.tooltip": "防止客户端以左侧黄条和聊天消息右侧的 §e§l(§r§e?§e§l)§r 图标的形式显示“已修改”指示器。", - "option.NoChatReports.hideGrayChatIndicators": "隐藏灰色聊天指示器", - "option.NoChatReports.hideGrayChatIndicators.tooltip": "防止客户端以左侧灰条的形式显示系统消息的特殊指示器。", - "option.NoChatReports.hideWarningToast": "隐藏右上角警告消息框", - "option.NoChatReports.hideWarningToast.tooltip": "移除在加入禁用 §oenforce-secure-profile§r 的服务器时显示警告消息框。", - "option.NoChatReports.alwaysHideReportButton": "始终隐藏举报按钮", - "option.NoChatReports.alwaysHideReportButton.tooltip": "阻止客户端在“社交”界面显示举报按钮。此选项默认禁用,此模组只是使按钮在安装了 No Chat Reports 的服务器上处于不可用状态,并为按钮的提示框添加说明。", - "option.NoChatReports.demandOnServer": "要求在服务器上安装 No Chat Reports", + "option.NoChatReports.showServerSafety.tooltip": "允许客户端在聊天屏幕的右下角显示服务器安全状态。图标可悬停以获取更多信息。", + "option.NoChatReports.showServerSafety.moreInfo": "§b单击此处阅读有关服务器安全级别的更多信息", + "option.NoChatReports.verifiedIconEnabled": "启用验证图标", + "option.NoChatReports.verifiedIconEnabled.tooltip": "允许模组在多人游戏菜单中为安装了 No Chat Reports 或采取了其他一些反聊天举报措施的服务器显示特殊图标。", + "option.NoChatReports.verifiedIconOffsetX": "验证图标X轴偏移", + "option.NoChatReports.verifiedIconOffsetX.tooltip": "定义渲染“安全服务器”图标的X轴偏移。", + "option.NoChatReports.verifiedIconOffsetY": "验证图标Y轴偏移", + "option.NoChatReports.verifiedIconOffsetY.tooltip": "定义渲染“安全服务器”图标的Y轴偏移。", + "option.NoChatReports.hideInsecureMessageIndicators.tooltip": "阻止客户端在聊天消息左侧以红色条的形式显示未验证的消息指示符。", + "option.NoChatReports.hideModifiedMessageIndicators": "隐藏修改的消息指示符", + "option.NoChatReports.hideModifiedMessageIndicators.tooltip": "阻止客户端在聊天消息的左侧以黄色条的形式显示修改后的消息指示符,并在聊天消息右侧悬停时显示。", + "option.NoChatReports.hideSystemMessageIndicators": "隐藏系统消息指示符", + "option.NoChatReports.hideSystemMessageIndicators.tooltip": "阻止客户端在聊天消息左侧以灰色条的形式显示系统消息指示符。", + "option.NoChatReports.hideWarningToast": "隐藏警告弹窗", + "option.NoChatReports.hideWarningToast.tooltip": "删除在进入禁用§o enforce-sevure-profile §r的服务器时显示的警告提示。", + "option.NoChatReports.alwaysHideReportButton": "总是隐藏举报按钮", + "option.NoChatReports.alwaysHideReportButton.tooltip": "防止客户端在社交屏幕中显示举报按钮。默认情况下禁用,模组只会在安装了 No Chat Reports 的服务器上使按钮无效,并在按钮的工具提示中添加说明。", + "configuration.NoChatReports.category.technical": "技术性", + "option.NoChatReports.demandOnServer": "要求服务器安装", "option.NoChatReports.demandOnServer.tooltip": "阻止客户端加入未安装 No Chat Reports 的服务器。", "option.NoChatReports.enableDebugLog": "启用调试日志", - "option.NoChatReports.enableDebugLog.tooltip": "启用某些调试信息的日志输出,这对于非开发人员来说通常是无用的。", - "option.NoChatReports.convertToGameMessage": "转换为游戏消息", - "option.NoChatReports.convertToGameMessage.tooltip": "让服务器将所有玩家消息转换为系统消息。系统消息未附加任何签名,无法被举报;在未修改的客户端上将在消息左侧显示灰条。", + "option.NoChatReports.enableDebugLog.tooltip": "启用某些调试信息的日志记录。这对于非开发人员来说通常是无用的。", "option.NoChatReports.disableTelemetry": "禁用遥测", - "option.NoChatReports.disableTelemetry.tooltip": "允许模组禁用内置遥测,类似于 No Telemetry 模组。", - "option.NoChatReports.showReloadButton": "显示重载配置按钮", - "option.NoChatReports.showReloadButton.tooltip": "添加一个用于重新加载 No Chat Reports 的配置的按钮到多人游戏菜单。", - "option.NoChatReports.whitelistAllServers": "将所有服务器列入白名单", - "option.NoChatReports.whitelistAllServers.tooltip": "使模组的行为就像所有服务器都已添加至“§owhitelistAllServers§r”列表中一样", - "option.NoChatReports.whitelistedServers": "whitelistAllServers", - "option.NoChatReports.whitelistedServers.tooltip": "包含不应显示“不安全的服务器”警告界面的服务器。当您在界面中选中“不再显示” 复选框时,服务器将会被自动添加至此列表。\n每个条目都是一个字符串,格式为:§l<服务器地址>:<端口>§r。", + "option.NoChatReports.disableTelemetry.tooltip": "允许模组禁用内置遥测,类似于 No Telemetry。", + "option.NoChatReports.showReloadButton": "显示重新加载按钮", + "option.NoChatReports.showReloadButton.tooltip": "在多人游戏菜单中添加一个重新加载配置的按钮。", + "option.NoChatReports.whitelistAllServers": "将所有服务器加入白名单", + "option.NoChatReports.whitelistAllServers.tooltip": "使模组的行为就像所有服务器都已添加到服务器白名单中一样。", + "option.NoChatReports.skipSigningWarning": "请求时自动签名", + "option.NoChatReports.skipSigningWarning.tooltip": "跳过“要求聊天签名”警告,并在服务器需要时自动签名聊天。", + "option.NoChatReports.showNCRButton": "显示模组按钮", + "option.NoChatReports.showNCRButton.tooltip": "添加一个按钮,可以在多人游戏菜单中切换模组大部分客户端功能的启用状态。", + "option.NoChatReports.enableMod": "启用模组", + "option.NoChatReports.enableMod.tooltip": "负责启用模组的大部分客户端功能。如果在会话中途切换,则需要重新加入服务器才能生效。", + "option.NoChatReports.reconnectAwaitSeconds": "重连等待秒数", + "option.NoChatReports.reconnectAwaitSeconds.tooltip": "假设用户同意进入不安全的服务器,在服务器拒绝无聊天签名密钥的连接后,客户端在自动重新连接之前应等待的秒数。", + "option.NoChatReports.postDisconnectAwaitSeconds": "断开后等待秒数", + "option.NoChatReports.postDisconnectAwaitSeconds.tooltip": "类似于 §oreconnectAwaitSeconds§r,但一旦玩家正常断开与服务器的连接,则开始倒计时。如果当他们尝试重新加入服务器时,该延迟大于 §oreconnectAwaitSeconds§r,则该延迟将适用。", + "option.NoChatReports.signingCheckDelaySeconds": "签名检查延迟秒数", + "option.NoChatReports.signingCheckDelaySeconds.tooltip": "检查白名单服务器是否仍然强制聊天签名的延迟(秒)。将此设置为0将导致对每次登录尝试执行检查,类似于未列入白名单的服务器。", + "option.NoChatReports.serverSigningChecks": "服务器签名检查", + "option.NoChatReports.serverSigningChecks.tooltip": "白名单服务器到最后一次签名强制检查时间的映射(以秒为单位)。这通常不需要手动编辑。", + "option.NoChatReports.showEncryptionButton": "显示加密按钮", + "option.NoChatReports.showEncryptionButton.tooltip": "将此设置为 false 只会阻止聊天屏幕中显示加密按钮。请注意,加密本身不会随按钮一起自动禁用。", + "configuration.NoChatReports.category.whitelistedServers": "加入白名单的服务器", + "option.NoChatReports.whitelistedServers": "加入白名单的服务器", + "option.NoChatReports.whitelistedServers.tooltip": "包含不应显示“要求聊天签名”警告屏幕的服务器。当您在该屏幕中单击“白名单服务器”时,服务器将添加到此列表中。\n每个条目都是一个字符串,格式为§l<服务器 IP>:<端口号>§r。", "option.NoChatReports.whitelistedServers.addButtonTooltip": "添加服务器", - "option.NoChatReports.whitelistedServers.removeButtonTooltip": "移除服务器", - "option.NoChatReports.whitelistedServers.instructions": "添加服务器时,单击“whitelistAllServers”下方的按钮以输入字段。" + "option.NoChatReports.whitelistedServers.removeButtonTooltip": "移除选中的服务器", + "option.NoChatReports.whitelistedServers.instructions": "单击 + 添加服务器。单击 - 删除所选服务器。", + "option.NoChatReports.whitelistedServers.serverAddress": "单击编辑服务器地址", + "configuration.NoChatReports.category.lanOptions": "局域网选项", + "option.NoChatReports.demandOnClient": "要求在客户端上安装", + "option.NoChatReports.demandOnClient.tooltip": "使服务器要求所有加入的客户端都安装 No Chat Reports。", + "option.NoChatReports.convertToGameMessage": "转换为游戏消息", + "option.NoChatReports.convertToGameMessage.tooltip": "使服务器将所有玩家消息转换为系统消息。系统消息没有附加任何签名,无法举报;在未修改的客户端上,它们将在左侧显示灰色条。", + "option.NoChatReports.addQueryData": "添加查询数据", + "option.NoChatReports.addQueryData.tooltip": "允许服务器在处理 Ping 时向客户端发送其他数据。这用于显示“安全服务器”图标以及其他一些技术用途。", + "gui.NoChatReports.showEncryptionButtonWarning": "§cBelow不禁用加密,它只隐藏按钮!" } diff --git a/src/main/resources/assets/nochatreports/lang/zh_tw.json b/src/main/resources/assets/nochatreports/lang/zh_tw.json index 94e1d63..dcb7ea6 100644 --- a/src/main/resources/assets/nochatreports/lang/zh_tw.json +++ b/src/main/resources/assets/nochatreports/lang/zh_tw.json @@ -1,11 +1,11 @@ { - "gui.nochatreport.secureChat": "此選項無法與 No Chat Reports 一起使用,因為沒有可用於驗證的簽名。", - "gui.nochatreport.noReporting": "聊天舉報在此伺服器上被禁用,由 No Chat Reports 提供。", + "gui.nochatreports.secure_chat": "此選項無法與 No Chat Reports 一起使用,因為沒有可用於驗證的簽名。", + "gui.nochatreports.no_reporting": "聊天舉報在此伺服器上被禁用,由 No Chat Reports 提供。", "disconnect.nochatreports.client": "此伺服器沒有安裝 No Chat Reports,但你已將其配置為要求在伺服器上安裝。", - "gui.nochatreports.status_secure": "此伺服器安裝了 No Chat Reports 或其他已知的方法避免消息被舉報。這也會避免「僅顯示已受保護的聊天內容」阻擋你的消息。你可以安全地聊天。", - "gui.nochatreports.status_unintrusive": "此伺服器不能防止聊天舉報,但允許發送未簽名的消息。這意味著你發的消息不能被舉報給 Mojang,但其他人還可以用「僅顯示已受保護的聊天內容」阻擋你的消息", - "gui.nochatreports.status_insecure": "此伺服器要求所有玩家的消息簽名,你也同意在這設置下繼續遊戲。你所發送的任何消息都可能成為你被舉報時潛在的違規證據。你可以在「NoChatReports.json」中手動移除此伺服器,以再次獲得相同的警告。", - "gui.nochatreports.status_undefined": "No Chat Reports 無法檢測此伺服器的安全性。這不應該發生,請將此錯誤反饋給模組作者。", + "gui.nochatreports.safety_status.secure": "此伺服器安裝了 No Chat Reports 或其他已知的方法避免消息被舉報。這也會避免「僅顯示已受保護的聊天內容」阻擋你的消息。你可以安全地聊天。", + "gui.nochatreports.OLD_status_unintrusive": "此伺服器不能防止聊天舉報,但允許發送未簽名的消息。這意味著你發的消息不能被舉報給 Mojang,但其他人還可以用「僅顯示已受保護的聊天內容」阻擋你的消息", + "gui.nochatreports.OLD_status_insecure": "此伺服器要求所有玩家的消息簽名,你也同意在這設置下繼續遊戲。你所發送的任何消息都可能成為你被舉報時潛在的違規證據。你可以在「NoChatReports.json」中手動移除此伺服器,以再次獲得相同的警告。", + "gui.nochatreports.safety_status.undefined": "No Chat Reports 無法檢測此伺服器的安全性。這不應該發生,請將此錯誤反饋給模組作者。", "gui.nochatreports.unsafe_server.header": "警告:不安全的伺服器", "gui.nochatreports.unsafe_server.contents": "此伺服器要求所有消息簽名,這意味著它們可以被舉報給 Mojang。可能是伺服器默認開啟了「enforce-secure-profile」選項。你可以選擇繼續遊玩,但 No Chat Reports 不能提供任何保護。", "gui.nochatreports.unsafe_server.check": "不在此伺服器中再次顯示", diff --git a/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons_extended.png b/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons_extended.png index 27ddc40..8020aa2 100644 Binary files a/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons_extended.png and b/src/main/resources/assets/nochatreports/textures/gui/chat_status_icons_extended.png differ diff --git a/src/main/resources/assets/nochatreports/textures/gui/report_server_button.png b/src/main/resources/assets/nochatreports/textures/gui/report_server_button.png new file mode 100644 index 0000000..c92377c Binary files /dev/null and b/src/main/resources/assets/nochatreports/textures/gui/report_server_button.png differ diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index a869685..5e73ba2 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -8,26 +8,22 @@ "mixins": [ "common.MixinServerStatus", "common.MixinServerStatusSerializer", - "server.MixinPlayer", "server.MixinServerboundChatPacket", "server.MixinServerGamePacketListenerImpl", - "server.MixinPlayerList" + "server.MixinPlayerList", + "server.MixinServerboundChatSessionUpdatePacket" ], "client": [ + "forge.client.MixinClientConnection", "forge.client.MixinClientHandshakePacketListenerImpl", "forge.client.MixinClientPacketListener", - "forge.client.MixinClientConnection", - "client.MixinLocalPlayer", "client.MixinOptions", "client.MixinChatListener", "client.MixinChatOptionsScreen", - "client.MixinProfileKeyPairManager", - "client.MixinClientTelemetryManager", + "client.MixinYggdrasilUserApiService", "client.MixinPlayerEntry", "client.MixinChatScreen", - "client.AccessorDisconnectedScreen", "client.MixinConnectScreen", - "client.MixinClientboundHelloPacket", "client.MixinJoinMultiplayerScreen", "client.MixinGuiMessageTag", "client.MixinToastComponent", @@ -37,7 +33,10 @@ "client.MixinOnlineServerEntry", "client.MixinChatComponent", "client.MixinGuiMessageTagIcon", - "client.MixinTitleScreen" + "client.MixinTitleScreen", + "client.MixinMinecraft", + "client.MixinClientPacketListener", + "client.MixinRowHelper" ], "server": [ "server.MixinDedicatedServer" -- cgit v1.2.3