From 26f9abc93b22d563fac521564d56b773853f6c79 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Sun, 7 Aug 2022 08:43:41 -0400 Subject: cleanup ModMenu code and add whitelistAllServers --- .../nochatreports/ModMenuIntegration.java | 48 +++++++++++++--------- .../resources/assets/nochatreports/lang/en_us.json | 6 ++- 2 files changed, 33 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 69ff5c6..2fd6c0a 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -30,26 +30,7 @@ public class ModMenuIntegration implements ModMenuApi { ConfigCategory technical = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.technical")); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - // Set an option for demandOnServer - technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NoReportsConfig.getInstance().demandOnServer) - .setDefaultValue(false) - .setTooltip(Component.translatable("option.NoChatReports.demandOnServer.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().demandOnServer = newValue) - .build()); - // Set an option for enableDebugLog - technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NoReportsConfig.getInstance().enableDebugLog) - .setDefaultValue(false) - .setTooltip(Component.translatable("option.NoChatReports.enableDebugLog.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().enableDebugLog = newValue) - .build()); - - // Set an option for convertToGameMessage - technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().convertToGameMessage) - .setDefaultValue(true) - .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = newValue) - .build()); // Set an option for showServerSafety visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().showServerSafety) @@ -98,6 +79,28 @@ public class ModMenuIntegration implements ModMenuApi { .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.versionEasterEgg.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().versionEasterEgg = newValue) + .build()); + + + // Set an option for demandOnServer + technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NoReportsConfig.getInstance().demandOnServer) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.demandOnServer.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().demandOnServer = newValue) + .build()); + + // Set an option for enableDebugLog + technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NoReportsConfig.getInstance().enableDebugLog) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.enableDebugLog.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().enableDebugLog = newValue) + .build()); + + // Set an option for convertToGameMessage + technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().convertToGameMessage) + .setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = newValue) .build()); // Set an option for disableTelemetry @@ -114,6 +117,13 @@ public class ModMenuIntegration implements ModMenuApi { .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showReloadButton = newValue) .build()); + // Set an option for whitelistAllServers + technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NoReportsConfig.getInstance().whitelistAllServers) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.whitelistAllServers.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = newValue) + .build()); + // Save config builder.setSavingRunnable(() -> { NoReportsConfig.saveConfig(); diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 4a1dfd9..4f94ea4 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -18,7 +18,7 @@ "option.NoChatReports.demandOnServer": "Demand on server", "option.NoChatReports.demandOnServer.tooltip": "True if client with No Chat Reports installed should demand that mod is present on every server that it tries to join.", "option.NoChatReports.enableDebugLog": "Enable debug log", - "option.NoChatReports.enableDebugLog.tooltip": "True if mod should log some additional information about its activity and message signatures. Generally only useful for debugging.", + "option.NoChatReports.enableDebugLog.tooltip": "True if mod should log some additional information about its activity and message signatures.\nGenerally only useful for debugging.", "option.NoChatReports.convertToGameMessage": "Convert to game message", "option.NoChatReports.convertToGameMessage.tooltip": "True if server should convert all player messages to system messages.", "option.NoChatReports.showServerSafety":"Show server safety", @@ -38,5 +38,7 @@ "option.NoChatReports.disableTelemetry":"Disable telemetry", "option.NoChatReports.disableTelemetry.tooltip":"True if sending telemetry to Mojang should be disabled.", "option.NoChatReports.showReloadButton":"Show reload button", - "option.NoChatReports.showReloadButton.tooltip":"True if the configuration reload button should be displayed in multiplayer screen." + "option.NoChatReports.showReloadButton.tooltip":"True if the configuration reload button should be displayed in multiplayer screen.", + "option.NoChatReports.whitelistAllServers":"Whitelist all servers", + "option.NoChatReports.whitelistAllServers.tooltip":"True if the full-screen warning should be skipped for servers that require chat signing, letting users simply join the server.\nBecause of that, servers will no longer be added to the whitelist." } \ No newline at end of file -- cgit v1.2.3