From 087b36279fdf31621fffeb329ab51dd5f65c0363 Mon Sep 17 00:00:00 2001 From: Madis Otenurm Date: Sun, 4 Dec 2022 12:15:31 +0200 Subject: Reorganize config options (#284) * Reorder options * Reorder strings * No more TODO * Fix weird spacing * showEncryptionIndicators * Better defaults * 1.19.3-pre3 + cloth config * Update gradle.properties--- .../nochatreports/config/ModMenuIntegration.java | 182 +++++++++++---------- .../nochatreports/config/NCRConfigClient.java | 10 +- .../nochatreports/config/NCRConfigCommon.java | 4 +- 3 files changed, 107 insertions(+), 89 deletions(-) (limited to 'src/main/java') 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); -- cgit v1.2.3