From be19582129e14100719fb5ba1e663dc95fedb848 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 26 Aug 2022 20:56:37 +0200 Subject: Relocate `DEFAULT_WHITELISTED_SERVERS` --- .../com/aizistral/nochatreports/config/ModMenuIntegration.java | 3 +-- .../java/com/aizistral/nochatreports/config/NCRClientConfig.java | 4 +++- .../java/com/aizistral/nochatreports/config/NCRCommonConfig.java | 9 ++++++++- 3 files changed, 12 insertions(+), 4 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 a3abcfd..d42864f 100644 --- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java @@ -27,7 +27,6 @@ import net.minecraft.network.chat.HoverEvent; @Environment(EnvType.CLIENT) public final class ModMenuIntegration implements ModMenuApi { - private static final List DEFAULT_WHITELISTED_SERVERS = new ArrayList<>(); private Component[] makeTooltip(String key) { String localized = Language.getInstance().getOrDefault(key); @@ -159,7 +158,7 @@ public final class ModMenuIntegration implements ModMenuApi { whitelistedServers.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NCRConfig.getClient().whitelistedServers) .setExpanded(true) .setInsertInFront(true) - .setDefaultValue(DEFAULT_WHITELISTED_SERVERS) + .setDefaultValue(NCRClientConfig.DEFAULT_WHITELISTED_SERVERS) .setTooltip(this.makeTooltip("option.NoChatReports.whitelistedServers.tooltip")) .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip")) .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip")) diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java index adb3d36..004ef83 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java @@ -12,11 +12,13 @@ import net.minecraft.client.multiplayer.resolver.ServerAddress; public final class NCRClientConfig extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Client.json"; + protected static final List DEFAULT_WHITELISTED_SERVERS = new ArrayList<>(); + protected boolean demandOnServer = false, showServerSafety = true, hideRedChatIndicators = true, hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, whitelistAllServers = false; - protected List whitelistedServers = new ArrayList<>(); + protected List whitelistedServers = DEFAULT_WHITELISTED_SERVERS; protected NCRClientConfig() { super(FILE_NAME); diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java index 3491f0d..65bbfc6 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java @@ -1,8 +1,15 @@ package com.aizistral.nochatreports.config; +import java.util.ArrayList; +import java.util.List; + +import com.google.common.base.Preconditions; + public final class NCRCommonConfig extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Common.json"; - protected String demandOnClientMessage = "You do not have No Chat Reports, and this server is configured to require it on client!"; + + protected String demandOnClientMessage = "You do not have No Chat Reports, and this server is" + + " configured to require it on client!"; protected boolean demandOnClient = true, enableDebugLog = false, convertToGameMessage = false, addQueryData = true; -- cgit v1.2.3