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-core/src/bitset.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-core/src/bitset.rs')
| -rwxr-xr-x | azalea-core/src/bitset.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/azalea-core/src/bitset.rs b/azalea-core/src/bitset.rs index 0be04a57..e7c79467 100755 --- a/azalea-core/src/bitset.rs +++ b/azalea-core/src/bitset.rs @@ -1,9 +1,9 @@ use std::io::{Cursor, Write}; -use azalea_buf::{BufReadError, McBuf, McBufReadable, McBufWritable}; +use azalea_buf::{AzBuf, AzaleaRead, AzaleaWrite, BufReadError}; /// Represents Java's BitSet, a list of bits. -#[derive(Debug, Clone, PartialEq, Eq, Hash, Default, McBuf)] +#[derive(Debug, Clone, PartialEq, Eq, Hash, Default, AzBuf)] pub struct BitSet { data: Vec<u64>, } @@ -159,25 +159,25 @@ where } } -impl<const N: usize> McBufReadable for FixedBitSet<N> +impl<const N: usize> AzaleaRead for FixedBitSet<N> where [u8; N.div_ceil(8)]: Sized, { - fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> { + fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> { let mut data = [0; N.div_ceil(8)]; for item in data.iter_mut().take(N.div_ceil(8)) { - *item = u8::read_from(buf)?; + *item = u8::azalea_read(buf)?; } Ok(FixedBitSet { data }) } } -impl<const N: usize> McBufWritable for FixedBitSet<N> +impl<const N: usize> AzaleaWrite for FixedBitSet<N> where [u8; N.div_ceil(8)]: Sized, { - fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { for i in 0..N.div_ceil(8) { - self.data[i].write_into(buf)?; + self.data[i].azalea_write(buf)?; } Ok(()) } |
