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_command_block.rs | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100755 azalea-protocol/src/packets/game/s_set_command_block.rs (limited to 'azalea-protocol/src/packets/game/s_set_command_block.rs') diff --git a/azalea-protocol/src/packets/game/s_set_command_block.rs b/azalea-protocol/src/packets/game/s_set_command_block.rs new file mode 100755 index 00000000..dacb79de --- /dev/null +++ b/azalea-protocol/src/packets/game/s_set_command_block.rs @@ -0,0 +1,63 @@ +use std::io::Cursor; + +use azalea_buf::{AzBuf, AzaleaRead, BufReadError}; +use azalea_core::{bitset::FixedBitSet, position::BlockPos}; +use azalea_protocol_macros::ServerboundGamePacket; + +use crate::packets::AzaleaWrite; + +#[derive(Clone, Debug, ServerboundGamePacket)] +pub struct ServerboundSetCommandBlock { + pub pos: BlockPos, + pub command: String, + pub mode: Mode, + + pub track_output: bool, + pub conditional: bool, + pub automatic: bool, +} + +#[derive(AzBuf, Clone, Copy, Debug)] +pub enum Mode { + Sequence = 0, + Auto = 1, + Redstone = 2, +} + +impl AzaleaRead for ServerboundSetCommandBlock { + fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result { + let pos = BlockPos::azalea_read(buf)?; + let command = String::azalea_read(buf)?; + let mode = Mode::azalea_read(buf)?; + + let set = FixedBitSet::<3>::azalea_read(buf)?; + Ok(Self { + pos, + command, + mode, + track_output: set.index(0), + conditional: set.index(1), + automatic: set.index(2), + }) + } +} + +impl AzaleaWrite for ServerboundSetCommandBlock { + fn azalea_write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> { + self.pos.azalea_write(buf)?; + self.command.azalea_write(buf)?; + self.mode.azalea_write(buf)?; + + let mut set = FixedBitSet::<3>::new(); + if self.track_output { + set.set(0); + } + if self.conditional { + set.set(1); + } + if self.automatic { + set.set(2); + } + set.azalea_write(buf) + } +} -- cgit v1.2.3