From dfdbf8544ad739269992c02edf35950f75429a2e Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sun, 9 Jul 2023 20:36:57 -0400
Subject: [PATCH] Guard against early parent resolution failing

---
 .../mixin/perf/dynamic_resources/ModelBakeryMixin.java      | 6 ++++--
 .../mixin/perf/dynamic_resources/ModelBakeryMixin.java      | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
index 4e74eb16..791bc274 100644
--- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
+++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
@@ -401,8 +401,10 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
                     // 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();
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
index fb7c9598..cbf5eea1 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
@@ -286,8 +286,10 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
                     // 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();