From 5d764c79d0b2be9a57a863cd2cb31ca47c16beca Mon Sep 17 00:00:00 2001 From: mat Date: Sat, 28 May 2022 18:20:15 -0500 Subject: genblocks --- azalea-block/block-macros/src/lib.rs | 6 +++--- azalea-block/src/blocks.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'azalea-block') diff --git a/azalea-block/block-macros/src/lib.rs b/azalea-block/block-macros/src/lib.rs index 3d937ac4..63e21e58 100644 --- a/azalea-block/block-macros/src/lib.rs +++ b/azalea-block/block-macros/src/lib.rs @@ -101,16 +101,16 @@ impl Parse for BlockDefinitions { impl Parse for MakeBlockStates { fn parse(input: ParseStream) -> Result { - // PROPERTIES => { ... } BLOCKS => { ... } + // Properties => { ... } Blocks => { ... } let properties_ident = input.parse::()?; - assert_eq!(properties_ident.to_string(), "PROPERTIES"); + assert_eq!(properties_ident.to_string(), "Properties"); input.parse::]>()?; let content; braced!(content in input); let properties = content.parse()?; let blocks_ident = input.parse::()?; - assert_eq!(blocks_ident.to_string(), "BLOCKS"); + assert_eq!(blocks_ident.to_string(), "Blocks"); input.parse::]>()?; let content; braced!(content in input); diff --git a/azalea-block/src/blocks.rs b/azalea-block/src/blocks.rs index beba877e..88253e34 100644 --- a/azalea-block/src/blocks.rs +++ b/azalea-block/src/blocks.rs @@ -7,7 +7,7 @@ pub trait Block { } make_block_states! { - PROPERTIES => { + Properties => { Face { Floor, Wall, @@ -36,7 +36,7 @@ make_block_states! { False }; } - BLOCKS => { + Blocks => { acacia_button => BlockBehavior::default().no_collision(), { Face, Facing, -- cgit v1.2.3