PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-04-01 01:05:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed sitting pose

Browse source
This commit is contained in:
Sollace 2023-03-20 19:09:58 +00:00
parent 77817a352d
commit 0eae23ea48
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
View file

@ -207,26 +207,32 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
protected void ponySit() { protected void ponySit() {
if (attributes.isRidingInteractive) { if (attributes.isRidingInteractive) {
adjustBodyComponents(BODY_ROT_X_RIDING * 2, BODY_RP_Y_RIDING, BODY_RP_Z_RIDING); adjustBodyComponents(BODY_ROT_X_RIDING * 2, BODY_RP_Y_RIDING, BODY_RP_Z_RIDING);
adjustNeck(BODY_ROT_X * 2, BODY_RP_Y, BODY_RP_Z - 4); neck.setPivot(NECK_ROT_X + BODY_ROT_X * 2, BODY_RP_Y, BODY_RP_Z - 4);
head.setPivot(0, -2, -5); head.setPivot(0, -2, -5);
} else { } else {
adjustBodyComponents(BODY_ROT_X_RIDING, BODY_RP_Y_RIDING, BODY_RP_Z_RIDING); adjustBodyComponents(BODY_ROT_X_RIDING, BODY_RP_Y_RIDING, BODY_RP_Z_RIDING);
adjustNeck(BODY_ROT_X, BODY_RP_Y, BODY_RP_Z); neck.setPivot(NECK_ROT_X + BODY_ROT_X, BODY_RP_Y, BODY_RP_Z);
head.setPivot(0, 0, 0); head.setPivot(0, 0, 0);
} }
leftLeg.pivotZ = 14; leftLeg.pivotZ = 14;
leftLeg.pivotY = 9; leftLeg.pivotY = 17;
leftLeg.pitch = -PI / 4; leftLeg.pitch = -PI / 4;
leftLeg.yaw = -PI / 5; leftLeg.yaw = -PI / 7;
leftLeg.pitch += body.pitch;
rightLeg.pivotZ = 15; rightLeg.pivotZ = 15;
rightLeg.pivotY = 9; rightLeg.pivotY = 17;
rightLeg.pitch = -PI / 4; rightLeg.pitch = -PI / 4;
rightLeg.yaw = PI / 5; rightLeg.yaw = PI / 7;
rightLeg.pitch += body.pitch;
leftArm.roll = -PI * 0.06f; leftArm.roll = -PI * 0.06f;
leftArm.pitch += body.pitch;
rightArm.roll = PI * 0.06f; rightArm.roll = PI * 0.06f;
rightArm.pitch += body.pitch;
if (attributes.isRidingInteractive) { if (attributes.isRidingInteractive) {
leftLeg.yaw = PI / 15; leftLeg.yaw = PI / 15;
@ -569,7 +575,7 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
protected void adjustBody(float rotateAngleX, float rotationPointY, float rotationPointZ) { protected void adjustBody(float rotateAngleX, float rotationPointY, float rotationPointZ) {
adjustBodyComponents(rotateAngleX, rotationPointY, rotationPointZ); adjustBodyComponents(rotateAngleX, rotationPointY, rotationPointZ);
adjustNeck(rotateAngleX, rotationPointY, rotationPointZ); neck.setPivot(NECK_ROT_X + rotateAngleX, rotationPointY, rotationPointZ);
} }
protected void adjustBodyComponents(float rotateAngleX, float rotationPointY, float rotationPointZ) { protected void adjustBodyComponents(float rotateAngleX, float rotationPointY, float rotationPointZ) {
@ -582,10 +588,6 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
upperTorso.pivotZ = rotationPointZ; upperTorso.pivotZ = rotationPointZ;
} }
private void adjustNeck(float rotateAngleX, float rotationPointY, float rotationPointZ) {
neck.setPivot(NECK_ROT_X + rotateAngleX, rotationPointY, rotationPointZ);
}
@Override @Override
public float getRiderYOffset() { public float getRiderYOffset() {
switch ((Sizes)getSize()) { switch ((Sizes)getSize()) {