From 76cfec8224d725e5121559e6515fe3d79ca8fb48 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 9 Dec 2021 15:17:21 +0200 Subject: [PATCH] Fix lighting on changeling wings and make them visible when not flying --- .../minelittlepony/client/model/part/PegasusWings.java | 2 ++ .../minelittlepony/models/components/bug_wings.json | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java b/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java index c234695d..7f91fc7c 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java +++ b/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java @@ -69,6 +69,8 @@ public class PegasusWings implements IPart, MsonMode if (!pegasus.getAttributes().isCrouching && pegasus.isWearing(Wearable.SADDLE_BAGS)) { flapAngle -= 1F; } + } else { + flapAngle = ROTATE_270 - 0.9F + (float)Math.sin(ticks / 10) / 15F; } if (!pegasus.isFlying()) { diff --git a/src/main/resources/assets/minelittlepony/models/components/bug_wings.json b/src/main/resources/assets/minelittlepony/models/components/bug_wings.json index f24ced27..e714a916 100644 --- a/src/main/resources/assets/minelittlepony/models/components/bug_wings.json +++ b/src/main/resources/assets/minelittlepony/models/components/bug_wings.json @@ -5,7 +5,7 @@ "name": "left_wing", "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", "data": { - "folded": { "visible": false }, + "folded": "#extended", "extended": { "texture": {"u": 56, "v": 19, "w": 64, "h": 64}, "pivot": [2.49, 5.28, 4], @@ -31,7 +31,7 @@ "name": "right_wing", "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", "data": { - "folded": { "visible": false }, + "folded": "#extended", "extended": { "texture": {"u": 56, "v": 19, "w": 64, "h": 64}, "pivot": [-2.49, 5.28, 4], @@ -40,13 +40,15 @@ "primary": { "type": "mson:planar", "texture": {"u": 56, "v": 16}, - "east": [0.5, 0, -7, 8, 16] + "mirror": [true, false, false], + "west": [0.5, 0, -7, 8, 16] }, "secondary": { "type": "mson:planar", "texture": {"u": 56, "v": 32}, + "mirror": [true, false, false], "rotate": [-0.5, -0.3, -0.3333], - "east": [-1, 0, -5, 8, 16] + "west": [-1, 0, -5, 8, 16] } } }