aboutsummaryrefslogtreecommitdiff
path: root/azalea-block/azalea-block-macros/src
diff options
context:
space:
mode:
authormat <git@matdoes.dev>2025-06-02 19:23:59 -0330
committermat <git@matdoes.dev>2025-06-03 06:11:26 +0700
commit7517a207db658c98d5b97b3b3f44df6725c025a2 (patch)
tree5daabe20be53705acd1fee93134421dc23b4d6c6 /azalea-block/azalea-block-macros/src
parentabf995a70245028f9cc860ee231dc671f14adfcc (diff)
downloadazalea-drasl-7517a207db658c98d5b97b3b3f44df6725c025a2.tar.xz
rename the Block trait to BlockTrait to disambiguate with azalea_registry::Block
Diffstat (limited to 'azalea-block/azalea-block-macros/src')
-rw-r--r--azalea-block/azalea-block-macros/src/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/azalea-block/azalea-block-macros/src/lib.rs b/azalea-block/azalea-block-macros/src/lib.rs
index 3d09b018..4174ed41 100644
--- a/azalea-block/azalea-block-macros/src/lib.rs
+++ b/azalea-block/azalea-block-macros/src/lib.rs
@@ -660,7 +660,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
#block_struct_fields
}
- impl Block for #block_struct_name {
+ impl BlockTrait for #block_struct_name {
fn behavior(&self) -> BlockBehavior {
#block_behavior
}
@@ -785,7 +785,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
#block_structs
- impl From<BlockState> for Box<dyn Block> {
+ impl From<BlockState> for Box<dyn BlockTrait> {
fn from(block_state: BlockState) -> Self {
let b = block_state.id();
match b {
@@ -794,7 +794,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
}
}
}
- impl From<azalea_registry::Block> for Box<dyn Block> {
+ impl From<azalea_registry::Block> for Box<dyn BlockTrait> {
fn from(block: azalea_registry::Block) -> Self {
match block {
#from_registry_block_to_block_match