aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-05-27 19:36:18 -0500
committermat <github@matdoes.dev>2022-05-27 19:36:18 -0500
commitc0433b7d4934caa5b1a42625d16058fcece2a86d (patch)
tree1224dc406283d13d6af7dc4a1bec490e1d8cff0e
parent88bc6d16602c163d122685997dc269d5d97a93a2 (diff)
downloadazalea-drasl-c0433b7d4934caa5b1a42625d16058fcece2a86d.tar.xz
Compiles
-rw-r--r--azalea-block/block-macros/src/lib.rs8
-rw-r--r--azalea-block/src/blocks.rs3
-rw-r--r--azalea-block/src/lib.rs1
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::<Token![;]>()?;
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;