From 45871fc01e212a50ac5e6268e4677f97f8fe5bb3 Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Sun, 2 Jan 2022 17:40:18 -0600
Subject: better parsing for entire login packet

---
 azalea-protocol/src/mc_buf/read.rs | 84 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 1 deletion(-)

(limited to 'azalea-protocol/src/mc_buf/read.rs')

diff --git a/azalea-protocol/src/mc_buf/read.rs b/azalea-protocol/src/mc_buf/read.rs
index 374e5443..5127860e 100644
--- a/azalea-protocol/src/mc_buf/read.rs
+++ b/azalea-protocol/src/mc_buf/read.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use azalea_core::resource_location::ResourceLocation;
+use azalea_core::{game_type::GameType, resource_location::ResourceLocation};
 use tokio::io::{AsyncRead, AsyncReadExt};
 
 use super::MAX_STRING_LENGTH;
@@ -304,3 +304,85 @@ impl McBufVarintReadable for u16 {
         buf.read_varint().await.map(|i| i as u16)
     }
 }
+
+// i64
+#[async_trait]
+impl McBufReadable for i64 {
+    async fn read_into<R>(buf: &mut R) -> Result<Self, String>
+    where
+        R: AsyncRead + std::marker::Unpin + std::marker::Send,
+    {
+        buf.read_long().await
+    }
+}
+
+// u64
+#[async_trait]
+impl McBufReadable for u64 {
+    async fn read_into<R>(buf: &mut R) -> Result<Self, String>
+    where
+        R: AsyncRead + std::marker::Unpin + std::marker::Send,
+    {
+        i64::read_into(buf).await.map(|i| i as u64)
+    }
+}
+
+// bool
+#[async_trait]
+impl McBufReadable for bool {
+    async fn read_into<R>(buf: &mut R) -> Result<Self, String>
+    where
+        R: AsyncRead + std::marker::Unpin + std::marker::Send,
+    {
+        buf.read_boolean().await
+    }
+}
+
+// GameType
+#[async_trait]
+impl McBufReadable for GameType {
+    async fn read_into<R>(buf: &mut R) -> Result<Self, String>
+    where
+        R: AsyncRead + std::marker::Unpin + std::marker::Send,
+    {
+        GameType::from_id(buf.read_byte().await?)
+    }
+}
+
+// Option<GameType>
+#[async_trait]
+impl McBufReadable for Option<GameType> {
+    async fn read_into<R>(buf: &mut R) -> Result<Self, String>
+    where
+        R: AsyncRead + std::marker::Unpin + std::marker::Send,
+    {
+        GameType::from_optional_id(buf.read_byte().await? as i8)
+    }
+}
+
+// Vec<ResourceLocation>
+#[async_trait]
+impl McBufReadable for Vec<ResourceLocation> {
+    async fn read_into<R>(buf: &mut R) -> Result<Self, String>
+    where
+        R: AsyncRead + std::marker::Unpin + std::marker::Send,
+    {
+        let mut vec = Vec::new();
+        let length = buf.read_varint().await?;
+        for _ in 0..length {
+            vec.push(buf.read_resource_location().await?);
+        }
+        Ok(vec)
+    }
+}
+
+// azalea_nbt::Tag
+#[async_trait]
+impl McBufReadable for azalea_nbt::Tag {
+    async fn read_into<R>(buf: &mut R) -> Result<Self, String>
+    where
+        R: AsyncRead + std::marker::Unpin + std::marker::Send,
+    {
+        buf.read_nbt().await
+    }
+}
-- 
cgit v1.2.3