From 2aafc214ac1880fbfc7ec04c3073d813456f489b Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 30 Nov 2019 17:18:05 +0200 Subject: [PATCH] Simplify offsets and fix ears (again) --- .../minelittlepony/models/armour_inner.json | 33 +++------- .../minelittlepony/models/armour_outer.json | 2 +- .../models/components/bat_ears.json | 20 ++++-- .../models/components/ears.json | 5 +- .../models/components/fish_tail.json | 8 +-- .../models/components/snout.json | 34 +++++----- .../models/components/tail_segment.json | 2 +- .../minelittlepony/models/enderman.json | 20 +++--- .../minelittlepony/models/gear/antlers.json | 10 ++- .../models/gear/saddlebags.json | 45 ++++++------- .../minelittlepony/models/gear/witch_hat.json | 4 ++ .../models/races/steve/bat_pony.json | 3 +- .../models/races/steve/unicorn.json | 3 +- .../models/races/steve/zebra.json | 11 ++-- .../assets/minelittlepony/models/skull.json | 10 +-- .../minelittlepony/models/steve_pony.json | 65 +++++++++---------- .../minelittlepony/models/villager.json | 9 +-- 17 files changed, 128 insertions(+), 156 deletions(-) diff --git a/src/main/resources/assets/minelittlepony/models/armour_inner.json b/src/main/resources/assets/minelittlepony/models/armour_inner.json index 705181a1..98c35d69 100644 --- a/src/main/resources/assets/minelittlepony/models/armour_inner.json +++ b/src/main/resources/assets/minelittlepony/models/armour_inner.json @@ -1,6 +1,7 @@ { "parent": "minelittlepony:steve_pony", - "scale": 0.25, + "texture": {"w": 64, "h": 32}, + "scale": 0.125, "chestpiece": { "texture": {"u": 16, "v": 8}, "cubes": [ @@ -8,36 +9,20 @@ ] }, "head": { - "offset": [ 0, -1, -2 ], "center": [ 0, 0, -2 ], "cubes": [ - { "from": [-4, -4, -4], "size": [ 8, 8, 8] }, - { "from": [-4, -6, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 0}, "stretch": -0.125 }, - { "from": [ 2, -6, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 4}, "stretch": -0.125 } - ], - "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" - } + { "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.125 }, + { "from": [ 2, -8, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 4}, "stretch": -0.125 } ] }, "upper_torso": { "type": "mson:planar", "texture": {"u": 24, "v": 0}, - "offset": [0, 8, 6], - "east": [4, -4, -4, 8, 8, 32, 32], - "west": [-4, -4, -4, 8, 8, 32, 23], - "south": [-4, -4, 4, 8, 8, 32, 23], - "up": [-4, -4, -8, 8, 12, 32, 23], + "east": [4, 4, 2, 8, 8, 32, 32], + "west": [-4, 4, 2, 8, 8, 32, 23], + "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": { diff --git a/src/main/resources/assets/minelittlepony/models/armour_outer.json b/src/main/resources/assets/minelittlepony/models/armour_outer.json index 44c787aa..b00bc4d1 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.125 + "scale": 0.25 } 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 f76eb364..570d2571 100644 --- a/src/main/resources/assets/minelittlepony/models/components/bat_ears.json +++ b/src/main/resources/assets/minelittlepony/models/components/bat_ears.json @@ -1,19 +1,27 @@ { "texture": {"w": 64, "h": 64}, + "locals": { + "x": 0, + "y": 0, + "z": 0 + }, "right": { "texture": {"u": 12, "v": 16}, + "offset": ["#x", "#y", "#z"], "cubes": [ - { "from": [-4, -6, 1], "size": [2, 2, 2] }, - { "from": [-3.5, -6.49, 1.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 3} }, - { "from": [-2.998, -6.49, 2.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 5} } + { "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}, + "offset": ["#x", "#y", "#z"], + "mirror": true, "cubes": [ - { "from": [2, -6, 1], "size": [2, 2, 2] }, - { "from": [2.5, -6.49, 1.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 3} }, - { "from": [1.998, -6.49, 2.001], "size": [1, 1, 1], "texture": {"u": 0, "v": 5} } + { "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/ears.json b/src/main/resources/assets/minelittlepony/models/components/ears.json index 8bd7a1ff..1466b62a 100644 --- a/src/main/resources/assets/minelittlepony/models/components/ears.json +++ b/src/main/resources/assets/minelittlepony/models/components/ears.json @@ -9,14 +9,15 @@ "texture": {"u": 12, "v": 16}, "offset": ["#x", "#y", "#z"], "cubes": [ - { "from": [-4, -6, -1], "size": [2, 2, 2] } + { "from": [-4, -8, -1], "size": [2, 2, 2] } ] }, "left": { "texture": {"u": 12, "v": 16}, "offset": ["#x", "#y", "#z"], + "mirror": true, "cubes": [ - { "from": [2, -6, -1], "size": [2, 2, 2] } + { "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 416964de..af0679ba 100644 --- a/src/main/resources/assets/minelittlepony/models/components/fish_tail.json +++ b/src/main/resources/assets/minelittlepony/models/components/fish_tail.json @@ -8,10 +8,9 @@ "texture": {"u": 0, "v": 38}, "center": [-2, 10, 8], "rotate": ["#tail_rot_x", 0, 0], - "offset": [0, -4, -2], "mirror": true, "cubes": [ - {"from": [0, 4, 2], "size": [4, 6, 4]} + {"from": [0, 0, 0], "size": [4, 6, 4]} ], "children": [ { @@ -25,19 +24,18 @@ { "name": "fins", "texture": {"u": 56, "v": 20}, - "offset": [1, 0, 4], "rotate": ["#tail_rot_x_neg", 0, 0], "cubes": [ { "type": "mson:plane", "face": "up", - "position": [-8, 0, 0], "size": [8, 8] + "position": [-7, 0, 4], "size": [8, 8] }, { "type": "mson:plane", "face": "up", "mirror": [true, false, false], - "position": [0, 0, 0], "size": [8, 8] + "position": [1, 0, 4], "size": [8, 8] } ] } diff --git a/src/main/resources/assets/minelittlepony/models/components/snout.json b/src/main/resources/assets/minelittlepony/models/components/snout.json index a5885ef7..44448631 100644 --- a/src/main/resources/assets/minelittlepony/models/components/snout.json +++ b/src/main/resources/assets/minelittlepony/models/components/snout.json @@ -2,38 +2,38 @@ "texture": {"w": 64, "h": 64, "u": 16, "v": 8}, "locals": { "x": 0, - "y": -1, - "z": -2 + "y": 0, + "z": 0 }, "stallion": { "type": "mson:planar", "offset": ["#x", "#y", "#z"], - "north": [-2, 1, -5, 4, 3, 10, 13], - "up": [-2, 1, -5, 4, 1, 10, 13], - "down": [-2, 4, -5, 4, 1, 18, 7], - "west": [-2, 1, -5, 3, 1, 10, 13], - "east": [ 2, 1, -5, 3, 1, 13, 13] + "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, 3, 1, 10, 13], + "east": [ 2, -1, -7, 3, 1, 13, 13] }, "mare": { "type": "mson:planar", "offset": ["#x", "#y", "#z"], "north": [ - [-2, 2, -5, 4, 2, 10, 14], - [-1, 1, -5, 2, 1, 11, 13] + [-2, 0, -7, 4, 2, 10, 14], + [-1, -1, -7, 2, 1, 11, 13] ], "up": [ - [-2, 2, -5, 1, 1, 9, 14], - [ 1, 2, -5, 1, 1, 14, 14], - [-1, 1, -5, 2, 1, 11, 12] + [-2, 0, -7, 1, 1, 9, 14], + [ 1, 0, -7, 1, 1, 14, 14], + [-1, -1, -7, 2, 1, 11, 12] ], - "down": [-2, 4, -5, 4, 1, 18, 7], + "down": [-2, 2, -7, 4, 1, 18, 7], "west": [ - [-2, 2, -5, 2, 1, 9, 14], - [-1, 1, -5, 1, 1, 11, 12] + [-2, 0, -7, 2, 1, 9, 14], + [-1, -1, -7, 1, 1, 11, 12] ], "east": [ - [ 2, 2, -5, 2, 1, 14, 14], - [ 1, 1, -5, 1, 1, 12, 12] + [ 2, 0, -7, 2, 1, 14, 14], + [ 1, -1, -7, 1, 1, 12, 12] ] } } 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 a5a7d13f..290c8c85 100644 --- a/src/main/resources/assets/minelittlepony/models/components/tail_segment.json +++ b/src/main/resources/assets/minelittlepony/models/components/tail_segment.json @@ -2,7 +2,7 @@ "texture": {"w": 64, "h": 64}, "locals": { "segment_index": 0, - "segment_y": [["#segment_index", "*", 4], "+", 0.063], + "segment_y": [["#segment_index", "*", 4], "+", 1.063], "tex_x": [["#segment_index", "%", 2], "*", 4] }, "segment": { diff --git a/src/main/resources/assets/minelittlepony/models/enderman.json b/src/main/resources/assets/minelittlepony/models/enderman.json index d360e9e4..c0c11bc1 100644 --- a/src/main/resources/assets/minelittlepony/models/enderman.json +++ b/src/main/resources/assets/minelittlepony/models/enderman.json @@ -6,10 +6,9 @@ "arm_rotation_y": 14 }, "head": { - "offset": [ 0, -1, -2 ], "center": [ 0, 0, -2 ], "cubes": [ - { "from": [-4, -4, -4], "size": [ 8, 8, 8] }, + { "from": [-4, -6, -6], "size": [ 8, 8, 8] }, { "from": [-4, -6, 1], "size": [2, 2, 2], "texture": {"u": 12, "v": 16} }, { "from": [ 2, -6, 1], "size": [2, 2, 2], "texture": {"u": 12, "v": 16}, "mirror": true } ], @@ -35,13 +34,12 @@ { "name": "left_horn", "texture": {"u": 0, "v": 52}, - "rotate": [0.1, 0, -0.8], - "offset": [-6, -213, -172], - "cubes": [ {"size": [2, 6, 2]} ], + "rotate": [6, 0, -45], + "cubes": [ {"size": [0, -4, -1]} ], "children": [ { - "rotate": [0, 0, 0.9], - "center": [-223, -343, 0.057], + "rotate": [0, 0, 51], + "center": [-3.9, -6, 0.001], "cubes": [ {"size": [2, 6, 2]} ] } ] @@ -49,9 +47,8 @@ { "name": "right_horn", "texture": {"u": 8, "v": 52}, - "rotate": [0.1, 0, 0.8], - "offset": [0, -147, -172], - "cubes": [ {"size": [2, 6, 2]} ], + "rotate": [6, 0, 45], + "cubes": [ {"size": [2, -4, -1]} ], "children": [ { "rotate": [0, 0, -51], @@ -64,10 +61,9 @@ }, "helmet": { "texture": { "u": 32, "v": 0 }, - "offset": [0, -1, -2], "center": [0, 0, -2], "cubes": [ - { "from": [-4, -4, -4], "size": [ 8, 8, 8], "stretch": -0.5 } + { "from": [-4, -6, -6], "size": [ 8, 8, 8], "stretch": -0.5 } ] }, "right_arm": { diff --git a/src/main/resources/assets/minelittlepony/models/gear/antlers.json b/src/main/resources/assets/minelittlepony/models/gear/antlers.json index 6969365d..34d65e5d 100644 --- a/src/main/resources/assets/minelittlepony/models/gear/antlers.json +++ b/src/main/resources/assets/minelittlepony/models/gear/antlers.json @@ -2,17 +2,15 @@ "texture": {"w": 16, "h": 8}, "left": { "center": [-7, 0.5, 0.5], - "offset": [-7, 0, 0], "cubes": [ - { "from": [3, -4, 0], "size": [7, 1, 1] }, - { "from": [3, -5, 0], "size": [1, 1, 1], "texture": {"u": 0, "v": 2 } }, - { "from": [5, -5, 0], "size": [1, 1, 1], "texture": {"u": 4, "v": 2 } }, - { "from": [7, -5, 0], "size": [1, 1, 1], "texture": {"u": 8, "v": 2 } } + { "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], - "offset": [0, 0, 0], "cubes": [ { "from": [-3, -4, 0], "size": [7, 1, 1] }, { "from": [ 3, -5, 0], "size": [1, 1, 1], "texture": {"u": 0, "v": 2 } }, diff --git a/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json b/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json index 497da8fc..7afaa1f9 100644 --- a/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json +++ b/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json @@ -3,26 +3,24 @@ "left_bag": { "type": "mson:planar", "texture": {"u": 56, "v": 19}, - "offset": [4, -0.5, -1], "center": [0, 4, 4], "south": [ - [0, 0, 0, 3, 6, 56, 25], - [0, 0, 8, 3, 6, 59, 25] + [4, -0.5, -1, 3, 6, 56, 25], + [4, -0.5, 7, 3, 6, 59, 25] ], "west": [ - [3, 0, 0, 6, 8, 56, 19], - [0, 0, 0, 6, 8, 56, 19] + [7, -0.5, -1, 6, 8, 56, 19], + [4, -0.5, -1, 6, 8, 56, 19] ], "children": [ { "rotate": [270, 0, 0], - "offset": [-1, -0.5, -4], - "top": [0, 0, -3, 8, 3, 56, 16], + "top": [-3, -1, -8, 8, 3, 56, 16], "children": [ { "type": "mson:plane", "face": "down", - "from": [0, 6, -3], "size": [-3, 8, 3], + "from": [-3, 5, -8], "size": [-3, 8, 3], "mirror": [false, false, true] } ] @@ -32,26 +30,24 @@ "right_bag": { "type": "mson:planar", "texture": {"u": 56, "v": 19}, - "offset": [-7, -0.5, -1], "center": [0, 4, 4], "south": [ - [0, 0, 0, 3, 6, 56, 25], - [0, 0, 8, 3, 6, 59, 25] + [-7, -0.5, -1, 3, 6, 56, 25], + [-7, -0.5, 7, 3, 6, 59, 25] ], "west": [ - [3, 0, 0, 6, 8, 56, 19], - [0, 0, 0, 6, 8, 56, 19] + [-4, -0.5, -1, 6, 8, 56, 19], + [-7, -0.5, -1, 6, 8, 56, 19] ], "children": [ { "rotate": [270, 0, 0], - "offset": [-1, -0.5, 7], - "top": [0, 0, -3, 8, 3, 56, 16], + "top": [-8, -1, 3, 8, 3, 56, 16], "children": [ { "type": "mson:plane", "face": "down", - "from": [0, 6, -3], "size": [-3, 8, 3], + "from": [-8, 5, 3], "size": [-3, 8, 3], "mirror": [false, false, true] } ] @@ -64,22 +60,21 @@ "offset": [-4, -0.3, 2], "center": [0, 4, 4], "top": [ - [0, 0, 0, 8, 1], - [0, 0, 1, 8, 1] + [-4, -0.3, 2, 8, 1], + [-4, -0.3, 3, 8, 1] ], - "south": [0, 0, 2, 8, 1], - "north": [0, 0, 0, 8, 1], + "south": [-4, -0.3, 4, 8, 1], + "north": [-4, -0.3, 2, 8, 1], "children": [ { "type": "mson:planar", - "offset": [0.0002, -3, -0.305], "texture": {"u": 56, "v": 31}, "rotate": [270, 0, 0], "west": [ - [ 4, 0, 0, 1, 3], - [ 4, -1, 0, 1, 3], - [-4, 0, 0, 1, 3], - [-4, -1, 0, 1, 3] + [ 4.0002, -3, -0.305, 1, 3], + [ 4.0002, -4, -0.305, 1, 3], + [-3.9998, -3, -0.305, 1, 3], + [-3.9998, -4, -0.305, 1, 3] ] } ] 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 a22d8a02..b44baee5 100644 --- a/src/main/resources/assets/minelittlepony/models/gear/witch_hat.json +++ b/src/main/resources/assets/minelittlepony/models/gear/witch_hat.json @@ -1,12 +1,14 @@ { "texture": {"w": 16, "h": 8, "u": 64, "h": 128}, "witch_hat": { + "visible": false, "texture": {"u": 0, "v": 64}, "cubes": [ { "from": [-5, -6, -7], "size": [10, 2, 10] } ], "children": [ { + "visible": false, "center": [1.75, -4, 2], "texture": {"u": 0, "v": 76}, "rotate": [3, 0, 1.5], @@ -15,6 +17,7 @@ ], "children": [ { + "visible": false, "center": [1.75, -4, 2], "texture": {"u": 0, "v": 87}, "rotate": [6, 0, 3], @@ -23,6 +26,7 @@ ], "children": [ { + "visible": false, "center": [1.75, -2, 2], "texture": {"u": 0, "v": 95}, "rotate": [12, 0, 6], 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 a075f2ff..022b956a 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,10 +1,9 @@ { "parent": "minelittlepony:steve_pony", "head": { - "offset": [ 0, -1, -2 ], "center": [ 0, 0, -2 ], "cubes": [ - { "from": [-4, -4, -4], "size": [ 8, 8, 8] } + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], "children": [ { 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 8d603767..ab82066f 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json @@ -1,10 +1,9 @@ { "parent": "minelittlepony:steve_pony", "head": { - "offset": [ 0, -1, -2 ], "center": [ 0, 0, -2 ], "cubes": [ - { "from": [-4, -4, -4], "size": [ 8, 8, 8] } + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], "children": [ { 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 816f073b..4b548894 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json @@ -1,10 +1,9 @@ { "parent": "minelittlepony:steve_pony", "head": { - "offset": [ 0, -1, -2 ], "center": [ 0, 0, -2 ], "cubes": [ - { "from": [-4, -4, -4], "size": [ 8, 8, 8] } + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], "children": [ { @@ -22,16 +21,14 @@ { "name": "bristles", "rotate": [17, 0, 0], - "offset": [-1, -1, -3], "cubes": [ - { "from": [ 0, -10, 2], "size": [2, 6, 2]}, - { "from": [ 0, -10, 4], "size": [2, 8, 2]}, - { "from": [ 0, -8, 6], "size": [2, 6, 2]} + { "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": [-1, 0, 0], - "offset": [-58, 114, -318], "cubes": [ { "from": [ 0, -10, 4], "size": [2, 8, 2]}, { "from": [ 0, -8, 6], "size": [2, 6, 2]} diff --git a/src/main/resources/assets/minelittlepony/models/skull.json b/src/main/resources/assets/minelittlepony/models/skull.json index 3ea613ef..c3b38a7d 100644 --- a/src/main/resources/assets/minelittlepony/models/skull.json +++ b/src/main/resources/assets/minelittlepony/models/skull.json @@ -10,8 +10,8 @@ "name": "snout", "locals": { "x": 0, - "y": -4, - "z": 0 + "y": -2, + "z": 2 }, "implementation": "com.minelittlepony.client.model.part.PonySnout", "content": "minelittlepony:components/snout" @@ -21,8 +21,8 @@ "name": "ears", "locals": { "x": 0, - "y": -4, - "z": 2 + "y": -1, + "z": 1 }, "implementation": "com.minelittlepony.client.model.part.PonyEars", "content": "minelittlepony:components/ears" @@ -33,7 +33,7 @@ "locals": { "x": 0, "y": -1, - "z": 3 + "z": 2 }, "implementation": "com.minelittlepony.client.model.part.UnicornHorn", "content": "minelittlepony:components/horn" diff --git a/src/main/resources/assets/minelittlepony/models/steve_pony.json b/src/main/resources/assets/minelittlepony/models/steve_pony.json index 74aabf46..8395ba05 100644 --- a/src/main/resources/assets/minelittlepony/models/steve_pony.json +++ b/src/main/resources/assets/minelittlepony/models/steve_pony.json @@ -15,10 +15,9 @@ "arm_rotation_y": 8 }, "head": { - "offset": [ 0, -1, -2 ], "center": [ 0, 0, -2 ], "cubes": [ - { "from": [-4, -4, -4], "size": [ 8, 8, 8] } + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], "children": [ { @@ -37,10 +36,9 @@ }, "helmet": { "texture": { "u": 32, "v": 0 }, - "offset": [ 0, -1, -2 ], "center": [ 0, 0, -2 ], "cubes": [ - { "from": [-4, -4, -4], "size": [ 8, 8, 8], "stretch": 0.5 } + { "from": [-4, -6, -6], "size": [ 8, 8, 8], "stretch": 0.5 } ] }, "torso": { @@ -51,84 +49,82 @@ }, "upper_torso": { "texture": { "u": 24, "v": 0 }, - "offset": [ 0, 8, 6 ], "cubes": [ { "type": "mson:plane", "__comment": "body sides", "texture": { "u": 24, "v": 0 }, "face": "east", - "position": [ 4, -4, -4 ], "size": [ 8, 8 ] + "position": [ 4, 4, 2 ], "size": [ 8, 8 ] }, { "type": "mson:plane", "__comment": "body sides", "texture": { "u": 24, "v": 0 }, "mirror": [ false, false, true ], "face": "west", - "position": [ -4, -4, -4 ], "size": [ 8, 8 ] + "position": [ -4, 4, 2 ], "size": [ 8, 8 ] }, { "type": "mson:plane", "__comment": "cutie mark", "texture": { "u": 4, "v": 0 }, "face": "east", - "position": [ 4, -4, 4 ], "size": [ 8, 4 ] + "position": [ 4, 4, 10 ], "size": [ 8, 4 ] }, { "type": "mson:plane", "__comment": "cutie mark", "texture": { "u": 4, "v": 0 }, "mirror": [ false, false, true ], "face": "east", - "position": [ -4, -4, 4 ], "size": [ 8, 4 ] + "position": [ -4, 4, 10 ], "size": [ 8, 4 ] }, { "type": "mson:plane", "__comment": "stomach", "texture": { "u": 56, "v": 0 }, "face": "down", - "position": [ -4, 4, -4 ], + "position": [ -4, 12, 2 ], "size": [ 8, 8 ] }, { "type": "mson:plane", "__comment": "butt", "texture": { "u": 36, "v": 16 }, "face": "south", - "position": [ -4, -4, 8 ], "size": [ 8, 4 ] + "position": [ -4, 4, 14 ], "size": [ 8, 4 ] }, { "type": "mson:plane", "__comment": "butt", "texture": { "u": 36, "v": 16 }, "face": "south", - "position": [ -4, 0, 8 ], + "position": [ -4, 8, 14 ], "size": [ 8, 4 ] }, { "type": "mson:plane", "__comment": "butt", "texture": { "u": 36, "v": 16 }, "face": "down", - "position": [ -4, 4, 4 ], "size": [ 8, 4 ] + "position": [ -4, 12, 10 ], "size": [ 8, 4 ] }, { "type": "mson:plane", "__comment": "back", "texture": { "u": 32, "v": 20 }, "mirror": [ false, false, true ], "face": "up", - "position": [ -4, -4, -4 ], "size": [ 8, 12 ] + "position": [ -4, 4, 2 ], "size": [ 8, 12 ] } ], "children": [ { "type": "mson:planar", "texture": { "u": 32, "v": 0 }, - "offset": [0, 7, 8], "rotate": [29, 0, 0], - "up": [-1, 2, 2, 2, 6], - "down": [-1, 4, 2, 2, 6], - "east": [ 1, 2, 2, 2, 6], - "south":[-1, 2, 8, 2, 2], + "up": [-1, 10, 10, 2, 6], + "down": [-1, 12, 10, 2, 6], + "east": [ 1, 10, 10, 2, 6], + "south":[-1, 10, 16, 2, 2], "cubes": [ { "type": "mson:plane", "mirror": [ false, false, true ], "face": "west", - "position": [ -1, 2, 2 ], "size": [ 2, 6 ] + "position": [ -1, 10, 10 ], "size": [ 2, 6 ] } ] } @@ -152,94 +148,93 @@ }, "saddle": { "texture": { "u": 24, "v": 0 }, - "offset": [0, 8, 6], "cubes": [ { "type": "mson:plane", "__comment": "body sides a", "texture": { "u": 12, "v": 32 }, "face": "east", - "position": [ 4, -4, -4 ], "size": [ 4, 8 ], "stretch": 0.25 + "position": [ 4, 4, 2 ], "size": [ 4, 8 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "body sides a", "texture": { "u": 12, "v": 32 }, "mirror": [ false, false, true ], "face": "west", - "position": [ -4, -4, -4 ], "size": [ 4, 8 ], "stretch": 0.25 + "position": [ -4, 4, 2 ], "size": [ 4, 8 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "body sides b", "texture": { "u": 12, "v": 48 }, "face": "east", - "position": [ 4, 0, -4 ], "size": [ 4, 8 ], "stretch": 0.25 + "position": [ 4, 8, 2 ], "size": [ 4, 8 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "body sides b", "mirror": [ false, false, true ], "texture": { "u": 12, "v": 48 }, "face": "west", - "position": [ -4, 0, -4 ], "size": [ 4, 8 ], "stretch": 0.25 + "position": [ -4, 8, 2 ], "size": [ 4, 8 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "qt mark a", "texture": { "u": 0, "v": 32 }, "face": "east", - "position": [ 4, -4, 4 ], "size": [ 4, 4 ], "stretch": 0.25 + "position": [ 4, 4, 10 ], "size": [ 4, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "qt mark a", "mirror": [ false, false, true ], "texture": { "u": 0, "v": 32 }, "face": "west", - "position": [ -4, -4, 4 ], "size": [ 4, 4 ], "stretch": 0.25 + "position": [ -4, 4, 10 ], "size": [ 4, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "qt mark b", "texture": { "u": 0, "v": 48 }, "face": "east", - "position": [ 4, 0, 4 ], "size": [ 4, 4 ], "stretch": 0.25 + "position": [ 4, 8, 10 ], "size": [ 4, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "qt mark b", "texture": { "u": 0, "v": 48 }, "face": "west", - "position": [ -4, 0, 4 ], "size": [ 4, 4 ], "stretch": 0.25 + "position": [ -4, 8, 10 ], "size": [ 4, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "stomach a", "texture": { "u": 28, "v": 48 }, "face": "down", - "position": [ -4, 4, -4 ], "size": [ 8, 4 ], "stretch": 0.25 + "position": [ -4, 12, 2 ], "size": [ 8, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "stomach b", "texture": { "u": 44, "v": 48 }, "face": "down", - "position": [ -4, 4, 0 ], "size": [ 8, 4 ], "stretch": 0.25 + "position": [ -4, 12, 6 ], "size": [ 8, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "stomach c", "texture": { "u": 36, "v": 32 }, "face": "down", - "position": [ -4, 4, 4 ], "size": [ 8, 4 ], "stretch": 0.25 + "position": [ -4, 12, 10 ], "size": [ 8, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "butt", "texture": { "u": 36, "v": 32 }, "face": "south", - "position": [ -4, -4, 8 ], "size": [ 8, 4 ], "stretch": 0.25 + "position": [ -4, 4, 14 ], "size": [ 8, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "butt", "texture": { "u": 36, "v": 32 }, "face": "south", - "position": [ -4, 0, 8 ], "size": [ 8, 4 ], "stretch": 0.25 + "position": [ -4, 8, 14 ], "size": [ 8, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "back", "texture": { "u": 32, "v": 36 }, "face": "up", - "position": [ -4, -4, -4 ], "size": [ 8, 12 ], "stretch": 0.25 + "position": [ -4, 4, 2 ], "size": [ 8, 12 ], "stretch": 0.25 } ] }, diff --git a/src/main/resources/assets/minelittlepony/models/villager.json b/src/main/resources/assets/minelittlepony/models/villager.json index baca75ad..f522fede 100644 --- a/src/main/resources/assets/minelittlepony/models/villager.json +++ b/src/main/resources/assets/minelittlepony/models/villager.json @@ -1,10 +1,9 @@ { "parent": "minelittlepony:races/steve/alicorn", "head": { - "offset": [ 0, -1, -2 ], "center": [ 0, 0, -2 ], "cubes": [ - { "from": [-4, -4, -4], "size": [ 8, 8, 8] } + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], "children": [ { @@ -36,13 +35,11 @@ "apron": { "type": "mson:planar", "texture": {"u": 56, "v": 16}, - "offset": [0, 8, 6], - "south": [-4, -4, -9, 8, 10] + "south": [-4, 4, -3, 8, 10] }, "trinket": { "type": "mson:planar", "texture": {"u": 0, "v": 3}, - "offset": [0, 8, 6], - "south": [-2, -4, -9, 4, 5] + "south": [-2, 4, -3, 4, 5] } }