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-client/src/interact.rs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'azalea-client/src/interact.rs') diff --git a/azalea-client/src/interact.rs b/azalea-client/src/interact.rs index 8a3aa49b..14fea407 100644 --- a/azalea-client/src/interact.rs +++ b/azalea-client/src/interact.rs @@ -17,6 +17,7 @@ use azalea_protocol::packets::game::{ serverbound_swing_packet::ServerboundSwingPacket, serverbound_use_item_on_packet::{BlockHit, ServerboundUseItemOnPacket}, }; +use azalea_registry::DataComponentKind; use azalea_world::{Instance, InstanceContainer, InstanceName}; use bevy_app::{App, Plugin, Update}; use bevy_ecs::{ @@ -28,7 +29,6 @@ use bevy_ecs::{ system::{Commands, Query, Res}, }; use derive_more::{Deref, DerefMut}; -use simdnbt::owned::NbtList; use tracing::warn; use crate::{ @@ -269,20 +269,11 @@ pub fn check_block_can_be_broken_by_item_in_adventure_mode( // minecraft caches the last checked block but that's kind of an unnecessary // optimization and makes the code too complicated - let Some(can_destroy) = item - .nbt - .compound("tag") - .and_then(|nbt| nbt.list("CanDestroy")) - else { + let Some(_can_destroy) = item.components.get(DataComponentKind::CanBreak) else { // no CanDestroy tag return false; }; - let NbtList::String(_can_destroy) = can_destroy else { - // CanDestroy tag must be a list of strings - return false; - }; - false // for block_predicate in can_destroy { -- cgit v1.2.3