Merge branch 'main' into custom_auth

CCBlueX · Jun 27, 2024 · 0e87706 · 0e87706
2 parents 157e711 + 350e32d
commit 0e87706
Show file tree

Hide file tree

Showing 32 changed files with 707 additions and 195 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.
 
 <!-- The line below is automatically read and updated by the migrate script, so don't change it manually. -->
 
-_Currently supported Minecraft version: `1.20.6`._
+_Currently supported Minecraft version: `1.21`._
 
 > [!WARNING]
 > Azalea is still very unfinished, though most crates are in a somewhat useable state
@@ -51,8 +51,11 @@ If you'd like to chat about Azalea, you can join the Matrix space at [#azalea:ma
 
 ## Branches
 
-There are several branches in the Azalea repository that target older Minecraft versions. It is not guaranteed that they will be up-to-date with the latest version of Azalea. If you'd like to update them or add more, please open a PR.
+There are several branches in the Azalea repository that target older Minecraft versions.
+Most of them are severely outdated compared to the latest version of Azalea.
+If you'd like to update them or add more, please open a PR.
 
+-   [1.20.5-1.20.6](https://github.com/azalea-rs/azalea/tree/1.20.6)
 -   [1.20.4](https://github.com/azalea-rs/azalea/tree/1.20.4)
 -   [1.20.2](https://github.com/azalea-rs/azalea/tree/1.20.2)
 -   [1.20-1.20.1](https://github.com/azalea-rs/azalea/tree/1.20.1)

diff --git a/azalea-block/Cargo.toml b/azalea-block/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-block"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-block"
-version = "0.10.0"
+version = "0.10.2"
 
 [lib]
 

diff --git a/azalea-block/azalea-block-macros/Cargo.toml b/azalea-block/azalea-block-macros/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-block-macros"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-block/azalea-block-macros"
-version = "0.10.0"
+version = "0.10.2"
 
 [lib]
 proc-macro = true

diff --git a/azalea-block/azalea-block-macros/src/lib.rs b/azalea-block/azalea-block-macros/src/lib.rs
@@ -42,8 +42,11 @@ struct PropertyDefinitions {
 /// `"snowy": Snowy(false)` or `"axis": properties::Axis::Y`
 #[derive(Debug)]
 struct PropertyWithNameAndDefault {
-    // "snowy" / "axis"
+    // "snowy" "axis"
     name: String,
+    /// The property name, potentially modified so it works better as a struct
+    /// field.
+    name_ident: Ident,
     // Snowy / Axis
     property_type: Ident,
     property_value_type: Ident,
@@ -100,8 +103,11 @@ impl Parse for PropertyWithNameAndDefault {
             }
         };
 
+        let property_name_ident = name_to_ident(&property_name);
+
         Ok(PropertyWithNameAndDefault {
             name: property_name,
+            name_ident: property_name_ident,
             property_type,
             property_value_type,
             is_enum,
@@ -433,6 +439,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
                 write!(property_name, "_{index}").unwrap();
             }
             properties_with_name.push(PropertyWithNameAndDefault {
+                name_ident: name_to_ident(&property_name),
                 name: property_name,
                 property_type: property.property_type.clone(),
                 property_value_type: property.property_value_type.clone(),
@@ -452,12 +459,11 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
         let mut block_struct_fields = quote! {};
         for PropertyWithNameAndDefault {
             property_value_type,
-            name,
+            name_ident,
             is_enum,
             ..
         } in &properties_with_name
         {
-            let name_ident = Ident::new_raw(name, proc_macro2::Span::call_site());
             block_struct_fields.extend(if *is_enum {
                 quote! { pub #name_ident: properties::#property_value_type, }
             } else {
@@ -496,7 +502,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
             let mut from_block_to_state_combination_match_inner = quote! {};
             for i in 0..properties_with_name.len() {
                 let property = &properties_with_name[i];
-                let property_name = &property.name;
+                let property_name_ident = &property.name_ident;
                 let property_value_name_ident = &property.property_type;
                 let variant =
                     Ident::new(&combination[i].to_string(), proc_macro2::Span::call_site());
@@ -519,8 +525,6 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
                     quote! {#variant}
                 };
 
-                let property_name_ident =
-                    Ident::new_raw(property_name, proc_macro2::Span::call_site());
                 from_block_to_state_combination_match_inner.extend(quote! {
                     #property_name_ident: #property_variant,
                 });
@@ -582,7 +586,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
         for i in (0..properties_with_name.len()).rev() {
             let PropertyWithNameAndDefault {
                 property_type: property_struct_name_ident,
-                name: property_name,
+                name_ident: property_name_ident,
                 property_value_type,
                 ..
             } = &properties_with_name[i];
@@ -598,7 +602,6 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
                     quote! {properties::#property_struct_name_ident::from((b / #division) % #property_variants_count)}
                 }
             };
-            let property_name_ident = Ident::new_raw(property_name, proc_macro2::Span::call_site());
             from_state_to_block_inner.extend(quote! {
                 #property_name_ident: #conversion_code,
             });
@@ -627,12 +630,11 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
 
         let mut block_default_fields = quote! {};
         for PropertyWithNameAndDefault {
-            name,
+            name_ident,
             default: property_default,
             ..
         } in properties_with_name
         {
-            let name_ident = Ident::new_raw(&name, proc_macro2::Span::call_site());
             block_default_fields.extend(quote! { #name_ident: #property_default, });
         }
 
@@ -821,3 +823,13 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
 
     generated.into()
 }
+
+/// Convert a name to a Rust identifier, replacing some Rust keywords with
+/// alternatives (e.g. `type` -> `kind`).
+fn name_to_ident(name: &str) -> Ident {
+    let ident_str = match name {
+        "type" => "kind",
+        _ => &name,
+    };
+    Ident::new(ident_str, proc_macro2::Span::call_site())
+}
diff --git a/azalea-brigadier/Cargo.toml b/azalea-brigadier/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-brigadier"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-brigadier"
-version = "0.10.0"
+version = "0.10.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/azalea-buf/Cargo.toml b/azalea-buf/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-buf"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-buf"
-version = "0.10.1"
+version = "0.10.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/azalea-buf/src/read.rs b/azalea-buf/src/read.rs
@@ -145,7 +145,7 @@ impl McBufVarReadable for i64 {
     fn var_read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
         let mut buffer = [0];
         let mut ans = 0;
-        for i in 0..8 {
+        for i in 0..10 {
             buf.read_exact(&mut buffer)
                 .map_err(|_| BufReadError::InvalidVarLong)?;
             ans |= ((buffer[0] & 0b0111_1111) as i64) << (7 * i);

diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-chat"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-chat"
-version = "0.10.1"
+version = "0.10.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-client"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-client"
-version = "0.10.1"
+version = "0.10.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs
@@ -276,19 +276,7 @@ fn handle_send_chat_kind_event(
             .get(),
             ChatPacketKind::Command => {
                 // TODO: chat signing
-                ServerboundChatCommandPacket {
-                    command: content,
-                    timestamp: SystemTime::now()
-                        .duration_since(UNIX_EPOCH)
-                        .expect("Time shouldn't be before epoch")
-                        .as_millis()
-                        .try_into()
-                        .expect("Instant should fit into a u64"),
-                    salt: azalea_crypto::make_salt(),
-                    argument_signatures: vec![],
-                    last_seen_messages: LastSeenMessagesUpdate::default(),
-                }
-                .get()
+                ServerboundChatCommandPacket { command: content }.get()
             }
         };
 

diff --git a/azalea-client/src/interact.rs b/azalea-client/src/interact.rs
@@ -365,10 +365,7 @@ fn update_modifiers_for_held_item(
         };
         attributes
             .attack_speed
-            .remove(&azalea_entity::attributes::BASE_ATTACK_SPEED_UUID);
-        attributes
-            .attack_speed
-            .insert(azalea_entity::attributes::tool_attack_speed_modifier(
+            .insert(azalea_entity::attributes::base_attack_speed_modifier(
                 added_attack_speed,
             ))
             .unwrap();

diff --git a/azalea-client/src/movement.rs b/azalea-client/src/movement.rs
@@ -463,7 +463,7 @@ fn set_sprinting(
     } else {
         attributes
             .speed
-            .remove(&azalea_entity::attributes::sprinting_modifier().uuid)
+            .remove(&azalea_entity::attributes::sprinting_modifier().id)
             .is_none()
     }
 }

diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 license = "MIT"
 name = "azalea-core"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-core"
-version = "0.10.0"
+version = "0.10.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/azalea-entity/Cargo.toml b/azalea-entity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "azalea-entity"
-version = "0.10.1"
+version = "0.10.2"
 edition = "2021"
 description = "Things related to Minecraft entities used by Azalea"
 repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-entity"