diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs index 751893b7..1f69d46e 100755 --- a/azalea-client/src/chat.rs +++ b/azalea-client/src/chat.rs @@ -207,7 +207,7 @@ pub struct SendChatEvent { pub content: String, } -fn handle_send_chat_event( +pub fn handle_send_chat_event( mut events: EventReader, mut send_chat_kind_events: EventWriter, ) { @@ -250,7 +250,7 @@ pub enum ChatPacketKind { Command, } -fn handle_send_chat_kind_event( +pub fn handle_send_chat_kind_event( mut events: EventReader, mut send_packet_events: EventWriter, ) { diff --git a/azalea-client/src/chunks.rs b/azalea-client/src/chunks.rs index 072fbd31..40e295aa 100644 --- a/azalea-client/src/chunks.rs +++ b/azalea-client/src/chunks.rs @@ -71,7 +71,7 @@ pub struct ChunkBatchFinishedEvent { pub batch_size: u32, } -fn handle_receive_chunk_events( +pub fn handle_receive_chunk_events( mut events: EventReader, mut query: Query<&mut InstanceHolder>, ) { diff --git a/azalea-client/src/events.rs b/azalea-client/src/events.rs index c748efca..61104a4b 100644 --- a/azalea-client/src/events.rs +++ b/azalea-client/src/events.rs @@ -134,20 +134,20 @@ impl Plugin for EventPlugin { } // when LocalPlayerEvents is added, it means the client just started -fn init_listener(query: Query<&LocalPlayerEvents, Added>) { +pub fn init_listener(query: Query<&LocalPlayerEvents, Added>) { for local_player_events in &query { let _ = local_player_events.send(Event::Init); } } // when MinecraftEntityId is added, it means the player is now in the world -fn login_listener(query: Query<&LocalPlayerEvents, Added>) { +pub fn login_listener(query: Query<&LocalPlayerEvents, Added>) { for local_player_events in &query { let _ = local_player_events.send(Event::Login); } } -fn chat_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { +pub fn chat_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { for event in events.read() { let local_player_events = query .get(event.entity) @@ -157,13 +157,13 @@ fn chat_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader>) { +pub fn tick_listener(query: Query<&LocalPlayerEvents, With>) { for local_player_events in &query { let _ = local_player_events.send(Event::Tick); } } -fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { +pub fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { for event in events.read() { let local_player_events = query .get(event.entity) @@ -172,7 +172,10 @@ fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader, mut events: EventReader) { +pub fn add_player_listener( + query: Query<&LocalPlayerEvents>, + mut events: EventReader, +) { for event in events.read() { let local_player_events = query .get(event.entity) @@ -181,7 +184,7 @@ fn add_player_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader } } -fn update_player_listener( +pub fn update_player_listener( query: Query<&LocalPlayerEvents>, mut events: EventReader, ) { @@ -193,7 +196,7 @@ fn update_player_listener( } } -fn remove_player_listener( +pub fn remove_player_listener( query: Query<&LocalPlayerEvents>, mut events: EventReader, ) { @@ -213,7 +216,10 @@ pub fn death_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader< } } -fn keepalive_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { +pub fn keepalive_listener( + query: Query<&LocalPlayerEvents>, + mut events: EventReader, +) { for event in events.read() { let local_player_events = query .get(event.entity) @@ -222,7 +228,10 @@ fn keepalive_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader< } } -fn disconnect_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader) { +pub fn disconnect_listener( + query: Query<&LocalPlayerEvents>, + mut events: EventReader, +) { for event in events.read() { if let Ok(local_player_events) = query.get(event.entity) { let _ = local_player_events.send(Event::Disconnect(event.reason.clone())); diff --git a/azalea-client/src/lib.rs b/azalea-client/src/lib.rs index 93e08717..82d4f561 100644 --- a/azalea-client/src/lib.rs +++ b/azalea-client/src/lib.rs @@ -16,7 +16,7 @@ mod client; pub mod configuration; pub mod disconnect; mod entity_query; -mod events; +pub mod events; pub mod interact; pub mod inventory; mod local_player; diff --git a/azalea-client/src/mining.rs b/azalea-client/src/mining.rs index 86a0193c..1c8461c5 100644 --- a/azalea-client/src/mining.rs +++ b/azalea-client/src/mining.rs @@ -418,7 +418,7 @@ pub struct FinishMiningBlockEvent { pub position: BlockPos, } -fn handle_finish_mining_block_event( +pub fn handle_finish_mining_block_event( mut events: EventReader, mut query: Query<( &InstanceName, @@ -484,7 +484,7 @@ fn handle_finish_mining_block_event( pub struct StopMiningBlockEvent { pub entity: Entity, } -fn handle_stop_mining_block_event( +pub fn handle_stop_mining_block_event( mut events: EventReader, mut send_packet_events: EventWriter, mut mine_block_progress_events: EventWriter, @@ -517,7 +517,7 @@ fn handle_stop_mining_block_event( } #[allow(clippy::too_many_arguments, clippy::type_complexity)] -fn continue_mining_block( +pub fn continue_mining_block( mut query: Query<( Entity, &InstanceName, diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs index 1f864526..611ad5c5 100644 --- a/azalea/src/pathfinder/mod.rs +++ b/azalea/src/pathfinder/mod.rs @@ -139,7 +139,7 @@ pub struct PathFoundEvent { } #[allow(clippy::type_complexity)] -fn add_default_pathfinder( +pub fn add_default_pathfinder( mut commands: Commands, mut query: Query, With, With)>, ) { @@ -193,7 +193,7 @@ impl PathfinderClientExt for azalea_client::Client { #[derive(Component)] pub struct ComputePath(Task>); -fn goto_listener( +pub fn goto_listener( mut commands: Commands, mut events: EventReader, mut query: Query<( @@ -340,7 +340,7 @@ fn goto_listener( } // poll the tasks and send the PathFoundEvent if they're done -fn handle_tasks( +pub fn handle_tasks( mut commands: Commands, mut transform_tasks: Query<(Entity, &mut ComputePath)>, mut path_found_events: EventWriter, @@ -358,7 +358,7 @@ fn handle_tasks( } // set the path for the target entity when we get the PathFoundEvent -fn path_found_listener( +pub fn path_found_listener( mut events: EventReader, mut query: Query<( &mut Pathfinder, @@ -446,7 +446,7 @@ fn path_found_listener( } } -fn timeout_movement( +pub fn timeout_movement( mut query: Query<(&Pathfinder, &mut ExecutingPath, &Position, Option<&Mining>)>, ) { for (pathfinder, mut executing_path, position, mining) in &mut query { @@ -481,7 +481,7 @@ fn timeout_movement( } } -fn check_node_reached( +pub fn check_node_reached( mut query: Query<( Entity, &mut Pathfinder, @@ -575,7 +575,7 @@ fn check_node_reached( } } -fn check_for_path_obstruction( +pub fn check_for_path_obstruction( mut query: Query<(&Pathfinder, &mut ExecutingPath, &InstanceName, &Inventory)>, instance_container: Res, ) { @@ -675,7 +675,7 @@ pub fn recalculate_near_end_of_path( } #[allow(clippy::type_complexity)] -fn tick_execute_path( +pub fn tick_execute_path( mut query: Query<( Entity, &mut ExecutingPath, @@ -719,7 +719,7 @@ fn tick_execute_path( } } -fn recalculate_if_has_goal_but_no_path( +pub fn recalculate_if_has_goal_but_no_path( mut query: Query<(Entity, &mut Pathfinder), Without>, mut goto_events: EventWriter, ) { @@ -748,7 +748,7 @@ pub struct StopPathfindingEvent { pub force: bool, } -fn handle_stop_pathfinding_event( +pub fn handle_stop_pathfinding_event( mut events: EventReader, mut query: Query<(&mut Pathfinder, &mut ExecutingPath)>, mut walk_events: EventWriter, @@ -782,7 +782,7 @@ fn handle_stop_pathfinding_event( } } -fn stop_pathfinding_on_instance_change( +pub fn stop_pathfinding_on_instance_change( mut query: Query<(Entity, &mut ExecutingPath), Changed>, mut stop_pathfinding_events: EventWriter, ) { @@ -800,7 +800,7 @@ fn stop_pathfinding_on_instance_change( /// Checks whether the path has been obstructed, and returns Some(index) if it /// has been. The index is of the first obstructed node. -fn check_path_obstructed( +pub fn check_path_obstructed( mut current_position: BlockPos, path: &VecDeque>, successors_fn: SuccessorsFn,