From cfbcfeaf4b5d55d5fd1af70b84139ff0d205a9b8 Mon Sep 17 00:00:00 2001 From: Bartek Bok Date: Wed, 27 Dec 2017 00:16:32 +0100 Subject: [PATCH] Enhance crash message when custom models return null default state (#4615) --- .../java/net/minecraftforge/client/model/ModelLoader.java | 6 +++++- 1 file changed, 5 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 39d00d5d63..6ff52a3f73 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -104,6 +104,7 @@ import org.apache.commons.lang3.tuple.Pair; import java.util.function.Function; import com.google.common.base.Joiner; import com.google.common.base.Objects; +import com.google.common.base.Preconditions; import java.util.Optional; import com.google.common.base.Predicate; import com.google.common.cache.CacheBuilder; @@ -670,7 +671,10 @@ public final class ModelLoader extends ModelBakery textures.addAll(model.getTextures()); // Kick this, just in case. models.add(model); - builder.add(Pair.of(model, new ModelStateComposition(v.getState(), model.getDefaultState()))); + + IModelState modelDefaultState = model.getDefaultState(); + Preconditions.checkNotNull(modelDefaultState, "Model %s returned null as default state", loc); + builder.add(Pair.of(model, new ModelStateComposition(v.getState(), modelDefaultState))); } if (models.size() == 0) //If all variants are missing, add one with the missing model and default rotation.