how do i do this

4 files changed, 210 insertions, 129 deletions

diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml
index 5769f289..d8477ea1 100755
--- a/azalea-client/Cargo.toml
+++ b/azalea-client/Cargo.toml
@@ -8,3 +8,4 @@ version = "0.1.0"
 [dependencies]
 azalea-auth = {path = "../azalea-auth"}
 azalea-protocol = {path = "../azalea-protocol"}
+tokio = {version = "1.18.0", features = ["sync"]}
diff --git a/azalea-client/README.md b/azalea-client/README.md
index dd42a6a4..9b51356e 100755
--- a/azalea-client/README.md
+++ b/azalea-client/README.md
@@ -1,3 +1,3 @@
 # Azalea Client
 
-A library that can mimic everything a normal Minecraft client can do. If you want to make a bot, you should use `azalea` instead since it contains utilities for that.
+A library that can mimic everything a normal Minecraft client can do. If you want to make a bot with higher-level functions, you should use `azalea` instead.
diff --git a/azalea-client/src/connect.rs b/azalea-client/src/connect.rs
index d7345f68..2098d6a3 100755
--- a/azalea-client/src/connect.rs
+++ b/azalea-client/src/connect.rs
@@ -1,6 +1,5 @@
-///! Connect to Minecraft servers.
 use azalea_protocol::{
-    connect::HandshakeConnection,
+    connect::{GameConnection, HandshakeConnection},
     packets::{
         game::GamePacket,
         handshake::client_intention_packet::ClientIntentionPacket,
@@ -12,140 +11,219 @@ use azalea_protocol::{
     },
     resolver, ServerAddress,
 };
+use futures::FutureExt;
+use std::{
+    borrow::BorrowMut,
+    cell::RefCell,
+    future::Future,
+    pin::Pin,
+    sync::{Arc, Mutex, Weak},
+};
+use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
 
-pub async fn join_server(address: &ServerAddress) -> Result<(), String> {
-    let username = "bot".to_string();
+///! Connect to Minecraft servers.
 
-    let resolved_address = resolver::resolve_address(address).await?;
+/// Something that can join Minecraft servers.
+pub struct Account {
+    username: String,
+}
 
-    let mut conn = HandshakeConnection::new(&resolved_address).await?;
+pub struct ClientState {
+    // placeholder
+    pub health: u16,
+}
 
-    // handshake
-    conn.write(
-        ClientIntentionPacket {
-            protocol_version: PROTOCOL_VERSION,
-            hostname: address.host.clone(),
-            port: address.port,
-            intention: ConnectionProtocol::Login,
-        }
-        .get(),
-    )
-    .await;
-    let mut conn = conn.login();
-
-    // login
-    conn.write(ServerboundHelloPacket { username }.get()).await;
-
-    let mut conn = loop {
-        let packet_result = conn.read().await;
-        match packet_result {
-            Ok(packet) => match packet {
-                LoginPacket::ClientboundHelloPacket(p) => {
-                    println!("Got encryption request {:?} {:?}", p.nonce, p.public_key);
-                    let e = azalea_auth::encryption::encrypt(&p.public_key, &p.nonce).unwrap();
-
-                    // TODO: authenticate with the server here (authenticateServer)
-                    println!("Sending encryption response {:?}", e);
-
-                    conn.write(
-                        ServerboundKeyPacket {
-                            nonce: e.encrypted_nonce.into(),
-                            shared_secret: e.encrypted_public_key.into(),
-                        }
-                        .get(),
-                    )
-                    .await;
-                    conn.set_encryption_key(e.secret_key);
-                }
-                LoginPacket::ClientboundLoginCompressionPacket(p) => {
-                    println!("Got compression request {:?}", p.compression_threshold);
-                    conn.set_compression_threshold(p.compression_threshold);
-                }
-                LoginPacket::ClientboundGameProfilePacket(p) => {
-                    println!("Got profile {:?}", p.game_profile);
-                    break conn.game();
-                }
-                LoginPacket::ServerboundHelloPacket(p) => {
-                    println!("Got hello {:?}", p);
-                }
-                LoginPacket::ClientboundLoginDisconnectPacket(p) => {
-                    println!("Got disconnect {:?}", p);
-                }
-                LoginPacket::ClientboundCustomQueryPacket(p) => {
-                    println!("Got custom query {:?}", p);
-                }
-                LoginPacket::ServerboundKeyPacket(_) => todo!(),
-            },
-            Err(e) => {
-                panic!("Error: {:?}", e);
+/// A player that you can control that is currently in a Minecraft server.
+pub struct Client {
+    event_receiver: UnboundedReceiver<Event>,
+    conn: GameConnection,
+    state: ClientState,
+}
+
+pub enum Event {}
+
+impl Client {
+    async fn join(account: &Account, address: &ServerAddress) -> Result<Arc<Mutex<Self>>, String> {
+        let resolved_address = resolver::resolve_address(address).await?;
+
+        let mut conn = HandshakeConnection::new(&resolved_address).await?;
+
+        // handshake
+        conn.write(
+            ClientIntentionPacket {
+                protocol_version: PROTOCOL_VERSION,
+                hostname: address.host.clone(),
+                port: address.port,
+                intention: ConnectionProtocol::Login,
             }
-        }
-    };
-
-    // game
-    loop {
-        let packet_result = conn.read().await;
-        match packet_result {
-            Ok(packet) => match packet {
-                GamePacket::ClientboundLoginPacket(p) => {
-                    println!("Got login packet {:?}", p);
-                }
-                GamePacket::ClientboundUpdateViewDistancePacket(p) => {
-                    println!("Got view distance packet {:?}", p);
-                }
-                GamePacket::ClientboundCustomPayloadPacket(p) => {
-                    println!("Got custom payload packet {:?}", p);
-                }
-                GamePacket::ClientboundChangeDifficultyPacket(p) => {
-                    println!("Got difficulty packet {:?}", p);
-                }
-                GamePacket::ClientboundDeclareCommandsPacket(p) => {
-                    println!("Got declare commands packet");
-                }
-                GamePacket::ClientboundPlayerAbilitiesPacket(p) => {
-                    println!("Got player abilities packet {:?}", p);
-                }
-                GamePacket::ClientboundSetCarriedItemPacket(p) => {
-                    println!("Got set carried item packet {:?}", p);
-                }
-                GamePacket::ClientboundUpdateTagsPacket(p) => {
-                    println!("Got update tags packet");
-                }
-                GamePacket::ClientboundDisconnectPacket(p) => {
-                    println!("Got login disconnect packet {:?}", p);
-                }
-                GamePacket::ClientboundUpdateRecipesPacket(p) => {
-                    println!("Got update recipes packet");
-                }
-                GamePacket::ClientboundEntityEventPacket(p) => {
-                    println!("Got entity event packet {:?}", p);
-                }
-                GamePacket::ClientboundRecipePacket(p) => {
-                    println!("Got recipe packet");
-                }
-                GamePacket::ClientboundPlayerPositionPacket(p) => {
-                    // TODO: reply with teleport confirm
-                    println!("Got player position packet {:?}", p);
-                }
-                GamePacket::ClientboundPlayerInfoPacket(p) => {
-                    println!("Got player info packet {:?}", p);
-                }
-                GamePacket::ClientboundSetChunkCacheCenterPacket(p) => {
-                    println!("Got chunk cache center packet {:?}", p);
-                }
-                GamePacket::ClientboundLevelChunkWithLightPacket(p) => {
-                    println!("Got chunk with light packet");
-                }
-                GamePacket::ClientboundLightUpdatePacket(p) => {
-                    println!("Got light update packet {:?}", p);
+            .get(),
+        )
+        .await;
+        let mut conn = conn.login();
+
+        // login
+        conn.write(
+            ServerboundHelloPacket {
+                username: account.username.clone(),
+            }
+            .get(),
+        )
+        .await;
+
+        let conn = loop {
+            let packet_result = conn.read().await;
+            match packet_result {
+                Ok(packet) => match packet {
+                    LoginPacket::ClientboundHelloPacket(p) => {
+                        println!("Got encryption request {:?} {:?}", p.nonce, p.public_key);
+                        let e = azalea_auth::encryption::encrypt(&p.public_key, &p.nonce).unwrap();
+
+                        // TODO: authenticate with the server here (authenticateServer)
+                        println!("Sending encryption response {:?}", e);
+
+                        conn.write(
+                            ServerboundKeyPacket {
+                                nonce: e.encrypted_nonce.into(),
+                                shared_secret: e.encrypted_public_key.into(),
+                            }
+                            .get(),
+                        )
+                        .await;
+                        conn.set_encryption_key(e.secret_key);
+                    }
+                    LoginPacket::ClientboundLoginCompressionPacket(p) => {
+                        println!("Got compression request {:?}", p.compression_threshold);
+                        conn.set_compression_threshold(p.compression_threshold);
+                    }
+                    LoginPacket::ClientboundGameProfilePacket(p) => {
+                        println!("Got profile {:?}", p.game_profile);
+                        break conn.game();
+                    }
+                    LoginPacket::ServerboundHelloPacket(p) => {
+                        println!("Got hello {:?}", p);
+                    }
+                    LoginPacket::ClientboundLoginDisconnectPacket(p) => {
+                        println!("Got disconnect {:?}", p);
+                    }
+                    LoginPacket::ClientboundCustomQueryPacket(p) => {
+                        println!("Got custom query {:?}", p);
+                    }
+                    LoginPacket::ServerboundKeyPacket(_) => todo!(),
+                },
+                Err(e) => {
+                    panic!("Error: {:?}", e);
                 }
-            },
-            Err(e) => {
-                panic!("Error: {:?}", e);
+            }
+        };
+
+        let (tx, rx) = mpsc::unbounded_channel();
+
+        // we got the GameConnection, so the server is now connected :)
+        let client = Client {
+            event_receiver: rx,
+            conn,
+            state: ClientState { health: 20 },
+        };
+        // let client = Arc::new(Mutex::new(client));
+        // let weak_client = Arc::<_>::downgrade(&client);
+
+        // just start up the game loop and we're ready!
+        // tokio::spawn(Self::game_loop(weak_client, tx));
+
+        Ok(client)
+    }
+
+    // async fn game_loop(weak_client: Weak<Mutex<Client>>, tx: UnboundedSender<Event>) {
+    //     loop {
+    //         let client_option = weak_client.upgrade();
+    //         match client_option {
+    //             Some(client) => {
+    //                 let mut client = client.lock().unwrap();
+
+    //                 match client.conn.read().await {
+    //                     Ok(packet) => client.handle(&packet, &tx),
+    //                     Err(e) => {
+    //                         panic!("Error: {:?}", e);
+    //                     }
+    //                 };
+    //             }
+    //             // the client was dropped, so we're done
+    //             None => break,
+    //         }
+    //     }
+    // }
+
+    fn handle(&self, packet: &GamePacket, tx: &UnboundedSender<Event>) {
+        match packet {
+            GamePacket::ClientboundLoginPacket(p) => {
+                println!("Got login packet {:?}", p);
+            }
+            GamePacket::ClientboundUpdateViewDistancePacket(p) => {
+                println!("Got view distance packet {:?}", p);
+            }
+            GamePacket::ClientboundCustomPayloadPacket(p) => {
+                println!("Got custom payload packet {:?}", p);
+            }
+            GamePacket::ClientboundChangeDifficultyPacket(p) => {
+                println!("Got difficulty packet {:?}", p);
+            }
+            GamePacket::ClientboundDeclareCommandsPacket(p) => {
+                println!("Got declare commands packet");
+            }
+            GamePacket::ClientboundPlayerAbilitiesPacket(p) => {
+                println!("Got player abilities packet {:?}", p);
+            }
+            GamePacket::ClientboundSetCarriedItemPacket(p) => {
+                println!("Got set carried item packet {:?}", p);
+            }
+            GamePacket::ClientboundUpdateTagsPacket(p) => {
+                println!("Got update tags packet");
+            }
+            GamePacket::ClientboundDisconnectPacket(p) => {
+                println!("Got login disconnect packet {:?}", p);
+            }
+            GamePacket::ClientboundUpdateRecipesPacket(p) => {
+                println!("Got update recipes packet");
+            }
+            GamePacket::ClientboundEntityEventPacket(p) => {
+                println!("Got entity event packet {:?}", p);
+            }
+            GamePacket::ClientboundRecipePacket(p) => {
+                println!("Got recipe packet");
+            }
+            GamePacket::ClientboundPlayerPositionPacket(p) => {
+                // TODO: reply with teleport confirm
+                println!("Got player position packet {:?}", p);
+            }
+            GamePacket::ClientboundPlayerInfoPacket(p) => {
+                println!("Got player info packet {:?}", p);
+            }
+            GamePacket::ClientboundSetChunkCacheCenterPacket(p) => {
+                println!("Got chunk cache center packet {:?}", p);
+            }
+            GamePacket::ClientboundLevelChunkWithLightPacket(p) => {
+                println!("Got chunk with light packet");
+            }
+            GamePacket::ClientboundLightUpdatePacket(p) => {
+                println!("Got light update packet {:?}", p);
             }
         }
         println!();
     }
 
-    Ok(())
+    pub async fn next(&mut self) -> Option<Event> {
+        self.event_receiver.recv().await
+    }
+}
+
+impl Account {
+    pub fn offline(username: &str) -> Self {
+        Self {
+            username: username.to_string(),
+        }
+    }
+
+    pub async fn join(&self, address: &ServerAddress) -> Result<Arc<Mutex<Client>>, String> {
+        Client::join(&self, address).await
+    }
 }
diff --git a/azalea-client/src/lib.rs b/azalea-client/src/lib.rs
index 8c1bcfe9..0e1b8c16 100755
--- a/azalea-client/src/lib.rs
+++ b/azalea-client/src/lib.rs
@@ -1,8 +1,10 @@
 //! Significantly abstract azalea-protocol so it's actually useable for bots.
 
-pub mod connect;
+mod connect;
 pub mod ping;
 
+pub use connect::{Account, ServerClient};
+
 #[cfg(test)]
 mod tests {
     #[test]