diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2025-12-12 00:56:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-12 00:56:02 -0600 |
| commit | f9c25665c203d6377ace62f1e95381d037d8fd9e (patch) | |
| tree | 8b4131d20fe661d3cc1175ec27f801fe61df41ea /azalea-inventory/src/item | |
| parent | 82ad975242292d5875780b4398b62637674bf50a (diff) | |
| download | azalea-drasl-f9c25665c203d6377ace62f1e95381d037d8fd9e.tar.xz | |
Refactor azalea-registry (#294)
* move registries in azalea-registry into separate modules
* rename Item and Block to ItemKind and BlockKind
* remove 'extra' registries from azalea-registry
* hide deprecated items from docs
* use DamageKindKey instead of Identifier when parsing registries
* store tag entries as a Vec instead of a HashSet
* sort tag values by protocol id
* update changelog
Diffstat (limited to 'azalea-inventory/src/item')
| -rw-r--r-- | azalea-inventory/src/item/consume_effect.rs | 24 | ||||
| -rw-r--r-- | azalea-inventory/src/item/mod.rs | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/azalea-inventory/src/item/consume_effect.rs b/azalea-inventory/src/item/consume_effect.rs index 7054e6c8..9b8a198d 100644 --- a/azalea-inventory/src/item/consume_effect.rs +++ b/azalea-inventory/src/item/consume_effect.rs @@ -1,6 +1,10 @@ use azalea_buf::AzBuf; -use azalea_core::{codec_utils::is_default, identifier::Identifier}; -use azalea_registry::{HolderSet, MobEffect, SoundEvent}; +use azalea_core::codec_utils::is_default; +use azalea_registry::{ + HolderSet, + builtin::{ConsumeEffectKind, MobEffect, SoundEvent}, + identifier::Identifier, +}; use serde::Serialize; use crate::components::MobEffectInstance; @@ -28,18 +32,14 @@ pub enum ConsumeEffect { }, } -impl From<ConsumeEffect> for azalea_registry::ConsumeEffectKind { +impl From<ConsumeEffect> for ConsumeEffectKind { fn from(effect: ConsumeEffect) -> Self { match effect { - ConsumeEffect::ApplyEffects { .. } => azalea_registry::ConsumeEffectKind::ApplyEffects, - ConsumeEffect::RemoveEffects { .. } => { - azalea_registry::ConsumeEffectKind::RemoveEffects - } - ConsumeEffect::ClearAllEffects => azalea_registry::ConsumeEffectKind::ClearAllEffects, - ConsumeEffect::TeleportRandomly { .. } => { - azalea_registry::ConsumeEffectKind::TeleportRandomly - } - ConsumeEffect::PlaySound { .. } => azalea_registry::ConsumeEffectKind::PlaySound, + ConsumeEffect::ApplyEffects { .. } => ConsumeEffectKind::ApplyEffects, + ConsumeEffect::RemoveEffects { .. } => ConsumeEffectKind::RemoveEffects, + ConsumeEffect::ClearAllEffects => ConsumeEffectKind::ClearAllEffects, + ConsumeEffect::TeleportRandomly { .. } => ConsumeEffectKind::TeleportRandomly, + ConsumeEffect::PlaySound { .. } => ConsumeEffectKind::PlaySound, } } } diff --git a/azalea-inventory/src/item/mod.rs b/azalea-inventory/src/item/mod.rs index 0e9947e2..015ca0e2 100644 --- a/azalea-inventory/src/item/mod.rs +++ b/azalea-inventory/src/item/mod.rs @@ -1,3 +1,5 @@ +use azalea_registry::builtin::ItemKind; + use crate::{components::MaxStackSize, default_components::get_default_component}; pub mod consume_effect; @@ -19,7 +21,7 @@ pub trait MaxStackSizeExt { } } -impl MaxStackSizeExt for azalea_registry::Item { +impl MaxStackSizeExt for ItemKind { fn max_stack_size(&self) -> i32 { get_default_component::<MaxStackSize>(*self).map_or(64, |s| s.count) } |
