Skip to content

Commit

Permalink
Update v1.19.63
Browse files Browse the repository at this point in the history
  • Loading branch information
@KurojakiKaoru
KurojakiKaoru committed Mar 2, 2023
1 parent 6cbf8ce commit c7f486f
Show file tree
Hide file tree
Showing 487 changed files with 26,400 additions and 30,912 deletions.
48 changes: 47 additions & 1 deletion animation_controllers/allay.animation_controllers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,66 @@
"blend_transition": 0.2
},
"flying": {
"animations": [ "fly" ],
"animations": [ "fly" ],
"transitions": [
{ "idling": "query.modified_move_speed < 0.2"}
],
"blend_transition": 0.2
}
}
},
"controller.animation.allay.look_at_target": {
"initial_state": "default",
"states" : {
"default": {
"transitions": [
{ "looking_at_target": "!query.is_dancing" }
]
},
"looking_at_target" : {
"animations": [ "look_at_target_default" ],
"transitions": [
{ "default": "query.is_dancing" }
]
}
}
},
"controller.animation.allay.holding": {
"initial_state": "holding",
"states": {
"holding": {
"animations": [
{ "hold_item": "variable.is_holding_left || variable.is_holding_right" }
],
"transitions": [
{ "fly_holding": "query.modified_move_speed > 0.2" }
],
"blend_transition": 0.2
},
"fly_holding": {
"animations": [
{ "hold_item_fly": "variable.is_holding_left || variable.is_holding_right" }
],
"transitions": [
{ "holding": "query.modified_move_speed < 0.2" }
],
"blend_transition": 0.2
}
}
},
"controller.animation.allay.dancing": {
"initial_state": "default",
"states": {
"default": {
"transitions": [
{ "dancing": "query.is_dancing" }
],
"blend_transition": 0.2
},
"dancing": {
"animations": [ "dance" ],
"transitions": [
{ "default": "!query.is_dancing" }
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions animation_controllers/bee.animation_controllers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"default": {
"transitions": [
{
"dripping": "query.is_powered"
"dripping": "query.property('minecraft:has_nectar')"
}
]
},
Expand All @@ -19,7 +19,7 @@
],
"transitions": [
{
"default": "!query.is_powered"
"default": "!query.property('minecraft:has_nectar')"
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions animation_controllers/evoker.animation_controllers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"initial_state" : "default",
"states" : {
"casting" : {
"animations" : [ "look_at_target", "casting" ],
"animations" : [ "look_at_target", "casting", "controller_riding" ],
"particle_effects" : [
{
"effect" : "spell",
Expand All @@ -23,7 +23,7 @@
]
},
"celebrating" : {
"animations" : [ "celebrating" ],
"animations" : [ "celebrating", "controller_riding" ],
"blend_transition" : 0.2,
"blend_via_shortest_path" : true,
"transitions" : [
Expand All @@ -33,7 +33,7 @@
]
},
"default" : {
"animations" : [ "look_at_target", "general" ],
"animations" : [ "look_at_target", "general", "controller_riding" ],
"blend_transition" : 0.2,
"blend_via_shortest_path" : true,
"transitions" : [
Expand All @@ -51,7 +51,7 @@
"initial_state" : "default",
"states" : {
"casting" : {
"animations" : [ "look_at_target", "casting" ],
"animations" : [ "look_at_target", "casting", "controller_riding" ],
"particle_effects" : [
{
"effect" : "spell",
Expand All @@ -69,7 +69,7 @@
]
},
"default" : {
"animations" : [ "look_at_target", "general" ],
"animations" : [ "look_at_target", "general", "controller_riding" ],
"transitions" : [
{
"casting" : "query.is_casting"
Expand Down
40 changes: 20 additions & 20 deletions animation_controllers/humanoid.animation_controllers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,26 +97,6 @@
}
}
},
"controller.animation.humanoid.holding_spyglass" : {
"initial_state" : "default",
"states" : {
"holding_spyglass" : {
"animations" : [ "holding_spyglass" ],
"transitions" : [
{
"default" : "!variable.is_holding_spyglass"
}
]
},
"default" : {
"transitions" : [
{
"holding_spyglass" : "variable.is_holding_spyglass"
}
]
}
}
},
"controller.animation.humanoid.charging" : {
"initial_state" : "default",
"states" : {
Expand Down Expand Up @@ -231,6 +211,26 @@
}
}
},
"controller.animation.humanoid.riding_legs_only" : {
"initial_state" : "default",
"states" : {
"default" : {
"transitions" : [
{
"riding" : "query.is_riding"
}
]
},
"riding" : {
"animations" : [ "riding.legs" ],
"transitions" : [
{
"default" : "!query.is_riding"
}
]
}
}
},
"controller.animation.humanoid.sneaking" : {
"initial_state" : "default",
"states" : {
Expand Down
29 changes: 16 additions & 13 deletions animation_controllers/player.animation_controllers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,39 +65,39 @@
"default" : {
"transitions" : [
{
"one_hand" : "query.get_equipped_item_name('off_hand') == 'map' || query.get_equipped_item_name('off_hand') == 'shield'"
"one_hand" : "query.get_equipped_item_name('off_hand') == 'filled_map' || query.get_equipped_item_name('off_hand') == 'shield'"
},
{
"two_hand" : "query.get_equipped_item_name('off_hand') != 'map' && query.get_equipped_item_name('off_hand') != 'shield'"
"two_hand" : "query.get_equipped_item_name('off_hand') != 'filled_map' && query.get_equipped_item_name('off_hand') != 'shield'"
}
]
},
"one_hand" : {
"animations" : [
{
"first_person_map_hold_main_hand" : "query.get_equipped_item_name(0, 1) == 'map'"
"first_person_map_hold_main_hand" : "query.get_equipped_item_name(0, 1) == 'filled_map'"
},
{
"first_person_map_hold_off_hand" : "query.get_equipped_item_name('off_hand') == 'map' && (query.get_equipped_item_name == 'bow' ? !(variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0) : 1.0)"
"first_person_map_hold_off_hand" : "query.get_equipped_item_name('off_hand') == 'filled_map' && (query.get_equipped_item_name == 'bow' ? !(variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0) : 1.0)"
}
],
"transitions" : [
{
"default" : "query.get_equipped_item_name(0, 1) != 'map' && query.get_equipped_item_name('off_hand') != 'map'"
"default" : "query.get_equipped_item_name(0, 1) != 'filled_map' && query.get_equipped_item_name('off_hand') != 'filled_map'"
},
{
"two_hand" : "query.get_equipped_item_name('off_hand') != 'map' && query.get_equipped_item_name('off_hand') != 'shield'"
"two_hand" : "query.get_equipped_item_name('off_hand') != 'filled_map' && query.get_equipped_item_name('off_hand') != 'shield'"
}
]
},
"two_hand" : {
"animations" : [ "first_person_map_hold", "first_person_map_hold_attack" ],
"transitions" : [
{
"default" : "query.get_equipped_item_name(0, 1) != 'map' && query.get_equipped_item_name('off_hand') != 'map'"
"default" : "query.get_equipped_item_name(0, 1) != 'filled_map' && query.get_equipped_item_name('off_hand') != 'filled_map'"
},
{
"one_hand" : "query.get_equipped_item_name('off_hand') == 'map' || query.get_equipped_item_name('off_hand') == 'shield'"
"one_hand" : "query.get_equipped_item_name('off_hand') == 'filled_map' || query.get_equipped_item_name('off_hand') == 'shield'"
}
]
}
Expand All @@ -115,17 +115,17 @@
"first_person_shield_block": "query.blocking"
},
{
"first_person_attack_controller" : "variable.attack_time > 0.0f && query.get_equipped_item_name != 'map'"
"first_person_attack_controller" : "variable.attack_time > 0.0f && query.get_equipped_item_name != 'filled_map'"
},
"first_person_base_pose",
{
"first_person_empty_hand" : "query.get_equipped_item_name(0, 1) != 'map'"
"first_person_empty_hand" : "query.get_equipped_item_name(0, 1) != 'filled_map'"
},
{
"first_person_walk" : "variable.bob_animation"
},
{
"first_person_map_controller" : "(query.get_equipped_item_name(0, 1) == 'map' || query.get_equipped_item_name('off_hand') == 'map')"
"first_person_map_controller" : "(query.get_equipped_item_name(0, 1) == 'filled_map' || query.get_equipped_item_name('off_hand') == 'filled_map')"
},
{
"first_person_crossbow_equipped": "query.get_equipped_item_name == 'crossbow' && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0)"
Expand Down Expand Up @@ -202,7 +202,7 @@
"sneaking" : "query.is_sneaking && !query.is_sleeping"
},
{
"bob": "!variable.is_holding_spyglass"
"bob": "!variable.is_holding_spyglass && !variable.is_tooting_goat_horn"
},
{
"damage_nearby_mobs" : "variable.damage_nearby_mobs"
Expand All @@ -214,7 +214,7 @@
"swimming.legs" : "variable.swim_amount > 0.0"
},
{
"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 && !query.is_item_name_any('slot.weapon.mainhand', 'minecraft:bow')"
"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')"
},
{
"sleeping" : "query.is_sleeping && query.is_alive"
Expand All @@ -236,6 +236,9 @@
},
{
"third_person_bow_equipped" : "query.get_equipped_item_name == 'bow' && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0)"
},
{
"tooting_goat_horn": "variable.is_tooting_goat_horn"
}
],
"transitions" : [
Expand Down
24 changes: 22 additions & 2 deletions animation_controllers/vex.animation_controllers.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@
{
"format_version" : "1.10.0",
"animation_controllers" : {
"controller.animation.vex.move" : {
"controller.animation.vex.idle" : {
"initial_state" : "default",
"states" : {
"default" : {
"animations" : [ "vex_move" ]
"animations" : [ "vex_idle" ]
}
}
},
"controller.animation.vex.charge" : {
"initial_state" : "default",
"states" : {
"default" : {
"transitions" : [
{
"charging" : "query.is_charging"
}
]
},
"charging" : {
"animations" : [ "vex_charge" ],
"transitions" : [
{
"default" : "!query.is_charging"
}
]
}
}
}
Expand Down
20 changes: 0 additions & 20 deletions animation_controllers/warden.animation_controllers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,6 @@
}
}
},
"controller.animation.warden.hurt" : {
"initial_state" : "default",
"states" : {
"default" : {
"transitions" : [
{
"hurting" : "query.hurt_time > 0"
}
]
},
"hurting" : {
"animations" : [ "hurt" ],
"transitions" : [
{
"default" : "query.hurt_time <= 0"
}
]
}
}
},
"controller.animation.warden.sniff" : {
"initial_state" : "default",
"states" : {
Expand Down
Loading

0 comments on commit c7f486f

Please sign in to comment.