From 36cf26be6d783d56ecff22af753def8e6ee5aa62 Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Tue, 21 Jan 2025 13:17:01 +0100
Subject: fix: Don't hide global overrides for textures with extra attributes
 ids

---
 src/main/kotlin/events/CustomItemModelEvent.kt | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/main/kotlin/events')

diff --git a/src/main/kotlin/events/CustomItemModelEvent.kt b/src/main/kotlin/events/CustomItemModelEvent.kt
index e7b6eb8..21ee326 100644
--- a/src/main/kotlin/events/CustomItemModelEvent.kt
+++ b/src/main/kotlin/events/CustomItemModelEvent.kt
@@ -5,28 +5,39 @@ 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? {
+		fun getModelIdentifier(itemStack: ItemStack?, itemModelManager: IntrospectableItemModelManager): Identifier? {
 			if (itemStack == null) return null
-			return cache.invoke(itemStack).getOrNull()
+			return cache.invoke(itemStack, itemModelManager).getOrNull()
 		}
 
-		fun getModelIdentifier0(itemStack: ItemStack): Optional<Identifier> {
+		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)).overrideModel)
+			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
 	}
 }
-- 
cgit