aboutsummaryrefslogtreecommitdiff
path: root/azalea-entity/src/data.rs
diff options
context:
space:
mode:
Diffstat (limited to 'azalea-entity/src/data.rs')
-rwxr-xr-xazalea-entity/src/data.rs16
1 files changed, 15 insertions, 1 deletions
diff --git a/azalea-entity/src/data.rs b/azalea-entity/src/data.rs
index b0a05e74..45c761e7 100755
--- a/azalea-entity/src/data.rs
+++ b/azalea-entity/src/data.rs
@@ -6,7 +6,6 @@ use azalea_buf::{
use azalea_chat::FormattedText;
use azalea_core::{
direction::Direction,
- particle::Particle,
position::{BlockPos, GlobalPos, Vec3},
};
use azalea_inventory::ItemSlot;
@@ -17,6 +16,8 @@ use nohash_hasher::IntSet;
use std::io::{Cursor, Write};
use uuid::Uuid;
+use crate::particle::Particle;
+
#[derive(Clone, Debug, Deref)]
pub struct EntityMetadataItems(Vec<EntityDataItem>);
@@ -83,15 +84,18 @@ pub enum EntityDataValue {
OptionalBlockState(azalea_block::BlockState),
CompoundTag(simdnbt::owned::NbtCompound),
Particle(Particle),
+ Particles(Vec<Particle>),
VillagerData(VillagerData),
// 0 for absent; 1 + actual value otherwise. Used for entity IDs.
OptionalUnsignedInt(OptionalUnsignedInt),
Pose(Pose),
CatVariant(azalea_registry::CatVariant),
+ WolfVariant(azalea_registry::WolfVariant),
FrogVariant(azalea_registry::FrogVariant),
OptionalGlobalPos(Option<GlobalPos>),
PaintingVariant(azalea_registry::PaintingVariant),
SnifferState(SnifferState),
+ ArmadilloState(ArmadilloStateKind),
Vector3(Vec3),
Quaternion(Quaternion),
}
@@ -107,6 +111,16 @@ pub struct Quaternion {
pub w: f32,
}
+// mojang just calls this ArmadilloState but i added "Kind" since otherwise it
+// collides with a name in metadata.rs
+#[derive(Clone, Debug, Copy, Default, McBuf)]
+pub enum ArmadilloStateKind {
+ #[default]
+ Idle,
+ Rolling,
+ Scared,
+}
+
impl McBufReadable for OptionalUnsignedInt {
fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
let val = u32::var_read_from(buf)?;