diff options
| author | mat <git@matdoes.dev> | 2025-10-04 12:52:57 -0300 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2025-10-04 12:52:57 -0300 |
| commit | 43f20b821ce26af148156e705f4c1fd3f956beb5 (patch) | |
| tree | bfe797e92cd496f4cee59bb078d378909a3823ed /azalea/src | |
| parent | a7e2f92b169d6079ba09b2190fefd2d539024a68 (diff) | |
| download | azalea-drasl-43f20b821ce26af148156e705f4c1fd3f956beb5.tar.xz | |
upgrade deps and rename SystemSets to follow bevy's new naming convention
Diffstat (limited to 'azalea/src')
| -rw-r--r-- | azalea/src/accept_resource_packs.rs | 4 | ||||
| -rw-r--r-- | azalea/src/bot.rs | 4 | ||||
| -rw-r--r-- | azalea/src/pathfinder/mod.rs | 21 |
3 files changed, 15 insertions, 14 deletions
diff --git a/azalea/src/accept_resource_packs.rs b/azalea/src/accept_resource_packs.rs index 6ca1b988..8641ce1e 100644 --- a/azalea/src/accept_resource_packs.rs +++ b/azalea/src/accept_resource_packs.rs @@ -2,7 +2,7 @@ use azalea_client::{ InConfigState, chunks::handle_chunk_batch_finished_event, client_information::send_client_information, - inventory::InventorySet, + inventory::InventorySystems, packet::{ config::SendConfigPacketEvent, death_event_on_0_health, @@ -30,7 +30,7 @@ impl Plugin for AcceptResourcePacksPlugin { .before(perform_respawn) .after(death_event_on_0_health) .after(handle_chunk_batch_finished_event) - .after(InventorySet) + .after(InventorySystems) .after(send_client_information), ); } diff --git a/azalea/src/bot.rs b/azalea/src/bot.rs index 5523b7b2..1897f510 100644 --- a/azalea/src/bot.rs +++ b/azalea/src/bot.rs @@ -12,7 +12,7 @@ use azalea_entity::{ Jumping, LocalEntity, LookDirection, Position, clamp_look_direction, dimensions::EntityDimensions, metadata::Player, update_dimensions, }; -use azalea_physics::PhysicsSet; +use azalea_physics::PhysicsSystems; use bevy_app::Update; use bevy_ecs::prelude::*; use futures_lite::Future; @@ -51,7 +51,7 @@ impl Plugin for BotPlugin { .add_systems( GameTick, stop_jumping - .after(PhysicsSet) + .after(PhysicsSystems) .after(azalea_client::movement::send_player_input_packet), ); } diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs index 9bac46df..54fd7a59 100644 --- a/azalea/src/pathfinder/mod.rs +++ b/azalea/src/pathfinder/mod.rs @@ -34,14 +34,14 @@ use std::{ use astar::{Edge, PathfinderTimeout}; use azalea_client::{ StartSprintEvent, StartWalkEvent, - inventory::{Inventory, InventorySet, SetSelectedHotbarSlotEvent}, + inventory::{Inventory, InventorySystems, SetSelectedHotbarSlotEvent}, local_player::InstanceHolder, - mining::{Mining, MiningSet, StartMiningBlockEvent}, - movement::MoveEventsSet, + mining::{Mining, MiningSystems, StartMiningBlockEvent}, + movement::MoveEventsSystems, }; use azalea_core::{position::BlockPos, tick::GameTick}; use azalea_entity::{LocalEntity, Physics, Position, metadata::Player}; -use azalea_physics::PhysicsSet; +use azalea_physics::PhysicsSystems; use azalea_world::{InstanceContainer, InstanceName}; use bevy_app::{PreUpdate, Update}; use bevy_ecs::prelude::*; @@ -95,9 +95,9 @@ impl Plugin for PathfinderPlugin { recalculate_if_has_goal_but_no_path, ) .chain() - .after(PhysicsSet) + .after(PhysicsSystems) .after(azalea_client::movement::send_position) - .after(MiningSet), + .after(MiningSystems), ) .add_systems(PreUpdate, add_default_pathfinder) .add_systems( @@ -110,8 +110,8 @@ impl Plugin for PathfinderPlugin { handle_stop_pathfinding_event, ) .chain() - .before(MoveEventsSet) - .before(InventorySet), + .before(MoveEventsSystems) + .before(InventorySystems), ); } } @@ -529,8 +529,9 @@ pub fn path_found_listener( mut commands: Commands, ) { for event in events.read() { - let Ok((mut pathfinder, executing_path, instance_name, inventory, custom_state)) = query - .get_mut(event.entity) else { + let Ok((mut pathfinder, executing_path, instance_name, inventory, custom_state)) = + query.get_mut(event.entity) + else { debug!("got path found event for an entity that can't pathfind"); continue; }; |
