Skip to content

Commit b893d13

Browse files
KurojakiKaoruKurojakiKaoru
committed
Update v1.20.30
1 parent 97d2641 commit b893d13

File tree

158 files changed

+23681
-5714
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+23681
-5714
lines changed

‎animation_controllers/agent.animation_controllers.json‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,30 @@
77
"moving" : {
88
"animations" : [ "move" ],
99
"transitions" : [
10-
{
11-
"swinging_arms" : "variable.agent.swinganimationtick > 0"
12-
}
10+
{
11+
"swinging_arms": "variable.agent.anim_state == 2"
12+
},
13+
{
14+
"shrug": "variable.agent.anim_state == 3"
15+
}
1316
]
1417
},
15-
"swinging_arms" : {
16-
"animations" : [ "swing_arms" ],
17-
"transitions" : [
18-
{
19-
"moving" : "variable.agent.swinganimationtick <= 0"
20-
}
21-
]
22-
}
18+
"swinging_arms": {
19+
"animations": [ "swing_arms" ],
20+
"transitions": [
21+
{
22+
"moving": "variable.agent.anim_state == 1"
23+
}
24+
]
25+
},
26+
"shrug": {
27+
"animations": [ "shrug" ],
28+
"transitions": [
29+
{
30+
"moving": "variable.agent.anim_state == 1"
31+
}
32+
]
33+
}
2334
}
2435
}
2536
}

‎animation_controllers/camel.animation_controllers.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"blend_transition": 0.5
5555
},
5656
"dashing": {
57-
"animations": [ "dashing" ],
57+
"animations": [ "dashing", "dashing_sound" ],
5858
"transitions": [
5959
{ "idling": "(query.is_on_ground || query.is_in_water || query.is_riding) && !variable.moving" },
6060
{ "moving": "(query.is_on_ground || query.is_in_water || query.is_riding) && variable.moving" }

‎animation_controllers/humanoid.animation_controllers.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@
155155
"gliding" : "query.is_gliding"
156156
},
157157
{
158-
"swimming" : "query.is_swimming"
158+
"swimming" : "query.is_swimming || query.is_crawling"
159159
}
160160
]
161161
},
162162
"gliding" : {
163163
"animations" : [ "look_at_target_gliding" ],
164164
"transitions" : [
165165
{
166-
"swimming" : "query.is_swimming"
166+
"swimming" : "query.is_swimming || query.is_crawling"
167167
},
168168
{
169169
"default" : "!query.is_gliding"
@@ -177,7 +177,7 @@
177177
"gliding" : "query.is_gliding"
178178
},
179179
{
180-
"default" : "!query.is_swimming"
180+
"default" : "!query.is_swimming && !query.is_crawling"
181181
}
182182
]
183183
}

‎animation_controllers/player.animation_controllers.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,12 @@
213213
{
214214
"swimming.legs" : "variable.swim_amount > 0.0"
215215
},
216+
{
217+
"crawling" : "query.is_crawling"
218+
},
219+
{
220+
"crawling.legs" : "query.is_crawling"
221+
},
216222
{
217223
"use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 ) && !variable.is_brandishing_spear && !variable.is_holding_spyglass && !variable.is_tooting_goat_horn && !variable.is_using_brush && !query.is_item_name_any('slot.weapon.mainhand', 'minecraft:bow')"
218224
},

‎animations/agent.animation.json‎

