Always convert identity unbaked missing model to identity baked missing model
Related: #433
This commit is contained in:
parent
d7bfeedc62
commit
783627f4c5
|
|
@ -116,15 +116,19 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
|
||||||
model = bakedTopLevelModels.get(location);
|
model = bakedTopLevelModels.get(location);
|
||||||
if(model == null) {
|
if(model == null) {
|
||||||
UnbakedModel prototype = mfix$loadUnbakedModelDynamic(location);
|
UnbakedModel prototype = mfix$loadUnbakedModelDynamic(location);
|
||||||
prototype.resolveParents(this::getModel);
|
if(prototype == missingModel) {
|
||||||
if(DEBUG_MODEL_LOADS) {
|
|
||||||
ModernFix.LOGGER.info("Baking model {}", location);
|
|
||||||
}
|
|
||||||
this.method_61072(this.textureGetter, location, prototype);
|
|
||||||
model = bakedTopLevelModels.remove(location);
|
|
||||||
if(model == null) {
|
|
||||||
ModernFix.LOGGER.error("Failed to load model " + location);
|
|
||||||
model = bakedMissingModel;
|
model = bakedMissingModel;
|
||||||
|
} else {
|
||||||
|
prototype.resolveParents(this::getModel);
|
||||||
|
if(DEBUG_MODEL_LOADS) {
|
||||||
|
ModernFix.LOGGER.info("Baking model {}", location);
|
||||||
|
}
|
||||||
|
this.method_61072(this.textureGetter, location, prototype);
|
||||||
|
model = bakedTopLevelModels.remove(location);
|
||||||
|
if(model == null) {
|
||||||
|
ModernFix.LOGGER.error("Failed to load model " + location);
|
||||||
|
model = bakedMissingModel;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user