Skip to content

Commit 97d2641

Browse files
KurojakiKaoruKurojakiKaoru
committed
Update v1.20.0
The cameras directory was readded with the additional experimental free camera
1 parent fbd4a57 commit 97d2641

File tree

731 files changed

+20753
-3252
lines changed

Some content is hidden

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

731 files changed

+20753
-3252
lines changed

‎animation_controllers/camel.animation_controllers.json‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"format_version": "1.10.0",
3+
"animation_controllers": {
4+
"controller.animation.camel.general": {
5+
"initial_state": "default",
6+
"states": {
7+
"default": {
8+
"transitions": [
9+
{ "idling": "!query.is_sitting" },
10+
{ "sitting": "query.is_sitting" }
11+
],
12+
"blend_transition": 0.0
13+
},
14+
"idling": {
15+
"transitions": [
16+
{ "moving": "variable.moving" },
17+
{ "sit_down": "query.is_sitting" },
18+
{ "dashing": "query.has_dash_cooldown && !query.is_on_ground && !query.is_in_water && !query.is_riding" }
19+
],
20+
"blend_transition": 0.5
21+
},
22+
"moving": {
23+
"animations": [
24+
{ "moving": "math.min(1.0, math.lerp(0.2, 1.5, query.modified_move_speed))" }
25+
],
26+
"transitions": [
27+
{ "idling": "!variable.moving" },
28+
{ "sit_down": "query.is_sitting" },
29+
{ "dashing": "query.has_dash_cooldown && !query.is_on_ground && !query.is_in_water && !query.is_riding" }
30+
],
31+
"blend_transition": 0.2
32+
},
33+
"sitting": {
34+
"animations": [ "sitting" ],
35+
"transitions": [
36+
{ "stand_up": "!query.is_sitting" }
37+
],
38+
"blend_transition": 0.5
39+
},
40+
"sit_down": {
41+
"animations": [ "sit_down" ],
42+
"transitions": [
43+
{ "stand_up": "!query.is_sitting" }
44+
],
45+
"blend_transition": 0.5
46+
},
47+
"stand_up": {
48+
"animations": [ "stand_up" ],
49+
"transitions": [
50+
{ "sit_down": "query.is_sitting" },
51+
{ "idling": "query.all_animations_finished" },
52+
{ "moving": "variable.moving" }
53+
],
54+
"blend_transition": 0.5
55+
},
56+
"dashing": {
57+
"animations": [ "dashing" ],
58+
"transitions": [
59+
{ "idling": "(query.is_on_ground || query.is_in_water || query.is_riding) && !variable.moving" },
60+
{ "moving": "(query.is_on_ground || query.is_in_water || query.is_riding) && variable.moving" }
61+
],
62+
"blend_transition": 0.5
63+
}
64+
}
65+
},
66+
"controller.animation.camel.idle": {
67+
"initial_state": "idling",
68+
"states": {
69+
"idling": {
70+
"animations": [ "idle" ]
71+
}
72+
}
73+
}
74+
}
75+
}