Lines changed: 101 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,103 @@
11
{
2-
"format_version" : "1.8.0",
3-
"animations" : {
4-
"animation.agent.move" : {
5-
"loop" : true,
6-
"bones" : {
7-
"body" : {
8-
"position" : [ 0.0, "variable.agent.easein * (math.sin(query.life_time * 114.6 * variable.agent.movespeedscalar) + 1.0) * 1.12", 0.0 ]
9-
},
10-
"leftarm" : {
11-
"rotation" : [ "((-0.2 + 1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 - variable.agent.armxrotationfactor", 0.0, "-variable.agent.armzrotation" ]
12-
},
13-
"leftleg" : {
14-
"rotation" : [ "((-1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 + (variable.agent.ishovering * variable.agent.legxrotationfactor)", 0.0, 0.0 ]
15-
},
16-
"rightarm" : {
17-
"rotation" : [ "((-0.2 - 1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 + variable.agent.armxrotationfactor", 0.0, "variable.agent.armzrotation" ]
18-
},
19-
"rightleg" : {
20-
"rotation" : [ "((1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 - (variable.agent.ishovering * variable.agent.legxrotationfactor)", 0.0, 0.0 ]
21-
}
22-
}
23-
},
24-
"animation.agent.swing_arms" : {
25-
"loop" : true,
26-
"bones" : {
27-
"rightarm" : {
28-
"rotation" : [ "(-2.0 + 1.5 * (math.abs(math.mod(variable.agent.swinganimationtick - query.frame_alpha, variable.agent.swinganimationduration) - variable.agent.swinganimationduration * 0.5) - variable.agent.swinganimationduration * 0.25) / (variable.agent.swinganimationduration * 0.25)) * 57.3", 0.0, 0.0 ]
29-
}
30-
}
31-
}
32-
}
2+
"format_version": "1.8.0",
3+
"animations": {
4+
"animation.agent.move": {
5+
"loop": true,
6+
"bones": {
7+
"body": {
8+
"position": [ 0, "variable.agent.easein * (math.sin(query.life_time * 114.6 * variable.agent.movespeedscalar) + 1.0) * 1.12", 0 ]
9+
},
10+
"leftArm": {
11+
"rotation": [
12+
"((-0.2 + 1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 - variable.agent.armxrotationfactor",
13+
0,
14+
"-variable.agent.armzrotation"
15+
]
16+
},
17+
"leftLeg": {
18+
"rotation": [
19+
"((-1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 + (variable.agent.ishovering * variable.agent.legxrotationfactor)",
20+
0,
21+
0
22+
]
23+
},
24+
"rightArm": {
25+
"rotation": [
26+
"((-0.2 - 1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 + variable.agent.armxrotationfactor",
27+
0,
28+
"variable.agent.armzrotation"
29+
]
30+
},
31+
"rightLeg": {
32+
"rotation": [
33+
"((1.5 * (math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 3.25) * query.modified_move_speed) * 57.3 - (variable.agent.ishovering * variable.agent.legxrotationfactor)",
34+
0,
35+
0
36+
]
37+
}
38+
}
39+
},
40+
"animation.agent.swing_arms": {
41+
"loop": true,
42+
"animation_length": 1.5,
43+
"bones": {
44+
"rightArm": {
45+
"rotation": [
46+
"(-2.0 + 1.5 * (math.abs(math.mod(variable.agent.swinganimationtick - query.frame_alpha, variable.agent.swinganimationduration) - variable.agent.swinganimationduration * 0.5) - variable.agent.swinganimationduration * 0.25) / (variable.agent.swinganimationduration * 0.25)) * 57.3",
47+
0,
48+
0
49+
]
50+
}
51+
}
52+
},
53+
"animation.agent.shrug": {
54+
"animation_length": 1.5,
55+
"bones": {
56+
"head": {
57+
"rotation": {
58+
"0.3333": [ 0, 0, 0 ],
59+
"0.5833": [ 0, 0, 0 ],
60+
"0.8333": [ 0, 72.5, 0 ],
61+
"1.0417": [ 0, 0, 0 ],
62+
"1.2917": [ 0, -62.5, 0 ],
63+
"1.5": [ 0, 0, 0 ]
64+
},
65+
"position": {
66+
"0.0": [ 0, 0, 0 ],
67+
"0.125": [ 0, 0, 0 ]
68+
}
69+
},
70+
"leftArm": {
71+
"rotation": {
72+
"0.0": [ 0, 0, 0 ],
73+
"0.25": [ -64.03195, -33.38529, 26.32435 ],
74+
"0.625": [ 0, 0, 0 ],
75+
"0.75": [ 0, 0, 0 ],
76+
"0.9583": [ 0, 0, -10 ],
77+
"1.1667": [ 0, 0, 0 ]
78+
},
79+
"position": {
80+
"0.75": [ 0, 0, 0 ],
81+
"0.9583": [ 0, 1, 0 ],
82+
"1.1667": [ 0, 0, 0 ]
83+
}
84+
},
85+
"rightArm": {
86+
"rotation": {
87+
"0.0": [ 0, 0, 0 ],
88+
"0.25": [ -58.25703, 25.73828, -15.06695 ],
89+
"0.625": [ 0, 0, 0 ],
90+
"0.75": [ 0, 0, 0 ],
91+
"0.9583": [ 0, 0, 10 ],
92+
"1.1667": [ 0, 0, 0 ]
93+
},
94+
"position": {
95+
"0.75": [ 0, 0, 0 ],
96+
"0.9583": [ 0, 1, 0 ],
97+
"1.1667": [ 0, 0, 0 ]
98+
}
99+
}
100+
}
101+
}
102+
}
33103
}

