snapshot

42 files changed, 121 insertions, 55 deletions

diff --git a/src/main/kotlin/features/FeatureManager.kt b/src/main/kotlin/features/FeatureManager.kt
index 183365b..3e235f5 100644
--- a/src/main/kotlin/features/FeatureManager.kt
+++ b/src/main/kotlin/features/FeatureManager.kt
@@ -35,6 +35,7 @@ import moe.nea.firmament.features.misc.CustomCapes
 import moe.nea.firmament.features.misc.Hud
 import moe.nea.firmament.features.world.FairySouls
 import moe.nea.firmament.features.world.Waypoints
+import moe.nea.firmament.util.ErrorUtil
 import moe.nea.firmament.util.compatloader.ICompatMeta
 import moe.nea.firmament.util.data.DataHolder
 
@@ -91,16 +92,13 @@ object FeatureManager : DataHolder<FeatureManager.Config>(serializer(), "feature
 	fun subscribeEvents() {
 		SubscriptionList.allLists.forEach { list ->
 			if (ICompatMeta.shouldLoad(list.javaClass.name))
-				runCatching {
+				ErrorUtil.catch("Error while loading events from $list") {
 					list.provideSubscriptions {
 						it.owner.javaClass.classes.forEach {
 							runCatching { it.getDeclaredField("INSTANCE").get(null) }
 						}
 						subscribeSingleEvent(it)
 					}
-				}.getOrElse {
-					// TODO: allow annotating source sets to specifically opt out of loading for mods, maybe automatically
-					Firmament.logger.info("Ignoring events from $list, likely due to a missing compat mod.", it)
 				}
 		}
 	}
diff --git a/src/main/kotlin/features/FirmamentFeature.kt b/src/main/kotlin/features/FirmamentFeature.kt
index 2cfc4fd..08e7019 100644
--- a/src/main/kotlin/features/FirmamentFeature.kt
+++ b/src/main/kotlin/features/FirmamentFeature.kt
@@ -3,7 +3,7 @@
 package moe.nea.firmament.features
 
 import moe.nea.firmament.events.subscription.SubscriptionOwner
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 
 // TODO: remove this entire feature system and revamp config
 interface FirmamentFeature : SubscriptionOwner {
diff --git a/src/main/kotlin/features/chat/AutoCompletions.kt b/src/main/kotlin/features/chat/AutoCompletions.kt
index 9e0de40..dac1daa 100644
--- a/src/main/kotlin/features/chat/AutoCompletions.kt
+++ b/src/main/kotlin/features/chat/AutoCompletions.kt
@@ -9,12 +9,14 @@ import moe.nea.firmament.commands.thenExecute
 import moe.nea.firmament.events.CommandEvent
 import moe.nea.firmament.events.MaskCommands
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.util.MC
+import moe.nea.firmament.util.data.Config
 
 object AutoCompletions : FirmamentFeature {
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.CHAT) {
 		val provideWarpTabCompletion by toggle("warp-complete") { true }
 		val replaceWarpIsByWarpIsland by toggle("warp-is") { true }
diff --git a/src/main/kotlin/features/chat/ChatLinks.kt b/src/main/kotlin/features/chat/ChatLinks.kt
index 28c526f..6ea07d6 100644
--- a/src/main/kotlin/features/chat/ChatLinks.kt
+++ b/src/main/kotlin/features/chat/ChatLinks.kt
@@ -27,9 +27,10 @@ import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ModifyChatEvent
 import moe.nea.firmament.events.ScreenRenderPostEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.jarvis.JarvisIntegration
 import moe.nea.firmament.util.MC
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.render.drawTexture
 import moe.nea.firmament.util.transformEachRecursively
 import moe.nea.firmament.util.unformattedString
@@ -38,6 +39,7 @@ object ChatLinks : FirmamentFeature {
 	override val identifier: String
 		get() = "chat-links"
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.CHAT) {
 		val enableLinks by toggle("links-enabled") { true }
 		val imageEnabled by toggle("image-enabled") { true }
diff --git a/src/main/kotlin/features/chat/CopyChat.kt b/src/main/kotlin/features/chat/CopyChat.kt
index 64f8734..5cd847a 100644
--- a/src/main/kotlin/features/chat/CopyChat.kt
+++ b/src/main/kotlin/features/chat/CopyChat.kt
@@ -4,7 +4,8 @@ import net.minecraft.text.OrderedText
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ClientStartedEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.reconstitute
 
 
@@ -12,6 +13,7 @@ object CopyChat : FirmamentFeature {
 	override val identifier: String
 		get() = "copy-chat"
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.CHAT) {
 		val copyChat by toggle("copy-chat") { false }
 	}
diff --git a/src/main/kotlin/features/chat/PartyCommands.kt b/src/main/kotlin/features/chat/PartyCommands.kt
index de3a0d9..5a80013 100644
--- a/src/main/kotlin/features/chat/PartyCommands.kt
+++ b/src/main/kotlin/features/chat/PartyCommands.kt
@@ -12,10 +12,11 @@ import moe.nea.firmament.commands.thenExecute
 import moe.nea.firmament.events.CommandEvent
 import moe.nea.firmament.events.PartyMessageReceivedEvent
 import moe.nea.firmament.events.ProcessChatEvent
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.ErrorUtil
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.TimeMark
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.tr
 import moe.nea.firmament.util.useMatch
 
@@ -89,6 +90,7 @@ object PartyCommands {
 		// TODO: at TPS command
 	}
 
+	@Config
 	object TConfig : ManagedConfig("party-commands", Category.CHAT) {
 		val enable by toggle("enable") { false }
 		val cooldown by duration("cooldown", 0.seconds, 20.seconds) { 2.seconds }
diff --git a/src/main/kotlin/features/chat/QuickCommands.kt b/src/main/kotlin/features/chat/QuickCommands.kt
index 7963171..88218b4 100644
--- a/src/main/kotlin/features/chat/QuickCommands.kt
+++ b/src/main/kotlin/features/chat/QuickCommands.kt
@@ -16,7 +16,7 @@ import moe.nea.firmament.commands.thenArgument
 import moe.nea.firmament.commands.thenExecute
 import moe.nea.firmament.events.CommandEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.gui.config.ManagedOption
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SBData
diff --git a/src/main/kotlin/features/debug/DeveloperFeatures.kt b/src/main/kotlin/features/debug/DeveloperFeatures.kt
index fd236f9..cb9cf00 100644
--- a/src/main/kotlin/features/debug/DeveloperFeatures.kt
+++ b/src/main/kotlin/features/debug/DeveloperFeatures.kt
@@ -17,11 +17,12 @@ import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.DebugInstantiateEvent
 import moe.nea.firmament.events.TickEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.init.MixinPlugin
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.TimeMark
 import moe.nea.firmament.util.asm.AsmAnnotationUtil
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.iterate
 
 object DeveloperFeatures : FirmamentFeature {
@@ -38,6 +39,7 @@ object DeveloperFeatures : FirmamentFeature {
 			.iterate { it.parent }
 			.find { it.resolve("settings.gradle.kts").exists() }
 
+	@Config
 	object TConfig : ManagedConfig("developer", Category.DEV) {
 		val autoRebuildResources by toggle("auto-rebuild") { false }
 	}
diff --git a/src/main/kotlin/features/debug/PowerUserTools.kt b/src/main/kotlin/features/debug/PowerUserTools.kt
index 0800a4f..90b73bb 100644
--- a/src/main/kotlin/features/debug/PowerUserTools.kt
+++ b/src/main/kotlin/features/debug/PowerUserTools.kt
@@ -28,10 +28,11 @@ import moe.nea.firmament.events.ScreenChangeEvent
 import moe.nea.firmament.events.TickEvent
 import moe.nea.firmament.events.WorldKeyboardEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.mixins.accessor.AccessorHandledScreen
 import moe.nea.firmament.util.ClipboardUtils
 import moe.nea.firmament.util.MC
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.focusedItemStack
 import moe.nea.firmament.util.mc.IntrospectableItemModelManager
 import moe.nea.firmament.util.mc.SNbtFormatter
@@ -47,6 +48,7 @@ object PowerUserTools : FirmamentFeature {
 	override val identifier: String
 		get() = "power-user"
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.DEV) {
 		val showItemIds by toggle("show-item-id") { false }
 		val copyItemId by keyBindingWithDefaultUnbound("copy-item-id")
diff --git a/src/main/kotlin/features/diana/DianaWaypoints.kt b/src/main/kotlin/features/diana/DianaWaypoints.kt
index 6d87262..68ee1ea 100644
--- a/src/main/kotlin/features/diana/DianaWaypoints.kt
+++ b/src/main/kotlin/features/diana/DianaWaypoints.kt
@@ -4,12 +4,14 @@ import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.AttackBlockEvent
 import moe.nea.firmament.events.UseBlockEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 
 object DianaWaypoints : FirmamentFeature {
     override val identifier get() = "diana"
     override val config get() = TConfig
 
+	@Config
     object TConfig : ManagedConfig(identifier, Category.EVENTS) {
         val ancestralSpadeSolver by toggle("ancestral-spade") { true }
         val ancestralSpadeTeleport by keyBindingWithDefaultUnbound("ancestral-teleport")
diff --git a/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt b/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt
index c1900e9..e26b4c9 100644
--- a/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt
+++ b/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt
@@ -14,7 +14,7 @@ import moe.nea.firmament.events.ProcessChatEvent
 import moe.nea.firmament.events.TickEvent
 import moe.nea.firmament.events.WorldReadyEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.gui.hud.MoulConfigHud
 import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.ItemNameLookup
@@ -23,6 +23,7 @@ import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SHORT_NUMBER_FORMAT
 import moe.nea.firmament.util.SkyblockId
 import moe.nea.firmament.util.TimeMark
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.parseShortNumber
 import moe.nea.firmament.util.useMatch
 
@@ -30,6 +31,7 @@ object AnniversaryFeatures : FirmamentFeature {
     override val identifier: String
         get() = "anniversary"
 
+	@Config
     object TConfig : ManagedConfig(identifier, Category.EVENTS) {
         val enableShinyPigTracker by toggle("shiny-pigs") {true}
         val trackPigCooldown by position("pig-hud", 200, 300) { Vector2i(100, 200) }
diff --git a/src/main/kotlin/features/events/anniversity/CenturyRaffleFeatures.kt b/src/main/kotlin/features/events/anniversity/CenturyRaffleFeatures.kt
index 9935051..9eb098a 100644
--- a/src/main/kotlin/features/events/anniversity/CenturyRaffleFeatures.kt
+++ b/src/main/kotlin/features/events/anniversity/CenturyRaffleFeatures.kt
@@ -8,14 +8,16 @@ import net.minecraft.text.Style
 import net.minecraft.util.Formatting
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.EntityRenderTintEvent
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SkyblockId
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.render.TintedOverlayTexture
 import moe.nea.firmament.util.skyBlockId
 import moe.nea.firmament.util.skyblock.SkyBlockItems
 
 object CenturyRaffleFeatures {
+	@Config
 	object TConfig : ManagedConfig("centuryraffle", Category.EVENTS) {
 		val highlightPlayersForSlice by toggle("highlight-cake-players") { true }
 //		val highlightAllPlayers by toggle("highlight-all-cake-players") { true }
diff --git a/src/main/kotlin/features/events/carnival/CarnivalFeatures.kt b/src/main/kotlin/features/events/carnival/CarnivalFeatures.kt
index 840fb8c..877b54b 100644
--- a/src/main/kotlin/features/events/carnival/CarnivalFeatures.kt
+++ b/src/main/kotlin/features/events/carnival/CarnivalFeatures.kt
@@ -2,10 +2,12 @@
 package moe.nea.firmament.features.events.carnival
 
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 
 object CarnivalFeatures : FirmamentFeature {
-    object TConfig : ManagedConfig(identifier, Category.EVENTS) {
+	@Config
+	object TConfig : ManagedConfig(identifier, Category.EVENTS) {
         val enableBombSolver by toggle("bombs-solver") { true }
         val displayTutorials by toggle("tutorials") { true }
     }
diff --git a/src/main/kotlin/features/fixes/CompatibliltyFeatures.kt b/src/main/kotlin/features/fixes/CompatibliltyFeatures.kt
index 76f6ed4..1858e87 100644
--- a/src/main/kotlin/features/fixes/CompatibliltyFeatures.kt
+++ b/src/main/kotlin/features/fixes/CompatibliltyFeatures.kt
@@ -5,13 +5,15 @@ import net.minecraft.util.math.Vec3d
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ParticleSpawnEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.compatloader.CompatLoader
+import moe.nea.firmament.util.data.Config
 
 object CompatibliltyFeatures : FirmamentFeature {
 	override val identifier: String
 		get() = "compatibility"
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.INTEGRATIONS) {
 		val enhancedExplosions by toggle("explosion-enabled") { false }
 		val explosionSize by integer("explosion-power", 10, 50) { 1 }
diff --git a/src/main/kotlin/features/fixes/Fixes.kt b/src/main/kotlin/features/fixes/Fixes.kt
index 0cb5a32..d3876a7 100644
--- a/src/main/kotlin/features/fixes/Fixes.kt
+++ b/src/main/kotlin/features/fixes/Fixes.kt
@@ -9,14 +9,16 @@ import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HudRenderEvent
 import moe.nea.firmament.events.WorldKeyboardEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.MC
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.tr
 
 object Fixes : FirmamentFeature {
 	override val identifier: String
 		get() = "fixes"
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.MISC) { // TODO: split this config
 		val fixUnsignedPlayerSkins by toggle("player-skins") { true }
 		var autoSprint by toggle("auto-sprint") { false }
diff --git a/src/main/kotlin/features/garden/HideComposterNoises.kt b/src/main/kotlin/features/garden/HideComposterNoises.kt
index 69207a9..2e8eb76 100644
--- a/src/main/kotlin/features/garden/HideComposterNoises.kt
+++ b/src/main/kotlin/features/garden/HideComposterNoises.kt
@@ -5,11 +5,13 @@ import net.minecraft.sound.SoundEvent
 import net.minecraft.sound.SoundEvents
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.SoundReceiveEvent
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.SBData
 import moe.nea.firmament.util.SkyBlockIsland
+import moe.nea.firmament.util.data.Config
 
 object HideComposterNoises {
+	@Config
 	object TConfig : ManagedConfig("composter", Category.GARDEN) {
 		val hideComposterNoises by toggle("no-more-noises") { false }
 	}
diff --git a/src/main/kotlin/features/inventory/ItemHotkeys.kt b/src/main/kotlin/features/inventory/ItemHotkeys.kt
index e826b31..c6b5ca6 100644
--- a/src/main/kotlin/features/inventory/ItemHotkeys.kt
+++ b/src/main/kotlin/features/inventory/ItemHotkeys.kt
@@ -2,7 +2,7 @@ package moe.nea.firmament.features.inventory
 
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HandledScreenKeyPressedEvent
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.HypixelStaticData
 import moe.nea.firmament.repo.ItemCache
@@ -11,11 +11,13 @@ import moe.nea.firmament.repo.ItemCache.isBroken
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.asBazaarStock
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.focusedItemStack
 import moe.nea.firmament.util.skyBlockId
 import moe.nea.firmament.util.skyblock.SBItemUtil.getSearchName
 
 object ItemHotkeys {
+	@Config
 	object TConfig : ManagedConfig("item-hotkeys", Category.INVENTORY) {
 		val openGlobalTradeInterface by keyBindingWithDefaultUnbound("global-trade-interface")
 	}
diff --git a/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt b/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
index 9dae118..196f948 100644
--- a/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
+++ b/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
@@ -11,9 +11,10 @@ import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HotbarItemRenderEvent
 import moe.nea.firmament.events.SlotRenderEvents
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.collections.lastNotNullOfOrNull
 import moe.nea.firmament.util.collections.memoizeIdentity
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.mc.loreAccordingToNbt
 import moe.nea.firmament.util.skyblock.Rarity
 import moe.nea.firmament.util.unformattedString
@@ -22,6 +23,7 @@ object ItemRarityCosmetics : FirmamentFeature {
 	override val identifier: String
 		get() = "item-rarity-cosmetics"
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
 		val showItemRarityBackground by toggle("background") { false }
 		val showItemRarityInHotbar by toggle("background-hotbar") { false }
diff --git a/src/main/kotlin/features/inventory/JunkHighlighter.kt b/src/main/kotlin/features/inventory/JunkHighlighter.kt
index 80fd99d..e5ab036 100644
--- a/src/main/kotlin/features/inventory/JunkHighlighter.kt
+++ b/src/main/kotlin/features/inventory/JunkHighlighter.kt
@@ -4,7 +4,8 @@ import org.lwjgl.glfw.GLFW
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.SlotRenderEvents
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.skyblock.SBItemUtil.getSearchName
 import moe.nea.firmament.util.useMatch
 
@@ -12,6 +13,7 @@ object JunkHighlighter : FirmamentFeature {
 	override val identifier: String
 		get() = "junk-highlighter"
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
 		val junkRegex by string("regex") { "" }
 		val highlightBind by keyBinding("highlight") { GLFW.GLFW_KEY_LEFT_CONTROL }
diff --git a/src/main/kotlin/features/inventory/PetFeatures.kt b/src/main/kotlin/features/inventory/PetFeatures.kt
index 701d30c..5df4bc4 100644
--- a/src/main/kotlin/features/inventory/PetFeatures.kt
+++ b/src/main/kotlin/features/inventory/PetFeatures.kt
@@ -9,12 +9,13 @@ import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HudRenderEvent
 import moe.nea.firmament.events.SlotRenderEvents
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.jarvis.JarvisIntegration
 import moe.nea.firmament.util.FirmFormatters.formatPercent
 import moe.nea.firmament.util.FirmFormatters.shortFormat
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SBData
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.petData
 import moe.nea.firmament.util.render.drawGuiTexture
 import moe.nea.firmament.util.skyblock.Rarity
@@ -29,6 +30,7 @@ object PetFeatures : FirmamentFeature {
 	override val config: ManagedConfig?
 		get() = TConfig
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
 		val highlightEquippedPet by toggle("highlight-pet") { true }
 		var petOverlay by toggle("pet-overlay") { false }
diff --git a/src/main/kotlin/features/inventory/PriceData.kt b/src/main/kotlin/features/inventory/PriceData.kt
index 32e8a1f..ce5c7ea 100644
--- a/src/main/kotlin/features/inventory/PriceData.kt
+++ b/src/main/kotlin/features/inventory/PriceData.kt
@@ -6,12 +6,13 @@ import net.minecraft.util.StringIdentifiable
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ItemTooltipEvent
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.repo.HypixelStaticData
 import moe.nea.firmament.util.FirmFormatters.formatCommas
 import moe.nea.firmament.util.asBazaarStock
 import moe.nea.firmament.util.bold
 import moe.nea.firmament.util.darkGrey
+import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.getLogicalStackSize
 import moe.nea.firmament.util.gold
 import moe.nea.firmament.util.skyBlockId
@@ -22,6 +23,7 @@ object PriceData : FirmamentFeature {
 	override val identifier: String
 		get() = "price-data"
 
+	@Config
 	object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
 		val tooltipEnabled by toggle("enable-always") { true }
 		val enableKeybinding by keyBindingWithDefaultUnbound("enable-keybind")
diff --git a/src/main/kotlin/features/inventory/REIDependencyWarner.kt b/src/main/kotlin/features/inventory/REIDependencyWarner.kt
index 6bf2928..4bb93ee 100644
--- a/src/main/kotlin/features/inventory/REIDependencyWarner.kt
+++ b/