Skip to content

Commit ad102a0

Browse files

File tree

235 files changed

+9950
-9431
lines changed

Some content is hidden

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

235 files changed

+9950
-9431
lines changed

animation_controllers/creaking.animation_controllers.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
"states": {
3232
"attack": {
3333
"animations": [ "attack" ],
34-
"transitions": [ { "default": "!variable.attacking" } ]
34+
"transitions": [ { "default": "query.all_animations_finished" } ]
3535
},
3636
"default": {
37-
"transitions": [ { "attack": "variable.attacking && query.all_animations_finished" } ]
37+
"transitions": [ { "attack": "variable.attacking" } ]
3838
}
3939
}
4040
},

animation_controllers/nautilus.animation_controllers.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"format_version": "1.10.0",
33
"animation_controllers": {
4-
"controller.animation.nautilus.general" : {
5-
"initial_state" : "swimming",
6-
"states" : {
7-
"swimming" : {
4+
"controller.animation.nautilus.general": {
5+
"initial_state": "swimming",
6+
"states": {
7+
"swimming": {
88
"animations": [
99
{ "breathe": "math.min(1.0, math.lerp(0.75, 1.5, query.modified_move_speed))" },
10-
{ "swim": "math.min(1.0, math.lerp(0.0, 6.0, query.modified_move_speed))" },
11-
{ "look_at_target": "1.0" }
10+
{ "swim": "query.has_rider ? 0.0 : math.min(1.0, math.lerp(0.0, 6.0, query.modified_move_speed))" },
11+
"look_at_target"
1212
],
13-
"particle_effects" : [
13+
"particle_effects": [
1414
{
15-
"effect" : "bubbles",
15+
"effect": "bubbles",
1616
"locator": "bubble_particle_emitter"
1717
}
1818
]

animations/nautilus.animation.json

Lines changed: 96 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,98 @@
11
{
2-
"format_version": "1.8.0",
3-
"animations": {
4-
"animation.nautilus.breathe": {
5-
"loop": true,
6-
"animation_length": 1,
7-
"anim_time_update": "query.anim_time + math.pow(3, query.modified_move_speed) / 2 * query.delta_time",
8-
"bones": {
9-
"body": {
10-
"scale": {
11-
"0.0": [1, 1, 1],
12-
"0.5": [1, 1, 1.2],
13-
"0.75": [1, 1, 0.9],
14-
"0.875": [1, 1, 1],
15-
"1.0": [1, 1, 1]
16-
}
17-
},
18-
"mouth_top": {
19-
"rotation": {
20-
"0.0": [0, 0, 0],
21-
"0.5": [30, 0, 0],
22-
"0.75": [0, 0, 0],
23-
"0.875": [0, 0, 0],
24-
"1.0": [0, 0, 0]
25-
},
26-
"scale": {
27-
"0.0": [1, 1, 1],
28-
"0.5": [1, 1, 1.4],
29-
"0.75": [1, 1, 0.9],
30-
"0.875": [1, 1, 1],
31-
"1.0": [1, 1, 1]
32-
}
33-
},
34-
"inner_mouth": {
35-
"scale": {
36-
"0.0": [1, 1, 1],
37-
"0.5": [0.8, 0.8, 1],
38-
"0.75": [1, 1, 0.9],
39-
"0.875": [1, 1, 1],
40-
"1.0": [1, 1, 1]
41-
}
42-
},
43-
"mouth_bottom": {
44-
"rotation": {
45-
"0.0": [0, 0, 0],
46-
"0.5": [-30, 0, 0],
47-
"0.75": [0, 0, 0],
48-
"0.875": [0, 0, 0],
49-
"1.0": [0, 0, 0]
50-
},
51-
"scale": {
52-
"0.0": [1, 1, 1],
53-
"0.5": [1, 1, 1.4],
54-
"0.75": [1, 1, 0.9],
55-
"0.875": [1, 1, 1],
56-
"1.0": [1, 1, 1]
57-
}
58-
}
59-
}
60-
},
61-
"animation.nautilus.swim": {
62-
"loop": true,
63-
"animation_length": 1,
64-
"anim_time_update": "query.anim_time + math.pow(3, query.modified_move_speed) / 2 * query.delta_time",
65-
"bones": {
66-
"head": {
67-
"position": {
68-
"0.0": [0, 0, 0],
69-
"0.5": [0, 0, -1],
70-
"0.75": [0, 0, 0.5],
71-
"0.875": [0, 0, 0],
72-
"1.0": [0, 0, 0]
73-
}
74-
}
75-
}
76-
},
77-
"animation.nautilus.charge_warning": {
78-
"animation_length": 1,
79-
"bones": {
80-
"nautilus": {
81-
"rotation": {
82-
"0.0": [0, 0, 0],
83-
"0.375": [-32.5, 0, 0],
84-
"0.5833": [10, 0, 0],
85-
"0.6667": [0, 0, 0]
86-
}
87-
},
88-
"body": {
89-
"scale": {
90-
"0.0": [1, 1, 1],
91-
"0.375": [1, 1, 0.8],
92-
"0.5833": [1, 1, 1.3429],
93-
"0.6667": [1, 1, 1]
94-
}
95-
},
96-
"mouth_top": {
97-
"rotation": {
98-
"0.0": [0, 0, 0],
99-
"0.375": [-15, 0, 0],
100-
"0.6667": [0, 0, 0]
101-
},
102-
"scale": {
103-
"0.0": [1, 1, 1],
104-
"0.375": [1, 1, 0.7],
105-
"0.6667": [1, 1, 1]
106-
}
107-
},
108-
"inner_mouth": {
109-
"scale": {
110-
"0.0": [1, 1, 1],
111-
"0.375": [1, 1, 0.7],
112-
"0.6667": [1, 1, 1]
113-
}
114-
},
115-
"mouth_bottom": {
116-
"rotation": {
117-
"0.0": [0, 0, 0],
118-
"0.375": [15, 0, 0],
119-
"0.6667": [0, 0, 0]
120-
},
121-
"scale": {
122-
"0.0": [1, 1, 1],
123-
"0.375": [1, 1, 0.7],
124-
"0.6667": [1, 1, 1]
125-
}
126-
}
127-
}
128-
},
129-
"animation.nautilus.dashing": {
130-
"animation_length": 0.5,
131-
"loop": false,
132-
"sound_effects": {
133-
"0.0": {
134-
"effect": "dash"
135-
}
136-
}
137-
},
138-
"animation.nautilus.look_at_target": {
139-
"loop": true,
140-
"animation_length": 1,
141-
"bones": {
142-
"head": {
143-
"rotation": [ 0, "variable.yHeadRot", 0 ]
144-
},
145-
"body": {
146-
"rotation": [ "variable.xHeadRot", 0, 0 ]
147-
}
148-
}
149-
}
150-
}
2+
"format_version": "1.8.0",
3+
"animations": {
4+
"animation.nautilus.breathe": {
5+
"loop": true,
6+
"animation_length": 1,
7+
"anim_time_update": "query.anim_time + math.pow(3, query.modified_move_speed) / 2 * query.delta_time",
8+
"bones": {
9+
"body": {
10+
"scale": {
11+
"0.0": [ 1, 1, 1 ],
12+
"0.5": [ 1, 1, 1.2 ],
13+
"0.75": [ 1, 1, 0.9 ],
14+
"0.875": [ 1, 1, 1 ],
15+
"1.0": [ 1, 1, 1 ]
16+
}
17+
},
18+
"mouth_top": {
19+
"rotation": {
20+
"0.0": [ 0, 0, 0 ],
21+
"0.5": [ 30, 0, 0 ],
22+
"0.75": [ 0, 0, 0 ],
23+
"0.875": [ 0, 0, 0 ],
24+
"1.0": [ 0, 0, 0 ]
25+
},
26+
"scale": {
27+
"0.0": [ 1, 1, 1 ],
28+
"0.5": [ 1, 1, 1.4 ],
29+
"0.75": [ 1, 1, 0.9 ],
30+
"0.875": [ 1, 1, 1 ],
31+
"1.0": [ 1, 1, 1 ]
32+
}
33+
},
34+
"inner_mouth": {
35+
"scale": {
36+
"0.0": [ 1, 1, 1 ],
37+
"0.5": [ 0.8, 0.8, 1 ],
38+
"0.75": [ 1, 1, 0.9 ],
39+
"0.875": [ 1, 1, 1 ],
40+
"1.0": [ 1, 1, 1 ]
41+
}
42+
},
43+
"mouth_bottom": {
44+
"rotation": {
45+
"0.0": [ 0, 0, 0 ],
46+
"0.5": [ -30, 0, 0 ],
47+
"0.75": [ 0, 0, 0 ],
48+
"0.875": [ 0, 0, 0 ],
49+
"1.0": [ 0, 0, 0 ]
50+
},
51+
"scale": {
52+
"0.0": [ 1, 1, 1 ],
53+
"0.5": [ 1, 1, 1.4 ],
54+
"0.75": [ 1, 1, 0.9 ],
55+
"0.875": [ 1, 1, 1 ],
56+
"1.0": [ 1, 1, 1 ]
57+
}
58+
}
59+
}
60+
},
61+
"animation.nautilus.swim": {
62+
"loop": true,
63+
"animation_length": 1,
64+
"anim_time_update": "query.anim_time + math.pow(3, query.modified_move_speed) / 2 * query.delta_time",
65+
"bones": {
66+
"head": {
67+
"position": {
68+
"0.0": [ 0, 0, 0 ],
69+
"0.5": [ 0, 0, 2 ],
70+
"0.8125": [ 0, 0, 0 ],
71+
"1.0": [ 0, 0, 0 ]
72+
}
73+
}
74+
}
75+
},
76+
"animation.nautilus.dashing": {
77+
"animation_length": 0.5,
78+
"loop": false,
79+
"sound_effects": {
80+
"0.0": {
81+
"effect": "dash"
82+
}
83+
}
84+
},
85+
"animation.nautilus.look_at_target": {
86+
"loop": true,
87+
"animation_length": 1,
88+
"bones": {
89+
"head": {
90+
"rotation": [ 0, "variable.yHeadRot", 0 ]
91+
},
92+
"body": {
93+
"rotation": [ "variable.xHeadRot", 0, 0 ]
94+
}
95+
}
96+
}
97+
}
15198
}

animations/player_firstperson.animation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
},
2222
// Animates attachable items and the player arm if no item is equipped... or maybe not, as commenting this out doesn't seem to have any effect.
23-
"animation.player.first_person.attack_item_rotation": {
23+
"animation.player.first_person.attack_rotation_item": {
2424
"loop": true,
2525
"override_previous_animation": true,
2626
"bones": {

animations/spear.animation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"bones": {
1616
"spear": {
1717
"position": [ 0.0, 24.0, "-27.0 + c.owning_entity->v.tp_melee_spear_attack_attachable_position_z" ],
18-
"rotation": [ 0.0, 0.0, "c.owning_entity->v.tp_melee_spear_use_attachable_rotation_z" ]
18+
"rotation": [ 0.0, 0.0, "-c.owning_entity->v.tp_melee_spear_use_attachable_rotation_z" ]
1919
}
2020
}
2121
},

entity/husk.entity.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.10.0",
2+
"format_version": "1.26.0",
33
"minecraft:client_entity": {
44
"description": {
55
"identifier": "minecraft:husk",

entity/nautilus.entity.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@
2828
"breathe": "animation.nautilus.breathe",
2929
"swim": "animation.nautilus.swim",
3030
"look_at_target": "animation.nautilus.look_at_target",
31-
"charge_warning": "animation.nautilus.charge_warning",
3231
"dashing": "animation.nautilus.dashing",
3332
"sound_controller": "controller.animation.nautilus.sound",
34-
"general_controller": "controller.animation.nautilus.general",
35-
"attack_controller": "controller.animation.nautilus.attack"
33+
"general_controller": "controller.animation.nautilus.general"
3634
},
3735
"scripts": {
3836
"pre_animation": [

entity/piglin.entity.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.10.0",
2+
"format_version": "1.26.0",
33
"minecraft:client_entity": {
44
"description": {
55
"identifier": "minecraft:piglin",

entity/player.entity.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.10.0",
2+
"format_version": "1.26.0",
33
"minecraft:client_entity": {
44
"description": {
55
"identifier": "minecraft:player",

entity/zombie.entity.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"format_version": "1.10.0",
2+
"format_version": "1.26.0",
33
"minecraft:client_entity": {
44
"description": {
55
"identifier": "minecraft:zombie",

0 commit comments

Comments
 (0)