diff options
| -rw-r--r-- | Cargo.lock | 7 | ||||
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | azalea-client/Cargo.toml | 1 | ||||
| -rw-r--r-- | azalea-client/src/plugins/packet/mod.rs | 20 | ||||
| -rw-r--r-- | azalea-protocol/azalea-protocol-macros/src/lib.rs | 108 | ||||
| -rw-r--r-- | azalea-protocol/azalea-protocol-macros/src/utils.rs | 29 | ||||
| -rw-r--r-- | azalea-protocol/src/lib.rs | 3 |
7 files changed, 105 insertions, 64 deletions
@@ -390,7 +390,6 @@ dependencies = [ "indexmap", "minecraft_folder_path", "parking_lot", - "pastey", "regex", "reqwest", "simdnbt", @@ -2570,12 +2569,6 @@ dependencies = [ ] [[package]] -name = "pastey" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b867cad97c0791bbd3aaa6472142568c6c9e8f71937e98379f584cfb0cf35bec" - -[[package]] name = "pem-rfc7468" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -67,7 +67,6 @@ num-bigint = "0.4.6" num-format = "0.4.4" num-traits = "0.2.19" parking_lot = "0.12.5" -pastey = "0.2.1" proc-macro2 = "1.0.106" quote = "1.0.44" rand = "0.10.0" diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml index b6ed7f12..d260eca0 100644 --- a/azalea-client/Cargo.toml +++ b/azalea-client/Cargo.toml @@ -30,7 +30,6 @@ derive_more = { workspace = true, features = ["deref", "deref_mut"] } indexmap.workspace = true minecraft_folder_path.workspace = true parking_lot.workspace = true -pastey.workspace = true regex.workspace = true reqwest = { workspace = true, optional = true, features = ["socks"] } simdnbt.workspace = true diff --git a/azalea-client/src/plugins/packet/mod.rs b/azalea-client/src/plugins/packet/mod.rs index 4309850e..e758ae5f 100644 --- a/azalea-client/src/plugins/packet/mod.rs +++ b/azalea-client/src/plugins/packet/mod.rs @@ -55,25 +55,7 @@ impl Plugin for PacketPlugin { } } -#[doc(hidden)] -macro_rules! __declare_packet_handlers { - ( - $packetenum:ident, - $packetvar:expr, - $handler:ident, - [$($packet:path),+ $(,)?] - ) => { - pastey::paste! { - match $packetvar { - $( - $packetenum::[< $packet:camel >](p) => $handler.$packet(p), - )+ - } - } - }; -} - -pub(crate) use __declare_packet_handlers as declare_packet_handlers; +pub(crate) use azalea_protocol::azalea_protocol_macros::declare_packet_handlers; #[derive(Resource)] struct CachedSystemState<T: SystemParam + 'static>(SystemState<T>); diff --git a/azalea-protocol/azalea-protocol-macros/src/lib.rs b/azalea-protocol/azalea-protocol-macros/src/lib.rs index fcac9c91..a815a86d 100644 --- a/azalea-protocol/azalea-protocol-macros/src/lib.rs +++ b/azalea-protocol/azalea-protocol-macros/src/lib.rs @@ -1,11 +1,15 @@ +mod utils; + use proc_macro::TokenStream; use quote::quote; use syn::{ - DeriveInput, Ident, Token, bracketed, + DeriveInput, Expr, Ident, Token, bracketed, parse::{Parse, ParseStream, Result}, parse_macro_input, }; +use crate::utils::{to_camel_case, to_snake_case}; + fn as_packet_derive(input: TokenStream, state: proc_macro2::TokenStream) -> TokenStream { let DeriveInput { ident, data, .. } = parse_macro_input!(input); @@ -194,17 +198,17 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream { let has_clientbound_packets = !input.clientbound.packets.is_empty(); let has_serverbound_packets = !input.serverbound.packets.is_empty(); - let mut mod_and_use_statements_contents = quote!(); - let mut clientbound_enum_contents = quote!(); - let mut serverbound_enum_contents = quote!(); - let mut clientbound_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 serverbound_write_match_contents = quote!(); - let mut clientbound_read_match_contents = quote!(); - let mut serverbound_read_match_contents = quote!(); + let mut mod_and_use_statements_contents = quote! {}; + let mut clientbound_enum_contents = quote! {}; + let mut serverbound_enum_contents = quote! {}; + let mut clientbound_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 serverbound_write_match_contents = quote! {}; + let mut clientbound_read_match_contents = quote! {}; + let mut serverbound_read_match_contents = quote! {}; for (id, packet_name) in input.clientbound.packets.iter().enumerate() { let id = id as u32; @@ -463,32 +467,64 @@ fn packet_name_to_variant_name(name: &syn::Ident) -> syn::Ident { syn::Ident::new(&variant_name, name.span()) } -fn to_camel_case(snake_case: &str) -> String { - let mut camel_case = String::new(); - let mut capitalize_next = true; - for c in snake_case.chars() { - if c == '_' { - capitalize_next = true; - } else { - if capitalize_next { - camel_case.push(c.to_ascii_uppercase()); - } else { - camel_case.push(c); - } - capitalize_next = false; - } +struct DeclarePacketHandlers { + packet_enum: Ident, + packet_var: Expr, + handler: Ident, + packets: Box<[syn::Path]>, +} +impl Parse for DeclarePacketHandlers { + fn parse(input: ParseStream) -> Result<Self> { + let packet_enum = input.parse()?; + input.parse::<Token![,]>()?; + let packet_var = input.parse()?; + input.parse::<Token![,]>()?; + let handler = input.parse()?; + input.parse::<Token![,]>()?; + + let packets_inner; + bracketed!(packets_inner in input); + let packets = packets_inner + .parse_terminated(syn::Path::parse, Token![,])? + .into_iter() + .collect::<Box<[_]>>(); + + Ok(Self { + packet_enum, + packet_var, + handler, + packets, + }) } - camel_case } -fn to_snake_case(camel_case: &str) -> String { - let mut snake_case = String::new(); - for c in camel_case.chars() { - if c.is_ascii_uppercase() { - snake_case.push('_'); - snake_case.push(c.to_ascii_lowercase()); - } else { - snake_case.push(c); +#[proc_macro] +pub fn declare_packet_handlers(input: TokenStream) -> TokenStream { + let DeclarePacketHandlers { + packet_enum, + packet_var, + handler, + packets, + } = parse_macro_input!(input as DeclarePacketHandlers); + // needs to be a proc macro to be able to convert snake_case to camelCase + + let mut inner = quote! {}; + for packet in packets { + let mut packet_camel = packet.clone(); + let packet_last_ident = &mut packet_camel.segments.last_mut().unwrap().ident; + *packet_last_ident = Ident::new( + &to_camel_case(&packet_last_ident.to_string()), + packet_last_ident.span(), + ); + + inner.extend(quote! { + #packet_enum::#packet_camel(p) => #handler.#packet(p), + }); + } + + quote! { + match #packet_var { + #inner } } - snake_case + .into() } diff --git a/azalea-protocol/azalea-protocol-macros/src/utils.rs b/azalea-protocol/azalea-protocol-macros/src/utils.rs new file mode 100644 index 00000000..cdfe0412 --- /dev/null +++ b/azalea-protocol/azalea-protocol-macros/src/utils.rs @@ -0,0 +1,29 @@ +pub fn to_camel_case(snake_case: &str) -> String { + let mut camel_case = String::new(); + let mut capitalize_next = true; + for c in snake_case.chars() { + if c == '_' { + capitalize_next = true; + } else { + if capitalize_next { + camel_case.push(c.to_ascii_uppercase()); + } else { + camel_case.push(c); + } + capitalize_next = false; + } + } + camel_case +} +pub fn to_snake_case(camel_case: &str) -> String { + let mut snake_case = String::new(); + for c in camel_case.chars() { + if c.is_ascii_uppercase() { + snake_case.push('_'); + snake_case.push(c.to_ascii_lowercase()); + } else { + snake_case.push(c); + } + } + snake_case +} diff --git a/azalea-protocol/src/lib.rs b/azalea-protocol/src/lib.rs index b269fba8..806bfdfc 100644 --- a/azalea-protocol/src/lib.rs +++ b/azalea-protocol/src/lib.rs @@ -11,6 +11,9 @@ pub mod read; pub mod resolve; pub mod write; +// re-export for internal use in azalea-client +#[doc(hidden)] +pub use azalea_protocol_macros; // re-export to make it easier for users to have the correct version pub use simdnbt; |