‎animation_controllers/player.animation_controllers.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
"sneaking" : "query.is_sneaking && !query.is_sleeping"
203203
},
204204
{
205-
"bob": "!variable.is_holding_spyglass && !variable.is_tooting_goat_horn"
205+
"bob": "!variable.is_holding_spyglass && !variable.is_tooting_goat_horn && !variable.is_using_brush"
206206
},
207207
{
208208
"damage_nearby_mobs" : "variable.damage_nearby_mobs"
@@ -214,7 +214,7 @@
214214
"swimming.legs" : "variable.swim_amount > 0.0"
215215
},
216216
{
217-
"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 && !query.is_item_name_any('slot.weapon.mainhand', 'minecraft:bow')"
217+
"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')"
218218
},
219219
{
220220
"sleeping" : "query.is_sleeping && query.is_alive"
@@ -239,6 +239,12 @@
239239
},
240240
{
241241
"tooting_goat_horn": "variable.is_tooting_goat_horn"
242+
},
243+
{
244+
"holding_brush": "query.get_equipped_item_name == 'brush'"
245+
},
246+
{
247+
"brushing": "variable.is_using_brush"
242248
}
243249
],
244250
"transitions" : [

‎animation_controllers/sniffer.animation_controllers.json‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
{
2+
"format_version" : "1.10.0",
3+
"animation_controllers": {
4+
"controller.animation.sniffer.baby": {
5+
"initial_state": "default",
6+
"states": {
7+
"default": {
8+
"animations": [
9+
{
10+
"baby_transform": "query.is_baby"
11+
}
12+
]
13+
}
14+
}
15+
},
16+
"controller.animation.sniffer.general": {
17+
"initial_state": "default",
18+
"states": {
19+
"default": {
20+
"animations": [
21+
"look_at_target"
22+
]
23+
}
24+
}
25+
},
26+
"controller.animation.sniffer.walk": {
27+
"initial_state": "default",
28+
"states": {
29+
"default": {
30+
"transitions": [
31+
{
32+
"walking": "query.modified_move_speed"
33+
}
34+
],
35+
"blend_transition": 0.2
36+
},
37+
"walking": {
38+
"animations": [
39+
{
40+
"walk": "variable.moving"
41+
}
42+
],
43+
"transitions": [
44+
{
45+
"default": "query.modified_move_speed < 0"
46+
}
47+
],
48+
"blend_transition": 0.2
49+
}
50+
}
51+
},
52+
"controller.animation.sniffer.sniffsniff": {
53+
"initial_state": "default",
54+
"states": {
55+
"default": {
56+
"transitions": [
57+
{
58+
"sniffsniff": "query.modified_move_speed > 0.005 && !query.is_searching && !query.is_digging && !query.is_scenting && !query.is_rising"
59+
}
60+
],
61+
"blend_transition": 0.2
62+
},
63+
"sniffsniff": {
64+
"animations": [ "sniffsniff" ],
65+
"transitions": [
66+
{
67+
"default": "query.modified_move_speed < 0.005"
68+
}
69+
],
70+
"blend_transition": 0.2
71+
}
72+
}
73+
},
74+
"controller.animation.sniffer.long_sniff": {
75+
"initial_state": "default",
76+
"states": {
77+
"default": {
78+
"transitions": [
79+
{
80+
"long_sniff": "query.is_scenting"
81+
}
82+
],
83+
"blend_transition": 0.2
84+
},
85+
"long_sniff": {
86+
"animations": [ "long_sniff" ],
87+
"transitions": [
88+
{
89+
"default": "!query.is_scenting"
90+
}
91+
],
92+
"blend_transition": 0.2
93+
}
94+
}
95+
},
96+
"controller.animation.sniffer.search": {
97+
"initial_state": "default",
98+
"states": {
99+
"default": {
100+
"transitions": [
101+
{
102+
"search": "query.is_searching"
103+
}
104+
],
105+
"blend_transition": 0.2
106+
},
107+
"search": {
108+
"animations": [ "search" ],
109+
"transitions": [
110+
{
111+
"default": "!query.is_searching"
112+
}
113+
],
114+
"blend_transition": 0.2
115+
}
116+
}
117+
},
118+
"controller.animation.sniffer.dig": {
119+
"initial_state": "default",
120+
"states": {
121+
"default": {
122+
"transitions": [
123+
{
124+
"dig": "query.is_digging"
125+
}
126+
],
127+
"blend_transition": 0.2
128+
},
129+
"dig": {
130+
"animations": [ "dig" ],
131+
"transitions": [
132+
{
133+
"default": "!query.is_digging"
134+
}
135+
],
136+
"blend_transition": 0.2
137+
}
138+
}
139+
},
140+
"controller.animation.sniffer.stand_up": {
141+
"initial_state": "default",
142+
"states": {
143+
"default": {
144+
"transitions": [
145+
{
146+
"stand_up": "query.is_rising"
147+
}
148+
],
149+
"blend_transition": 0.2
150+
},
151+
"stand_up": {
152+
"animations": [ "stand_up" ],
153+
"transitions": [
154+
{
155+
"default": "!query.is_rising"
156+
}
157+
],
158+
"blend_transition": 0.2
159+
}
160+
}
161+
},
162+
"controller.animation.sniffer.feeling_happy": {
163+
"initial_state": "default",
164+
"states": {
165+
"default": {
166+
"transitions": [
167+
{
168+
"feeling_happy": "query.is_feeling_happy"
169+
}
170+
],
171+
"blend_transition": 0.2
172+
},
173+
"feeling_happy": {
174+
"animations": [ "feeling_happy" ],
175+
"transitions": [
176+
{
177+
"default": "!query.is_feeling_happy"
178+
}
179+
],
180+
"blend_transition": 0.2
181+
}
182+
}
183+
}
184+
}
185+
}

‎animations/armor_stand.animation.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@
222222
"rotation" : [ "-this", "-this", "-this" ]
223223
},
224224
"leftleg" : {
225-
"rotation" : [ "-this", "-this", "-this" ]
225+
"rotation" : [ "-this", "-this-0.1", "-this-0.01" ]
226226
},
227227
"rightarm" : {
228-
"rotation" : [ "-this", "-this", "-this" ]
228+
"rotation": [ "-this", "-this+0.01", "-this+0.01" ]
229229
},
230230
"rightitem" : {
231231
"rotation" : [ "-this", "-this", "-this" ]

0 commit comments

Comments
 (0)