From c0433b7d4934caa5b1a42625d16058fcece2a86d Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 27 May 2022 19:36:18 -0500 Subject: Compiles --- azalea-block/block-macros/src/lib.rs | 8 ++++++-- azalea-block/src/blocks.rs | 3 ++- azalea-block/src/lib.rs | 1 - 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/azalea-block/block-macros/src/lib.rs b/azalea-block/block-macros/src/lib.rs index 20ec5f3e..d6c3465e 100644 --- a/azalea-block/block-macros/src/lib.rs +++ b/azalea-block/block-macros/src/lib.rs @@ -38,7 +38,11 @@ impl Parse for PropertyDefinition { // Ceiling // }; let name = input.parse()?; - let variants = input.parse_terminated(Ident::parse)?; + + let content; + braced!(content in input); + let variants = content.parse_terminated(Ident::parse)?; + input.parse::()?; Ok(PropertyDefinition { name, variants }) } @@ -130,7 +134,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream { }); } - let property_name = property.name; + let property_name = &property.name; property_enums.extend(quote! { #[derive(Debug, Clone, Copy)] diff --git a/azalea-block/src/blocks.rs b/azalea-block/src/blocks.rs index 6bc82a20..a50e8804 100644 --- a/azalea-block/src/blocks.rs +++ b/azalea-block/src/blocks.rs @@ -1,4 +1,5 @@ -use crate::{behavior::BlockBehavior, properties}; +use crate::behavior::BlockBehavior; +use block_macros::make_block_states; make_block_states! { PROPERTIES => { diff --git a/azalea-block/src/lib.rs b/azalea-block/src/lib.rs index 30f2aadc..488e8e62 100644 --- a/azalea-block/src/lib.rs +++ b/azalea-block/src/lib.rs @@ -1,3 +1,2 @@ pub mod behavior; pub mod blocks; -pub mod properties; -- cgit v1.2.3