From 7857a014b92e64361ee237ceae7ef1acc185ac46 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:59:05 -0600
Subject: 1.20.3 (#110)

* 23w40a

* 23w41a

* 23w42a

* 23w43a

* 23w44a

* serialize FormattedText as nbt in network

* use azalea-nbt/serde in azalea-chat

* 23w45a

* fix 23w45a to compile

* handle Object in codegen

* 1.20.3-pre2

* remove unused clientbound_resource_pack_packet.rs

* merge main and make azalea-chat use simdnbt

* 1.20.3-rc1

* fix tests

* use simdnbt 0.3

* fix ServerboundSetJigsawBlockPacket

* 1.20.3
---
 .../configuration/clientbound_resource_pack_pop_packet.rs   |  8 ++++++++
 .../configuration/clientbound_resource_pack_push_packet.rs  | 13 +++++++++++++
 azalea-protocol/src/packets/configuration/mod.rs            | 10 ++++++----
 .../configuration/serverbound_resource_pack_packet.rs       |  5 +++++
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 azalea-protocol/src/packets/configuration/clientbound_resource_pack_pop_packet.rs
 create mode 100644 azalea-protocol/src/packets/configuration/clientbound_resource_pack_push_packet.rs

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

diff --git a/azalea-protocol/src/packets/configuration/clientbound_resource_pack_pop_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_resource_pack_pop_packet.rs
new file mode 100644
index 00000000..6533b589
--- /dev/null
+++ b/azalea-protocol/src/packets/configuration/clientbound_resource_pack_pop_packet.rs
@@ -0,0 +1,8 @@
+use azalea_buf::McBuf;
+use azalea_protocol_macros::ClientboundConfigurationPacket;
+use uuid::Uuid;
+
+#[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)]
+pub struct ClientboundResourcePackPopPacket {
+    pub id: Option<Uuid>,
+}
diff --git a/azalea-protocol/src/packets/configuration/clientbound_resource_pack_push_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_resource_pack_push_packet.rs
new file mode 100644
index 00000000..798f5f98
--- /dev/null
+++ b/azalea-protocol/src/packets/configuration/clientbound_resource_pack_push_packet.rs
@@ -0,0 +1,13 @@
+use azalea_buf::McBuf;
+use azalea_chat::FormattedText;
+use azalea_protocol_macros::ClientboundConfigurationPacket;
+use uuid::Uuid;
+
+#[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)]
+pub struct ClientboundResourcePackPushPacket {
+    pub id: Uuid,
+    pub url: String,
+    pub hash: String,
+    pub required: bool,
+    pub prompt: Option<FormattedText>,
+}
diff --git a/azalea-protocol/src/packets/configuration/mod.rs b/azalea-protocol/src/packets/configuration/mod.rs
index 8244e90a..9516935f 100755
--- a/azalea-protocol/src/packets/configuration/mod.rs
+++ b/azalea-protocol/src/packets/configuration/mod.rs
@@ -4,7 +4,8 @@ pub mod clientbound_finish_configuration_packet;
 pub mod clientbound_keep_alive_packet;
 pub mod clientbound_ping_packet;
 pub mod clientbound_registry_data_packet;
-pub mod clientbound_resource_pack_packet;
+pub mod clientbound_resource_pack_pop_packet;
+pub mod clientbound_resource_pack_push_packet;
 pub mod clientbound_update_enabled_features_packet;
 pub mod clientbound_update_tags_packet;
 pub mod serverbound_client_information_packet;
@@ -32,8 +33,9 @@ declare_state_packets!(
         0x03: clientbound_keep_alive_packet::ClientboundKeepAlivePacket,
         0x04: clientbound_ping_packet::ClientboundPingPacket,
         0x05: clientbound_registry_data_packet::ClientboundRegistryDataPacket,
-        0x06: clientbound_resource_pack_packet::ClientboundResourcePackPacket,
-        0x07: clientbound_update_enabled_features_packet::ClientboundUpdateEnabledFeaturesPacket,
-        0x08: clientbound_update_tags_packet::ClientboundUpdateTagsPacket,
+        0x06: clientbound_resource_pack_pop_packet::ClientboundResourcePackPopPacket,
+        0x07: clientbound_resource_pack_push_packet::ClientboundResourcePackPushPacket,
+        0x08: clientbound_update_enabled_features_packet::ClientboundUpdateEnabledFeaturesPacket,
+        0x09: clientbound_update_tags_packet::ClientboundUpdateTagsPacket,
     }
 );
diff --git a/azalea-protocol/src/packets/configuration/serverbound_resource_pack_packet.rs b/azalea-protocol/src/packets/configuration/serverbound_resource_pack_packet.rs
index 11149115..6f35525e 100644
--- a/azalea-protocol/src/packets/configuration/serverbound_resource_pack_packet.rs
+++ b/azalea-protocol/src/packets/configuration/serverbound_resource_pack_packet.rs
@@ -1,8 +1,10 @@
 use azalea_buf::McBuf;
 use azalea_protocol_macros::ServerboundConfigurationPacket;
+use uuid::Uuid;
 
 #[derive(Clone, Debug, McBuf, ServerboundConfigurationPacket)]
 pub struct ServerboundResourcePackPacket {
+    pub id: Uuid,
     pub action: Action,
 }
 
@@ -12,4 +14,7 @@ pub enum Action {
     Declined = 1,
     FailedDownload = 2,
     Accepted = 3,
+    InvalidUrl = 4,
+    FailedReload = 5,
+    Discarded = 6,
 }
-- 
cgit v1.2.3