From 08958c2278b15ebeac8a964f392ebb792e479b61 Mon Sep 17 00:00:00 2001 From: mat <27899617+mat-1@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:31:40 -0600 Subject: Refactor azalea-protocol (#190) * start updating to 1.21.4 * fix block codegen and stop using block data from burger * rename packet related modules and structs to be simpler * ItemSlot -> ItemStack for more consistency with mojmap * .get() -> .into_packet() * simplify declare_state_packets by removing packet ids * rename read_from and write_into to azalea_read and azalea_write * rename McBufReadable and McBufWritable to AzaleaRead and AzaleaWrite * McBuf -> AzBuf * remove most uses of into_variant * update codegen and use resourcelocation names for packets * implement #[limit(i)] attribute for AzBuf derive macro * fixes for 1.21.4 * fix examples * update some physics code and fix ChatType * remove unused imports in codegen * re-add some things to migrate.py and update +mc version numbers automatically * downgrade to 1.21.3 lol --- .../packets/game/serverbound_interact_packet.rs | 86 ---------------------- 1 file changed, 86 deletions(-) delete mode 100755 azalea-protocol/src/packets/game/serverbound_interact_packet.rs (limited to 'azalea-protocol/src/packets/game/serverbound_interact_packet.rs') diff --git a/azalea-protocol/src/packets/game/serverbound_interact_packet.rs b/azalea-protocol/src/packets/game/serverbound_interact_packet.rs deleted file mode 100755 index e393920c..00000000 --- a/azalea-protocol/src/packets/game/serverbound_interact_packet.rs +++ /dev/null @@ -1,86 +0,0 @@ -use std::io::{Cursor, Write}; - -use azalea_buf::{McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable}; -use azalea_core::position::Vec3; -use azalea_protocol_macros::ServerboundGamePacket; - -use crate::packets::BufReadError; - -#[derive(Clone, Debug, McBuf, ServerboundGamePacket)] -pub struct ServerboundInteractPacket { - #[var] - pub entity_id: u32, - pub action: ActionType, - /// Whether the player is sneaking - pub using_secondary_action: bool, -} - -#[derive(Clone, Copy, Debug)] -pub enum ActionType { - Interact { - hand: InteractionHand, - }, - Attack, - InteractAt { - location: Vec3, - hand: InteractionHand, - }, -} - -impl McBufWritable for ActionType { - fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { - match self { - ActionType::Interact { hand } => { - 0u32.var_write_into(buf)?; - hand.write_into(buf)?; - } - ActionType::Attack => { - 1u32.var_write_into(buf)?; - } - ActionType::InteractAt { location, hand } => { - 2u32.var_write_into(buf)?; - (location.x as f32).write_into(buf)?; - (location.y as f32).write_into(buf)?; - (location.z as f32).write_into(buf)?; - hand.write_into(buf)?; - } - } - Ok(()) - } -} - -impl McBufReadable for ActionType { - fn read_from(buf: &mut Cursor<&[u8]>) -> Result { - let action_type = u32::var_read_from(buf)?; - match action_type { - 0 => { - let hand = InteractionHand::read_from(buf)?; - Ok(ActionType::Interact { hand }) - } - 1 => Ok(ActionType::Attack), - 2 => { - let x = f32::read_from(buf)?; - let y = f32::read_from(buf)?; - let z = f32::read_from(buf)?; - let hand = InteractionHand::read_from(buf)?; - Ok(ActionType::InteractAt { - location: Vec3 { - x: f64::from(x), - y: f64::from(y), - z: f64::from(z), - }, - hand, - }) - } - _ => Err(BufReadError::UnexpectedEnumVariant { - id: action_type as i32, - }), - } - } -} - -#[derive(McBuf, Clone, Copy, Debug)] -pub enum InteractionHand { - MainHand = 0, - OffHand = 1, -} -- cgit v1.2.3