summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/JSONConfig.java (renamed from src/main/java/com/aizistral/nochatreports/config/AbstractJSONConfig.java)12
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfig.java16
4 files changed, 16 insertions, 16 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/config/AbstractJSONConfig.java b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
index 84f73b1..07d0b9a 100644
--- a/src/main/java/com/aizistral/nochatreports/config/AbstractJSONConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
@@ -19,13 +19,13 @@ import com.google.gson.GsonBuilder;
import net.fabricmc.loader.api.FabricLoader;
-public abstract class AbstractJSONConfig {
+public abstract class JSONConfig {
protected static final Path CONFIG_DIR = FabricLoader.getInstance().getConfigDir();
protected static final Gson GSON = new GsonBuilder().setPrettyPrinting()
.setExclusionStrategies(new ExclusionStrategy() {
@Override
public boolean shouldSkipField(FieldAttributes field) {
- return field.getDeclaringClass() == AbstractJSONConfig.class;
+ return field.getDeclaringClass() == JSONConfig.class;
}
@Override
@@ -37,7 +37,7 @@ public abstract class AbstractJSONConfig {
protected final String fileName;
protected final Path filePath;
- protected AbstractJSONConfig(String file) {
+ protected JSONConfig(String file) {
this.fileName = file;
this.filePath = CONFIG_DIR.resolve(this.fileName);
}
@@ -46,17 +46,17 @@ public abstract class AbstractJSONConfig {
return this.filePath;
}
- protected void save() {
+ public void saveFile() {
NoChatReports.LOGGER.info("Writing config file {}...", this.fileName);
writeFile(this.fileName, this);
}
- protected static <T extends AbstractJSONConfig> T loadConfig(Class<T> configClass, Supplier<T> freshInstance, String fileName) {
+ public static <T extends JSONConfig> T loadConfig(Class<T> configClass, Supplier<T> freshInstance, String fileName) {
NoChatReports.LOGGER.info("Reading config file {}...", fileName);
return readFile(fileName, configClass).orElseGet(freshInstance);
}
- private static <T extends AbstractJSONConfig> Optional<T> readFile(String fileName, Class<T> configClass) {
+ private static <T extends JSONConfig> Optional<T> readFile(String fileName, Class<T> configClass) {
Path file = CONFIG_DIR.resolve(fileName);
if (!Files.isRegularFile(file))
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java
index ea1bc9a..de7f739 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRClientConfig.java
@@ -10,7 +10,7 @@ import com.aizistral.nochatreports.mixins.client.MixinToastComponent;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
-public final class NCRClientConfig extends AbstractJSONConfig {
+public final class NCRClientConfig extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Client.json";
protected boolean demandOnServer = false, showServerSafety = true, hideRedChatIndicators = true,
hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true,
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java
index e9ad0a5..cbb724d 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRCommonConfig.java
@@ -10,7 +10,7 @@ import com.aizistral.nochatreports.mixins.client.MixinToastComponent;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
-public final class NCRCommonConfig extends AbstractJSONConfig {
+public final class NCRCommonConfig extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Common.json";
protected boolean demandOnClient = true, enableDebugLog = false, convertToGameMessage = false,
addQueryData = true;
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
index 9d7c7e7..13ce2a8 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
@@ -15,7 +15,7 @@ public final class NCRConfig {
throw new IllegalStateException("Can't touch this");
}
- public static AbstractJSONConfig getCommon() {
+ public static JSONConfig getCommon() {
if (common == null) {
load();
}
@@ -24,7 +24,7 @@ public final class NCRConfig {
}
@Environment(EnvType.CLIENT)
- public static AbstractJSONConfig getClient() {
+ public static JSONConfig getClient() {
if (client == null) {
load();
}
@@ -33,20 +33,20 @@ public final class NCRConfig {
}
public static void load() {
- common = AbstractJSONConfig.loadConfig(NCRCommonConfig.class, NCRCommonConfig::new, NCRCommonConfig.FILE_NAME);
- common.save();
+ common = JSONConfig.loadConfig(NCRCommonConfig.class, NCRCommonConfig::new, NCRCommonConfig.FILE_NAME);
+ common.saveFile();
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
- client = AbstractJSONConfig.loadConfig(NCRClientConfig.class, NCRClientConfig::new, NCRClientConfig.FILE_NAME);
- client.save();
+ client = JSONConfig.loadConfig(NCRClientConfig.class, NCRClientConfig::new, NCRClientConfig.FILE_NAME);
+ client.saveFile();
}
}
public static void save() {
- Objects.requireNonNull(common, "Cannot save config because it was not loaded!").save();
+ Objects.requireNonNull(common, "Cannot save config because it was not loaded!").saveFile();
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
- Objects.requireNonNull(client, "Cannot save config because it was not loaded!").save();
+ Objects.requireNonNull(client, "Cannot save config because it was not loaded!").saveFile();
}
}