From 428bb5d412b66cda37d6f2199e81d0cb81a8bb96 Mon Sep 17 00:00:00 2001 From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com> Date: Sun, 20 Feb 2022 15:50:05 +0100 Subject: profile system --- .../java/io/polyfrost/oneconfig/OneConfig.java | 9 ++- .../oneconfig/config/OneConfigConfig.java | 44 ++++++++++++ .../oneconfig/config/core/ConfigCore.java | 14 ++++ .../oneconfig/config/interfaces/Config.java | 61 +++++++++------- .../config/interfaces/OneConfigTypeAdapter.java | 2 +- .../oneconfig/config/profiles/Profiles.java | 84 ++++++++++++++++++++++ .../io/polyfrost/oneconfig/test/TestConfig.java | 4 +- 7 files changed, 187 insertions(+), 31 deletions(-) create mode 100644 src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java create mode 100644 src/main/java/io/polyfrost/oneconfig/config/profiles/Profiles.java (limited to 'src/main/java/io/polyfrost/oneconfig') diff --git a/src/main/java/io/polyfrost/oneconfig/OneConfig.java b/src/main/java/io/polyfrost/oneconfig/OneConfig.java index 9d6ed49..1b90f6b 100644 --- a/src/main/java/io/polyfrost/oneconfig/OneConfig.java +++ b/src/main/java/io/polyfrost/oneconfig/OneConfig.java @@ -1,7 +1,9 @@ package io.polyfrost.oneconfig; import io.polyfrost.oneconfig.command.OneConfigCommand; -import io.polyfrost.oneconfig.renderer.Renderer; +import io.polyfrost.oneconfig.config.OneConfigConfig; +import io.polyfrost.oneconfig.config.core.ConfigCore; +import io.polyfrost.oneconfig.config.profiles.Profiles; import io.polyfrost.oneconfig.test.TestConfig; import io.polyfrost.oneconfig.themes.Themes; import net.minecraft.client.Minecraft; @@ -19,17 +21,20 @@ public class OneConfig { public static File jarFile; public static File oneConfigDir = new File(mc.mcDataDir, "OneConfig/"); public static File themesDir = new File(oneConfigDir, "themes/"); - public static TestConfig config = new TestConfig(); + public static OneConfigConfig config; + public static TestConfig testConfig; @Mod.EventHandler public void onPreFMLInit(FMLPreInitializationEvent event) { jarFile = event.getSourceFile(); oneConfigDir.mkdirs(); themesDir.mkdirs(); + config = new OneConfigConfig(); } @Mod.EventHandler public void onFMLInitialization(FMLInitializationEvent event) { + testConfig = new TestConfig(); ClientCommandHandler.instance.registerCommand(new OneConfigCommand()); MinecraftForge.EVENT_BUS.register(this); Themes.openTheme(new File("OneConfig/themes/one.zip").getAbsoluteFile()); diff --git a/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java b/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java new file mode 100644 index 0000000..de9bf92 --- /dev/null +++ b/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java @@ -0,0 +1,44 @@ +package io.polyfrost.oneconfig.config; + +import com.google.gson.JsonParser; +import io.polyfrost.oneconfig.config.data.ModData; +import io.polyfrost.oneconfig.config.interfaces.Config; + +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; + +public class OneConfigConfig extends Config { + public OneConfigConfig() { + super(null, "OneConfig.json"); + } + + @Override + public void init(ModData modData) { + if (new File("OneConfig/" + configFile).exists()) + load(); + else + save(); + } + + @Override + public void save() { + try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream("OneConfig/" + configFile), StandardCharsets.UTF_8))) { + writer.write(gson.toJson(this.getClass())); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void load() { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("OneConfig/" + configFile), StandardCharsets.UTF_8))) { + deserializePart(new JsonParser().parse(reader).getAsJsonObject(), this.getClass()); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static HashMap profiles = new HashMap<>(); + public static String currentProfile; +} diff --git a/src/main/java/io/polyfrost/oneconfig/config/core/ConfigCore.java b/src/main/java/io/polyfrost/oneconfig/config/core/ConfigCore.java index ff7ed28..1e0940b 100644 --- a/src/main/java/io/polyfrost/oneconfig/config/core/ConfigCore.java +++ b/src/main/java/io/polyfrost/oneconfig/config/core/ConfigCore.java @@ -8,4 +8,18 @@ import java.util.HashMap; public class ConfigCore { public static HashMap> settings = new HashMap<>(); + + public static void saveAll () { + for (ModData modData : settings.keySet()) { + modData.config.save(); + } + } + + public static void reInitAll () { + ArrayList data = new ArrayList<>(settings.keySet()); + settings.clear(); + for (ModData modData : data) { + modData.config.init(modData); + } + } } diff --git a/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java b/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java index f592152..73696a5 100644 --- a/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java +++ b/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java @@ -4,6 +4,7 @@ import com.google.gson.*; import io.polyfrost.oneconfig.config.annotations.*; import io.polyfrost.oneconfig.config.core.ConfigCore; import io.polyfrost.oneconfig.config.data.ModData; +import io.polyfrost.oneconfig.config.profiles.Profiles; import io.polyfrost.oneconfig.gui.elements.config.*; import java.io.*; @@ -11,20 +12,26 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Arrays; import java.util.Map; +import java.util.Optional; public class Config { - private final File configFile; - private final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).setPrettyPrinting() + protected final String configFile; + protected final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).setPrettyPrinting() .registerTypeAdapterFactory(OneConfigTypeAdapterFactory.getStaticTypeAdapterFactory()).create(); /** * @param modData information about the mod * @param configFile file where config is stored */ - public Config(ModData modData, File configFile) { + public Config(ModData modData, String configFile) { this.configFile = configFile; - if (configFile.exists()) + init(modData); + } + + public void init(ModData modData) { + if (Profiles.getProfileFile(configFile).exists()) load(); else save(); @@ -36,7 +43,7 @@ public class Config { * Save current config to file */ public void save() { - try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8))) { + try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(Profiles.getProfileFile(configFile)), StandardCharsets.UTF_8))) { writer.write(gson.toJson(this.getClass())); } catch (IOException e) { e.printStackTrace(); @@ -47,7 +54,7 @@ public class Config { * Load file and overwrite current values */ public void load() { - try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8))) { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(Profiles.getProfileFile(configFile)), StandardCharsets.UTF_8))) { deserializePart(new JsonParser().parse(reader).getAsJsonObject(), this.getClass()); } catch (IOException e) { e.printStackTrace(); @@ -60,7 +67,7 @@ public class Config { * @param clazz target class * @return list of options */ - private ArrayList