diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 0a5cf821..6a4a8969 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -125,10 +125,10 @@ public abstract class AbstractPonyModel extends ClientPo head.setPivot(1, 2, sneaking ? -1 : 1); - ((MsonPart)(Object)rightArm).shift(0, 2, 6); - ((MsonPart)(Object)leftArm).shift(0, 2, 6); - ((MsonPart)(Object)rightLeg).shift(0, 2, -8); - ((MsonPart)(Object)leftLeg).shift(0, 2, -8); + MsonPart.of(rightArm).shift(0, 2, 6); + MsonPart.of(leftArm).shift(0, 2, 6); + MsonPart.of(rightLeg).shift(0, 2, -8); + MsonPart.of(leftLeg).shift(0, 2, -8); } protected void ponySit() { diff --git a/src/main/java/com/minelittlepony/client/model/entity/BreezieModel.java b/src/main/java/com/minelittlepony/client/model/entity/BreezieModel.java index f04dcaf5..90863525 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/BreezieModel.java +++ b/src/main/java/com/minelittlepony/client/model/entity/BreezieModel.java @@ -9,7 +9,6 @@ import net.minecraft.util.math.MathHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.minelittlepony.mson.api.model.MsonPart; import static com.minelittlepony.api.model.PonyModelConstants.PI; @@ -47,16 +46,16 @@ public class BreezieModel extends BipedEntityModel { leftArm.pitch = MathHelper.cos(move * 0.6662F) * swing; leftArm.roll = 0; - ((MsonPart)(Object)rightArm).rotate(swing * MathHelper.cos(move * 0.6662F + PI), 0, 0); - ((MsonPart)(Object)leftLeg) .rotate(swing * MathHelper.cos(move * 0.6662F + PI) * 1.4F, 0, 0); - ((MsonPart)(Object)rightLeg).rotate(swing * MathHelper.cos(move * 0.6662F) * 1.4F, 0, 0); + rightArm.setAngles(swing * MathHelper.cos(move * 0.6662F + PI), 0, 0); + leftLeg .setAngles(swing * MathHelper.cos(move * 0.6662F + PI) * 1.4F, 0, 0); + rightLeg.setAngles(swing * MathHelper.cos(move * 0.6662F) * 1.4F, 0, 0); if (riding) { leftArm.pitch += -PI / 5; rightArm.pitch += -PI / 5; - rotateLegRiding((MsonPart)(Object)leftLeg, -1); - rotateLegRiding((MsonPart)(Object)rightLeg, 1); + rotateLegRiding(leftLeg, -1); + rotateLegRiding(rightLeg, 1); } rotateArm(leftArm, leftArmPose, 1); @@ -98,8 +97,8 @@ public class BreezieModel extends BipedEntityModel { } - protected void rotateLegRiding(MsonPart leg, float factor) { - leg.rotate(-1.4137167F, factor * PI / 10, factor * 0.07853982F); + protected void rotateLegRiding(ModelPart leg, float factor) { + leg.setAngles(-1.4137167F, factor * PI / 10, factor * 0.07853982F); } protected void swingArms(Arm mainHand) { diff --git a/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java b/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java index ecee8248..9aad56d5 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java @@ -29,10 +29,10 @@ public class ZomponyModel extends AlicornModel extends EarthPonyModel impl protected void rotateLegs(float move, float swing, float ticks, T entity) { super.rotateLegs(move, swing, ticks, entity); - ((MsonPart)(Object)unicornArmRight).rotate(0, 0, 0).around(-7, 12, -2); - ((MsonPart)(Object)unicornArmLeft).rotate(0, 0, 0).around(-7, 12, -2); + unicornArmRight.setAngles(0, 0, 0); + unicornArmRight.setPivot(-7, 12, -2); + + unicornArmLeft.setAngles(0, 0, 0); + unicornArmLeft.setPivot(-7, 12, -2); } @Override diff --git a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java index a66c0b00..e6c7490c 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java @@ -9,7 +9,6 @@ import com.minelittlepony.api.pony.meta.Gender; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.mson.api.ModelContext; import com.minelittlepony.mson.api.MsonModel; -import com.minelittlepony.mson.api.model.MsonPart; import com.minelittlepony.mson.api.model.PartBuilder; import java.util.UUID; @@ -36,8 +35,8 @@ public class PonySnout implements IPart, MsonModel { } public void rotate(float x, float y, float z) { - ((MsonPart)(Object)mare).rotate(x, y, z); - ((MsonPart)(Object)stallion).rotate(x, y, z); + mare.setAngles(x, y, z); + stallion.setAngles(x, y, z); } @Override