From f562579054f6d53d87df9ef2a8ff967845ef6257 Mon Sep 17 00:00:00 2001
From: RainWarrior <rainwarrior@fry.su>
Date: Mon, 4 Jan 2016 14:08:52 +0300
Subject: [PATCH] Don't crash on exception during loading of item variants from
 blockstate jsons.

---
 .../net/minecraftforge/client/model/ModelLoader.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
index 6dec67520b..9404ff5534 100644
--- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java
+++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
@@ -203,7 +203,14 @@ public class ModelLoader extends ModelBakery
                     if (model == null || model == getMissingModel())
                     {
                         FMLLog.fine("Item json isn't found for '" + memory + "', trying to load the variant from the blockstate json");
-                        registerVariant(getModelBlockDefinition(memory), memory);
+                        try
+                        {
+                            registerVariant(getModelBlockDefinition(memory), memory);
+                        }
+                        catch (Exception exception)
+                        {
+                            FMLLog.getLogger().warn("Unable to load definition " + memory, exception);
+                        }
                     }
                     else stateModels.put(memory, model);
                 }