diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2024-11-27 19:31:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-27 19:31:40 -0600 |
| commit | 08958c2278b15ebeac8a964f392ebb792e479b61 (patch) | |
| tree | 4ae3664cea38d7fd1a8f1e95ed06fac04ffe519e /azalea-chat/src/numbers.rs | |
| parent | 139d77d3c2b0922fba5e9d4fa2bd9819d78bd773 (diff) | |
| download | azalea-drasl-08958c2278b15ebeac8a964f392ebb792e479b61.tar.xz | |
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
Diffstat (limited to 'azalea-chat/src/numbers.rs')
| -rw-r--r-- | azalea-chat/src/numbers.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/azalea-chat/src/numbers.rs b/azalea-chat/src/numbers.rs index a5a88c4f..161f1177 100644 --- a/azalea-chat/src/numbers.rs +++ b/azalea-chat/src/numbers.rs @@ -4,7 +4,7 @@ use std::io::{Cursor, Write}; #[cfg(feature = "azalea-buf")] -use azalea_buf::{McBufReadable, McBufWritable}; +use azalea_buf::{AzaleaRead, AzaleaWrite}; use azalea_registry::NumberFormatKind; use simdnbt::owned::Nbt; @@ -18,33 +18,33 @@ pub enum NumberFormat { } #[cfg(feature = "azalea-buf")] -impl McBufReadable for NumberFormat { - fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, azalea_buf::BufReadError> { - let kind = NumberFormatKind::read_from(buf)?; +impl AzaleaRead for NumberFormat { + fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, azalea_buf::BufReadError> { + let kind = NumberFormatKind::azalea_read(buf)?; match kind { NumberFormatKind::Blank => Ok(NumberFormat::Blank), NumberFormatKind::Styled => Ok(NumberFormat::Styled { style: simdnbt::owned::read(buf)?, }), NumberFormatKind::Fixed => Ok(NumberFormat::Fixed { - value: FormattedText::read_from(buf)?, + value: FormattedText::azalea_read(buf)?, }), } } } #[cfg(feature = "azalea-buf")] -impl McBufWritable for NumberFormat { - fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { +impl AzaleaWrite for NumberFormat { + fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { match self { - NumberFormat::Blank => NumberFormatKind::Blank.write_into(buf)?, + NumberFormat::Blank => NumberFormatKind::Blank.azalea_write(buf)?, NumberFormat::Styled { style } => { - NumberFormatKind::Styled.write_into(buf)?; - style.write_into(buf)?; + NumberFormatKind::Styled.azalea_write(buf)?; + style.azalea_write(buf)?; } NumberFormat::Fixed { value } => { - NumberFormatKind::Fixed.write_into(buf)?; - value.write_into(buf)?; + NumberFormatKind::Fixed.azalea_write(buf)?; + value.azalea_write(buf)?; } } Ok(()) |
