1 files changed, 8 insertions, 159 deletions
diff --git a/azalea-protocol/src/packets/game/c_explode.rs b/azalea-protocol/src/packets/game/c_explode.rs
index aef3887d..c5d90d03 100755
--- a/azalea-protocol/src/packets/game/c_explode.rs
+++ b/azalea-protocol/src/packets/game/c_explode.rs
@@ -1,164 +1,13 @@
-use std::{
-    io::{Cursor, Write},
-    str::FromStr,
-};
-
-use azalea_buf::{AzBuf, AzaleaRead, AzaleaReadVar, AzaleaWrite, AzaleaWriteVar, BufReadError};
-use azalea_core::{position::BlockPos, resource_location::ResourceLocation};
+use azalea_buf::AzBuf;
+use azalea_core::position::Vec3;
+use azalea_entity::particle::Particle;
 use azalea_protocol_macros::ClientboundGamePacket;
-use azalea_registry::{ParticleKind, SoundEvent};
+use azalea_registry::SoundEvent;
 
-#[derive(Clone, Debug, PartialEq, ClientboundGamePacket)]
+#[derive(Clone, Debug, ClientboundGamePacket, AzBuf)]
 pub struct ClientboundExplode {
-    pub x: f64,
-    pub y: f64,
-    pub z: f64,
-    pub power: f32,
-    pub to_blow: Vec<BlockPos>,
-    pub knockback_x: f32,
-    pub knockback_y: f32,
-    pub knockback_z: f32,
-    pub block_interaction: BlockInteraction,
-    pub small_explosion_particles: ParticleKind,
-    pub large_explosion_particles: ParticleKind,
+    pub center: Vec3,
+    pub knockback: Option<Vec3>,
+    pub explosion_particle: Particle,
     pub explosion_sound: SoundEvent,
 }
-
-#[derive(Clone, Copy, Debug, PartialEq, AzBuf)]
-pub enum BlockInteraction {
-    Keep,
-    Destroy,
-    DestroyWithDecay,
-    TriggerBlock,
-}
-
-impl AzaleaRead for ClientboundExplode {
-    fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let x = f64::azalea_read(buf)?;
-        let y = f64::azalea_read(buf)?;
-        let z = f64::azalea_read(buf)?;
-        let power = f32::azalea_read(buf)?;
-
-        let x_floor = x.floor() as i32;
-        let y_floor = y.floor() as i32;
-        let z_floor = z.floor() as i32;
-
-        let to_blow_len = u32::azalea_read_var(buf)?;
-        let mut to_blow = Vec::with_capacity(to_blow_len as usize);
-        for _ in 0..to_blow_len {
-            // the bytes are offsets from the main x y z
-            let x = x_floor + i32::from(i8::azalea_read(buf)?);
-            let y = y_floor + i32::from(i8::azalea_read(buf)?);
-            let z = z_floor + i32::from(i8::azalea_read(buf)?);
-            to_blow.push(BlockPos { x, y, z });
-        }
-
-        let knockback_x = f32::azalea_read(buf)?;
-        let knockback_y = f32::azalea_read(buf)?;
-        let knockback_z = f32::azalea_read(buf)?;
-
-        let block_interaction = BlockInteraction::azalea_read(buf)?;
-        let small_explosion_particles = ParticleKind::azalea_read(buf)?;
-        let large_explosion_particles = ParticleKind::azalea_read(buf)?;
-
-        let sound_event_resource_location = ResourceLocation::azalea_read(buf)?.to_string();
-        let explosion_sound =
-            SoundEvent::from_str(&sound_event_resource_location).map_err(|_| {
-                BufReadError::UnexpectedStringEnumVariant {
-                    id: sound_event_resource_location,
-                }
-            })?;
-
-        Ok(Self {
-            x,
-            y,
-            z,
-            power,
-            to_blow,
-            knockback_x,
-            knockback_y,
-            knockback_z,
-            block_interaction,
-            small_explosion_particles,
-            large_explosion_particles,
-            explosion_sound,
-        })
-    }
-}
-
-impl AzaleaWrite for ClientboundExplode {
-    fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        self.x.azalea_write(buf)?;
-        self.y.azalea_write(buf)?;
-        self.z.azalea_write(buf)?;
-        self.power.azalea_write(buf)?;
-
-        let to_blow_len = self.to_blow.len() as u32;
-        to_blow_len.azalea_write_var(buf)?;
-
-        let x_floor = self.x.floor() as i32;
-        let y_floor = self.y.floor() as i32;
-        let z_floor = self.z.floor() as i32;
-
-        for pos in &self.to_blow {
-            let x = (pos.x - x_floor) as i8;
-            let y = (pos.y - y_floor) as i8;
-            let z = (pos.z - z_floor) as i8;
-            x.azalea_write(buf)?;
-            y.azalea_write(buf)?;
-            z.azalea_write(buf)?;
-        }
-
-        self.knockback_x.azalea_write(buf)?;
-        self.knockback_y.azalea_write(buf)?;
-        self.knockback_z.azalea_write(buf)?;
-
-        self.block_interaction.azalea_write(buf)?;
-        self.small_explosion_particles.azalea_write(buf)?;
-        self.large_explosion_particles.azalea_write(buf)?;
-
-        let sound_event_resource_location =
-            ResourceLocation::new(&self.explosion_sound.to_string());
-        sound_event_resource_location.azalea_write(buf)?;
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_read_write() {
-        let packet = ClientboundExplode {
-            x: 123_456.0,
-            y: 789_012.0,
-            z: 345_678.0,
-            power: 1_000.0,
-            to_blow: vec![
-                BlockPos {
-                    x: 123_456 + 1,
-                    y: 789_012 + 2,
-                    z: 345_678 - 127,
-                },
-                BlockPos {
-                    x: 123_456 + 4,
-                    y: 789_012 - 5,
-                    z: 345_678 + 6,
-                },
-            ],
-            knockback_x: 1_000.0,
-            knockback_y: 2_000.0,
-            knockback_z: 3_000.0,
-            block_interaction: BlockInteraction::Destroy,
-            small_explosion_particles: ParticleKind::Explosion,
-            large_explosion_particles: ParticleKind::ExplosionEmitter,
-            explosion_sound: SoundEvent::EntityGenericExplode,
-        };
-        let mut buf = Vec::new();
-        packet.azalea_write(&mut buf).unwrap();
-        let packet2 = ClientboundExplode::azalea_read(&mut Cursor::new(&buf)).unwrap();
-        assert_eq!(packet, packet2);
-    }
-}