diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 66614d5c..be9f8b95 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -8,10 +8,7 @@ import com.minelittlepony.model.BodyPart; import com.minelittlepony.model.IPart; import com.minelittlepony.model.armour.IEquestrianArmour; import com.minelittlepony.mson.api.ModelContext; -import com.minelittlepony.mson.api.mixin.Extends; -import com.minelittlepony.mson.api.mixin.MixedMsonModel; import com.minelittlepony.mson.api.model.MsonPart; -import com.minelittlepony.mson.api.model.biped.MsonBiped; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.VertexConsumer; @@ -25,9 +22,7 @@ import net.minecraft.util.math.MathHelper; /** * Foundation class for all types of ponies. */ -@Extends(MsonBiped.class) -public abstract class AbstractPonyModel extends ClientPonyModel - implements MixedMsonModel { +public abstract class AbstractPonyModel extends ClientPonyModel { protected ModelPart upperTorso; protected ModelPart upperTorsoOverlay; @@ -38,13 +33,9 @@ public abstract class AbstractPonyModel extends ClientPo protected PonySnout snout; protected IPart ears; - public AbstractPonyModel(boolean arms) { - super(0, arms); - } - @Override public void init(ModelContext context) { - MixedMsonModel.super.init(context); + super.init(context); context.findByName("left_sleeve", leftSleeve); context.findByName("right_sleeve", rightSleeve); diff --git a/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java b/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java index 42368012..38653ade 100644 --- a/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java @@ -2,12 +2,12 @@ package com.minelittlepony.client.model; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.entity.model.BipedEntityModel; -import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.entity.LivingEntity; import net.minecraft.util.Arm; import com.minelittlepony.client.pony.PonyData; import com.minelittlepony.model.ModelAttributes; +import com.minelittlepony.mson.api.model.biped.MsonPlayer; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.IPonyData; import com.minelittlepony.pony.meta.Size; @@ -19,7 +19,7 @@ import com.minelittlepony.pony.meta.Size; * * Modders can extend this class to make their own pony models if they wish. */ -public abstract class ClientPonyModel extends PlayerEntityModel implements IPonyModel { +public abstract class ClientPonyModel extends MsonPlayer implements IPonyModel { /** * The model attributes. @@ -31,10 +31,6 @@ public abstract class ClientPonyModel extends PlayerEnti */ protected IPonyData metadata = new PonyData(); - public ClientPonyModel(float float_1, boolean boolean_1) { - super(float_1, boolean_1); - } - @Override public void updateLivingState(T entity, IPony pony) { isChild = entity.isBaby(); diff --git a/src/main/java/com/minelittlepony/client/model/armour/ModelPonyArmour.java b/src/main/java/com/minelittlepony/client/model/armour/ModelPonyArmour.java index 8b2cd35f..08290cf9 100644 --- a/src/main/java/com/minelittlepony/client/model/armour/ModelPonyArmour.java +++ b/src/main/java/com/minelittlepony/client/model/armour/ModelPonyArmour.java @@ -22,7 +22,6 @@ public class ModelPonyArmour extends AbstractPonyModel extends AbstractPonyModel { private final boolean smallArms; - private ModelPart cape; - public ModelEarthPony(boolean smallArms) { - super(smallArms); this.smallArms = smallArms; } - @Override - public void init(ModelContext context) { - super.init(context); - cape = context.findByName("cape"); - } - @Override public void setAngles(T entity, float move, float swing, float ticks, float headYaw, float headPitch) { super.setAngles(entity, move, swing, ticks, headYaw, headPitch);