1.19

README.md

@@ -7,7 +7,7 @@ A Rust crate for creating Minecraft bots.
 </p>
 
 <!-- The line below is automatically read and updated by the migrate script, so don't change it manually. -->
-*Currently supported Minecraft version: `1.18.2`.*
+*Currently supported Minecraft version: `1.19-pre3`.*
 
 I named this Azalea because it sounds like a cool word and this is a cool library. This project was heavily inspired by PrismarineJS.
 

azalea-client/src/connect.rs

@@ -4,7 +4,8 @@ use azalea_protocol::{
     connect::{GameConnection, HandshakeConnection},
     packets::{
         game::{
-            clientbound_chat_packet::ClientboundChatPacket,
+            clientbound_player_chat_packet::ClientboundPlayerChatPacket,
+            clientbound_system_chat_packet::ClientboundSystemChatPacket,
             serverbound_custom_payload_packet::ServerboundCustomPayloadPacket,
             serverbound_keep_alive_packet::ServerboundKeepAlivePacket, GamePacket,
         },
@@ -43,10 +44,25 @@ pub struct Client {
     // game_loop
 }
 
+#[derive(Debug, Clone)]
+pub enum ChatPacket {
+    System(ClientboundSystemChatPacket),
+    Player(ClientboundPlayerChatPacket),
+}
+
+// impl ChatPacket {
+//     pub fn message(&self) -> &str {
+//         match self {
+//             ChatPacket::System(p) => &p.content,
+//             ChatPacket::Player(p) => &p.message,
+//         }
+//     }
+// }
+
 #[derive(Debug, Clone)]
 pub enum Event {
     Login,
-    Chat(ClientboundChatPacket),
+    Chat(ChatPacket),
 }
 
 /// Whether we should ignore errors when decoding packets.
@@ -75,6 +91,7 @@ impl Client {
         conn.write(
             ServerboundHelloPacket {
                 username: account.username.clone(),
+                public_key: None,
             }
             .get(),
         )
@@ -290,9 +307,6 @@ impl Client {
             GamePacket::ClientboundLightUpdatePacket(p) => {
                 println!("Got light update packet {:?}", p);
             }
-            GamePacket::ClientboundAddMobPacket(p) => {
-                println!("Got add mob packet {:?}", p);
-            }
             GamePacket::ClientboundAddEntityPacket(p) => {
                 println!("Got add entity packet {:?}", p);
             }
@@ -357,9 +371,13 @@ impl Client {
             GamePacket::ClientboundRemoveEntitiesPacket(p) => {
                 println!("Got remove entities packet {:?}", p);
             }
-            GamePacket::ClientboundChatPacket(p) => {
+            GamePacket::ClientboundPlayerChatPacket(p) => {
-                println!("Got chat packet {:?}", p);
+                println!("Got player chat packet {:?}", p);
-                tx.send(Event::Chat(p.clone())).unwrap();
+                tx.send(Event::Chat(ChatPacket::Player(p.clone()))).unwrap();
+            }
+            GamePacket::ClientboundSystemChatPacket(p) => {
+                println!("Got system chat packet {:?}", p);
+                tx.send(Event::Chat(ChatPacket::System(p.clone()))).unwrap();
             }
             GamePacket::ClientboundSoundPacket(p) => {
                 println!("Got sound packet {:?}", p);

azalea-crypto/src/lib.rs

@@ -1,3 +1,5 @@
+mod signing;
+
 use aes::cipher::inout::InOutBuf;
 use aes::{
     cipher::{BlockDecryptMut, BlockEncryptMut, KeyIvInit},
@@ -5,6 +7,7 @@ use aes::{
 };
 use rand::{rngs::OsRng, RngCore};
 use sha1::{Digest, Sha1};
+pub use signing::SaltSignaturePair;
 
 fn generate_secret_key() -> [u8; 16] {
     let mut key = [0u8; 16];
@@ -65,7 +68,6 @@ pub fn create_cipher(key: &[u8]) -> (Aes128CfbEnc, Aes128CfbDec) {
     )
 }
 
-// wow this is terrible
 pub fn encrypt_packet(cipher: &mut Aes128CfbEnc, packet: &mut [u8]) {
     let (chunks, rest) = InOutBuf::from(packet).into_chunks();
     assert!(rest.is_empty());

azalea-crypto/src/signing.rs

@@ -0,0 +1,5 @@
+#[derive(Debug, Clone)]
+pub struct SaltSignaturePair {
+    pub salt: u64,
+    pub signature: Vec<u8>,
+}

azalea-protocol/src/mc_buf/read.rs

@@ -4,6 +4,7 @@ use azalea_core::{
     difficulty::Difficulty, game_type::GameType, resource_location::ResourceLocation,
     serializable_uuid::SerializableUuid, BlockPos, ChunkSectionPos, Direction, Slot, SlotData,
 };
+use azalea_crypto::SaltSignaturePair;
 use byteorder::{ReadBytesExt, BE};
 use serde::Deserialize;
 use std::{collections::HashMap, hash::Hash, io::Read};
@@ -311,56 +312,48 @@ impl McBufReadable for Vec<u8> {
     }
 }
 
-// string
 impl McBufReadable for String {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_utf()
     }
 }
 
-// ResourceLocation
 impl McBufReadable for ResourceLocation {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_resource_location()
     }
 }
 
-// u32
 impl McBufReadable for u32 {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         Readable::read_int(buf).map(|i| i as u32)
     }
 }
 
-// u32 varint
 impl McBufVarReadable for u32 {
     fn var_read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_varint().map(|i| i as u32)
     }
 }
 
-// u16
 impl McBufReadable for u16 {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_short().map(|i| i as u16)
     }
 }
 
-// i16
 impl McBufReadable for i16 {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_short()
     }
 }
 
-// u16 varint
 impl McBufVarReadable for u16 {
     fn var_read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_varint().map(|i| i as u16)
     }
 }
 
-// Vec<T> varint
 impl<T: McBufVarReadable> McBufVarReadable for Vec<T> {
     fn var_read_into(buf: &mut impl Read) -> Result<Self, String> {
         let length = buf.read_varint()? as usize;
@@ -372,70 +365,60 @@ impl<T: McBufVarReadable> McBufVarReadable for Vec<T> {
     }
 }
 
-// i64
 impl McBufReadable for i64 {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_long()
     }
 }
 
-// u64
 impl McBufReadable for u64 {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         i64::read_into(buf).map(|i| i as u64)
     }
 }
 
