From 6f361dafa8f50ec3f0e0653ef4627cf2107b60bc Mon Sep 17 00:00:00 2001
From: James Mitchell <tehgeek@gmail.com>
Date: Tue, 17 Jan 2017 13:19:58 -0800
Subject: [PATCH] Skip first baking in ModelLoader (#3621) (#3638)

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

diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
index c9c1fb6b05..dd7d7e4372 100644
--- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java
+++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
@@ -117,6 +117,7 @@ import com.google.common.collect.Sets;
 
 public final class ModelLoader extends ModelBakery
 {
+    private static boolean firstLoad = Boolean.parseBoolean(System.getProperty("fml.skipFirstModelBake", "true"));
     private final Map<ModelResourceLocation, IModel> stateModels = Maps.newHashMap();
     private final Set<ModelResourceLocation> missingVariants = Sets.newHashSet();
     private final Map<ResourceLocation, Exception> loadingExceptions = Maps.newHashMap();
@@ -168,6 +169,16 @@ public final class ModelLoader extends ModelBakery
         HashMultimap<IModel, ModelResourceLocation> models = HashMultimap.create();
         Multimaps.invertFrom(Multimaps.forMap(stateModels), models);
 
+        if (firstLoad)
+        {
+            firstLoad = false;
+            for (ModelResourceLocation mrl : stateModels.keySet())
+            {
+                bakedRegistry.putObject(mrl, missingBaked);
+            }
+            return bakedRegistry;
+        }
+
         ProgressBar bakeBar = ProgressManager.push("ModelLoader: baking", models.keySet().size());
 
         for(IModel model : models.keySet())