PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-25 13:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java
View file

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

4
src/main/resources/assets/minelittlepony/models/entity/components/bat_wings.json
View file

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

9
src/main/resources/assets/minelittlepony/models/entity/components/fish_tail.json
View file

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

1
src/main/resources/assets/minelittlepony/models/entity/components/horn.json
View file

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

6
src/main/resources/assets/minelittlepony/models/entity/components/pegasus_wings.json
View file

@ -16,7 +16,7 @@
"extended": {
"texture": {"u": 57, "v": 35, "w": 64, "h": 64},
"pivot": [4.5, 5.3, 6],
"rotate": [-30, 180, 0],
"rotate": [-30, 180, -145],
"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] },
@ -44,7 +44,7 @@
"extended": {
"texture": {"u": 56, "v": 19, "w": 64, "h": 64},
"pivot": [-4.5, 5.3, 6],
"rotate": [-30, 180, 0],
"rotate": [-30, 180, 145],
"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] },
@ -72,7 +72,7 @@
"extended": {
"texture": {"u": 57, "v": 35, "w": 64, "h": 64},
"pivot": [-4.5, 5.3, 6],
"rotate": [-30, 180, 0],
"rotate": [-30, 180, 145],
"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 },

1
src/main/resources/assets/minelittlepony/models/entity/components/snout.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/enderman.json
View file

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

3
src/main/resources/assets/minelittlepony/models/entity/piglin.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/alicorn.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/bat_pony.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/changeling.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/earth_pony.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/gryphon.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/hippogriff.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/kirin.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/pegasus.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/reformed_changeling.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/sea_pony.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/unicorn.json
View file

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

2
src/main/resources/assets/minelittlepony/models/entity/races/alex/zebra.json
View file

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

1
src/main/resources/assets/minelittlepony/models/entity/races/steve/bat_pony.json
View file

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

1
src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json
View file

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

1
src/main/resources/assets/minelittlepony/models/entity/races/steve/kirin.json
View file

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

1
src/main/resources/assets/minelittlepony/models/entity/races/steve/reformed_changeling.json
View file

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

80
src/main/resources/assets/minelittlepony/models/entity/races/steve/sea_pony.json
View file

@ -1,5 +1,5 @@
{
"parent": "minelittlepony:races/steve/alicorn",
"parent": "minelittlepony:races/steve/unicorn",
"data": {
"left_fin": {
"type": "mson:planar",
@ -15,10 +15,9 @@
},
"center_fin": {
"type": "mson:planar",
"texture": {"u": 58, "v": 28},
"rotate": [84, 0, 0],
"pivot": [0, 6, 9],
"east": [0, -6, 0, 6, 12]
"rotate": [74, 0, 0],
"pivot": [0, 7, 7],
"east": [0, -6, 0, 7, 12, 56, 30, true, false]
},
"body": {
"cubes": [
@ -39,10 +38,81 @@
},
"jacket": {
"texture": { "u": 24, "v": 0 },
"visible": false,
"dilate": 0.25,
"cubes": [
{ "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": {
"implementation": "com.minelittlepony.client.model.part.SeaponyTail",

3
src/main/resources/assets/minelittlepony/models/entity/races/steve/unicorn.json
View file

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

1
src/main/resources/assets/minelittlepony/models/entity/races/steve/zebra.json
View file

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

20
src/main/resources/assets/minelittlepony/models/entity/steve_pony.json
View file

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