-// bool
 impl McBufReadable for bool {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_boolean()
     }
 }
 
-// u8
 impl McBufReadable for u8 {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_byte()
     }
 }
 
-// i8
 impl McBufReadable for i8 {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_byte().map(|i| i as i8)
     }
 }
 
-// f32
 impl McBufReadable for f32 {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_float()
     }
 }
 
-// f64
 impl McBufReadable for f64 {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_double()
     }
 }
 
-// GameType
 impl McBufReadable for GameType {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         GameType::from_id(buf.read_byte()?)
     }
 }
 
-// Option<GameType>
 impl McBufReadable for Option<GameType> {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         GameType::from_optional_id(buf.read_byte()? as i8)
     }
 }
 
-// Option<String>
 impl<T: McBufReadable> McBufReadable for Option<T> {
     default fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         let present = buf.read_boolean()?;
@@ -447,21 +430,18 @@ impl<T: McBufReadable> McBufReadable for Option<T> {
     }
 }
 
-// azalea_nbt::Tag
 impl McBufReadable for azalea_nbt::Tag {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_nbt()
     }
 }
 
-// Difficulty
 impl McBufReadable for Difficulty {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         Ok(Difficulty::by_id(u8::read_into(buf)?))
     }
 }
 
-// Component
 impl McBufReadable for Component {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         let string = buf.read_utf()?;
@@ -472,7 +452,6 @@ impl McBufReadable for Component {
     }
 }
 
