PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Adjust model files to more closely resemble what they look like in-game

Browse source
This commit is contained in:
Sollace 2022-06-27 17:28:39 +02:00
parent 37804a883b
commit 2f2e21ee5b
14 changed files with 71 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
View file

@ -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) { public void setAngles(T entity, float move, float swing, float ticks, float headYaw, float headPitch) {
attributes.checkRainboom(entity, swing, canFly(), ticks); attributes.checkRainboom(entity, swing, canFly(), ticks);
PonyModelPrepareCallback.EVENT.invoker().onPonyModelPrepared(entity, this, ModelAttributes.Mode.OTHER); PonyModelPrepareCallback.EVENT.invoker().onPonyModelPrepared(entity, this, ModelAttributes.Mode.OTHER);
super.setAngles(entity, move, swing, ticks, headYaw, headPitch); super.setAngles(entity, move, swing, ticks, headYaw, headPitch);
rotateHead(headYaw, headPitch); rotateHead(headYaw, headPitch);

8
src/main/java/com/minelittlepony/client/model/part/PonyTail.java
View file

@ -11,7 +11,6 @@ import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.mson.api.MsonModel; import com.minelittlepony.mson.api.MsonModel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -26,7 +25,7 @@ public class PonyTail implements IPart, MsonModel {
private final List<Segment> segments = new ArrayList<>(); private final List<Segment> segments = new ArrayList<>();
public PonyTail(ModelPart tree) { public PonyTail(ModelPart tree) {
tail = tree.getChild("tail");
} }
@Override @Override
@ -48,8 +47,6 @@ public class PonyTail implements IPart, MsonModel {
} catch (InterruptedException | ExecutionException e) { } catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
tail = new ModelPart(new ArrayList<>(), new HashMap<>());
} }
@Override @Override
@ -78,8 +75,6 @@ public class PonyTail implements IPart, MsonModel {
tail.pivotY += 6; tail.pivotY += 6;
tail.pivotZ++; tail.pivotZ++;
} }
tailStop = theModel.getMetadata().getTail().ordinal();
} }
private void swingX(float ticks) { private void swingX(float ticks) {
@ -96,6 +91,7 @@ public class PonyTail implements IPart, MsonModel {
@Override @Override
public void setVisible(boolean visible) { public void setVisible(boolean visible) {
tail.visible = visible; tail.visible = visible;
tailStop = theModel.getMetadata().getTail().ordinal();
} }
@Override @Override

1
src/main/resources/assets/minelittlepony/models/armour_inner.json
View file

@ -10,7 +10,6 @@
] ]
}, },
"head": { "head": {
"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 },
{ "from": [-4, -8, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 0}, "dilate": -0.0125 }, { "from": [-4, -8, -1], "size": [ 2, 2, 2], "texture": {"u": 0, "v": 0}, "dilate": -0.0125 },

59
src/main/resources/assets/minelittlepony/models/components/tail.json
View file

@ -4,33 +4,38 @@
"segments": 4 "segments": 4
}, },
"data": { "data": {
"segment_0": { "tail": {
"type": "mson:slot", "pivot": [0, 0, 14],
"name": "segment_0", "children": {
"implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", "segment_0": {
"locals": { "segment_index": 0 }, "type": "mson:slot",
"data": "minelittlepony:components/tail_segment" "name": "segment_0",
}, "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment",
"segment_1": { "locals": { "segment_index": 0 },
"type": "mson:slot", "data": "minelittlepony:components/tail_segment"
"name": "segment_1", },
"implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", "segment_1": {
"locals": { "segment_index": 1 }, "type": "mson:slot",
"data": "minelittlepony:components/tail_segment" "name": "segment_1",
}, "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment",
"segment_2": { "locals": { "segment_index": 1 },
"type": "mson:slot", "data": "minelittlepony:components/tail_segment"
"name": "segment_2", },
"implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", "segment_2": {
"locals": { "segment_index": 2 }, "type": "mson:slot",
"data": "minelittlepony:components/tail_segment" "name": "segment_2",
}, "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment",
"segment_3": { "locals": { "segment_index": 2 },
"type": "mson:slot", "data": "minelittlepony:components/tail_segment"
"name": "segment_3", },
"implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", "segment_3": {
"locals": { "segment_index": 3 }, "type": "mson:slot",
"data": "minelittlepony:components/tail_segment" "name": "segment_3",
"implementation": "com.minelittlepony.client.model.part.PonyTail$Segment",
"locals": { "segment_index": 3 },
"data": "minelittlepony:components/tail_segment"
}
}
} }
} }
} }

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

