Merge 1.18 into 1.19.2

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelShaperMixin.java

@@ -6,6 +6,7 @@
 import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.world.item.Item;
+import org.embeddedt.modernfix.dynamicresources.DynamicModelCache;
 import org.embeddedt.modernfix.dynamicresources.ModelLocationCache;
 import org.embeddedt.modernfix.util.DynamicInt2ObjectMap;
 import org.spongepowered.asm.mixin.*;
@@ -31,6 +32,8 @@ public ItemModelShaperMixin() {
 
     private static final ModelResourceLocation SENTINEL_VANILLA = new ModelResourceLocation("modernfix", "sentinel");
 
+    private final DynamicModelCache<Item> mfix$itemModelCache = new DynamicModelCache<>(k -> this.mfix$getModelForItem((Item)k), true);
+
     @Inject(method = "<init>", at = @At("RETURN"))
     private void replaceLocationMap(CallbackInfo ci) {
         overrideLocationsVanilla = new HashMap<>();
@@ -47,15 +50,20 @@ private void replaceLocationMap(CallbackInfo ci) {
         return map;
     }
 
+
+    private BakedModel mfix$getModelForItem(Item item) {
+        ModelResourceLocation map = mfix$getLocation(item);
+        return map == null ? null : getModelManager().getModel(map);
+    }
+
     /**
      * @author embeddedt
      * @reason Get the stored location for that item and meta, and get the model
      * from that location from the model manager.
      **/
     @Overwrite
     public BakedModel getItemModel(Item item) {
-        ModelResourceLocation map = mfix$getLocation(item);
-        return map == null ? null : getModelManager().getModel(map);
+        return this.mfix$itemModelCache.get(item);
     }
 
     /**
@@ -74,5 +82,7 @@ public void register(Item item, ModelResourceLocation location) {
      * all models).
      **/
     @Overwrite
-    public void rebuildCache() {}
+    public void rebuildCache() {
+        this.mfix$itemModelCache.clear();
+    }
 }