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/write.rs | 68 ++++++++++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 5 deletions(-)

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

diff --git a/azalea-protocol/src/mc_buf/write.rs b/azalea-protocol/src/mc_buf/write.rs
index f22b218a..14dac9d1 100644
--- a/azalea-protocol/src/mc_buf/write.rs
+++ b/azalea-protocol/src/mc_buf/write.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 byteorder::{BigEndian, WriteBytesExt};
 use std::io::Write;
 
@@ -202,27 +202,85 @@ impl McBufWritable for ResourceLocation {
 // u32
 impl McBufWritable for u32 {
     fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
-        buf.write_varint(*self as i32)
+        i32::varint_write_into(&(*self as i32), buf)
     }
 }
 
 // u32 varint
 impl McBufVarintWritable for u32 {
     fn varint_write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
-        buf.write_varint(*self as i32)
+        i32::varint_write_into(&(*self as i32), buf)
     }
 }
 
 // u16
 impl McBufWritable for u16 {
     fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
-        buf.write_varint(*self as i32)
+        i32::varint_write_into(&(*self as i32), buf)
     }
 }
 
 // u16 varint
 impl McBufVarintWritable for u16 {
     fn varint_write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
-        buf.write_varint(*self as i32)
+        i32::varint_write_into(&(*self as i32), buf)
+    }
+}
+
+// u8
+impl McBufWritable for u8 {
+    fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+        buf.write_byte(*self)
+    }
+}
+
+// i64
+impl McBufWritable for i64 {
+    fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+        Writable::write_long(buf, *self)
+    }
+}
+
+// u64
+impl McBufWritable for u64 {
+    fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+        i64::write_into(&(*self as i64), buf)
+    }
+}
+
+// bool
+impl McBufWritable for bool {
+    fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+        buf.write_boolean(*self)
+    }
+}
+
+// GameType
+impl McBufWritable for GameType {
+    fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+        u8::write_into(&self.to_id(), buf)
+    }
+}
+
+// Option<GameType>
+impl McBufWritable for Option<GameType> {
+    fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+        buf.write_byte(GameType::to_optional_id(&self) as u8)
+    }
+}
+
+// Vec<ResourceLocation>
+impl McBufWritable for Vec<ResourceLocation> {
+    fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+        buf.write_list(&self, |buf, resource_location| {
+            buf.write_resource_location(resource_location)
+        })
+    }
+}
+
+// azalea_nbt::Tag
+impl McBufWritable for azalea_nbt::Tag {
+    fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+        buf.write_nbt(self)
     }
 }
-- 
cgit v1.2.3