@ -7,7 +7,6 @@
}, },
"data": { "data": {
"head": { "head": {
"pivot": [ 0, 0, -2 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] } { "from": [-4, -6, -6], "size": [ 8, 8, 8] }
], ],

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

@ -3,7 +3,6 @@
"parent": "minelittlepony:zombie", "parent": "minelittlepony:zombie",
"data": { "data": {
"head": { "head": {
"pivot": [ 0, 0, -2 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] } { "from": [-4, -6, -6], "size": [ 8, 8, 8] }
], ],
@ -158,33 +157,37 @@
"segments": 4 "segments": 4
}, },
"data": { "data": {
"segment_0": { "tail": {
"type": "mson:slot", "children": {
"name": "segment_0", "segment_0": {
"implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", "type": "mson:slot",
"locals": { "segment_index": 0 }, "name": "segment_0",
"data": "minelittlepony:components/tail_segment" "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment",
}, "locals": { "segment_index": 0 },
"segment_1": { "data": "minelittlepony:components/tail_segment"
"type": "mson:slot", },
"name": "segment_1", "segment_1": {
"implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", "type": "mson:slot",
"locals": { "segment_index": 1 }, "name": "segment_1",
"data": "minelittlepony:components/tail_segment" "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment",
}, "locals": { "segment_index": 1 },
"segment_2": { "data": "minelittlepony:components/tail_segment"
"type": "mson:slot", },
"name": "segment_2", "segment_2": {
"implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", "type": "mson:slot",
"locals": { "segment_index": 2 }, "name": "segment_2",
"data": "minelittlepony:components/tail_segment" "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment",
}, "locals": { "segment_index": 2 },
"segment_3": { "data": "minelittlepony:components/tail_segment"
"type": "mson:slot", },
"name": "segment_3", "segment_3": {
"implementation": "com.minelittlepony.client.model.part.PonyTail$Segment", "type": "mson:slot",
"locals": { "segment_index": 3 }, "name": "segment_3",
"data": "minelittlepony:components/tail_segment" "implementation": "com.minelittlepony.client.model.part.PonyTail$Segment",
"locals": { "segment_index": 3 },
"data": "minelittlepony:components/tail_segment"
}
}
} }
} }
} }

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

