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 --- azalea-protocol/src/packets/game/s_interact.rs | 86 ++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100755 azalea-protocol/src/packets/game/s_interact.rs (limited to 'azalea-protocol/src/packets/game/s_interact.rs') diff --git a/azalea-protocol/src/packets/game/s_interact.rs b/azalea-protocol/src/packets/game/s_interact.rs new file mode 100755 index 00000000..cdd9cba5 --- /dev/null +++ b/azalea-protocol/src/packets/game/s_interact.rs @@ -0,0 +1,86 @@ +use std::io::{Cursor, Write}; + +use azalea_buf::{AzBuf, AzaleaRead, AzaleaReadVar, AzaleaWrite, AzaleaWriteVar}; +use azalea_core::position::Vec3; +use azalea_protocol_macros::ServerboundGamePacket; + +use crate::packets::BufReadError; + +#[derive(Clone, Debug, AzBuf, ServerboundGamePacket)] +pub struct ServerboundInteract { + #[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 AzaleaWrite for ActionType { + fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { + match self { + ActionType::Interact { hand } => { + 0u32.azalea_write_var(buf)?; + hand.azalea_write(buf)?; + } + ActionType::Attack => { + 1u32.azalea_write_var(buf)?; + } + ActionType::InteractAt { location, hand } => { + 2u32.azalea_write_var(buf)?; + (location.x as f32).azalea_write(buf)?; + (location.y as f32).azalea_write(buf)?; + (location.z as f32).azalea_write(buf)?; + hand.azalea_write(buf)?; + } + } + Ok(()) + } +} + +impl AzaleaRead for ActionType { + fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result { + let action_type = u32::azalea_read_var(buf)?; + match action_type { + 0 => { + let hand = InteractionHand::azalea_read(buf)?; + Ok(ActionType::Interact { hand }) + } + 1 => Ok(ActionType::Attack), + 2 => { + let x = f32::azalea_read(buf)?; + let y = f32::azalea_read(buf)?; + let z = f32::azalea_read(buf)?; + let hand = InteractionHand::azalea_read(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(AzBuf, Clone, Copy, Debug)] +pub enum InteractionHand { + MainHand = 0, + OffHand = 1, +} -- cgit v1.2.3