1.21.3 WIP

1 files changed, 24 insertions, 22 deletions

diff --git a/src/main/kotlin/events/CustomItemModelEvent.kt b/src/main/kotlin/events/CustomItemModelEvent.kt
index e50eca4..d5c08f4 100644
--- a/src/main/kotlin/events/CustomItemModelEvent.kt
+++ b/src/main/kotlin/events/CustomItemModelEvent.kt
@@ -2,35 +2,37 @@ package moe.nea.firmament.events
 
 import java.util.Optional
 import kotlin.jvm.optionals.getOrNull
+import net.minecraft.client.render.item.ItemModels
 import net.minecraft.client.render.model.BakedModel
-import net.minecraft.client.render.model.BakedModelManager
 import net.minecraft.client.util.ModelIdentifier
 import net.minecraft.item.ItemStack
+import moe.nea.firmament.util.ErrorUtil
 import moe.nea.firmament.util.collections.WeakCache
 
 data class CustomItemModelEvent(
-    val itemStack: ItemStack,
-    var overrideModel: ModelIdentifier? = null,
+	val itemStack: ItemStack,
+	var overrideModel: ModelIdentifier? = null,
 ) : FirmamentEvent() {
-    companion object : FirmamentEventBus<CustomItemModelEvent>() {
-        val cache =
-            WeakCache.memoize<ItemStack, BakedModelManager, Optional<BakedModel>>("CustomItemModels") { stack, models ->
-                val modelId = getModelIdentifier(stack) ?: return@memoize Optional.empty()
-                val bakedModel = models.getModel(modelId)
-                if (bakedModel === models.missingModel) return@memoize Optional.empty()
-                Optional.of(bakedModel)
-            }
+	companion object : FirmamentEventBus<CustomItemModelEvent>() {
+		val cache =
+			WeakCache.memoize<ItemStack, ItemModels, Optional<BakedModel>>("CustomItemModels") { stack, models ->
+				val modelId = getModelIdentifier(stack) ?: return@memoize Optional.empty()
+				ErrorUtil.softCheck("Model Id needs to have an inventory variant") { modelId.variant() == "inventory" }
+				val bakedModel = models.getModel(modelId.id)
+				if (bakedModel == null || bakedModel === models.missingModelSupplier.get()) return@memoize Optional.empty()
+				Optional.of(bakedModel)
+			}
 
-        @JvmStatic
-        fun getModelIdentifier(itemStack: ItemStack?): ModelIdentifier? {
-            if (itemStack == null) return null
-            return publish(CustomItemModelEvent(itemStack)).overrideModel
-        }
+		@JvmStatic
+		fun getModelIdentifier(itemStack: ItemStack?): ModelIdentifier? {
+			if (itemStack == null) return null
+			return publish(CustomItemModelEvent(itemStack)).overrideModel
+		}
 
-        @JvmStatic
-        fun getModel(itemStack: ItemStack?, thing: BakedModelManager): BakedModel? {
-            if (itemStack == null) return null
-            return cache.invoke(itemStack, thing).getOrNull()
-        }
-    }
+		@JvmStatic
+		fun getModel(itemStack: ItemStack?, thing: ItemModels): BakedModel? {
+			if (itemStack == null) return null
+			return cache.invoke(itemStack, thing).getOrNull()
+		}
+	}
 }