snapshot

16 files changed, 133 insertions, 170 deletions

diff --git a/src/main/kotlin/features/inventory/CraftingOverlay.kt b/src/main/kotlin/features/inventory/CraftingOverlay.kt
index f823086..30d2c6b 100644
--- a/src/main/kotlin/features/inventory/CraftingOverlay.kt
+++ b/src/main/kotlin/features/inventory/CraftingOverlay.kt
@@ -7,13 +7,12 @@ import net.minecraft.util.Formatting
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ScreenChangeEvent
 import moe.nea.firmament.events.SlotRenderEvents
-import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.SBItemStack
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.skyblockId
 
-object CraftingOverlay : FirmamentFeature {
+object CraftingOverlay {
 
 	private var screen: GenericContainerScreen? = null
 	private var recipe: NEUCraftingRecipe? = null
@@ -43,7 +42,7 @@ object CraftingOverlay : FirmamentFeature {
 		}
 	}
 
-	override val identifier: String
+	val identifier: String
 		get() = "crafting-overlay"
 
 	@OptIn(ExpensiveItemCacheApi::class)
diff --git a/src/main/kotlin/features/inventory/ItemHotkeys.kt b/src/main/kotlin/features/inventory/ItemHotkeys.kt
index c6b5ca6..e9d0631 100644
--- a/src/main/kotlin/features/inventory/ItemHotkeys.kt
+++ b/src/main/kotlin/features/inventory/ItemHotkeys.kt
@@ -2,16 +2,15 @@ package moe.nea.firmament.features.inventory
 
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HandledScreenKeyPressedEvent
-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
 import moe.nea.firmament.repo.ItemCache.asItemStack
 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.data.ManagedConfig
 import moe.nea.firmament.util.focusedItemStack
 import moe.nea.firmament.util.skyBlockId
 import moe.nea.firmament.util.skyblock.SBItemUtil.getSearchName
diff --git a/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt b/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
index 196f948..7a474f9 100644
--- a/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
+++ b/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
@@ -3,24 +3,17 @@ package moe.nea.firmament.features.inventory
 import java.awt.Color
 import net.minecraft.client.gl.RenderPipelines
 import net.minecraft.client.gui.DrawContext
-import net.minecraft.client.render.RenderLayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Formatting
 import net.minecraft.util.Identifier
 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.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.data.ManagedConfig
 import moe.nea.firmament.util.skyblock.Rarity
-import moe.nea.firmament.util.unformattedString
 
-object ItemRarityCosmetics : FirmamentFeature {
-	override val identifier: String
+object ItemRarityCosmetics {
+	val identifier: String
 		get() = "item-rarity-cosmetics"
 
 	@Config
@@ -29,9 +22,6 @@ object ItemRarityCosmetics : FirmamentFeature {
 		val showItemRarityInHotbar by toggle("background-hotbar") { false }
 	}
 
-	override val config: ManagedConfig
-		get() = TConfig
-
 	private val rarityToColor = Rarity.colourMap.mapValues {
 		val c = Color(it.value.colorValue!!)
 		c.rgb
diff --git a/src/main/kotlin/features/inventory/JunkHighlighter.kt b/src/main/kotlin/features/inventory/JunkHighlighter.kt
index e5ab036..45d265e 100644
--- a/src/main/kotlin/features/inventory/JunkHighlighter.kt
+++ b/src/main/kotlin/features/inventory/JunkHighlighter.kt
@@ -3,14 +3,13 @@ package moe.nea.firmament.features.inventory
 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.util.data.Config
 import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.skyblock.SBItemUtil.getSearchName
 import moe.nea.firmament.util.useMatch
 
-object JunkHighlighter : FirmamentFeature {
-	override val identifier: String
+object JunkHighlighter {
+	val identifier: String
 		get() = "junk-highlighter"
 
 	@Config
@@ -21,7 +20,7 @@ object JunkHighlighter : FirmamentFeature {
 
 	@Subscribe
 	fun onDrawSlot(event: SlotRenderEvents.After) {
-		if(!TConfig.highlightBind.isPressed() || TConfig.junkRegex.isEmpty()) return
+		if (!TConfig.highlightBind.isPressed() || TConfig.junkRegex.isEmpty()) return
 		val junkRegex = TConfig.junkRegex.toPattern()
 		val slot = event.slot
 		junkRegex.useMatch(slot.stack.getSearchName()) {
diff --git a/src/main/kotlin/features/inventory/PetFeatures.kt b/src/main/kotlin/features/inventory/PetFeatures.kt
index 5df4bc4..965e705 100644
--- a/src/main/kotlin/features/inventory/PetFeatures.kt
+++ b/src/main/kotlin/features/inventory/PetFeatures.kt
@@ -8,14 +8,13 @@ import moe.nea.firmament.Firmament
 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.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.data.ManagedConfig
 import moe.nea.firmament.util.petData
 import moe.nea.firmament.util.render.drawGuiTexture
 import moe.nea.firmament.util.skyblock.Rarity
@@ -23,13 +22,10 @@ import moe.nea.firmament.util.titleCase
 import moe.nea.firmament.util.useMatch
 import moe.nea.firmament.util.withColor
 
-object PetFeatures : FirmamentFeature {
-	override val identifier: String
+object PetFeatures {
+	val identifier: String
 		get() = "pets"
 
-	override val config: ManagedConfig?
-		get() = TConfig
-
 	@Config
 	object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
 		val highlightEquippedPet by toggle("highlight-pet") { true }
diff --git a/src/main/kotlin/features/inventory/PriceData.kt b/src/main/kotlin/features/inventory/PriceData.kt
index ce5c7ea..5f9268e 100644
--- a/src/main/kotlin/features/inventory/PriceData.kt
+++ b/src/main/kotlin/features/inventory/PriceData.kt
@@ -5,22 +5,21 @@ import net.minecraft.text.Text
 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.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.data.ManagedConfig
 import moe.nea.firmament.util.getLogicalStackSize
 import moe.nea.firmament.util.gold
 import moe.nea.firmament.util.skyBlockId
 import moe.nea.firmament.util.tr
 import moe.nea.firmament.util.yellow
 
-object PriceData : FirmamentFeature {
-	override val identifier: String
+object PriceData {
+	val identifier: String
 		get() = "price-data"
 
 	@Config
@@ -46,8 +45,6 @@ object PriceData : FirmamentFeature {
 		}
 	}
 
-	override val config get() = TConfig
-
 	fun formatPrice(label: Text, price: Double): Text {
 		return Text.literal("")
 			.yellow()
diff --git a/src/main/kotlin/features/inventory/REIDependencyWarner.kt b/src/main/kotlin/features/inventory/REIDependencyWarner.kt
index 4bb93ee..9e8a4db 100644
--- a/src/main/kotlin/features/inventory/REIDependencyWarner.kt
+++ b/src/main/kotlin/features/inventory/REIDependencyWarner.kt
@@ -52,7 +52,7 @@ object REIDependencyWarner {
 	@Subscribe
 	fun checkREIDependency(event: SkyblockServerUpdateEvent) {
 		if (!SBData.isOnSkyblock) return
-		if (!RepoManager.Config.warnForMissingItemListMod) return
+		if (!RepoManager.TConfig.warnForMissingItemListMod) return
 		if (hasREI) return
 		if (sentWarning) return
 		sentWarning = true
@@ -76,8 +76,8 @@ object REIDependencyWarner {
 		if (hasREI) return
 		event.subcommand("disablereiwarning") {
 			thenExecute {
-				RepoManager.Config.warnForMissingItemListMod = false
-				RepoManager.Config.markDirty()
+				RepoManager.TConfig.warnForMissingItemListMod = false
+				RepoManager.TConfig.markDirty()
 				MC.sendChat(Text.translatable("firmament.reiwarning.disabled").yellow())
 			}
 		}
diff --git a/src/main/kotlin/features/inventory/SaveCursorPosition.kt b/src/main/kotlin/features/inventory/SaveCursorPosition.kt
index 2a08730..3e55d02 100644
--- a/src/main/kotlin/features/inventory/SaveCursorPosition.kt
+++ b/src/main/kotlin/features/inventory/SaveCursorPosition.kt
@@ -1,64 +1,57 @@
-
-
 package moe.nea.firmament.features.inventory
 
 import org.lwjgl.glfw.GLFW
 import kotlin.math.absoluteValue
 import kotlin.time.Duration.Companion.milliseconds
-import net.minecraft.client.util.InputUtil
-import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.TimeMark
 import moe.nea.firmament.util.assertNotNullOr
 import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 
-object SaveCursorPosition : FirmamentFeature {
-    override val identifier: String
-        get() = "save-cursor-position"
+object SaveCursorPosition {
+	val identifier: String
+		get() = "save-cursor-position"
 
 	@Config
-    object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
-        val enable by toggle("enable") { true }
-        val tolerance by duration("tolerance", 10.milliseconds, 5000.milliseconds) { 500.milliseconds }
-    }
-
-    override val config: TConfig
-        get() = TConfig
-
-    var savedPositionedP1: Pair<Double, Double>? = null
-    var savedPosition: SavedPosition? = null
-
-    data class SavedPosition(
-        val middle: Pair<Double, Double>,
-        val cursor: Pair<Double, Double>,
-        val savedAt: TimeMark = TimeMark.now()
-    )
-
-    @JvmStatic
-    fun saveCursorOriginal(positionedX: Double, positionedY: Double) {
-        savedPositionedP1 = Pair(positionedX, positionedY)
-    }
-
-    @JvmStatic
-    fun loadCursor(middleX: Double, middleY: Double): Pair<Double, Double>? {
-        if (!TConfig.enable) return null
-        val lastPosition = savedPosition?.takeIf { it.savedAt.passedTime() < TConfig.tolerance }
-        savedPosition = null
-        if (lastPosition != null &&
-            (lastPosition.middle.first - middleX).absoluteValue < 1 &&
-            (lastPosition.middle.second - middleY).absoluteValue < 1
-        ) {
+	object TConfig : ManagedConfig(identifier, Category.INVENTORY) {
+		val enable by toggle("enable") { true }
+		val tolerance by duration("tolerance", 10.milliseconds, 5000.milliseconds) { 500.milliseconds }
+	}
+
+	var savedPositionedP1: Pair<Double, Double>? = null
+	var savedPosition: SavedPosition? = null
+
+	data class SavedPosition(
+		val middle: Pair<Double, Double>,
+		val cursor: Pair<Double, Double>,
+		val savedAt: TimeMark = TimeMark.now()
+	)
+
+	@JvmStatic
+	fun saveCursorOriginal(positionedX: Double, positionedY: Double) {
+		savedPositionedP1 = Pair(positionedX, positionedY)
+	}
+
+	@JvmStatic
+	fun loadCursor(middleX: Double, middleY: Double): Pair<Double, Double>? {
+		if (!TConfig.enable) return null
+		val lastPosition = savedPosition?.takeIf { it.savedAt.passedTime() < TConfig.tolerance }
+		savedPosition = null
+		if (lastPosition != null &&
+			(lastPosition.middle.first - middleX).absoluteValue < 1 &&
+			(lastPosition.middle.second - middleY).absoluteValue < 1
+		) {
 			GLFW.glfwSetCursorPos(MC.window.handle, lastPosition.cursor.first, lastPosition.cursor.second);
-            return lastPosition.cursor
-        }
-        return null
-    }
-
-    @JvmStatic
-    fun saveCursorMiddle(middleX: Double, middleY: Double) {
-        if (!TConfig.enable) return
-        val cursorPos = assertNotNullOr(savedPositionedP1) { return }
-        savedPosition = SavedPosition(Pair(middleX, middleY), cursorPos)
-    }
+			return lastPosition.cursor
+		}
+		return null
+	}
+
+	@JvmStatic
+	fun saveCursorMiddle(middleX: Double, middleY: Double) {
+		if (!TConfig.enable) return
+		val cursorPos = assertNotNullOr(savedPositionedP1) { return }
+		savedPosition = SavedPosition(Pair(middleX, middleY), cursorPos)
+	}
 }
diff --git a/src/main/kotlin/features/inventory/SlotLocking.kt b/src/main/kotlin/features/inventory/SlotLocking.kt
index 8be7bdb..bae6a5e 100644
--- a/src/main/kotlin/features/inventory/SlotLocking.kt
+++ b/src/main/kotlin/features/inventory/SlotLocking.kt
@@ -26,15 +26,13 @@ import net.minecraft.screen.slot.SlotActionType
 import net.minecraft.util.Identifier
 import net.minecraft.util.StringIdentifiable
 import moe.nea.firmament.annotations.Subscribe
-import moe.nea.firmament.events.FeaturesInitializedEvent
+import moe.nea.firmament.events.ClientInitEvent
 import moe.nea.firmament.events.HandledScreenForegroundEvent
 import moe.nea.firmament.events.HandledScreenKeyPressedEvent
 import moe.nea.firmament.events.HandledScreenKeyReleasedEvent
 import moe.nea.firmament.events.IsSlotProtectedEvent
 import moe.nea.firmament.events.ScreenChangeEvent
 import moe.nea.firmament.events.SlotRenderEvents
-import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.keybindings.InputModifiers
 import moe.nea.firmament.keybindings.SavedKeyBinding
 import moe.nea.firmament.mixins.accessor.AccessorHandledScreen
@@ -43,6 +41,7 @@ import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SBData
 import moe.nea.firmament.util.SkyBlockIsland
 import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.data.ProfileSpecificDataHolder
 import moe.nea.firmament.util.extraAttributes
 import moe.nea.firmament.util.json.DashlessUUIDSerializer
@@ -60,8 +59,8 @@ import moe.nea.firmament.util.skyblockUUID
 import moe.nea.firmament.util.tr
 import moe.nea.firmament.util.unformattedString
 
-object SlotLocking : FirmamentFeature {
-	override val identifier: String
+object SlotLocking {
+	val identifier: String
 		get() = "slot-locking"
 
 	@Serializable
@@ -166,15 +165,14 @@ object SlotLocking : FirmamentFeature {
 		}
 	}
 
-	override val config: TConfig
-		get() = TConfig
-
+	@Config
 	object DConfig : ProfileSpecificDataHolder<Data>(serializer(), "locked-slots", ::Data)
 
 	val lockedUUIDs get() = DConfig.data?.lockedUUIDs
 
 	val lockedSlots
 		get() = currentWorldData?.lockedSlots
+
 	fun isSalvageScreen(screen: HandledScreen<*>?): Boolean {
 		if (screen == null) return false
 		return screen.title.unformattedString.contains("Salvage Item")
@@ -259,7 +257,7 @@ object SlotLocking : FirmamentFeature {
 	}
 
 	@Subscribe
-	fun onEvent(event: FeaturesInitializedEvent) {
+	fun onEvent(event: ClientInitEvent) {
 		IsSlotProtectedEvent.subscribe(receivesCancelled = true, "SlotLocking:unlockInDungeons") {
 			if (it.isProtected
 				&& it.origin == IsSlotProtectedEvent.MoveOrigin.DROP_FROM_HOTBAR
diff --git a/src/main/kotlin/features/inventory/TimerInLore.kt b/src/main/kotlin/features/inventory/TimerInLore.kt
index eb1463b..d8eebda 100644
--- a/src/main/kotlin/features/inventory/TimerInLore.kt
+++ b/src/main/kotlin/features/inventory/TimerInLore.kt
@@ -11,10 +11,10 @@ import net.minecraft.text.Text
 import net.minecraft.util.StringIdentifiable
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ItemTooltipEvent
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.SBData
 import moe.nea.firmament.util.aqua
 import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.grey
 import moe.nea.firmament.util.mc.displayNameAccordingToNbt
 import moe.nea.firmament.util.timestamp
diff --git a/src/main/kotlin/features/inventory/WardrobeKeybinds.kt b/src/main/kotlin/features/inventory/WardrobeKeybinds.kt
index ca5ff3a..cdd646e 100644
--- a/src/main/kotlin/features/inventory/WardrobeKeybinds.kt
+++ b/src/main/kotlin/features/inventory/WardrobeKeybinds.kt
@@ -4,10 +4,9 @@ import org.lwjgl.glfw.GLFW
 import net.minecraft.item.Items
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HandledScreenKeyPressedEvent
-import moe.nea.firmament.features.FirmamentFeature
-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.data.ManagedConfig
 import moe.nea.firmament.util.mc.SlotUtils.clickLeftMouseButton
 
 object WardrobeKeybinds {
diff --git a/src/main/kotlin/features/inventory/buttons/InventoryButtonTemplates.kt b/src/main/kotlin/features/inventory/buttons/InventoryButtonTemplates.kt
index d282157..082673e 100644
--- a/src/main/kotlin/features/inventory/buttons/InventoryButtonTemplates.kt
+++ b/src/main/kotlin/features/inventory/buttons/InventoryButtonTemplates.kt
@@ -1,6 +1,5 @@
 package moe.nea.firmament.features.inventory.buttons
 
-import kotlinx.serialization.encodeToString
 import net.minecraft.text.Text
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.util.ErrorUtil
diff --git a/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt b/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt
index f49e6ab..47fdbe9 100644
--- a/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt
+++ b/src/main/kotlin/features/inventory/buttons/InventoryButtons.kt
@@ -1,5 +1,3 @@
-
-
 package moe.nea.firmament.features.inventory.buttons
 
 import me.shedaniel.math.Rectangle
@@ -13,32 +11,33 @@ import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HandledScreenClickEvent
 import moe.nea.firmament.events.HandledScreenForegroundEvent
 import moe.nea.firmament.events.HandledScreenPushREIEvent
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.ScreenUtil
 import moe.nea.firmament.util.TimeMark
-import moe.nea.firmament.util.data.DataHolder
 import moe.nea.firmament.util.accessors.getRectangle
 import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.DataHolder
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.gold
 
 object InventoryButtons {
 
 	@Config
-    object TConfig : ManagedConfig("inventory-buttons-config", Category.INVENTORY) {
-        val _openEditor by button("open-editor") {
-            openEditor()
-        }
+	object TConfig : ManagedConfig("inventory-buttons-config", Category.INVENTORY) {
+		val _openEditor by button("open-editor") {
+			openEditor()
+		}
 		val hoverText by toggle("hover-text") { true }
 		val onlyInv by toggle("only-inv") { false }
-    }
+	}
 
-    object DConfig : DataHolder<Data>(serializer(), "inventory-buttons", ::Data)
+	@Config
+	object DConfig : DataHolder<Data>(serializer(), "inventory-buttons", ::Data)
 
-    @Serializable
-    data class Data(
-        var buttons: MutableList<InventoryButton> = mutableListOf()
-    )
+	@Serializable
+	data class Data(
+		var buttons: MutableList<InventoryButton> = mutableListOf()
+	)
 
 	fun getValidButtons(screen: HandledScreen<*>): Sequence<InventoryButton> {
 		return DConfig.data.buttons.asSequence().filter { button ->
@@ -47,41 +46,41 @@ object InventoryButtons {
 	}
 
 
-    @Subscribe
-    fun onRectangles(it: HandledScreenPushREIEvent) {
-        val bounds = it.screen.getRectangle()
-        for (button in getValidButtons(it.screen)) {
-            val buttonBounds = button.getBounds(bounds)
-            it.block(buttonBounds)
-        }
-    }
+	@Subscribe
+	fun onRectangles(it: HandledScreenPushREIEvent) {
+		val bounds = it.screen.getRectangle()
+		for (button in getValidButtons(it.screen)) {
+			val buttonBounds = button.getBounds(bounds)
+			it.block(buttonBounds)
+		}
+	}
 
-    @Subscribe
-    fun onClickScreen(it: HandledScreenClickEvent) {
-        val bounds = it.screen.getRectangle()
-        for (button in getValidButtons(it.screen)) {
-            val buttonBounds = button.getBounds(bounds)
-            if (buttonBounds.contains(it.mouseX, it.mouseY)) {
-                MC.sendCommand(button.command!! /* non null invariant covered by getValidButtons */)
-                break
-            }
-        }
-    }
+	@Subscribe
+	fun onClickScreen(it: HandledScreenClickEvent) {
+		val bounds = it.screen.getRectangle()
+		for (button in getValidButtons(it.screen)) {
+			val buttonBounds = button.getBounds(bounds)
+			if (buttonBounds.contains(it.mouseX, it.mouseY)) {
+				MC.sendCommand(button.command!! /* non null invariant covered by getValidButtons */)
+				break
+			}
+		}
+	}
 
 	var lastHoveredComponent: InventoryButton? = null
 	var lastMouseMove = TimeMark.farPast()
 
-    @Subscribe
-    fun onRenderForeground(it: HandledScreenForegroundEvent) {
+	@Subscribe
+	fun onRenderForeground(it: HandledScreenForegroundEvent) {
 		val bounds = it.screen.getRectangle()
 
 		var hoveredComponent: InventoryButton? = null
 		for (button in getValidButtons(it.screen)) {
-            val buttonBounds = button.getBounds(bounds)
-            it.context.matrices.pushMatrix()
-            it.context.matrices.translate(buttonBounds.minX.toFloat(), buttonBounds.minY.toFloat())
-            button.render(it.context)
-            it.context.matrices.popMatrix()
+			val buttonBounds = button.getBounds(bounds)
+			it.context.matrices.pushMatrix()
+			it.context.matrices.translate(buttonBounds.minX.toFloat(), buttonBounds.minY.toFloat())
+			button.render(it.context)
+			it.context.matrices.popMatrix()
 
 			if (buttonBounds.contains(it.mouseX, it.mouseY) && TConfig.hoverText && hoveredComponent == null) {
 				hoveredComponent = button
@@ -94,23 +93,23 @@ object InventoryButtons {
 					)
 				}
 			}
-        }
+		}
 		if (hoveredComponent !== lastHoveredComponent)
 			lastMouseMove = TimeMark.now()
 		lastHoveredComponent = hoveredComponent
-        lastRectangle = bounds
-    }
+		lastRectangle = bounds
+	}
 
-    var lastRectangle: Rectangle? = null
-    fun openEditor() {
-        ScreenUtil.setScreenLater(
-            InventoryButtonEditor(
-                lastRectangle ?: Rectangle(
-                    MC.window.scaledWidth / 2 - 88,
-                    MC.window.scaledHeight / 2 - 83,
-                    176, 166,
-                )
-            )
-        )
-    }
+	var lastRectangle: Rectangle? = null
+	fun openEditor() {
+		ScreenUtil.setScreenLater(
+			InventoryButtonEditor(
+				lastRectangle ?: Rectangle(
+					MC.window.scaledWidth / 2 - 88,
+					MC.window.scaledHeight / 2 - 83,
+					176, 166,
+				)
+			)
+		)
+	}
 }
diff --git a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt
index 3734024..6043335 100644
--- a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt
+++ b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlay.kt
@@ -13,19 +13,18 @@ import moe.nea.firmament.events.ScreenChangeEvent
 import moe.nea.firmament.events.SlotClickEvent
 import moe.nea.firmament.events.SlotRenderEvents
 import moe.nea.firmament.events.TickEvent
-import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.customgui.customGui
 import moe.nea.firmament.util.data.Config
+import moe.nea.firmament.util.data.ManagedConfig
 import moe.nea.firmament.util.data.ProfileSpecificDataHolder
 
-object StorageOverlay : FirmamentFeature {
-
+object StorageOverlay {
 
+	@Config
 	object Data : ProfileSpecificDataHolder<StorageData>(serializer(), "storage-data", ::StorageData)
 
-	override val identifier: String
+	val identifier: String
 		get() = "storage-overlay"
 
 	@Config
@@ -86,9 +85,6 @@ object StorageOverlay : FirmamentFeature {
 		return amount * TConfig.scrollSpeed * (if (TConfig.inverseScroll) 1 else -1)
 	}
 
-	override val config: TConfig
-		get() = TConfig
-
 	var lastStorageOverlay: StorageOverviewScreen? = null
 	var skipNextStorageOverlayBackflip = false
 	var currentHandler: StorageBackingHandle? = null
diff --git a/src/main/kotlin/features/inventory/storageoverlay/StorageOverviewScreen.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverviewScreen.kt
index e383d29..65d7e8c 100644
--- a/src/main/kotlin/features/inventory/storageoverlay/StorageOverviewScreen.kt
+++ b/src/main/kotlin/features/inventory/storageoverlay/StorageOverviewScreen.kt
@@ -53,18 +53,18 @@ class StorageOverviewScreen() : Screen(Text.empty()) {
 
     inline fun layoutedForEach(onEach: (data: Pair<StoragePageSlot, StorageData.StorageInventory>, offsetX: Int, offsetY: Int) -> Unit) {
         var offsetY = 0
-        var currentMaxHeight = StorageOverlay.config.margin - StorageOverlay.config.padding - scroll
+        var currentMaxHeight = StorageOverlay.TConfig.margin - StorageOverlay.TConfig.padding - scroll
         var totalHeight = -currentMaxHeight
         content.storageInventories.onEachIndexed { index, (key, value) ->
-            val pageX = (index % StorageOverlay.config.columns)
+            val pageX = (index % StorageOverlay.TConfig.columns)
             if (pageX == 0) {
-                currentMaxHeight += StorageOverlay.config.padding
+                currentMaxHeight += StorageOverlay.TConfig.padding
                 offsetY += currentMaxHeight
                 totalHeight += currentMaxHeight
                 currentMaxHeight = 0
             }
             val xPosition =
-                width / 2 - (StorageOverlay.config.columns * (pageWidth + StorageOverlay.config.padding) - StorageOverlay.config.padding) / 2 + pageX * (pageWidth + StorageOverlay.config.padding)
+                width / 2 - (StorageOverlay.TConfig.columns * (pageWidth + StorageOverlay.TConfig.padding) - StorageOverlay.TConfig.padding) / 2 + pageX * (pageWidth + StorageOverlay.TConfig.padding)
             onEach(Pair(key, value), xPosition, offsetY)
             val height = getStorePageHeight(value)
             currentMaxHeight = max(currentMaxHeight, height)
@@ -102,7 +102,7 @@ class StorageOverviewScreen() : Screen(Text.empty()) {
         return true
     }
 
-	private fun getMaxScroll() = lastRenderedHeight - height + 2 * StorageOverlay.config.margin
+	private fun getMaxScroll() = lastRenderedHeight - height + 2 * StorageOverlay.TConfig.margin
 
     private fun renderStoragePage(context: DrawContext, page: StorageData.StorageInventory, mouseX: Int, mouseY: Int) {
         context.drawText(MC.font, page.title, 2, 2, -1, true)
diff --git a/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt b/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
index d99acd7..83e0d19 100644
--- a/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
+++ b/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
@@ -18,7 +18,6 @@ import net.minecraft.nbt.NbtIo
 import net.minecraft.nbt.NbtList
 import net.minecraft.nbt.NbtOps
 import net.minecraft.nbt.NbtSizeTracker
-import net.minecraft.registry.RegistryOps
 import moe.nea.firmament.util.ErrorUtil
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.mc.TolerantRegistriesOps