Skip to content

Commit

Permalink
Update v1.20.0
Browse files Browse the repository at this point in the history 
The cameras directory was readded with the additional experimental free camera
  • Loading branch information
@KurojakiKaoru
KurojakiKaoru committed Jun 9, 2023
1 parent fbd4a57 commit 97d2641
Show file tree
Hide file tree
Showing 731 changed files with 20,753 additions and 3,252 deletions.
75 changes: 75 additions & 0 deletions animation_controllers/camel.animation_controllers.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"format_version": "1.10.0",
"animation_controllers": {
"controller.animation.camel.general": {
"initial_state": "default",
"states": {
"default": {
"transitions": [
{ "idling": "!query.is_sitting" },
{ "sitting": "query.is_sitting" }
],
"blend_transition": 0.0
},
"idling": {
"transitions": [
{ "moving": "variable.moving" },
{ "sit_down": "query.is_sitting" },
{ "dashing": "query.has_dash_cooldown && !query.is_on_ground && !query.is_in_water && !query.is_riding" }
],
"blend_transition": 0.5
},
"moving": {
"animations": [
{ "moving": "math.min(1.0, math.lerp(0.2, 1.5, query.modified_move_speed))" }
],
"transitions": [
{ "idling": "!variable.moving" },
{ "sit_down": "query.is_sitting" },
{ "dashing": "query.has_dash_cooldown && !query.is_on_ground && !query.is_in_water && !query.is_riding" }
],
"blend_transition": 0.2
},
"sitting": {
"animations": [ "sitting" ],
"transitions": [
{ "stand_up": "!query.is_sitting" }
],
"blend_transition": 0.5
},
"sit_down": {
"animations": [ "sit_down" ],
"transitions": [
{ "stand_up": "!query.is_sitting" }
],
"blend_transition": 0.5
},
"stand_up": {
"animations": [ "stand_up" ],
"transitions": [
{ "sit_down": "query.is_sitting" },
{ "idling": "query.all_animations_finished" },
{ "moving": "variable.moving" }
],
"blend_transition": 0.5
},
"dashing": {
"animations": [ "dashing" ],
"transitions": [
{ "idling": "(query.is_on_ground || query.is_in_water || query.is_riding) && !variable.moving" },
{ "moving": "(query.is_on_ground || query.is_in_water || query.is_riding) && variable.moving" }
],
"blend_transition": 0.5
}
}
},
"controller.animation.camel.idle": {
"initial_state": "idling",
"states": {
"idling": {
"animations": [ "idle" ]
}
}
}
}
}
10 changes: 8 additions & 2 deletions animation_controllers/player.animation_controllers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
"sneaking" : "query.is_sneaking && !query.is_sleeping"
},
{
"bob": "!variable.is_holding_spyglass && !variable.is_tooting_goat_horn"
"bob": "!variable.is_holding_spyglass && !variable.is_tooting_goat_horn && !variable.is_using_brush"
},
{
"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 && !variable.is_tooting_goat_horn && !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 && !variable.is_using_brush && !query.is_item_name_any('slot.weapon.mainhand', 'minecraft:bow')"
},
{
"sleeping" : "query.is_sleeping && query.is_alive"
Expand All @@ -239,6 +239,12 @@
},
{
"tooting_goat_horn": "variable.is_tooting_goat_horn"
},
{
"holding_brush": "query.get_equipped_item_name == 'brush'"
},
{
"brushing": "variable.is_using_brush"
}
],
"transitions" : [
Expand Down
185 changes: 185 additions & 0 deletions animation_controllers/sniffer.animation_controllers.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
{
"format_version" : "1.10.0",
"animation_controllers": {
"controller.animation.sniffer.baby": {
"initial_state": "default",
"states": {
"default": {
"animations": [
{
"baby_transform": "query.is_baby"
}
]
}
}
},
"controller.animation.sniffer.general": {
"initial_state": "default",
"states": {
"default": {
"animations": [
"look_at_target"
]
}
}
},
"controller.animation.sniffer.walk": {
"initial_state": "default",
"states": {
"default": {
"transitions": [
{
"walking": "query.modified_move_speed"
}
],
"blend_transition": 0.2
},
"walking": {
"animations": [
{
"walk": "variable.moving"
}
],
"transitions": [
{
"default": "query.modified_move_speed < 0"
}
],
"blend_transition": 0.2
}
}
},
"controller.animation.sniffer.sniffsniff": {
"initial_state": "default",
"states": {
"default": {
"transitions": [
{
"sniffsniff": "query.modified_move_speed > 0.005 && !query.is_searching && !query.is_digging && !query.is_scenting && !query.is_rising"
}
],
"blend_transition": 0.2
},
"sniffsniff": {
"animations": [ "sniffsniff" ],
"transitions": [
{
"default": "query.modified_move_speed < 0.005"
}
],
"blend_transition": 0.2
}
}
},
"controller.animation.sniffer.long_sniff": {
"initial_state": "default",
"states": {
"default": {
"transitions": [
{
"long_sniff": "query.is_scenting"
}
],
"blend_transition": 0.2
},
"long_sniff": {
"animations": [ "long_sniff" ],
"transitions": [
{
"default": "!query.is_scenting"
}
],
"blend_transition": 0.2
}
}
},
"controller.animation.sniffer.search": {
"initial_state": "default",
"states": {
"default": {
"transitions": [
{
"search": "query.is_searching"
}
],
"blend_transition": 0.2
},
"search": {
"animations": [ "search" ],
"transitions": [
{
"default": "!query.is_searching"
}
],
"blend_transition": 0.2
}
}
},
"controller.animation.sniffer.dig": {
"initial_state": "default",
"states": {
"default": {
"transitions": [
{
"dig": "query.is_digging"
}
],
"blend_transition": 0.2
},
"dig": {
"animations": [ "dig" ],
"transitions": [
{
"default": "!query.is_digging"
}
],
"blend_transition": 0.2
}
}
},
"controller.animation.sniffer.stand_up": {
"initial_state": "default",
"states": {
"default": {
"transitions": [
{
"stand_up": "query.is_rising"
}
],
"blend_transition": 0.2
},
"stand_up": {
"animations": [ "stand_up" ],
"transitions": [
{
"default": "!query.is_rising"
}
],
"blend_transition": 0.2
}
}
},
"controller.animation.sniffer.feeling_happy": {
"initial_state": "default",
"states": {
"default": {
"transitions": [
{
"feeling_happy": "query.is_feeling_happy"
}
],
"blend_transition": 0.2
},
"feeling_happy": {
"animations": [ "feeling_happy" ],
"transitions": [
{
"default": "!query.is_feeling_happy"
}
],
"blend_transition": 0.2
}
}
}
}
}
4 changes: 2 additions & 2 deletions animations/armor_stand.animation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@
"rotation" : [ "-this", "-this", "-this" ]
},
"leftleg" : {
"rotation" : [ "-this", "-this", "-this" ]
"rotation" : [ "-this", "-this-0.1", "-this-0.01" ]
},
"rightarm" : {
"rotation" : [ "-this", "-this", "-this" ]
"rotation": [ "-this", "-this+0.01", "-this+0.01" ]
},
"rightitem" : {
"rotation" : [ "-this", "-this", "-this" ]
Expand Down
Loading

0 comments on commit 97d2641

Please sign in to comment.