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/c_map_item_data.rs | 88 ++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100755 azalea-protocol/src/packets/game/c_map_item_data.rs (limited to 'azalea-protocol/src/packets/game/c_map_item_data.rs') diff --git a/azalea-protocol/src/packets/game/c_map_item_data.rs b/azalea-protocol/src/packets/game/c_map_item_data.rs new file mode 100755 index 00000000..9a41ed85 --- /dev/null +++ b/azalea-protocol/src/packets/game/c_map_item_data.rs @@ -0,0 +1,88 @@ +use azalea_buf::{AzBuf, AzaleaRead, AzaleaWrite}; +use azalea_chat::FormattedText; +use azalea_protocol_macros::ClientboundGamePacket; + +#[derive(Clone, Debug, ClientboundGamePacket, AzBuf)] +pub struct ClientboundMapItemData { + #[var] + pub map_id: u32, + pub scale: u8, + pub locked: bool, + pub decorations: Option>, + pub color_patch: OptionalMapPatch, +} + +#[derive(Clone, Debug, AzBuf)] +pub struct MapDecoration { + pub decoration_type: DecorationType, + pub x: i8, + pub y: i8, + /// Minecraft does & 15 on this value, azalea-protocol doesn't. I don't + /// think it matters. + pub rot: i8, + pub name: Option, +} + +#[derive(Debug, Clone)] +pub struct OptionalMapPatch(pub Option); + +impl AzaleaRead for OptionalMapPatch { + fn azalea_read(buf: &mut std::io::Cursor<&[u8]>) -> Result { + let pos = buf.position(); + Ok(Self(if u8::azalea_read(buf)? == 0 { + None + } else { + buf.set_position(pos); + Some(MapPatch::azalea_read(buf)?) + })) + } +} + +impl AzaleaWrite for OptionalMapPatch { + fn azalea_write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> { + match &self.0 { + None => 0u8.azalea_write(buf), + Some(m) => m.azalea_write(buf), + } + } +} + +#[derive(Debug, Clone, AzBuf)] +pub struct MapPatch { + pub width: u8, + pub height: u8, + pub start_x: u8, + pub start_y: u8, + pub map_colors: Vec, +} + +#[derive(Clone, Copy, Debug, AzBuf)] +pub enum DecorationType { + Player, + Frame, + RedMarker, + BlueMarker, + TargetX, + TargetPoint, + PlayerOffMap, + PlayerOffLimits, + Mansion, + Monument, + BannerWhite, + BannerOrange, + BannerMagenta, + BannerLightBlue, + BannerYellow, + BannerLime, + BannerPink, + BannerGray, + BannerLightGray, + BannerCyan, + BannerPurple, + BannerBlue, + BannerBrown, + BannerGreen, + BannerRed, + BannerBlack, + RedX, +} -- cgit v1.2.3