From bcff920cccfe3cfc800790fe14b0dc9ef96a61bc Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 26 Aug 2022 19:47:19 +0200 Subject: Some refactoring on new config --- .../nochatreports/config/AbstractJSONConfig.java | 88 ---------------------- .../aizistral/nochatreports/config/JSONConfig.java | 88 ++++++++++++++++++++++ .../nochatreports/config/NCRClientConfig.java | 2 +- .../nochatreports/config/NCRCommonConfig.java | 2 +- .../aizistral/nochatreports/config/NCRConfig.java | 16 ++-- 5 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 src/main/java/com/aizistral/nochatreports/config/AbstractJSONConfig.java create mode 100644 src/main/java/com/aizistral/nochatreports/config/JSONConfig.java (limited to 'src/main/java/com/aizistral') diff --git a/src/main/java/com/aizistral/nochatreports/config/AbstractJSONConfig.java b/src/main/java/com/aizistral/nochatreports/config/AbstractJSONConfig.java deleted file mode 100644 index 84f73b1..0000000 --- a/src/main/java/com/aizistral/nochatreports/config/AbstractJSONConfig.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.aizistral.nochatreports.config; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Optional; -import java.util.function.Supplier; - -import javax.annotation.Nullable; - -import com.aizistral.nochatreports.NoChatReports; -import com.google.gson.ExclusionStrategy; -import com.google.gson.FieldAttributes; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import net.fabricmc.loader.api.FabricLoader; - -public abstract class AbstractJSONConfig { - 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; - } - - @Override - public boolean shouldSkipClass(Class theClass) { - return false; - } - }).create(); - - protected final String fileName; - protected final Path filePath; - - protected AbstractJSONConfig(String file) { - this.fileName = file; - this.filePath = CONFIG_DIR.resolve(this.fileName); - } - - public Path getFile() { - return this.filePath; - } - - protected void save() { - NoChatReports.LOGGER.info("Writing config file {}...", this.fileName); - writeFile(this.fileName, this); - } - - protected static T loadConfig(Class configClass, Supplier freshInstance, String fileName) { - NoChatReports.LOGGER.info("Reading config file {}...", fileName); - return readFile(fileName, configClass).orElseGet(freshInstance); - } - - private static Optional readFile(String fileName, Class configClass) { - Path file = CONFIG_DIR.resolve(fileName); - - if (!Files.isRegularFile(file)) - return Optional.empty(); - - try (BufferedReader reader = Files.newBufferedReader(file)) { - return Optional.of(GSON.fromJson(reader, configClass)); - } catch (IOException ex) { - NoChatReports.LOGGER.fatal("Could not read config file: {}", file); - ex.printStackTrace(); - return null; - } - } - - private static void writeFile(String fileName, T config) { - Path file = CONFIG_DIR.resolve(fileName); - - try { - Files.createDirectories(file.getParent()); - try (BufferedWriter writer = Files.newBufferedWriter(file)) { - GSON.toJson(config, writer); - } - } catch (Exception ex) { - NoChatReports.LOGGER.fatal("Could not write config file: {}", file); - throw new RuntimeException(ex); - } - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java new file mode 100644 index 0000000..07d0b9a --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java @@ -0,0 +1,88 @@ +package com.aizistral.nochatreports.config; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Optional; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + +import com.aizistral.nochatreports.NoChatReports; +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import net.fabricmc.loader.api.FabricLoader; + +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() == JSONConfig.class; + } + + @Override + public boolean shouldSkipClass(Class theClass) { + return false; + } + }).create(); + + protected final String fileName; + protected final Path filePath; + + protected JSONConfig(String file) { + this.fileName = file; + this.filePath = CONFIG_DIR.resolve(this.fileName); + } + + public Path getFile() { + return this.filePath; + } + + public void saveFile() { + NoChatReports.LOGGER.info("Writing config file {}...", this.fileName); + writeFile(this.fileName, this); + } + + public static T loadConfig(Class configClass, Supplier freshInstance, String fileName) { + NoChatReports.LOGGER.info("Reading config file {}...", fileName); + return readFile(fileName, configClass).orElseGet(freshInstance); + } + + private static Optional readFile(String fileName, Class configClass) { + Path file = CONFIG_DIR.resolve(fileName); + + if (!Files.isRegularFile(file)) + return Optional.empty(); + + try (BufferedReader reader = Files.newBufferedReader(file)) { + return Optional.of(GSON.fromJson(reader, configClass)); + } catch (IOException ex) { + NoChatReports.LOGGER.fatal("Could not read config file: {}", file); + ex.printStackTrace(); + return null; + } + } + + private static void writeFile(String fileName, T config) { + Path file = CONFIG_DIR.resolve(fileName); + + try { + Files.createDirectories(file.getParent()); + try (BufferedWriter writer = Files.newBufferedWriter(file)) { + GSON.toJson(config, writer); + } + } catch (Exception ex) { + NoChatReports.LOGGER.fatal("Could not write config file: {}", file); + throw new RuntimeException(ex); + } + } + +} 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(); } } -- cgit v1.2.3