1 files changed, 9 insertions, 28 deletions

diff --git a/azalea-physics/src/clip.rs b/azalea-physics/src/clip.rs
index 30b46a8e..f24721c5 100644
--- a/azalea-physics/src/clip.rs
+++ b/azalea-physics/src/clip.rs
@@ -5,7 +5,7 @@ use azalea_core::{
     math::{self, lerp, EPSILON},
     position::{BlockPos, Vec3},
 };
-use azalea_inventory::ItemSlot;
+use azalea_inventory::ItemStack;
 use azalea_world::ChunkStorage;
 use bevy_ecs::entity::Entity;
 
@@ -52,7 +52,7 @@ pub enum FluidPickType {
 pub struct EntityCollisionContext {
     pub descending: bool,
     pub entity_bottom: f64,
-    pub held_item: ItemSlot,
+    pub held_item: ItemStack,
     // pub can_stand_on_fluid: Box<dyn Fn(&FluidState) -> bool>,
     pub entity: Entity,
 }
@@ -62,21 +62,15 @@ pub fn clip(chunk_storage: &ChunkStorage, context: ClipContext) -> BlockHitResul
         context.from,
         context.to,
         context,
-        |context, block_pos| {
+        |ctx, block_pos| {
             let block_state = chunk_storage.get_block_state(block_pos).unwrap_or_default();
             // TODO: add fluid stuff to this (see getFluidState in vanilla source)
-            let block_shape = context.block_shape(block_state);
-            clip_with_interaction_override(
-                &context.from,
-                &context.to,
-                block_pos,
-                block_shape,
-                &block_state,
-            )
+            let block_shape = ctx.block_shape(block_state);
+            clip_with_interaction_override(&ctx.from, &ctx.to, block_pos, block_shape, &block_state)
             // let block_distance = if let Some(block_hit_result) =
-            // block_hit_result {     context.from.distance_to_sqr(&
+            // block_hit_result {     context.from.distance_squared_to(&
             // block_hit_result.location) } else {
-            //     f64::MAX
+            //     f64::INFINITY
             // };
         },
         |context| {
@@ -90,19 +84,6 @@ pub fn clip(chunk_storage: &ChunkStorage, context: ClipContext) -> BlockHitResul
     )
 }
 
-// default BlockHitResult clipWithInteractionOverride(Vec3 world, Vec3 from,
-// BlockPos to, VoxelShape shape,     BlockState block) {
-//  BlockHitResult blockHitResult = shape.clip(world, from, to);
-//  if (blockHitResult != null) {
-//     BlockHitResult var7 = block.getInteractionShape(this, to).clip(world,
-// from, to);     if (var7 != null
-//           && var7.getLocation().subtract(world).lengthSqr() <
-// blockHitResult.getLocation().subtract(world).lengthSqr()) {        return
-// blockHitResult.withDirection(var7.getDirection());     }
-//  }
-
-//  return blockHitResult;
-// }
 fn clip_with_interaction_override(
     from: &Vec3,
     to: &Vec3,
@@ -119,8 +100,8 @@ fn clip_with_interaction_override(
         let interaction_shape = block_state.shape();
         let interaction_hit_result = interaction_shape.clip(from, to, block_pos);
         if let Some(interaction_hit_result) = interaction_hit_result {
-            if interaction_hit_result.location.distance_to_sqr(from)
-                < block_hit_result.location.distance_to_sqr(from)
+            if interaction_hit_result.location.distance_squared_to(from)
+                < block_hit_result.location.distance_squared_to(from)
             {
                 return Some(block_hit_result.with_direction(interaction_hit_result.direction));
             }