summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorMODKILLER10012022-08-07 14:22:05 -0400
committerMODKILLER10012022-08-07 14:22:05 -0400
commit65bf39a5017bda114aa1743971711467683768f4 (patch)
treec27d0d98e5709f88c9693e47be5d88b7e1c6cd92 /src/main
parent2f8974e4a673cf340a9d7a1111cb7643f90f17dd (diff)
Add ability to add and remove servers in GUI
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java219
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java2
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json7
3 files changed, 120 insertions, 108 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java
index a77358a..832fd51 100644
--- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java
@@ -3,6 +3,7 @@ package com.aizistral.nochatreports;
import com.aizistral.nochatreports.core.NoReportsConfig;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
+
import me.shedaniel.clothconfig2.api.ConfigBuilder;
import me.shedaniel.clothconfig2.api.ConfigCategory;
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
@@ -20,112 +21,118 @@ public class ModMenuIntegration implements ModMenuApi {
public ConfigScreenFactory<?> getModConfigScreenFactory() {
return screen -> {
- // 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"));
-
- ConfigEntryBuilder entryBuilder = builder.entryBuilder();
-
-
- // Set an option for showServerSafety
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().showServerSafety)
- .setDefaultValue(true)
- .setTooltip(Component.translatable("option.NoChatReports.showServerSafety.tooltip"))
- .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showServerSafety = newValue)
- .build());
-
- // Set an option for hideRedChatIndicators
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.getInstance().hideRedChatIndicators)
- .setDefaultValue(true)
- .setTooltip(Component.translatable("option.NoChatReports.hideRedChatIndicators.tooltip"))
- .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideRedChatIndicators = newValue)
- .build());
-
- // Set an option for hideYellowChatIndicators
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NoReportsConfig.getInstance().hideYellowChatIndicators)
- .setDefaultValue(true)
- .setTooltip(Component.translatable("option.NoChatReports.hideYellowChatIndicators.tooltip"))
- .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideYellowChatIndicators = newValue)
- .build());
-
- // Set an option for hideGrayChatIndicators
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideGrayChatIndicators"), NoReportsConfig.getInstance().hideGrayChatIndicators)
- .setDefaultValue(true)
- .setTooltip(Component.translatable("option.NoChatReports.hideGrayChatIndicators.tooltip"))
- .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideGrayChatIndicators = newValue)
- .build());
-
- // Set an option for hideWarningToast
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NoReportsConfig.getInstance().hideWarningToast)
- .setDefaultValue(true)
- .setTooltip(Component.translatable("option.NoChatReports.hideWarningToast.tooltip"))
- .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideWarningToast = newValue)
- .build());
-
- // Set an option for alwaysHideReportButton
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.getInstance().alwaysHideReportButton)
- .setDefaultValue(false)
- .setTooltip(Component.translatable("option.NoChatReports.alwaysHideReportButton.tooltip"))
- .setSaveConsumer(newValue -> NoReportsConfig.getInstance().alwaysHideReportButton = 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
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NoReportsConfig.getInstance().disableTelemetry)
- .setDefaultValue(true)
- .setTooltip(Component.translatable("option.NoChatReports.disableTelemetry.tooltip"))
- .setSaveConsumer(newValue -> NoReportsConfig.getInstance().disableTelemetry = newValue)
- .build());
-
- // Set an option for showReloadButton
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NoReportsConfig.getInstance().showReloadButton)
- .setDefaultValue(true)
- .setTooltip(Component.translatable("option.NoChatReports.showReloadButton.tooltip"))
- .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();
- NoReportsConfig.loadConfig();
- });
-
-
- return builder.build();
+ // 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"));
+
+ ConfigEntryBuilder entryBuilder = builder.entryBuilder();
+
+ // Set an option for showServerSafety
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().showServerSafety)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.showServerSafety.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showServerSafety = newValue)
+ .build());
+
+ // Set an option for hideRedChatIndicators
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.getInstance().hideRedChatIndicators)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.hideRedChatIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideRedChatIndicators = newValue)
+ .build());
+
+ // Set an option for hideYellowChatIndicators
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NoReportsConfig.getInstance().hideYellowChatIndicators)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.hideYellowChatIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideYellowChatIndicators = newValue)
+ .build());
+
+ // Set an option for hideGrayChatIndicators
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideGrayChatIndicators"), NoReportsConfig.getInstance().hideGrayChatIndicators)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.hideGrayChatIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideGrayChatIndicators = newValue)
+ .build());
+
+ // Set an option for hideWarningToast
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NoReportsConfig.getInstance().hideWarningToast)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.hideWarningToast.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideWarningToast = newValue)
+ .build());
+
+ // Set an option for alwaysHideReportButton
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.getInstance().alwaysHideReportButton)
+ .setDefaultValue(false)
+ .setTooltip(Component.translatable("option.NoChatReports.alwaysHideReportButton.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().alwaysHideReportButton = 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
+ technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NoReportsConfig.getInstance().disableTelemetry)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.disableTelemetry.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().disableTelemetry = newValue)
+ .build());
+
+ // Set an option for showReloadButton
+ technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NoReportsConfig.getInstance().showReloadButton)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.showReloadButton.tooltip"))
+ .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());
+
+ // Add or remove whitelisted servers
+ whitelistedServers.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NoReportsConfig.getInstance().whitelistedServers)
+ .setExpanded(true)
+ .setInsertInFront(true)
+ .setTooltip(Component.translatable("option.NoChatReports.whitelistedServers.tooltip"))
+ .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip"))
+ .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistedServers = newValue)
+ .build());
+
+ // Save config
+ builder.setSavingRunnable(() -> {
+ NoReportsConfig.saveConfig();
+ NoReportsConfig.loadConfig();
+ });
+ return builder.build();
};
}
-
-
} \ No newline at end of file
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
index 60993ec..fd48230 100644
--- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
@@ -45,7 +45,7 @@ public class NoReportsConfig {
hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true,
alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true,
whitelistAllServers = false;
- private List<String> whitelistedServers;
+ public List<String> whitelistedServers;
public static NoReportsConfig getInstance() {
if (INSTANCE == null) {
diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json
index 5bbdaea..621e66c 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -15,6 +15,7 @@
"configuration.NoChatReports.config": "No Chat Reports",
"configuration.NoChatReports.category.visual": "Visual",
"configuration.NoChatReports.category.technical": "Technical",
+ "configuration.NoChatReports.category.whitelistedServers": "Whitelisted servers",
"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",
@@ -38,5 +39,9 @@
"option.NoChatReports.showReloadButton":"Show reload button",
"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."
+ "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.",
+ "option.NoChatReports.whitelistedServers":"Whitelisted servers",
+ "option.NoChatReports.whitelistedServers.tooltip":"Current list of whitelisted unsafe servers.\nUsed on client to remember which servers user disabled unsafety warnings for.",
+ "option.NoChatReports.whitelistedServers.addButtonTooltip":"Add server",
+ "option.NoChatReports.whitelistedServers.removeButtonTooltip":"Remove server"
} \ No newline at end of file