2 files changed, 6 insertions, 54 deletions
diff --git a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
index 5e1422fb..c0fc7b1e 100755
--- a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
+++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
@@ -2,20 +2,12 @@ use azalea_buf::McBuf;
 use azalea_protocol_macros::ServerboundLoginPacket;
 use uuid::Uuid;
 
-#[derive(Clone, Debug, ServerboundLoginPacket, McBuf, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, McBuf, ServerboundLoginPacket)]
 pub struct ServerboundHelloPacket {
-    pub username: String,
-    pub public_key: Option<ProfilePublicKeyData>,
+    pub name: String,
     pub profile_id: Option<Uuid>,
 }
 
-#[derive(Clone, Debug, McBuf, PartialEq, Eq)]
-pub struct ProfilePublicKeyData {
-    pub expires_at: u64,
-    pub key: Vec<u8>,
-    pub key_signature: Vec<u8>,
-}
-
 #[cfg(test)]
 mod tests {
     use std::io::Cursor;
@@ -26,9 +18,8 @@ mod tests {
     #[test]
     fn test_read_write() {
         let packet = ServerboundHelloPacket {
-            username: "test".to_string(),
-            public_key: None,
-            profile_id: Some(Uuid::from_u128(0)),
+            name: "test".to_string(),
+            profile_id: Some(Uuid::nil()),
         };
         let mut buf: Vec<u8> = Vec::new();
         packet.write_into(&mut buf).unwrap();
diff --git a/azalea-protocol/src/packets/login/serverbound_key_packet.rs b/azalea-protocol/src/packets/login/serverbound_key_packet.rs
index 23b3659b..dc0abeac 100755
--- a/azalea-protocol/src/packets/login/serverbound_key_packet.rs
+++ b/azalea-protocol/src/packets/login/serverbound_key_packet.rs
@@ -1,47 +1,8 @@
-use azalea_buf::{BufReadError, McBuf};
-use azalea_crypto::SaltSignaturePair;
+use azalea_buf::McBuf;
 use azalea_protocol_macros::ServerboundLoginPacket;
-use std::io::{Cursor, Write};
-
-use azalea_buf::{McBufReadable, McBufWritable};
 
 #[derive(Clone, Debug, McBuf, ServerboundLoginPacket)]
 pub struct ServerboundKeyPacket {
     pub key_bytes: Vec<u8>,
-    pub nonce_or_salt_signature: NonceOrSaltSignature,
-}
-
-#[derive(Clone, Debug)]
-pub enum NonceOrSaltSignature {
-    Nonce(Vec<u8>),
-    SaltSignature(SaltSignaturePair),
-}
-
-impl McBufReadable for NonceOrSaltSignature {
-    fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let is_nonce = bool::read_from(buf)?;
-        if is_nonce {
-            Ok(NonceOrSaltSignature::Nonce(Vec::<u8>::read_from(buf)?))
-        } else {
-            Ok(NonceOrSaltSignature::SaltSignature(
-                SaltSignaturePair::read_from(buf)?,
-            ))
-        }
-    }
-}
-
-impl McBufWritable for NonceOrSaltSignature {
-    fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        match self {
-            NonceOrSaltSignature::Nonce(nonce) => {
-                bool::write_into(&true, buf)?;
-                nonce.write_into(buf)?;
-            }
-            NonceOrSaltSignature::SaltSignature(salt_signature) => {
-                bool::write_into(&false, buf)?;
-                salt_signature.write_into(buf)?;
-            }
-        }
-        Ok(())
-    }
+    pub encrypted_challenge: Vec<u8>,
 }