From 2e11f5a564e6c5687ebe1d4eab26d6eb841f8406 Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Wed, 15 Dec 2021 18:50:10 -0600
Subject: start implementing other packets and stuff

---
 minecraft-client/src/connect.rs             | 17 ++++++++++++-----
 minecraft-client/src/crypt.rs               |  0
 minecraft-client/src/listeners/handshake.rs |  0
 minecraft-client/src/listeners/mod.rs       |  3 ---
 4 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 minecraft-client/src/crypt.rs
 delete mode 100644 minecraft-client/src/listeners/handshake.rs
 delete mode 100644 minecraft-client/src/listeners/mod.rs

(limited to 'minecraft-client/src')

diff --git a/minecraft-client/src/connect.rs b/minecraft-client/src/connect.rs
index 4bf937db..c4a18f1e 100644
--- a/minecraft-client/src/connect.rs
+++ b/minecraft-client/src/connect.rs
@@ -33,11 +33,18 @@ pub async fn join_server(address: &ServerAddress) -> Result<(), String> {
     conn.write(ServerboundHelloPacket { username }.get()).await;
 
     // encryption request
-    let packet = conn.read().await.unwrap();
-    let _encryption_request_packet = match packet {
-        LoginPacket::ClientboundHelloPacket(p) => p,
-        _ => return Err(format!("Invalid packet type: {:?}", packet)),
-    };
+    loop {
+        let packet = conn.read().await.unwrap();
+        match packet {
+            LoginPacket::ClientboundHelloPacket(encryption_request_packet) => {
+                println!(
+                    "Got encryption request {:?} {:?}",
+                    encryption_request_packet.nonce, encryption_request_packet.public_key
+                );
+            }
+            _ => (),
+        }
+    }
 
     // TODO: client auth
 
diff --git a/minecraft-client/src/crypt.rs b/minecraft-client/src/crypt.rs
new file mode 100644
index 00000000..e69de29b
diff --git a/minecraft-client/src/listeners/handshake.rs b/minecraft-client/src/listeners/handshake.rs
deleted file mode 100644
index e69de29b..00000000
diff --git a/minecraft-client/src/listeners/mod.rs b/minecraft-client/src/listeners/mod.rs
deleted file mode 100644
index 1f174453..00000000
--- a/minecraft-client/src/listeners/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-trait PacketListener {
-	handle(Packet)
-}
\ No newline at end of file
-- 
cgit v1.2.3