aboutsummaryrefslogtreecommitdiff
path: root/azalea-physics/src/collision
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2025-12-12 00:56:02 -0600
committerGitHub <noreply@github.com>2025-12-12 00:56:02 -0600
commitf9c25665c203d6377ace62f1e95381d037d8fd9e (patch)
tree8b4131d20fe661d3cc1175ec27f801fe61df41ea /azalea-physics/src/collision
parent82ad975242292d5875780b4398b62637674bf50a (diff)
downloadazalea-drasl-f9c25665c203d6377ace62f1e95381d037d8fd9e.tar.xz
Refactor azalea-registry (#294)
* move registries in azalea-registry into separate modules * rename Item and Block to ItemKind and BlockKind * remove 'extra' registries from azalea-registry * hide deprecated items from docs * use DamageKindKey instead of Identifier when parsing registries * store tag entries as a Vec instead of a HashSet * sort tag values by protocol id * update changelog
Diffstat (limited to 'azalea-physics/src/collision')
-rw-r--r--azalea-physics/src/collision/mod.rs11
1 files changed, 6 insertions, 5 deletions
diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs
index e6423fc4..6c622d40 100644
--- a/azalea-physics/src/collision/mod.rs
+++ b/azalea-physics/src/collision/mod.rs
@@ -7,7 +7,7 @@ pub mod world_collisions;
use std::{ops::Add, sync::LazyLock};
-use azalea_block::{BlockState, fluid_state::FluidState};
+use azalea_block::{BlockState, BlockTrait, fluid_state::FluidState};
use azalea_core::{
aabb::Aabb,
direction::Axis,
@@ -18,6 +18,7 @@ use azalea_entity::{
Attributes, Jumping, LookDirection, OnClimbable, Physics, PlayerAbilities, Pose, Position,
metadata::Sprinting,
};
+use azalea_registry::builtin::BlockKind;
use azalea_world::{ChunkStorage, Instance};
use bevy_ecs::{entity::Entity, world::Mut};
pub use blocks::BlockWithShape;
@@ -483,15 +484,15 @@ pub fn legacy_blocks_motion(block: BlockState) -> bool {
return false;
}
- let registry_block = azalea_registry::Block::from(block);
+ let registry_block = BlockKind::from(block);
legacy_calculate_solid(block)
- && registry_block != azalea_registry::Block::Cobweb
- && registry_block != azalea_registry::Block::BambooSapling
+ && registry_block != BlockKind::Cobweb
+ && registry_block != BlockKind::BambooSapling
}
pub fn legacy_calculate_solid(block: BlockState) -> bool {
// force_solid has to be checked before anything else
- let block_trait = Box::<dyn azalea_block::BlockTrait>::from(block);
+ let block_trait = Box::<dyn BlockTrait>::from(block);
if let Some(solid) = block_trait.behavior().force_solid {
return solid;
}