aboutsummaryrefslogtreecommitdiff
path: root/azalea-entity/src/data.rs
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2025-12-12 00:56:02 -0600
committerGitHub <noreply@github.com>2025-12-12 00:56:02 -0600
commitf9c25665c203d6377ace62f1e95381d037d8fd9e (patch)
tree8b4131d20fe661d3cc1175ec27f801fe61df41ea /azalea-entity/src/data.rs
parent82ad975242292d5875780b4398b62637674bf50a (diff)
downloadazalea-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-entity/src/data.rs')
-rw-r--r--azalea-entity/src/data.rs23
1 files changed, 12 insertions, 11 deletions
diff --git a/azalea-entity/src/data.rs b/azalea-entity/src/data.rs
index c535bb72..bb73cbed 100644
--- a/azalea-entity/src/data.rs
+++ b/azalea-entity/src/data.rs
@@ -12,6 +12,7 @@ use azalea_core::{
position::{BlockPos, GlobalPos, Vec3f32},
};
use azalea_inventory::{ItemStack, components};
+use azalea_registry::builtin::{VillagerKind, VillagerProfession};
use bevy_ecs::component::Component;
use derive_more::Deref;
use enum_as_inner::EnumAsInner;
@@ -83,16 +84,16 @@ pub enum EntityDataValue {
// 0 for absent; 1 + actual value otherwise. Used for entity IDs.
OptionalUnsignedInt(OptionalUnsignedInt),
Pose(Pose),
- CatVariant(azalea_registry::CatVariant),
- ChickenVariant(azalea_registry::ChickenVariant),
- CowVariant(azalea_registry::CowVariant),
- WolfVariant(azalea_registry::WolfVariant),
- WolfSoundVariant(azalea_registry::WolfSoundVariant),
- FrogVariant(azalea_registry::FrogVariant),
- PigVariant(azalea_registry::PigVariant),
- ZombieNautilusVariant(azalea_registry::ZombieNautilusVariant),
+ CatVariant(azalea_registry::data::CatVariant),
+ ChickenVariant(azalea_registry::data::ChickenVariant),
+ CowVariant(azalea_registry::data::CowVariant),
+ WolfVariant(azalea_registry::data::WolfVariant),
+ WolfSoundVariant(azalea_registry::data::WolfSoundVariant),
+ FrogVariant(azalea_registry::data::FrogVariant),
+ PigVariant(azalea_registry::data::PigVariant),
+ ZombieNautilusVariant(azalea_registry::data::ZombieNautilusVariant),
OptionalGlobalPos(Option<GlobalPos>),
- PaintingVariant(azalea_registry::PaintingVariant),
+ PaintingVariant(azalea_registry::data::PaintingVariant),
SnifferState(SnifferStateKind),
ArmadilloState(ArmadilloStateKind),
CopperGolemState(CopperGolemStateKind),
@@ -176,8 +177,8 @@ pub enum Pose {
#[derive(Debug, Clone, AzBuf, PartialEq)]
pub struct VillagerData {
- pub kind: azalea_registry::VillagerKind,
- pub profession: azalea_registry::VillagerProfession,
+ pub kind: VillagerKind,
+ pub profession: VillagerProfession,
#[var]
pub level: u32,
}