Reworked the whole feature loading system to use Annotation and Reflections based on the system used in SkyHanni. Fixed inaccurate max shard amount being displayed inside attribute features.

Author: Frostzie

build.gradle.kts

@@ -34,6 +34,8 @@ dependencies {
     modImplementation(libs.fabric.kotlin)
     modImplementation(libs.fabric.api)
     modRuntimeOnly(libs.devauth)
+    implementation("org.reflections:reflections:0.10.2") // Might switch to something like ClassGraph
+    include("org.reflections:reflections:0.10.2")
     include(libs.moulconfig)
 }
 

src/main/kotlin/io/github/frostzie/skyfall/SkyFall.kt

@@ -1,6 +1,7 @@
 package io.github.frostzie.skyfall
 
 import io.github.frostzie.skyfall.commands.CommandManager
+import io.github.frostzie.skyfall.config.ConfigGuiManager
 import io.github.frostzie.skyfall.config.ConfigManager
 import io.github.frostzie.skyfall.config.Features
 import io.github.frostzie.skyfall.data.RepoManager
@@ -21,20 +22,25 @@ class SkyFall : ModInitializer {
 		configManager.firstLoad()
 		Runtime.getRuntime().addShutdownHook(Thread {
 			configManager.saveConfig("shutdown-hook")
+			FeatureManager.updateFeatureStates()
 		})
 		IslandManager.init()
 		CommandManager.loadCommands()
 		StackCountRenderer.initialize()
 		HudManager.init()
-		FeatureManager.loadFeatures()
+		FeatureManager.initialize()
 
 		ClientTickEvents.END_CLIENT_TICK.register { client ->
 			if (screenToOpen != null) {
 				client.setScreen(screenToOpen)
 				screenToOpen = null
 			}
-		}
 
+			if (ConfigGuiManager.currentScreenInstance != null && client.currentScreen != ConfigGuiManager.currentScreenInstance) {
+				feature.saveNow()
+				ConfigGuiManager.currentScreenInstance = null
+			}
+		}
 
 		ItemTooltipCallback.EVENT.register { stack, _, _, lines ->
 			if (!stack.isEmpty) {

src/main/kotlin/io/github/frostzie/skyfall/config/ConfigGuiManager.kt

@@ -1,32 +1,43 @@
 package io.github.frostzie.skyfall.config
 
 import io.github.frostzie.skyfall.SkyFall
+import io.github.frostzie.skyfall.hud.HudEditorScreen
 import io.github.notenoughupdates.moulconfig.gui.GuiElementWrapper
 import io.github.notenoughupdates.moulconfig.gui.MoulConfigEditor
 import net.minecraft.client.gui.screen.Screen
 
-// Taken and modified from Skyhanni
 object ConfigGuiManager {
-    var editor: MoulConfigEditor<Features>? = null
 
-    fun getEditorInstance(): MoulConfigEditor<Features> {
-        if (editor == null) {
-            editor = MoulConfigEditor(SkyFall.Companion.configManager.processor)
+    private var configEditor: MoulConfigEditor<Features>? = null
+
+    var currentScreenInstance: Screen? = null
+
+    private fun getConfigEditorInstance(): MoulConfigEditor<Features> {
+        if (configEditor == null) {
+            configEditor = MoulConfigEditor(SkyFall.configManager.processor)
         }
-        return editor!!
+        return configEditor!!
     }
 
     fun openConfigGui(search: String? = null) {
-        val currentEditor = getEditorInstance()
+        val currentEditor = getConfigEditorInstance()
         if (search != null) {
             currentEditor.search(search)
         }
-        SkyFall.Companion.screenToOpen = GuiElementWrapper(currentEditor)
+
+        val screen = GuiElementWrapper(currentEditor)
+        currentScreenInstance = screen
+        SkyFall.screenToOpen = screen
+    }
+
+    fun openHudEditor() {
+        val screen = HudEditorScreen()
+        currentScreenInstance = screen
+        SkyFall.screenToOpen = screen
     }
 
     fun createModMenuScreen(parentScreenFromModMenu: Screen): Screen {
-        val currentEditor = getEditorInstance()
-        val configScreen = GuiElementWrapper(currentEditor)
-        return configScreen
+        val newEditor = MoulConfigEditor(SkyFall.configManager.processor)
+        return GuiElementWrapper(newEditor)
     }
 }

src/main/kotlin/io/github/frostzie/skyfall/config/ConfigManager.kt

@@ -1,23 +1,15 @@
 package io.github.frostzie.skyfall.config
 
+import com.google.gson.GsonBuilder
 import io.github.frostzie.skyfall.SkyFall
+import io.github.frostzie.skyfall.features.FeatureManager
+import io.github.frostzie.skyfall.utils.LoggerProvider
 import io.github.frostzie.skyfall.utils.SimpleTimeMark
-
 import io.github.notenoughupdates.moulconfig.observer.PropertyTypeAdapterFactory
 import io.github.notenoughupdates.moulconfig.processor.BuiltinMoulConfigGuis
 import io.github.notenoughupdates.moulconfig.processor.ConfigProcessorDriver
 import io.github.notenoughupdates.moulconfig.processor.MoulConfigProcessor
-
-import com.google.gson.GsonBuilder
-import io.github.frostzie.skyfall.utils.LoggerProvider
-import java.io.BufferedReader
-import java.io.BufferedWriter
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.io.IOException
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
+import java.io.*
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
@@ -35,25 +27,22 @@ object ConfigManager {
 
     lateinit var features: Features
 
-    var configDirectory = File("config/skyfall")
+    private var configDirectory = File("config/skyfall")
     private var configFile: File? = null
     lateinit var processor: MoulConfigProcessor<Features>
 
     fun firstLoad() {
-        if (ConfigManager::features.isInitialized) {
-            println("SkyFall: Loading config despite config alr being loaded?..")
-        }
-
         configDirectory.mkdirs()
         configFile = File(configDirectory, "config.json")
-        println("Trying to load config from $configFile")
+        logger.info("Trying to load config from $configFile")
+
         if (configFile!!.exists()) {
             try {
-                println("load-config-now")
+                logger.info("load-config-now")
                 val inputStreamReader = InputStreamReader(FileInputStream(configFile!!), StandardCharsets.UTF_8)
                 val bufferedReader = BufferedReader(inputStreamReader)
                 features = gson.fromJson(bufferedReader.readText(), Features::class.java)
-                println("SkyFall: Loaded config file")
+                logger.info("Loaded config File")
             } catch (e: Exception) {
                 logger.error("Exception while reading config file $configFile", e)
                 val backupFile = configFile!!.resolveSibling("config-${SimpleTimeMark.now().toMillis()}-backup.json")
@@ -66,28 +55,27 @@ object ConfigManager {
             }
         }
 
-        if (!ConfigManager::features.isInitialized) {
-            println("Creating a new config file and saving it")
+        if (!this::features.isInitialized) {
+            logger.info("Creating a new config file and saving it")
             features = Features()
             saveConfig("blank config")
         }
 
+        logger.info("Initializing MoulConfig with the loaded configuration.")
+        processor = MoulConfigProcessor(SkyFall.feature)
+        BuiltinMoulConfigGuis.addProcessors(processor)
+        val driver = ConfigProcessorDriver(processor)
+        driver.warnForPrivateFields = false
+        driver.processConfig(SkyFall.feature)
+
         fixedRateTimer(name = "skyfall-config-auto-save", period = 60_000L, initialDelay = 60_000L) {
             try {
                 saveConfig("auto-save-60s")
+                logger.debug("60s Config Save.")
             } catch (e: Throwable) {
                 logger.error("Error auto-saving config!", e)
             }
         }
-
-        //TODO: Add UpdateManager
-        val features = SkyFall.feature
-        processor = MoulConfigProcessor(SkyFall.feature)
-        BuiltinMoulConfigGuis.addProcessors(processor)
-        //UpdateManager.injectConfigProcessor(processor)
-        val driver = ConfigProcessorDriver(processor)
-        driver.warnForPrivateFields = false
-        driver.processConfig(features)
     }
 
     fun saveConfig(reason: String) {
@@ -106,6 +94,7 @@ object ConfigManager {
                 StandardCopyOption.REPLACE_EXISTING,
                 StandardCopyOption.ATOMIC_MOVE
             )
+            FeatureManager.updateFeatureStates()
         } catch (e: IOException) {
             logger.error("Couldn't save config file to $file", e)
         }

src/main/kotlin/io/github/frostzie/skyfall/config/Features.kt

@@ -1,6 +1,7 @@
 package io.github.frostzie.skyfall.config
 
 import com.google.gson.annotations.Expose
+import io.github.frostzie.skyfall.SkyFall
 import io.github.frostzie.skyfall.config.features.chat.ChatConfig
 import io.github.frostzie.skyfall.config.features.dev.DevConfig
 import io.github.frostzie.skyfall.config.features.dungeon.DungeonConfig
@@ -14,6 +15,10 @@ import io.github.notenoughupdates.moulconfig.annotations.Category
 import io.github.notenoughupdates.moulconfig.common.MyResourceLocation
 
 class Features : Config() {
+    override fun saveNow() {
+        SkyFall.configManager.saveConfig("close-gui")
+    }
+
     //TODO: add version change support and color gradient title
     override fun getTitle(): String {
         return "§b§lSkyFall§r by §3Frostzie§r, config by §5Moulberry §rand §5nea89"

src/main/kotlin/io/github/frostzie/skyfall/config/features/misc/keybind/KeyBinds.kt

@@ -5,8 +5,7 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption
 import org.lwjgl.glfw.GLFW
 
-//TODO: Move all the keybinds to one class
-//TODO: Add mouse button support
+//TODO: Remove this and either recommend skytils or add new overall system for hotkeys
 
 class KeyBinds {
 

src/main/kotlin/io/github/frostzie/skyfall/features/Feature.kt

@@ -0,0 +1,32 @@
+package io.github.frostzie.skyfall.features
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Feature(val name: String)
+
+// Based on the system used by Skyhanni
+interface IFeature {
+    /**
+     * A flag to track if the feature is currently active.
+     * This should be set to true in init() and false in terminate().
+     */
+    var isRunning: Boolean
+
+    /**
+     * The condition to check if this feature should be loaded.
+     * This will now be checked both at startup and after config changes.
+     */
+    fun shouldLoad(): Boolean
+
+    /**
+     * The entry point of the feature. Called when the feature is enabled.
+     * Should register listeners and set isRunning = true.
+     */
+    fun init()
+
+    /**
+     * A new method to clean up the feature when it's disabled.
+     * Should unregister listeners, reset state, and set isRunning = false.
+     */
+    fun terminate()
+}