From b300cd7b36a5ba6f5be58e1942da8e2c866106e6 Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 19 Dec 2025 13:07:19 +1100 Subject: smaller EntityDataValue type --- azalea-entity/src/data.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'azalea-entity/src/data.rs') diff --git a/azalea-entity/src/data.rs b/azalea-entity/src/data.rs index fab78795..c9e98b0d 100644 --- a/azalea-entity/src/data.rs +++ b/azalea-entity/src/data.rs @@ -65,9 +65,9 @@ pub enum EntityDataValue { Int(#[var] i32), Long(#[var] i64), Float(f32), - String(String), - FormattedText(FormattedText), - OptionalFormattedText(Option), + String(Box), + FormattedText(Box), + OptionalFormattedText(Option>), ItemStack(ItemStack), Boolean(bool), Rotations(Rotations), @@ -79,7 +79,7 @@ pub enum EntityDataValue { /// If this is air, that means it's absent, OptionalBlockState(azalea_block::BlockState), Particle(Particle), - Particles(Vec), + Particles(Box<[Particle]>), VillagerData(VillagerData), // 0 for absent; 1 + actual value otherwise. Used for entity IDs. OptionalUnsignedInt(OptionalUnsignedInt), @@ -92,7 +92,7 @@ pub enum EntityDataValue { PigVariant(azalea_registry::data::PigVariant), ChickenVariant(azalea_registry::data::ChickenVariant), ZombieNautilusVariant(azalea_registry::data::ZombieNautilusVariant), - OptionalGlobalPos(Option), + OptionalGlobalPos(Option>), PaintingVariant(azalea_registry::data::PaintingVariant), SnifferState(SnifferStateKind), ArmadilloState(ArmadilloStateKind), @@ -104,6 +104,8 @@ pub enum EntityDataValue { HumanoidArm(HumanoidArm), } +const _: () = assert!(size_of::() == 24); + #[derive(Clone, Debug, PartialEq)] pub struct OptionalUnsignedInt(pub Option); -- cgit v1.2.3