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
---
 azalea-protocol/src/connect.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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

diff --git a/azalea-protocol/src/connect.rs b/azalea-protocol/src/connect.rs
index 567e4c40..fde24c40 100755
--- a/azalea-protocol/src/connect.rs
+++ b/azalea-protocol/src/connect.rs
@@ -52,7 +52,7 @@ pub struct WriteConnection<W: ProtocolPacket> {
 ///         login::{
 ///             ClientboundLoginPacket,
 ///             serverbound_hello_packet::ServerboundHelloPacket,
-///             serverbound_key_packet::{ServerboundKeyPacket, NonceOrSaltSignature}
+///             serverbound_key_packet::ServerboundKeyPacket
 ///         },
 ///         handshake::client_intention_packet::ClientIntentionPacket
 ///     }
@@ -80,8 +80,7 @@ pub struct WriteConnection<W: ProtocolPacket> {
 ///     // login
 ///     conn.write(
 ///         ServerboundHelloPacket {
-///             username: "bot".to_string(),
-///             public_key: None,
+///             name: "bot".to_string(),
 ///             profile_id: None,
 ///         }
 ///         .get(),
@@ -96,8 +95,8 @@ pub struct WriteConnection<W: ProtocolPacket> {
 ///
 ///                 conn.write(
 ///                     ServerboundKeyPacket {
-///                         nonce_or_salt_signature: NonceOrSaltSignature::Nonce(e.encrypted_nonce),
 ///                         key_bytes: e.encrypted_public_key,
+///                         encrypted_challenge: e.encrypted_nonce,
 ///                     }
 ///                     .get(),
 ///                 )
@@ -131,7 +130,7 @@ where
     R: ProtocolPacket + Debug,
 {
     /// Read a packet from the stream.
-    pub async fn read(&mut self) -> Result<R, ReadPacketError> {
+    pub async fn read(&mut self) -> Result<R, Box<ReadPacketError>> {
         read_packet::<R, _>(
             &mut self.read_stream,
             &mut self.buffer,
@@ -179,7 +178,7 @@ where
     W: ProtocolPacket + Debug,
 {
     /// Read a packet from the other side of the connection.
-    pub async fn read(&mut self) -> Result<R, ReadPacketError> {
+    pub async fn read(&mut self) -> Result<R, Box<ReadPacketError>> {
         self.reader.read().await
     }
 
@@ -276,7 +275,7 @@ impl Connection<ClientboundLoginPacket, ServerboundLoginPacket> {
     /// use azalea_protocol::connect::Connection;
     /// use azalea_protocol::packets::login::{
     ///     ClientboundLoginPacket,
-    ///     serverbound_key_packet::{ServerboundKeyPacket, NonceOrSaltSignature}
+    ///     serverbound_key_packet::ServerboundKeyPacket
     /// };
     /// use uuid::Uuid;
     /// # use azalea_protocol::ServerAddress;
@@ -307,8 +306,8 @@ impl Connection<ClientboundLoginPacket, ServerboundLoginPacket> {
     ///         ).await?;
     ///         conn.write(
     ///             ServerboundKeyPacket {
-    ///                 nonce_or_salt_signature: NonceOrSaltSignature::Nonce(e.encrypted_nonce),
     ///                 key_bytes: e.encrypted_public_key,
+    ///                 encrypted_challenge: e.encrypted_nonce,
     ///             }.get()
     ///         ).await?;
     ///         conn.set_encryption_key(e.secret_key);
-- 
cgit v1.2.3