@ -2,7 +2,6 @@
"parent": "minelittlepony:steve_pony", "parent": "minelittlepony:steve_pony",
"data": { "data": {
"head": { "head": {
"pivot": [ 0, 0, -2 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] } { "from": [-4, -6, -6], "size": [ 8, 8, 8] }
], ],

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

@ -2,7 +2,6 @@
"parent": "minelittlepony:races/steve/unicorn", "parent": "minelittlepony:races/steve/unicorn",
"data": { "data": {
"head": { "head": {
"pivot": [ 0, 0, -2 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] } { "from": [-4, -6, -6], "size": [ 8, 8, 8] }
], ],

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

@ -2,7 +2,6 @@
"parent": "minelittlepony:races/steve/alicorn", "parent": "minelittlepony:races/steve/alicorn",
"data": { "data": {
"head": { "head": {
"pivot": [ 0, 0, -2 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] } { "from": [-4, -6, -6], "size": [ 8, 8, 8] }
], ],

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

@ -2,7 +2,6 @@
"parent": "minelittlepony:steve_pony", "parent": "minelittlepony:steve_pony",
"data": { "data": {
"head": { "head": {
"pivot": [ 0, 0, -2 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] } { "from": [-4, -6, -6], "size": [ 8, 8, 8] }
], ],

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

@ -2,7 +2,6 @@
"parent": "minelittlepony:steve_pony", "parent": "minelittlepony:steve_pony",
"data": { "data": {
"head": { "head": {
"pivot": [ 0, 0, -2 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] } { "from": [-4, -6, -6], "size": [ 8, 8, 8] }
], ],

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

@ -10,7 +10,7 @@
"arm_x": 0, "arm_x": 0,
"arm_x_neg": ["#arm_x", "-", "#arm_width"], "arm_x_neg": ["#arm_x", "-", "#arm_width"],
"arm_z": [2, "-", "#arm_depth"], "arm_z": [2, "-", "#arm_depth"],
"arm_rotation_x": 3, "arm_rotation_x": 0,
"arm_rotation_x_neg": [0, "-", "#arm_rotation_x"], "arm_rotation_x_neg": [0, "-", "#arm_rotation_x"],
"arm_rotation_y": 8 "arm_rotation_y": 8
}, },
@ -32,7 +32,6 @@
}, },
"data": { "data": {
"head": { "head": {
"pivot": [ 0, 0, -2 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] } { "from": [-4, -6, -6], "size": [ 8, 8, 8] }
], ],
@ -53,7 +52,7 @@
}, },
"hat": { "hat": {
"texture": { "u": 32, "v": 0 }, "texture": { "u": 32, "v": 0 },
"pivot": [ 0, 0, -2 ], "pivot": [ 0, 0, 0 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": 0.5 } { "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": 0.5 }
] ]
@ -270,7 +269,7 @@
] ]
}, },
"right_leg": { "right_leg": {
"pivot": ["#arm_rotation_x_neg", 0, 0], "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 11],
"texture": { "u": 0, "v": 16 }, "texture": { "u": 0, "v": 16 },
"cubes": [ "cubes": [
{ {
@ -280,7 +279,7 @@
] ]
}, },
"left_leg": { "left_leg": {
"pivot": ["#arm_rotation_x", 0, 0], "pivot": ["#arm_rotation_x", "#arm_rotation_y", 11],
"texture": { "u": 16, "v": 48 }, "texture": { "u": 16, "v": 48 },
"cubes": [ "cubes": [
{ {
@ -312,7 +311,7 @@
] ]
}, },
"right_pants": { "right_pants": {
"pivot": ["#arm_rotation_x_neg", 0, 0], "pivot": ["#arm_rotation_x_neg", "#arm_rotation_y", 0],
"texture": { "u": 0, "v": 32 }, "texture": { "u": 0, "v": 32 },
"cubes": [ "cubes": [
{ {
@ -323,7 +322,7 @@
] ]
}, },
"left_pants": { "left_pants": {
"pivot": ["#arm_rotation_x", 0, 0], "pivot": ["#arm_rotation_x", "#arm_rotation_y", 0],
"texture": { "u": 0, "v": 48 }, "texture": { "u": 0, "v": 48 },
"cubes": [ "cubes": [
{ {

1
src/main/resources/assets/minelittlepony/models/vex.json
View file

@ -4,7 +4,6 @@
}, },
"data": { "data": {
"body": { "body": {
"pivot": [0, 0, 0],
"cubes": [ "cubes": [
{"from": [-4, -4, -4], "size": [8, 5, 8] } {"from": [-4, -4, -4], "size": [8, 5, 8] }
], ],

1
src/main/resources/assets/minelittlepony/models/villager.json
View file

@ -2,7 +2,6 @@
"parent": "minelittlepony:races/steve/alicorn", "parent": "minelittlepony:races/steve/alicorn",
"data": { "data": {
"head": { "head": {
"pivot": [ 0, 0, -2 ],
"cubes": [ "cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] } { "from": [-4, -6, -6], "size": [ 8, 8, 8] }
], ],