diff --git a/src/main/java/com/minelittlepony/model/components/ModelBugWing.java b/src/main/java/com/minelittlepony/model/components/ModelBugWing.java index bdcd6745..0dc71cc1 100644 --- a/src/main/java/com/minelittlepony/model/components/ModelBugWing.java +++ b/src/main/java/com/minelittlepony/model/components/ModelBugWing.java @@ -24,14 +24,14 @@ public class ModelBugWing extends M .rotateAngleY = r * 3; PlaneRenderer primary = new PlaneRenderer(pegasus) - .tex(56, 17) + .tex(56, 16) .mirror(right) - .west(0, 0, -7, 15, 8, scale); + .west(r * -0.5F, 0, -7, 16, 8, scale); PlaneRenderer secondary = new PlaneRenderer(pegasus) .tex(56, 32) .rotate(-0.5F, r * 0.3F, r / 3) .mirror(right) - .west(0, 0, -7, 15, 8, scale); + .west(r, 0, -5, 16, 8, scale); extended.child(primary); extended.child(secondary); diff --git a/src/main/java/com/minelittlepony/model/player/ModelChangeling.java b/src/main/java/com/minelittlepony/model/player/ModelChangeling.java index 8bda7668..8b722e07 100644 --- a/src/main/java/com/minelittlepony/model/player/ModelChangeling.java +++ b/src/main/java/com/minelittlepony/model/player/ModelChangeling.java @@ -1,5 +1,6 @@ package com.minelittlepony.model.player; +import com.minelittlepony.pony.data.PonyWearable; import net.minecraft.util.math.MathHelper; import com.minelittlepony.model.components.BugWings; @@ -15,11 +16,25 @@ public class ModelChangeling extends ModelAlicorn { wings = new BugWings<>(this, yOffset, stretch); } + @Override + public boolean wingsAreOpen() { + return (isFlying() || isCrouching()) && !isElytraFlying(); + } + @Override public float getWingRotationFactor(float ticks) { if (isFlying()) { - return MathHelper.sin(ticks * 3) + ROTATE_270 + 0.4f; + return MathHelper.sin(ticks * 3) + ROTATE_270; } return WING_ROT_Z_SNEAK; } + + @Override + public boolean isWearing(PonyWearable wearable) { + if (wearable == PonyWearable.SADDLE_BAGS) { + return false; + } + + return super.isWearing(wearable); + } }