Fix Facade model cache not being collision-free

AppliedEnergistics · Jul 1, 2024 · 6be78d9 · 6be78d9
1 parent c55b9fb
commit 6be78d9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java
@@ -19,7 +19,6 @@
 package appeng.client.render;
 
 import java.util.List;
-import java.util.Objects;
 
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -51,12 +50,15 @@ public List<BakedModel> getRenderPasses(ItemStack stack, boolean fabulous) {
         }
 
         ItemStack textureItem = itemFacade.getTextureItem(stack);
+        if (textureItem.isEmpty()) {
+            return List.of(this);
+        }
 
-        int hash = Objects.hash(BuiltInRegistries.ITEM.getKey(textureItem.getItem()), textureItem.getTag());
-        FacadeBakedItemModel model = cache.get(hash);
+        var itemId = BuiltInRegistries.ITEM.getId(textureItem.getItem());
+        var model = cache.get(itemId);
         if (model == null) {
             model = new FacadeBakedItemModel(getBaseModel(), textureItem, facadeBuilder);
-            cache.put(hash, model);
+            cache.put(itemId, model);
         }
 
         return List.of(model);