Merge pull request #7 from mat-1/1.19

1.19

19 files changed, 290 insertions, 286 deletions

diff --git a/azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs b/azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs
index 9afd151b..8a8a713e 100644
--- a/azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs
@@ -4,9 +4,9 @@ use uuid::Uuid;
 #[derive(Clone, Debug, McBuf, GamePacket)]
 pub struct ClientboundAddEntityPacket {
     #[var]
-    pub id: i32,
+    pub id: u32,
     pub uuid: Uuid,
-    // TODO: have an entity type struct
+    // TODO: have an entity type enum/struct
     #[var]
     pub entity_type: i32,
     pub x: f64,
@@ -14,9 +14,10 @@ pub struct ClientboundAddEntityPacket {
     pub z: f64,
     pub x_rot: i8,
     pub y_rot: i8,
-    // pub y_head_rot: i8,
+    pub y_head_rot: i8,
+    #[var]
     pub data: i32,
-    pub x_vel: u16,
-    pub y_vel: u16,
-    pub z_vel: u16,
+    pub x_vel: i16,
+    pub y_vel: i16,
+    pub z_vel: i16,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_add_mob_packet.rs b/azalea-protocol/src/packets/game/clientbound_add_mob_packet.rs
deleted file mode 100644
index bc0ddcef..00000000
--- a/azalea-protocol/src/packets/game/clientbound_add_mob_packet.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use packet_macros::{GamePacket, McBuf};
-use uuid::Uuid;
-
-#[derive(Clone, Debug, McBuf, GamePacket)]
-pub struct ClientboundAddMobPacket {
-    #[var]
-    pub id: i32,
-    pub uuid: Uuid,
-    // TODO: have an entity type struct
-    #[var]
-    pub entity_type: i32,
-    pub x: f64,
-    pub y: f64,
-    pub z: f64,
-    pub x_rot: i8,
-    pub y_rot: i8,
-    pub y_head_rot: i8,
-    pub x_vel: u16,
-    pub y_vel: u16,
-    pub z_vel: u16,
-}
diff --git a/azalea-protocol/src/packets/game/clientbound_block_changed_ack_packet.rs b/azalea-protocol/src/packets/game/clientbound_block_changed_ack_packet.rs
new file mode 100644
index 00000000..a580440c
--- /dev/null
+++ b/azalea-protocol/src/packets/game/clientbound_block_changed_ack_packet.rs
@@ -0,0 +1,7 @@
+use packet_macros::{GamePacket, McBuf};
+
+#[derive(Clone, Debug, McBuf, GamePacket)]
+pub struct ClientboundBlockChangedAckPacket {
+    #[var]
+    pub sequence: i32,
+}
diff --git a/azalea-protocol/src/packets/game/clientbound_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_chat_packet.rs
deleted file mode 100644
index 77c5370c..00000000
--- a/azalea-protocol/src/packets/game/clientbound_chat_packet.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use azalea_chat::component::Component;
-use packet_macros::{GamePacket, McBuf};
-use uuid::Uuid;
-
-#[derive(Clone, Debug, McBuf, GamePacket)]
-pub struct ClientboundChatPacket {
-    pub message: Component,
-    pub type_: ChatType,
-    pub sender: Uuid,
-}
-
-#[derive(Clone, Debug, Copy, McBuf)]
-pub enum ChatType {
-    Chat = 0,
-    System = 1,
-    GameInfo = 2,
-}
diff --git a/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs b/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs
new file mode 100644
index 00000000..58dd0722
--- /dev/null
+++ b/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs
@@ -0,0 +1,8 @@
+use azalea_chat::component::Component;
+use packet_macros::{GamePacket, McBuf};
+
+#[derive(Clone, Debug, McBuf, GamePacket)]
+pub struct ClientboundChatPreviewPacket {
+    pub query_id: i32,
+    pub preview: Option<Component>,
+}
diff --git a/azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs b/azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs
index 6743c3af..648ca9e0 100755
--- a/azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs
@@ -1,43 +1,20 @@
 use super::GamePacket;
+use crate::mc_buf::McBufVarReadable;
 use crate::mc_buf::{McBufReadable, McBufWritable, Readable, Writable};
 use azalea_core::resource_location::ResourceLocation;
+use packet_macros::{GamePacket, McBuf};
 use std::{
     hash::Hash,
     io::{Read, Write},
 };
 
-#[derive(Hash, Clone, Debug)]
+#[derive(Clone, Debug, McBuf, GamePacket)]
 pub struct ClientboundDeclareCommandsPacket {
     pub entries: Vec<BrigadierNodeStub>,
+    #[var]
     pub root_index: i32,
 }
 
-impl ClientboundDeclareCommandsPacket {
-    pub fn get(self) -> GamePacket {
-        GamePacket::ClientboundDeclareCommandsPacket(self)
-    }
-
-    pub fn write(&self, _buf: &mut impl Write) -> Result<(), std::io::Error> {
-        panic!("ClientboundDeclareCommandsPacket::write not implemented")
-    }
-
-    pub fn read<T: Read>(buf: &mut T) -> Result<GamePacket, String> {
-        let node_count = buf.read_varint()?;
-        let mut nodes = Vec::with_capacity(node_count as usize);
-        for _ in 0..node_count {
-            let node = BrigadierNodeStub::read_into(buf)?;
-            nodes.push(node);
-        }
-        let root_index = buf.read_varint()?;
-        Ok(GamePacket::ClientboundDeclareCommandsPacket(
-            ClientboundDeclareCommandsPacket {
-                entries: nodes,
-                root_index,
-            },
-        ))
-    }
-}
-
 #[derive(Hash, Debug, Clone)]
 pub struct BrigadierNodeStub {}
 
@@ -82,7 +59,7 @@ impl<T: McBufWritable> McBufWritable for BrigadierNumber<T> {
     }
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, McBuf)]
 pub enum BrigadierString {
     /// Reads a single word
     SingleWord = 0,
@@ -92,24 +69,6 @@ pub enum BrigadierString {
     GreedyPhrase = 2,
 }
 
-impl McBufReadable for BrigadierString {
-    fn read_into(buf: &mut impl Read) -> Result<Self, String> {
-        let id = buf.read_byte()?;
-        Ok(match id {
-            0 => BrigadierString::SingleWord,
-            1 => BrigadierString::QuotablePhrase,
-            2 => BrigadierString::GreedyPhrase,
-            _ => panic!("Unknown BrigadierString id: {}", id),
-        })
-    }
-}
-impl McBufWritable for BrigadierString {
-    fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        buf.write_byte(*self as u8)?;
-        Ok(())
-    }
-}
-
 #[derive(Debug, Clone)]
 pub enum BrigadierParser {
     Bool,
@@ -148,7 +107,6 @@ pub enum BrigadierParser {
     MobEffect,
     Function,
     EntityAnchor,
-    Range { decimals_allowed: bool },
     IntRange,
     FloatRange,
     ItemEnchantment,
@@ -160,123 +118,79 @@ pub enum BrigadierParser {
     Time,
     ResourceOrTag { registry_key: ResourceLocation },
     Resource { registry_key: ResourceLocation },
+    TemplateMirror,
+    TemplateRotation,
 }
 
 impl McBufReadable for BrigadierParser {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
-        let parser = buf.read_resource_location()?;
+        let parser_type = u32::var_read_into(buf)?;
 
-        if parser == ResourceLocation::new("brigadier:bool")? {
-            Ok(BrigadierParser::Bool)
-        } else if parser == ResourceLocation::new("brigadier:double")? {
-            Ok(BrigadierParser::Double(BrigadierNumber::read_into(buf)?))
-        } else if parser == ResourceLocation::new("brigadier:float")? {
-            Ok(BrigadierParser::Float(BrigadierNumber::read_into(buf)?))
-        } else if parser == ResourceLocation::new("brigadier:integer")? {
-            Ok(BrigadierParser::Integer(BrigadierNumber::read_into(buf)?))
-        } else if parser == ResourceLocation::new("brigadier:long")? {
-            Ok(BrigadierParser::Long(BrigadierNumber::read_into(buf)?))
-        } else if parser == ResourceLocation::new("brigadier:string")? {
-            Ok(BrigadierParser::String(BrigadierString::read_into(buf)?))
-        } else if parser == ResourceLocation::new("minecraft:entity")? {
-            let flags = buf.read_byte()?;
-            Ok(BrigadierParser::Entity {
-                single: flags & 0x01 != 0,
-                players_only: flags & 0x02 != 0,
-            })
-        } else if parser == ResourceLocation::new("minecraft:game_profile")? {
-            Ok(BrigadierParser::GameProfile)
-        } else if parser == ResourceLocation::new("minecraft:block_pos")? {
-            Ok(BrigadierParser::BlockPos)
-        } else if parser == ResourceLocation::new("minecraft:column_pos")? {
-            Ok(BrigadierParser::ColumnPos)
-        } else if parser == ResourceLocation::new("minecraft:vec3")? {
-            Ok(BrigadierParser::Vec3)
-        } else if parser == ResourceLocation::new("minecraft:vec2")? {
-            Ok(BrigadierParser::Vec2)
-        } else if parser == ResourceLocation::new("minecraft:block_state")? {
-            Ok(BrigadierParser::BlockState)
-        } else if parser == ResourceLocation::new("minecraft:block_predicate")? {
-            Ok(BrigadierParser::BlockPredicate)
-        } else if parser == ResourceLocation::new("minecraft:item_stack")? {
-            Ok(BrigadierParser::ItemStack)
-        } else if parser == ResourceLocation::new("minecraft:item_predicate")? {
-            Ok(BrigadierParser::ItemPredicate)
-        } else if parser == ResourceLocation::new("minecraft:color")? {
-            Ok(BrigadierParser::Color)
-        } else if parser == ResourceLocation::new("minecraft:component")? {
-            Ok(BrigadierParser::Component)
-        } else if parser == ResourceLocation::new("minecraft:message")? {
-            Ok(BrigadierParser::Message)
-        } else if parser == ResourceLocation::new("minecraft:nbt")? {
-            Ok(BrigadierParser::Nbt)
-        } else if parser == ResourceLocation::new("minecraft:nbt_path")? {
-            Ok(BrigadierParser::NbtPath)
-        } else if parser == ResourceLocation::new("minecraft:objective")? {
-            Ok(BrigadierParser::Objective)
-        } else if parser == ResourceLocation::new("minecraft:objective_criteria")? {
-            Ok(BrigadierParser::ObjectiveCriteira)
-        } else if parser == ResourceLocation::new("minecraft:operation")? {
-            Ok(BrigadierParser::Operation)
-        } else if parser == ResourceLocation::new("minecraft:particle")? {
-            Ok(BrigadierParser::Particle)
-        } else if parser == ResourceLocation::new("minecraft:rotation")? {
-            Ok(BrigadierParser::Rotation)
-        } else if parser == ResourceLocation::new("minecraft:angle")? {
-            Ok(BrigadierParser::Angle)
-        } else if parser == ResourceLocation::new("minecraft:scoreboard_slot")? {
-            Ok(BrigadierParser::ScoreboardSlot)
-        } else if parser == ResourceLocation::new("minecraft:score_holder")? {
-            let flags = buf.read_byte()?;
-            Ok(BrigadierParser::ScoreHolder {
-                allows_multiple: flags & 0x01 != 0,
-            })
-        } else if parser == ResourceLocation::new("minecraft:swizzle")? {
-            Ok(BrigadierParser::Swizzle)
-        } else if parser == ResourceLocation::new("minecraft:team")? {
-            Ok(BrigadierParser::Team)
-        } else if parser == ResourceLocation::new("minecraft:item_slot")? {
-            Ok(BrigadierParser::ItemSlot)
-        } else if parser == ResourceLocation::new("minecraft:resource_location")? {
-            Ok(BrigadierParser::ResourceLocation)
-        } else if parser == ResourceLocation::new("minecraft:mob_effect")? {
-            Ok(BrigadierParser::MobEffect)
-        } else if parser == ResourceLocation::new("minecraft:function")? {
-            Ok(BrigadierParser::Function)
-        } else if parser == ResourceLocation::new("minecraft:entity_anchor")? {
-            Ok(BrigadierParser::EntityAnchor)
-        } else if parser == ResourceLocation::new("minecraft:range")? {
-            Ok(BrigadierParser::Range {
-                decimals_allowed: buf.read_boolean()?,
-            })
-        } else if parser == ResourceLocation::new("minecraft:int_range")? {
-            Ok(BrigadierParser::IntRange)
-        } else if parser == ResourceLocation::new("minecraft:float_range")? {
-            Ok(BrigadierParser::FloatRange)
-        } else if parser == ResourceLocation::new("minecraft:item_enchantment")? {
-            Ok(BrigadierParser::ItemEnchantment)
-        } else if parser == ResourceLocation::new("minecraft:entity_summon")? {
-            Ok(BrigadierParser::EntitySummon)
-        } else if parser == ResourceLocation::new("minecraft:dimension")? {
-            Ok(BrigadierParser::Dimension)
-        } else if parser == ResourceLocation::new("minecraft:uuid")? {
-            Ok(BrigadierParser::Uuid)
-        } else if parser == ResourceLocation::new("minecraft:nbt_tag")? {
-            Ok(BrigadierParser::NbtTag)
-        } else if parser == ResourceLocation::new("minecraft:nbt_compound_tag")? {
-            Ok(BrigadierParser::NbtCompoundTag)
-        } else if parser == ResourceLocation::new("minecraft:time")? {
-            Ok(BrigadierParser::Time)
-        } else if parser == ResourceLocation::new("minecraft:resource_or_tag")? {
-            Ok(BrigadierParser::ResourceOrTag {
+        match parser_type {
+            0 => Ok(BrigadierParser::Bool),
+            1 => Ok(BrigadierParser::Float(BrigadierNumber::read_into(buf)?)),
+            2 => Ok(BrigadierParser::Double(BrigadierNumber::read_into(buf)?)),
+            3 => Ok(BrigadierParser::Integer(BrigadierNumber::read_into(buf)?)),
+            4 => Ok(BrigadierParser::Long(BrigadierNumber::read_into(buf)?)),
+            5 => Ok(BrigadierParser::String(BrigadierString::read_into(buf)?)),
+            6 => {
+                let flags = buf.read_byte()?;
+                Ok(BrigadierParser::Entity {
+                    single: flags & 0x01 != 0,
+                    players_only: flags & 0x02 != 0,
+                })
+            }
+            7 => Ok(BrigadierParser::GameProfile),
+            8 => Ok(BrigadierParser::BlockPos),
+            9 => Ok(BrigadierParser::ColumnPos),
+            10 => Ok(BrigadierParser::Vec3),
+            11 => Ok(BrigadierParser::Vec2),
+            12 => Ok(BrigadierParser::BlockState),
+            13 => Ok(BrigadierParser::BlockPredicate),
+            14 => Ok(BrigadierParser::ItemStack),
+            15 => Ok(BrigadierParser::ItemPredicate),
+            16 => Ok(BrigadierParser::Color),
+            17 => Ok(BrigadierParser::Component),
+            18 => Ok(BrigadierParser::Message),
+            19 => Ok(BrigadierParser::NbtCompoundTag),
+            20 => Ok(BrigadierParser::NbtTag),
+            21 => Ok(BrigadierParser::NbtPath),
+            22 => Ok(BrigadierParser::Objective),
+            23 => Ok(BrigadierParser::ObjectiveCriteira),
+            24 => Ok(BrigadierParser::Operation),
+            25 => Ok(BrigadierParser::Particle),
+            26 => Ok(BrigadierParser::Angle),
+            27 => Ok(BrigadierParser::Rotation),
+            28 => Ok(BrigadierParser::ScoreboardSlot),
+            29 => {
+                let flags = buf.read_byte()?;
+                Ok(BrigadierParser::ScoreHolder {
+                    allows_multiple: flags & 0x01 != 0,
+                })
+            }
+            30 => Ok(BrigadierParser::Swizzle),
+            31 => Ok(BrigadierParser::Team),
+            32 => Ok(BrigadierParser::ItemSlot),
+            33 => Ok(BrigadierParser::ResourceLocation),
+            34 => Ok(BrigadierParser::MobEffect),
+            35 => Ok(BrigadierParser::Function),
+            36 => Ok(BrigadierParser::EntityAnchor),
+            37 => Ok(BrigadierParser::IntRange),
+            38 => Ok(BrigadierParser::FloatRange),
+            39 => Ok(BrigadierParser::ItemEnchantment),
+            40 => Ok(BrigadierParser::EntitySummon),
+            41 => Ok(BrigadierParser::Dimension),
+            42 => Ok(BrigadierParser::Time),
+            43 => Ok(BrigadierParser::ResourceOrTag {
                 registry_key: buf.read_resource_location()?,
-            })
-        } else if parser == ResourceLocation::new("minecraft:resource")? {
-            Ok(BrigadierParser::Resource {
+            }),
+            44 => Ok(BrigadierParser::Resource {
                 registry_key: buf.read_resource_location()?,
-            })
-        } else {
-            panic!("Unknown Brigadier parser: {}", parser)
+            }),
+            45 => Ok(BrigadierParser::TemplateMirror),
+            46 => Ok(BrigadierParser::TemplateRotation),
+            47 => Ok(BrigadierParser::Uuid),
+            _ => Err(format!("Unknown BrigadierParser type: {}", parser_type)),
         }
     }
 }
@@ -287,7 +201,7 @@ impl McBufReadable for BrigadierNodeStub {
         let flags = u8::read_into(buf)?;
         if flags > 31 {
             println!(
-                "Warning: The flags from a Brigadier node are over 31. This is probably a bug."
+                "Warning: The flags from a Brigadier node are over 31 ({flags}; {flags:#b}). This is probably a bug.",
             );
         }
 
@@ -319,3 +233,9 @@ impl McBufReadable for BrigadierNodeStub {
         // return Err("Unknown node type".to_string());
     }
 }
+
+impl McBufWritable for BrigadierNodeStub {
+    fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
+        todo!()
+    }
+}
diff --git a/azalea-protocol/src/packets/game/clientbound_login_packet.rs b/azalea-protocol/src/packets/game/clientbound_login_packet.rs
index b4a1b8d4..6ddc6b5a 100755
--- a/azalea-protocol/src/packets/game/clientbound_login_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_login_packet.rs
@@ -1,4 +1,4 @@
-use azalea_core::{game_type::GameType, resource_location::ResourceLocation};
+use azalea_core::{game_type::GameType, resource_location::ResourceLocation, GlobalPos};
 use packet_macros::{GamePacket, McBuf};
 
 #[derive(Clone, Debug, McBuf, GamePacket)]
@@ -9,7 +9,7 @@ pub struct ClientboundLoginPacket {
     pub previous_game_type: Option<GameType>,
     pub levels: Vec<ResourceLocation>,
     pub registry_holder: azalea_nbt::Tag,
-    pub dimension_type: azalea_nbt::Tag,
+    pub dimension_type: ResourceLocation,
     pub dimension: ResourceLocation,
     pub seed: i64,
     #[var]
@@ -22,4 +22,5 @@ pub struct ClientboundLoginPacket {
     pub show_death_screen: bool,
     pub is_debug: bool,
     pub is_flat: bool,
+    pub last_death_location: Option<GlobalPos>,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs
new file mode 100644
index 00000000..e6941f25
--- /dev/null
+++ b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs
@@ -0,0 +1,21 @@
+use azalea_chat::component::Component;
+use azalea_crypto::SaltSignaturePair;
+use packet_macros::{GamePacket, McBuf};
+
+#[derive(Clone, Debug, McBuf, GamePacket)]
+pub struct ClientboundPlayerChatPacket {
+    pub signed_content: Component,
+    pub unsigned_content: Option<Component>,
+    #[var]
+    pub type_id: i32,
+    pub sender: ChatSender,
+    pub timestamp: u64,
+    pub salt_signature: SaltSignaturePair,
+}
+
+#[derive(Clone, Debug, McBuf)]
+pub struct ChatSender {
+    pub uuid: uuid::Uuid,
+    pub name: Component,
+    pub team_name: Option<Component>,
+}
diff --git a/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs b/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs
new file mode 100644
index 00000000..4c2d94e6
--- /dev/null
+++ b/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs
@@ -0,0 +1,9 @@
+use azalea_chat::component::Component;
+use packet_macros::{GamePacket, McBuf};
+
+#[derive(Clone, Debug, McBuf, GamePacket)]
+pub struct ClientboundServerDataPacket {
+    pub motd: Option<Component>,
+    pub icon_base64: Option<String>,
+    pub previews_chat: bool,
+}
diff --git a/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center.rs b/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center_packet.rs
index 7557c16b..7557c16b 100644
--- a/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center.rs
+++ b/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center_packet.rs
diff --git a/azalea-protocol/src/packets/game/clientbound_set_display_chat_preview_packet.rs b/azalea-protocol/src/packets/game/clientbound_set_display_chat_preview_packet.rs
new file mode 100644
index 00000000..46a0d582
--- /dev/null
+++ b/azalea-protocol/src/packets/game/clientbound_set_display_chat_preview_packet.rs
@@ -0,0 +1,6 @@
+use packet_macros::{GamePacket, McBuf};
+
+#[derive(Clone, Debug, McBuf, GamePacket)]
+pub struct ClientboundSetDisplayChatPreviewPacket {
+    pub enabled: bool,
+}
diff --git a/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs
new file mode 100644
index 00000000..dfa75a5b
--- /dev/null
+++ b/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs
@@ -0,0 +1,9 @@
+use azalea_chat::component::Component;
+use packet_macros::{GamePacket, McBuf};
+
+#[derive(Clone, Debug, McBuf, GamePacket)]
+pub struct ClientboundSystemChatPacket {
+    pub content: Component,
+    #[var]
+    pub type_id: i32,
+}
diff --git a/azalea-protocol/src/packets/game/mod.rs b/azalea-protocol/src/packets/game/mod.rs
index 883e03aa..eee36788 100755
--- a/azalea-protocol/src/packets/game/mod.rs
+++ b/azalea-protocol/src/packets/game/mod.rs
@@ -1,10 +1,10 @@
 pub mod clientbound_add_entity_packet;
-pub mod clientbound_add_mob_packet;
 pub mod clientbound_add_player_packet;
 pub mod clientbound_animate_packet;
+pub mod clientbound_block_changed_ack_packet;
 pub mod clientbound_block_update_packet;
 pub mod clientbound_change_difficulty_packet;
-pub mod clientbound_chat_packet;
+pub mod clientbound_chat_preview_packet;
 pub mod clientbound_container_set_content_packet;
 pub mod clientbound_custom_payload_packet;
 pub mod clientbound_declare_commands_packet;
@@ -23,27 +23,33 @@ pub mod clientbound_move_entity_pos_packet;
 pub mod clientbound_move_entity_posrot_packet;
 pub mod clientbound_move_entity_rot_packet;
 pub mod clientbound_player_abilities_packet;
+pub mod clientbound_player_chat_packet;
 pub mod clientbound_player_info_packet;
 pub mod clientbound_player_position_packet;
 pub mod clientbound_recipe_packet;
 pub mod clientbound_remove_entities_packet;
 pub mod clientbound_rotate_head_packet;
 pub mod clientbound_section_blocks_update_packet;
+pub mod clientbound_server_data_packet;
 pub mod clientbound_set_carried_item_packet;
-pub mod clientbound_set_chunk_cache_center;
+pub mod clientbound_set_chunk_cache_center_packet;
 pub mod clientbound_set_default_spawn_position_packet;
+pub mod clientbound_set_display_chat_preview_packet;
 pub mod clientbound_set_entity_data_packet;
 pub mod clientbound_set_entity_link_packet;
 pub mod clientbound_set_experience_packet;
 pub mod clientbound_set_health_packet;
 pub mod clientbound_set_time_packet;
 pub mod clientbound_sound_packet;
+pub mod clientbound_system_chat_packet;
 pub mod clientbound_teleport_entity_packet;
 pub mod clientbound_update_advancements_packet;
 pub mod clientbound_update_attributes_packet;
 pub mod clientbound_update_recipes_packet;
 pub mod clientbound_update_tags_packet;
 pub mod clientbound_update_view_distance_packet;
+pub mod serverbound_chat_command_packet;
+pub mod serverbound_chat_preview_packet;
 pub mod serverbound_custom_payload_packet;
 pub mod serverbound_keep_alive_packet;
 
@@ -52,55 +58,61 @@ use packet_macros::declare_state_packets;
 declare_state_packets!(
     GamePacket,
     Serverbound => {
-        0x0a: serverbound_custom_payload_packet::ServerboundCustomPayloadPacket,
-        0x0f: serverbound_keep_alive_packet::ServerboundKeepAlivePacket,
+        0x03: serverbound_chat_command_packet::ServerboundChatCommandPacket,
+        0x05: serverbound_chat_preview_packet::ServerboundChatPreviewPacket,
+        0x0c: serverbound_custom_payload_packet::ServerboundCustomPayloadPacket,
+        0x11: serverbound_keep_alive_packet::ServerboundKeepAlivePacket,
     },
     Clientbound => {
         0x00: clientbound_add_entity_packet::ClientboundAddEntityPacket,
-        0x02: clientbound_add_mob_packet::ClientboundAddMobPacket,
-        0x04: clientbound_add_player_packet::ClientboundAddPlayerPacket,
-        0x06: clientbound_animate_packet::ClientboundAnimatePacket,
-        0x0c: clientbound_block_update_packet::ClientboundBlockUpdatePacket,
-        0x0e: clientbound_change_difficulty_packet::ClientboundChangeDifficultyPacket,
-        0x0f: clientbound_chat_packet::ClientboundChatPacket,
-        0x12: clientbound_declare_commands_packet::ClientboundDeclareCommandsPacket,
-        0x14: clientbound_container_set_content_packet::ClientboundContainerSetContentPacket,
-        0x1a: clientbound_disconnect_packet::ClientboundDisconnectPacket,
-        0x1b: clientbound_entity_event_packet::ClientboundEntityEventPacket,
-        0x18: clientbound_custom_payload_packet::ClientboundCustomPayloadPacket,
-        0x1e: clientbound_game_event_packet::ClientboundGameEventPacket,
-        0x20: clientbound_initialize_border_packet::ClientboundInitializeBorderPacket,
-        0x21: clientbound_keep_alive_packet::ClientboundKeepAlivePacket,
-        0x22: clientbound_level_chunk_with_light_packet::ClientboundLevelChunkWithLightPacket,
-        0x23: clientbound_level_event_packet::ClientboundLevelEventPacket,
-        0x24: clientbound_level_particles_packet::ClientboundLevelParticlesPacket,
-        0x25: clientbound_light_update_packet::ClientboundLightUpdatePacket,
-        0x26: clientbound_login_packet::ClientboundLoginPacket,
-        0x29: clientbound_move_entity_pos_packet::ClientboundMoveEntityPosPacket,
-        0x2a: clientbound_move_entity_posrot_packet::ClientboundMoveEntityPosRotPacket,
-        0x2b: clientbound_move_entity_rot_packet::ClientboundMoveEntityRotPacket,
-        0x32: clientbound_player_abilities_packet::ClientboundPlayerAbilitiesPacket,
-        0x36: clientbound_player_info_packet::ClientboundPlayerInfoPacket,
-        0x38: clientbound_player_position_packet::ClientboundPlayerPositionPacket,
-        0x39: clientbound_recipe_packet::ClientboundRecipePacket,
-        0x3a: clientbound_remove_entities_packet::ClientboundRemoveEntitiesPacket,
-        0x3e: clientbound_rotate_head_packet::ClientboundRotateHeadPacket,
-        0x3f: clientbound_section_blocks_update_packet::ClientboundSectionBlocksUpdatePacket,
-        0x48: clientbound_set_carried_item_packet::ClientboundSetCarriedItemPacket,
-        0x49: clientbound_set_chunk_cache_center::ClientboundSetChunkCacheCenterPacket,
-        0x4a: clientbound_update_view_distance_packet::ClientboundUpdateViewDistancePacket,
-        0x4b: clientbound_set_default_spawn_position_packet::ClientboundSetDefaultSpawnPositionPacket,
+        0x02: clientbound_add_player_packet::ClientboundAddPlayerPacket,
+        0x03: clientbound_animate_packet::ClientboundAnimatePacket,
+        0x05: clientbound_block_changed_ack_packet::ClientboundBlockChangedAckPacket,
+        0x09: clientbound_block_update_packet::ClientboundBlockUpdatePacket,
+        0x0b: clientbound_change_difficulty_packet::ClientboundChangeDifficultyPacket,
+        0x0c: clientbound_chat_preview_packet::ClientboundChatPreviewPacket,
+        0x0f: clientbound_declare_commands_packet::ClientboundDeclareCommandsPacket,
+        0x11: clientbound_container_set_content_packet::ClientboundContainerSetContentPacket,
+        0x15: clientbound_custom_payload_packet::ClientboundCustomPayloadPacket,
+        0x17: clientbound_disconnect_packet::ClientboundDisconnectPacket,
+        0x18: clientbound_entity_event_packet::ClientboundEntityEventPacket,
+        0x1b: clientbound_game_event_packet::ClientboundGameEventPacket,
+        0x1d: clientbound_initialize_border_packet::ClientboundInitializeBorderPacket,
+        0x1e: clientbound_keep_alive_packet::ClientboundKeepAlivePacket,
+        0x1f: clientbound_level_chunk_with_light_packet::ClientboundLevelChunkWithLightPacket,
+        0x20: clientbound_level_event_packet::ClientboundLevelEventPacket,
+        0x21: clientbound_level_particles_packet::ClientboundLevelParticlesPacket,
+        0x22: clientbound_light_update_packet::ClientboundLightUpdatePacket,
+        0x23: clientbound_login_packet::ClientboundLoginPacket,
+        0x26: clientbound_move_entity_pos_packet::ClientboundMoveEntityPosPacket,
+        0x27: clientbound_move_entity_posrot_packet::ClientboundMoveEntityPosRotPacket,
+        0x28: clientbound_move_entity_rot_packet::ClientboundMoveEntityRotPacket,
+        0x2f: clientbound_player_abilities_packet::ClientboundPlayerAbilitiesPacket,
+        0x30: clientbound_player_chat_packet::ClientboundPlayerChatPacket,
+        0x34: clientbound_player_info_packet::ClientboundPlayerInfoPacket,
+        0x36: clientbound_player_position_packet::ClientboundPlayerPositionPacket,
+        0x37: clientbound_recipe_packet::ClientboundRecipePacket,
+        0x38: clientbound_remove_entities_packet::ClientboundRemoveEntitiesPacket,
+        0x3c: clientbound_rotate_head_packet::ClientboundRotateHeadPacket,
+        0x3d: clientbound_section_blocks_update_packet::ClientboundSectionBlocksUpdatePacket,
+        0x3f: clientbound_server_data_packet::ClientboundServerDataPacket,
+        0x44: clientbound_set_entity_link_packet::ClientboundSetEntityLinkPacket,
+        0x47: clientbound_set_carried_item_packet::ClientboundSetCarriedItemPacket,
+        0x48: clientbound_set_chunk_cache_center_packet::ClientboundSetChunkCacheCenterPacket,
+        0x49: clientbound_update_view_distance_packet::ClientboundUpdateViewDistancePacket,
+        0x4a: clientbound_set_default_spawn_position_packet::ClientboundSetDefaultSpawnPositionPacket,
+        0x4b: clientbound_set_display_chat_preview_packet::ClientboundSetDisplayChatPreviewPacket,
         0x4d: clientbound_set_entity_data_packet::ClientboundSetEntityDataPacket,
-        0x45: clientbound_set_entity_link_packet::ClientboundSetEntityLinkPacket,
         0x4f: clientbound_entity_velocity_packet::ClientboundEntityVelocityPacket,
         0x51: clientbound_set_experience_packet::ClientboundSetExperiencePacket,
         0x52: clientbound_set_health_packet::ClientboundSetHealthPacket,
         0x59: clientbound_set_time_packet::ClientboundSetTimePacket,
         0x5d: clientbound_sound_packet::ClientboundSoundPacket,
-        0x62: clientbound_teleport_entity_packet::ClientboundTeleportEntityPacket,
-        0x63: clientbound_update_advancements_packet::ClientboundUpdateAdvancementsPacket,
-        0x64: clientbound_update_attributes_packet::ClientboundUpdateAttributesPacket,
-        0x66: clientbound_update_recipes_packet::ClientboundUpdateRecipesPacket,
-        0x67: clientbound_update_tags_packet::ClientboundUpdateTagsPacket,
+        0x5f: clientbound_system_chat_packet::ClientboundSystemChatPacket,
+        0x63: clientbound_teleport_entity_packet::ClientboundTeleportEntityPacket,
+        0x64: clientbound_update_advancements_packet::ClientboundUpdateAdvancementsPacket,
+        0x65: clientbound_update_attributes_packet::ClientboundUpdateAttributesPacket,
+        0x67: clientbound_update_recipes_packet::ClientboundUpdateRecipesPacket,
+        0x68: clientbound_update_tags_packet::ClientboundUpdateTagsPacket,
     }
 );
diff --git a/azalea-protocol/src/packets/game/serverbound_chat_command_packet.rs b/azalea-protocol/src/packets/game/serverbound_chat_command_packet.rs
new file mode 100644
index 00000000..9ae0b79f
--- /dev/null
+++ b/azalea-protocol/src/packets/game/serverbound_chat_command_packet.rs
@@ -0,0 +1,18 @@
+use std::collections::HashMap;
+
+use packet_macros::{GamePacket, McBuf};
+
+#[derive(Clone, Debug, McBuf, GamePacket)]
+pub struct ServerboundChatCommandPacket {
+    pub command: String,
+    // TODO: Choose a real timestamp type
+    pub timestamp: u64,
+    pub argument_signatures: ArgumentSignatures,
+    pub signed_preview: bool,
+}
+
+#[derive(Clone, Debug, McBuf)]
+pub struct ArgumentSignatures {
+    pub salt: u64,
+    pub signatures: HashMap<String, Vec<u8>>,
+}
diff --git a/azalea-protocol/src/packets/game/serverbound_chat_preview_packet.rs b/azalea-protocol/src/packets/game/serverbound_chat_preview_packet.rs
new file mode 100644
index 00000000..60535f69
--- /dev/null
+++ b/azalea-protocol/src/packets/game/serverbound_chat_preview_packet.rs
@@ -0,0 +1,7 @@
+use packet_macros::{GamePacket, McBuf};
+
+#[derive(Clone, Debug, McBuf, GamePacket)]
+pub struct ServerboundChatPreviewPacket {
+    pub query_id: i32,
+    pub query: String,
+}
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())
-    }
-}
diff --git a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
index 5cb660ed..46fb665e 100755
--- a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
+++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
@@ -1,7 +1,18 @@
 use packet_macros::{LoginPacket, McBuf};
