diff options
| author | mat <git@matdoes.dev> | 2025-06-02 19:23:59 -0330 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2025-06-03 06:11:26 +0700 |
| commit | 7517a207db658c98d5b97b3b3f44df6725c025a2 (patch) | |
| tree | 5daabe20be53705acd1fee93134421dc23b4d6c6 /azalea-physics/src | |
| parent | abf995a70245028f9cc860ee231dc671f14adfcc (diff) | |
| download | azalea-drasl-7517a207db658c98d5b97b3b3f44df6725c025a2.tar.xz | |
rename the Block trait to BlockTrait to disambiguate with azalea_registry::Block
Diffstat (limited to 'azalea-physics/src')
| -rw-r--r-- | azalea-physics/src/collision/mod.rs | 2 | ||||
| -rw-r--r-- | azalea-physics/src/lib.rs | 6 | ||||
| -rw-r--r-- | azalea-physics/src/travel.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs index 56491e2d..2e46970d 100644 --- a/azalea-physics/src/collision/mod.rs +++ b/azalea-physics/src/collision/mod.rs @@ -379,7 +379,7 @@ pub fn legacy_blocks_motion(block: BlockState) -> bool { pub fn legacy_calculate_solid(block: BlockState) -> bool { // force_solid has to be checked before anything else - let block_trait = Box::<dyn azalea_block::Block>::from(block); + let block_trait = Box::<dyn azalea_block::BlockTrait>::from(block); if let Some(solid) = block_trait.behavior().force_solid { return solid; } diff --git a/azalea-physics/src/lib.rs b/azalea-physics/src/lib.rs index 6c9fe096..f384a90f 100644 --- a/azalea-physics/src/lib.rs +++ b/azalea-physics/src/lib.rs @@ -8,7 +8,7 @@ pub mod travel; use std::collections::HashSet; -use azalea_block::{Block, BlockState, fluid_state::FluidState, properties}; +use azalea_block::{BlockTrait, BlockState, fluid_state::FluidState, properties}; use azalea_core::{ math, position::{BlockPos, Vec3}, @@ -492,7 +492,7 @@ fn block_jump_factor(world: &Instance, position: &Position) -> f32 { .get_block_state(&get_block_pos_below_that_affects_movement(position)); let block_at_pos_jump_factor = if let Some(block) = block_at_pos { - Box::<dyn Block>::from(block).behavior().jump_factor + Box::<dyn BlockTrait>::from(block).behavior().jump_factor } else { 1. }; @@ -501,7 +501,7 @@ fn block_jump_factor(world: &Instance, position: &Position) -> f32 { } if let Some(block) = block_below { - Box::<dyn Block>::from(block).behavior().jump_factor + Box::<dyn BlockTrait>::from(block).behavior().jump_factor } else { 1. } diff --git a/azalea-physics/src/travel.rs b/azalea-physics/src/travel.rs index 8f89de25..741267c2 100644 --- a/azalea-physics/src/travel.rs +++ b/azalea-physics/src/travel.rs @@ -1,4 +1,4 @@ -use azalea_block::{Block, BlockState, fluid_state::FluidState}; +use azalea_block::{BlockTrait, BlockState, fluid_state::FluidState}; use azalea_core::{ aabb::AABB, position::{BlockPos, Vec3}, @@ -124,7 +124,7 @@ fn travel_in_air( .chunks .get_block_state(&block_pos_below) .unwrap_or(BlockState::AIR); - let block_below: Box<dyn Block> = block_state_below.into(); + let block_below: Box<dyn BlockTrait> = block_state_below.into(); let block_friction = block_below.behavior().friction; let inertia = if physics.on_ground() { |