From d6d4fc8acc478b0b03f86941d7b49ec883e3e2bf Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 29 Mar 2023 00:22:03 +0100 Subject: [PATCH] Fixed changeling wing positions --- .../com/minelittlepony/client/model/part/PonyWings.java | 9 +++++++++ .../models/entity/races/steve/changeling.json | 6 +++++- .../models/entity/races/steve/reformed_changeling.json | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/client/model/part/PonyWings.java b/src/main/java/com/minelittlepony/client/model/part/PonyWings.java index 488d93a5..8d047ec3 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonyWings.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonyWings.java @@ -7,6 +7,7 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; import com.minelittlepony.api.model.*; +import com.minelittlepony.api.pony.meta.Race; import com.minelittlepony.api.pony.meta.Wearable; import com.minelittlepony.mson.api.ModelView; import com.minelittlepony.mson.api.MsonModel; @@ -119,10 +120,18 @@ public class PonyWings implements IPart, MsonModel { public void rotateWalking(float swing) { folded.yaw = swing * walkingRotationSpeed; + Race race = pegasus.getMetadata().getRace(); + if (race == Race.CHANGELING || race == Race.CHANGEDLING) { + extended.yaw = folded.yaw; + } } public void rotateFlying(float roll) { extended.roll = roll; + Race race = pegasus.getMetadata().getRace(); + if (race == Race.CHANGELING || race == Race.CHANGEDLING) { + folded.roll = roll; + } } public void render(MatrixStack stack, VertexConsumer vertices, int overlayUv, int lightUv, float red, float green, float blue, float alpha) { diff --git a/src/main/resources/assets/minelittlepony/models/entity/races/steve/changeling.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/changeling.json index 9a1d6ce6..355a52ff 100644 --- a/src/main/resources/assets/minelittlepony/models/entity/races/steve/changeling.json +++ b/src/main/resources/assets/minelittlepony/models/entity/races/steve/changeling.json @@ -3,7 +3,11 @@ "data": { "wings": { "data": "minelittlepony:components/bug_wings", - "implementation": "com.minelittlepony.client.model.part.PonyWings" + "implementation": "com.minelittlepony.client.model.part.PonyWings", + "locals": { + "wing_scale": 1.3, + "walking_rotation_speed": 0.05 + } } } } diff --git a/src/main/resources/assets/minelittlepony/models/entity/races/steve/reformed_changeling.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/reformed_changeling.json index 1651fe4d..97a7f728 100644 --- a/src/main/resources/assets/minelittlepony/models/entity/races/steve/reformed_changeling.json +++ b/src/main/resources/assets/minelittlepony/models/entity/races/steve/reformed_changeling.json @@ -61,6 +61,10 @@ }, "wings": { "implementation": "com.minelittlepony.client.model.part.PonyWings", + "locals": { + "wing_scale": 1.3, + "walking_rotation_speed": 0.05 + }, "data": { "left_wing": { "implementation": "com.minelittlepony.client.model.part.PonyWings$Wing",