From 533b03300a59830e438a104f67ff4c171ee9d861 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Thu, 18 Jan 2018 21:14:33 +0000 Subject: [PATCH] Catch and log exceptions during model baking (#4609) --- .../minecraftforge/client/model/ModelLoader.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index bfa12c3537..97b0ef22b9 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -180,14 +180,23 @@ public final class ModelLoader extends ModelBakery for(IModel model : models.keySet()) { - bakeBar.step("[" + Joiner.on(", ").join(models.get(model)) + "]"); + String modelLocations = "[" + Joiner.on(", ").join(models.get(model)) + "]"; + bakeBar.step(modelLocations); if(model == getMissingModel()) { bakedModels.put(model, missingBaked); } else { - bakedModels.put(model, model.bake(model.getDefaultState(), DefaultVertexFormats.ITEM, DefaultTextureGetter.INSTANCE)); + try + { + bakedModels.put(model, model.bake(model.getDefaultState(), DefaultVertexFormats.ITEM, DefaultTextureGetter.INSTANCE)); + } + catch (Exception e) + { + FMLLog.log.error("Exception baking model for location(s) {}:", modelLocations, e); + bakedModels.put(model, missingBaked); + } } }