From 7d901e39bc10a855b545d7b6c167f45148a1fb0a Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Wed, 7 Dec 2022 21:09:58 -0600
Subject: 1.19.3 (#34)

* start updating to 22w42a

* work a bit more on 22w42a

* player chat packet

* serverbound hello packet

* Update mod.rs

* add more stuff to clientbound player chat packet

* ClientboundPlayerInfoUpdatePacket

* features enabled and container closed

* serverbound chat packets

* make it compile

* 22w43a

* ServerboundChatSessionUpdatePacket

* profile_public_key isn't Option anymore

* Update bitset.rs

* joining a server works

* fix entitydatavalue

* backtraces + fix clientbound chat message

* fix some warnings and add more ecomments

* 22w44a

* generate en_us.json

* add updating guide to codegen/readme

* fix some markdown

* update list of generated things

* metadata stuff

* Replace PJS generator mod with PixLyzer (#38)

* pixlizer extractor

* start working on shape extraction

* fix generating language

* fix pixlyzer shape generation

* use empty_shape

* generate blocks and shapes

* update pixlyzer dir

* Revert "update pixlyzer dir"

This reverts commit ee9a0e7a49936dd8569c610ba9b6455895eeff71.

* fix

* fix

* Revert "fix"

This reverts commit ad12ddcb009ccc4eeb13ddef0871db1d9322ab7d.

* fix

* detect pixlyzer fail

* fix pixlyzer

* 22w45a

* gen entities

* add async-trait dep

* update codegen/readme.md

* explain when rust_log should be used

* remove some unused code

* start fixing pixlyzer issues

* fix a thing in codegen

* almost fixed

* more progress towards 1.19.3

* 1.19.3-pre2

* fixes

* revert some hardcoded property names

* Delete clientbound_player_info_packet.rs

* handle 1.19.3 player info packets

* handle playerinforemove

* start updating to 1.19.3-rc1

* optional registries work

* fix some issues with 1.19.3

chat doesn't work yet

* aaaaaaaaaaaaaaaaa

* oh

* ignore unused shapes

* uncomment generate_blocks

* fix migrate

* 1.19.3-rc2

* fix clippy warnings

* 1.19.3-rc3

* split the azalea-buf macro into separate modules

* improve Recipe in protocol

* 1.19.3
---
 .../src/packets/login/serverbound_hello_packet.rs  | 17 ++-------
 .../src/packets/login/serverbound_key_packet.rs    | 43 +---------------------
 2 files changed, 6 insertions(+), 54 deletions(-)

(limited to 'azalea-protocol/src/packets/login')

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>,
 }
-- 
cgit v1.2.3