Fix Debark crash

embeddedt · Aug 26, 2023 · 2c82194 · 2c82194
1 parent 55c2b5b
commit 2c82194
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/org/embeddedt/vintagefix/dynamicresources/model/DynamicModelProvider.java b/src/main/java/org/embeddedt/vintagefix/dynamicresources/model/DynamicModelProvider.java
@@ -72,6 +72,14 @@ public IModel getObject(ResourceLocation location) {
         return opt.orElse(null);
     }
 
+    public IModel getModelOrMissing(ResourceLocation location) {
+        try {
+            return getObject(location);
+        } catch(RuntimeException e) {
+            return getObject(new ModelResourceLocation("builtin/missing", "missing"));
+        }
+    }
+
     private static final Map<ResourceLocation, IModel> MODEL_LOADER_REGISTRY_CACHE = ObfuscationReflectionHelper.getPrivateValue(ModelLoaderRegistry.class, null, "cache");
 
     private static final Class<?> VANILLA_MODEL_WRAPPER;

diff --git a/...ava/org/embeddedt/vintagefix/mixin/dynamic_resources/MixinModelLoaderEarlyViewDebark.java b/...ava/org/embeddedt/vintagefix/mixin/dynamic_resources/MixinModelLoaderEarlyViewDebark.java
@@ -24,7 +24,7 @@ public class MixinModelLoaderEarlyViewDebark {
 
     @Inject(method = "<init>", at = @At("RETURN") , remap = false)
     private void changeBackingMap(CallbackInfo ci) {
-        this.secretSauce = Maps.asMap(ModelLocationInformation.allKnownModelLocations, location -> DynamicModelProvider.instance.getObject(location));
+        this.secretSauce = Maps.asMap(ModelLocationInformation.allKnownModelLocations, location -> DynamicModelProvider.instance.getModelOrMissing(location));
     }
 
 }