Fix up most of the remaining event handlers

[no changelog]

1 files changed, 31 insertions, 31 deletions

diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt
index e7f821d..866d1cc 100644
--- a/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt
@@ -9,11 +9,12 @@ package moe.nea.firmament.features.inventory
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen
 import net.minecraft.item.ItemStack
 import net.minecraft.util.Formatting
+import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.SlotRenderEvents
 import moe.nea.firmament.features.FirmamentFeature
-import moe.nea.firmament.rei.recipes.SBCraftingRecipe
 import moe.nea.firmament.rei.FirmamentReiPlugin.Companion.asItemEntry
 import moe.nea.firmament.rei.SBItemEntryDefinition
+import moe.nea.firmament.rei.recipes.SBCraftingRecipe
 import moe.nea.firmament.util.MC
 
 object CraftingOverlay : FirmamentFeature {
@@ -35,36 +36,35 @@ object CraftingOverlay : FirmamentFeature {
     override val identifier: String
         get() = "crafting-overlay"
 
-    override fun onLoad() {
-        SlotRenderEvents.After.subscribe { event ->
-            val slot = event.slot
-            val recipe = this.recipe ?: return@subscribe
-            if (slot.inventory != screen?.screenHandler?.inventory) return@subscribe
-            val recipeIndex = craftingOverlayIndices.indexOf(slot.index)
-            if (recipeIndex < 0) return@subscribe
-            val expectedItem = recipe.neuRecipe.inputs[recipeIndex]
-            val actualStack = slot.stack ?: ItemStack.EMPTY!!
-            val actualEntry = SBItemEntryDefinition.getEntry(actualStack).value
-            if ((actualEntry.skyblockId.neuItem != expectedItem.itemId || actualEntry.stackSize < expectedItem.amount) && expectedItem.amount.toInt() != 0) {
-                event.context.fill(
-                    event.slot.x,
-                    event.slot.y,
-                    event.slot.x + 16,
-                    event.slot.y + 16,
-                    0x80FF0000.toInt()
-                )
-            }
-            if (!slot.hasStack()) {
-                val itemStack = SBItemEntryDefinition.getEntry(expectedItem).asItemEntry().value
-                event.context.drawItem(itemStack, event.slot.x, event.slot.y)
-                event.context.drawItemInSlot(
-                    MC.font,
-                    itemStack,
-                    event.slot.x,
-                    event.slot.y,
-                    "${Formatting.RED}${expectedItem.amount.toInt()}"
-                )
-            }
+    @Subscribe
+    fun onSlotRender(event: SlotRenderEvents.After) {
+        val slot = event.slot
+        val recipe = this.recipe ?: return
+        if (slot.inventory != screen?.screenHandler?.inventory) return
+        val recipeIndex = craftingOverlayIndices.indexOf(slot.index)
+        if (recipeIndex < 0) return
+        val expectedItem = recipe.neuRecipe.inputs[recipeIndex]
+        val actualStack = slot.stack ?: ItemStack.EMPTY!!
+        val actualEntry = SBItemEntryDefinition.getEntry(actualStack).value
+        if ((actualEntry.skyblockId.neuItem != expectedItem.itemId || actualEntry.stackSize < expectedItem.amount) && expectedItem.amount.toInt() != 0) {
+            event.context.fill(
+                event.slot.x,
+                event.slot.y,
+                event.slot.x + 16,
+                event.slot.y + 16,
+                0x80FF0000.toInt()
+            )
+        }
+        if (!slot.hasStack()) {
+            val itemStack = SBItemEntryDefinition.getEntry(expectedItem).asItemEntry().value
+            event.context.drawItem(itemStack, event.slot.x, event.slot.y)
+            event.context.drawItemInSlot(
+                MC.font,
+                itemStack,
+                event.slot.x,
+                event.slot.y,
+                "${Formatting.RED}${expectedItem.amount.toInt()}"
+            )
         }
     }
 }