-// Slot
 impl McBufReadable for Slot {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         let present = buf.read_boolean()?;
@@ -486,14 +465,12 @@ impl McBufReadable for Slot {
     }
 }
 
-// Uuid
 impl McBufReadable for Uuid {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         buf.read_uuid()
     }
 }
 
-// BlockPos
 impl McBufReadable for BlockPos {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         let val = u64::read_into(buf)?;
@@ -504,7 +481,6 @@ impl McBufReadable for BlockPos {
     }
 }
 
-// Direction
 impl McBufReadable for Direction {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         match buf.read_varint()? {
@@ -519,7 +495,6 @@ impl McBufReadable for Direction {
     }
 }
 
-// ChunkSectionPos
 impl McBufReadable for ChunkSectionPos {
     fn read_into(buf: &mut impl Read) -> Result<Self, String> {
         let long = i64::read_into(buf)?;
@@ -530,3 +505,11 @@ impl McBufReadable for ChunkSectionPos {
         })
     }
 }
+
+impl McBufReadable for SaltSignaturePair {
+    fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+        let salt = u64::read_into(buf)?;
+        let signature = Vec::<u8>::read_into(buf)?;
+        Ok(SaltSignaturePair { salt, signature })
+    }
+}

azalea-protocol/src/mc_buf/write.rs

@@ -4,6 +4,7 @@ use azalea_core::{
     difficulty::Difficulty, game_type::GameType, resource_location::ResourceLocation,
     serializable_uuid::SerializableUuid, BlockPos, ChunkSectionPos, Direction, Slot,
 };
+use azalea_crypto::SaltSignaturePair;
 use byteorder::{BigEndian, WriteBytesExt};
 use std::{collections::HashMap, io::Write};
 use uuid::Uuid;
@@ -436,3 +437,11 @@ impl McBufWritable for ChunkSectionPos {
         Ok(())
     }
 }
+
+impl McBufWritable for SaltSignaturePair {
+    fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
+        self.salt.write_into(buf)?;
+        self.signature.write_into(buf)?;
+        Ok(())
+    }
+}

azalea-protocol/src/packets/game/clientbound_add_mob_packet.rs

@@ -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,
-}

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,
+}

azalea-protocol/src/packets/game/clientbound_chat_packet.rs

