WIP: Port to compilation on 1.21.4

2 files changed, 17 insertions, 27 deletions

diff --git a/src/main/kotlin/events/BakeExtraModelsEvent.kt b/src/main/kotlin/events/BakeExtraModelsEvent.kt
index adaa495..35bfecb 100644
--- a/src/main/kotlin/events/BakeExtraModelsEvent.kt
+++ b/src/main/kotlin/events/BakeExtraModelsEvent.kt
@@ -1,11 +1,13 @@
 package moe.nea.firmament.events
 
 import java.util.function.BiConsumer
+import net.minecraft.client.item.ItemAssetsLoader
 import net.minecraft.client.render.model.ReferencedModelsCollector
 import net.minecraft.client.util.ModelIdentifier
 import net.minecraft.util.Identifier
 
-// TODO: Rename this event, since it is not really directly baking models anymore
+// TODO: This event may be removed now since ItemAssetsLoader seems to load all item models now (probably to cope with servers setting the item_model component). Check whether this also applies to blocks now.
+//@Deprecated(level = DeprecationLevel.ERROR, message = "This is no longer needed, since ItemAssetsLoader loads all item models.")
 class BakeExtraModelsEvent(
 	private val addAnyModel: BiConsumer<ModelIdentifier, Identifier>,
 ) : FirmamentEvent() {
@@ -15,10 +17,13 @@ class BakeExtraModelsEvent(
 	}
 
 	fun addItemModel(modelIdentifier: ModelIdentifier) {
-		addNonItemModel(
-			modelIdentifier,
-			modelIdentifier.id.withPrefixedPath(ReferencedModelsCollector.ITEM_DIRECTORY))
+	// TODO: If this is still needed: ItemAssetsLoader.FINDER
+	//		addNonItemModel(
+//			modelIdentifier,
+//			modelIdentifier.id.withPrefixedPath())
 	}
 
+//	@Deprecated(level = DeprecationLevel.ERROR, message = "This is no longer needed, since ItemAssetsLoader loads all item models.")
+	@Suppress("DEPRECATION")
 	companion object : FirmamentEventBus<BakeExtraModelsEvent>()
 }
diff --git a/src/main/kotlin/events/CustomItemModelEvent.kt b/src/main/kotlin/events/CustomItemModelEvent.kt
index 4328d77..7abdaf7 100644
--- a/src/main/kotlin/events/CustomItemModelEvent.kt
+++ b/src/main/kotlin/events/CustomItemModelEvent.kt
@@ -1,38 +1,23 @@
 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.util.ModelIdentifier
 import net.minecraft.item.ItemStack
-import moe.nea.firmament.util.ErrorUtil
-import moe.nea.firmament.util.collections.WeakCache
+import net.minecraft.util.Identifier
 
+// TODO: assert an order on these events
 data class CustomItemModelEvent(
 	val itemStack: ItemStack,
-	var overrideModel: ModelIdentifier? = null,
+	var overrideModel: Identifier? = null,
 ) : FirmamentEvent() {
 	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? {
+		fun getModelIdentifier(itemStack: ItemStack?): Identifier? {
+			// TODO: Re-add memoization and add an error / warning if the model does not exist
 			if (itemStack == null) return null
 			return publish(CustomItemModelEvent(itemStack)).overrideModel
 		}
+	}
 
-		@JvmStatic
-		fun getModel(itemStack: ItemStack?, thing: ItemModels): BakedModel? {
-			if (itemStack == null) return null
-			return cache.invoke(itemStack, thing).getOrNull()
-		}
+	fun overrideIfExists(overrideModel: Identifier) {
+		TODO()
 	}
 }