Merge remote-tracking branch 'origin/20.1/forge' into 19.2/forge

FiniteReality · May 3, 2024 · 63641de · 63641de
2 parents d9542fc + 7731565
commit 63641de
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/ModelBakeryMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/ModelBakeryMixin.java
@@ -17,8 +17,12 @@ private void epsilonizeBlockModel(ResourceLocation pLocation, CallbackInfoReturn
         if(pLocation.getPath().startsWith("block/")) {
             BlockModel bm = cir.getReturnValue();
             if(bm != null) {
-                for(BlockElement vanillaElement : bm.getElements()) {
-                    ((EpsilonizableBlockElement)vanillaElement).embeddium$epsilonize();
+                try {
+                    for(BlockElement vanillaElement : bm.getElements()) {
+                        ((EpsilonizableBlockElement)vanillaElement).embeddium$epsilonize();
+                    }
+                } catch(Throwable ignored) {
+                    // Epsilonizing isn't critical, make sure it doesn't prevent resource reload
                 }
             }
         }