add StartClientOpts::new_with_appexit_rx

2 files changed, 27 insertions, 14 deletions

diff --git a/azalea/src/client_impl/mod.rs b/azalea/src/client_impl/mod.rs
index 45b11fbf..be711ef1 100644
--- a/azalea/src/client_impl/mod.rs
+++ b/azalea/src/client_impl/mod.rs
@@ -29,7 +29,7 @@ use azalea_world::{PartialWorld, World, WorldName};
 use bevy_app::{App, AppExit};
 use bevy_ecs::{entity::Entity, resource::Resource, world::Mut};
 use parking_lot::RwLock;
-use tokio::sync::mpsc;
+use tokio::sync::{mpsc, oneshot};
 use uuid::Uuid;
 
 use crate::{
@@ -87,24 +87,33 @@ impl StartClientOpts {
         address: ResolvedAddr,
         event_sender: Option<mpsc::UnboundedSender<Event>>,
     ) -> StartClientOpts {
+        Self::new_with_appexit_rx(account, address, event_sender).0
+    }
+
+    pub fn new_with_appexit_rx(
+        account: Account,
+        address: ResolvedAddr,
+        event_sender: Option<mpsc::UnboundedSender<Event>>,
+    ) -> (StartClientOpts, oneshot::Receiver<AppExit>) {
         let mut app = App::new();
         app.add_plugins((DefaultPlugins, DefaultBotPlugins, DefaultSwarmPlugins));
 
-        // appexit_rx is unused here since the user should be able to handle it
-        // themselves if they're using StartClientOpts::new
-        let (ecs_lock, start_running_systems, _appexit_rx) = start_ecs_runner(app.main_mut());
+        let (ecs_lock, start_running_systems, appexit_rx) = start_ecs_runner(app.main_mut());
         start_running_systems();
 
-        Self {
-            ecs_lock,
-            account,
-            connect_opts: ConnectOpts {
-                address,
-                server_proxy: None,
-                sessionserver_proxy: None,
+        (
+            Self {
+                ecs_lock,
+                account,
+                connect_opts: ConnectOpts {
+                    address,
+                    server_proxy: None,
+                    sessionserver_proxy: None,
+                },
+                event_sender,
             },
-            event_sender,
-        }
+            appexit_rx,
+        )
     }
 
     /// Configure the SOCKS5 proxy used for connecting to the server and for
diff --git a/azalea/src/lib.rs b/azalea/src/lib.rs
index 1ce7e5e6..3be74b9e 100644
--- a/azalea/src/lib.rs
+++ b/azalea/src/lib.rs
@@ -56,7 +56,11 @@ pub use builder::ClientBuilder;
 use futures::future::BoxFuture;
 pub use join_opts::JoinOpts;
 
-pub use crate::{client_impl::Client, entity_ref::EntityRef, events::Event};
+pub use crate::{
+    client_impl::{Client, StartClientOpts},
+    entity_ref::EntityRef,
+    events::Event,
+};
 
 pub type BoxHandleFn<S, R> = Box<dyn Fn(Client, Event, S) -> BoxFuture<'static, R> + Send>;
 pub type HandleFn<S, Fut> = fn(Client, Event, S) -> Fut;