Skip to content

Commit

Permalink
add data for EntityEffect particle to fix set_entity_data errors on h…
Browse files Browse the repository at this point in the history
…ypixel
  • Loading branch information
mat-1 committed Jan 29, 2025
1 parent 67c0536 commit ef25e77
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 4 deletions.
18 changes: 14 additions & 4 deletions azalea-entity/src/particle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use bevy_ecs::component::Component;
// the order of this enum must be kept in sync with ParticleKind, otherwise
// we get errors parsing particles.
/// A [`ParticleKind`] with data potentially attached to it.
#[derive(Component, Clone, Debug, AzBuf, Default)]
#[derive(Component, Clone, Debug, AzBuf)]
pub enum Particle {
AngryVillager,
Block(BlockParticle),
Expand All @@ -30,8 +30,7 @@ pub enum Particle {
EnchantedHit,
Enchant,
EndRod,
#[default]
EntityEffect,
EntityEffect(ColorParticle),
ExplosionEmitter,
Explosion,
Gust,
Expand Down Expand Up @@ -154,7 +153,7 @@ impl From<ParticleKind> for Particle {
ParticleKind::EnchantedHit => Self::EnchantedHit,
ParticleKind::Enchant => Self::Enchant,
ParticleKind::EndRod => Self::EndRod,
ParticleKind::EntityEffect => Self::EntityEffect,
ParticleKind::EntityEffect => Self::EntityEffect(ColorParticle::default()),
ParticleKind::ExplosionEmitter => Self::ExplosionEmitter,
ParticleKind::Explosion => Self::Explosion,
ParticleKind::Gust => Self::Gust,
Expand Down Expand Up @@ -250,6 +249,12 @@ impl From<ParticleKind> for Particle {
}
}

impl Default for Particle {
fn default() -> Self {
Self::EntityEffect(ColorParticle::default())
}
}

#[derive(Debug, Clone, AzBuf, Default)]
pub struct BlockParticle {
pub block_state: BlockState,
Expand All @@ -269,6 +274,11 @@ pub struct DustColorTransitionParticle {
pub scale: f32,
}

#[derive(Debug, Clone, AzBuf, Default)]
pub struct ColorParticle {
pub color: RgbColor,
}

#[derive(Debug, Clone, AzBuf, Default)]
pub struct ItemParticle {
pub item: ItemStack,
Expand Down
23 changes: 23 additions & 0 deletions azalea-protocol/src/packets/game/c_set_entity_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,26 @@ pub struct ClientboundSetEntityData {
pub id: u32,
pub packed_items: EntityMetadataItems,
}

#[cfg(test)]
mod tests {
use std::io::Cursor;

use azalea_buf::AzaleaRead;

use super::*;

#[test]
fn test_read_write_container_set_content() {
let contents = [161, 226, 1, 10, 18, 1, 20, 38, 124, 175, 198, 255];
let mut buf = Cursor::new(contents.as_slice());
let packet = ClientboundSetEntityData::azalea_read(&mut buf).unwrap();
println!("{:?}", packet);

assert_eq!(buf.position(), contents.len() as u64);

let mut buf = Vec::new();
packet.write(&mut buf).unwrap();
assert_eq!(buf, contents);
}
}

0 comments on commit ef25e77

Please sign in to comment.