WIP: Port to compilation on 1.21.4

1 files changed, 9 insertions, 4 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>()
 }