mat/azalea
1
2
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2025-08-02 23:44:38 +00:00
Code Issues Projects Releases Packages Activity

add ProtocolPacket::name function

Browse source
This commit is contained in:
mat 2025-01-25 22:16:59 +00:00
commit b6ddde99ea
2 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
azalea-protocol/azalea-protocol-macros/src/lib.rs
View file

@ -196,6 +196,8 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
let mut serverbound_enum_contents = quote!(); let mut serverbound_enum_contents = quote!();
let mut clientbound_id_match_contents = quote!(); let mut clientbound_id_match_contents = quote!();
let mut serverbound_id_match_contents = quote!(); let mut serverbound_id_match_contents = quote!();
let mut clientbound_name_match_contents = quote!();
let mut serverbound_name_match_contents = quote!();
let mut clientbound_write_match_contents = quote!(); let mut clientbound_write_match_contents = quote!();
let mut serverbound_write_match_contents = quote!(); let mut serverbound_write_match_contents = quote!();
let mut clientbound_read_match_contents = quote!(); let mut clientbound_read_match_contents = quote!();
@ -218,7 +220,10 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
#variant_name(#module_name::#struct_name), #variant_name(#module_name::#struct_name),
}); });
clientbound_id_match_contents.extend(quote! { clientbound_id_match_contents.extend(quote! {
#clientbound_state_name::#variant_name(_packet) => #id, #clientbound_state_name::#variant_name(..) => #id,
});
clientbound_name_match_contents.extend(quote! {
#clientbound_state_name::#variant_name(..) => #packet_name_litstr,
}); });
clientbound_write_match_contents.extend(quote! { clientbound_write_match_contents.extend(quote! {
#clientbound_state_name::#variant_name(packet) => packet.write(buf), #clientbound_state_name::#variant_name(packet) => packet.write(buf),
@ -267,7 +272,10 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
#variant_name(#module_name::#struct_name), #variant_name(#module_name::#struct_name),
}); });
serverbound_id_match_contents.extend(quote! { serverbound_id_match_contents.extend(quote! {
#serverbound_state_name::#variant_name(_packet) => #id, #serverbound_state_name::#variant_name(..) => #id,
});
serverbound_name_match_contents.extend(quote! {
#serverbound_state_name::#variant_name(..) => #packet_name_litstr,
}); });
serverbound_write_match_contents.extend(quote! { serverbound_write_match_contents.extend(quote! {
#serverbound_state_name::#variant_name(packet) => packet.write(buf), #serverbound_state_name::#variant_name(packet) => packet.write(buf),
@ -297,6 +305,9 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
serverbound_id_match_contents.extend(quote! { serverbound_id_match_contents.extend(quote! {
_ => unreachable!("This enum is empty and can't exist.") _ => unreachable!("This enum is empty and can't exist.")
}); });
serverbound_name_match_contents.extend(quote! {
_ => unreachable!("This enum is empty and can't exist.")
});
serverbound_write_match_contents.extend(quote! { serverbound_write_match_contents.extend(quote! {
_ => unreachable!("This enum is empty and can't exist.") _ => unreachable!("This enum is empty and can't exist.")
}); });
@ -305,6 +316,9 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
clientbound_id_match_contents.extend(quote! { clientbound_id_match_contents.extend(quote! {
_ => unreachable!("This enum is empty and can't exist.") _ => unreachable!("This enum is empty and can't exist.")
}); });
clientbound_name_match_contents.extend(quote! {
_ => unreachable!("This enum is empty and can't exist.")
});
clientbound_write_match_contents.extend(quote! { clientbound_write_match_contents.extend(quote! {
_ => unreachable!("This enum is empty and can't exist.") _ => unreachable!("This enum is empty and can't exist.")
}); });
@ -338,6 +352,12 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
} }
} }
fn name(&self) -> &'static str {
match self {
#serverbound_name_match_contents
}
}
fn write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> { fn write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> {
match self { match self {
#serverbound_write_match_contents #serverbound_write_match_contents
@ -376,6 +396,12 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
} }
} }
fn name(&self) -> &'static str {
match self {
#clientbound_name_match_contents
}
}
fn write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> { fn write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> {
match self { match self {
#clientbound_write_match_contents #clientbound_write_match_contents

6
azalea-protocol/src/packets/mod.rs
View file

@ -44,6 +44,12 @@ where
{ {
fn id(&self) -> u32; fn id(&self) -> u32;
/// Returns Mojang's resource name for the packet.
///
/// This doesn't include the "minecraft:" prefix, it just returns a string
/// like `pong`.
fn name(&self) -> &'static str;
/// Read a packet by its id, `ConnectionProtocol`, and flow /// Read a packet by its id, `ConnectionProtocol`, and flow
fn read(id: u32, buf: &mut Cursor<&[u8]>) -> Result<Self, Box<ReadPacketError>>; fn read(id: u32, buf: &mut Cursor<&[u8]>) -> Result<Self, Box<ReadPacketError>>;