From ee687535289e78f35314b81f3f71dd9d2b5f02e3 Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 9 Aug 2021 20:52:14 +0200 Subject: [PATCH] Migrate models to mson v2 --- .../client/model/part/PonySnout.java | 1 + .../minelittlepony/models/armour_inner.json | 174 +++--- .../minelittlepony/models/armour_outer.json | 2 +- .../minelittlepony/models/armour_stand.json | 216 +++---- .../assets/minelittlepony/models/breezie.json | 218 +++---- .../models/components/bat_ears.json | 38 +- .../models/components/bat_wings.json | 222 ++++---- .../models/components/bug_wings.json | 100 ++-- .../models/components/ears.json | 30 +- .../models/components/fish_tail.json | 76 +-- .../models/components/horn.json | 54 +- .../models/components/pegasus_wings.json | 172 +++--- .../models/components/pig_snout.json | 18 +- .../models/components/snout.json | 62 +- .../models/components/tail.json | 56 +- .../models/components/tail_segment.json | 20 +- .../minelittlepony/models/dj_pon_three.json | 12 +- .../assets/minelittlepony/models/elytra.json | 22 +- .../minelittlepony/models/enderman.json | 214 +++---- .../minelittlepony/models/gear/antlers.json | 36 +- .../minelittlepony/models/gear/muffin.json | 20 +- .../models/gear/saddlebags.json | 92 +-- .../minelittlepony/models/gear/stetson.json | 63 ++- .../minelittlepony/models/gear/witch_hat.json | 68 +-- .../minelittlepony/models/parasprite.json | 80 +-- .../assets/minelittlepony/models/piglin.json | 362 ++++++------ .../models/races/steve/alicorn.json | 12 +- .../models/races/steve/bat_pony.json | 50 +- .../models/races/steve/changeling.json | 12 +- .../models/races/steve/pegasus.json | 12 +- .../models/races/steve/sea_pony.json | 70 +-- .../models/races/steve/unicorn.json | 90 +-- .../models/races/steve/zebra.json | 73 +-- .../models/skeleton_clothes.json | 2 +- .../assets/minelittlepony/models/skull.json | 86 +-- .../minelittlepony/models/steve_pony.json | 530 +++++++++--------- .../minelittlepony/models/villager.json | 94 ++-- 37 files changed, 1763 insertions(+), 1696 deletions(-) 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 e6c7490c..49cf4a3c 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java @@ -41,6 +41,7 @@ public class PonySnout implements IPart, MsonModel { @Override public void renderPart(MatrixStack stack, VertexConsumer vertices, int overlayUv, int lightUv, float red, float green, float blue, float alpha, UUID interpolatorId) { + mare.render(stack, vertices, lightUv, overlayUv, red, green, blue, alpha); } @Override diff --git a/src/main/resources/assets/minelittlepony/models/armour_inner.json b/src/main/resources/assets/minelittlepony/models/armour_inner.json index c95f9160..9aed69a6 100644 --- a/src/main/resources/assets/minelittlepony/models/armour_inner.json +++ b/src/main/resources/assets/minelittlepony/models/armour_inner.json @@ -1,91 +1,93 @@ { "parent": "minelittlepony:steve_pony", "texture": {"w": 64, "h": 32}, - "scale": 0.125, - "chestpiece": { - "texture": {"u": 16, "v": 8}, - "cubes": [ - {"from": [-4, 4, -2], "size": [8, 8, 16]} - ] - }, - "head": { - "center": [ 0, 0, -2 ], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8], "stretch": 0.5 }, - { "from": [-4, -8, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 0}, "stretch": -0.0125 }, - { "from": [ 2, -8, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 4}, "stretch": -0.0125 } - ] - }, - "upper_torso": { - "type": "mson:planar", - "texture": {"u": 24, "v": 0}, - "east": [4, 4, 2, 8, 8, 32, 32], - "west": [-4, 4, 2, 8, 8, 23, 32], - "south": [-4, 4,10, 8, 8, 32, 23], - "up": [-4, 4, -2, 8, 12, 32, 23], - "__comment": "it's a little short, so the butt tends to show. :/" - }, - "right_arm": { - "center": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], - "texture": { "u": 0, "v": 16 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "left_arm": { - "center": ["#arm_rotation_x", "#arm_rotation_y", 0], - "mirror": true, - "texture": { "u": 0, "v": 16 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "right_leg": { - "center": ["#arm_rotation_x_neg", 0, 0], - "texture": { "u": 48, "v": 8 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "left_leg": { - "center": ["#arm_rotation_x", 0, 0], - "mirror": true, - "texture": { "u": 48, "v": 8 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "steve_right_leg": { - "center": ["#arm_rotation_x_neg", 0, 0], - "texture": { "u": 0, "v": 16 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "steve_left_leg": { - "center": ["#arm_rotation_x", 0, 0], - "mirror": true, - "texture": { "u": 0, "v": 16 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] + "dilate": 0.125, + "data": { + "chestpiece": { + "texture": {"u": 16, "v": 8}, + "cubes": [ + {"from": [-4, 4, -2], "size": [8, 8, 16]} + ] + }, + "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 }, + { "from": [ 2, -8, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 4}, "dilate": -0.0125 } + ] + }, + "upper_torso": { + "type": "mson:planar", + "texture": {"u": 24, "v": 0}, + "east": [4, 4, 2, 8, 8, 32, 32], + "west": [-4, 4, 2, 8, 8, 23, 32], + "south": [-4, 4,10, 8, 8, 32, 23], + "up": [-4, 4, -2, 8, 12, 32, 23], + "__comment": "it's a little short, so the butt tends to show. :/" + }, + "right_arm": { + "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], + "texture": { "u": 0, "v": 16 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "left_arm": { + "pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], + "mirror": true, + "texture": { "u": 0, "v": 16 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "right_leg": { + "pivot": ["#arm_rotation_x_neg", 0, 0], + "texture": { "u": 48, "v": 8 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "left_leg": { + "pivot": ["#arm_rotation_x", 0, 0], + "mirror": true, + "texture": { "u": 48, "v": 8 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "steve_right_leg": { + "pivot": ["#arm_rotation_x_neg", 0, 0], + "texture": { "u": 0, "v": 16 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "steve_left_leg": { + "pivot": ["#arm_rotation_x", 0, 0], + "mirror": true, + "texture": { "u": 0, "v": 16 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/armour_outer.json b/src/main/resources/assets/minelittlepony/models/armour_outer.json index b00bc4d1..4d561ec9 100644 --- a/src/main/resources/assets/minelittlepony/models/armour_outer.json +++ b/src/main/resources/assets/minelittlepony/models/armour_outer.json @@ -1,4 +1,4 @@ { "parent": "minelittlepony:armour_inner", - "scale": 0.25 + "dilate": 0.25 } diff --git a/src/main/resources/assets/minelittlepony/models/armour_stand.json b/src/main/resources/assets/minelittlepony/models/armour_stand.json index f88c6cd8..21cf4ddc 100644 --- a/src/main/resources/assets/minelittlepony/models/armour_stand.json +++ b/src/main/resources/assets/minelittlepony/models/armour_stand.json @@ -1,112 +1,114 @@ { "texture": { "w": 64, "h": 64 }, - "head": { - "center": [ 0, 5, 0 ], - "cubes": [ - { "from": [ -1, -7, -1 ], "size": [ 2, 7, 2 ] } - ] - }, - "hat": { - "center": [ 0, 5, 0 ], - "cubes": [ - { "from": [ -1, -7, -1 ], "size": [ 2, 7, 2 ], "stretch": 0.5 } - ] - }, - "body": { - "texture": { "u": 0, "v": 48 }, - "center": [ 0, 0, 1 ], - "cubes": [ - { "from": [ -4, 10, -1 ], "size": [ 8, 2, 2 ] } - ] - }, - "right_arm": { - "texture": { "u": 8 }, - "center": [ -1.9, 12, 1 ], - "cubes": [ - { "from": [ -1, 0, -1 ], "size": [ 2, 11, 2 ] } - ] - }, - "left_arm": { - "texture": { "u": 40, "v": 16 }, - "center": [ 1.9, 12, 1 ], - "cubes": [ - { "from": [ -1, 0, -1 ], "size": [ 2, 11, 2 ] } - ] - }, - "right_leg": { - "texture": { "u": 8 }, - "center": [ -1.9, 12, 10 ], - "cubes": [ - { "from": [ -1, 0, -1 ], "size": [2, 11, 2 ] } - ] - }, - "left_leg": { - "texture": { "u": 40, "v": 16 }, - "center": [ 1.9, 12, 10 ], - "cubes": [ - { "from": [ -1, 0, -1 ], "size": [2, 11, 2 ] } - ] - }, - "right_body_stick": { - "texture": { "u": 16 }, - "children": [ - { - "rotate": [ 10, 0, 15 ], - "cubes": [ - { "from": [ -1, 4, -1 ], "size": [ 2, 7, 2 ] } - ] - } - ], - "cubes": [ - { "from": [ -3, 3, -1 ], "size": [ 2, 2, 2 ] } - ] - }, - "left_body_stick": { - "texture": { "u": 48, "v": 16 }, - "children": [ - { - "rotate": [ 10, 0, -15 ], - "cubes": [ - { "from": [ -1, 4, -1 ], "size": [ 2, 7, 2 ] } - ] - } - ], - "cubes": [ - { "from": [ 1, 3, -1 ], "size": [ 2, 2, 2 ] } - ] - }, - "shoulder_stick": { - "texture": { "v": 48 }, - "center": [ 0, 0, 10 ], - "children": [ - { - "texture": { "u": 16, "v": 0 }, - "rotate": [ 90, 0, 0 ], - "center": [ -1, 0, 0 ], - "children": [ - { - "rotate": [ 45, 0, 0 ], - "cubes": [ - { "from": [ 0, -8, -9 ], "size": [ 2, 7, 2 ] } - ] - } - ], - "cubes": [ - { "from": [ 2, -8, -12 ], "size": [ 2, 7, 2 ] }, - { "from": [ -2, -8, -12 ], "size": [ 2, 7, 2 ] } - ] - } - ], - "cubes": [ - { "from": [ -4, 10, -1 ], "size": [ 8, 2, 2 ] } - ] - }, - "base_plate": { - "texture": { "v": 32 }, - "center": [ 0, 12, 4 ], - "cubes": [ - { "from": [ -6, 11, -6 ], "size": [ 12, 1, 12 ] } - ] + "data": { + "head": { + "pivot": [ 0, 5, 0 ], + "cubes": [ + { "from": [ -1, -7, -1 ], "size": [ 2, 7, 2 ] } + ] + }, + "hat": { + "pivot": [ 0, 5, 0 ], + "cubes": [ + { "from": [ -1, -7, -1 ], "size": [ 2, 7, 2 ], "dilate": 0.5 } + ] + }, + "body": { + "texture": { "u": 0, "v": 48 }, + "pivot": [ 0, 0, 1 ], + "cubes": [ + { "from": [ -4, 10, -1 ], "size": [ 8, 2, 2 ] } + ] + }, + "right_arm": { + "texture": { "u": 8 }, + "pivot": [ -1.9, 12, 1 ], + "cubes": [ + { "from": [ -1, 0, -1 ], "size": [ 2, 11, 2 ] } + ] + }, + "left_arm": { + "texture": { "u": 40, "v": 16 }, + "pivot": [ 1.9, 12, 1 ], + "cubes": [ + { "from": [ -1, 0, -1 ], "size": [ 2, 11, 2 ] } + ] + }, + "right_leg": { + "texture": { "u": 8 }, + "pivot": [ -1.9, 12, 10 ], + "cubes": [ + { "from": [ -1, 0, -1 ], "size": [2, 11, 2 ] } + ] + }, + "left_leg": { + "texture": { "u": 40, "v": 16 }, + "pivot": [ 1.9, 12, 10 ], + "cubes": [ + { "from": [ -1, 0, -1 ], "size": [2, 11, 2 ] } + ] + }, + "right_body_stick": { + "texture": { "u": 16 }, + "children": { + "right_body_support": { + "rotate": [ 10, 0, 15 ], + "cubes": [ + { "from": [ -1, 4, -1 ], "size": [ 2, 7, 2 ] } + ] + } + }, + "cubes": [ + { "from": [ -3, 3, -1 ], "size": [ 2, 2, 2 ] } + ] + }, + "left_body_stick": { + "texture": { "u": 48, "v": 16 }, + "children": { + "left_body_support": { + "rotate": [ 10, 0, -15 ], + "cubes": [ + { "from": [ -1, 4, -1 ], "size": [ 2, 7, 2 ] } + ] + } + }, + "cubes": [ + { "from": [ 1, 3, -1 ], "size": [ 2, 2, 2 ] } + ] + }, + "shoulder_stick": { + "texture": { "v": 48 }, + "pivot": [ 0, 0, 10 ], + "children": { + "back_stick": { + "texture": { "u": 16, "v": 0 }, + "rotate": [ 90, 0, 0 ], + "pivot": [ -1, 0, 0 ], + "children": { + "back_stick_support": { + "rotate": [ 45, 0, 0 ], + "cubes": [ + { "from": [ 0, -8, -9 ], "size": [ 2, 7, 2 ] } + ] + } + }, + "cubes": [ + { "from": [ 2, -8, -12 ], "size": [ 2, 7, 2 ] }, + { "from": [ -2, -8, -12 ], "size": [ 2, 7, 2 ] } + ] + } + }, + "cubes": [ + { "from": [ -4, 10, -1 ], "size": [ 8, 2, 2 ] } + ] + }, + "base_plate": { + "texture": { "v": 32 }, + "pivot": [ 0, 12, 4 ], + "cubes": [ + { "from": [ -6, 11, -6 ], "size": [ 12, 1, 12 ] } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/breezie.json b/src/main/resources/assets/minelittlepony/models/breezie.json index 01e3b83b..757aeeab 100644 --- a/src/main/resources/assets/minelittlepony/models/breezie.json +++ b/src/main/resources/assets/minelittlepony/models/breezie.json @@ -3,117 +3,119 @@ "texture": { "w": 64, "h": 64 }, - "head": { - "children": [ - { - "center": [0, 0, -4], - "cubes": [ - {"from": [-3, -6, -3], "size": [6, 6, 6] }, - {"from": [ 2, -7, 1], "size": [1, 1, 1], "texture": {"u": 28, "v": 0} }, - {"from": [-3, -7, 1], "size": [1, 1, 1], "texture": {"u": 24, "v": 0} }, - {"from": [-1, -2, -4], "size": [2, 2, 1], "texture": {"u": 24, "v": 9} } - ] - }, - { - "rotate": [-15, 0, 0], - "cubes": [ - {"from": [ 1, -11, -3], "size": [1, 6, 1], "texture": {"u": 28, "v": 2} }, - {"from": [-2, -11, -3], "size": [1, 6, 1], "texture": {"u": 24, "v": 2} } - ] + "data": { + "head": { + "children": { + "head_parts": { + "pivot": [0, 0, -4], + "cubes": [ + {"from": [-3, -6, -3], "size": [6, 6, 6] }, + {"from": [ 2, -7, 1], "size": [1, 1, 1], "texture": {"u": 28, "v": 0} }, + {"from": [-3, -7, 1], "size": [1, 1, 1], "texture": {"u": 24, "v": 0} }, + {"from": [-1, -2, -4], "size": [2, 2, 1], "texture": {"u": 24, "v": 9} } + ] + }, + "antennas": { + "rotate": [-15, 0, 0], + "cubes": [ + {"from": [ 1, -11, -3], "size": [1, 6, 1], "texture": {"u": 28, "v": 2} }, + {"from": [-2, -11, -3], "size": [1, 6, 1], "texture": {"u": 24, "v": 2} } + ] + } } - ] - }, - "hat": { - "children": [ - { - "center": [0, 0, -4], - "cubes": [ - {"from": [-3, -6, -3], "size": [6, 6, 6] } - ] + }, + "hat": { + "children": { + "hat_parts": { + "pivot": [0, 0, -4], + "cubes": [ + {"from": [-3, -6, -3], "size": [6, 6, 6] } + ] + } } - ] - }, - "neck": { - "texture": {"u": 40, "v": 0}, - "rotate": [5, 0, 0], - "center": [-1, -2, -4], - "cubes": [ - {"from": [0, 0, 0], "size": [2, 5, 2] } - ] - }, - "body": { - "texture": {"u": 2, "v": 12}, - "center": [-3, 2, -3], - "rotate": [-30, 0, 0], - "cubes": [ - {"from": [0, 0, 0], "size": [6, 7, 14] } - ], - "children": [ - { - "texture": {"u": 40, "v": 7 }, - "center": [3, 0, 13], - "rotate": [60, 0, 0], - "cubes": [ - {"from": [0, 0, 0], "size": [1, 1, 3] } - ], - "children": [ - { - "texture": {"u": 32, "v": 0 }, - "center": [-0.5, -1, 1], - "rotate": [-20, 0, 0], - "cubes": [ - {"from": [0, 0, 1], "size": [2, 9, 2] } - ] + }, + "neck": { + "texture": {"u": 40, "v": 0}, + "rotate": [5, 0, 0], + "pivot": [-1, -2, -4], + "cubes": [ + {"from": [0, 0, 0], "size": [2, 5, 2] } + ] + }, + "body": { + "texture": {"u": 2, "v": 12}, + "pivot": [-3, 2, -3], + "rotate": [-30, 0, 0], + "cubes": [ + {"from": [0, 0, 0], "size": [6, 7, 14] } + ], + "children": { + "tail": { + "texture": {"u": 40, "v": 7 }, + "pivot": [3, 0, 13], + "rotate": [60, 0, 0], + "cubes": [ + {"from": [0, 0, 0], "size": [1, 1, 3] } + ], + "children": { + "tail_hair": { + "texture": {"u": 32, "v": 0 }, + "pivot": [-0.5, -1, 1], + "rotate": [-20, 0, 0], + "cubes": [ + {"from": [0, 0, 1], "size": [2, 9, 2] } + ] + } } - ] + } } - ] - }, - "right_arm": { - "center": [-3, 8, -5], - "texture": { "u": 36, "v": 12 }, - "cubes": [ - { "from": [0, 0, 0], "size": [ 2, 12, 2] } - ] - }, - "left_arm": { - "center": [1, 8, -5], - "texture": { "u": 28, "v": 12 }, - "mirror": true, - "cubes": [ - { "from": [0, 0, 0], "size": [ 2, 12, 2] } - ] - }, - "right_leg": { - "center": [-3, 12, 3], - "texture": { "u": 0, "v": 12 }, - "cubes": [ - { "from": [0, 0, 0], "size": [ 2, 12, 2] } - ] - }, - "left_leg": { - "center": [1, 12, 3], - "texture": { "u": 8, "v": 12 }, - "mirror": true, - "cubes": [ - { "from": [0, 0, 0], "size": [ 2, 12, 2] } - ] - }, - "left_wing": { - "center": [2, 3, 1], - "rotate": [0, -40, 0], - "texture": { "u": 0, "v": 40 }, - "cubes": [ - { "from": [0, -12, 0], "size": [ 24, 24, 0] } - ] - }, - "right_wing": { - "center": [-2, 3, 1], - "rotate": [0, 40, 0], - "texture": { "u": 0, "v": 40 }, - "mirror": true, - "cubes": [ - { "from": [-22, -12, 0], "size": [ 24, 24, 0] } - ] + }, + "right_arm": { + "pivot": [-3, 8, -5], + "texture": { "u": 36, "v": 12 }, + "cubes": [ + { "from": [0, 0, 0], "size": [ 2, 12, 2] } + ] + }, + "left_arm": { + "pivot": [1, 8, -5], + "texture": { "u": 28, "v": 12 }, + "mirror": true, + "cubes": [ + { "from": [0, 0, 0], "size": [ 2, 12, 2] } + ] + }, + "right_leg": { + "pivot": [-3, 12, 3], + "texture": { "u": 0, "v": 12 }, + "cubes": [ + { "from": [0, 0, 0], "size": [ 2, 12, 2] } + ] + }, + "left_leg": { + "pivot": [1, 12, 3], + "texture": { "u": 8, "v": 12 }, + "mirror": true, + "cubes": [ + { "from": [0, 0, 0], "size": [ 2, 12, 2] } + ] + }, + "left_wing": { + "pivot": [2, 3, 1], + "rotate": [0, -40, 0], + "texture": { "u": 0, "v": 40 }, + "cubes": [ + { "from": [0, -12, 0], "size": [ 24, 24, 0] } + ] + }, + "right_wing": { + "pivot": [-2, 3, 1], + "rotate": [0, 40, 0], + "texture": { "u": 0, "v": 40 }, + "mirror": true, + "cubes": [ + { "from": [-22, -12, 0], "size": [ 24, 24, 0] } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/components/bat_ears.json b/src/main/resources/assets/minelittlepony/models/components/bat_ears.json index d7cb65be..2fb62cc3 100644 --- a/src/main/resources/assets/minelittlepony/models/components/bat_ears.json +++ b/src/main/resources/assets/minelittlepony/models/components/bat_ears.json @@ -5,23 +5,25 @@ "y": 0, "z": 0 }, - "right": { - "texture": {"u": 12, "v": 16}, - "center": ["#x", "#y", "#z"], - "cubes": [ - { "from": [-4, -8, -1], "size": [2, 2, 2] }, - { "from": [-3.5, -8.49, -1.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 3} }, - { "from": [-2.998, -8.49, -2.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 5} } - ] - }, - "left": { - "texture": {"u": 12, "v": 16}, - "center": ["#x", "#y", "#z"], - "mirror": [true, false, false], - "cubes": [ - { "from": [2, -8, -1], "size": [2, 2, 2] }, - { "from": [2.5, -8.49, -1.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 3} }, - { "from": [1.998, -8.49, -2.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 5} } - ] + "data": { + "right": { + "texture": {"u": 12, "v": 16}, + "pivot": ["#x", "#y", "#z"], + "cubes": [ + { "from": [-4, -8, -1], "size": [2, 2, 2] }, + { "from": [-3.5, -8.49, -1.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 3} }, + { "from": [-2.998, -8.49, -2.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 5} } + ] + }, + "left": { + "texture": {"u": 12, "v": 16}, + "pivot": ["#x", "#y", "#z"], + "mirror": [true, false, false], + "cubes": [ + { "from": [2, -8, -1], "size": [2, 2, 2] }, + { "from": [2.5, -8.49, -1.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 3} }, + { "from": [1.998, -8.49, -2.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 5} } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/components/bat_wings.json b/src/main/resources/assets/minelittlepony/models/components/bat_wings.json index 26ce064e..04866379 100644 --- a/src/main/resources/assets/minelittlepony/models/components/bat_wings.json +++ b/src/main/resources/assets/minelittlepony/models/components/bat_wings.json @@ -1,118 +1,120 @@ { - "left_wing": { - "type": "mson:slot", - "name": "left_wing", - "implementation": "com.minelittlepony.client.model.part.BatWings$Wing", - "content": { - "texture": {"w": 64, "h": 64 }, - "folded": { - "texture": {"u": 56, "v": 16}, - "rotate": [90, 0, 0], - "center": [-0.5, 13, -4], - "cubes": [ - { "from": [3.15, 5, 4], "size": [1, 4, 1] }, - { "from": [ 3.5, 5, 6], "size": [1, 7, 1] }, - { "from": [ 3.5, 5, 5], "size": [1, 6, 1] }, - { "from": [3.15, 5, 7], "size": [1, 7, 1] } - ] - }, - "extended": { - "texture": {"u": 56, "v": 19}, - "rotate": [3, 180, 0], - "center": [2.5, 5.3, 3], - "children": [ - { - "texture": {"u": 60, "v": 16}, - "rotate": [0.1, 0, 0], - "cubes": [ - { "from": [-0.5, -1, 0], "size": [1, 8, 1], "stretch": 0.001 } - ], - "children": [ - { - "texture": {"u": 60, "v": 16}, - "rotate": [-28, 0, 0], - "center": [0, -1, -2], - "cubes": [ - { "from": [-0.5, 0, 2], "size": [1, 7, 1] } - ] - }, - { - "texture": {"u": 60, "v": 16}, - "rotate": [-28, 0, 0], - "center": [0, 4, -2.4], - "cubes": [ - { "from": [-0.5, 0, 3], "size": [1, 7, 1] } - ] - }, - { - "type": "mson:planar", - "west": [0, 0, -7, 8, 16, 56, 32] + "data": { + "left_wing": { + "type": "mson:slot", + "name": "left_wing", + "implementation": "com.minelittlepony.client.model.part.BatWings$Wing", + "data": { + "texture": {"w": 64, "h": 64 }, + "folded": { + "texture": {"u": 56, "v": 16}, + "rotate": [90, 0, 0], + "pivot": [-0.5, 13, -4], + "cubes": [ + { "from": [3.15, 5, 4], "size": [1, 4, 1] }, + { "from": [ 3.5, 5, 6], "size": [1, 7, 1] }, + { "from": [ 3.5, 5, 5], "size": [1, 6, 1] }, + { "from": [3.15, 5, 7], "size": [1, 7, 1] } + ] + }, + "extended": { + "texture": {"u": 56, "v": 19}, + "rotate": [3, 180, 0], + "pivot": [2.5, 5.3, 3], + "children": { + "bones": { + "texture": {"u": 60, "v": 16}, + "rotate": [0.1, 0, 0], + "cubes": [ + { "from": [-0.5, -1, 0], "size": [1, 8, 1], "dilate": 0.001 } + ], + "children": { + "bone_1": { + "texture": {"u": 60, "v": 16}, + "rotate": [-28, 0, 0], + "pivot": [0, -1, -2], + "cubes": [ + { "from": [-0.5, 0, 2], "size": [1, 7, 1] } + ] + }, + "bone_2": { + "texture": {"u": 60, "v": 16}, + "rotate": [-28, 0, 0], + "pivot": [0, 4, -2.4], + "cubes": [ + { "from": [-0.5, 0, 3], "size": [1, 7, 1] } + ] + }, + "skin": { + "type": "mson:planar", + "west": [0, 0, -7, 8, 16, 56, 32] + } } - ] + } } - ] + } } - } - }, - "right_wing": { - "type": "mson:slot", - "name": "right_wing", - "implementation": "com.minelittlepony.client.model.part.BatWings$Wing", - "content": { - "texture": {"w": 64, "h": 64 }, - "folded": { - "texture": {"u": 56, "v": 16}, - "rotate": [90, 0, 0], - "center": [-0.5, 13, -4], - "mirror": true, - "cubes": [ - { "from": [-3.15, 5, 4], "size": [1, 4, 1] }, - { "from": [ -3.5, 5, 6], "size": [1, 7, 1] }, - { "from": [ -3.5, 5, 5], "size": [1, 6, 1] }, - { "from": [-3.15, 5, 7], "size": [1, 7, 1] } - ] - }, - "extended": { - "texture": {"u": 56, "v": 19}, - "center": [-2.5, 5.3, 3], - "rotate": [-3, 180, 0], - "mirror": true, - "children": [ - { - "texture": {"u": 60, "v": 16}, - "rotate": [5.7, 0, 0], - "cubes": [ - { "from": [-0.5, -1, 0], "size": [1, 8, 1], "stretch": 0.001 } - ], - "children": [ - { - "texture": {"u": 60, "v": 16}, - "rotate": [-28, 0, 0], - "center": [0, -1, -2], - "mirror": true, - "cubes": [ - { "from": [-0.5, 0, 2], "size": [1, 7, 1] } - ] - }, - { - "texture": {"u": 60, "v": 16}, - "rotate": [-28, 0, 0], - "center": [0, 4, -2.4], - "mirror": true, - "cubes": [ - { "from": [-0.5, 0, 3], "size": [1, 7, 1] } - ] - }, - { - "type": "mson:planar", - "mirror": [true, false, true], - "east": [0, 0, -7, 8, 16, 56, 32] + }, + "right_wing": { + "type": "mson:slot", + "name": "right_wing", + "implementation": "com.minelittlepony.client.model.part.BatWings$Wing", + "data": { + "texture": {"w": 64, "h": 64 }, + "folded": { + "texture": {"u": 56, "v": 16}, + "rotate": [90, 0, 0], + "pivot": [-0.5, 13, -4], + "mirror": true, + "cubes": [ + { "from": [-3.15, 5, 4], "size": [1, 4, 1] }, + { "from": [ -3.5, 5, 6], "size": [1, 7, 1] }, + { "from": [ -3.5, 5, 5], "size": [1, 6, 1] }, + { "from": [-3.15, 5, 7], "size": [1, 7, 1] } + ] + }, + "extended": { + "texture": {"u": 56, "v": 19}, + "pivot": [-2.5, 5.3, 3], + "rotate": [-3, 180, 0], + "mirror": true, + "children": { + "bones": { + "texture": {"u": 60, "v": 16}, + "rotate": [5.7, 0, 0], + "cubes": [ + { "from": [-0.5, -1, 0], "size": [1, 8, 1], "dilate": 0.001 } + ], + "children": { + "bone_1": { + "texture": {"u": 60, "v": 16}, + "rotate": [-28, 0, 0], + "pivot": [0, -1, -2], + "mirror": true, + "cubes": [ + { "from": [-0.5, 0, 2], "size": [1, 7, 1] } + ] + }, + "bone_2": { + "texture": {"u": 60, "v": 16}, + "rotate": [-28, 0, 0], + "pivot": [0, 4, -2.4], + "mirror": true, + "cubes": [ + { "from": [-0.5, 0, 3], "size": [1, 7, 1] } + ] + }, + "skin": { + "type": "mson:planar", + "mirror": [true, false, true], + "east": [0, 0, -7, 8, 16, 56, 32] + } } - ] + } } - ] + } } - } - }, - "legacy_right_wing": "#right_wing" + }, + "legacy_right_wing": "#right_wing" + } } 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 70070a2e..f24ced27 100644 --- a/src/main/resources/assets/minelittlepony/models/components/bug_wings.json +++ b/src/main/resources/assets/minelittlepony/models/components/bug_wings.json @@ -1,55 +1,57 @@ { - "left_wing": { - "type": "mson:slot", - "name": "left_wing", - "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", - "content": { - "folded": { "visible": false }, - "extended": { - "texture": {"u": 56, "v": 19, "w": 64, "h": 64}, - "center": [2.49, 5.28, 4], - "rotate": [30, 0, 0], - "children": [ - { - "type": "mson:planar", - "texture": {"u": 56, "v": 16}, - "east": [-0.5, 0, -7, 8, 16] - }, - { - "type": "mson:planar", - "texture": {"u": 56, "v": 32}, - "rotate": [-0.5, 0.3, 0.3333], - "east": [1, 0, -5, 8, 16] + "data": { + "left_wing": { + "type": "mson:slot", + "name": "left_wing", + "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", + "data": { + "folded": { "visible": false }, + "extended": { + "texture": {"u": 56, "v": 19, "w": 64, "h": 64}, + "pivot": [2.49, 5.28, 4], + "rotate": [30, 0, 0], + "children": { + "primary": { + "type": "mson:planar", + "texture": {"u": 56, "v": 16}, + "east": [-0.5, 0, -7, 8, 16] + }, + "secondary": { + "type": "mson:planar", + "texture": {"u": 56, "v": 32}, + "rotate": [-0.5, 0.3, 0.3333], + "east": [1, 0, -5, 8, 16] + } } - ] + } } - } - }, - "right_wing": { - "type": "mson:slot", - "name": "right_wing", - "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", - "content": { - "folded": { "visible": false }, - "extended": { - "texture": {"u": 56, "v": 19, "w": 64, "h": 64}, - "center": [-2.49, 5.28, 4], - "rotate": [30, 0, 0], - "children": [ - { - "type": "mson:planar", - "texture": {"u": 56, "v": 16}, - "east": [0.5, 0, -7, 8, 16] - }, - { - "type": "mson:planar", - "texture": {"u": 56, "v": 32}, - "rotate": [-0.5, -0.3, -0.3333], - "east": [-1, 0, -5, 8, 16] + }, + "right_wing": { + "type": "mson:slot", + "name": "right_wing", + "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", + "data": { + "folded": { "visible": false }, + "extended": { + "texture": {"u": 56, "v": 19, "w": 64, "h": 64}, + "pivot": [-2.49, 5.28, 4], + "rotate": [30, 0, 0], + "children": { + "primary": { + "type": "mson:planar", + "texture": {"u": 56, "v": 16}, + "east": [0.5, 0, -7, 8, 16] + }, + "secondary": { + "type": "mson:planar", + "texture": {"u": 56, "v": 32}, + "rotate": [-0.5, -0.3, -0.3333], + "east": [-1, 0, -5, 8, 16] + } } - ] + } } - } - }, - "legacy_right_wing": "#right_wing" + }, + "legacy_right_wing": "#right_wing" + } } diff --git a/src/main/resources/assets/minelittlepony/models/components/ears.json b/src/main/resources/assets/minelittlepony/models/components/ears.json index 5a00b0c3..2158b5c3 100644 --- a/src/main/resources/assets/minelittlepony/models/components/ears.json +++ b/src/main/resources/assets/minelittlepony/models/components/ears.json @@ -5,19 +5,21 @@ "y": 0, "z": 0 }, - "right": { - "texture": {"u": 12, "v": 16}, - "center": ["#x", "#y", "#z"], - "cubes": [ - { "from": [-4, -8, -1], "size": [2, 2, 2] } - ] - }, - "left": { - "texture": {"u": 12, "v": 16}, - "center": ["#x", "#y", "#z"], - "mirror": [true, false, false], - "cubes": [ - { "from": [2, -8, -1], "size": [2, 2, 2] } - ] + "data": { + "right": { + "texture": {"u": 12, "v": 16}, + "pivot": ["#x", "#y", "#z"], + "cubes": [ + { "from": [-4, -8, -1], "size": [2, 2, 2] } + ] + }, + "left": { + "texture": {"u": 12, "v": 16}, + "pivot": ["#x", "#y", "#z"], + "mirror": [true, false, false], + "cubes": [ + { "from": [2, -8, -1], "size": [2, 2, 2] } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/components/fish_tail.json b/src/main/resources/assets/minelittlepony/models/components/fish_tail.json index 1212ac03..c1cb44d2 100644 --- a/src/main/resources/assets/minelittlepony/models/components/fish_tail.json +++ b/src/main/resources/assets/minelittlepony/models/components/fish_tail.json @@ -4,44 +4,46 @@ "tail_rot_x": 90, "tail_rot_x_neg": [0, "-", "#tail_rot_x"] }, - "base": { - "texture": {"u": 0, "v": 38}, - "center": [-2, 10, 8], - "rotate": ["#tail_rot_x", 0, 0], - "mirror": true, - "cubes": [ - {"from": [0, 0, 0], "size": [4, 6, 4]} - ], - "children": [ - { - "name": "tip", - "texture": {"u": 24, "v": 0}, - "center": [1, 5, 1], - "cubes": [ - {"size": [2, 6, 1]} - ], - "children": [ - { - "name": "fins", - "texture": {"u": 56, "v": 20}, - "rotate": ["#tail_rot_x_neg", 0, 0], - "cubes": [ - { - "type": "mson:plane", - "face": "up", - "mirror": [false, true], - "position": [-7, 0, 4], "size": [8, 8] - }, - { - "type": "mson:plane", - "face": "up", - "mirror": [true, true], - "position": [1, 0, 4], "size": [8, 8] - } - ] + "data": { + "base": { + "texture": {"u": 0, "v": 38}, + "pivot": [-2, 10, 8], + "rotate": ["#tail_rot_x", 0, 0], + "mirror": true, + "cubes": [ + {"from": [0, 0, 0], "size": [4, 6, 4]} + ], + "children": { + "tip": { + "name": "tip", + "texture": {"u": 24, "v": 0}, + "pivot": [1, 5, 1], + "cubes": [ + {"size": [2, 6, 1]} + ], + "children": { + "fins": { + "name": "fins", + "texture": {"u": 56, "v": 20}, + "rotate": ["#tail_rot_x_neg", 0, 0], + "cubes": [ + { + "type": "mson:plane", + "face": "up", + "mirror": [false, true], + "position": [-7, 0, 4], "size": [8, 8] + }, + { + "type": "mson:plane", + "face": "up", + "mirror": [true, true], + "position": [1, 0, 4], "size": [8, 8] + } + ] + } } - ] + } } - ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/components/horn.json b/src/main/resources/assets/minelittlepony/models/components/horn.json index 6f6208d8..6609bf12 100644 --- a/src/main/resources/assets/minelittlepony/models/components/horn.json +++ b/src/main/resources/assets/minelittlepony/models/components/horn.json @@ -5,31 +5,33 @@ "y": 0, "z": 0 }, - "bone": { - "rotate": [29, 0, 0], - "center": ["#x", "#y", "#z"], - "cubes": [ - { "from": [-0.5, -11, -3.5], "size": [1, 4, 1] } - ] - }, - "corona": { - "rotate": [29, 0, 0], - "center": ["#x", "#y", "#z"], - "cubes": [ - { - "type": "mson:cone", - "size": [1, 4, 1], - "from": [-0.5, -11, -3.5], - "stretch": 0.5, - "taper": 0.4 - }, - { - "type": "mson:cone", - "size": [1, 3, 1], - "from": [-0.5, -11, -3.5], - "stretch": 0.8, - "taper": 0.4 - } - ] + "data": { + "bone": { + "rotate": [29, 0, 0], + "pivot": ["#x", "#y", "#z"], + "cubes": [ + { "from": [-0.5, -11, -3.5], "size": [1, 4, 1] } + ] + }, + "corona": { + "rotate": [29, 0, 0], + "pivot": ["#x", "#y", "#z"], + "cubes": [ + { + "type": "mson:cone", + "size": [1, 4, 1], + "from": [-0.5, -11, -3.5], + "dilate": 0.5, + "taper": 0.4 + }, + { + "type": "mson:cone", + "size": [1, 3, 1], + "from": [-0.5, -11, -3.5], + "dilate": 0.8, + "taper": 0.4 + } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json b/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json index 92496119..fa3b1c11 100644 --- a/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json +++ b/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json @@ -1,91 +1,93 @@ { - "left_wing": { - "type": "mson:slot", - "name": "left_wing", - "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", - "content": { - "folded": { - "texture": {"u": 56, "v": 32, "w": 64, "h": 64}, - "center": [0, 13, -2], - "rotate": [90, 0, 0], - "cubes": [ - {"from": [4, 5, 2], "size": [2, 6, 2] }, - {"from": [4, 5, 4], "size": [2, 8, 2] }, - {"from": [4, 5, 6], "size": [2, 6, 2] } - ] - }, - "extended": { - "texture": {"u": 57, "v": 35, "w": 64, "h": 64}, - "center": [4.5, 5.3, 6], - "rotate": [-30, 180, 0], - "children": [ - { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "stretch": 0.1 } ] }, - { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-48, 0, 0] }, - { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-42, 0, 0] }, - { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, - { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "stretch": 0.3 } ] }, - { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-48, 0, 0] } - ] + "data": { + "left_wing": { + "type": "mson:slot", + "name": "left_wing", + "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", + "data": { + "folded": { + "texture": {"u": 56, "v": 32, "w": 64, "h": 64}, + "pivot": [0, 13, -2], + "rotate": [90, 0, 0], + "cubes": [ + {"from": [4, 5, 2], "size": [2, 6, 2] }, + {"from": [4, 5, 4], "size": [2, 8, 2] }, + {"from": [4, 5, 6], "size": [2, 6, 2] } + ] + }, + "extended": { + "texture": {"u": 57, "v": 35, "w": 64, "h": 64}, + "pivot": [4.5, 5.3, 6], + "rotate": [-30, 180, 0], + "children": { + "feather_1": { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "dilate": 0.1 } ] }, + "feather_2": { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "dilate": 0.1 } ], "rotate": [-48, 0, 0] }, + "feather_3": { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "dilate": -0.1 } ], "rotate": [-42, 0, 0] }, + "feather_4": { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, + "feather_5": { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "dilate": 0.3 } ] }, + "feather_6": { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "dilate": 0.19 } ], "rotate": [-48, 0, 0] } + } + } } - } - }, - "right_wing": { - "type": "mson:slot", - "name": "right_wing", - "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", - "content": { - "folded": { - "texture": {"u": 56, "v": 16, "w": 64, "h": 64}, - "center": [0, 13, -2], - "rotate": [90, 0, 0], - "cubes": [ - {"from": [-6, 5, 2], "size": [2, 6, 2] }, - {"from": [-6, 5, 4], "size": [2, 8, 2] }, - {"from": [-6, 5, 6], "size": [2, 6, 2] } - ] - }, - "extended": { - "texture": {"u": 56, "v": 19, "w": 64, "h": 64}, - "center": [-4.5, 5.3, 6], - "rotate": [-30, 180, 0], - "children": [ - { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "stretch": 0.1 } ] }, - { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-48, 0, 0] }, - { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-42, 0, 0] }, - { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, - { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "stretch": 0.3 } ] }, - { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-48, 0, 0] } - ] + }, + "right_wing": { + "type": "mson:slot", + "name": "right_wing", + "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", + "data": { + "folded": { + "texture": {"u": 56, "v": 16, "w": 64, "h": 64}, + "pivot": [0, 13, -2], + "rotate": [90, 0, 0], + "cubes": [ + {"from": [-6, 5, 2], "size": [2, 6, 2] }, + {"from": [-6, 5, 4], "size": [2, 8, 2] }, + {"from": [-6, 5, 6], "size": [2, 6, 2] } + ] + }, + "extended": { + "texture": {"u": 56, "v": 19, "w": 64, "h": 64}, + "pivot": [-4.5, 5.3, 6], + "rotate": [-30, 180, 0], + "children": { + "feather_1": { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "dilate": 0.1 } ] }, + "feather_2": { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "dilate": 0.1 } ], "rotate": [-48, 0, 0] }, + "feather_3": { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "dilate": -0.1 } ], "rotate": [-42, 0, 0] }, + "feather_4": { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, + "feather_5": { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "dilate": 0.3 } ] }, + "feather_6": { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "dilate": 0.19 } ], "rotate": [-48, 0, 0] } + } + } } - } - }, - "legacy_right_wing": { - "type": "mson:slot", - "name": "legacy_right_wing", - "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", - "content": { - "folded": { - "texture": {"u": 56, "v": 32}, - "center": [0, 13, -2], - "rotate": [90, 0, 0], - "cubes": [ - {"from": [-6, 5, 2], "size": [2, 6, 2] }, - {"from": [-6, 5, 4], "size": [2, 8, 2] }, - {"from": [-6, 5, 6], "size": [2, 6, 2] } - ] - }, - "extended": { - "texture": {"u": 57, "v": 35, "w": 64, "h": 64}, - "center": [-4.5, 5.3, 6], - "rotate": [-30, 180, 0], - "children": [ - { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "stretch": 0.1 } ], "mirror": true }, - { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-48, 0, 0], "mirror": true }, - { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-42, 0, 0], "mirror": true }, - { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28 , 0, 0], "mirror": true }, - { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "stretch": 0.3 } ] }, - { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-48, 0, 0], "mirror": true } - ] + }, + "legacy_right_wing": { + "type": "mson:slot", + "name": "legacy_right_wing", + "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", + "data": { + "folded": { + "texture": {"u": 56, "v": 32}, + "pivot": [0, 13, -2], + "rotate": [90, 0, 0], + "cubes": [ + {"from": [-6, 5, 2], "size": [2, 6, 2] }, + {"from": [-6, 5, 4], "size": [2, 8, 2] }, + {"from": [-6, 5, 6], "size": [2, 6, 2] } + ] + }, + "extended": { + "texture": {"u": 57, "v": 35, "w": 64, "h": 64}, + "pivot": [-4.5, 5.3, 6], + "rotate": [-30, 180, 0], + "children": { + "feather_1": { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "dilate": 0.1 } ], "mirror": true }, + "feather_2": { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "dilate": 0.1 } ], "rotate": [-48, 0, 0], "mirror": true }, + "feather_3": { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "dilate": -0.1 } ], "rotate": [-42, 0, 0], "mirror": true }, + "feather_4": { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28 , 0, 0], "mirror": true }, + "feather_5": { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "dilate": 0.3 } ] }, + "feather_6": { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "dilate": 0.19 } ], "rotate": [-48, 0, 0], "mirror": true } + } + } } } } diff --git a/src/main/resources/assets/minelittlepony/models/components/pig_snout.json b/src/main/resources/assets/minelittlepony/models/components/pig_snout.json index 6c8c37a8..80af4fef 100644 --- a/src/main/resources/assets/minelittlepony/models/components/pig_snout.json +++ b/src/main/resources/assets/minelittlepony/models/components/pig_snout.json @@ -1,13 +1,15 @@ { "parent": "minelittlepony:components/snout", "texture": {"w": 64, "h": 64, "u": 16, "v": 8}, - "mare": { - "type": "mson:planar", - "center": ["#x", "#y", "#z"], - "north": [-2, -1, -7, 4, 3, 10, 13], - "up": [-2, -1, -7, 4, 1, 10, 13], - "down": [-2, 2, -7, 4, 1, 18, 7], - "west": [-2, -1, -7, 1, 3, 9, 13], - "east": [ 2, -1, -7, 1, 3, 14, 13] + "data": { + "mare": { + "type": "mson:planar", + "pivot": ["#x", "#y", "#z"], + "north": [-2, -1, -7, 4, 3, 10, 13], + "up": [-2, -1, -7, 4, 1, 10, 13], + "down": [-2, 2, -7, 4, 1, 18, 7], + "west": [-2, -1, -7, 1, 3, 9, 13], + "east": [ 2, -1, -7, 1, 3, 14, 13] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/components/snout.json b/src/main/resources/assets/minelittlepony/models/components/snout.json index 526ba980..f12eaf91 100644 --- a/src/main/resources/assets/minelittlepony/models/components/snout.json +++ b/src/main/resources/assets/minelittlepony/models/components/snout.json @@ -5,35 +5,37 @@ "y": 0, "z": 0 }, - "stallion": { - "type": "mson:planar", - "center": ["#x", "#y", "#z"], - "north": [-2, -1, -7, 4, 3, 10, 13], - "up": [-2, -1, -7, 4, 1, 10, 13], - "down": [-2, 2, -7, 4, 1, 18, 7], - "west": [-2, -1, -7, 1, 3, 9, 13], - "east": [ 2, -1, -7, 1, 3, 14, 13] - }, - "mare": { - "type": "mson:planar", - "center": ["#x", "#y", "#z"], - "north": [ - [-2, 0, -7, 4, 2, 10, 14], - [-1, -1, -7, 2, 1, 11, 13] - ], - "up": [ - [-2, 0, -7, 1, 1, 9, 14], - [ 1, 0, -7, 1, 1, 14, 14], - [-1, -1, -7, 2, 1, 11, 12] - ], - "down": [-2, 2, -7, 4, 1, 18, 7], - "west": [ - [-2, 0, -7, 1, 2, 9, 14], - [-1, -1, -7, 1, 1, 11, 13] - ], - "east": [ - [ 2, 0, -7, 1, 2, 14, 14], - [ 1, -1, -7, 1, 1, 12, 13] - ] + "data": { + "stallion": { + "type": "mson:planar", + "pivot": ["#x", "#y", "#z"], + "north": [-2, -1, -7, 4, 3, 10, 13], + "up": [-2, -1, -7, 4, 1, 10, 13], + "down": [-2, 2, -7, 4, 1, 18, 7], + "west": [-2, -1, -7, 1, 3, 9, 13], + "east": [ 2, -1, -7, 1, 3, 14, 13] + }, + "mare": { + "type": "mson:planar", + "pivot": ["#x", "#y", "#z"], + "north": [ + [-2, 0, -7, 4, 2, 10, 14], + [-1, -1, -7, 2, 1, 11, 13] + ], + "up": [ + [-2, 0, -7, 1, 1, 9, 14], + [ 1, 0, -7, 1, 1, 14, 14], + [-1, -1, -7, 2, 1, 11, 12] + ], + "down": [-2, 2, -7, 4, 1, 18, 7], + "west": [ + [-2, 0, -7, 1, 2, 9, 14], + [-1, -1, -7, 1, 1, 11, 13] + ], + "east": [ + [ 2, 0, -7, 1, 2, 14, 14], + [ 1, -1, -7, 1, 1, 12, 13] + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/components/tail.json b/src/main/resources/assets/minelittlepony/models/components/tail.json index 80a632de..26400df9 100644 --- a/src/main/resources/assets/minelittlepony/models/components/tail.json +++ b/src/main/resources/assets/minelittlepony/models/components/tail.json @@ -3,32 +3,34 @@ "locals": { "segments": 4 }, - "segment_0": { - "type": "mson:slot", - "name": "segment_0", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 0 }, - "content": "minelittlepony:components/tail_segment" - }, - "segment_1": { - "type": "mson:slot", - "name": "segment_1", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 1 }, - "content": "minelittlepony:components/tail_segment" - }, - "segment_2": { - "type": "mson:slot", - "name": "segment_2", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 2 }, - "content": "minelittlepony:components/tail_segment" - }, - "segment_3": { - "type": "mson:slot", - "name": "segment_3", - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 3 }, - "content": "minelittlepony:components/tail_segment" + "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" + } } } diff --git a/src/main/resources/assets/minelittlepony/models/components/tail_segment.json b/src/main/resources/assets/minelittlepony/models/components/tail_segment.json index 290c8c85..2cfe09ef 100644 --- a/src/main/resources/assets/minelittlepony/models/components/tail_segment.json +++ b/src/main/resources/assets/minelittlepony/models/components/tail_segment.json @@ -5,14 +5,16 @@ "segment_y": [["#segment_index", "*", 4], "+", 1.063], "tex_x": [["#segment_index", "%", 2], "*", 4] }, - "segment": { - "type": "mson:planar", - "center": [0, "#segment_y", 0], - "up": [-2, 0, 2, 4, 4, 32, 0], - "east": [ 2, 0, 2, 4, 4, 36, "#tex_x"], - "west": [-2, 0, 2, 4, 4, 36, "#tex_x"], - "south":[-2, 0, 2, 4, 4, 32, "#tex_x"], - "north":[-2, 0, 6, 4, 4, 32, "#tex_x"], - "down": [-2, 4, 2, 4, 4, 32, 0] + "data": { + "segment": { + "type": "mson:planar", + "pivot": [0, "#segment_y", 0], + "up": [-2, 0, 2, 4, 4, 32, 0], + "east": [ 2, 0, 2, 4, 4, 36, "#tex_x"], + "west": [-2, 0, 2, 4, 4, 36, "#tex_x"], + "south":[-2, 0, 2, 4, 4, 32, "#tex_x"], + "north":[-2, 0, 6, 4, 4, 32, "#tex_x"], + "down": [-2, 4, 2, 4, 4, 32, 0] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/dj_pon_three.json b/src/main/resources/assets/minelittlepony/models/dj_pon_three.json index daa45e8f..23e1541b 100644 --- a/src/main/resources/assets/minelittlepony/models/dj_pon_three.json +++ b/src/main/resources/assets/minelittlepony/models/dj_pon_three.json @@ -1,9 +1,11 @@ { "texture": {"w": 64, "h": 64}, - "head": { - "cubes": [ - { "from": [-9, -13, -1], "size": [ 6, 6, 1] }, - { "from": [ 3, 13, -1], "size": [ 6, 6, 1] } - ] + "data": { + "head": { + "cubes": [ + { "from": [-9, -13, -1], "size": [ 6, 6, 1] }, + { "from": [ 3, 13, -1], "size": [ 6, 6, 1] } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/elytra.json b/src/main/resources/assets/minelittlepony/models/elytra.json index 72fe6115..793aa588 100644 --- a/src/main/resources/assets/minelittlepony/models/elytra.json +++ b/src/main/resources/assets/minelittlepony/models/elytra.json @@ -1,14 +1,16 @@ { "texture": {"u": 22, "w": 64, "h": 32}, - "left_wing": { - "cubes": [ - {"from": [-10, 0, 0], "size": [10, 20, 2], "stretch": 1} - ] - }, - "right_wing": { - "mirror": true, - "cubes": [ - {"from": [ 0, 0, 0], "size": [10, 20, 2], "stretch": 1} - ] + "data": { + "left_wing": { + "cubes": [ + {"from": [-10, 0, 0], "size": [10, 20, 2], "dilate": 1} + ] + }, + "right_wing": { + "mirror": true, + "cubes": [ + {"from": [ 0, 0, 0], "size": [10, 20, 2], "dilate": 1} + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/enderman.json b/src/main/resources/assets/minelittlepony/models/enderman.json index 3c4fb5f7..3af6c5d5 100644 --- a/src/main/resources/assets/minelittlepony/models/enderman.json +++ b/src/main/resources/assets/minelittlepony/models/enderman.json @@ -5,114 +5,116 @@ "arm_rotation_x": 3, "arm_rotation_y": 14 }, - "head": { - "center": [ 0, 0, -2 ], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": [ - { - "type": "mson:slot", - "name": "snout", - "implementation": "com.minelittlepony.client.model.part.PonySnout", - "content": "minelittlepony:components/snout" - }, - { - "type": "mson:slot", - "name": "ears", - "implementation": "com.minelittlepony.client.model.part.PonyEars", - "content": "minelittlepony:components/ears" - }, - { - "type": "mson:slot", - "name": "horn", - "implementation": "com.minelittlepony.client.model.part.UnicornHorn", - "content": "minelittlepony:components/horn" - }, - { - "name": "left_horn", - "texture": {"u": 0, "v": 52}, - "center": [-4, -5, -3], - "rotate": [200, 0, -45], - "cubes": [ - { "from": [-1, 0, -1], "size": [2, 6, 2] } - ], - "children": [ - { - "rotate": [0, 0, -51], - "center": [-0.5, 5.25, -0.1], - "cubes": [ - { "from": [-1, 0, -1], "size": [2, 6, 2] } - ] + "data": { + "head": { + "pivot": [ 0, 0, -2 ], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "snout": { + "type": "mson:slot", + "name": "snout", + "implementation": "com.minelittlepony.client.model.part.PonySnout", + "data": "minelittlepony:components/snout" + }, + "ears": { + "type": "mson:slot", + "name": "ears", + "implementation": "com.minelittlepony.client.model.part.PonyEars", + "data": "minelittlepony:components/ears" + }, + "horn": { + "type": "mson:slot", + "name": "horn", + "implementation": "com.minelittlepony.client.model.part.UnicornHorn", + "data": "minelittlepony:components/horn" + }, + "left_horn": { + "texture": {"u": 0, "v": 52}, + "name": "left_horn", + "pivot": [-4, -5, -3], + "rotate": [200, 0, -45], + "cubes": [ + { "from": [-1, 0, -1], "size": [2, 6, 2] } + ], + "children": { + "upright": { + "rotate": [0, 0, -51], + "pivot": [-0.5, 5.25, -0.1], + "cubes": [ + { "from": [-1, 0, -1], "size": [2, 6, 2] } + ] + } } - ] - }, - { - "name": "right_horn", - "texture": {"u": 8, "v": 52}, - "center": [4, -5, -3], - "rotate": [200, 0, 45], - "cubes": [ - { "from": [-1, 0, -1], "size": [2, 6, 2] } - ], - "children": [ - { - "rotate": [0, 0, 51], - "texture": {"u": 8, "v": 52}, - "center": [0.5, 5.25, -0.1], - "cubes": [ - { "from": [-1, 0, -1], "size": [2, 6, 2] } - ] + }, + "right_horn": { + "texture": {"u": 8, "v": 52}, + "name": "right_horn", + "pivot": [4, -5, -3], + "rotate": [200, 0, 45], + "cubes": [ + { "from": [-1, 0, -1], "size": [2, 6, 2] } + ], + "children": { + "upright": { + "rotate": [0, 0, 51], + "texture": {"u": 8, "v": 52}, + "pivot": [0.5, 5.25, -0.1], + "cubes": [ + { "from": [-1, 0, -1], "size": [2, 6, 2] } + ] + } } - ] + } } - ] - }, - "hat": { - "texture": { "u": 32, "v": 0 }, - "center": [0, 0, -2], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8], "stretch": -0.5 } - ] - }, - "right_arm": { - "center": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], - "texture": { "u": 0, "v": 20 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "left_arm": { - "center": ["#arm_rotation_x", "#arm_rotation_y", 0], - "texture": { "u": 0, "v": 20 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "right_leg": { - "center": ["#arm_rotation_x_neg", 0, 0], - "texture": { "u": 0, "v": 20 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "left_leg": { - "center": ["#arm_rotation_x", 0, 0], - "texture": { "u": 0, "v": 20 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] + }, + "hat": { + "texture": { "u": 32, "v": 0 }, + "pivot": [0, 0, -2], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": -0.5 } + ] + }, + "right_arm": { + "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], + "texture": { "u": 0, "v": 20 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "left_arm": { + "pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], + "texture": { "u": 0, "v": 20 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "right_leg": { + "pivot": ["#arm_rotation_x_neg", 0, 0], + "texture": { "u": 0, "v": 20 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "left_leg": { + "pivot": ["#arm_rotation_x", 0, 0], + "texture": { "u": 0, "v": 20 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/gear/antlers.json b/src/main/resources/assets/minelittlepony/models/gear/antlers.json index 34d65e5d..a09e9be7 100644 --- a/src/main/resources/assets/minelittlepony/models/gear/antlers.json +++ b/src/main/resources/assets/minelittlepony/models/gear/antlers.json @@ -1,21 +1,23 @@ { "texture": {"w": 16, "h": 8}, - "left": { - "center": [-7, 0.5, 0.5], - "cubes": [ - { "from": [-4, -4, 0], "size": [7, 1, 1] }, - { "from": [-4, -5, 0], "size": [1, 1, 1], "texture": {"u": 0, "v": 2 } }, - { "from": [-2, -5, 0], "size": [1, 1, 1], "texture": {"u": 4, "v": 2 } }, - { "from": [ 0, -5, 0], "size": [1, 1, 1], "texture": {"u": 8, "v": 2 } } - ] - }, - "right": { - "center": [7, 0.5, 0.5], - "cubes": [ - { "from": [-3, -4, 0], "size": [7, 1, 1] }, - { "from": [ 3, -5, 0], "size": [1, 1, 1], "texture": {"u": 0, "v": 2 } }, - { "from": [ 1, -5, 0], "size": [1, 1, 1], "texture": {"u": 4, "v": 2 } }, - { "from": [-1, -5, 0], "size": [1, 1, 1], "texture": {"u": 8, "v": 2 } } - ] + "data": { + "left": { + "pivot": [-7, 0.5, 0.5], + "cubes": [ + { "from": [-4, -4, 0], "size": [7, 1, 1] }, + { "from": [-4, -5, 0], "size": [1, 1, 1], "texture": {"u": 0, "v": 2 } }, + { "from": [-2, -5, 0], "size": [1, 1, 1], "texture": {"u": 4, "v": 2 } }, + { "from": [ 0, -5, 0], "size": [1, 1, 1], "texture": {"u": 8, "v": 2 } } + ] + }, + "right": { + "pivot": [7, 0.5, 0.5], + "cubes": [ + { "from": [-3, -4, 0], "size": [7, 1, 1] }, + { "from": [ 3, -5, 0], "size": [1, 1, 1], "texture": {"u": 0, "v": 2 } }, + { "from": [ 1, -5, 0], "size": [1, 1, 1], "texture": {"u": 4, "v": 2 } }, + { "from": [-1, -5, 0], "size": [1, 1, 1], "texture": {"u": 8, "v": 2 } } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/gear/muffin.json b/src/main/resources/assets/minelittlepony/models/gear/muffin.json index e757e278..37744496 100644 --- a/src/main/resources/assets/minelittlepony/models/gear/muffin.json +++ b/src/main/resources/assets/minelittlepony/models/gear/muffin.json @@ -1,13 +1,15 @@ { "texture": {"w": 64, "h": 44}, - "crown": { - "center": [-4, -12, -6], - "cubes": [ - { "from": [0, 0, 0], "size": [8, 4, 8] }, - { "from": [3, -1.5, 3], "size": [2, 2, 2] }, - { "from": [1.5, -1, 1.5], "size": [5, 1, 5], "texture": {"u": 0, "v": 12 } }, - { "from": [2, 1, 1], "size": [4, 7, 6], "texture": {"u": 0, "v": 18 } }, - { "from": [1, 1, 2], "size": [6, 7, 4], "texture": {"u": 0, "v": 18 } } - ] + "data": { + "crown": { + "pivot": [-4, -12, -6], + "cubes": [ + { "from": [0, 0, 0], "size": [8, 4, 8] }, + { "from": [3, -1.5, 3], "size": [2, 2, 2] }, + { "from": [1.5, -1, 1.5], "size": [5, 1, 5], "texture": {"u": 0, "v": 12 } }, + { "from": [2, 1, 1], "size": [4, 7, 6], "texture": {"u": 0, "v": 18 } }, + { "from": [1, 1, 2], "size": [6, 7, 4], "texture": {"u": 0, "v": 18 } } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json b/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json index 0c5cee7b..ffcf2689 100644 --- a/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json +++ b/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json @@ -1,51 +1,53 @@ { "texture": {"w": 64, "h": 64}, - "left_bag": { - "type": "mson:planar", - "texture": {"u": 56, "v": 19}, - "center": [4, 4, 4], - "north": [0, -0.5, -1, 3, 6, 56, 25], - "south": [0, -0.5, 7, 3, 6, 59, 25], - "east": [3, -0.5, -1, 8, 6, 56, 19], - "west": [0, -0.5, -1, 8, 6, 56, 19], - "children": [ - { - "type": "mson:planar", - "rotate": [0, 90, 0], - "up": [-7, -0.5, 0, 8, 3, 56, 16], - "down": [-7, 5.5, 0, 8, 3, 56, 22] + "data": { + "left_bag": { + "type": "mson:planar", + "texture": {"u": 56, "v": 19}, + "pivot": [4, 4, 4], + "north": [0, -0.5, -1, 3, 6, 56, 25], + "south": [0, -0.5, 7, 3, 6, 59, 25], + "east": [3, -0.5, -1, 8, 6, 56, 19], + "west": [0, -0.5, -1, 8, 6, 56, 19], + "children": { + "top_bottom": { + "type": "mson:planar", + "rotate": [0, 90, 0], + "up": [-7, -0.5, 0, 8, 3, 56, 16], + "down": [-7, 5.5, 0, 8, 3, 56, 22] + } } - ] - }, - "right_bag": { - "type": "mson:planar", - "texture": {"u": 56, "v": 19}, - "center": [-4, 4, 4], - "north": [-3, -0.5, -1, 3, 6, 56, 25], - "south": [-3, -0.5, 7, 3, 6, 59, 25], - "east": [ 0, -0.5, -1, 8, 6, 56, 19], - "west": [-3, -0.5, -1, 8, 6, 56, 19], - "children": [ - { - "type": "mson:planar", - "rotate": [0, 90, 0], - "mirror": [false, false, true], - "up": [-7, -0.5, -3, 8, 3, 56, 16], - "down": [-7, 5.5, -3, 8, 3, 56, 22] + }, + "right_bag": { + "type": "mson:planar", + "texture": {"u": 56, "v": 19}, + "pivot": [-4, 4, 4], + "north": [-3, -0.5, -1, 3, 6, 56, 25], + "south": [-3, -0.5, 7, 3, 6, 59, 25], + "east": [ 0, -0.5, -1, 8, 6, 56, 19], + "west": [-3, -0.5, -1, 8, 6, 56, 19], + "children": { + "top_bottom": { + "type": "mson:planar", + "rotate": [0, 90, 0], + "mirror": [false, false, true], + "up": [-7, -0.5, -3, 8, 3, 56, 16], + "down": [-7, 5.5, -3, 8, 3, 56, 22] + } } - ] - }, - "strap": { - "type": "mson:planar", - "texture": {"u": 56, "v": 19}, - "center": [0, 3.4, 4], - "up": [ - [-4, 0, 2, 8, 1], - [-4, 0, 3, 8, 1] - ], - "south": [-4, 0, 4, 8, 1], - "north": [-4, 0, 2, 8, 1], - "east": [ -4, 0, 2, 2, 1, 56, 31], - "west": [ 4, 0, 2, 2, 1, 56, 31] + }, + "strap": { + "type": "mson:planar", + "texture": {"u": 56, "v": 19}, + "pivot": [0, 3.4, 4], + "up": [ + [-4, 0, 2, 8, 1], + [-4, 0, 3, 8, 1] + ], + "south": [-4, 0, 4, 8, 1], + "north": [-4, 0, 2, 8, 1], + "east": [ -4, 0, 2, 2, 1, 56, 31], + "west": [ 4, 0, 2, 2, 1, 56, 31] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/gear/stetson.json b/src/main/resources/assets/minelittlepony/models/gear/stetson.json index 361aca37..8d229535 100644 --- a/src/main/resources/assets/minelittlepony/models/gear/stetson.json +++ b/src/main/resources/assets/minelittlepony/models/gear/stetson.json @@ -1,36 +1,37 @@ { "texture": {"w": 64, "h": 64}, - "rim": { - "texture": {"u": 16, "v": 33}, - "rotate": [-17, 0, 5.7], - "cubes": [ - { - "type": "mson:plane", - "face": "up", - "texture": {"u": 16, "v": 33}, - "position": [-9, -4, -12], "size": [16, 17] - }, - { - "type": "mson:plane", - "face": "down", - "texture": {"u": 0, "v": 33}, - "position": [-9, -3.999, -12], "size": [16, 17] + "data": { + "rim": { + "texture": {"u": 16, "v": 33}, + "rotate": [-17, 0, 5.7], + "cubes": [ + { + "type": "mson:plane", + "face": "up", + "texture": {"u": 16, "v": 33}, + "position": [-9, -4, -12], "size": [16, 17] + }, + { + "type": "mson:plane", + "face": "down", + "texture": {"u": 0, "v": 33}, + "position": [-9, -3.999, -12], "size": [16, 17] + } + ], + "children": { + "inside": { + "cubes": [ + {"from": [-5, -8, -6], "size": [9, 4, 9], "texture": {"u": 0, "v": 0}}, + {"from": [-6, -6, -7], "size": [11, 2, 11], "texture": {"u": 0, "v": 13}} + ] + }, + "rim": { + "type": "mson:planar", + "pivot": [-9, -4, -12 ], + "rotate": [23, 0, 0], + "south": [0, -6, 0, 16, 6, 0, 27] + } } - ], - "children": [ - { - "__comment": "hat inside", - "cubes": [ - {"from": [-5, -8, -6], "size": [9, 4, 9], "texture": {"u": 0, "v": 0}}, - {"from": [-6, -6, -7], "size": [11, 2, 11], "texture": {"u": 0, "v": 13}} - ] - }, - { - "type": "mson:planar", - "center": [-9, -4, -12 ], - "rotate": [23, 0, 0], - "south": [0, -6, 0, 16, 6, 0, 27] - } - ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/gear/witch_hat.json b/src/main/resources/assets/minelittlepony/models/gear/witch_hat.json index e0c0775a..c0dc48f2 100644 --- a/src/main/resources/assets/minelittlepony/models/gear/witch_hat.json +++ b/src/main/resources/assets/minelittlepony/models/gear/witch_hat.json @@ -1,40 +1,42 @@ { "texture": {"u": 0, "w": 64, "h": 128}, - "hat": { - "texture": {"v": 64 }, - "center": [-5, -8, -7.0], - "cubes": [ - { "size": [10, 2, 10] } - ], - "children": [ - { - "texture": {"v": 76 }, - "center": [1.75, -4, 2], - "rotate": [-3, 0, 1.5], - "cubes": [ - { "size": [7, 4, 7] } - ], - "children": [ - { - "texture": {"v": 87 }, - "center": [1.75, -4, 2], - "rotate": [-6, 0, 3], - "cubes": [ - { "size": [4, 4, 4] } - ], - "children": [ - { - "texture": {"v": 95 }, - "center": [1.75, -2, 2], - "rotate": [-12, 0, 6], - "cubes": [ - { "size": [1, 2, 1], "stretch": 0.25 } - ] + "data": { + "hat": { + "texture": {"v": 64 }, + "pivot": [-5, -8, -7.0], + "cubes": [ + { "size": [10, 2, 10] } + ], + "children": { + "tier_1": { + "texture": {"v": 76 }, + "pivot": [1.75, -4, 2], + "rotate": [-3, 0, 1.5], + "cubes": [ + { "size": [7, 4, 7] } + ], + "children": { + "tier_2": { + "texture": {"v": 87 }, + "pivot": [1.75, -4, 2], + "rotate": [-6, 0, 3], + "cubes": [ + { "size": [4, 4, 4] } + ], + "children": { + "tier_3": { + "texture": {"v": 95 }, + "pivot": [1.75, -2, 2], + "rotate": [-12, 0, 6], + "cubes": [ + { "size": [1, 2, 1], "dilate": 0.25 } + ] + } } - ] + } } - ] + } } - ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/parasprite.json b/src/main/resources/assets/minelittlepony/models/parasprite.json index 5fbfaea8..de502620 100644 --- a/src/main/resources/assets/minelittlepony/models/parasprite.json +++ b/src/main/resources/assets/minelittlepony/models/parasprite.json @@ -2,44 +2,46 @@ "texture": { "w": 64, "h": 64 }, - "body": { - "center": [-4, -4, -4], - "cubes": [ - {"from": [0, 0, 0], "size": [8, 8, 8] } - ] - }, - "leftWing": { - "name": "leftWing", - "center": [0, -2, 4], - "texture": {"u": 48, "v": 0}, - "cubes": [ - { - "type": "mson:plane", - "face": "west", - "position": [0, -16, 0], - "size": [ 16, 16 ] - } - ] - }, - "rightWing": { - "name": "rightWing", - "center": [0, -2, 4], - "texture": {"u": 48, "v": 0}, - "cubes": [ - { - "type": "mson:plane", - "face": "west", - "position": [0, -16, 0], - "size": [ 16, 16 ] - } - ] - }, - "saddle": { - "center": [-4, -4, -4], - "texture": {"u": 0, "v": 16}, - "visible": true, - "cubes": [ - {"from": [-4, -0.1, -4], "size": [16, 16, 16] } - ] + "data": { + "body": { + "pivot": [-4, -4, -4], + "cubes": [ + {"from": [0, 0, 0], "size": [8, 8, 8] } + ] + }, + "leftWing": { + "name": "leftWing", + "pivot": [0, -2, 4], + "texture": {"u": 48, "v": 0}, + "cubes": [ + { + "type": "mson:plane", + "face": "west", + "position": [0, -16, 0], + "size": [ 16, 16 ] + } + ] + }, + "rightWing": { + "name": "rightWing", + "pivot": [0, -2, 4], + "texture": {"u": 48, "v": 0}, + "cubes": [ + { + "type": "mson:plane", + "face": "west", + "position": [0, -16, 0], + "size": [ 16, 16 ] + } + ] + }, + "saddle": { + "pivot": [-4, -4, -4], + "texture": {"u": 0, "v": 16}, + "visible": true, + "cubes": [ + {"from": [-4, -0.1, -4], "size": [16, 16, 16] } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/piglin.json b/src/main/resources/assets/minelittlepony/models/piglin.json index af7eeac2..7041b6ef 100644 --- a/src/main/resources/assets/minelittlepony/models/piglin.json +++ b/src/main/resources/assets/minelittlepony/models/piglin.json @@ -1,193 +1,195 @@ { "texture": {"w": 128, "h": 64}, "parent": "minelittlepony:zombie", - "head": { - "center": [ 0, 0, -2 ], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": [ - { - "name": "left_flap", - "texture": {"u": 64, "v": 0}, - "rotate": [ 0, 0, 60 ], - "center": [ 5, -4, 0 ], - "cubes": [ - { "from": [-2, -0.5, -2], "size": [ 4, 1, 4] } - ] - }, - { - "name": "right_flap", - "texture": {"u": 64, "v": 0}, - "rotate": [ 0, 0, -60 ], - "center": [-5, -4, 0 ], - "cubes": [ - { "from": [-2, -0.5, -2], "size": [ 4, 1, 4] } - ] - }, - { - "type": "mson:slot", - "name": "snout", - "texture": {"w": 128, "h": 64}, - "implementation": "com.minelittlepony.client.model.part.PonySnout", - "content": "minelittlepony:components/pig_snout" - }, - { - "type": "mson:slot", - "name": "ears", - "texture": {"w": 128, "h": 64}, - "implementation": "com.minelittlepony.client.model.part.PonyEars", - "content": "minelittlepony:components/ears" - }, - { - "type": "mson:slot", - "name": "horn", - "texture": {"w": 128, "h": 64}, - "implementation": "com.minelittlepony.client.model.part.UnicornHorn", - "content": "minelittlepony:components/horn" + "data": { + "head": { + "pivot": [ 0, 0, -2 ], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "left_flap": { + "name": "left_flap", + "texture": {"u": 64, "v": 0}, + "rotate": [ 0, 0, 60 ], + "pivot": [ 5, -4, 0 ], + "cubes": [ + { "from": [-2, -0.5, -2], "size": [ 4, 1, 4] } + ] + }, + "right_flap": { + "name": "right_flap", + "texture": {"u": 64, "v": 0}, + "rotate": [ 0, 0, -60 ], + "pivot": [-5, -4, 0 ], + "cubes": [ + { "from": [-2, -0.5, -2], "size": [ 4, 1, 4] } + ] + }, + "snout": { + "type": "mson:slot", + "name": "snout", + "texture": {"w": 128, "h": 64}, + "implementation": "com.minelittlepony.client.model.part.PonySnout", + "data": "minelittlepony:components/pig_snout" + }, + "ears": { + "type": "mson:slot", + "name": "ears", + "texture": {"w": 128, "h": 64}, + "implementation": "com.minelittlepony.client.model.part.PonyEars", + "data": "minelittlepony:components/ears" + }, + "horn": { + "type": "mson:slot", + "name": "horn", + "texture": {"w": 128, "h": 64}, + "implementation": "com.minelittlepony.client.model.part.UnicornHorn", + "data": "minelittlepony:components/horn" + } } - ] - }, - "wings": { - "type": "mson:slot", - "name": "wings", - "implementation": "com.minelittlepony.client.model.part.PegasusWings", - "content": { - "left_wing": { - "type": "mson:slot", - "name": "left_wing", - "texture": {"w": 128, "h": 64}, - "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", - "content": { - "folded": { - "texture": {"u": 56, "v": 32}, - "center": [0, 13, -2], - "rotate": [90, 0, 0], - "cubes": [ - {"from": [4, 5, 2], "size": [2, 6, 2] }, - {"from": [4, 5, 4], "size": [2, 8, 2] }, - {"from": [4, 5, 6], "size": [2, 6, 2] } - ] - }, - "extended": { - "texture": {"u": 57, "v": 35}, - "center": [4.5, 5.3, 6], - "rotate": [-30, 180, 0], - "children": [ - { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "stretch": 0.1 } ] }, - { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-48, 0, 0] }, - { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-42, 0, 0] }, - { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, - { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "stretch": 0.3 } ] }, - { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-48, 0, 0] } - ] + }, + "wings": { + "type": "mson:slot", + "name": "wings", + "implementation": "com.minelittlepony.client.model.part.PegasusWings", + "data": { + "left_wing": { + "type": "mson:slot", + "name": "left_wing", + "texture": {"w": 128, "h": 64}, + "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", + "data": { + "folded": { + "texture": {"u": 56, "v": 32}, + "pivot": [0, 13, -2], + "rotate": [90, 0, 0], + "cubes": [ + {"from": [4, 5, 2], "size": [2, 6, 2] }, + {"from": [4, 5, 4], "size": [2, 8, 2] }, + {"from": [4, 5, 6], "size": [2, 6, 2] } + ] + }, + "extended": { + "texture": {"u": 57, "v": 35}, + "pivot": [4.5, 5.3, 6], + "rotate": [-30, 180, 0], + "children": { + "feather_1": { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "dilate": 0.1 } ] }, + "feather_2": { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "dilate": 0.1 } ], "rotate": [-48, 0, 0] }, + "feather_3": { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "dilate": -0.1 } ], "rotate": [-42, 0, 0] }, + "feather_4": { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, + "feather_5": { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "dilate": 0.3 } ] }, + "feather_6": { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "dilate": 0.19 } ], "rotate": [-48, 0, 0] } + } + } } - } - }, - "right_wing": { - "type": "mson:slot", - "name": "right_wing", - "texture": {"w": 128, "h": 64}, - "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", - "content": { - "folded": { - "texture": {"u": 56, "v": 16}, - "center": [0, 13, -2], - "rotate": [90, 0, 0], - "cubes": [ - {"from": [-6, 5, 2], "size": [2, 6, 2] }, - {"from": [-6, 5, 4], "size": [2, 8, 2] }, - {"from": [-6, 5, 6], "size": [2, 6, 2] } - ] - }, - "extended": { - "texture": {"u": 56, "v": 19}, - "center": [-4.5, 5.3, 6], - "rotate": [-30, 180, 0], - "children": [ - { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "stretch": 0.1 } ] }, - { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-48, 0, 0] }, - { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-42, 0, 0] }, - { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, - { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "stretch": 0.3 } ] }, - { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-48, 0, 0] } - ] + }, + "right_wing": { + "type": "mson:slot", + "name": "right_wing", + "texture": {"w": 128, "h": 64}, + "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", + "data": { + "folded": { + "texture": {"u": 56, "v": 16}, + "pivot": [0, 13, -2], + "rotate": [90, 0, 0], + "cubes": [ + {"from": [-6, 5, 2], "size": [2, 6, 2] }, + {"from": [-6, 5, 4], "size": [2, 8, 2] }, + {"from": [-6, 5, 6], "size": [2, 6, 2] } + ] + }, + "extended": { + "texture": {"u": 56, "v": 19}, + "pivot": [-4.5, 5.3, 6], + "rotate": [-30, 180, 0], + "children": { + "feather_1": { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "dilate": 0.1 } ] }, + "feather_2": { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "dilate": 0.1 } ], "rotate": [-48, 0, 0] }, + "feather_3": { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "dilate": -0.1 } ], "rotate": [-42, 0, 0] }, + "feather_4": { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, + "feather_5": { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "dilate": 0.3 } ] }, + "feather_6": { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "dilate": 0.19 } ], "rotate": [-48, 0, 0] } + } + } } - } - }, - "legacy_right_wing": { - "type": "mson:slot", - "name": "legacy_right_wing", - - "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", - "content": { - "folded": { - "texture": {"u": 56, "v": 32}, - "center": [0, 13, -2], - "rotate": [90, 0, 0], - "cubes": [ - {"from": [-6, 5, 2], "size": [2, 6, 2] }, - {"from": [-6, 5, 4], "size": [2, 8, 2] }, - {"from": [-6, 5, 6], "size": [2, 6, 2] } - ] - }, - "extended": { - "texture": {"u": 57, "v": 35, "w": 64, "h": 64}, - "center": [-4.5, 5.3, 6], - "rotate": [-30, 180, 0], - "children": [ - { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "stretch": 0.1 } ], "mirror": true }, - { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-48, 0, 0], "mirror": true }, - { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-42, 0, 0], "mirror": true }, - { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28 , 0, 0], "mirror": true }, - { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "stretch": 0.3 } ] }, - { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-48, 0, 0], "mirror": true } - ] + }, + "legacy_right_wing": { + "type": "mson:slot", + "name": "legacy_right_wing", + + "implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing", + "data": { + "folded": { + "texture": {"u": 56, "v": 32}, + "pivot": [0, 13, -2], + "rotate": [90, 0, 0], + "cubes": [ + {"from": [-6, 5, 2], "size": [2, 6, 2] }, + {"from": [-6, 5, 4], "size": [2, 8, 2] }, + {"from": [-6, 5, 6], "size": [2, 6, 2] } + ] + }, + "extended": { + "texture": {"u": 57, "v": 35, "w": 64, "h": 64}, + "pivot": [-4.5, 5.3, 6], + "rotate": [-30, 180, 0], + "children": { + "feather_1": { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "dilate": 0.1 } ], "mirror": true }, + "feather_2": { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "dilate": 0.1 } ], "rotate": [-48, 0, 0], "mirror": true }, + "feather_3": { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "dilate": -0.1 } ], "rotate": [-42, 0, 0], "mirror": true }, + "feather_4": { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28 , 0, 0], "mirror": true }, + "feather_5": { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "dilate": 0.3 } ] }, + "feather_6": { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "dilate": 0.19 } ], "rotate": [-48, 0, 0], "mirror": true } + } + } } } } - } - }, - "tail": { - "type": "mson:slot", - "name": "tail", - "implementation": "com.minelittlepony.client.model.part.PonyTail", - "content": { - "texture": {"w": 128, "h": 64}, - "locals": { - "segments": 4 - }, - "segment_0": { - "type": "mson:slot", - "name": "segment_0", + }, + "tail": { + "type": "mson:slot", + "name": "tail", + "implementation": "com.minelittlepony.client.model.part.PonyTail", + "data": { "texture": {"w": 128, "h": 64}, - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 0 }, - "content": "minelittlepony:components/tail_segment" - }, - "segment_1": { - "type": "mson:slot", - "name": "segment_1", - "texture": {"w": 128, "h": 64}, - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 1 }, - "content": "minelittlepony:components/tail_segment" - }, - "segment_2": { - "type": "mson:slot", - "name": "segment_2", - "texture": {"w": 128, "h": 64}, - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 2 }, - "content": "minelittlepony:components/tail_segment" - }, - "segment_3": { - "type": "mson:slot", - "name": "segment_3", - "texture": {"w": 128, "h": 64}, - "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", - "locals": { "segment_index": 3 }, - "content": "minelittlepony:components/tail_segment" + "locals": { + "segments": 4 + }, + "segment_0": { + "type": "mson:slot", + "name": "segment_0", + "texture": {"w": 128, "h": 64}, + "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", + "texture": {"w": 128, "h": 64}, + "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", + "texture": {"w": 128, "h": 64}, + "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", + "texture": {"w": 128, "h": 64}, + "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/alicorn.json b/src/main/resources/assets/minelittlepony/models/races/steve/alicorn.json index e1906160..3fd2d2cf 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/alicorn.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/alicorn.json @@ -1,9 +1,11 @@ { "parent": "minelittlepony:races/steve/unicorn", - "wings": { - "type": "mson:slot", - "name": "wings", - "implementation": "com.minelittlepony.client.model.part.PegasusWings", - "content": "minelittlepony:components/pegasus_wings" + "data": { + "wings": { + "type": "mson:slot", + "name": "wings", + "implementation": "com.minelittlepony.client.model.part.PegasusWings", + "data": "minelittlepony:components/pegasus_wings" + } } } 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 022b956a..c2300a1b 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 @@ -1,29 +1,31 @@ { "parent": "minelittlepony:steve_pony", - "head": { - "center": [ 0, 0, -2 ], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": [ - { - "type": "mson:slot", - "name": "snout", - "implementation": "com.minelittlepony.client.model.part.PonySnout", - "content": "minelittlepony:components/snout" - }, - { - "type": "mson:slot", - "name": "ears", - "implementation": "com.minelittlepony.client.model.part.PonyEars", - "content": "minelittlepony:components/bat_ears" + "data": { + "head": { + "pivot": [ 0, 0, -2 ], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "snout": { + "type": "mson:slot", + "name": "snout", + "implementation": "com.minelittlepony.client.model.part.PonySnout", + "data": "minelittlepony:components/snout" + }, + "ears": { + "type": "mson:slot", + "name": "ears", + "implementation": "com.minelittlepony.client.model.part.PonyEars", + "data": "minelittlepony:components/bat_ears" + } } - ] - }, - "wings": { - "type": "mson:slot", - "name": "wings", - "implementation": "com.minelittlepony.client.model.part.BatWings", - "content": "minelittlepony:components/bat_wings" + }, + "wings": { + "type": "mson:slot", + "name": "wings", + "implementation": "com.minelittlepony.client.model.part.BatWings", + "data": "minelittlepony:components/bat_wings" + } } } diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/changeling.json b/src/main/resources/assets/minelittlepony/models/races/steve/changeling.json index 54405aab..ac8d7b42 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/changeling.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/changeling.json @@ -1,9 +1,11 @@ { "parent": "minelittlepony:races/steve/alicorn", - "wings": { - "type": "mson:slot", - "name": "wings", - "implementation": "com.minelittlepony.client.model.part.PegasusWings", - "content": "minelittlepony:components/bug_wings" + "data": { + "wings": { + "type": "mson:slot", + "name": "wings", + "implementation": "com.minelittlepony.client.model.part.PegasusWings", + "data": "minelittlepony:components/bug_wings" + } } } diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/pegasus.json b/src/main/resources/assets/minelittlepony/models/races/steve/pegasus.json index 4c7338ea..4716f171 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/pegasus.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/pegasus.json @@ -1,9 +1,11 @@ { "parent": "minelittlepony:steve_pony", - "wings": { - "type": "mson:slot", - "name": "wings", - "implementation": "com.minelittlepony.client.model.part.PegasusWings", - "content": "minelittlepony:components/pegasus_wings" + "data": { + "wings": { + "type": "mson:slot", + "name": "wings", + "implementation": "com.minelittlepony.client.model.part.PegasusWings", + "data": "minelittlepony:components/pegasus_wings" + } } } diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json b/src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json index ee491fe2..fe0fbc35 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json @@ -1,38 +1,40 @@ { "parent": "minelittlepony:races/steve/alicorn", - "left_fin": { - "type": "mson:planar", - "texture": {"u": 56, "v": 16}, - "mirror": [false, false, true], - "rotate": [0, 30, 0], - "center": [3, -6, 3], - "east": [0, 0, 0, 8, 12] - }, - "right_fin": { - "type": "mson:planar", - "texture": {"u": 56, "v": 16}, - "rotate": [0, -30, 0], - "center": [-3, -6, 3], - "west": [0, 0, 0, 8, 12] - }, - "center_fin": { - "type": "mson:planar", - "texture": {"u": 58, "v": 28}, - "rotate": [84, 0, 0], - "center": [0, 6, 9], - "east": [0, -6, 0, 6, 12] - }, - "abdomin": { - "texture": {"u": 0, "v": 48}, - "center": [0, 6, 1], - "cubes": [ - { "from": [-3, -1, 0], "size": [6, 7, 9] } - ] - }, - "tail": { - "type": "mson:slot", - "name": "tail", - "implementation": "com.minelittlepony.client.model.part.SeaponyTail", - "content": "minelittlepony:components/fish_tail" + "data": { + "left_fin": { + "type": "mson:planar", + "texture": {"u": 56, "v": 16}, + "mirror": [false, false, true], + "rotate": [0, 30, 0], + "pivot": [3, -6, 3], + "east": [0, 0, 0, 8, 12] + }, + "right_fin": { + "type": "mson:planar", + "texture": {"u": 56, "v": 16}, + "rotate": [0, -30, 0], + "pivot": [-3, -6, 3], + "west": [0, 0, 0, 8, 12] + }, + "center_fin": { + "type": "mson:planar", + "texture": {"u": 58, "v": 28}, + "rotate": [84, 0, 0], + "pivot": [0, 6, 9], + "east": [0, -6, 0, 6, 12] + }, + "abdomin": { + "texture": {"u": 0, "v": 48}, + "pivot": [0, 6, 1], + "cubes": [ + { "from": [-3, -1, 0], "size": [6, 7, 9] } + ] + }, + "tail": { + "type": "mson:slot", + "name": "tail", + "implementation": "com.minelittlepony.client.model.part.SeaponyTail", + "data": "minelittlepony:components/fish_tail" + } } } 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 ab82066f..55731c67 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json @@ -1,49 +1,51 @@ { "parent": "minelittlepony:steve_pony", - "head": { - "center": [ 0, 0, -2 ], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": [ - { - "type": "mson:slot", - "name": "snout", - "implementation": "com.minelittlepony.client.model.part.PonySnout", - "content": "minelittlepony:components/snout" - }, - { - "type": "mson:slot", - "name": "ears", - "implementation": "com.minelittlepony.client.model.part.PonyEars", - "content": "minelittlepony:components/ears" - }, - { - "type": "mson:slot", - "name": "horn", - "implementation": "com.minelittlepony.client.model.part.UnicornHorn", - "content": "minelittlepony:components/horn" + "data": { + "head": { + "pivot": [ 0, 0, -2 ], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "snout": { + "type": "mson:slot", + "name": "snout", + "implementation": "com.minelittlepony.client.model.part.PonySnout", + "data": "minelittlepony:components/snout" + }, + "ears": { + "type": "mson:slot", + "name": "ears", + "implementation": "com.minelittlepony.client.model.part.PonyEars", + "data": "minelittlepony:components/ears" + }, + "horn": { + "type": "mson:slot", + "name": "horn", + "implementation": "com.minelittlepony.client.model.part.UnicornHorn", + "data": "minelittlepony:components/horn" + } } - ] - }, - "right_cast": { - "center": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], - "texture": { "u": 40, "v": 32, "w": 64, "h": 64 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "left_cast": { - "center": ["#arm_rotation_x", "#arm_rotation_y", 0], - "texture": { "u": 40, "v": 32, "w": 64, "h": 64 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] + }, + "right_cast": { + "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], + "texture": { "u": 40, "v": 32, "w": 64, "h": 64 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "left_cast": { + "pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], + "texture": { "u": 40, "v": 32, "w": 64, "h": 64 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + } } } 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 eb120c87..056ab458 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json @@ -1,42 +1,43 @@ { "parent": "minelittlepony:steve_pony", - "head": { - "center": [ 0, 0, -2 ], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": [ - { - "type": "mson:slot", - "name": "snout", - "implementation": "com.minelittlepony.client.model.part.PonySnout", - "content": "minelittlepony:components/snout" - }, - { - "type": "mson:slot", - "name": "ears", - "implementation": "com.minelittlepony.client.model.part.PonyEars", - "content": "minelittlepony:components/ears" - }, - { - "texture": {"u": 56, "v": 32}, - "name": "bristles", - "rotate": [17, 0, 0], - "cubes": [ - { "from": [ -1, -11, -1], "size": [2, 6, 2]}, - { "from": [ -1, -11, 1], "size": [2, 8, 2]}, - { "from": [ -1, -9, 3], "size": [2, 6, 2]} - ], - "children": [ - { - "rotate": [0, 0, 0], - "cubes": [ - { "from": [ -1, -6, -1], "size": [2, 8, 2]}, - { "from": [ -1, -6, 1], "size": [2, 6, 2]} - ] + "data": { + "head": { + "pivot": [ 0, 0, -2 ], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "snout": { + "type": "mson:slot", + "name": "snout", + "implementation": "com.minelittlepony.client.model.part.PonySnout", + "data": "minelittlepony:components/snout" + }, + "ears": { + "type": "mson:slot", + "name": "ears", + "implementation": "com.minelittlepony.client.model.part.PonyEars", + "data": "minelittlepony:components/ears" + }, + "bristles": { + "texture": {"u": 56, "v": 32}, + "rotate": [17, 0, 0], + "cubes": [ + { "from": [ -1, -11, -1], "size": [2, 6, 2]}, + { "from": [ -1, -11, 1], "size": [2, 8, 2]}, + { "from": [ -1, -9, 3], "size": [2, 6, 2]} + ], + "children": { + "bristles_2": { + "rotate": [0, 0, 0], + "cubes": [ + { "from": [ -1, -6, -1], "size": [2, 8, 2]}, + { "from": [ -1, -6, 1], "size": [2, 6, 2]} + ] + } } - ] + } } - ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/skeleton_clothes.json b/src/main/resources/assets/minelittlepony/models/skeleton_clothes.json index 712e6358..a6c49708 100644 --- a/src/main/resources/assets/minelittlepony/models/skeleton_clothes.json +++ b/src/main/resources/assets/minelittlepony/models/skeleton_clothes.json @@ -1,6 +1,6 @@ { "parent": "minelittlepony:skeleton", - "scale": 0.3, + "dilate": 0.3, "locals": { "arm_width": 4, "arm_depth": 4 diff --git a/src/main/resources/assets/minelittlepony/models/skull.json b/src/main/resources/assets/minelittlepony/models/skull.json index 0ba17ce3..5babdcae 100644 --- a/src/main/resources/assets/minelittlepony/models/skull.json +++ b/src/main/resources/assets/minelittlepony/models/skull.json @@ -1,49 +1,51 @@ { "texture": {"w": 64, "h": 64}, - "head": { - "cubes": [ - {"from": [-4, -8, -4], "size": [8, 8, 8]} - ], - "children": [ - { - "type": "mson:slot", - "name": "snout", - "locals": { - "x": 0, - "y": -4, - "z": 4 + "data": { + "head": { + "cubes": [ + {"from": [-4, -8, -4], "size": [8, 8, 8]} + ], + "children": { + "snout": { + "type": "mson:slot", + "name": "snout", + "locals": { + "x": 0, + "y": -4, + "z": 4 + }, + "implementation": "com.minelittlepony.client.model.part.PonySnout", + "data": "minelittlepony:components/snout" }, - "implementation": "com.minelittlepony.client.model.part.PonySnout", - "content": "minelittlepony:components/snout" - }, - { - "type": "mson:slot", - "name": "ears", - "locals": { - "x": 0, - "y": -2, - "z": 2 + "ears": { + "type": "mson:slot", + "name": "ears", + "locals": { + "x": 0, + "y": -2, + "z": 2 + }, + "implementation": "com.minelittlepony.client.model.part.PonyEars", + "data": "minelittlepony:components/ears" }, - "implementation": "com.minelittlepony.client.model.part.PonyEars", - "content": "minelittlepony:components/ears" - }, - { - "type": "mson:slot", - "name": "horn", - "locals": { - "x": 0, - "y": -2, - "z": 4 - }, - "implementation": "com.minelittlepony.client.model.part.UnicornHorn", - "content": "minelittlepony:components/horn" + "horn": { + "type": "mson:slot", + "name": "horn", + "locals": { + "x": 0, + "y": -2, + "z": 4 + }, + "implementation": "com.minelittlepony.client.model.part.UnicornHorn", + "data": "minelittlepony:components/horn" + } } - ] - }, - "hair": { - "texture": {"u": 32}, - "cubes": [ - {"from": [-4, -8, -4], "size": [8, 8, 8], "stretch": 0.25} - ] + }, + "hair": { + "texture": {"u": 32}, + "cubes": [ + {"from": [-4, -8, -4], "size": [8, 8, 8], "dilate": 0.25} + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/steve_pony.json b/src/main/resources/assets/minelittlepony/models/steve_pony.json index fba7e25b..68895c87 100644 --- a/src/main/resources/assets/minelittlepony/models/steve_pony.json +++ b/src/main/resources/assets/minelittlepony/models/steve_pony.json @@ -14,272 +14,274 @@ "arm_rotation_x_neg": [0, "-", "#arm_rotation_x"], "arm_rotation_y": 8 }, - "head": { - "center": [ 0, 0, -2 ], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": [ - { - "type": "mson:slot", - "name": "snout", - "implementation": "com.minelittlepony.client.model.part.PonySnout", - "content": "minelittlepony:components/snout" - }, - { - "type": "mson:slot", - "name": "ears", - "implementation": "com.minelittlepony.client.model.part.PonyEars", - "content": "minelittlepony:components/ears" + "data": { + "head": { + "pivot": [ 0, 0, -2 ], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "snout": { + "type": "mson:slot", + "name": "snout", + "implementation": "com.minelittlepony.client.model.part.PonySnout", + "data": "minelittlepony:components/snout" + }, + "ears": { + "type": "mson:slot", + "name": "ears", + "implementation": "com.minelittlepony.client.model.part.PonyEars", + "data": "minelittlepony:components/ears" + } } - ] - }, - "hat": { - "texture": { "u": 32, "v": 0 }, - "center": [ 0, 0, -2 ], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8], "stretch": 0.5 } - ] - }, - "body": { - "texture": { "u": 16, "v": 16 }, - "cubes": [ - { "from": [-4, 4, -2], "size": [ 8, 8, 4] } - ] - }, - "upper_torso": { - "texture": { "u": 24, "v": 0 }, - "cubes": [ - { - "type": "mson:plane", "__comment": "body sides", - "texture": { "u": 24, "v": 0 }, - "face": "east", - "position": [ 4, 4, 2 ], "size": [ 8, 8 ] - }, - { - "type": "mson:plane", "__comment": "body sides", - "texture": { "u": 24, "v": 0 }, - "face": "west", - "mirror": [ true ], - "position": [ -4, 4, 2 ], "size": [ 8, 8 ] - }, - { - "type": "mson:plane", "__comment": "cutie mark", - "texture": { "u": 4, "v": 0 }, - "face": "east", - "position": [ 4, 4, 10 ], "size": [ 4, 8 ] - }, - { - "type": "mson:plane", "__comment": "cutie mark", - "texture": { "u": 4, "v": 0 }, - "mirror": [ true ], - "face": "west", - "position": [ -4, 4, 10 ], "size": [ 4, 8 ] - }, - { - "type": "mson:plane", "__comment": "stomach", - "texture": { "u": 56, "v": 0 }, - "face": "down", - "mirror": [false, true], - "position": [ -4, 12, 2 ], - "size": [ 8, 8 ] - }, - { - "type": "mson:plane", "__comment": "butt", - "texture": { "u": 36, "v": 16 }, - "face": "down", - "position": [ -4, 12, 10 ], "size": [ 8, 4 ] - }, - { - "type": "mson:plane", "__comment": "butt", - "texture": { "u": 36, "v": 16 }, - "face": "south", - "position": [ -4, 4, 14 ], "size": [ 8, 4 ] - }, - { - "type": "mson:plane", "__comment": "butt", - "texture": { "u": 36, "v": 16 }, - "face": "south", - "position": [ -4, 8, 14 ], - "size": [ 8, 4 ] - }, - { - "type": "mson:plane", "__comment": "back", - "texture": { "u": 32, "v": 20 }, - "mirror": [ false, false, true ], - "face": "up", - "position": [ -4, 4, 2 ], "size": [ 8, 12 ] + }, + "hat": { + "texture": { "u": 32, "v": 0 }, + "pivot": [ 0, 0, -2 ], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": 0.5 } + ] + }, + "body": { + "texture": { "u": 16, "v": 16 }, + "cubes": [ + { "from": [-4, 4, -2], "size": [ 8, 8, 4] } + ] + }, + "upper_torso": { + "texture": { "u": 24, "v": 0 }, + "cubes": [ + { + "type": "mson:plane", "__comment": "body sides", + "texture": { "u": 24, "v": 0 }, + "face": "east", + "position": [ 4, 4, 2 ], "size": [ 8, 8 ] + }, + { + "type": "mson:plane", "__comment": "body sides", + "texture": { "u": 24, "v": 0 }, + "face": "west", + "mirror": [ true, false ], + "position": [ -4, 4, 2 ], "size": [ 8, 8 ] + }, + { + "type": "mson:plane", "__comment": "cutie mark", + "texture": { "u": 4, "v": 0 }, + "face": "east", + "position": [ 4, 4, 10 ], "size": [ 4, 8 ] + }, + { + "type": "mson:plane", "__comment": "cutie mark", + "texture": { "u": 4, "v": 0 }, + "mirror": [ true, false ], + "face": "west", + "position": [ -4, 4, 10 ], "size": [ 4, 8 ] + }, + { + "type": "mson:plane", "__comment": "stomach", + "texture": { "u": 56, "v": 0 }, + "face": "down", + "mirror": [false, true], + "position": [ -4, 12, 2 ], + "size": [ 8, 8 ] + }, + { + "type": "mson:plane", "__comment": "butt", + "texture": { "u": 36, "v": 16 }, + "face": "down", + "position": [ -4, 12, 10 ], "size": [ 8, 4 ] + }, + { + "type": "mson:plane", "__comment": "butt", + "texture": { "u": 36, "v": 16 }, + "face": "south", + "position": [ -4, 4, 14 ], "size": [ 8, 4 ] + }, + { + "type": "mson:plane", "__comment": "butt", + "texture": { "u": 36, "v": 16 }, + "face": "south", + "position": [ -4, 8, 14 ], + "size": [ 8, 4 ] + }, + { + "type": "mson:plane", "__comment": "back", + "texture": { "u": 32, "v": 20 }, + "mirror": [ false, true ], + "face": "up", + "position": [ -4, 4, 2 ], "size": [ 8, 12 ] + } + ], + "children": { + "tail_stub": { + "type": "mson:planar", + "texture": { "u": 32, "v": 0 }, + "rotate": [29, 0, 0], + "up": [-1, 10, 10, 2, 6], + "down": [-1, 12, 10, 2, 6], + "east": [ 1, 10, 10, 6, 2], + "south":[-1, 10, 16, 2, 2], + "cubes": [ + { + "type": "mson:plane", + "mirror": [ true, false ], + "face": "west", + "position": [ -1, 10, 10 ], "size": [ 6, 2 ] + } + ] + } } - ], - "children": [ - { - "type": "mson:planar", - "texture": { "u": 32, "v": 0 }, - "rotate": [29, 0, 0], - "up": [-1, 10, 10, 2, 6], - "down": [-1, 12, 10, 2, 6], - "east": [ 1, 10, 10, 6, 2], - "south":[-1, 10, 16, 2, 2], - "cubes": [ - { - "type": "mson:plane", - "mirror": [ true, false ], - "face": "west", - "position": [ -1, 10, 10 ], "size": [ 6, 2 ] - } - ] + }, + "neck": { + "type": "mson:planar", + "texture": { "u": 0, "v": 16 }, + "rotate": [9, 0, 0], + "north": [-2, 1.199998, -2.8, 4, 4], + "south": [-2, 1.199998, 1.2, 4, 4], + "east": [ 2, 1.199998, -2.8, 4, 4], + "west": [-2, 1.199998, -2.8, 4, 4] + }, + "jacket": { + "cubes": [ + { "from": [-4, 4, -2], "size": [ 8, 8, 4 ], "texture": { "u": 16, "v": 32 }, "dilate": 0.25 } + ] + }, + "saddle": { + "texture": { "u": 24, "v": 0 }, + "children": { + "left_side": { + "type": "mson:planar", + "dilate": 0.26, + "__comment": [ + "body sides a", "body sides b", "qt mark a", "qt mark b", + "stomach a", "stomach b", "stomach c", + "butt", "butt", + "back" + ], + "east": [ + [ 4, 4, 2, 8, 4, 12, 32 ], + [ 4, 8, 2, 8, 4, 12, 48 ], + [ 4, 4, 10, 4, 4, 0, 32 ], + [ 4, 8, 10, 4, 4, 0, 48 ] + ], + "down": [ + [ -4, 12, 2, 8, 4, 28, 48 ], + [ -4, 12, 6, 8, 4, 44, 48 ], + [ -4, 12, 10, 8, 4, 36, 32 ] + ], + "south": [ + [ -4, 4, 14, 8, 4, 36, 32 ], + [ -4, 8, 14, 8, 4, 36, 32 ] + ], + "up": [ + [ -4, 4, 2, 8, 12, 32, 36 ] + ] + }, + "right_side": { + "type": "mson:planar", + "dilate": 0.26, + "mirror": [ false, false, true ], + "__comment": [ + "body sides a", "body sides b", "qt mark a", "qt mark b" + ], + "west": [ + [ -4, 4, 2, 8, 4, 12, 32 ], + [ -4, 8, 2, 8, 4, 12, 48 ], + [ -4, 4, 10, 4, 4, 0, 32 ], + [ -4, 8, 10, 4, 4, 0, 48 ] + ] + } } - ] - }, - "neck": { - "type": "mson:planar", - "texture": { "u": 0, "v": 16 }, - "rotate": [9, 0, 0], - "north": [-2, 1.199998, -2.8, 4, 4], - "south": [-2, 1.199998, 1.2, 4, 4], - "east": [ 2, 1.199998, -2.8, 4, 4], - "west": [-2, 1.199998, -2.8, 4, 4] - }, - "jacket": { - "cubes": [ - { "from": [-4, 4, -2], "size": [ 8, 8, 4 ], "texture": { "u": 16, "v": 32 }, "stretch": 0.25 } - ] - }, - "saddle": { - "texture": { "u": 24, "v": 0 }, - "children": [ - { - "type": "mson:planar", - "stretch": 0.26, - "__comment": [ - "body sides a", "body sides b", "qt mark a", "qt mark b", - "stomach a", "stomach b", "stomach c", - "butt", "butt", - "back" - ], - "east": [ - [ 4, 4, 2, 8, 4, 12, 32 ], - [ 4, 8, 2, 8, 4, 12, 48 ], - [ 4, 4, 10, 4, 4, 0, 32 ], - [ 4, 8, 10, 4, 4, 0, 48 ] - ], - "down": [ - [ -4, 12, 2, 8, 4, 28, 48 ], - [ -4, 12, 6, 8, 4, 44, 48 ], - [ -4, 12, 10, 8, 4, 36, 32 ] - ], - "south": [ - [ -4, 4, 14, 8, 4, 36, 32 ], - [ -4, 8, 14, 8, 4, 36, 32 ] - ], - "up": [ - [ -4, 4, 2, 8, 12, 32, 36 ] - ] - }, - { - "type": "mson:planar", - "stretch": 0.26, - "mirror": [ false, false, true ], - "__comment": [ - "body sides a", "body sides b", "qt mark a", "qt mark b" - ], - "west": [ - [ -4, 4, 2, 8, 4, 12, 32 ], - [ -4, 8, 2, 8, 4, 12, 48 ], - [ -4, 4, 10, 4, 4, 0, 32 ], - [ -4, 8, 10, 4, 4, 0, 48 ] - ] - } - ] - }, - "tail": { - "type": "mson:slot", - "name": "tail", - "implementation": "com.minelittlepony.client.model.part.PonyTail", - "content": "minelittlepony:components/tail" - }, - "right_arm": { - "center": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], - "texture": { "u": 40, "v": 16 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "left_arm": { - "center": ["#arm_rotation_x", "#arm_rotation_y", 0], - "texture": { "u": 32, "v": 48 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "right_leg": { - "center": ["#arm_rotation_x_neg", 0, 0], - "texture": { "u": 0, "v": 16 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "left_leg": { - "center": ["#arm_rotation_x", 0, 0], - "texture": { "u": 16, "v": 48 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ] - } - ] - }, - "right_sleeve": { - "center": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], - "texture": { "u": 40, "v": 32 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ], - "stretch": 0.25 - } - ] - }, - "left_sleeve": { - "center": ["#arm_rotation_x", "#arm_rotation_y", 0], - "texture": { "u": 48, "v": 48 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ], - "stretch": 0.25 - } - ] - }, - "right_pants": { - "center": ["#arm_rotation_x_neg", 0, 0], - "texture": { "u": 0, "v": 32 }, - "cubes": [ - { - "from": [ "#arm_x_neg", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ], - "stretch": 0.25 - } - ] - }, - "left_pants": { - "center": ["#arm_rotation_x", 0, 0], - "texture": { "u": 0, "v": 48 }, - "cubes": [ - { - "from": [ "#arm_x", 4, "#arm_z"], - "size": [ "#arm_width", "#arm_length", "#arm_depth" ], - "stretch": 0.25 - } - ] + }, + "tail": { + "type": "mson:slot", + "name": "tail", + "implementation": "com.minelittlepony.client.model.part.PonyTail", + "data": "minelittlepony:components/tail" + }, + "right_arm": { + "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], + "texture": { "u": 40, "v": 16 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "left_arm": { + "pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], + "texture": { "u": 32, "v": 48 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "right_leg": { + "pivot": ["#arm_rotation_x_neg", 0, 0], + "texture": { "u": 0, "v": 16 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "left_leg": { + "pivot": ["#arm_rotation_x", 0, 0], + "texture": { "u": 16, "v": 48 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ] + } + ] + }, + "right_sleeve": { + "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], + "texture": { "u": 40, "v": 32 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ], + "dilate": 0.25 + } + ] + }, + "left_sleeve": { + "pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], + "texture": { "u": 48, "v": 48 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ], + "dilate": 0.25 + } + ] + }, + "right_pants": { + "pivot": ["#arm_rotation_x_neg", 0, 0], + "texture": { "u": 0, "v": 32 }, + "cubes": [ + { + "from": [ "#arm_x_neg", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ], + "dilate": 0.25 + } + ] + }, + "left_pants": { + "pivot": ["#arm_rotation_x", 0, 0], + "texture": { "u": 0, "v": 48 }, + "cubes": [ + { + "from": [ "#arm_x", 4, "#arm_z"], + "size": [ "#arm_width", "#arm_length", "#arm_depth" ], + "dilate": 0.25 + } + ] + } } } diff --git a/src/main/resources/assets/minelittlepony/models/villager.json b/src/main/resources/assets/minelittlepony/models/villager.json index 53ceb4d7..0e58dcd1 100644 --- a/src/main/resources/assets/minelittlepony/models/villager.json +++ b/src/main/resources/assets/minelittlepony/models/villager.json @@ -1,51 +1,53 @@ { "parent": "minelittlepony:races/steve/alicorn", - "head": { - "center": [ 0, 0, -2 ], - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": [ - { - "type": "mson:slot", - "name": "snout", - "implementation": "com.minelittlepony.client.model.part.PonySnout", - "content": "minelittlepony:components/snout" - }, - { - "type": "mson:slot", - "name": "ears", - "implementation": "com.minelittlepony.client.model.part.PonyEars", - "content": "minelittlepony:components/ears" - }, - { - "type": "mson:slot", - "name": "bat_ears", - "implementation": "com.minelittlepony.client.model.part.PonyEars", - "content": "minelittlepony:components/bat_ears" - }, - { - "type": "mson:slot", - "name": "horn", - "implementation": "com.minelittlepony.client.model.part.UnicornHorn", - "content": "minelittlepony:components/horn" + "data": { + "head": { + "pivot": [ 0, 0, -2 ], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "snout": { + "type": "mson:slot", + "name": "snout", + "implementation": "com.minelittlepony.client.model.part.PonySnout", + "data": "minelittlepony:components/snout" + }, + "ears": { + "type": "mson:slot", + "name": "ears", + "implementation": "com.minelittlepony.client.model.part.PonyEars", + "data": "minelittlepony:components/ears" + }, + "bat_ears": { + "type": "mson:slot", + "name": "bat_ears", + "implementation": "com.minelittlepony.client.model.part.PonyEars", + "data": "minelittlepony:components/bat_ears" + }, + "horn": { + "type": "mson:slot", + "name": "horn", + "implementation": "com.minelittlepony.client.model.part.UnicornHorn", + "data": "minelittlepony:components/horn" + } } - ] - }, - "bat_wings": { - "type": "mson:slot", - "name": "bat_wings", - "implementation": "com.minelittlepony.client.model.part.BatWings", - "content": "minelittlepony:components/bat_wings" - }, - "apron": { - "type": "mson:planar", - "texture": {"u": 56, "v": 16}, - "south": [-4, 4, -3, 8, 10] - }, - "trinket": { - "type": "mson:planar", - "texture": {"u": 0, "v": 3}, - "south": [-2, 4, -3, 4, 5] + }, + "bat_wings": { + "type": "mson:slot", + "name": "bat_wings", + "implementation": "com.minelittlepony.client.model.part.BatWings", + "data": "minelittlepony:components/bat_wings" + }, + "apron": { + "type": "mson:planar", + "texture": {"u": 56, "v": 16}, + "south": [-4, 4, -3, 8, 10] + }, + "trinket": { + "type": "mson:planar", + "texture": {"u": 0, "v": 3}, + "south": [-2, 4, -3, 4, 5] + } } }