snapshot

72 files changed, 759 insertions, 536 deletions

diff --git a/src/main/kotlin/Firmament.kt b/src/main/kotlin/Firmament.kt
index 83cc259..198defa 100644
--- a/src/main/kotlin/Firmament.kt
+++ b/src/main/kotlin/Firmament.kt
@@ -46,6 +46,7 @@ import moe.nea.firmament.events.ScreenRenderPostEvent
 import moe.nea.firmament.events.TickEvent
 import moe.nea.firmament.events.registration.registerFirmamentEvents
 import moe.nea.firmament.features.FeatureManager
+import moe.nea.firmament.gui.config.storage.FirmamentConfigLoader
 import moe.nea.firmament.repo.HypixelStaticData
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.util.MC
@@ -137,10 +138,10 @@ object Firmament {
 	fun onClientInitialize() {
 		InitLevel.bump(InitLevel.MC_INIT)
 		FeatureManager.subscribeEvents()
+		FirmamentConfigLoader.loadConfig()
 		ClientTickEvents.END_CLIENT_TICK.register(ClientTickEvents.EndTick { instance ->
 			TickEvent.publish(TickEvent(MC.currentTick++))
 		})
-		IDataHolder.registerEvents()
 		RepoManager.initialize()
 		SBData.init()
 		FeatureManager.autoload()
diff --git a/src/main/kotlin/commands/rome.kt b/src/main/kotlin/commands/rome.kt
index f808231..d12da44 100644
--- a/src/main/kotlin/commands/rome.kt
+++ b/src/main/kotlin/commands/rome.kt
@@ -20,7 +20,7 @@ import moe.nea.firmament.features.inventory.storageoverlay.StorageOverviewScreen
 import moe.nea.firmament.features.mining.MiningBlockInfoUi
 import moe.nea.firmament.gui.config.AllConfigsGui
 import moe.nea.firmament.gui.config.BooleanHandler
-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.init.MixinPlugin
 import moe.nea.firmament.repo.HypixelStaticData
@@ -90,7 +90,7 @@ fun firmamentCommand() = literal("firmament") {
 						}
 						propertyObj as ManagedOption<Boolean>
 						propertyObj.value = !propertyObj.value
-						configObj.save()
+						configObj.markDirty()
 						source.sendFeedback(
 							Text.stringifiedTranslatable(
 								"firmament.command.toggle.toggled", configObj.labelText,
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-c