From 962b843199286d8e429572f54d0212fde71c2bf5 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sat, 20 May 2023 12:35:33 -0400
Subject: [PATCH] Avoid exposing mods to exceptions when baking models

---
 .../dynamicresources/DynamicBakedModelProvider.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
index d11971b3..5803fb77 100644
--- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
+++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
@@ -13,6 +13,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.state.BlockState;
 import org.apache.commons.lang3.tuple.Triple;
+import org.embeddedt.modernfix.ModernFix;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -106,7 +107,12 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
         if(model != SENTINEL)
             return model;
         else {
-            model = bakery.bake((ResourceLocation)o, BlockModelRotation.X0_Y0);
+            try {
+                model = bakery.bake((ResourceLocation)o, BlockModelRotation.X0_Y0);
+            } catch(RuntimeException e) {
+                ModernFix.LOGGER.error("Exception baking {}: {}", o, e);
+                model = missingModel;
+            }
             if(model == missingModel) {
                 // to correctly emulate the original map, we return null for missing models
                 permanentOverrides.put((ResourceLocation) o, null);