Make some internal system handles public for use with before/after (#180)

5 files changed, 26 insertions, 17 deletions

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<SendChatEvent>,
     mut send_chat_kind_events: EventWriter<SendChatKindEvent>,
 ) {
@@ -250,7 +250,7 @@ pub enum ChatPacketKind {
     Command,
 }
 
-fn handle_send_chat_kind_event(
+pub fn handle_send_chat_kind_event(
     mut events: EventReader<SendChatKindEvent>,
     mut send_packet_events: EventWriter<SendPacketEvent>,
 ) {
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<ReceiveChunkEvent>,
     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<LocalPlayerEvents>>) {
+pub fn init_listener(query: Query<&LocalPlayerEvents, Added<LocalPlayerEvents>>) {
     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<MinecraftEntityId>>) {
+pub fn login_listener(query: Query<&LocalPlayerEvents, Added<MinecraftEntityId>>) {
     for local_player_events in &query {
         let _ = local_player_events.send(Event::Login);
     }
 }
 
-fn chat_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<ChatReceivedEvent>) {
+pub fn chat_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<ChatReceivedEvent>) {
     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<ChatR
 }
 
 // only tick if we're in a world
-fn tick_listener(query: Query<&LocalPlayerEvents, With<InstanceName>>) {
+pub fn tick_listener(query: Query<&LocalPlayerEvents, With<InstanceName>>) {
     for local_player_events in &query {
         let _ = local_player_events.send(Event::Tick);
     }
 }
 
-fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<PacketEvent>) {
+pub fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<PacketEvent>) {
     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<Pac
     }
 }
 
-fn add_player_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<AddPlayerEvent>) {
+pub fn add_player_listener(
+    query: Query<&LocalPlayerEvents>,
+    mut events: EventReader<AddPlayerEvent>,
+) {
     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<UpdatePlayerEvent>,
 ) {
@@ -193,7 +196,7 @@ fn update_player_listener(
     }
 }
 
-fn remove_player_listener(
+pub fn remove_player_listener(
     query: Query<&LocalPlayerEvents>,
     mut events: EventReader<RemovePlayerEvent>,
 ) {
@@ -213,7 +216,10 @@ pub fn death_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<
     }
 }
 
-fn keepalive_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<KeepAliveEvent>) {
+pub fn keepalive_listener(
+    query: Query<&LocalPlayerEvents>,
+    mut events: EventReader<KeepAliveEvent>,
+) {
     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<DisconnectEvent>) {
+pub fn disconnect_listener(
+    query: Query<&LocalPlayerEvents>,
+    mut events: EventReader<DisconnectEvent>,
+) {
     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<FinishMiningBlockEvent>,
     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<StopMiningBlockEvent>,
     mut send_packet_events: EventWriter<SendPacketEvent>,
     mut mine_block_progress_events: EventWriter<MineBlockProgressEvent>,
@@ -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,