1 files changed, 8 insertions, 10 deletions
diff --git a/src/main/kotlin/jarvis/JarvisIntegration.kt b/src/main/kotlin/jarvis/JarvisIntegration.kt
index 96f47f7..58c606b 100644
--- a/src/main/kotlin/jarvis/JarvisIntegration.kt
+++ b/src/main/kotlin/jarvis/JarvisIntegration.kt
@@ -6,13 +6,13 @@ import moe.nea.jarvis.api.Jarvis
 import moe.nea.jarvis.api.JarvisConfigOption
 import moe.nea.jarvis.api.JarvisHud
 import moe.nea.jarvis.api.JarvisPlugin
-import net.minecraft.client.gui.screen.Screen
-import net.minecraft.text.Text
+import net.minecraft.client.gui.screens.Screen
+import net.minecraft.network.chat.Component
 import moe.nea.firmament.Firmament
-import moe.nea.firmament.features.FeatureManager
 import moe.nea.firmament.gui.config.HudMeta
 import moe.nea.firmament.gui.config.HudMetaHandler
-import moe.nea.firmament.repo.RepoManager
+import moe.nea.firmament.gui.config.storage.FirmamentConfigLoader
+import moe.nea.firmament.util.data.ManagedConfig
 
 class JarvisIntegration : JarvisPlugin {
     override fun getModId(): String =
@@ -27,9 +27,7 @@ class JarvisIntegration : JarvisPlugin {
     }
 
     val configs
-        get() = listOf(
-            RepoManager.Config
-        ) + FeatureManager.allFeatures.mapNotNull { it.config }
+        get() = FirmamentConfigLoader.allConfigs.filterIsInstance<ManagedConfig>()
 
 
     override fun getAllHuds(): List<JarvisHud> {
@@ -39,18 +37,18 @@ class JarvisIntegration : JarvisPlugin {
     }
 
     override fun onHudEditorClosed() {
-        configs.forEach { it.save() }
+        configs.forEach { it.markDirty() }
     }
 
     override fun getAllConfigOptions(): List<JarvisConfigOption> {
         return configs.flatMap { config ->
             config.sortedOptions.map {
                 object : JarvisConfigOption {
-                    override fun title(): Text {
+                    override fun title(): Component {
                         return it.labelText
                     }
 
-                    override fun description(): List<Text> {
+                    override fun description(): List<Component> {
                         return emptyList()
                     }