diff --git a/src/main/java/net/minecraftforge/client/model/BlockStateLoader.java b/src/main/java/net/minecraftforge/client/model/BlockStateLoader.java index dffcc5b003..cda7c8b559 100644 --- a/src/main/java/net/minecraftforge/client/model/BlockStateLoader.java +++ b/src/main/java/net/minecraftforge/client/model/BlockStateLoader.java @@ -200,10 +200,6 @@ public class BlockStateLoader return base; } - // Apply rotation of base model to sub-models. - // If baseRot is non-null, then that rotation will be applied instead of the base model's rotation. - // This is used to allow replacing base model with a sub-model when there is no base model for a variant. - IModelState baseTr = getState(); ImmutableMap.Builder> models = ImmutableMap.builder(); for (Entry entry : parts.entrySet()) { @@ -224,7 +220,7 @@ public class BlockStateLoader models.put(entry.getKey(), Pair.of(runModelHooks(model, part.smooth, part.gui3d, part.uvLock, part.getTextures(), part.getCustomData()), part.getState())); } - return new MultiModel(getModelLocation(), hasBase ? base : null, baseTr, models.build()); + return new MultiModel(getModelLocation(), hasBase ? base : null, models.build()); } @Override diff --git a/src/main/java/net/minecraftforge/client/model/MultiModel.java b/src/main/java/net/minecraftforge/client/model/MultiModel.java index 455c028c7c..463b0b1429 100644 --- a/src/main/java/net/minecraftforge/client/model/MultiModel.java +++ b/src/main/java/net/minecraftforge/client/model/MultiModel.java @@ -227,20 +227,32 @@ public final class MultiModel implements IModel private final ResourceLocation location; @Nullable private final IModel base; - private final IModelState baseState; private final Map> parts; + // TODO 1.13 remove, kept for binary compatibility + @Deprecated public MultiModel(ResourceLocation location, @Nullable IModel base, IModelState baseState, ImmutableMap> parts) + { + this(location, base, parts); + } + + public MultiModel(ResourceLocation location, @Nullable IModel base, ImmutableMap> parts) { this.location = location; this.base = base; - this.baseState = baseState; this.parts = parts; } + // TODO 1.13 remove, kept for binary compatibility + @Deprecated public MultiModel(ResourceLocation location, IModel base, IModelState baseState, Map> parts) { - this(location, base, baseState, ImmutableMap.copyOf(parts)); + this(location, base, parts); + } + + public MultiModel(ResourceLocation location, IModel base, Map> parts) + { + this(location, base, ImmutableMap.copyOf(parts)); } @Override @@ -295,10 +307,4 @@ public final class MultiModel implements IModel } return new Baked(location, true, bakedBase, mapBuilder.build()); } - - @Override - public IModelState getDefaultState() - { - return baseState; - } }