From 968b7cae40ada4204b7a6725536d5c1d336db3b3 Mon Sep 17 00:00:00 2001
From: RainWarrior <rainwarrior@fry.su>
Date: Mon, 18 Jan 2016 21:35:23 +0300
Subject: [PATCH] Correctly handle error caused by missing/malformed bucket
 model definition file.

---
 .../net/minecraftforge/client/model/ModelLoader.java  | 11 +++++++++--
 1 file changed, 9 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 d3a25aeaf..c130a0eca 100644
--- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java
+++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
@@ -256,8 +256,15 @@ public class ModelLoader extends ModelBakery
             if(!stateModels.containsKey(ModelDynBucket.LOCATION))
             {
                 // load forges blockstate json for it
-                ModelResourceLocation memory = getInventoryVariant("forge:dynbucket");
-                registerVariant(getModelBlockDefinition(memory), memory);
+                try
+                {
+                    registerVariant(getModelBlockDefinition(ModelDynBucket.LOCATION), ModelDynBucket.LOCATION);
+                }
+                catch (Exception exception)
+                {
+                    FMLLog.getLogger().error("Could not load the forge bucket model from the blockstate", exception);
+                    return;
+                }
             }
 
             // empty bucket