Merge 1.16 into 1.18

Author: embeddedt

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -408,8 +408,10 @@ public void getOrLoadModelDynamic(ResourceLocation modelLocation, CallbackInfoRe
                     // As in pathological cases (e.g. Pedestals on 1.19) unbakedCache can lose
                     // the model immediately
                     UnbakedModel result = smallLoadingCache.getOrDefault(modelLocation, iunbakedmodel);
-                    // required as some mods (e.g. EBE) call bake directly on the returned model, without resolving parents themselves
-                    result.getMaterials(this::getModel, new HashSet<>());
+                    try {
+                        // required as some mods (e.g. EBE) call bake directly on the returned model, without resolving parents themselves
+                        result.getMaterials(this::getModel, new HashSet<>());
+                    } catch(RuntimeException ignored) {}
                     // We are done with loading, so clear this cache to allow GC of any unneeded models
                     if(mfix$nestedLoads == 0)
                         smallLoadingCache.clear();

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -286,8 +286,10 @@ public void getOrLoadModelDynamic(ResourceLocation modelLocation, CallbackInfoRe
                     // As in pathological cases (e.g. Pedestals on 1.19) unbakedCache can lose
                     // the model immediately
                     UnbakedModel result = smallLoadingCache.getOrDefault(modelLocation, iunbakedmodel);
-                    // required as some mods (e.g. EBE) call bake directly on the returned model, without resolving parents themselves
-                    result.getMaterials(this::getModel, new HashSet<>());
+                    try {
+                        // required as some mods (e.g. EBE) call bake directly on the returned model, without resolving parents themselves
+                        result.getMaterials(this::getModel, new HashSet<>());
+                    } catch(RuntimeException ignored) {}
                     // We are done with loading, so clear this cache to allow GC of any unneeded models
                     if(mfix$nestedLoads == 0)
                         smallLoadingCache.clear();