1 files changed, 59 insertions, 46 deletions
diff --git a/src/main/kotlin/features/inventory/CraftingOverlay.kt b/src/main/kotlin/features/inventory/CraftingOverlay.kt
index 031ef78..8e75478 100644
--- a/src/main/kotlin/features/inventory/CraftingOverlay.kt
+++ b/src/main/kotlin/features/inventory/CraftingOverlay.kt
@@ -1,11 +1,10 @@
-
-
 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.ScreenChangeEvent
 import moe.nea.firmament.events.SlotRenderEvents
 import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.rei.FirmamentReiPlugin.Companion.asItemEntry
@@ -15,52 +14,66 @@ import moe.nea.firmament.util.MC
 
 object CraftingOverlay : FirmamentFeature {
 
-    private var screen: GenericContainerScreen? = null
-    private var recipe: SBCraftingRecipe? = null
-    private val craftingOverlayIndices = listOf(
-        10, 11, 12,
-        19, 20, 21,
-        28, 29, 30,
-    )
+	private var screen: GenericContainerScreen? = null
+	private var recipe: SBCraftingRecipe? = null
+	private var useNextScreen = false
+	private val craftingOverlayIndices = listOf(
+		10, 11, 12,
+		19, 20, 21,
+		28, 29, 30,
+	)
+	val CRAFTING_SCREEN_NAME = "Craft Item"
 
+	fun setOverlay(screen: GenericContainerScreen?, recipe: SBCraftingRecipe) {
+		this.screen = screen
+		if (screen == null) {
+			useNextScreen = true
+		}
+		this.recipe = recipe
+	}
 
-    fun setOverlay(screen: GenericContainerScreen, recipe: SBCraftingRecipe) {
-        this.screen = screen
-        this.recipe = recipe
-    }
+	@Subscribe
+	fun onScreenChange(event: ScreenChangeEvent) {
+		if (useNextScreen && event.new is GenericContainerScreen
+			&& event.new.title?.string == "Craft Item"
+		) {
+			useNextScreen = false
+			screen = event.new
+		}
+	}
 
-    override val identifier: String
-        get() = "crafting-overlay"
+	override val identifier: String
+		get() = "crafting-overlay"
 
-    @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.getStackSize() < 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.getStackSize() < 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()}"
+			)
+		}
+	}
 }