aboutsummaryrefslogtreecommitdiff
path: root/azalea-block
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-05-28 18:20:15 -0500
committermat <github@matdoes.dev>2022-05-28 18:20:15 -0500
commit5d764c79d0b2be9a57a863cd2cb31ca47c16beca (patch)
tree4b1d5bc669b4747c500d6a79626f031770bdef34 /azalea-block
parentff2f3c7af5bd4c1a1c10fa7c269830b9081319e4 (diff)
downloadazalea-drasl-5d764c79d0b2be9a57a863cd2cb31ca47c16beca.tar.xz
genblocks
Diffstat (limited to 'azalea-block')
-rw-r--r--azalea-block/block-macros/src/lib.rs6
-rw-r--r--azalea-block/src/blocks.rs4
2 files changed, 5 insertions, 5 deletions
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<Self> {
- // PROPERTIES => { ... } BLOCKS => { ... }
+ // Properties => { ... } Blocks => { ... }
let properties_ident = input.parse::<Ident>()?;
- assert_eq!(properties_ident.to_string(), "PROPERTIES");
+ assert_eq!(properties_ident.to_string(), "Properties");
input.parse::<Token![=>]>()?;
let content;
braced!(content in input);
let properties = content.parse()?;
let blocks_ident = input.parse::<Ident>()?;
- assert_eq!(blocks_ident.to_string(), "BLOCKS");
+ assert_eq!(blocks_ident.to_string(), "Blocks");
input.parse::<Token![=>]>()?;
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,