Do not assume normal blockstates are provided to getModelForState

Never make assumptions about 1.12 content.
embeddedt · Jun 1, 2024 · 6ebc4e0 · 6ebc4e0
1 parent d9029c7
commit 6ebc4e0
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/org/embeddedt/vintagefix/mixin/dynamic_resources/MixinBlockModelShapes.java b/src/main/java/org/embeddedt/vintagefix/mixin/dynamic_resources/MixinBlockModelShapes.java
@@ -67,16 +67,20 @@ private IBakedModel getModelForStateSlow(IBlockState state) {
      **/
     @Overwrite
     public IBakedModel getModelForState(IBlockState state) {
-        IModelHoldingBlockState holder = (IModelHoldingBlockState)state;
-        IBakedModel model = holder.vfix$getModel();
+        if(state instanceof IModelHoldingBlockState) {
+            IModelHoldingBlockState holder = (IModelHoldingBlockState)state;
+            IBakedModel model = holder.vfix$getModel();
 
-        if(model != null) {
+            if(model != null) {
+                return model;
+            }
+
+            model = this.getModelForStateSlow(state);
+            holder.vfix$setModel(model);
             return model;
+        } else {
+            return this.getModelForStateSlow(state);
         }
-
-        model = this.getModelForStateSlow(state);
-        holder.vfix$setModel(model);
-        return model;
     }
 
     @Override