diff --git a/src/main/resources/integratedpack/animation_controllers/player.animation_controllers.json b/src/main/resources/integratedpack/animation_controllers/player.animation_controllers.json index 338718f..fb8ed93 100644 --- a/src/main/resources/integratedpack/animation_controllers/player.animation_controllers.json +++ b/src/main/resources/integratedpack/animation_controllers/player.animation_controllers.json @@ -103,7 +103,7 @@ "sneaking" : "query.is_sneaking && !query.is_sleeping" }, { - "bob": "!variable.is_holding_spyglass && !(q.is_item_name_any('slot.weapon.offhand', 0, 'minecraft:spyglass') && q.is_emerging)" + "bob": "!variable.is_holding_spyglass && !variable.is_tooting_goat_horn && !variable.is_using_brush !(q.is_item_name_any('slot.weapon.offhand', 0, 'minecraft:spyglass') && q.is_emerging)" }, { "damage_nearby_mobs" : "variable.damage_nearby_mobs" @@ -112,10 +112,22 @@ "swimming" : "variable.swim_amount > 0.0" }, { + "swimming.no_right_arm": "variable.swim_amount > 0.0 && variable.melee_spear_equipped" + }, + { "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 && !(q.is_item_name_any('slot.weapon.offhand', 0, 'minecraft:spyglass') && q.is_emerging)" + "crawling": "query.is_crawling && !variable.melee_spear_equipped" + }, + { + "crawling.no_right_arm": "query.is_crawling && variable.melee_spear_equipped" + }, + { + "crawling.legs": "query.is_crawling" + }, + { + "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') && !(q.is_item_name_any('slot.weapon.offhand', 0, 'minecraft:spyglass') && q.is_emerging)" }, { "sleeping" : "query.is_sleeping && query.is_alive" @@ -137,7 +149,22 @@ }, { "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" + }, + { + "holding_brush": "query.get_equipped_item_name == 'brush'" + }, + { + "brushing": "variable.is_using_brush" + }, + { + "holding_heavy_core": "query.is_item_name_any('slot.weapon.mainhand', 'minecraft:heavy_core')" + }, + { + "third_person_melee_spear_controller": "variable.melee_spear_equipped" + } ], "transitions" : [ { diff --git a/src/main/resources/integratedpack/manifest.json b/src/main/resources/integratedpack/manifest.json index dc67bd1..43fc3d5 100644 --- a/src/main/resources/integratedpack/manifest.json +++ b/src/main/resources/integratedpack/manifest.json @@ -4,7 +4,7 @@ "description": "Bedrock resource pack to extend Geyser functionality", "name": "GeyserIntegratedPack", "uuid": "2254393d-8430-45b0-838a-bd397828c765", - "version": [1, 0, 3], + "version": [1, 0, 4], "min_engine_version": [ 1, 16, 0 ] }, "modules": [ @@ -12,7 +12,7 @@ "description": "GeyserIntegratedPack", "type": "resources", "uuid": "4d60881b-e4ed-466f-925c-8abc873151ba", - "version": [1, 0, 3] + "version": [1, 0, 4] } ] }