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-protocol/src/packets/mod.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-protocol/src/packets/mod.rs')
| -rwxr-xr-x | azalea-protocol/src/packets/mod.rs | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 1dabe175..14ae7c71 100755 --- a/azalea-protocol/src/packets/mod.rs +++ b/azalea-protocol/src/packets/mod.rs @@ -1,20 +1,18 @@ pub mod common; -pub mod configuration; +pub mod config; pub mod game; -pub mod handshaking; +pub mod handshake; pub mod login; pub mod status; use std::io::{Cursor, Write}; -use azalea_buf::{BufReadError, McBufVarReadable, McBufVarWritable, McBufWritable}; +use azalea_buf::{AzaleaReadVar, AzaleaWrite, AzaleaWriteVar, BufReadError}; use crate::read::ReadPacketError; -// TODO: rename the packet files to just like clientbound_add_entity instead of -// clientbound_add_entity_packet - pub const PROTOCOL_VERSION: i32 = 768; +pub const VERSION_NAME: &str = "1.21.3"; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub enum ConnectionProtocol { @@ -39,7 +37,7 @@ impl ConnectionProtocol { } } -/// An enum of packets for a certain protocol +/// An enum of packets for a certain protocol. pub trait ProtocolPacket where Self: Sized, @@ -52,6 +50,10 @@ where fn write(&self, buf: &mut impl Write) -> Result<(), std::io::Error>; } +pub trait Packet<Protocol> { + fn into_variant(self) -> Protocol; +} + #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub enum ClientIntention { Status = 1, @@ -81,16 +83,16 @@ impl From<ClientIntention> for ConnectionProtocol { } } -impl azalea_buf::McBufReadable for ClientIntention { - fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> { - let id = i32::var_read_from(buf)?; +impl azalea_buf::AzaleaRead for ClientIntention { + fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> { + let id = i32::azalea_read_var(buf)?; id.try_into() .map_err(|_| BufReadError::UnexpectedEnumVariant { id }) } } -impl McBufWritable for ClientIntention { - fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { - (*self as i32).var_write_into(buf) +impl AzaleaWrite for ClientIntention { + fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { + (*self as i32).azalea_write_var(buf) } } |
