From 8a90df8c5a35bca53fa8d122895cf0f0ad677172 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 28 Nov 2019 20:59:15 +0200 Subject: [PATCH] Fixed ears and tried to fix snouts --- .../java/com/minelittlepony/client/model/part/PonyEars.java | 5 +++++ .../java/com/minelittlepony/client/model/part/PonySnout.java | 5 +++++ .../assets/minelittlepony/models/components/ears.json | 4 ++-- .../assets/minelittlepony/models/components/snout.json | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/model/part/PonyEars.java b/src/main/java/com/minelittlepony/client/model/part/PonyEars.java index 0b920453..eae39c7c 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonyEars.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonyEars.java @@ -7,6 +7,7 @@ import net.minecraft.client.util.math.MatrixStack; import com.minelittlepony.model.IPart; import com.minelittlepony.mson.api.ModelContext; import com.minelittlepony.mson.api.MsonModel; +import com.minelittlepony.mson.api.model.BoxBuilder.ContentAccessor; import java.util.UUID; @@ -20,6 +21,10 @@ public class PonyEars implements IPart, MsonModel { public void init(ModelContext context) { right = context.findByName("right"); left = context.findByName("left"); + + ContentAccessor head = context.getContext(); + head.children().add(right); + head.children().add(left); } @Override diff --git a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java index c425b6d0..83baace0 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java @@ -10,6 +10,7 @@ import com.minelittlepony.model.IPart; import com.minelittlepony.mson.api.ModelContext; import com.minelittlepony.mson.api.MsonModel; import com.minelittlepony.mson.api.model.MsonPart; +import com.minelittlepony.mson.api.model.BoxBuilder.ContentAccessor; import com.minelittlepony.pony.meta.Gender; import java.util.UUID; @@ -28,6 +29,10 @@ public class PonySnout implements IPart, MsonModel { head = context.getModel(); mare = context.findByName("mare"); stallion = context.findByName("stallion"); + + ContentAccessor head = context.getContext(); + head.children().add(mare); + head.children().add(stallion); } public void rotate(float x, float y, float z) { diff --git a/src/main/resources/assets/minelittlepony/models/components/ears.json b/src/main/resources/assets/minelittlepony/models/components/ears.json index 94909067..8f9e8718 100644 --- a/src/main/resources/assets/minelittlepony/models/components/ears.json +++ b/src/main/resources/assets/minelittlepony/models/components/ears.json @@ -3,13 +3,13 @@ "right": { "texture": {"u": 12, "v": 16}, "cubes": [ - { "from": [-4, -6, 1], "size": [2, 2, 2] } + { "from": [-4, -6, -1], "size": [2, 2, 2] } ] }, "left": { "texture": {"u": 12, "v": 16}, "cubes": [ - { "from": [2, -6, 1], "size": [2, 2, 2] } + { "from": [2, -6, -1], "size": [2, 2, 2] } ] } } diff --git a/src/main/resources/assets/minelittlepony/models/components/snout.json b/src/main/resources/assets/minelittlepony/models/components/snout.json index 54fafd1b..1f528274 100644 --- a/src/main/resources/assets/minelittlepony/models/components/snout.json +++ b/src/main/resources/assets/minelittlepony/models/components/snout.json @@ -1,5 +1,5 @@ { - "texture": {"w": 16, "h": 8}, + "texture": {"w": 64, "h": 64, "u": 16, "v": 8}, "stallion": { "type": "mson:planar", "offset": [0, -1, -2],