‎animations/armor_stand.animation.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
"rotation" : [ "-this + 246", "-this", "-this + 89" ]
255255
},
256256
"rightitem" : {
257-
"rotation" : [ "-this", "-this + 180", "-this" ]
257+
"rotation" : [ "-this", "query.get_equipped_item_name == 'shield' ? -this + 90 : -this + 180", "-this" ]
258258
},
259259
"rightleg" : {
260260
"rotation" : [ "-this + 8", "-this + 20", "-this + 4" ]

‎animations/camel.animation.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,10 +560,14 @@
560560
"0.5": [ 0, 67.5, 0 ]
561561
}
562562
}
563-
},
563+
}
564+
},
565+
"animation.camel.dash_sound": {
566+
"animation_length": 0.5,
567+
"loop": false,
564568
"sound_effects": {
565569
"0.0": {
566-
"effect": "dashing"
570+
"effect": "dash"
567571
}
568572
}
569573
},

‎animations/player.animation.json‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403
}
404404
},
405405
"root" : {
406-
"position" : [ 0.0, "(math.sin(query.target_x_rotation) * 24.0 + 3.0) * variable.swim_amount", "(math.cos(query.target_x_rotation) * 24.0 + 9.0) * variable.swim_amount" ],
406+
"position" : [ 0.0, "(math.sin(query.target_x_rotation) * 17.0 + 5.0) * variable.swim_amount", "(math.cos(query.target_x_rotation) * 17.0) * variable.swim_amount" ],
407407
"rotation" : [ "variable.swim_amount * (90 + query.target_x_rotation)", 0.0, 0.0 ]
408408
}
409409
}
@@ -442,6 +442,46 @@
442442
"rotation" : [ 0.0, 0.1, 0.1 ]
443443
}
444444
}
445+
},
446+
"animation.player.crawl" : {
447+
"anim_time_update": "query.modified_distance_moved / 15.0",
448+
"animation_length" : 1.3,
449+
"loop" : true,
450+
"override_previous_animation" : true,
451+
"bones" : {
452+
"leftarm" : {
453+
"rotation" : {
454+
"0" : [ 0.0, 180.0, 180.0 ],
455+
"0.7" : [ 0.0, 180.0, 287.2 ],
456+
"1.1" : [ 90.0, 180.0, 180.0 ],
457+
"1.3" : [ 0.0, 180.0, 180.0 ]
458+
}
459+
},
460+
"rightarm" : {
461+
"rotation" : {
462+
"0" : [ 0.0, 180.0, -180.0 ],
463+
"0.7" : [ 0.0, 180.0, -287.2 ],
464+
"1.1" : [ 90.0, 180.0, -180.0 ],
465+
"1.3" : [ 0.0, 180.0, -180.0 ]
466+
}
467+
},
468+
"root" : {
469+
"position" : [ 0.0, "5.0 * variable.swim_amount", "17.0 * variable.swim_amount" ],
470+
"rotation" : [ "variable.swim_amount * 90", 0.0, 0.0 ]
471+
}
472+
}
473+
},
474+
"animation.player.crawl.legs" : {
475+
"loop" : true,
476+
"override_previous_animation" : true,
477+
"bones" : {
478+
"leftleg" : {
479+
"rotation" : [ "math.lerp(0.0, math.cos(query.modified_distance_moved * 30.0 + 180.0) * 17.2, variable.swim_amount)", -0.1, -0.1 ]
480+
},
481+
"rightleg" : {
482+
"rotation" : [ "math.lerp(0.0, math.cos(query.modified_distance_moved * 30.0) * 17.2, variable.swim_amount)", 0.1, 0.1 ]
483+
}
484+
}
445485
}
446486
}
447487
}

0 commit comments

Comments
 (0)