From 685a97fd93609f811e62982542e7d535dba8672a Mon Sep 17 00:00:00 2001
From: RainWarrior <rainwarrior@fry.su>
Date: Thu, 4 Jun 2015 18:07:03 +0300
Subject: [PATCH] Fixed missing variant logging; added the possibility to
 specify the item variant in the blockstate json.

---
 .../client/model/ModelLoader.java             | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
index 3701a9f0ed..57d0cc314f 100644
--- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java
+++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
@@ -91,7 +91,8 @@ public class ModelLoader extends ModelBakery
         isLoading = true;
         loadBlocks();
         loadItems();
-        stateModels.put(MODEL_MISSING, getModel(new ResourceLocation(MODEL_MISSING.getResourceDomain(), MODEL_MISSING.getResourcePath())));
+        IModel missing = getModel(new ResourceLocation(MODEL_MISSING.getResourceDomain(), MODEL_MISSING.getResourcePath()));
+        stateModels.put(MODEL_MISSING, missing);
         textures.remove(TextureMap.LOCATION_MISSING_TEXTURE);
         textures.addAll(LOCATIONS_BUILTIN_TEXTURES);
         textureMap.loadSprites(resourceManager, new IIconCreator()
@@ -106,9 +107,17 @@ public class ModelLoader extends ModelBakery
         });
         sprites.put(new ResourceLocation("missingno"), textureMap.getMissingSprite());
         Function<ResourceLocation, TextureAtlasSprite> textureGetter = Functions.forMap(sprites, textureMap.getMissingSprite());
+        IFlexibleBakedModel missingBaked = missing.bake(missing.getDefaultState(), Attributes.DEFAULT_BAKED_FORMAT, textureGetter);
         for(Entry<ModelResourceLocation, IModel> e : stateModels.entrySet())
         {
-            bakedRegistry.putObject(e.getKey(), e.getValue().bake(e.getValue().getDefaultState(), Attributes.DEFAULT_BAKED_FORMAT, textureGetter));
+            if(e.getValue() == getMissingModel())
+            {
+                bakedRegistry.putObject(e.getKey(), missingBaked);
+            }
+            else
+            {
+                bakedRegistry.putObject(e.getKey(), e.getValue().bake(e.getValue().getDefaultState(), Attributes.DEFAULT_BAKED_FORMAT, textureGetter));
+            }
         }
         return bakedRegistry;
     }
@@ -159,7 +168,8 @@ public class ModelLoader extends ModelBakery
                 IModel model = getModel(file);
                 if(model == null || model == getMissingModel())
                 {
-                    missingVariants.add(memory);
+                    FMLLog.fine("Item json isn't found for '" + memory + "', trying to load the variant from the blockstate json");
+                    registerVariant(getModelBlockDefinition(memory), memory);
                 }
                 else stateModels.put(memory, model);
             }
@@ -569,9 +579,11 @@ public class ModelLoader extends ModelBakery
 
     public void onPostBakeEvent(IRegistry modelRegistry)
     {
+        Object missingModel = modelRegistry.getObject(MODEL_MISSING);
         for(ModelResourceLocation missing : missingVariants)
         {
-            if(modelRegistry.getObject(missing) == null)
+            Object model = modelRegistry.getObject(missing);
+            if(model == null || model == missingModel)
             {
                 FMLLog.severe("Model definition for location %s not found", missing);
             }