Merge branch 'main' into auth

1 files changed, 21 insertions, 21 deletions

diff --git a/azalea-protocol/src/packets/handshake/client_intention_packet.rs b/azalea-protocol/src/packets/handshake/client_intention_packet.rs
index 939a695e..a92d65f6 100644..100755
--- a/azalea-protocol/src/packets/handshake/client_intention_packet.rs
+++ b/azalea-protocol/src/packets/handshake/client_intention_packet.rs
@@ -1,34 +1,34 @@
-use std::hash::Hash;
-
 use crate::{mc_buf::Writable, packets::ConnectionProtocol};
+use packet_macros::HandshakePacket;
+use std::hash::Hash;
 
 use super::HandshakePacket;
 
-#[derive(Hash, Clone, Debug)]
+#[derive(Hash, Clone, Debug, HandshakePacket)]
 pub struct ClientIntentionPacket {
+    #[varint]
     pub protocol_version: u32,
     pub hostname: String,
     pub port: u16,
-    /// 1 for status, 2 for login
     pub intention: ConnectionProtocol,
 }
 
-impl ClientIntentionPacket {
-    pub fn get(self) -> HandshakePacket {
-        HandshakePacket::ClientIntentionPacket(self)
-    }
+// impl ClientIntentionPacket {
+//     pub fn get(self) -> HandshakePacket {
+//         HandshakePacket::ClientIntentionPacket(self)
+//     }
 
-    pub fn write(&self, buf: &mut Vec<u8>) {
-        buf.write_varint(self.protocol_version as i32).unwrap();
-        buf.write_utf(&self.hostname).unwrap();
-        buf.write_short(self.port).unwrap();
-        buf.write_varint(self.intention.clone() as i32).unwrap();
-    }
+//     pub fn write(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+//         buf.write_varint(self.protocol_version as i32)?;
+//         buf.write_utf(&self.hostname)?;
+//         buf.write_short(self.port as i16)?;
+//         buf.write_varint(self.intention as i32)?;
+//         Ok(())
+//     }
 
-    pub async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
-        _buf: &mut T,
-    ) -> Result<HandshakePacket, String> {
-        Err("ClientIntentionPacket::parse not implemented".to_string())
-        // Ok(ClientIntentionPacket {}.get())
-    }
-}
+//     pub async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
+//         buf: &mut T,
+//     ) -> Result<HandshakePacket, String> {
+//         todo!()
+//     }
+// }