@@ -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,
-}

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>,
+}

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>,
+}

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,
+}

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,
+}

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,
+}

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,
+        0x03: serverbound_chat_command_packet::ServerboundChatCommandPacket,
-        0x0f: serverbound_keep_alive_packet::ServerboundKeepAlivePacket,
+        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,
+        0x02: clientbound_add_player_packet::ClientboundAddPlayerPacket,
-        0x04: clientbound_add_player_packet::ClientboundAddPlayerPacket,
+        0x03: clientbound_animate_packet::ClientboundAnimatePacket,
-        0x06: clientbound_animate_packet::ClientboundAnimatePacket,
+        0x05: clientbound_block_changed_ack_packet::ClientboundBlockChangedAckPacket,
-        0x0c: clientbound_block_update_packet::ClientboundBlockUpdatePacket,
+        0x09: clientbound_block_update_packet::ClientboundBlockUpdatePacket,
-        0x0e: clientbound_change_difficulty_packet::ClientboundChangeDifficultyPacket,
+        0x0b: clientbound_change_difficulty_packet::ClientboundChangeDifficultyPacket,
-        0x0f: clientbound_chat_packet::ClientboundChatPacket,
+        0x0c: clientbound_chat_preview_packet::ClientboundChatPreviewPacket,
-        0x12: clientbound_declare_commands_packet::ClientboundDeclareCommandsPacket,
+        0x0f: clientbound_declare_commands_packet::ClientboundDeclareCommandsPacket,
-        0x14: clientbound_container_set_content_packet::ClientboundContainerSetContentPacket,
+        0x11: clientbound_container_set_content_packet::ClientboundContainerSetContentPacket,
-        0x1a: clientbound_disconnect_packet::ClientboundDisconnectPacket,
+        0x15: clientbound_custom_payload_packet::ClientboundCustomPayloadPacket,
-        0x1b: clientbound_entity_event_packet::ClientboundEntityEventPacket,
+        0x17: clientbound_disconnect_packet::ClientboundDisconnectPacket,
-        0x18: clientbound_custom_payload_packet::ClientboundCustomPayloadPacket,
+        0x18: clientbound_entity_event_packet::ClientboundEntityEventPacket,
-        0x1e: clientbound_game_event_packet::ClientboundGameEventPacket,
+        0x1b: clientbound_game_event_packet::ClientboundGameEventPacket,
-        0x20: clientbound_initialize_border_packet::ClientboundInitializeBorderPacket,
+        0x1d: clientbound_initialize_border_packet::ClientboundInitializeBorderPacket,
-        0x21: clientbound_keep_alive_packet::ClientboundKeepAlivePacket,
+        0x1e: clientbound_keep_alive_packet::ClientboundKeepAlivePacket,
-        0x22: clientbound_level_chunk_with_light_packet::ClientboundLevelChunkWithLightPacket,
+        0x1f: clientbound_level_chunk_with_light_packet::ClientboundLevelChunkWithLightPacket,
-        0x23: clientbound_level_event_packet::ClientboundLevelEventPacket,
+        0x20: clientbound_level_event_packet::ClientboundLevelEventPacket,
-        0x24: clientbound_level_particles_packet::ClientboundLevelParticlesPacket,
+        0x21: clientbound_level_particles_packet::ClientboundLevelParticlesPacket,
-        0x25: clientbound_light_update_packet::ClientboundLightUpdatePacket,
+        0x22: clientbound_light_update_packet::ClientboundLightUpdatePacket,
-        0x26: clientbound_login_packet::ClientboundLoginPacket,
+        0x23: clientbound_login_packet::ClientboundLoginPacket,
-        0x29: clientbound_move_entity_pos_packet::ClientboundMoveEntityPosPacket,
+        0x26: clientbound_move_entity_pos_packet::ClientboundMoveEntityPosPacket,
-        0x2a: clientbound_move_entity_posrot_packet::ClientboundMoveEntityPosRotPacket,
+        0x27: clientbound_move_entity_posrot_packet::ClientboundMoveEntityPosRotPacket,
-        0x2b: clientbound_move_entity_rot_packet::ClientboundMoveEntityRotPacket,
+        0x28: clientbound_move_entity_rot_packet::ClientboundMoveEntityRotPacket,
-        0x32: clientbound_player_abilities_packet::ClientboundPlayerAbilitiesPacket,
+        0x2f: clientbound_player_abilities_packet::ClientboundPlayerAbilitiesPacket,
-        0x36: clientbound_player_info_packet::ClientboundPlayerInfoPacket,
+        0x30: clientbound_player_chat_packet::ClientboundPlayerChatPacket,
-        0x38: clientbound_player_position_packet::ClientboundPlayerPositionPacket,
+        0x34: clientbound_player_info_packet::ClientboundPlayerInfoPacket,
-        0x39: clientbound_recipe_packet::ClientboundRecipePacket,
+        0x36: clientbound_player_position_packet::ClientboundPlayerPositionPacket,
-        0x3a: clientbound_remove_entities_packet::ClientboundRemoveEntitiesPacket,
+        0x37: clientbound_recipe_packet::ClientboundRecipePacket,
-        0x3e: clientbound_rotate_head_packet::ClientboundRotateHeadPacket,
+        0x38: clientbound_remove_entities_packet::ClientboundRemoveEntitiesPacket,
-        0x3f: clientbound_section_blocks_update_packet::ClientboundSectionBlocksUpdatePacket,
+        0x3c: clientbound_rotate_head_packet::ClientboundRotateHeadPacket,
-        0x48: clientbound_set_carried_item_packet::ClientboundSetCarriedItemPacket,
+        0x3d: clientbound_section_blocks_update_packet::ClientboundSectionBlocksUpdatePacket,
-        0x49: clientbound_set_chunk_cache_center::ClientboundSetChunkCacheCenterPacket,
+        0x3f: clientbound_server_data_packet::ClientboundServerDataPacket,
-        0x4a: clientbound_update_view_distance_packet::ClientboundUpdateViewDistancePacket,
+        0x44: clientbound_set_entity_link_packet::ClientboundSetEntityLinkPacket,
-        0x4b: clientbound_set_default_spawn_position_packet::ClientboundSetDefaultSpawnPositionPacket,
+        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,
+        0x5f: clientbound_system_chat_packet::ClientboundSystemChatPacket,
-        0x63: clientbound_update_advancements_packet::ClientboundUpdateAdvancementsPacket,
+        0x63: clientbound_teleport_entity_packet::ClientboundTeleportEntityPacket,
-        0x64: clientbound_update_attributes_packet::ClientboundUpdateAttributesPacket,
+        0x64: clientbound_update_advancements_packet::ClientboundUpdateAdvancementsPacket,
-        0x66: clientbound_update_recipes_packet::ClientboundUpdateRecipesPacket,
+        0x65: clientbound_update_attributes_packet::ClientboundUpdateAttributesPacket,
-        0x67: clientbound_update_tags_packet::ClientboundUpdateTagsPacket,
+        0x67: clientbound_update_recipes_packet::ClientboundUpdateRecipesPacket,
+        0x68: clientbound_update_tags_packet::ClientboundUpdateTagsPacket,
     }
