翻新先辈

This commit is contained in:
Atsuishio 2025-04-19 02:30:27 +08:00 committed by Light_Quanta
parent 8f3c43b220
commit 036c7d866a
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
4 changed files with 571 additions and 541 deletions

View file

@ -139,7 +139,7 @@ public class SenpaiEntity extends Monster implements GeoEntity {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.senpai.die")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.senpai.die"));
} }
if (this.isAggressive() && event.isMoving()) { if (this.isAggressive() && event.isMoving()) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.senpai.run")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.senpai.run2"));
} }
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.senpai.idle")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.senpai.idle"));
} }

View file

@ -6,7 +6,7 @@
"identifier": "geometry.ChiramIdolChestplateModel", "identifier": "geometry.ChiramIdolChestplateModel",
"texture_width": 64, "texture_width": 64,
"texture_height": 64, "texture_height": 64,
"visible_bounds_width": 4, "visible_bounds_width": 6,
"visible_bounds_height": 4.5, "visible_bounds_height": 4.5,
"visible_bounds_offset": [0, 1.75, 0] "visible_bounds_offset": [0, 1.75, 0]
}, },
@ -64,27 +64,46 @@
"pivot": [-5, 22, 0], "pivot": [-5, 22, 0],
"cubes": [ "cubes": [
{ {
"origin": [-8, 12.25, -2], "origin": [-8, 18, -2],
"size": [4, 7.75, 4], "size": [4, 2, 4],
"uv": { "uv": {
"north": {"uv": [26, 0], "uv_size": [4.5, 8]}, "north": {"uv": [26, 6], "uv_size": [4, 2]},
"east": {"uv": [26, 26], "uv_size": [4, 8]}, "east": {"uv": [4, 44], "uv_size": [4, 2]},
"south": {"uv": [26, 18], "uv_size": [4.5, 8]}, "south": {"uv": [44, 16], "uv_size": [4, 2]},
"west": {"uv": [0, 28], "uv_size": [4, 8]}, "west": {"uv": [44, 18], "uv_size": [4, 2]},
"up": {"uv": [18, 8], "uv_size": [4.5, 4]}, "up": {"uv": [36, 41], "uv_size": [4, 4]},
"down": {"uv": [39, 28], "uv_size": [4.5, -4]} "down": {"uv": [41, 42], "uv_size": [4, -4]}
} }
}, },
{ {
"origin": [-8.25, 20, -2.25], "origin": [-8.25, 20, -2.25],
"size": [4.25, 4, 4.5], "size": [4.25, 4, 4.5],
"uv": { "uv": {
"north": {"uv": [43, 12], "uv_size": [4, 4]}, "north": {"uv": [18, 8], "uv_size": [4.5, 4]},
"east": {"uv": [40, 35], "uv_size": [4.5, 4]}, "east": {"uv": [39, 26], "uv_size": [4.5, 4]},
"south": {"uv": [16, 43], "uv_size": [4, 4]}, "south": {"uv": [39, 30], "uv_size": [4.5, 4]},
"west": {"uv": [40, 39], "uv_size": [4.5, 4]}, "west": {"uv": [0, 40], "uv_size": [4.5, 4]},
"up": {"uv": [35, 41], "uv_size": [4, 4.5]}, "up": {"uv": [31, 36], "uv_size": [4.5, 4.5]},
"down": {"uv": [0, 46.5], "uv_size": [4, -4.5]} "down": {"uv": [36, 40.5], "uv_size": [4.5, -4.5]}
}
}
]
},
{
"name": "right_arm2",
"parent": "right_arm",
"pivot": [-6, 18, 2],
"cubes": [
{
"origin": [-8, 12, -2],
"size": [4, 6, 4],
"uv": {
"north": {"uv": [35, 30], "uv_size": [4, 6]},
"east": {"uv": [36, 0], "uv_size": [4, 6]},
"south": {"uv": [23, 36], "uv_size": [4, 6]},
"west": {"uv": [27, 36], "uv_size": [4, 6]},
"up": {"uv": [18, 43], "uv_size": [4, 4]},
"down": {"uv": [0, 48], "uv_size": [4, -4]}
} }
} }
] ]
@ -95,15 +114,15 @@
"pivot": [5, 22, 0], "pivot": [5, 22, 0],
"cubes": [ "cubes": [
{ {
"origin": [4, 12, -2], "origin": [4, 18, -2],
"size": [4, 8, 4], "size": [4, 2, 4],
"uv": { "uv": {
"north": {"uv": [4, 28], "uv_size": [4, 8]}, "north": {"uv": [44, 20], "uv_size": [4, 2]},
"east": {"uv": [8, 28], "uv_size": [4, 8]}, "east": {"uv": [44, 22], "uv_size": [4, 2]},
"south": {"uv": [12, 28], "uv_size": [4, 8]}, "south": {"uv": [44, 24], "uv_size": [4, 2]},
"west": {"uv": [30, 26], "uv_size": [4, 8]}, "west": {"uv": [44, 26], "uv_size": [4, 2]},
"up": {"uv": [43, 4], "uv_size": [4, 4]}, "up": {"uv": [42, 4], "uv_size": [4, 4]},
"down": {"uv": [43, 12], "uv_size": [4, -4]} "down": {"uv": [42, 12], "uv_size": [4, -4]}
} }
}, },
{ {
@ -111,11 +130,30 @@
"size": [4.25, 4, 4.5], "size": [4.25, 4, 4.5],
"uv": { "uv": {
"north": {"uv": [40, 0], "uv_size": [4.5, 4]}, "north": {"uv": [40, 0], "uv_size": [4.5, 4]},
"east": {"uv": [40, 16], "uv_size": [4.5, 4]}, "east": {"uv": [5, 40], "uv_size": [4.5, 4]},
"south": {"uv": [40, 20], "uv_size": [4.5, 4]}, "south": {"uv": [31, 41], "uv_size": [4.5, 4]},
"west": {"uv": [26, 40], "uv_size": [4.5, 4]}, "west": {"uv": [41, 34], "uv_size": [4.5, 4]},
"up": {"uv": [21, 38], "uv_size": [4.5, 4.5]}, "up": {"uv": [37, 6], "uv_size": [4.5, 4.5]},
"down": {"uv": [38, 34.5], "uv_size": [4.5, -4.5]} "down": {"uv": [37, 15.5], "uv_size": [4.5, -4.5]}
}
}
]
},
{
"name": "left_arm2",
"parent": "left_arm",
"pivot": [6, 18, 2],
"cubes": [
{
"origin": [4, 12, -2],
"size": [4, 6, 4],
"uv": {
"north": {"uv": [4, 34], "uv_size": [4, 6]},
"east": {"uv": [8, 34], "uv_size": [4, 6]},
"south": {"uv": [35, 18], "uv_size": [4, 6]},
"west": {"uv": [35, 24], "uv_size": [4, 6]},
"up": {"uv": [10, 43], "uv_size": [4, 4]},
"down": {"uv": [14, 47], "uv_size": [4, -4]}
} }
} }
] ]
@ -130,28 +168,35 @@
"parent": "lower", "parent": "lower",
"pivot": [-1.9, 12, 0], "pivot": [-1.9, 12, 0],
"cubes": [ "cubes": [
{
"origin": [-4, 0, -2],
"size": [4, 6, 4],
"uv": {
"north": {"uv": [34, 30], "uv_size": [4, 6]},
"east": {"uv": [0, 36], "uv_size": [4, 6]},
"south": {"uv": [36, 0], "uv_size": [4, 6]},
"west": {"uv": [4, 36], "uv_size": [4, 6]},
"up": {"uv": [4, 42], "uv_size": [4, 4]},
"down": {"uv": [8, 46], "uv_size": [4, -4]}
}
},
{ {
"origin": [-4.25, 6, -2.25], "origin": [-4.25, 6, -2.25],
"size": [4.5, 6, 4.5], "size": [4.5, 6, 4.5],
"uv": { "uv": {
"north": {"uv": [33, 6], "uv_size": [4.5, 6]}, "north": {"uv": [26, 0], "uv_size": [4.5, 6]},
"east": {"uv": [33, 12], "uv_size": [4.5, 6]}, "east": {"uv": [26, 18], "uv_size": [4.5, 6]},
"south": {"uv": [34, 24], "uv_size": [4.5, 6]}, "south": {"uv": [26, 24], "uv_size": [4.5, 6]},
"west": {"uv": [26, 34], "uv_size": [4.5, 6]}, "west": {"uv": [0, 28], "uv_size": [4.5, 6]},
"up": {"uv": [38, 11], "uv_size": [4.5, 4.5]}, "up": {"uv": [12, 38], "uv_size": [4.5, 4.5]},
"down": {"uv": [16, 42.5], "uv_size": [4.5, -4.5]} "down": {"uv": [17, 42.5], "uv_size": [4.5, -4.5]}
}
}
]
},
{
"name": "rightleg2",
"parent": "rightleg",
"pivot": [-2, 6, -2],
"cubes": [
{
"origin": [-4, 0, -2],
"size": [4, 6, 4],
"uv": {
"north": {"uv": [31, 18], "uv_size": [4, 6]},
"east": {"uv": [31, 24], "uv_size": [4, 6]},
"south": {"uv": [31, 30], "uv_size": [4, 6]},
"west": {"uv": [15, 32], "uv_size": [4, 6]},
"up": {"uv": [42, 12], "uv_size": [4, 4]},
"down": {"uv": [22, 46], "uv_size": [4, -4]}
} }
} }
] ]
@ -161,28 +206,35 @@
"parent": "lower", "parent": "lower",
"pivot": [1.9, 12, 0], "pivot": [1.9, 12, 0],
"cubes": [ "cubes": [
{
"origin": [0, 0, -2],
"size": [4, 6, 4],
"uv": {
"north": {"uv": [8, 36], "uv_size": [4, 6]},
"east": {"uv": [12, 36], "uv_size": [4, 6]},
"south": {"uv": [36, 18], "uv_size": [4, 6]},
"west": {"uv": [31, 36], "uv_size": [4, 6]},
"up": {"uv": [12, 42], "uv_size": [4, 4]},
"down": {"uv": [31, 46], "uv_size": [4, -4]}
}
},
{ {
"origin": [-0.25, 6, -2.25], "origin": [-0.25, 6, -2.25],
"size": [4.5, 6, 4.5], "size": [4.5, 6, 4.5],
"uv": { "uv": {
"north": {"uv": [31, 0], "uv_size": [4.5, 6]}, "north": {"uv": [5, 28], "uv_size": [4.5, 6]},
"east": {"uv": [31, 18], "uv_size": [4.5, 6]}, "east": {"uv": [10, 28], "uv_size": [4.5, 6]},
"south": {"uv": [16, 32], "uv_size": [4.5, 6]}, "south": {"uv": [26, 30], "uv_size": [4.5, 6]},
"west": {"uv": [21, 32], "uv_size": [4.5, 6]}, "west": {"uv": [31, 0], "uv_size": [4.5, 6]},
"up": {"uv": [35, 36], "uv_size": [4.5, 4.5]}, "up": {"uv": [39, 16], "uv_size": [4.5, 4.5]},
"down": {"uv": [38, 10.5], "uv_size": [4.5, -4.5]} "down": {"uv": [39, 25.5], "uv_size": [4.5, -4.5]}
}
}
]
},
{
"name": "leftleg2",
"parent": "leftleg",
"pivot": [2, 6, -2],
"cubes": [
{
"origin": [0, 0, -2],
"size": [4, 6, 4],
"uv": {
"north": {"uv": [19, 32], "uv_size": [4, 6]},
"east": {"uv": [33, 6], "uv_size": [4, 6]},
"south": {"uv": [33, 12], "uv_size": [4, 6]},
"west": {"uv": [0, 34], "uv_size": [4, 6]},
"up": {"uv": [26, 42], "uv_size": [4, 4]},
"down": {"uv": [40, 46], "uv_size": [4, -4]}
} }
} }
] ]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB