mirror of
https://github.com/MineLittlePony/MineLittlePony.git
synced 2025-02-13 16:24:23 +01:00
Adjust model files to more closely resemble what they look like in-game
This commit is contained in:
Sollace
parent
37804a883b
commit
2f2e21ee5b
14 changed files with 71 additions and 78 deletions
|
|
@ -61,7 +61,6 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
|
|||
public void setAngles(T entity, float move, float swing, float ticks, float headYaw, float headPitch) {
|
||||
attributes.checkRainboom(entity, swing, canFly(), ticks);
|
||||
PonyModelPrepareCallback.EVENT.invoker().onPonyModelPrepared(entity, this, ModelAttributes.Mode.OTHER);
|
||||
|
||||
super.setAngles(entity, move, swing, ticks, headYaw, headPitch);
|
||||
|
||||
rotateHead(headYaw, headPitch);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import com.minelittlepony.mson.api.ModelContext;
|
|||
import com.minelittlepony.mson.api.MsonModel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
|
@ -26,7 +25,7 @@ public class PonyTail implements IPart, MsonModel {
|
|||
private final List<Segment> segments = new ArrayList<>();
|
||||
|
||||
public PonyTail(ModelPart tree) {
|
||||
|
||||
tail = tree.getChild("tail");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -48,8 +47,6 @@ public class PonyTail implements IPart, MsonModel {
|
|||
} catch (InterruptedException | ExecutionException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
tail = new ModelPart(new ArrayList<>(), new HashMap<>());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -78,8 +75,6 @@ public class PonyTail implements IPart, MsonModel {
|
|||
tail.pivotY += 6;
|
||||
tail.pivotZ++;
|
||||
}
|
||||
|
||||
tailStop = theModel.getMetadata().getTail().ordinal();
|
||||
}
|
||||
|
||||
private void swingX(float ticks) {
|
||||
|
|
@ -96,6 +91,7 @@ public class PonyTail implements IPart, MsonModel {
|
|||
@Override
|
||||
public void setVisible(boolean visible) {
|
||||
tail.visible = visible;
|
||||
tailStop = theModel.getMetadata().getTail().ordinal();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
]
|
||||
},
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": 0.5 },
|
||||
{ "from": [-4, -8, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 0}, "dilate": -0.0125 },
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@
|
|||
"segments": 4
|
||||
},
|
||||
"data": {
|
||||
"tail": {
|
||||
"pivot": [0, 0, 14],
|
||||
"children": {
|
||||
"segment_0": {
|
||||
"type": "mson:slot",
|
||||
"name": "segment_0",
|
||||
|
|
@ -34,3 +37,5 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
},
|
||||
"data": {
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
|
||||
],
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
"parent": "minelittlepony:zombie",
|
||||
"data": {
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
|
||||
],
|
||||
|
|
@ -158,6 +157,8 @@
|
|||
"segments": 4
|
||||
},
|
||||
"data": {
|
||||
"tail": {
|
||||
"children": {
|
||||
"segment_0": {
|
||||
"type": "mson:slot",
|
||||
"name": "segment_0",
|
||||
|
|
@ -190,3 +191,5 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
"parent": "minelittlepony:steve_pony",
|
||||
"data": {
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
|
||||
],
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
"parent": "minelittlepony:races/steve/unicorn",
|
||||
"data": {
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
|
||||
],
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
"parent": "minelittlepony:races/steve/alicorn",
|
||||
"data": {
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
|
||||
],
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
"parent": "minelittlepony:steve_pony",
|
||||
"data": {
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
|
||||
],
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
"parent": "minelittlepony:steve_pony",
|
||||
"data": {
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
|
||||
],
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
"arm_x": 0,
|
||||
"arm_x_neg": ["#arm_x", "-", "#arm_width"],
|
||||
"arm_z": [2, "-", "#arm_depth"],
|
||||
"arm_rotation_x": 3,
|
||||
"arm_rotation_x": 0,
|
||||
"arm_rotation_x_neg": [0, "-", "#arm_rotation_x"],
|
||||
"arm_rotation_y": 8
|
||||
},
|
||||
|
|
@ -32,7 +32,6 @@
|
|||
},
|
||||
"data": {
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
|
||||
],
|
||||
|
|
@ -53,7 +52,7 @@
|
|||
},
|
||||
"hat": {
|
||||
"texture": { "u": 32, "v": 0 },
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"pivot": [ 0, 0, 0 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": 0.5 }
|
||||
]
|
||||
|
|
@ -270,7 +269,7 @@
|
|||
]
|
||||
},
|
||||
"right_leg": {
|
||||
"pivot": ["#arm_rotation_x_neg", 0, 0],
|
||||
"pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 11],
|
||||
"texture": { "u": 0, "v": 16 },
|
||||
"cubes": [
|
||||
{
|
||||
|
|
@ -280,7 +279,7 @@
|
|||
]
|
||||
},
|
||||
"left_leg": {
|
||||
"pivot": ["#arm_rotation_x", 0, 0],
|
||||
"pivot": ["#arm_rotation_x", "#arm_rotation_y", 11],
|
||||
"texture": { "u": 16, "v": 48 },
|
||||
"cubes": [
|
||||
{
|
||||
|
|
@ -312,7 +311,7 @@
|
|||
]
|
||||
},
|
||||
"right_pants": {
|
||||
"pivot": ["#arm_rotation_x_neg", 0, 0],
|
||||
"pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0],
|
||||
"texture": { "u": 0, "v": 32 },
|
||||
"cubes": [
|
||||
{
|
||||
|
|
@ -323,7 +322,7 @@
|
|||
]
|
||||
},
|
||||
"left_pants": {
|
||||
"pivot": ["#arm_rotation_x", 0, 0],
|
||||
"pivot": ["#arm_rotation_x", "#arm_rotation_y", 0],
|
||||
"texture": { "u": 0, "v": 48 },
|
||||
"cubes": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
},
|
||||
"data": {
|
||||
"body": {
|
||||
"pivot": [0, 0, 0],
|
||||
"cubes": [
|
||||
{"from": [-4, -4, -4], "size": [8, 5, 8] }
|
||||
],
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
"parent": "minelittlepony:races/steve/alicorn",
|
||||
"data": {
|
||||
"head": {
|
||||
"pivot": [ 0, 0, -2 ],
|
||||
"cubes": [
|
||||
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
|
||||
],
|
||||
|
|
|
|||
Loading…
Reference in a new issue