diff --git a/src/main/java/net/minecraftforge/client/model/FancyMissingModel.java b/src/main/java/net/minecraftforge/client/model/FancyMissingModel.java index 36b81dc851..a768df857e 100644 --- a/src/main/java/net/minecraftforge/client/model/FancyMissingModel.java +++ b/src/main/java/net/minecraftforge/client/model/FancyMissingModel.java @@ -32,6 +32,7 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.block.model.ModelBlock; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.EnumFacing; @@ -95,6 +96,12 @@ final class FancyMissingModel implements IModel return ImmutableList.of(font2); } + @Override + public Optional asVanillaModel() + { + return missingModel.asVanillaModel(); + } + @Override public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { diff --git a/src/main/java/net/minecraftforge/client/model/IModel.java b/src/main/java/net/minecraftforge/client/model/IModel.java index e351d82eda..4c797f1400 100644 --- a/src/main/java/net/minecraftforge/client/model/IModel.java +++ b/src/main/java/net/minecraftforge/client/model/IModel.java @@ -25,6 +25,7 @@ import java.util.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelBlock; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.ResourceLocation; @@ -121,4 +122,8 @@ public interface IModel default IModel retexture(ImmutableMap textures) { return this; } + + default Optional asVanillaModel() { + return Optional.empty(); + } } diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index 7995408674..97dc3d26c1 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -375,23 +375,17 @@ public final class ModelLoader extends ModelBakery public Collection getTextures() { // setting parent here to make textures resolve properly - if(model.getParentLocation() != null) + ResourceLocation parentLocation = model.getParentLocation(); + if(parentLocation != null && model.parent == null) { - if(model.getParentLocation().getResourcePath().equals("builtin/generated")) + if(parentLocation.getResourcePath().equals("builtin/generated")) { model.parent = MODEL_GENERATED; } else { - IModel parent = ModelLoaderRegistry.getModelOrLogError(model.getParentLocation(), "Could not load vanilla model parent '" + model.getParentLocation() + "' for '" + model); - if(parent instanceof VanillaModelWrapper) - { - model.parent = ((VanillaModelWrapper) parent).model; - } - else - { - throw new IllegalStateException("vanilla model '" + model + "' can't have non-vanilla parent"); - } + model.parent = ModelLoaderRegistry.getModelOrLogError(parentLocation, "Could not load vanilla model parent '" + parentLocation + "' for '" + model + "'") + .asVanillaModel().orElseThrow(() -> new IllegalStateException("vanilla model '" + model + "' can't have non-vanilla parent")); } } @@ -621,6 +615,12 @@ public final class ModelLoader extends ModelBakery } return new VanillaModelWrapper(location, model, value, animation); } + + @Override + public Optional asVanillaModel() + { + return Optional.of(model); + } } private static final class WeightedRandomModel implements IModel