From 1d80f531b74bc3b31023753acb81b35efcdadd73 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Tue, 23 Apr 2024 10:34:50 -0500
Subject: 1.20.5 (#127)

* 23w51b

* make recalculate_near_end_of_path public

so other plugins can do .after(recalculate_near_end_of_path)

* update to 24w03a i think

* start implementing 24w13a

* registries work (but a lot of packets are still broken)

* fix recipes and commands packets

* i love codecs :D i am not going insane :D mojang's java is very readable :D

* item components are "implemented" meowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeow

* update to 1.20.5-pre3

* fix all the broken packets and clippy (mojang please don't do an update like this again or i will murder someone)

* 1.20.5-rc1

* fix failing tests

* 1.20.5
---
 azalea/Cargo.toml       | 4 ++--
 azalea/src/auto_tool.rs | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'azalea')

diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml
index 372b4bb5..bc48ecb7 100644
--- a/azalea/Cargo.toml
+++ b/azalea/Cargo.toml
@@ -18,7 +18,6 @@ azalea-block = { version = "0.9.0", path = "../azalea-block" }
 azalea-chat = { version = "0.9.0", path = "../azalea-chat" }
 azalea-client = { version = "0.9.0", path = "../azalea-client", default-features = false }
 azalea-core = { version = "0.9.0", path = "../azalea-core" }
-azalea-inventory = { version = "0.9.0", path = "../azalea-inventory" }
 azalea-physics = { version = "0.9.0", path = "../azalea-physics" }
 azalea-protocol = { version = "0.9.0", path = "../azalea-protocol" }
 azalea-registry = { version = "0.9.0", path = "../azalea-registry" }
@@ -41,9 +40,10 @@ thiserror = "^1.0.58"
 tokio = "^1.37.0"
 uuid = "1.8.0"
 bevy_log = "0.13.2"
-azalea-entity = { version = "0.9.0", path = "../azalea-entity" }
 bevy_time = "0.13.2"
 rustc-hash = "1.1.0"
+azalea-inventory = { version = "0.9.0", path = "../azalea-inventory" }
+azalea-entity = { version = "0.9.0", path = "../azalea-entity" }
 
 [dev-dependencies]
 criterion = "0.5.1"
diff --git a/azalea/src/auto_tool.rs b/azalea/src/auto_tool.rs
index bc9bb474..77345acc 100644
--- a/azalea/src/auto_tool.rs
+++ b/azalea/src/auto_tool.rs
@@ -2,7 +2,7 @@ use azalea_block::{Block, BlockState};
 use azalea_client::{inventory::InventoryComponent, Client};
 use azalea_entity::{FluidOnEyes, Physics};
 use azalea_inventory::{ItemSlot, Menu};
-use azalea_registry::Fluid;
+use azalea_registry::{DataComponentKind, Fluid};
 
 #[derive(Debug)]
 pub struct BestToolResult {
@@ -92,7 +92,11 @@ pub fn accurate_best_tool_in_hotbar_for_block(
             ItemSlot::Present(item_slot) => {
                 // lazy way to avoid checking durability since azalea doesn't have durability
                 // data yet
-                if item_slot.nbt.is_none() {
+                if item_slot
+                    .components
+                    .get(DataComponentKind::Damage)
+                    .is_none()
+                {
                     this_item_speed = Some(azalea_entity::mining::get_mine_progress(
                         block.as_ref(),
                         item_slot.kind,
-- 
cgit v1.2.3