1 files changed, 18 insertions, 9 deletions
diff --git a/src/main/kotlin/moe/nea/firmament/events/IsSlotProtectedEvent.kt b/src/main/kotlin/moe/nea/firmament/events/IsSlotProtectedEvent.kt
index f1a861e..02557ab 100644
--- a/src/main/kotlin/moe/nea/firmament/events/IsSlotProtectedEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/IsSlotProtectedEvent.kt
@@ -6,28 +6,37 @@
 
 package moe.nea.firmament.events
 
+import net.minecraft.item.ItemStack
 import net.minecraft.screen.slot.Slot
+import net.minecraft.screen.slot.SlotActionType
 import net.minecraft.text.Text
 import moe.nea.firmament.util.CommonSoundEffects
 import moe.nea.firmament.util.MC
 
 data class IsSlotProtectedEvent(
-    val slot: Slot, var isProtected: Boolean = false
+    val slot: Slot?,
+    val actionType: SlotActionType,
+    var isProtected: Boolean,
+    val itemStackOverride: ItemStack?,
 ) : FirmamentEvent() {
+    val itemStack get() = itemStackOverride ?: slot!!.stack
+
+    fun protect() {
+        isProtected = true
+    }
+
     companion object : FirmamentEventBus<IsSlotProtectedEvent>() {
         @JvmStatic
-        fun shouldBlockInteraction(slot: Slot?): Boolean {
-            if (slot == null) return false
-            return publish(IsSlotProtectedEvent(slot)).isProtected.also {
+        @JvmOverloads
+        fun shouldBlockInteraction(slot: Slot?, action: SlotActionType, itemStackOverride: ItemStack? = null): Boolean {
+            if (slot == null && itemStackOverride == null) return false
+            val event = IsSlotProtectedEvent(slot, action, false, itemStackOverride)
+            return publish(event).isProtected.also {
                 if (it) {
-                    MC.player?.sendMessage(Text.translatable("firmament.protectitem").append(slot.stack.name))
+                    MC.player?.sendMessage(Text.translatable("firmament.protectitem").append(event.itemStack.name))
                     CommonSoundEffects.playFailure()
                 }
             }
         }
     }
-
-    fun protect() {
-        isProtected = true
-    }
 }