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 | |
| 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')
| -rw-r--r-- | azalea-chat/Cargo.toml | 2 | ||||
| -rwxr-xr-x | azalea-chat/src/component.rs | 10 | ||||
| -rw-r--r-- | azalea-chat/src/numbers.rs | 24 | ||||
| -rwxr-xr-x | azalea-chat/src/style.rs | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml index 370a8862..b4f38ac3 100644 --- a/azalea-chat/Cargo.toml +++ b/azalea-chat/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-chat" repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-chat" -version = "0.10.3+mc1.21.1" +version = "0.10.3+mc1.21.3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/azalea-chat/src/component.rs b/azalea-chat/src/component.rs index 43614c77..86738b26 100755 --- a/azalea-chat/src/component.rs +++ b/azalea-chat/src/component.rs @@ -1,7 +1,7 @@ use std::{fmt::Display, sync::LazyLock}; #[cfg(feature = "azalea-buf")] -use azalea_buf::{BufReadError, McBufReadable, McBufWritable}; +use azalea_buf::{AzaleaRead, AzaleaWrite, BufReadError}; use serde::{de, Deserialize, Deserializer, Serialize}; #[cfg(feature = "simdnbt")] use simdnbt::{Deserialize as _, FromNbtTag as _, Serialize as _}; @@ -455,8 +455,8 @@ impl From<&simdnbt::Mutf8Str> for FormattedText { #[cfg(feature = "azalea-buf")] #[cfg(feature = "simdnbt")] -impl McBufReadable for FormattedText { - fn read_from(buf: &mut std::io::Cursor<&[u8]>) -> Result<Self, BufReadError> { +impl AzaleaRead for FormattedText { + fn azalea_read(buf: &mut std::io::Cursor<&[u8]>) -> Result<Self, BufReadError> { let nbt = simdnbt::borrow::read_optional_tag(buf)?; if let Some(nbt) = nbt { FormattedText::from_nbt_tag(nbt.as_tag()).ok_or(BufReadError::Custom( @@ -470,8 +470,8 @@ impl McBufReadable for FormattedText { #[cfg(feature = "azalea-buf")] #[cfg(feature = "simdnbt")] -impl McBufWritable for FormattedText { - fn write_into(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> { +impl AzaleaWrite for FormattedText { + fn azalea_write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> { let mut out = Vec::new(); simdnbt::owned::BaseNbt::write_unnamed(&(self.clone().to_compound().into()), &mut out); buf.write_all(&out) 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(()) diff --git a/azalea-chat/src/style.rs b/azalea-chat/src/style.rs index e147bc97..fd2a58dd 100755 --- a/azalea-chat/src/style.rs +++ b/azalea-chat/src/style.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, fmt, sync::LazyLock}; #[cfg(feature = "azalea-buf")] -use azalea_buf::McBuf; +use azalea_buf::AzBuf; use serde::{ser::SerializeStruct, Serialize, Serializer}; use serde_json::Value; #[cfg(feature = "simdnbt")] @@ -100,7 +100,7 @@ impl Ansi { } #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)] -#[cfg_attr(feature = "azalea-buf", derive(McBuf))] +#[cfg_attr(feature = "azalea-buf", derive(AzBuf))] pub enum ChatFormatting { Black, DarkBlue, |
