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_set_objective.rs | 82 ++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100755 azalea-protocol/src/packets/game/c_set_objective.rs (limited to 'azalea-protocol/src/packets/game/c_set_objective.rs') diff --git a/azalea-protocol/src/packets/game/c_set_objective.rs b/azalea-protocol/src/packets/game/c_set_objective.rs new file mode 100755 index 00000000..7ddb3f71 --- /dev/null +++ b/azalea-protocol/src/packets/game/c_set_objective.rs @@ -0,0 +1,82 @@ +use std::io::{Cursor, Write}; + +use azalea_buf::{AzBuf, AzaleaRead, AzaleaWrite}; +use azalea_chat::{numbers::NumberFormat, FormattedText}; +use azalea_core::objectives::ObjectiveCriteria; +use azalea_protocol_macros::ClientboundGamePacket; + +#[derive(Clone, Debug, AzBuf, ClientboundGamePacket)] +pub struct ClientboundSetObjective { + pub objective_name: String, + pub method: Method, +} + +#[derive(Clone, Copy, Debug, AzBuf)] +pub enum MethodKind { + Add, + Remove, + Change, +} + +#[derive(Clone, Debug)] +pub enum Method { + Add { + display_name: FormattedText, + render_type: ObjectiveCriteria, + number_format: NumberFormat, + }, + Remove, + Change { + display_name: FormattedText, + render_type: ObjectiveCriteria, + number_format: NumberFormat, + }, +} + +impl AzaleaRead for Method { + fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result { + let kind = MethodKind::azalea_read(buf)?; + match kind { + MethodKind::Add => Ok(Method::Add { + display_name: FormattedText::azalea_read(buf)?, + render_type: ObjectiveCriteria::azalea_read(buf)?, + number_format: NumberFormat::azalea_read(buf)?, + }), + MethodKind::Remove => Ok(Method::Remove), + MethodKind::Change => Ok(Method::Change { + display_name: FormattedText::azalea_read(buf)?, + render_type: ObjectiveCriteria::azalea_read(buf)?, + number_format: NumberFormat::azalea_read(buf)?, + }), + } + } +} + +impl AzaleaWrite for Method { + fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { + match self { + Method::Add { + display_name, + render_type, + number_format, + } => { + MethodKind::Add.azalea_write(buf)?; + display_name.azalea_write(buf)?; + render_type.azalea_write(buf)?; + number_format.azalea_write(buf)?; + } + Method::Remove => MethodKind::Remove.azalea_write(buf)?, + Method::Change { + display_name, + render_type, + number_format, + } => { + MethodKind::Change.azalea_write(buf)?; + display_name.azalea_write(buf)?; + render_type.azalea_write(buf)?; + number_format.azalea_write(buf)?; + } + } + Ok(()) + } +} -- cgit v1.2.3