-use std::hash::Hash;
 
-#[derive(Hash, Clone, Debug, McBuf, LoginPacket)]
+#[derive(Clone, Debug, McBuf, LoginPacket)]
 pub struct ServerboundHelloPacket {
     pub username: String,
+    pub public_key: Option<ProfilePublicKeyData>,
+}
+
+pub struct ProfilePublicKey {
+    pub data: ProfilePublicKeyData,
+}
+
+#[derive(Clone, Debug, McBuf)]
+pub struct ProfilePublicKeyData {
+    pub expires_at: u64,
+    pub key: Vec<u8>,
+    pub key_signature: Vec<u8>,
 }
diff --git a/azalea-protocol/src/packets/login/serverbound_key_packet.rs b/azalea-protocol/src/packets/login/serverbound_key_packet.rs
index 9100823d..d57b122a 100644
--- a/azalea-protocol/src/packets/login/serverbound_key_packet.rs
+++ b/azalea-protocol/src/packets/login/serverbound_key_packet.rs
@@ -1,8 +1,46 @@
+use azalea_crypto::SaltSignaturePair;
 use packet_macros::{LoginPacket, McBuf};
-use std::hash::Hash;
+use std::io::{Read, Write};
 
-#[derive(Hash, Clone, Debug, McBuf, LoginPacket)]
+use crate::mc_buf::{McBufReadable, McBufWritable};
+
+#[derive(Clone, Debug, McBuf, LoginPacket)]
 pub struct ServerboundKeyPacket {
-    pub shared_secret: Vec<u8>,
-    pub nonce: Vec<u8>,
+    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_into(buf: &mut impl Read) -> Result<Self, String> {
+        let is_nonce = bool::read_into(buf)?;
+        if is_nonce {
+            Ok(NonceOrSaltSignature::Nonce(Vec::<u8>::read_into(buf)?))
+        } else {
+            Ok(NonceOrSaltSignature::SaltSignature(
+                SaltSignaturePair::read_into(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(())
+    }
 }
diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs
index 16e97068..1cc79b79 100755
--- a/azalea-protocol/src/packets/mod.rs
+++ b/azalea-protocol/src/packets/mod.rs
@@ -12,7 +12,7 @@ use crate::{
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
 
-pub const PROTOCOL_VERSION: u32 = 758;
+pub const PROTOCOL_VERSION: u32 = 759;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, FromPrimitive)]
 pub enum ConnectionProtocol {