diff options
| author | Aizistral | 2022-08-30 12:42:25 +0200 |
|---|---|---|
| committer | Aizistral | 2022-08-30 12:42:25 +0200 |
| commit | d7f6da48492140f9b602c8a4e72ffdee60247e10 (patch) | |
| tree | eeca9dd5805bc74fd3152cd87ff459e56d5ad4e3 /src/main/java/com/aizistral/nochatreports | |
| parent | 86cd952ab6db39afe72da8154a00c2fa52746f66 (diff) | |
Rename config classes once more
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/config/NCRConfig.java | 12 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java (renamed from src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java) | 8 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java (renamed from src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java) | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java index 8a18f3d..5253fe1 100644 --- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java @@ -171,7 +171,7 @@ public final class ModMenuIntegration implements ModMenuApi { whitelistedServers.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NCRConfig.getClient().whitelistedServers) .setExpanded(true) .setInsertInFront(true) - .setDefaultValue(NCRClientConfig.DEFAULT_WHITELISTED_SERVERS) + .setDefaultValue(NCRConfigClient.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/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java index 450934c..d1b51ff 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java @@ -13,14 +13,14 @@ import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; public final class NCRConfig { - private static NCRCommonConfig common = null; - private static NCRClientConfig client = null; + private static NCRConfigCommon common = null; + private static NCRConfigClient client = null; private NCRConfig() { throw new IllegalStateException("Can't touch this"); } - public static NCRCommonConfig getCommon() { + public static NCRConfigCommon getCommon() { if (common == null) { load(); } @@ -29,7 +29,7 @@ public final class NCRConfig { } @Environment(EnvType.CLIENT) - public static NCRClientConfig getClient() { + public static NCRConfigClient getClient() { if (client == null) { load(); } @@ -38,10 +38,10 @@ public final class NCRConfig { } public static void load() { - common = JSONConfig.loadConfig(NCRCommonConfig.class, NCRCommonConfig::new, NCRCommonConfig.FILE_NAME); + common = JSONConfig.loadConfig(NCRConfigCommon.class, NCRConfigCommon::new, NCRConfigCommon.FILE_NAME); if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { - client = JSONConfig.loadConfig(NCRClientConfig.class, NCRClientConfig::new, NCRClientConfig.FILE_NAME); + client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME); } save(); diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java index a07c92d..4ae79cd 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java @@ -10,7 +10,7 @@ import com.aizistral.nochatreports.mixins.client.MixinToastComponent; import net.minecraft.client.multiplayer.resolver.ServerAddress; -public final class NCRClientConfig extends JSONConfig { +public final class NCRConfigClient extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Client.json"; protected static final List<String> DEFAULT_WHITELISTED_SERVERS = new ArrayList<>(); @@ -21,13 +21,13 @@ public final class NCRClientConfig extends JSONConfig { protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0; protected List<String> whitelistedServers = DEFAULT_WHITELISTED_SERVERS; - protected NCRClientConfig() { + protected NCRConfigClient() { super(FILE_NAME); } @Override - public NCRClientConfig getDefault() { - return new NCRClientConfig(); + public NCRConfigClient getDefault() { + return new NCRConfigClient(); } /** diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java index 509100f..7aa0322 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java @@ -5,7 +5,7 @@ import java.util.List; import com.google.common.base.Preconditions; -public final class NCRCommonConfig extends JSONConfig { +public final class NCRConfigCommon 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" @@ -13,13 +13,13 @@ public final class NCRCommonConfig extends JSONConfig { protected boolean demandOnClient = true, enableDebugLog = false, convertToGameMessage = false, addQueryData = true; - protected NCRCommonConfig() { + protected NCRConfigCommon() { super(FILE_NAME); } @Override - public NCRCommonConfig getDefault() { - return new NCRCommonConfig(); + public NCRConfigCommon getDefault() { + return new NCRConfigCommon(); } /** |
