PurpleCelloServer
/
mc_protocol
mirror of https://github.com/PurpleCelloServer/mc_protocol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed macro lib

This commit is contained in:
Kyler Olsen 2025-09-15 22:00:40 -06:00
parent b51826c0ff
commit fb2c45d163
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
purple_cello_mc_derive/src/lib.rs
View File

@ -2,46 +2,38 @@
use proc_macro::TokenStream; use proc_macro::TokenStream;
use quote::quote; use quote::quote;
use syn::{parse_macro_input, DeriveInput, Data, Fields, Meta, Lit}; use syn::{parse_macro_input, DeriveInput, Data, Fields, Lit};
#[proc_macro_derive(Packet, attributes(packet))] #[proc_macro_derive(Packet, attributes(packet))]
pub fn derive_packet(input: TokenStream) -> TokenStream { pub fn derive_packet(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput); let input = parse_macro_input!(input as DeriveInput);
let name = &input.ident; let name = &input.ident;
let packet_id = input.attrs.iter().find_map(|attr| { let mut packet_id: Option<i32> = None;
if attr.path.is_ident("packet") { let mut enum_variant: Option<String> = None;
if let Ok(Meta::List(list)) = attr.parse_meta() {
for nested in list.nested.iter() {
if let syn::NestedMeta::Meta(Meta::NameValue(nv)) = nested {
if nv.path.is_ident("id") {
if let Lit::Int(litint) = &nv.lit {
return Some(litint.base10_parse::<i32>().unwrap());
}
}
}
}
}
}
None
}).expect("Missing #[packet(id = …)] attribute");
let enum_variant = input.attrs.iter().find_map(|attr| { for attr in &input.attrs {
if attr.path.is_ident("packet") { if attr.path().is_ident("packet") {
if let Ok(Meta::List(list)) = attr.parse_meta() { let _ = attr.parse_nested_meta(|meta| {
for nested in list.nested.iter() { if meta.path.is_ident("id") {
if let syn::NestedMeta::Meta(Meta::NameValue(nv)) = nested { let lit: Lit = meta.value()?.parse()?;
if nv.path.is_ident("name") { if let Lit::Int(litint) = lit {
if let Lit::Str(litstr) = &nv.lit { packet_id = Some(litint.base10_parse::<i32>()?);
return Some(litstr.value());
}
}
} }
} }
} if meta.path.is_ident("name") {
let lit: Lit = meta.value()?.parse()?;
if let Lit::Str(litstr) = lit {
enum_variant = Some(litstr.value());
}
}
Ok(())
});
} }
None }
}).expect("Missing #[packet(name = …)] attribute");
let packet_id = packet_id.expect("Missing #[packet(id = …)] attribute");
let enum_variant = enum_variant.expect("Missing #[packet(name = …)] attribute");
let Data::Struct(data_struct) = input.data else { let Data::Struct(data_struct) = input.data else {
return syn::Error::new_spanned(name, "Packet can only be derived for structs") return syn::Error::new_spanned(name, "Packet can only be derived for structs")
@ -55,7 +47,6 @@ pub fn derive_packet(input: TokenStream) -> TokenStream {
.into(); .into();
}; };
// build field accessors
let read_fields = fields.named.iter().map(|f| { let read_fields = fields.named.iter().map(|f| {
let fname = &f.ident; let fname = &f.ident;
let fty = &f.ty; let fty = &f.ty;
@ -125,7 +116,6 @@ pub fn derive_mctype_struct(input: TokenStream) -> TokenStream {
.into(); .into();
}; };
// build field accessors
let read_fields = fields.named.iter().map(|f| { let read_fields = fields.named.iter().map(|f| {
let fname = &f.ident; let fname = &f.ident;
let fty = &f.ty; let fty = &f.ty;