3 files changed, 67 insertions, 36 deletions

diff --git a/src/main/kotlin/events/CustomItemModelEvent.kt b/src/main/kotlin/events/CustomItemModelEvent.kt
index 11528fd..21ee326 100644
--- a/src/main/kotlin/events/CustomItemModelEvent.kt
+++ b/src/main/kotlin/events/CustomItemModelEvent.kt
@@ -1,23 +1,43 @@
 package moe.nea.firmament.events
 
+import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 import net.minecraft.item.ItemStack
 import net.minecraft.util.Identifier
+import moe.nea.firmament.util.collections.WeakCache
+import moe.nea.firmament.util.mc.IntrospectableItemModelManager
 
 // TODO: assert an order on these events
 data class CustomItemModelEvent(
 	val itemStack: ItemStack,
+	val itemModelManager: IntrospectableItemModelManager,
 	var overrideModel: Identifier? = null,
 ) : FirmamentEvent() {
 	companion object : FirmamentEventBus<CustomItemModelEvent>() {
+		val cache = WeakCache.memoize("ItemModelIdentifier", ::getModelIdentifier0)
+
 		@JvmStatic
-		fun getModelIdentifier(itemStack: ItemStack?): Identifier? {
-			// TODO: Re-add memoization and add an error / warning if the model does not exist
+		fun getModelIdentifier(itemStack: ItemStack?, itemModelManager: IntrospectableItemModelManager): Identifier? {
 			if (itemStack == null) return null
-			return publish(CustomItemModelEvent(itemStack)).overrideModel
+			return cache.invoke(itemStack, itemModelManager).getOrNull()
+		}
+
+		fun getModelIdentifier0(
+			itemStack: ItemStack,
+			itemModelManager: IntrospectableItemModelManager
+		): Optional<Identifier> {
+			// TODO: add an error / warning if the model does not exist
+			return Optional.ofNullable(publish(CustomItemModelEvent(itemStack, itemModelManager)).overrideModel)
 		}
 	}
 
 	fun overrideIfExists(overrideModel: Identifier) {
-		this.overrideModel = overrideModel
+		if (itemModelManager.hasModel_firmament(overrideModel))
+			this.overrideModel = overrideModel
+	}
+
+	fun overrideIfEmpty(identifier: Identifier) {
+		if (overrideModel == null)
+			overrideModel = identifier
 	}
 }
diff --git a/src/main/kotlin/events/FirmamentEventBus.kt b/src/main/kotlin/events/FirmamentEventBus.kt
index 71331d1..af4e16a 100644
--- a/src/main/kotlin/events/FirmamentEventBus.kt
+++ b/src/main/kotlin/events/FirmamentEventBus.kt
@@ -3,6 +3,7 @@ package moe.nea.firmament.events
 import java.util.concurrent.CopyOnWriteArrayList
 import org.apache.commons.lang3.reflect.TypeUtils
 import moe.nea.firmament.Firmament
+import moe.nea.firmament.util.ErrorUtil
 import moe.nea.firmament.util.MC
 
 /**
@@ -48,7 +49,7 @@ open class FirmamentEventBus<T : FirmamentEvent> {
                     val klass = e.javaClass
                     if (!function.knownErrors.contains(klass) || Firmament.DEBUG) {
                         function.knownErrors.add(klass)
-                        Firmament.logger.error("Caught exception during processing event $event by $function", e)
+                        ErrorUtil.softError("Caught exception during processing event $event by $function", e)
                     }
                 }
             }
diff --git a/src/main/kotlin/events/IsSlotProtectedEvent.kt b/src/main/kotlin/events/IsSlotProtectedEvent.kt
index cd2b676..eac2d9b 100644
--- a/src/main/kotlin/events/IsSlotProtectedEvent.kt
+++ b/src/main/kotlin/events/IsSlotProtectedEvent.kt
@@ -1,5 +1,3 @@
-
-
 package moe.nea.firmament.events
 
 import net.minecraft.item.ItemStack
@@ -10,37 +8,49 @@ import moe.nea.firmament.util.CommonSoundEffects
 import moe.nea.firmament.util.MC
 
 data class IsSlotProtectedEvent(
-    val slot: Slot?,
-    val actionType: SlotActionType,
-    var isProtected: Boolean,
-    val itemStackOverride: ItemStack?,
-    var silent: Boolean = false,
+	val slot: Slot?,
+	val actionType: SlotActionType,
+	var isProtected: Boolean,
+	val itemStackOverride: ItemStack?,
+	val origin: MoveOrigin,
+	var silent: Boolean = false,
 ) : FirmamentEvent() {
-    val itemStack get() = itemStackOverride ?: slot!!.stack
+	val itemStack get() = itemStackOverride ?: slot!!.stack
 
-    fun protect() {
-        isProtected = true
-    }
+	fun protect() {
+		isProtected = true
+		silent = false
+	}
 
-    fun protectSilent() {
-        if (!isProtected) {
-            silent = true
-        }
-        isProtected = true
-    }
+	fun protectSilent() {
+		if (!isProtected) {
+			silent = true
+		}
+		isProtected = true
+	}
 
-    companion object : FirmamentEventBus<IsSlotProtectedEvent>() {
-        @JvmStatic
-        @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)
-            publish(event)
-            if (event.isProtected && !event.silent) {
-                MC.sendChat(Text.translatable("firmament.protectitem").append(event.itemStack.name))
-                CommonSoundEffects.playFailure()
-            }
-            return event.isProtected
-        }
-    }
+	enum class MoveOrigin {
+		DROP_FROM_HOTBAR,
+		SALVAGE,
+		INVENTORY_MOVE
+		;
+	}
+	companion object : FirmamentEventBus<IsSlotProtectedEvent>() {
+		@JvmStatic
+		@JvmOverloads
+		fun shouldBlockInteraction(
+			slot: Slot?, action: SlotActionType,
+			origin: MoveOrigin,
+			itemStackOverride: ItemStack? = null,
+		): Boolean {
+			if (slot == null && itemStackOverride == null) return false
+			val event = IsSlotProtectedEvent(slot, action, false, itemStackOverride, origin)
+			publish(event)
+			if (event.isProtected && !event.silent) {
+				MC.sendChat(Text.translatable("firmament.protectitem").append(event.itemStack.name))
+				CommonSoundEffects.playFailure()
+			}
+			return event.isProtected
+		}
+	}
 }