summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java31
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/JSONConfig.java37
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java30
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfig.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java29
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java67
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java57
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java41
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java11
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java20
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/SigningMode.java94
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java (renamed from src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java)54
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java48
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java31
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java28
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java97
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java13
-rw-r--r--src/main/resources/assets/nochatreports/lang/ca_es.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/cs_cz.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/da_dk.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/de_de.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_pt.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json68
-rw-r--r--src/main/resources/assets/nochatreports/lang/es_es.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/et_ee.json68
-rw-r--r--src/main/resources/assets/nochatreports/lang/fi_fi.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/fr_fr.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/id_id.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/it_it.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/ko_kr.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/nl_nl.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/pl_pl.json16
-rw-r--r--src/main/resources/assets/nochatreports/lang/pt_br.json12
-rw-r--r--src/main/resources/assets/nochatreports/lang/ro_ro.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/ru_ru.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/sk_sk.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/th_th.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/tr_tr.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/uk_ua.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/zh_cn.json16
-rw-r--r--src/main/resources/assets/nochatreports/lang/zh_tw.json4
43 files changed, 556 insertions, 402 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 3b85d03..8fdc00f 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -4,6 +4,8 @@ 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.core.SigningMode;
+
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@@ -11,7 +13,9 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.ChatScreen;
import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.client.multiplayer.ProfileKeyPairManager;
import net.minecraft.network.chat.Component;
/**
@@ -21,6 +25,7 @@ import net.minecraft.network.chat.Component;
@Environment(EnvType.CLIENT)
public final class NoChatReportsClient implements ClientModInitializer {
+ private static boolean signingKeysPresent = false;
@Override
public void onInitializeClient() {
@@ -50,11 +55,13 @@ public final class NoChatReportsClient implements ClientModInitializer {
if (ServerSafetyState.isOnRealms()) {
// NO-OP
+ } 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.getLastServer() != null &&
- NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServer())) {
+ } else if (NCRConfig.getServerPreferences().hasMode(ServerSafetyState.getLastServer(),
+ SigningMode.ALWAYS)) {
ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
ServerSafetyState.setAllowChatSigning(true);
} else {
@@ -74,4 +81,24 @@ public final class NoChatReportsClient implements ClientModInitializer {
});
}
+ 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 3c937b7..edc8bec 100644
--- a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
@@ -15,22 +15,13 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonSyntaxException;
+import net.fabricmc.api.EnvType;
import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
public abstract class JSONConfig {
protected static final Path CONFIG_DIR = FabricLoader.getInstance().getConfigDir();
- 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;
@@ -93,4 +84,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 (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+ builder.registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE);
+ }
+
+ return builder.create();
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
index 61aa605..6ab9f60 100644
--- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
@@ -222,36 +222,6 @@ public final class ModMenuIntegration implements ModMenuApi {
.setSaveConsumer(newValue -> NCRConfig.getCommon().addQueryData = newValue)
.build());
- // Set an option for skipSigningWarning
- whitelist.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.skipSigningWarning"), NCRConfig.getClient().skipSigningWarning)
- .setDefaultValue(false)
- .setTooltip(this.makeTooltip("option.NoChatReports.skipSigningWarning.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().skipSigningWarning = newValue)
- .build());
-
- // Set an option for whitelistAllServers
- whitelist.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NCRConfig.getClient().whitelistAllServers)
- .setDefaultValue(false)
- .setTooltip(this.makeTooltip("option.NoChatReports.whitelistAllServers.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().whitelistAllServers = newValue)
- .build());
-
- // Instructions for adding servers
- whitelist.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.whitelistedServers.instructions"))
- .build());
-
- // Add or remove whitelisted servers
- whitelist.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NCRConfig.getServerWhitelist().whitelistedServers)
- .setExpanded(true)
- .setInsertInFront(true)
- .setDefaultValue(NCRServerWhitelist.DEFAULT_WHITELISTED_SERVERS)
- .setTooltip(this.makeTooltip("option.NoChatReports.whitelistedServers.tooltip"))
- .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip"))
- .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getServerWhitelist().whitelistedServers = newValue)
- .setCreateNewInstance(baseListEntry -> new StringListListEntry.StringListCell(Language.getInstance().getOrDefault(("option.NoChatReports.whitelistedServers.serverAddress")), baseListEntry))
- .build());
-
// Save config
builder.setSavingRunnable(NCRConfig::save);
return builder.build();
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
index 4d24da4..7f203bc 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
@@ -13,7 +13,7 @@ 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() {
@@ -30,8 +30,8 @@ public final class NCRConfig {
}
@Environment(EnvType.CLIENT)
- public static NCRServerWhitelist getServerWhitelist() {
- return checkLoaded(() -> whitelist);
+ public static NCRServerPreferences getServerPreferences() {
+ return checkLoaded(() -> serverPreferences);
}
@Environment(EnvType.CLIENT)
@@ -52,7 +52,7 @@ public final class NCRConfig {
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.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);
}
@@ -64,7 +64,7 @@ public final class NCRConfig {
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.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 b1e2fe8..e79bc5a 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
@@ -1,20 +1,21 @@
package com.aizistral.nochatreports.config;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
+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 enableMod = true, showNCRButton = true, showReloadButton = true, verifiedIconEnabled = true,
- showServerSafety = true, hideInsecureMessageIndicators = true, hideModifiedMessageIndicators = true,
- hideSystemMessageIndicators = true, hideWarningToast = true, hideSigningRequestMessage = false,
- alwaysHideReportButton = false, skipRealmsWarning = false, skipSigningWarning = false,
- whitelistAllServers = false, disableTelemetry = true, demandOnServer = false;
+ 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, demandOnServer = false;
protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0;
-
protected NCRConfigClient() {
super(FILE_NAME);
}
@@ -134,18 +135,6 @@ public final class NCRConfigClient extends JSONConfig {
}
/**
- * @return True if the full-screen warning should be skipped for servers that require chat signing,
- * letting users simply join the server. Because of that, servers will no longer be added to the
- * whitelist.<br><br>
- *
- * This is false by default.
- */
-
- public 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.<br><br>
*
@@ -206,6 +195,8 @@ public final class NCRConfigClient extends JSONConfig {
return this.hideSigningRequestMessage;
}
- public boolean skipSigningWarning() { return this.skipSigningWarning; }
+ public SigningMode defaultSigningMode() {
+ return this.defaultSigningMode;
+ }
}
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..a3eafd3
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java
@@ -0,0 +1,67 @@
+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.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<ServerAddress, SigningMode> 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 (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 a8cc1c2..0000000
--- a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java
+++ /dev/null
@@ -1,57 +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<String> DEFAULT_WHITELISTED_SERVERS = new ArrayList<>();
- protected List<String> 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.<br><br>
- *
- * This is empty by default.
- *
- * @see UnsafeServerScreen
- */
-
- public List<String> 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() || (address != null &&
- this.getList().contains(address.getHost() + ":" + address.getPort()));
- }
-
- public boolean add(ServerAddress address) {
- return this.getList().add(address.getHost() + ":" + address.getPort());
- }
-
- public boolean remove(ServerAddress address) {
- return this.getList().remove(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..9a90b6e
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java
@@ -0,0 +1,41 @@
+package com.aizistral.nochatreports.config;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.InstanceCreator;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
+
+@Environment(EnvType.CLIENT)
+public class ServerAddressAdapter extends TypeAdapter<ServerAddress> {
+ public static final ServerAddressAdapter INSTANCE = new ServerAddressAdapter();
+
+ private ServerAddressAdapter() {
+ // NO-OP
+ }
+
+ @Override
+ public ServerAddress read(JsonReader reader) throws IOException {
+ String string = reader.nextString();
+ String address[] = string.split(":");
+
+ if (address.length != 2)
+ throw new IOException("Incorrect server address format: " + string);
+
+ return new ServerAddress(address[0], Integer.valueOf(address[1]));
+ }
+
+ @Override
+ public void write(JsonWriter writer, ServerAddress address) throws IOException {
+ writer.value(address.getHost() + ":" + address.getPort());
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
index 0808f4f..302a1a3 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
@@ -37,14 +37,6 @@ public enum ServerSafetyLevel {
INSECURE,
/**
- * Servers that don't require signatures but the user gave them anyway by whitelisting.
- * The state is only displayed after the player toggles the whitelist for a server, because
- * it is not possible to determine whether a server requires signatures if they are already given.
- */
-
- INSECURE_WHITELISTED,
-
- /**
* For Realms specifically, as these are a whole new level of unsafe.
*/
@@ -62,9 +54,8 @@ public enum ServerSafetyLevel {
UNDEFINED;
- @Environment(EnvType.CLIENT)
public MutableComponent getTooltip() {
- return Component.translatable("gui.nochatreports.status_" + this.name().toLowerCase());
+ return Component.translatable("gui.nochatreports.safety_status." + this.name().toLowerCase());
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index 047c820..b55e059 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -9,6 +9,7 @@ import net.minecraft.network.chat.LocalChatSession;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import org.jetbrains.annotations.Nullable;
@@ -38,21 +39,22 @@ public final class ServerSafetyState {
return ALLOW_CHAT_SIGNING.get();
}
- public static void setAllowChatSigning(boolean allow) {
+ public static CompletableFuture<Void> 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) {
- Minecraft.getInstance().getProfileKeyPairManager().prepareKeyPair()
- .thenAcceptAsync(optional -> optional.ifPresent(profileKeyPair -> {
- connection.setKeyPair(profileKeyPair);
- SIGNING_ACTIONS.forEach(Runnable::run);
- SIGNING_ACTIONS.clear();
- }), Minecraft.getInstance());
- }
+ 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());
}
}
+
+ return CompletableFuture.completedFuture(null);
}
public static void toggleChatSigning() {
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..3d7aa3d
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java
@@ -0,0 +1,94 @@
+package com.aizistral.nochatreports.core;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.aizistral.nochatreports.config.NCRConfig;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+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 MutableComponent getName() {
+ String key = "gui.nochatreports.signing_mode." + this.name().toLowerCase();
+
+ if (this != DEFAULT)
+ return Component.translatable(key);
+ else
+ return Component.translatable(key, NCRConfig.getClient().defaultSigningMode().getName());
+ }
+
+ public MutableComponent getTooltip() {
+ return Component.translatable("gui.nochatreports.signing_mode." + this.name().toLowerCase() +
+ ".tooltip");
+ }
+
+ public SigningMode next() {
+ SigningMode result = null;
+
+ if (this.ordinal() == values().length - 1) {
+ result = values()[0];
+ } else {
+ result = values()[this.ordinal() + 1];
+ }
+
+ return result == NEVER_FORCED ? result.next() : result;
+ }
+
+ public SigningMode resolve() {
+ return switch(this) {
+ case DEFAULT -> NCRConfig.getClient().defaultSigningMode();
+ case NEVER_FORCED -> NEVER;
+ default -> this;
+ };
+ }
+
+ public static SigningMode nullable(@Nullable SigningMode mode) {
+ return mode == null ? DEFAULT : mode;
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java
index 8cdafdd..898b1f5 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java
@@ -1,6 +1,9 @@
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;
@@ -11,22 +14,24 @@ 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 {
+public abstract class AdaptiveWarningScreen extends Screen {
private final Component title;
private final Component content;
- private final Component check;
private final Component narration;
- private final String wiki_link;
+ @Nullable
protected final Screen previous;
- protected MultiLineLabel message = MultiLineLabel.EMPTY;
+ @Nullable
+ private final Component check;
+ @Nullable
protected Checkbox stopShowing = null;
+ protected MultiLineLabel message = MultiLineLabel.EMPTY;
- public ExtendedWarningScreen(Component title, Component content, Component check, String wikiLink, Screen previous) {
+ public AdaptiveWarningScreen(Component title, Component content, @Nullable Component check,
+ @Nullable 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;
}
@@ -40,37 +45,16 @@ public abstract class ExtendedWarningScreen extends Screen {
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(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed)
- .pos(this.width / 2 - 260 + offset, buttonY + i).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.wiki_link);
- }
-
- Minecraft.getInstance().setScreen(this);
- }, this.wiki_link, true));
- }).pos(this.width / 2 - 100 + offset, buttonY + i).size(150, 20).build());
-
-
- this.addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, this::onBack)
- .pos(this.width / 2 + 60 + offset, buttonY + i).size(150, 20).build());
+ 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 onProceed(Button button);
-
- protected abstract void onBack(Button button);
+ protected abstract void initButtons(int y);
@Override
public void render(PoseStack poseStack, int i, int j, float f) {
@@ -96,4 +80,4 @@ public abstract class ExtendedWarningScreen extends Screen {
return this.minecraft.font.lineHeight * 2;
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java
index 89a8418..0882a0a 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java
@@ -9,7 +9,7 @@ import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
@Environment(EnvType.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/RealmsWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java
index e44b7f1..3fb2b79 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java
@@ -6,7 +6,7 @@ import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.Screen;
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 c0bb983..36820a8 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
@@ -16,6 +16,7 @@ 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;
@@ -23,18 +24,15 @@ import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
@Environment(EnvType.CLIENT)
-public final class UnsafeServerScreen extends WarningScreen {
+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;
-
public UnsafeServerScreen(Screen previous) {
- super(TITLE, CONTENT, CHECK, NARRATION);
- this.previous = previous;
+ super(TITLE, CONTENT, CHECK, previous);
}
@Override
@@ -43,35 +41,16 @@ public final class UnsafeServerScreen extends WarningScreen {
button -> {
ServerSafetyState.setAllowChatSigning(true);
this.minecraft.setScreen(this.previous);
- }).pos(this.width / 2 - 260 + 28, 100 + i).size(150, 20)
+ }).bounds(this.width / 2 - 155, i, 150, 20)
.build());
- ServerAddress address = ServerSafetyState.getLastServer();
- var whitelist = Button.builder(Component.translatable("gui.nochatreports.signing_required.whitelist_server"),
- button -> {
- if (address != null) {
- NCRConfig.getServerWhitelist().add(address);
- NCRConfig.getServerWhitelist().saveFile();
- }
-
- ServerSafetyState.setAllowChatSigning(true);
- this.minecraft.setScreen(this.previous);
- }).pos(this.width / 2 - 100 + 28, 100 + i).size(150, 20)
- .build();
-
- if (address == null) {
- whitelist.active = false;
- }
-
- this.addRenderableWidget(whitelist);
-
this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.signing_required.cancel"),
button -> {
if (this.stopShowing.selected()) {
hideThisSession = true;
}
this.minecraft.setScreen(this.previous);
- }).pos(this.width / 2 + 60 + 28, 100 + i).size(150, 20).build());
+ }).bounds(this.width / 2 - 155 + 160, i, 150, 20).build());
}
private void resendLastMessage() {
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 21a53e9..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,10 +1,12 @@
package com.aizistral.nochatreports.mixins.client;
import com.aizistral.nochatreports.NoChatReports;
+import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.EncryptionUtil;
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;
@@ -38,7 +40,7 @@ public class MixinChatListener {
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.signingRequested");
+ mutable.contents = new TranslatableContents("chat.nochatreports.disabled.signing_requested");
if (!ServerSafetyState.isOnRealms()) {
ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
@@ -47,18 +49,8 @@ public class MixinChatListener {
if (UnsafeServerScreen.hideThisSession() || ServerSafetyState.allowChatSigning())
return;
- if (NCRConfig.getClient().skipSigningWarning()) {
- ServerSafetyState.scheduleSigningAction(() -> {
- 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);
- });
-
+ if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ON_DEMAND)) {
+ ServerSafetyState.scheduleSigningAction(NoChatReportsClient::resendLastChatMessage);
ServerSafetyState.setAllowChatSigning(true);
if (NCRConfig.getClient().hideSigningRequestMessage()) {
@@ -68,11 +60,13 @@ public class MixinChatListener {
return;
}
- Minecraft.getInstance().setScreen(new UnsafeServerScreen(Minecraft.getInstance().screen
- instanceof ChatScreen chat ? chat : new ChatScreen("")));
+ 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();
+ if (NCRConfig.getClient().hideSigningRequestMessage()) {
+ info.cancel();
+ }
}
}
}
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 53b7149..3fb0864 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
@@ -1,14 +1,18 @@
package com.aizistral.nochatreports.mixins.client;
+import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.config.NCRConfig;
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.EncryptionWarningScreen;
import com.mojang.blaze3d.systems.RenderSystem;
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;
@@ -24,12 +28,14 @@ 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;
/**
@@ -48,6 +54,20 @@ public abstract class MixinChatScreen extends Screen {
throw new IllegalStateException("Can't touch this");
}
+ @Inject(method = "handleChatInput", at = @At("HEAD"), cancellable = true)
+ public void handleChatInput(String string, boolean bl, CallbackInfoReturnable<Boolean> 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<String> info) {
String message = info.getReturnValue();
@@ -73,59 +93,53 @@ public abstract class MixinChatScreen extends Screen {
if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) {
this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(),
0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> {
- if (NCRConfig.getClient().whitelistAllServers())
+ if (!NoChatReportsClient.areSigningKeysPresent())
return;
var address = ServerSafetyState.getLastServer();
+
if (address != null) {
- var whitelist = NCRConfig.getServerWhitelist();
-
- if (!whitelist.isWhitelisted(address)) {
- whitelist.add(address);
- whitelist.saveFile();
-
- if (ServerSafetyState.getCurrent() != ServerSafetyLevel.SECURE) {
- ServerSafetyState.setAllowChatSigning(true);
- if(ServerSafetyState.getCurrent() != ServerSafetyLevel.INSECURE){
- ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE_WHITELISTED);
- }
- }
- } else {
- whitelist.remove(address);
- whitelist.saveFile();
- }
+ 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();
ServerAddress address = ServerSafetyState.getLastServer();
- String signing = "gui.nochatreports.status_signing_denied";
-
- if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) {
- signing = "gui.nochatreports.status_signing_allowed_realms";
- } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE) {
- signing = "gui.nochatreports.status_signing_denied_secure";
- } else if (NCRConfig.getServerWhitelist().isWhitelisted(address)) {
- signing = "gui.nochatreports.status_signing_allowed_whitelisted";
- } else if (ServerSafetyState.allowChatSigning()) {
- signing = "gui.nochatreports.status_signing_allowed";
- }
+ SigningMode mode = NCRConfig.getServerPreferences().getModeUnresolved(address);
+ String signing = "gui.nochatreports.signing_status.";
- tooltip.append("\n\n").append(Component.translatable(signing));
-
- if (address != null) {
- String status = "gui.nochatreports.status_whitelist_no";
+ if (ServerSafetyState.allowChatSigning()) {
+ tooltip = Component.translatable("gui.nochatreports.safety_status.insecure_signing");
+ }
- if (NCRConfig.getClient().whitelistAllServers()) {
- status = "gui.nochatreports.status_whitelist_all";
- } else if (NCRConfig.getServerWhitelist().isWhitelisted(address)) {
- status = "gui.nochatreports.status_whitelist_yes";
+ 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";
}
-
- tooltip.append("\n\n").append(Component.translatable(
- "gui.nochatreports.status_whitelist_mode", Component.translatable(status)));
+ } else if (ServerSafetyState.allowChatSigning()) {
+ signing += "allowed_session";
+ } else {
+ signing += "disabled";
}
+ tooltip.append("\n\n");
+ tooltip.append(Component.translatable(signing));
+ 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));
@@ -185,11 +199,14 @@ public abstract class MixinChatScreen extends Screen {
return switch (level) {
case SECURE -> 21;
case UNINTRUSIVE -> 42;
- case INSECURE, INSECURE_WHITELISTED -> 0;
+ case INSECURE -> 0;
case REALMS -> 63;
case UNKNOWN -> 84;
case UNDEFINED -> 105;
};
}
+ @Shadow
+ public abstract String normalizeChatMessage(String string);
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
index dd41e5d..c6dc485 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
@@ -1,19 +1,32 @@
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 = "<init>(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<ProfileKeyPairManager> info) {
diff --git a/src/main/resources/assets/nochatreports/lang/ca_es.json b/src/main/resources/assets/nochatreports/lang/ca_es.json
index d70f4f0..f2b0410 100644
--- a/src/main/resources/assets/nochatreports/lang/ca_es.json
+++ b/src/main/resources/assets/nochatreports/lang/ca_es.json
@@ -2,10 +2,10 @@
"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.OLD_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.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.OLD_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.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 7ed92e1..e21c7be 100644
--- a/src/main/resources/assets/nochatreports/lang/cs_cz.json
+++ b/src/main/resources/assets/nochatreports/lang/cs_cz.json
@@ -2,10 +2,10 @@
"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.OLD_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.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.OLD_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.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 df5b429..520171f 100644
--- a/src/main/resources/assets/nochatreports/lang/da_dk.json
+++ b/src/main/resources/assets/nochatreports/lang/da_dk.json
@@ -2,11 +2,11 @@
"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.OLD_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.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.OLD_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.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 46c0d10..a42f438 100644
--- a/src/main/resources/assets/nochatreports/lang/de_de.json
+++ b/src/main/resources/assets/nochatreports/lang/de_de.json
@@ -2,10 +2,10 @@
"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.OLD_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.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.OLD_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.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 66412b0..c8bad35 100644
--- a/src/main/resources/assets/nochatreports/lang/en_pt.json
+++ b/src/main/resources/assets/nochatreports/lang/en_pt.json
@@ -3,11 +3,11 @@
"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.OLD_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.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.OLD_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.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 f91fd32..5a20dfc 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -3,22 +3,20 @@
"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 \"Unverified\" and not show them if \"Only Show Secure Chat\" is enabled in chat options.",
- "gui.nochatreports.status_insecure": "This server currently demands all chat messages to be signed. All signed messages are a potentially incriminating evidence that can be used against you in the report.",
- "gui.nochatreports.status_insecure_whitelisted": "This server does not require chat signing, but you enabled it anyway via whitelisting. All signed messages are a potentially incriminating evidence that can be used against you in the report.",
- "gui.nochatreports.status_realms": "This is a Realms server. Not only there is no way to prevent chat reports here, but Mojang also employ automated chat monitoring to identify potential \"online harms\" and escalate them for human review, whether owner of the realm likes it or not. Your only hope is chat encryption.",
- "gui.nochatreports.status_unknown": "No Chat Reports is not sure about safety of this server yet. Try to send a message in chat in order to evaluate it.",
- "gui.nochatreports.status_undefined": "No Chat Reports could not evaluate the safety of this server. This should never happen, please report it as a bug to the mod developer.",
- "gui.nochatreports.status_signing_allowed_realms": "Chat signing is always enabled on Realms, since it is always required and disabling it would yield no benefit anyways.",
- "gui.nochatreports.status_signing_allowed_whitelisted": "Message signing is enabled for this session. You can try disabling it by removing the server from whitelist, rejoining and sending a chat message. After that, No Chat Reports will be able to determine whether or not signing is required.",
- "gui.nochatreports.status_signing_allowed": "Message signing is enabled for this session. Re-join the server to disable it.",
- "gui.nochatreports.status_signing_denied_secure": "Message signing is disabled since this server is secure.",
- "gui.nochatreports.status_signing_denied": "Message signing is disabled for this session. You can whitelist this server to always enable chat signing on it.",
- "gui.nochatreports.status_whitelist_mode": "§lWhitelisted Server: %1$s",
- "gui.nochatreports.status_whitelist_all": "§a§lYes (All Servers)",
- "gui.nochatreports.status_whitelist_yes": "§a§lYes",
- "gui.nochatreports.status_whitelist_no": "§c§lNo",
+ "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.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.",
@@ -59,12 +57,23 @@
"gui.nochatreports.realms_warning.check": "Don't show again",
"gui.nochatreports.realms_warning.learn_more": "Learn More",
"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. Click \"Allow Signing\" to enable message signing for this session, or \"Whitelist Server\" to always enable signing on this server.",
+ "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.whitelist_server": "Whitelist Server",
"gui.nochatreports.signing_required.cancel": "Dismiss",
"gui.nochatreports.signing_required.check": "Don't show again during this session",
- "chat.nochatreports.disabled.signingRequested": "Server refused to deliver unsigned message. You can enable chat signing by allowing it for one session in a pop-up screen or whitelisting the server. Without signing you can still use most commands.",
+ "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.client": "Client",
@@ -114,24 +123,5 @@
"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",
- "option.NoChatReports.addQueryData.tooltip": "Allows the server to send additional data to client when handling pings. This is used for displaying \"Safe Server\" icon, as well as some other technical purposes.",
- "configuration.NoChatReports.category.whitelist": "Whitelist",
- "option.NoChatReports.skipSigningWarning": "Sign automatically when requested",
- "option.NoChatReports.skipSigningWarning.tooltip": "Skips the \"Chat Signing Requested\" warning and signs the chat automatically when the server requires it.",
- "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.whitelistedServers.instructions": "Click the + to add a server. Click the - to remove the selected server.",
- "option.NoChatReports.whitelistedServers": "Whitelisted Servers",
- "option.NoChatReports.whitelistedServers.tooltip": "Contains servers for which \"Chat Signing Requested\" warning screen should never display. Servers are added to this list when you click \"Whitelist Server\" in that screen.\nEach entry is a string that is formatted as §l<server-ip>:<port>§r.",
- "option.NoChatReports.whitelistedServers.addButtonTooltip": "Add server",
- "option.NoChatReports.whitelistedServers.removeButtonTooltip": "Remove selected server",
- "option.NoChatReports.whitelistedServers.serverAddress": "Click here to edit server address",
- "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.addQueryData.tooltip": "Allows the server to send additional data to client when handling pings. This is used for displaying \"Safe Server\" icon, as well as some other technical purposes."
}
diff --git a/src/main/resources/assets/nochatreports/lang/es_es.json b/src/main/resources/assets/nochatreports/lang/es_es.json
index 519ab42..be7148a 100644
--- a/src/main/resources/assets/nochatreports/lang/es_es.json
+++ b/src/main/resources/assets/nochatreports/lang/es_es.json
@@ -3,11 +3,11 @@
"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.OLD_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.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.OLD_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.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 a9859f9..873532d 100644
--- a/src/main/resources/assets/nochatreports/lang/et_ee.json
+++ b/src/main/resources/assets/nochatreports/lang/et_ee.json
@@ -3,22 +3,20 @@
"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 \"kinnitamata sõnumitena\" ning ei kuva neid üldse, kui vestlusseadetes on lubatud \"Vaid turvaline vestlus\".",
- "gui.nochatreports.status_insecure": "See server nõuab hetkel kõikide mängijasõnumite signeerimist. Kõik signeeritud sõnumid on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada.",
- "gui.nochatreports.status_insecure_whitelisted": "See server ei nõua mängijasõnumite signeerimist, aga sa lubasid selle lubamisloendisse lisamisega siiski. Kõik signeeritud sõnumid on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada.",
- "gui.nochatreports.status_realms": "See on Realmsi server. Lisaks sellele, et siin ei saa vestlusest teatamist keelata, kasutab Mojang ka automaatset vestlusseiret, et tuvastada potentsiaalsed \"võrgukäitumise rikkumised\" ning saata need edasi inimkontrolli, olenemata sellest, kas see meeldib realmi omanikule või mitte. Sinu ainus lootus on vestluse krüpteerimine.",
- "gui.nochatreports.status_unknown": "No Chat Reports ei ole veel selle serveri turvalisuses kindel. Proovi selle tuvastamiseks vestlusesse üks sõnum saata.",
- "gui.nochatreports.status_undefined": "No Chat Reports ei suutnud selle serveri turvalisust hinnata. Seda ei tohiks kunagi juhtuda, palun teata sellest veast modi arendajale.",
- "gui.nochatreports.status_signing_allowed_realms": "Vestluse signeerimine on Realmsis alati lubatud, kuna see on alati nõutud ning selle keelamine ei annaks nagunii eelist.",
- "gui.nochatreports.status_signing_allowed_whitelisted": "Sõnumite signeerimine on selle seansi jaoks lubatud. Sa võid proovida seda keelata, eemaldades serveri lubamisloendist, taasliitudes ning saates vestlussõnumi. Pärast seda saab No Chat Reports kontrollida, kas signeerimine on nõutud või mitte.",
- "gui.nochatreports.status_signing_allowed": "Sõnumite signeerimine on selle seansi jaoks lubatud. Taasliitu serveriga, et see keelata.",
- "gui.nochatreports.status_signing_denied_secure": "Sõnumite signeerimine on keelatud, kuna see server on turvaline.",
- "gui.nochatreports.status_signing_denied": "Sõnumite signeerimine on selle seansi jaoks keelatud. Sa võid selle serveri lubamisloendisse lisada, et lubada selles alati vestluse signeerimine.",
- "gui.nochatreports.status_whitelist_mode": "§lLubamisloendis server: %1$s",
- "gui.nochatreports.status_whitelist_all": "§a§ljah (kõik serverid)",
- "gui.nochatreports.status_whitelist_yes": "§a§ljah",
- "gui.nochatreports.status_whitelist_no": "§c§lei",
+ "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.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.",
@@ -59,12 +57,23 @@
"gui.nochatreports.realms_warning.check": "Ära kuva uuesti",
"gui.nochatreports.realms_warning.learn_more": "Lisateave",
"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. Sa võid siiski seal mängida, kuid No Chat Reports ei saa sind kaitsta.",
+ "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.whitelist_server": "Server lubamisloendisse",
"gui.nochatreports.signing_required.cancel": "Loobu",
"gui.nochatreports.signing_required.check": "Ära kuva selle seansi puhul uuesti",
- "chat.nochatreports.disabled.signingRequested": "Server keeldus signeerimata sõnumi edastamisest. Vestluse signeerimist saad käimasoleva seansi jaoks lubada hüpikaknas või lisades serveri lubamisloendisse. Signeerimata saad sa siiski enamus käsklusi kasutada.",
+ "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": "mitte kunagi (sunnitud)",
+ "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.client": "Klient",
@@ -114,24 +123,5 @@
"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",
- "option.NoChatReports.addQueryData.tooltip": "Lubab serveril saata pingide käsitlemisel kliendile täiendavaid andmeid. Seda kasutatakse \"turvalise serveri\" ikooni kuvamiseks, kui ka teisteks tehnilisteks eesmärkideks.",
- "configuration.NoChatReports.category.whitelist": "Lubamisloend",
- "option.NoChatReports.skipSigningWarning": "Signeeri nõude korral automaatselt",
- "option.NoChatReports.skipSigningWarning.tooltip": "Jätab vahele hoiatuskuva \"taodeldi vestluse signeerimist\", signeerides vestluse automaatselt, kui server seda nõuab.",
- "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.whitelistedServers.instructions": "Serveri lisamiseks vajuta + nuppu. Valitud serveri eemaldamiseks vajuta - nuppu.",
- "option.NoChatReports.whitelistedServers": "Lubamisloendis serverid",
- "option.NoChatReports.whitelistedServers.tooltip": "Sisaldab servereid, mille puhul \"taodeldi vestluse signeerimist\" hoiatuskuva ei kuvata. Serverid lisatakse siia loendisse, kui vajutad sellel kuval \"Server lubamisloendisse\".\nIga kirje on §l<serveri-ip>:<port>§r vormistusega string.",
- "option.NoChatReports.whitelistedServers.addButtonTooltip": "Lisa server",
- "option.NoChatReports.whitelistedServers.removeButtonTooltip": "Eemalda server",
- "option.NoChatReports.whitelistedServers.serverAddress": "Klõpsa siia serveri aadressi muutmiseks",
- "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.addQueryData.tooltip": "Lubab serveril saata pingide käsitlemisel kliendile täiendavaid andmeid. Seda kasutatakse \"turvalise serveri\" ikooni kuvamiseks, kui ka teisteks tehnilisteks eesmärkideks."
}
diff --git a/src/main/resources/assets/nochatreports/lang/fi_fi.json b/src/main/resources/assets/nochatreports/lang/fi_fi.json
index 5f923bb..b15b4ac 100644
--- a/src/main/resources/assets/nochatreports/lang/fi_fi.json
+++ b/src/main/resources/assets/nochatreports/lang/fi_fi.json
@@ -2,10 +2,10 @@
"gui.nochatreports.secure_chat": "Tämä asetus ei toimi No Chat Reportsin kanssa, koska viestien sähköiset allekirjoitukset on poistettu.",
"gui.nochatreports.no_reporting": "Pelaajien ilmiantaminen on mahdotonta tällä palvelimella, kiitos No Chat Reportsin.",
"disconnect.nochatreports.client": "Tällä palvelimella ei ole No Chat Reportsia ja olet määritellyt sen pakolliseksi pelaamillesi palvelimille.",
- "gui.nochatreports.OLD_status_secure": "Tällä palvelimella on No Chat Reports tai palvelin muuten estää lähettämiesi viestien ilmiannon. Voit keskustella turvallisesti.",
+ "gui.nochatreports.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_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.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.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",
diff --git a/src/main/resources/assets/nochatreports/lang/fr_fr.json b/src/main/resources/assets/nochatreports/lang/fr_fr.json
index 396f79c..ef8e131 100644
--- a/src/main/resources/assets/nochatreports/lang/fr_fr.json
+++ b/src/main/resources/assets/nochatreports/lang/fr_fr.json
@@ -2,10 +2,10 @@
"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.OLD_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.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.OLD_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.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 7493bc8..8a562ef 100644
--- a/src/main/resources/assets/nochatreports/lang/id_id.json
+++ b/src/main/resources/assets/nochatreports/lang/id_id.json
@@ -2,10 +2,10 @@
"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.OLD_status_secure": "Server ini memiliki §oNo Chat Reports§r atau cara lain yang membuat semua chatnya aman.",
+ "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.OLD_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.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 3a7def2..ca98616 100644
--- a/src/main/resources/assets/nochatreports/lang/it_it.json
+++ b/src/main/resources/assets/nochatreports/lang/it_it.json
@@ -3,12 +3,12 @@
"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.OLD_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.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.OLD_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.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 9812335..0b9156c 100644
--- a/src/main/resources/assets/nochatreports/lang/ko_kr.json
+++ b/src/main/resources/assets/nochatreports/lang/ko_kr.json
@@ -3,11 +3,11 @@
"gui.nochatreports.secure_chat": "확인할 서명이 없기 때문에 이 설정은 No Chat Reports와 작동하지 않습니다.",
"gui.nochatreports.no_reporting": "이 서버는 No Chat Reports에 의해 신고가 비활성화되어있습니다.",
"disconnect.nochatreports.client": "이 서버는 No Chat Reports가 없으며 서버에 필요하도록 설정되어 있습니다.",
- "gui.nochatreports.OLD_status_secure": "이 서버는 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.OLD_status_undefined": "No Chat Reports는 이 서버의 안전성을 평가할 수 없습니다. 이것은 발생해서는 안됩니다. 모드 개발자에게 버그로 보고해주세요.",
+ "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 018ac85..9220d2c 100644
--- a/src/main/resources/assets/nochatreports/lang/nl_nl.json
+++ b/src/main/resources/assets/nochatreports/lang/nl_nl.json
@@ -2,10 +2,10 @@
"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.OLD_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.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.OLD_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.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 1d1e196..4afc9d8 100644
--- a/src/main/resources/assets/nochatreports/lang/pl_pl.json
+++ b/src/main/resources/assets/nochatreports/lang/pl_pl.json
@@ -3,14 +3,14 @@
"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 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.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.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.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.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.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.status_signing_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.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.",
@@ -59,7 +59,7 @@
"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": "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.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ć",
diff --git a/src/main/resources/assets/nochatreports/lang/pt_br.json b/src/main/resources/assets/nochatreports/lang/pt_br.json
index 03ba892..70b19cd 100644
--- a/src/main/resources/assets/nochatreports/lang/pt_br.json
+++ b/src/main/resources/assets/nochatreports/lang/pt_br.json
@@ -3,13 +3,13 @@
"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 d6f8669..c903535 100644
--- a/src/main/resources/assets/nochatreports/lang/ro_ro.json
+++ b/src/main/resources/assets/nochatreports/lang/ro_ro.json
@@ -2,10 +2,10 @@
"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.OLD_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.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.OLD_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.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 4c025c3..6baf196 100644
--- a/src/main/resources/assets/nochatreports/lang/ru_ru.json
+++ b/src/main/resources/assets/nochatreports/lang/ru_ru.json
@@ -4,11 +4,11 @@
"gui.nochatreports.secure_chat": "Этот параметр не работает с No Chat Reports ввиду отсутствия криптографических подписей.",
"gui.nochatreports.no_reporting": "No Chat Reports защищает этот сервер от отправки жалоб.",
"disconnect.nochatreports.client": "Ваши текущие настройки требуют наличия No Chat Reports на сервере, однако здесь этот мод отсутствует.",
- "gui.nochatreports.OLD_status_secure": "Сервер либо содержит 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.OLD_status_undefined": "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 6a8f6c3..1601327 100644
--- a/src/main/resources/assets/nochatreports/lang/sk_sk.json
+++ b/src/main/resources/assets/nochatreports/lang/sk_sk.json
@@ -2,11 +2,11 @@
"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.OLD_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.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.OLD_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.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 fc20670..46bc901 100644
--- a/src/main/resources/assets/nochatreports/lang/th_th.json
+++ b/src/main/resources/assets/nochatreports/lang/th_th.json
@@ -3,12 +3,12 @@
"gui.nochatreports.secure_chat": "ตัวเลือกนี้ไม่สามารถใช้ร่วมกับ No Chat Reports ได้ เนื่องจากไม่มีลายนามให้ยืนยันตัวตนได้",
"gui.nochatreports.no_reporting": "การรายงานแช็ตถูกปิดบนเซิร์ฟเวอร์นี้ จากการป้องกันของ No Chat Reports",
"disconnect.nochatreports.client": "เซิร์ฟเวอร์นี่้ไม่มีม็อด No Chat Reports โดยเมื่อก่อนหน้านี้ คุณได้ตั้งค่าให้ตัวม็อดเองต้องมีการใช้ม็อดดังกล่าวในเซิร์ฟเวอร์",
- "gui.nochatreports.OLD_status_secure": "เซิร์ฟเวอร์นี้ไม่มีม็อด 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.OLD_status_undefined": "ม็อด No Chat Reports ไม่สามารถประเมินความปลอดภัยของเซิร์ฟเวอร์นี้ได้ ซึ่งสิ่งนี้ไม่ควรที่จะเกิดขึ้นเป็นอย่างยิ่ง เมื่อพบ โปรดรายงานปัญหานี้ในรูปแบบของบักให้กับผู้พัฒนาม็อดเพื่อทำการแก้ไขต่อไป",
+ "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 b515833..fb06244 100644
--- a/src/main/resources/assets/nochatreports/lang/tr_tr.json
+++ b/src/main/resources/assets/nochatreports/lang/tr_tr.json
@@ -2,11 +2,11 @@
"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.OLD_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.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.OLD_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.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 9709136..ef168c4 100644
--- a/src/main/resources/assets/nochatreports/lang/uk_ua.json
+++ b/src/main/resources/assets/nochatreports/lang/uk_ua.json
@@ -2,10 +2,10 @@
"gui.nochatreports.secure_chat": "Ця опція не сумісна із модом No Chat Reports, бо підписів для перевірки не буде.",
"gui.nochatreports.no_reporting": "Завдяки No Chat Reports, на цьому сервері неможливо скаржитися на повідомлення в чаті.",
"disconnect.nochatreports.client": "Цей сервер не може забезпечети можливість вільної комунікації у чаті. Ваші налаштування не дозволяють приєднуватися до таких серверів, запропонуйте адміністратору встановити No Chat Reports.",
- "gui.nochatreports.OLD_status_secure": "Цей сервер є безпечним: на ньому встановлено мод 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.OLD_status_undefined": "No Chat Reports не вдалося зробити висновок про безпечність цього серверу. Ця поведінка не нормальна та є ознакою помилки, будь ласка, повідомте автора модифікації про це.",
+ "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 d9fb4a9..a5e113d 100644
--- a/src/main/resources/assets/nochatreports/lang/zh_cn.json
+++ b/src/main/resources/assets/nochatreports/lang/zh_cn.json
@@ -3,14 +3,14 @@
"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": "此服务器没有安装 No Chat Reports,但允许发送不能被举报给 Mojang 的未签名消息。这意味着你的消息不能被举报,但其他人可以通过打开“仅显示安全的聊天”屏蔽你的消息。",
- "gui.nochatreports.status_insecure": "此服务器要求对所有聊天消息进行签名。所有签名的消息都是潜在的罪证,可能在举报中对你不利。使用聊天加密是一种防止被举报的有效方法。",
+ "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.status_realms": "这是 Realms 服务器。这里不仅无法阻止聊天举报,Mojang 还使用自动聊天监控来识别潜在的“在线危害”,并将其升级以供人类审查,无论该 Realm 的所有者是否愿意。使用聊天加密是一种有效方法。",
- "gui.nochatreports.status_unknown": "No Chat Reports 尚不确定此服务器的安全性。尝试在聊天中发送消息以进行测试。",
- "gui.nochatreports.status_undefined": "No Chat Reports 无法检测此服务器的安全性。这不该发生,请将其作为 Bug 反馈给模组开发人员。",
- "gui.nochatreports.status_signing_allowed_realms": "聊天签名始终在 Realms 上启用,因为它始终是必需的,禁用它不会带来任何好处。",
+ "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": "消息签名已禁用,因为此服务器是安全的。",
@@ -59,7 +59,7 @@
"gui.nochatreports.realms_warning.check": "不再提示",
"gui.nochatreports.realms_warning.learn_more": "了解更多",
"gui.nochatreports.signing_required.header": "警告:聊天签名要求",
- "gui.nochatreports.signing_required.contents": "该服务器要求所有聊天消息都必须签名,这意味着它们可以被举报给 Mojang,这可能会导致被禁止多人游戏。这可能意味着服务器在 server.properties 中启用了“enforce-secure-profile”,这是自 1.19.1 以来的默认设置。单击“允许签名”可启用此会话的消息签名,或单击“白名单服务器”可始终启用此服务器上的签名。",
+ "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": "取消",
diff --git a/src/main/resources/assets/nochatreports/lang/zh_tw.json b/src/main/resources/assets/nochatreports/lang/zh_tw.json
index f77c433..80f7051 100644
--- a/src/main/resources/assets/nochatreports/lang/zh_tw.json
+++ b/src/main/resources/assets/nochatreports/lang/zh_tw.json
@@ -2,10 +2,10 @@
"gui.nochatreports.secure_chat": "此選項無法與 No Chat Reports 一起使用,因為沒有可用於驗證的簽名。",
"gui.nochatreports.no_reporting": "聊天舉報在此伺服器上被禁用,由 No Chat Reports 提供。",
"disconnect.nochatreports.client": "此伺服器沒有安裝 No Chat Reports,但你已將其配置為要求在伺服器上安裝。",
- "gui.nochatreports.OLD_status_secure": "此伺服器安裝了 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.OLD_status_undefined": "No Chat Reports 無法檢測此伺服器的安全性。這不應該發生,請將此錯誤反饋給模組作者。",
+ "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": "不在此伺服器中再次顯示",