Merge pull request #7 from mat-1/1.19

1.19

1 files changed, 5 insertions, 31 deletions

diff --git a/azalea-protocol/src/packets/login/clientbound_hello_packet.rs b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs
index f7de4c21..58d48ffe 100755
--- a/azalea-protocol/src/packets/login/clientbound_hello_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs
@@ -1,37 +1,11 @@
-use std::{
-    hash::Hash,
-    io::{Read, Write},
-};
+use packet_macros::LoginPacket;
+use packet_macros::McBuf;
 
-use super::LoginPacket;
-use crate::mc_buf::Readable;
-
-#[derive(Hash, Clone, Debug)]
+#[derive(Clone, Debug, McBuf, LoginPacket)]
 pub struct ClientboundHelloPacket {
+    // TODO: make this len thing work
+    // #[len(20)]
     pub server_id: String,
     pub public_key: Vec<u8>,
     pub nonce: Vec<u8>,
 }
-
-impl ClientboundHelloPacket {
-    pub fn get(self) -> LoginPacket {
-        LoginPacket::ClientboundHelloPacket(self)
-    }
-
-    pub fn write(&self, _buf: &mut impl Write) -> Result<(), std::io::Error> {
-        panic!("ClientboundHelloPacket::write not implemented")
-    }
-
-    pub fn read(buf: &mut impl Read) -> Result<LoginPacket, String> {
-        let server_id = buf.read_utf_with_len(20)?;
-        let public_key = buf.read_byte_array()?;
-        let nonce = buf.read_byte_array()?;
-
-        Ok(ClientboundHelloPacket {
-            server_id,
-            public_key,
-            nonce,
-        }
-        .get())
-    }
-}