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

Fix #165 and backport other seapony model fixes

Browse source
This commit is contained in:
Sollace 2020-06-12 23:29:32 +02:00
parent ece8e81c0d
commit 5f0594c44b
3 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/minelittlepony/model/components/SeaponyTail.java
View file

@ -40,7 +40,7 @@ public class SeaponyTail implements IModelPart {
@Override @Override
public void init(float yOffset, float stretch) { public void init(float yOffset, float stretch) {
tailBase.rotate(TAIL_ROTX, 0, 0) tailBase.rotate(TAIL_ROTX, 0, 0)
.offset(0, -4, -2) .offset(0, -1, 0)
.around(-2, 10, 8) .around(-2, 10, 8)
.box( 0, 0, 0, 4, 6, 4, stretch) .box( 0, 0, 0, 4, 6, 4, stretch)
.flip(); .flip();

39
src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java
View file

@ -40,6 +40,7 @@ public class ModelSeapony extends ModelUnicorn {
// Seaponies can't sneak, silly // Seaponies can't sneak, silly
isSneak = false; isSneak = false;
isCrouching = false;
} }
@Override @Override
@ -106,6 +107,15 @@ public class ModelSeapony extends ModelUnicorn {
if (!isSleeping()) { if (!isSleeping()) {
centerFin.rotateAngleZ = flapMotion; centerFin.rotateAngleZ = flapMotion;
} }
}
@Override
protected void rotateLegs(float move, float swing, float ticks, Entity entity) {
super.rotateLegs(move, swing, ticks, entity);
bipedLeftArm.rotateAngleX -= 1.4F;
bipedLeftArm.rotateAngleY -= 0.3F;
bipedRightArm.rotateAngleX -= 1.4F;
bipedRightArm.rotateAngleY += 0.3F;
if (!entity.isInWater()) { if (!entity.isInWater()) {
bipedLeftArm.rotateAngleX -= 0.5F; bipedLeftArm.rotateAngleX -= 0.5F;
@ -118,15 +128,6 @@ public class ModelSeapony extends ModelUnicorn {
} }
} }
@Override
protected void rotateLegs(float move, float swing, float ticks, Entity entity) {
super.rotateLegs(move, swing, ticks, entity);
bipedLeftArm.rotateAngleX -= 1.4F;
bipedLeftArm.rotateAngleY -= 0.3F;
bipedRightArm.rotateAngleX -= 1.4F;
bipedRightArm.rotateAngleY += 0.3F;
}
@Override @Override
protected void rotateLegsSwimming(float move, float swing, float ticks, Entity entity) { protected void rotateLegsSwimming(float move, float swing, float ticks, Entity entity) {
super.rotateLegsOnGround(move, swing, ticks, entity); super.rotateLegsOnGround(move, swing, ticks, entity);
@ -197,6 +198,26 @@ public class ModelSeapony extends ModelUnicorn {
// Seaponies can't sneak, silly // Seaponies can't sneak, silly
isSneak = false; isSneak = false;
isCrouching = false;
}
@Override
protected void rotateLegs(float move, float swing, float ticks, Entity entity) {
super.rotateLegs(move, swing, ticks, entity);
bipedLeftArm.rotateAngleX -= 1.4F;
bipedLeftArm.rotateAngleY -= 0.3F;
bipedRightArm.rotateAngleX -= 1.4F;
bipedRightArm.rotateAngleY += 0.3F;
if (!entity.isInWater()) {
bipedLeftArm.rotateAngleX -= 0.5F;
bipedRightArm.rotateAngleX -= 0.5F;
}
if (!entity.isInWater() || entity.onGround) {
bipedLeftArm.rotateAngleY -= 0.5F;
bipedRightArm.rotateAngleY += 0.5F;
}
} }
@Override @Override

1
src/main/java/com/minelittlepony/render/RenderPony.java
View file

@ -78,7 +78,6 @@ public class RenderPony<T extends EntityLivingBase> {
// negate vanilla translations so the rider begins at the ridees feet. // negate vanilla translations so the rider begins at the ridees feet.
GlStateManager.translate(0, -ridingEntity.height, 0); GlStateManager.translate(0, -ridingEntity.height, 0);
@SuppressWarnings("unchecked")
IPony riderPony = renderer.getEntityPony((EntityLivingBase)ridingEntity); IPony riderPony = renderer.getEntityPony((EntityLivingBase)ridingEntity);
renderer.translateRider((EntityLivingBase)ridingEntity, riderPony, entity, pony, ticks); renderer.translateRider((EntityLivingBase)ridingEntity, riderPony, entity, pony, ticks);