fix: Missing cache for custom item models causing lags

3 files changed, 12 insertions, 6 deletions

diff --git a/src/main/kotlin/events/CustomItemModelEvent.kt b/src/main/kotlin/events/CustomItemModelEvent.kt
index 11528fd..e7b6eb8 100644
--- a/src/main/kotlin/events/CustomItemModelEvent.kt
+++ b/src/main/kotlin/events/CustomItemModelEvent.kt
@@ -1,7 +1,10 @@
 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
 
 // TODO: assert an order on these events
 data class CustomItemModelEvent(
@@ -9,11 +12,17 @@ data class CustomItemModelEvent(
 	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
 			if (itemStack == null) return null
-			return publish(CustomItemModelEvent(itemStack)).overrideModel
+			return cache.invoke(itemStack).getOrNull()
+		}
+
+		fun getModelIdentifier0(itemStack: ItemStack): Optional<Identifier> {
+			// TODO: add an error / warning if the model does not exist
+			return Optional.ofNullable(publish(CustomItemModelEvent(itemStack)).overrideModel)
 		}
 	}
 
diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt
index d9ca5b4..0de9eb5 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt
@@ -44,6 +44,7 @@ object CustomSkyBlockTextures : FirmamentFeature {
 	val allItemCaches by lazy {
 		listOf(
 			skullTextureCache.cache,
+			CustomItemModelEvent.cache.cache,
 			CustomGlobalArmorOverrides.overrideCache.cache
 		)
 	}
diff --git a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceItemModelPatch.java b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceItemModelPatch.java
index dfc87a0..a71ad92 100644
--- a/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceItemModelPatch.java
+++ b/src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceItemModelPatch.java
@@ -27,10 +27,6 @@ public class ReplaceItemModelPatch {
 	@Final
 	private Function<Identifier, ItemModel> modelGetter;
 
-	@Inject(method = "<init>", at = @At("TAIL"))
-	private void saveMissingModel(BakedModelManager bakedModelManager, CallbackInfo ci) {
-	}
-
 	@Unique
 	private boolean hasModel(Identifier identifier) {
 		return !(modelGetter.apply(identifier) instanceof MissingItemModel);