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 --- .../src/packets/game/s_set_structure_block.rs | 98 ++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100755 azalea-protocol/src/packets/game/s_set_structure_block.rs (limited to 'azalea-protocol/src/packets/game/s_set_structure_block.rs') diff --git a/azalea-protocol/src/packets/game/s_set_structure_block.rs b/azalea-protocol/src/packets/game/s_set_structure_block.rs new file mode 100755 index 00000000..7f05a3a7 --- /dev/null +++ b/azalea-protocol/src/packets/game/s_set_structure_block.rs @@ -0,0 +1,98 @@ +use std::io::{Cursor, Write}; + +use azalea_buf::AzBuf; +use azalea_buf::{AzaleaRead, AzaleaWrite}; +use azalea_core::{bitset::FixedBitSet, position::BlockPos}; +use azalea_protocol_macros::ServerboundGamePacket; + +use crate::packets::BufReadError; + +#[derive(Clone, Debug, AzBuf, ServerboundGamePacket)] +pub struct ServerboundSetStructureBlock { + pub pos: BlockPos, + pub update_type: UpdateType, + pub mode: StructureMode, + pub name: String, + pub offset: BytePosition, + pub size: BytePosition, + pub mirror: Mirror, + pub rotation: Rotation, + pub data: String, + pub integrity: f32, + #[var] + pub seed: u64, + pub flags: Flags, +} + +#[derive(Clone, Debug, AzBuf)] +pub struct BytePosition { + pub x: u8, + pub y: u8, + pub z: u8, +} + +#[derive(AzBuf, Clone, Copy, Debug)] +pub enum UpdateType { + UpdateData = 0, + SaveArea = 1, + LoadArea = 2, + ScanArea = 3, +} + +#[derive(AzBuf, Clone, Copy, Debug)] +pub enum StructureMode { + Save = 0, + Load = 1, + Corner = 2, + Data = 3, +} + +#[derive(AzBuf, Clone, Copy, Debug)] +pub enum Mirror { + None = 0, + LeftRight = 1, + FrontBack = 2, +} + +#[derive(AzBuf, Clone, Copy, Debug)] +pub enum Rotation { + None = 0, + Clockwise90 = 1, + Clockwise180 = 2, + Counterclockwise90 = 3, +} + +#[derive(Debug, Clone)] +pub struct Flags { + pub ignore_entities: bool, + pub show_air: bool, + pub show_bounding_box: bool, +} + +impl AzaleaRead for Flags { + fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result { + let set = FixedBitSet::<3>::azalea_read(buf)?; + Ok(Self { + ignore_entities: set.index(0), + show_air: set.index(1), + show_bounding_box: set.index(2), + }) + } +} + +impl AzaleaWrite for Flags { + fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { + let mut set = FixedBitSet::<3>::new(); + if self.ignore_entities { + set.set(0); + } + if self.show_air { + set.set(1); + } + if self.show_bounding_box { + set.set(2); + } + set.azalea_write(buf)?; + Ok(()) + } +} -- cgit v1.2.3