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

We don't need to override holdItem for unicorns

Browse source
This commit is contained in:
Sollace 2019-07-13 23:57:05 +02:00
parent 44b07c2b19
commit 7793dc003f
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -364,8 +364,8 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
protected void holdItem(float swing) { protected void holdItem(float swing) {
boolean both = leftArmPose == ArmPose.ITEM && rightArmPose == ArmPose.ITEM; boolean both = leftArmPose == ArmPose.ITEM && rightArmPose == ArmPose.ITEM;
alignArmForAction(leftArm, leftArmPose, rightArmPose, both, swing, 1); alignArmForAction(getArm(AbsoluteHand.LEFT), leftArmPose, rightArmPose, both, swing, 1);
alignArmForAction(rightArm, rightArmPose, leftArmPose, both, swing, -1); alignArmForAction(getArm(AbsoluteHand.RIGHT), rightArmPose, leftArmPose, both, swing, -1);
} }
@Override @Override

12
src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
View file

@ -45,18 +45,6 @@ public class ModelUnicorn<T extends LivingEntity> extends ModelEarthPony<T> impl
unicornArmLeft.rotate(0, 0, 0).around(-7, 12, -2); unicornArmLeft.rotate(0, 0, 0).around(-7, 12, -2);
} }
@Override
protected void holdItem(float swing) {
if (canCast()) {
boolean both = leftArmPose == ArmPose.ITEM && rightArmPose == ArmPose.ITEM;
alignArmForAction(unicornArmLeft, leftArmPose, rightArmPose, both, swing, 1);
alignArmForAction(unicornArmRight, rightArmPose, leftArmPose, both, swing, -1);
} else {
super.holdItem(swing);
}
}
public ArmPose getArmPoseForSide(AbsoluteHand side) { public ArmPose getArmPoseForSide(AbsoluteHand side) {
return side == AbsoluteHand.RIGHT ? rightArmPose : leftArmPose; return side == AbsoluteHand.RIGHT ? rightArmPose : leftArmPose;
} }