Change to using MoulConfig's ManagedConfig for 1.8.9 also

VixidDev · Jun 28, 2024 · 3030114 · 3030114
1 parent 11a7bd4
commit 3030114
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 104 deletions.
diff --git a/src/main/java/dev/vixid/vsm/config/VSMConfig.java b/src/main/java/dev/vixid/vsm/config/VSMConfig.java
@@ -1,6 +1,7 @@
 package dev.vixid.vsm.config;
 
 import com.google.gson.annotations.Expose;
+import dev.vixid.vsm.VSM;
 import dev.vixid.vsm.config.features.SpotifyConfig;
 import io.github.notenoughupdates.moulconfig.Config;
 import io.github.notenoughupdates.moulconfig.Social;
@@ -15,7 +16,7 @@ public class VSMConfig extends Config {
     @Override
     public List<Social> getSocials() {
         return Collections.singletonList(
-                Social.forLink("GitHub", GITHUB, "https://github.com/VixidDev")
+                Social.forLink("GitHub", GITHUB, "https://github.com/VixidDev/VSM")
         );
     }
 
@@ -26,7 +27,7 @@ public String getTitle() {
 
     @Override
     public void saveNow() {
-        ConfigManager.INSTANCE.saveConfig();
+        VSM.getConfig().saveToFile();
     }
 
     @Expose

diff --git a/src/main/java/dev/vixid/vsm/config/core/VSMGsonMapper.java b/src/main/java/dev/vixid/vsm/config/core/VSMGsonMapper.java
@@ -0,0 +1,46 @@
+package dev.vixid.vsm.config.core;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import io.github.notenoughupdates.moulconfig.ChromaColour;
+import io.github.notenoughupdates.moulconfig.LegacyStringChromaColourTypeAdapter;
+import io.github.notenoughupdates.moulconfig.managed.DataMapper;
+import io.github.notenoughupdates.moulconfig.observer.PropertyTypeAdapterFactory;
+import java.lang.reflect.InvocationTargetException;
+import org.jetbrains.annotations.NotNull;
+
+public class VSMGsonMapper<T> implements DataMapper<T> {
+
+    public Class<T> clazz;
+
+    public Gson gson = new GsonBuilder()
+            .registerTypeAdapterFactory(new PropertyTypeAdapterFactory())
+            .registerTypeAdapter(ChromaColour.class, new LegacyStringChromaColourTypeAdapter(true))
+            .excludeFieldsWithoutExposeAnnotation()
+            .setPrettyPrinting()
+            .create();
+
+    public VSMGsonMapper(Class<T> clazz) {
+        this.clazz = clazz;
+    }
+
+    @NotNull
+    @Override
+    public String serialize(T value) {
+        return gson.toJson(value);
+    }
+
+    @Override
+    public T createDefault() {
+        try {
+            return clazz.getDeclaredConstructor().newInstance();
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public T deserialize(@NotNull String string) {
+        return gson.fromJson(string, clazz);
+    }
+}
diff --git a/src/main/kotlin/dev/vixid/vsm/VSM.kt b/src/main/kotlin/dev/vixid/vsm/VSM.kt
@@ -2,11 +2,13 @@ package dev.vixid.vsm
 
 import com.github.kwhat.jnativehook.GlobalScreen
 import dev.vixid.vsm.commands.Commands
-import dev.vixid.vsm.config.ConfigManager
 import dev.vixid.vsm.config.VSMConfig
+import dev.vixid.vsm.config.core.VSMGsonMapper
 import dev.vixid.vsm.features.SpotifyDisplay
 import dev.vixid.vsm.jnativehook.VSMLibraryLocator
 import dev.vixid.vsm.overlays.OverlayPositions
+import io.github.notenoughupdates.moulconfig.managed.ManagedConfig
+import java.io.File
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -30,8 +32,6 @@ class VSM {
 
     @Mod.EventHandler
     fun init(event: FMLInitializationEvent) {
-        ConfigManager.firstLoad()
-
         MinecraftForge.EVENT_BUS.register(this)
 
         SpotifyDisplay.initialise()
@@ -56,7 +56,9 @@ class VSM {
 
     companion object {
         @JvmStatic
-        val config: VSMConfig get() = ConfigManager.config
+        val config = ManagedConfig.create(File("config/vsm/config.json"), VSMConfig::class.java) {
+            mapper = VSMGsonMapper(this.clazz)
+        }
 
         private val globalJob: Job = Job(null)
         val coroutineScope = CoroutineScope(CoroutineName("VSM") + SupervisorJob(globalJob))

diff --git a/src/main/kotlin/dev/vixid/vsm/commands/Commands.kt b/src/main/kotlin/dev/vixid/vsm/commands/Commands.kt
@@ -1,13 +1,13 @@
 package dev.vixid.vsm.commands
 
-import dev.vixid.vsm.config.ConfigGuiManager
+import dev.vixid.vsm.VSM
 import net.minecraft.command.ICommandSender
 import net.minecraftforge.client.ClientCommandHandler
 
 object Commands {
 
     fun initCommands() {
-        registerCommand("vsm") { ConfigGuiManager.openConfig() }
+        registerCommand("vsm") { VSM.screenToOpen = VSM.config.getGui() }
     }
 
     private fun registerCommand(name: String, function: (Array<String>) -> Unit) {

diff --git a/src/main/kotlin/dev/vixid/vsm/config/ConfigGuiManager.kt b/src/main/kotlin/dev/vixid/vsm/config/ConfigGuiManager.kt
diff --git a/src/main/kotlin/dev/vixid/vsm/config/ConfigManager.kt b/src/main/kotlin/dev/vixid/vsm/config/ConfigManager.kt
diff --git a/src/main/kotlin/dev/vixid/vsm/features/SpotifyDisplay.kt b/src/main/kotlin/dev/vixid/vsm/features/SpotifyDisplay.kt
@@ -18,7 +18,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent
 
 object SpotifyDisplay : Overlay() {
 
-    private val config: SpotifyConfig get() = VSM.config.spotifyConfig
+    private val config: SpotifyConfig get() = VSM.config.instance.spotifyConfig
 
     private var songName: String = "§cCannot detect song name!"
     private var totalTicks = 0

diff --git a/src/main/kotlin/dev/vixid/vsm/overlays/PositionEditor.kt b/src/main/kotlin/dev/vixid/vsm/overlays/PositionEditor.kt
@@ -61,7 +61,7 @@ class PositionEditor(private val editorOverlays: MutableMap<UUID, Pair<String, P
     }
 
     override fun onGuiClosed() {
-        VSM.config.saveNow()
+        VSM.config.instance.saveNow()
     }
 
     override fun doesGuiPauseGame(): Boolean {