-);
+);

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>>,
+}

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,
+}

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>,
 }

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 = 1073741911;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, FromPrimitive)]
 pub enum ConnectionProtocol {

bot/src/main.rs

@@ -6,7 +6,7 @@ async fn main() {
     println!("Hello, world!");
 
     // let address = "95.111.249.143:10000";
-    let address = "192.168.2.234:50736";
+    let address = "localhost:65519";
     // let response = azalea_client::ping::ping_server(&address.try_into().unwrap())
     //     .await
     //     .unwrap();
@@ -21,13 +21,13 @@ async fn main() {
             // TODO: have a "loaded" or "ready" event that fires when all chunks are loaded
             Event::Login => {}
             Event::Chat(p) => {
-                println!("{}", p.message.to_ansi(None));
+                // println!("{}", p.message.to_ansi(None));
-                if p.message.to_ansi(None) == "<py5> ok" {
+                // if p.message.to_ansi(None) == "<py5> ok" {
-                    let state = client.state.lock().await;
+                //     let state = client.state.lock().await;
-                    let world = state.world.as_ref().unwrap();
+                //     let world = state.world.as_ref().unwrap();
-                    let c = world.get_block_state(&BlockPos::new(5, 78, -2)).unwrap();
+                //     let c = world.get_block_state(&BlockPos::new(5, 78, -2)).unwrap();
-                    println!("block state: {:?}", c);
+                //     println!("block state: {:?}", c);
-                }
+                // }
             }
         }
     }

codegen/migrate.py

@@ -72,6 +72,11 @@ for packet, packet_name in new_packets.items():
 for packet in added_packets:
     lib.code.packet.generate_packet(
         new_burger_data[0]['packets']['packet'], new_mappings, packet.packet_id, packet.direction, packet.state)
+
+lib.code.version.set_protocol_version(
+    new_burger_data[0]['version']['protocol'])
+lib.code.version.set_version_id(new_version_id)
+
 lib.code.utils.fmt()
 
 print('Done!')