summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java182
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java4
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json67
4 files changed, 143 insertions, 120 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
index 86275ae..61aa605 100644
--- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
@@ -43,166 +43,205 @@ public final class ModMenuIntegration implements ModMenuApi {
public ConfigScreenFactory<?> getModConfigScreenFactory() {
return screen -> {
- // TODO Sort config options into client and common instead of visual and technical
-
// Get the previous screen
ConfigBuilder builder = ConfigBuilder.create()
.setParentScreen(Minecraft.getInstance().screen)
.setTitle(Component.translatable("configuration.NoChatReports.config"));
// Set category
- ConfigCategory visual = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.visual"));
- ConfigCategory technical = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.technical"));
- ConfigCategory whitelistedServers = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.whitelistedServers"));
- ConfigCategory lanOptions = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lanOptions"));
+ ConfigCategory client = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.client"));
+ ConfigCategory lan = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lan"));
+ ConfigCategory whitelist = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.whitelist"));
ConfigEntryBuilder entryBuilder = builder.entryBuilder();
- // Set an option for showServerSafety
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NCRConfig.getClient().showServerSafety)
+ // Set an option for enableMod
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod)
.setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.showServerSafety.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().showServerSafety = newValue)
+ .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip"))
+ .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() -> {
+ NCRConfig.getClient().enableMod = newValue;
+ NCRConfig.getClient().saveFile();
+ }))
.build());
- // Add link for documentation for showServerSafety
- visual.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.moreInfo")
- .withStyle(s -> s
- .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.translatable("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))).withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))))
+ // Set an option for showNCRButton
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showNCRButton"), NCRConfig.getClient().showNCRButton)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showNCRButton.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().showNCRButton = newValue)
+ .build());
+
+ // Set an option for showReloadButton
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NCRConfig.getClient().showReloadButton)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showReloadButton.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().showReloadButton = newValue)
.build());
// Set an option for verifiedIconEnabled
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.verifiedIconEnabled"), NCRConfig.getClient().verifiedIconEnabled)
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.verifiedIconEnabled"), NCRConfig.getClient().verifiedIconEnabled)
.setDefaultValue(true)
.setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconEnabled.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconEnabled = newValue)
.build());
// Set an option for verifiedIconOffsetX
- visual.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetX"), NCRConfig.getClient().verifiedIconOffsetX)
+ client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetX"), NCRConfig.getClient().verifiedIconOffsetX)
.setDefaultValue(0)
.setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetX.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetX = newValue)
.build());
// Set an option for verifiedIconOffsetY
- visual.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetY"), NCRConfig.getClient().verifiedIconOffsetY)
+ client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetY"), NCRConfig.getClient().verifiedIconOffsetY)
.setDefaultValue(0)
.setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetY.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetY = newValue)
.build());
+ // Warning for showEncryptionButton
+ client.addEntry(entryBuilder.startTextDescription(Component.translatable("gui.NoChatReports.showEncryptionButtonWarning"))
+ .build());
+
+ // Set an option for showEncryptionButton
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionButton"), NCRConfig.getEncryption().showEncryptionButton)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionButton.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionButton = newValue)
+ .build());
+
+ // Set an option for showEncryptionIndicators
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionIndicators"), NCRConfig.getEncryption().showEncryptionIndicators)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionIndicators = newValue)
+ .build());
+
+ // Set an option for showServerSafety
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NCRConfig.getClient().showServerSafety)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showServerSafety.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().showServerSafety = newValue)
+ .build());
+
+ // Add link for documentation for showServerSafety
+ client.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.moreInfo")
+ .withStyle(s -> s
+ .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.translatable("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))).withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))))
+ .build());
+
// Set an option for hideInsecureMessageIndicators
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideInsecureMessageIndicators"), NCRConfig.getClient().hideInsecureMessageIndicators)
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideInsecureMessageIndicators"), NCRConfig.getClient().hideInsecureMessageIndicators)
.setDefaultValue(true)
.setTooltip(this.makeTooltip("option.NoChatReports.hideInsecureMessageIndicators.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().hideInsecureMessageIndicators = newValue)
.build());
// Set an option for hideModifiedMessageIndicators
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideModifiedMessageIndicators"), NCRConfig.getClient().hideModifiedMessageIndicators)
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideModifiedMessageIndicators"), NCRConfig.getClient().hideModifiedMessageIndicators)
.setDefaultValue(true)
.setTooltip(this.makeTooltip("option.NoChatReports.hideModifiedMessageIndicators.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().hideModifiedMessageIndicators = newValue)
.build());
// Set an option for hideSystemMessageIndicators
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSystemMessageIndicators"), NCRConfig.getClient().hideSystemMessageIndicators)
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSystemMessageIndicators"), NCRConfig.getClient().hideSystemMessageIndicators)
.setDefaultValue(true)
.setTooltip(this.makeTooltip("option.NoChatReports.hideSystemMessageIndicators.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().hideSystemMessageIndicators = newValue)
.build());
// Set an option for hideWarningToast
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NCRConfig.getClient().hideWarningToast)
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NCRConfig.getClient().hideWarningToast)
.setDefaultValue(true)
.setTooltip(this.makeTooltip("option.NoChatReports.hideWarningToast.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().hideWarningToast = newValue)
.build());
+ // Set an option for hideSigningRequestMessage
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSigningRequestMessage"), NCRConfig.getClient().hideSigningRequestMessage)
+ .setDefaultValue(false)
+ .setTooltip(this.makeTooltip("option.NoChatReports.hideSigningRequestMessage.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().hideSigningRequestMessage = newValue)
+ .build());
+
// Set an option for alwaysHideReportButton
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NCRConfig.getClient().alwaysHideReportButton)
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NCRConfig.getClient().alwaysHideReportButton)
.setDefaultValue(false)
.setTooltip(this.makeTooltip("option.NoChatReports.alwaysHideReportButton.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().alwaysHideReportButton = newValue)
.build());
// Set an option for demandOnServer
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NCRConfig.getClient().demandOnServer)
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NCRConfig.getClient().demandOnServer)
.setDefaultValue(false)
.setTooltip(this.makeTooltip("option.NoChatReports.demandOnServer.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().demandOnServer = newValue)
.build());
// Set an option for enableDebugLog
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NCRConfig.getCommon().enableDebugLog)
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NCRConfig.getCommon().enableDebugLog)
.setDefaultValue(false)
.setTooltip(this.makeTooltip("option.NoChatReports.enableDebugLog.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getCommon().enableDebugLog = newValue)
.build());
// Set an option for disableTelemetry
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NCRConfig.getClient().disableTelemetry)
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NCRConfig.getClient().disableTelemetry)
.setDefaultValue(true)
.setTooltip(this.makeTooltip("option.NoChatReports.disableTelemetry.tooltip"))
.setSaveConsumer(newValue -> NCRConfig.getClient().disableTelemetry = newValue)
.build());
- // Set an option for showReloadButton
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NCRConfig.getClient().showReloadButton)
- .setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.showReloadButton.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().showReloadButton = newValue)
- .build());
-
- // Set an option for whitelistAllServers
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NCRConfig.getClient().whitelistAllServers)
+ // Set an option for demandOnClient
+ lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NCRConfig.getCommon().demandOnClient)
.setDefaultValue(false)
- .setTooltip(this.makeTooltip("option.NoChatReports.whitelistAllServers.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().whitelistAllServers = newValue)
+ .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClient.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClient = newValue)
.build());
- // Set an option for skipSigningWarning
- technical.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)
+ // Set an option for demandOnClientMessage
+ lan.addEntry(entryBuilder.startStrField(Component.translatable("option.NoChatReports.demandOnClientMessage"), NCRConfig.getCommon().demandOnClientMessage)
+ .setDefaultValue(NCRConfig.getCommon().demandOnClientMessage)
+ .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClientMessage.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClientMessage = newValue)
.build());
- // Set an option for showNCRButton
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showNCRButton"), NCRConfig.getClient().showNCRButton)
+ // Set an option for convertToGameMessage
+ lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NCRConfig.getCommon().convertToGameMessage)
.setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.showNCRButton.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().showNCRButton = newValue)
+ .setTooltip(this.makeTooltip("option.NoChatReports.convertToGameMessage.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getCommon().convertToGameMessage = newValue)
.build());
- // Set an option for enableMod
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod)
+ // Set an option for addQueryData
+ lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.addQueryData"), NCRConfig.getCommon().addQueryData)
.setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip"))
- .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() -> {
- NCRConfig.getClient().enableMod = newValue;
- NCRConfig.getClient().saveFile();
- }))
+ .setTooltip(this.makeTooltip("option.NoChatReports.addQueryData.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getCommon().addQueryData = newValue)
.build());
- // Warning for showEncryptionButton
- technical.addEntry(entryBuilder.startTextDescription(Component.translatable("gui.NoChatReports.showEncryptionButtonWarning"))
+ // 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 showEncryptionButton
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionButton"), NCRConfig.getEncryption().showEncryptionButton)
- .setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionButton.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionButton = newValue)
+ // 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
- whitelistedServers.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.whitelistedServers.instructions"))
+ whitelist.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.whitelistedServers.instructions"))
.build());
// Add or remove whitelisted servers
- whitelistedServers.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NCRConfig.getServerWhitelist().whitelistedServers)
+ whitelist.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NCRConfig.getServerWhitelist().whitelistedServers)
.setExpanded(true)
.setInsertInFront(true)
.setDefaultValue(NCRServerWhitelist.DEFAULT_WHITELISTED_SERVERS)
@@ -213,27 +252,6 @@ public final class ModMenuIntegration implements ModMenuApi {
.setCreateNewInstance(baseListEntry -> new StringListListEntry.StringListCell(Language.getInstance().getOrDefault(("option.NoChatReports.whitelistedServers.serverAddress")), baseListEntry))
.build());
- // Set an option for demandOnClient
- lanOptions.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NCRConfig.getCommon().demandOnClient)
- .setDefaultValue(false)
- .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClient.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClient = newValue)
- .build());
-
- // Set an option for convertToGameMessage
- lanOptions.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NCRConfig.getCommon().convertToGameMessage)
- .setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.convertToGameMessage.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getCommon().convertToGameMessage = newValue)
- .build());
-
- // Set an option for addQueryData
- lanOptions.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.addQueryData"), NCRConfig.getCommon().addQueryData)
- .setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.addQueryData.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getCommon().addQueryData = newValue)
- .build());
-
// Save config
builder.setSavingRunnable(NCRConfig::save);
return builder.build();
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
index 936f523..b1e2fe8 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
@@ -7,11 +7,11 @@ import com.aizistral.nochatreports.mixins.client.MixinToastComponent;
public final class NCRConfigClient extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Client.json";
- protected boolean demandOnServer = false, showServerSafety = true, hideInsecureMessageIndicators = true,
- hideModifiedMessageIndicators = true, hideSystemMessageIndicators = true, hideWarningToast = true,
- alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true,
- whitelistAllServers = false, verifiedIconEnabled = true, showNCRButton = true,
- enableMod = true, skipRealmsWarning = false, hideSigningRequestMessage = false, skipSigningWarning = false;
+ 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 int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0;
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
index 6f6ee3c..38df30e 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
@@ -5,8 +5,8 @@ public final class NCRConfigCommon extends JSONConfig {
protected String demandOnClientMessage = "You do not have No Chat Reports, and this server is"
+ " configured to require it on client!";
- protected boolean demandOnClient = false, enableDebugLog = false, convertToGameMessage = true,
- addQueryData = true;
+ protected boolean demandOnClient = false, convertToGameMessage = true,
+ addQueryData = true, enableDebugLog = false;
protected NCRConfigCommon() {
super(FILE_NAME);
diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json
index 005d740..3672021 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -67,16 +67,27 @@
"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.",
"configuration.NoChatReports.config": "No Chat Reports",
- "configuration.NoChatReports.category.visual": "Visual",
- "option.NoChatReports.showServerSafety": "Show server safety",
- "option.NoChatReports.showServerSafety.tooltip": "Allows the client to display server safety status in bottom-right corner of chat screen. The icon is hoverable for additional information.",
- "option.NoChatReports.showServerSafety.moreInfo": "§bClick here to read more about server safety levels",
+ "configuration.NoChatReports.category.client": "Client",
+ "option.NoChatReports.enableMod": "Enable mod",
+ "option.NoChatReports.enableMod.tooltip": "Responsible for enabling most of the mod's client-sided functionality. Will require re-joining the server to take effect if toggled mid-session.",
+ "option.NoChatReports.showNCRButton": "Show NCR button",
+ "option.NoChatReports.showNCRButton.tooltip": "Adds a button that toggles most of the mod's client-sided functionality to multiplayer menu.",
+ "option.NoChatReports.showReloadButton": "Show reload button",
+ "option.NoChatReports.showReloadButton.tooltip": "Adds a button for config reloading to multiplayer menu.",
"option.NoChatReports.verifiedIconEnabled": "Verified icon enabled",
"option.NoChatReports.verifiedIconEnabled.tooltip": "Allows the mod to display special icon in multiplayer menu for servers that have No Chat Reports or some other anti-chat-reporting measures installed.",
"option.NoChatReports.verifiedIconOffsetX": "Verified icon X-offset",
"option.NoChatReports.verifiedIconOffsetX.tooltip": "Defines X-axis offset for rendering of \"Safe Server\" icon.",
"option.NoChatReports.verifiedIconOffsetY": "Verified icon Y-offset",
"option.NoChatReports.verifiedIconOffsetY.tooltip": "Defines Y-axis offset for rendering of \"Safe Server\" icon.",
+ "gui.NoChatReports.showEncryptionButtonWarning": "§cBelow does not disable encryption, it only hides the button!",
+ "option.NoChatReports.showEncryptionButton": "Show encryption button",
+ "option.NoChatReports.showEncryptionButton.tooltip": "Setting this to false will simply prevent encryption button from being displayed in the chat screen. Be aware that encryption itself will not be automatically disabled along with the button.",
+ "option.NoChatReports.showEncryptionIndicators": "Show encryption indicators",
+ "option.NoChatReports.showEncryptionIndicators.tooltip": "Toggles the display of the encrypted message indicators, in the form of a purple bar to the left and and §5§l(§r§5ȯ§5§l)§r on hover to the right of the chat message",
+ "option.NoChatReports.showServerSafety": "Show server safety",
+ "option.NoChatReports.showServerSafety.tooltip": "Allows the client to display server safety status in bottom-right corner of chat screen. The icon is hoverable for additional information.",
+ "option.NoChatReports.showServerSafety.moreInfo": "§bClick here to read more about server safety levels",
"option.NoChatReports.hideInsecureMessageIndicators": "Hide unverified message indicators",
"option.NoChatReports.hideInsecureMessageIndicators.tooltip": "Prevents the client from displaying unverified message indicators, in the form of a gray bar to the left of the chat message.",
"option.NoChatReports.hideModifiedMessageIndicators": "Hide modified message indicators",
@@ -85,25 +96,36 @@
"option.NoChatReports.hideSystemMessageIndicators.tooltip": "Prevents the client from displaying system message indicators, in the form of a gray bar to the left of the chat message.",
"option.NoChatReports.hideWarningToast": "Hide warning toast",
"option.NoChatReports.hideWarningToast.tooltip": "Removes a warning toast that is displayed when entering servers with disabled §oenforce-secure-profile§r.",
+ "option.NoChatReports.hideSigningRequestMessage": "Hide signing request message",
+ "option.NoChatReports.hideSigningRequestMessage.tooltip": "Hides the chat message that is shown when the server requests the client to sign messages.",
"option.NoChatReports.alwaysHideReportButton": "Always hide report button",
"option.NoChatReports.alwaysHideReportButton.tooltip": "Prevents the client from ever showing report button in Social Interactions screen. This is disabled by default, and mod simply makes button inactive on servers that have No Chat Reports installed, adding an explanation to the tooltip of the button.",
- "configuration.NoChatReports.category.technical": "Technical",
"option.NoChatReports.demandOnServer": "Demand on server",
"option.NoChatReports.demandOnServer.tooltip": "Prevents the client from joining servers that don't have No Chat Reports installed.",
"option.NoChatReports.enableDebugLog": "Enable debug log",
"option.NoChatReports.enableDebugLog.tooltip": "Enables logging of certain debug information. This is generally useless for non-developers.",
"option.NoChatReports.disableTelemetry": "Disable telemetry",
"option.NoChatReports.disableTelemetry.tooltip": "Allows the mod to disable built-in telemetry, similar to how No Telemetry does.",
- "option.NoChatReports.showReloadButton": "Show reload button",
- "option.NoChatReports.showReloadButton.tooltip": "Adds a button for config reloading to multiplayer menu.",
- "option.NoChatReports.whitelistAllServers": "Whitelist all servers",
- "option.NoChatReports.whitelistAllServers.tooltip": "Makes the mod behave as if all servers were added to §oWhitelisted Servers§r list.",
+ "configuration.NoChatReports.category.lan": "LAN",
+ "option.NoChatReports.demandOnClient": "Demand on client",
+ "option.NoChatReports.demandOnClient.tooltip": "Makes the server require all joining clients to have No Chat Reports installed.",
+ "option.NoChatReports.demandOnClientMessage": "Demand on client kick message",
+ "option.NoChatReports.demandOnClientMessage.tooltip": "Message that is displayed to the client when it tries to join the server without having No Chat Reports installed.",
+ "option.NoChatReports.convertToGameMessage": "Convert to game message",
+ "option.NoChatReports.convertToGameMessage.tooltip": "Makes the server convert all player messages into system messages. System messages don't have any signatures attached and cannot be reported; on unmodified clients they will display with gray bar to the left.",
+ "option.NoChatReports.addQueryData": "Add query data",
+ "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.showNCRButton": "Show NCR button",
- "option.NoChatReports.showNCRButton.tooltip": "Adds a button that toggles most of the mod's client-sided functionality to multiplayer menu.",
- "option.NoChatReports.enableMod": "Enable mod",
- "option.NoChatReports.enableMod.tooltip": "Responsible for enabling most of the mod's client-sided functionality. Will require re-joining the server to take effect if toggled mid-session.",
+ "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",
@@ -111,22 +133,5 @@
"option.NoChatReports.signingCheckDelaySeconds": "Signing check delay seconds",
"option.NoChatReports.signingCheckDelaySeconds.tooltip": "Delay for checking whether whitelisted servers still enforce chat signing, in seconds. Setting this to 0 will cause check to be performed on every login attempt, similar to non-whitelisted servers.",
"option.NoChatReports.serverSigningChecks": "Server signing checks",
- "option.NoChatReports.serverSigningChecks.tooltip": "Map of whitelisted servers to last signing enforcement check times, in epoch seconds. This typically does not have to be edited manually.",
- "option.NoChatReports.showEncryptionButton": "Show encryption button",
- "option.NoChatReports.showEncryptionButton.tooltip": "Setting this to false will simply prevent encryption button from being displayed in the chat screen. Be aware that encryption itself will not be automatically disabled along with the button.",
- "configuration.NoChatReports.category.whitelistedServers": "Whitelisted Servers",
- "option.NoChatReports.whitelistedServers": "Whitelisted Servers",
- "option.NoChatReports.whitelistedServers.tooltip": "Contains servers for which \"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.instructions": "Click the + to add a server. Click the - to remove the selected server.",
- "option.NoChatReports.whitelistedServers.serverAddress": "Click here to edit server address",
- "configuration.NoChatReports.category.lanOptions": "LAN Options",
- "option.NoChatReports.demandOnClient": "Demand on client",
- "option.NoChatReports.demandOnClient.tooltip": "Makes the server require all joining clients to have No Chat Reports installed.",
- "option.NoChatReports.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.",
- "gui.NoChatReports.showEncryptionButtonWarning": "§cBelow does not disable encryption, it only hides the button!"
+ "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."
}