Fixed several model issues so they output correctly when converted to bbmodel files

This commit is contained in:
Sollace 2023-08-21 21:24:36 +01:00
parent 5a0d3a073d
commit da790fc984
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
28 changed files with 124 additions and 36 deletions

View file

@ -28,8 +28,6 @@ public class SeaponyModel<T extends LivingEntity> extends UnicornModel<T> {
leftPants.hidden = true; leftPants.hidden = true;
rightPants.hidden = true; rightPants.hidden = true;
leftSleeve.hidden = true;
rightSleeve.hidden = true;
leftLeg.hidden = true; leftLeg.hidden = true;
rightLeg.hidden = true; rightLeg.hidden = true;
} }

View file

@ -20,7 +20,7 @@
}, },
"extended": { "extended": {
"texture": {"u": 56, "v": 19, "w": 64, "h": 64}, "texture": {"u": 56, "v": 19, "w": 64, "h": 64},
"rotate": [3, 180, 0], "rotate": [3, 180, -140],
"pivot": [2.5, 5.3, 3], "pivot": [2.5, 5.3, 3],
"children": { "children": {
"bones": { "bones": {
@ -61,7 +61,7 @@
"data": { "data": {
"folded": { "folded": {
"texture": {"u": 56, "v": 16, "w": 64, "h": 64}, "texture": {"u": 56, "v": 16, "w": 64, "h": 64},
"rotate": [90, 0, 0], "rotate": [90, 0, 140],
"pivot": [-0.5, 13, -4], "pivot": [-0.5, 13, -4],
"mirror": true, "mirror": true,
"cubes": [ "cubes": [

View file

@ -15,7 +15,6 @@
], ],
"children": { "children": {
"tip": { "tip": {
"name": "tip",
"texture": {"u": 24, "v": 0}, "texture": {"u": 24, "v": 0},
"pivot": [1, 5, 1], "pivot": [1, 5, 1],
"cubes": [ "cubes": [
@ -23,21 +22,21 @@
], ],
"children": { "children": {
"fins": { "fins": {
"name": "fins", "texture": {"u": 56, "v": 41},
"texture": {"u": 56, "v": 20}, "pivot": [1, 4, 0.5],
"rotate": ["#tail_rot_x_neg", 0, 0], "rotate": ["#tail_rot_x_neg", 0, 0],
"cubes": [ "cubes": [
{ {
"type": "mson:plane", "type": "mson:plane",
"face": "up", "face": "up",
"mirror": [false, true], "mirror": [false, true],
"position": [-7, 0, 4], "size": [8, 8] "position": [-8, 0, 0], "size": [8, 8]
}, },
{ {
"type": "mson:plane", "type": "mson:plane",
"face": "up", "face": "up",
"mirror": [true, true], "mirror": [true, true],
"position": [1, 0, 4], "size": [8, 8] "position": [0, 0, 0], "size": [8, 8]
} }
] ]
} }

View file

@ -19,6 +19,7 @@
}, },
"corona": { "corona": {
"rotate": ["#incline", 0, 0], "rotate": ["#incline", 0, 0],
"visible": false,
"pivot": ["#x", "#y", "#z"], "pivot": ["#x", "#y", "#z"],
"cubes": [ "cubes": [
{ {

View file

@ -16,7 +16,7 @@
"extended": { "extended": {
"texture": {"u": 57, "v": 35, "w": 64, "h": 64}, "texture": {"u": 57, "v": 35, "w": 64, "h": 64},
"pivot": [4.5, 5.3, 6], "pivot": [4.5, 5.3, 6],
"rotate": [-30, 180, 0], "rotate": [-30, 180, -145],
"children": { "children": {
"feather_1": { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "dilate": 0.1 } ] }, "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_2": { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "dilate": 0.1 } ], "rotate": [-48, 0, 0] },
@ -44,7 +44,7 @@
"extended": { "extended": {
"texture": {"u": 56, "v": 19, "w": 64, "h": 64}, "texture": {"u": 56, "v": 19, "w": 64, "h": 64},
"pivot": [-4.5, 5.3, 6], "pivot": [-4.5, 5.3, 6],
"rotate": [-30, 180, 0], "rotate": [-30, 180, 145],
"children": { "children": {
"feather_1": { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "dilate": 0.1 } ] }, "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_2": { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "dilate": 0.1 } ], "rotate": [-48, 0, 0] },
@ -72,7 +72,7 @@
"extended": { "extended": {
"texture": {"u": 57, "v": 35, "w": 64, "h": 64}, "texture": {"u": 57, "v": 35, "w": 64, "h": 64},
"pivot": [-4.5, 5.3, 6], "pivot": [-4.5, 5.3, 6],
"rotate": [-30, 180, 0], "rotate": [-30, 180, 145],
"children": { "children": {
"feather_1": { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "dilate": 0.1 } ], "mirror": true }, "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_2": { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "dilate": 0.1 } ], "rotate": [-48, 0, 0], "mirror": true },

View file

@ -8,6 +8,7 @@
"data": { "data": {
"stallion": { "stallion": {
"type": "mson:planar", "type": "mson:planar",
"visible": false,
"pivot": ["#x", "#y", "#z"], "pivot": ["#x", "#y", "#z"],
"north": [-2, -1, -7, 4, 3, 10, 13], "north": [-2, -1, -7, 4, 3, 10, 13],
"up": [-2, -1, -7, 4, 1, 10, 13], "up": [-2, -1, -7, 4, 1, 10, 13],

View file

@ -13,6 +13,7 @@
"children": { "children": {
"nose": { "nose": {
"dilate": [-1, 0, -1], "dilate": [-1, 0, -1],
"visible": false,
"cubes": [ "cubes": [
{ "from": [-4, -6, -13], "size": [ 8, 8, 8] } { "from": [-4, -6, -13], "size": [ 8, 8, 8] }
] ]
@ -67,6 +68,7 @@
}, },
"hat": { "hat": {
"texture": { "u": 32, "v": 0 }, "texture": { "u": 32, "v": 0 },
"visible": false,
"pivot": [0, 0, -2], "pivot": [0, 0, -2],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": -0.5 } { "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": -0.5 }

View file

@ -1,5 +1,5 @@
{ {
"texture": {"w": 128, "h": 64}, "texture": {"w": 128, "h": 64},
"parent": "minelittlepony:zombie", "parent": "minelittlepony:zombie",
"data": { "data": {
"head": { "head": {
@ -11,6 +11,7 @@
"children": { "children": {
"nose": { "nose": {
"dilate": [-1, 0, -1], "dilate": [-1, 0, -1],
"visible": false,
"cubes": [ "cubes": [
{ "from": [-4, -6, -13], "size": [ 8, 8, 8] } { "from": [-4, -6, -13], "size": [ 8, 8, 8] }
] ]

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/alicorn", "parent": "minelittlepony:races/steve/alicorn",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/bat_pony", "parent": "minelittlepony:races/steve/bat_pony",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/changeling", "parent": "minelittlepony:races/steve/changeling",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/earth_pony", "parent": "minelittlepony:races/steve/earth_pony",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/gryphon", "parent": "minelittlepony:races/steve/gryphon",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/hippogriff", "parent": "minelittlepony:races/steve/hippogriff",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/kirin", "parent": "minelittlepony:races/steve/kirin",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/pegasus", "parent": "minelittlepony:races/steve/pegasus",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/reformed_changeling", "parent": "minelittlepony:races/steve/reformed_changeling",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/sea_pony", "parent": "minelittlepony:races/steve/sea_pony",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/unicorn", "parent": "minelittlepony:races/steve/unicorn",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -2,6 +2,6 @@
"parent": "minelittlepony:races/steve/zebra", "parent": "minelittlepony:races/steve/zebra",
"locals": { "locals": {
"arm_width": 3, "arm_width": 3,
"arm_rotation_x": 2 "arm_rotation_x": 1
} }
} }

View file

@ -10,6 +10,7 @@
"children": { "children": {
"nose": { "nose": {
"dilate": [-1, 0, -1], "dilate": [-1, 0, -1],
"visible": false,
"cubes": [ "cubes": [
{ "from": [-4, -6, -13], "size": [ 8, 8, 8] } { "from": [-4, -6, -13], "size": [ 8, 8, 8] }
] ]

View file

@ -23,6 +23,7 @@
"children": { "children": {
"nose": { "nose": {
"dilate": [-1, 0, -1], "dilate": [-1, 0, -1],
"visible": false,
"cubes": [ "cubes": [
{ "from": [-4, -6, -13], "size": [ 8, 8, 8] } { "from": [-4, -6, -13], "size": [ 8, 8, 8] }
] ]

View file

@ -10,6 +10,7 @@
"children": { "children": {
"nose": { "nose": {
"dilate": [-1, 0, -1], "dilate": [-1, 0, -1],
"visible": false,
"cubes": [ "cubes": [
{ "from": [-4, -6, -13], "size": [ 8, 8, 8] } { "from": [-4, -6, -13], "size": [ 8, 8, 8] }
] ]

View file

@ -10,6 +10,7 @@
"children": { "children": {
"nose": { "nose": {
"dilate": [-1, 0, -1], "dilate": [-1, 0, -1],
"visible": false,
"cubes": [ "cubes": [
{ "from": [-4, -6, -13], "size": [ 8, 8, 8] } { "from": [-4, -6, -13], "size": [ 8, 8, 8] }
] ]

View file

@ -1,5 +1,5 @@
{ {
"parent": "minelittlepony:races/steve/alicorn", "parent": "minelittlepony:races/steve/unicorn",
"data": { "data": {
"left_fin": { "left_fin": {
"type": "mson:planar", "type": "mson:planar",
@ -15,10 +15,9 @@
}, },
"center_fin": { "center_fin": {
"type": "mson:planar", "type": "mson:planar",
"texture": {"u": 58, "v": 28}, "rotate": [74, 0, 0],
"rotate": [84, 0, 0], "pivot": [0, 7, 7],
"pivot": [0, 6, 9], "east": [0, -6, 0, 7, 12, 56, 30, true, false]
"east": [0, -6, 0, 6, 12]
}, },
"body": { "body": {
"cubes": [ "cubes": [
@ -39,10 +38,81 @@
}, },
"jacket": { "jacket": {
"texture": { "u": 24, "v": 0 }, "texture": { "u": 24, "v": 0 },
"visible": false,
"dilate": 0.25, "dilate": 0.25,
"cubes": [ "cubes": [
{ "from": [-4, 4, -2], "size": [ 8, 8, 4 ], "texture": { "u": 16, "v": 32 }, "dilate": 0.25 } { "from": [-4, 4, -2], "size": [ 8, 8, 4 ], "texture": { "u": 16, "v": 32 }, "dilate": 0.25 }
] ]
},
"right_arm": {
"pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", "#arm_rotation_z"],
"rotate": [-80, 29, 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", "#arm_rotation_z"],
"rotate": [-80, -29, 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", "#arm_rotation_y", 11],
"visible": false,
"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", "#arm_rotation_y", 11],
"visible": false,
"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", "#arm_rotation_z"],
"rotate": [-80, 29, 0],
"visible": false,
"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", "#arm_rotation_z"],
"rotate": [-80, -29, 0],
"visible": false,
"texture": { "u": 48, "v": 48 },
"cubes": [
{
"from": [ "#arm_x", 4, "#arm_z"],
"size": [ "#arm_width", "#arm_length", "#arm_depth" ],
"dilate": 0.25
}
]
}, },
"tail": { "tail": {
"implementation": "com.minelittlepony.client.model.part.SeaponyTail", "implementation": "com.minelittlepony.client.model.part.SeaponyTail",

View file

@ -10,6 +10,7 @@
"children": { "children": {
"nose": { "nose": {
"dilate": [-1, 0, -1], "dilate": [-1, 0, -1],
"visible": false,
"cubes": [ "cubes": [
{ "from": [-4, -6, -13], "size": [ 8, 8, 8] } { "from": [-4, -6, -13], "size": [ 8, 8, 8] }
] ]
@ -27,6 +28,7 @@
}, },
"right_cast": { "right_cast": {
"pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0],
"visible": false,
"texture": { "u": 40, "v": 32, "w": 64, "h": 64 }, "texture": { "u": 40, "v": 32, "w": 64, "h": 64 },
"cubes": [ "cubes": [
{ {
@ -37,6 +39,7 @@
}, },
"left_cast": { "left_cast": {
"pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], "pivot": ["#arm_rotation_x", "#arm_rotation_y", 0],
"visible": false,
"texture": { "u": 40, "v": 32, "w": 64, "h": 64 }, "texture": { "u": 40, "v": 32, "w": 64, "h": 64 },
"cubes": [ "cubes": [
{ {

View file

@ -12,6 +12,7 @@
"children": { "children": {
"nose": { "nose": {
"dilate": [-1, 0, -1], "dilate": [-1, 0, -1],
"visible": false,
"cubes": [ "cubes": [
{ "from": [-4, -6, -13], "size": [ 8, 8, 8] } { "from": [-4, -6, -13], "size": [ 8, 8, 8] }
] ]

View file

@ -12,6 +12,7 @@
"arm_z": ["#arm_depth", "/", -2], "arm_z": ["#arm_depth", "/", -2],
"arm_rotation_x": 0, "arm_rotation_x": 0,
"arm_rotation_x_neg": [0, "-", "#arm_rotation_x"], "arm_rotation_x_neg": [0, "-", "#arm_rotation_x"],
"arm_rotation_z": 2,
"arm_rotation_y": 8, "arm_rotation_y": 8,
"head_pivot_y": 0, "head_pivot_y": 0,
"neck_dilate_y": -0.1, "neck_dilate_y": -0.1,
@ -28,6 +29,7 @@
], ],
"children": { "children": {
"nose": { "nose": {
"visible": false,
"dilate": [-1, 0, -1], "dilate": [-1, 0, -1],
"cubes": [ "cubes": [
{ "from": [-4, -6, -13], "size": [ 8, 8, 8] } { "from": [-4, -6, -13], "size": [ 8, 8, 8] }
@ -186,6 +188,7 @@
"children": { "children": {
"mane": { "mane": {
"type": "mson:planar", "type": "mson:planar",
"visible": false,
"pivot": [0, -2.9, 1.5], "pivot": [0, -2.9, 1.5],
"dilate": [ -0.8, 2, 0 ], "dilate": [ -0.8, 2, 0 ],
"texture": { "u": 32, "v": 0 }, "texture": { "u": 32, "v": 0 },
@ -199,6 +202,7 @@
}, },
"jacket": { "jacket": {
"texture": { "u": 24, "v": 0 }, "texture": { "u": 24, "v": 0 },
"visible": false,
"dilate": 0.25, "dilate": 0.25,
"cubes": [ "cubes": [
{ "from": [-4, 4, -2], "size": [ 8, 8, 4 ], "texture": { "u": 16, "v": 32 }, "dilate": 0.25 } { "from": [-4, 4, -2], "size": [ 8, 8, 4 ], "texture": { "u": 16, "v": 32 }, "dilate": 0.25 }
@ -264,7 +268,7 @@
"data": "minelittlepony:components/tail" "data": "minelittlepony:components/tail"
}, },
"right_arm": { "right_arm": {
"pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", "#arm_rotation_z"],
"texture": { "u": 40, "v": 16 }, "texture": { "u": 40, "v": 16 },
"cubes": [ "cubes": [
{ {
@ -274,7 +278,7 @@
] ]
}, },
"left_arm": { "left_arm": {
"pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], "pivot": ["#arm_rotation_x", "#arm_rotation_y", "#arm_rotation_z"],
"texture": { "u": 32, "v": 48 }, "texture": { "u": 32, "v": 48 },
"cubes": [ "cubes": [
{ {
@ -304,7 +308,8 @@
] ]
}, },
"right_sleeve": { "right_sleeve": {
"pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", "#arm_rotation_z"],
"visible": false,
"texture": { "u": 40, "v": 32 }, "texture": { "u": 40, "v": 32 },
"cubes": [ "cubes": [
{ {
@ -315,7 +320,8 @@
] ]
}, },
"left_sleeve": { "left_sleeve": {
"pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], "pivot": ["#arm_rotation_x", "#arm_rotation_y", "#arm_rotation_z"],
"visible": false,
"texture": { "u": 48, "v": 48 }, "texture": { "u": 48, "v": 48 },
"cubes": [ "cubes": [
{ {
@ -326,7 +332,8 @@
] ]
}, },
"right_pants": { "right_pants": {
"pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0], "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 11],
"visible": false,
"texture": { "u": 0, "v": 32 }, "texture": { "u": 0, "v": 32 },
"cubes": [ "cubes": [
{ {
@ -337,7 +344,8 @@
] ]
}, },
"left_pants": { "left_pants": {
"pivot": ["#arm_rotation_x", "#arm_rotation_y", 0], "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 11],
"visible": false,
"texture": { "u": 0, "v": 48 }, "texture": { "u": 0, "v": 48 },
"cubes": [ "cubes": [
{ {