From 2f2e21ee5bfdf9ee68b441399bff6caa5afa9fba Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 27 Jun 2022 17:28:39 +0200 Subject: [PATCH] Adjust model files to more closely resemble what they look like in-game --- .../client/model/AbstractPonyModel.java | 1 - .../client/model/part/PonyTail.java | 8 +-- .../minelittlepony/models/armour_inner.json | 1 - .../models/components/tail.json | 59 ++++++++++--------- .../minelittlepony/models/enderman.json | 1 - .../assets/minelittlepony/models/piglin.json | 59 ++++++++++--------- .../models/races/steve/bat_pony.json | 1 - .../models/races/steve/kirin.json | 1 - .../races/steve/reformed_changeling.json | 1 - .../models/races/steve/unicorn.json | 1 - .../models/races/steve/zebra.json | 1 - .../minelittlepony/models/steve_pony.json | 13 ++-- .../assets/minelittlepony/models/vex.json | 1 - .../minelittlepony/models/villager.json | 1 - 14 files changed, 71 insertions(+), 78 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index d23e0445..da5970f8 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -61,7 +61,6 @@ public abstract class AbstractPonyModel extends ClientPo public void setAngles(T entity, float move, float swing, float ticks, float headYaw, float headPitch) { attributes.checkRainboom(entity, swing, canFly(), ticks); PonyModelPrepareCallback.EVENT.invoker().onPonyModelPrepared(entity, this, ModelAttributes.Mode.OTHER); - super.setAngles(entity, move, swing, ticks, headYaw, headPitch); rotateHead(headYaw, headPitch); diff --git a/src/main/java/com/minelittlepony/client/model/part/PonyTail.java b/src/main/java/com/minelittlepony/client/model/part/PonyTail.java index 35a353ac..20c7c69b 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonyTail.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonyTail.java @@ -11,7 +11,6 @@ import com.minelittlepony.mson.api.ModelContext; import com.minelittlepony.mson.api.MsonModel; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -26,7 +25,7 @@ public class PonyTail implements IPart, MsonModel { private final List segments = new ArrayList<>(); public PonyTail(ModelPart tree) { - + tail = tree.getChild("tail"); } @Override @@ -48,8 +47,6 @@ public class PonyTail implements IPart, MsonModel { } catch (InterruptedException | ExecutionException e) { throw new RuntimeException(e); } - - tail = new ModelPart(new ArrayList<>(), new HashMap<>()); } @Override @@ -78,8 +75,6 @@ public class PonyTail implements IPart, MsonModel { tail.pivotY += 6; tail.pivotZ++; } - - tailStop = theModel.getMetadata().getTail().ordinal(); } private void swingX(float ticks) { @@ -96,6 +91,7 @@ public class PonyTail implements IPart, MsonModel { @Override public void setVisible(boolean visible) { tail.visible = visible; + tailStop = theModel.getMetadata().getTail().ordinal(); } @Override diff --git a/src/main/resources/assets/minelittlepony/models/armour_inner.json b/src/main/resources/assets/minelittlepony/models/armour_inner.json index fa4cdcba..80cb4e02 100644 --- a/src/main/resources/assets/minelittlepony/models/armour_inner.json +++ b/src/main/resources/assets/minelittlepony/models/armour_inner.json @@ -10,7 +10,6 @@ ] }, "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": 0.5 }, { "from": [-4, -8, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 0}, "dilate": -0.0125 }, diff --git a/src/main/resources/assets/minelittlepony/models/components/tail.json b/src/main/resources/assets/minelittlepony/models/components/tail.json index 26400df9..cf84d991 100644 --- a/src/main/resources/assets/minelittlepony/models/components/tail.json +++ b/src/main/resources/assets/minelittlepony/models/components/tail.json @@ -4,33 +4,38 @@ "segments": 4 }, "data": { - "segment_0": { - "type": "mson:slot", - "name": "segment_0", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 0 }, - "data": "minelittlepony:components/tail_segment" - }, - "segment_1": { - "type": "mson:slot", - "name": "segment_1", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 1 }, - "data": "minelittlepony:components/tail_segment" - }, - "segment_2": { - "type": "mson:slot", - "name": "segment_2", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 2 }, - "data": "minelittlepony:components/tail_segment" - }, - "segment_3": { - "type": "mson:slot", - "name": "segment_3", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 3 }, - "data": "minelittlepony:components/tail_segment" + "tail": { + "pivot": [0, 0, 14], + "children": { + "segment_0": { + "type": "mson:slot", + "name": "segment_0", + "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", + "locals": { "segment_index": 0 }, + "data": "minelittlepony:components/tail_segment" + }, + "segment_1": { + "type": "mson:slot", + "name": "segment_1", + "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", + "locals": { "segment_index": 1 }, + "data": "minelittlepony:components/tail_segment" + }, + "segment_2": { + "type": "mson:slot", + "name": "segment_2", + "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", + "locals": { "segment_index": 2 }, + "data": "minelittlepony:components/tail_segment" + }, + "segment_3": { + "type": "mson:slot", + "name": "segment_3", + "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", + "locals": { "segment_index": 3 }, + "data": "minelittlepony:components/tail_segment" + } + } } } } diff --git a/src/main/resources/assets/minelittlepony/models/enderman.json b/src/main/resources/assets/minelittlepony/models/enderman.json index 0cd0f10f..4317f5b0 100644 --- a/src/main/resources/assets/minelittlepony/models/enderman.json +++ b/src/main/resources/assets/minelittlepony/models/enderman.json @@ -7,7 +7,6 @@ }, "data": { "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], diff --git a/src/main/resources/assets/minelittlepony/models/piglin.json b/src/main/resources/assets/minelittlepony/models/piglin.json index 4f8d8d9a..d86f96f1 100644 --- a/src/main/resources/assets/minelittlepony/models/piglin.json +++ b/src/main/resources/assets/minelittlepony/models/piglin.json @@ -3,7 +3,6 @@ "parent": "minelittlepony:zombie", "data": { "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], @@ -158,33 +157,37 @@ "segments": 4 }, "data": { - "segment_0": { - "type": "mson:slot", - "name": "segment_0", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 0 }, - "data": "minelittlepony:components/tail_segment" - }, - "segment_1": { - "type": "mson:slot", - "name": "segment_1", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 1 }, - "data": "minelittlepony:components/tail_segment" - }, - "segment_2": { - "type": "mson:slot", - "name": "segment_2", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 2 }, - "data": "minelittlepony:components/tail_segment" - }, - "segment_3": { - "type": "mson:slot", - "name": "segment_3", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 3 }, - "data": "minelittlepony:components/tail_segment" + "tail": { + "children": { + "segment_0": { + "type": "mson:slot", + "name": "segment_0", + "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", + "locals": { "segment_index": 0 }, + "data": "minelittlepony:components/tail_segment" + }, + "segment_1": { + "type": "mson:slot", + "name": "segment_1", + "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", + "locals": { "segment_index": 1 }, + "data": "minelittlepony:components/tail_segment" + }, + "segment_2": { + "type": "mson:slot", + "name": "segment_2", + "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", + "locals": { "segment_index": 2 }, + "data": "minelittlepony:components/tail_segment" + }, + "segment_3": { + "type": "mson:slot", + "name": "segment_3", + "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", + "locals": { "segment_index": 3 }, + "data": "minelittlepony:components/tail_segment" + } + } } } } diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/bat_pony.json b/src/main/resources/assets/minelittlepony/models/races/steve/bat_pony.json index c2300a1b..23acba2d 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/bat_pony.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/bat_pony.json @@ -2,7 +2,6 @@ "parent": "minelittlepony:steve_pony", "data": { "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/kirin.json b/src/main/resources/assets/minelittlepony/models/races/steve/kirin.json index df174c14..05a6dd84 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/kirin.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/kirin.json @@ -2,7 +2,6 @@ "parent": "minelittlepony:races/steve/unicorn", "data": { "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/reformed_changeling.json b/src/main/resources/assets/minelittlepony/models/races/steve/reformed_changeling.json index 094f548b..988ec253 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/reformed_changeling.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/reformed_changeling.json @@ -2,7 +2,6 @@ "parent": "minelittlepony:races/steve/alicorn", "data": { "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json b/src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json index 55731c67..dc6df78c 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json @@ -2,7 +2,6 @@ "parent": "minelittlepony:steve_pony", "data": { "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json b/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json index 056ab458..6b72b04a 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json @@ -2,7 +2,6 @@ "parent": "minelittlepony:steve_pony", "data": { "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], diff --git a/src/main/resources/assets/minelittlepony/models/steve_pony.json b/src/main/resources/assets/minelittlepony/models/steve_pony.json index 9f766e93..7fd8dee9 100644 --- a/src/main/resources/assets/minelittlepony/models/steve_pony.json +++ b/src/main/resources/assets/minelittlepony/models/steve_pony.json @@ -10,7 +10,7 @@ "arm_x": 0, "arm_x_neg": ["#arm_x", "-", "#arm_width"], "arm_z": [2, "-", "#arm_depth"], - "arm_rotation_x": 3, + "arm_rotation_x": 0, "arm_rotation_x_neg": [0, "-", "#arm_rotation_x"], "arm_rotation_y": 8 }, @@ -32,7 +32,6 @@ }, "data": { "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], @@ -53,7 +52,7 @@ }, "hat": { "texture": { "u": 32, "v": 0 }, - "pivot": [ 0, 0, -2 ], + "pivot": [ 0, 0, 0 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": 0.5 } ] @@ -270,7 +269,7 @@ ] }, "right_leg": { - "pivot": ["#arm_rotation_x_neg", 0, 0], + "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 11], "texture": { "u": 0, "v": 16 }, "cubes": [ { @@ -280,7 +279,7 @@ ] }, "left_leg": { - "pivot": ["#arm_rotation_x", 0, 0], + "pivot": ["#arm_rotation_x", "#arm_rotation_y", 11], "texture": { "u": 16, "v": 48 }, "cubes": [ { @@ -312,7 +311,7 @@ ] }, "right_pants": { - "pivot": ["#arm_rotation_x_neg", 0, 0], + "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], "texture": { "u": 0, "v": 32 }, "cubes": [ { @@ -323,7 +322,7 @@ ] }, "left_pants": { - "pivot": ["#arm_rotation_x", 0, 0], + "pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], "texture": { "u": 0, "v": 48 }, "cubes": [ { diff --git a/src/main/resources/assets/minelittlepony/models/vex.json b/src/main/resources/assets/minelittlepony/models/vex.json index 932a851e..5c79f082 100644 --- a/src/main/resources/assets/minelittlepony/models/vex.json +++ b/src/main/resources/assets/minelittlepony/models/vex.json @@ -4,7 +4,6 @@ }, "data": { "body": { - "pivot": [0, 0, 0], "cubes": [ {"from": [-4, -4, -4], "size": [8, 5, 8] } ], diff --git a/src/main/resources/assets/minelittlepony/models/villager.json b/src/main/resources/assets/minelittlepony/models/villager.json index 0e58dcd1..c855d2bd 100644 --- a/src/main/resources/assets/minelittlepony/models/villager.json +++ b/src/main/resources/assets/minelittlepony/models/villager.json @@ -2,7 +2,6 @@ "parent": "minelittlepony:races/steve/alicorn", "data": { "head": { - "pivot": [ 0, 0, -2 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ],