aboutsummaryrefslogtreecommitdiff
path: root/azalea/src/pathfinder
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2024-11-27 19:31:40 -0600
committerGitHub <noreply@github.com>2024-11-27 19:31:40 -0600
commit08958c2278b15ebeac8a964f392ebb792e479b61 (patch)
tree4ae3664cea38d7fd1a8f1e95ed06fac04ffe519e /azalea/src/pathfinder
parent139d77d3c2b0922fba5e9d4fa2bd9819d78bd773 (diff)
downloadazalea-drasl-08958c2278b15ebeac8a964f392ebb792e479b61.tar.xz
Refactor azalea-protocol (#190)
* start updating to 1.21.4 * fix block codegen and stop using block data from burger * rename packet related modules and structs to be simpler * ItemSlot -> ItemStack for more consistency with mojmap * .get() -> .into_packet() * simplify declare_state_packets by removing packet ids * rename read_from and write_into to azalea_read and azalea_write * rename McBufReadable and McBufWritable to AzaleaRead and AzaleaWrite * McBuf -> AzBuf * remove most uses of into_variant * update codegen and use resourcelocation names for packets * implement #[limit(i)] attribute for AzBuf derive macro * fixes for 1.21.4 * fix examples * update some physics code and fix ChatType * remove unused imports in codegen * re-add some things to migrate.py and update +mc version numbers automatically * downgrade to 1.21.3 lol
Diffstat (limited to 'azalea/src/pathfinder')
-rw-r--r--azalea/src/pathfinder/debug.rs2
-rw-r--r--azalea/src/pathfinder/goals.rs2
-rw-r--r--azalea/src/pathfinder/mod.rs2
-rw-r--r--azalea/src/pathfinder/moves/basic.rs12
-rw-r--r--azalea/src/pathfinder/moves/mod.rs2
5 files changed, 11 insertions, 9 deletions
diff --git a/azalea/src/pathfinder/debug.rs b/azalea/src/pathfinder/debug.rs
index a5e51cdf..ca08cbc5 100644
--- a/azalea/src/pathfinder/debug.rs
+++ b/azalea/src/pathfinder/debug.rs
@@ -60,7 +60,7 @@ pub fn debug_render_path_with_particles(
let start_vec3 = start.center();
let end_vec3 = end.center();
- let step_count = (start_vec3.distance_to_sqr(&end_vec3).sqrt() * 4.0) as usize;
+ let step_count = (start_vec3.distance_squared_to(&end_vec3).sqrt() * 4.0) as usize;
let target_block_state = chunks.get_block_state(&movement.target).unwrap_or_default();
let above_target_block_state = chunks
diff --git a/azalea/src/pathfinder/goals.rs b/azalea/src/pathfinder/goals.rs
index 7e33f7d8..531e4036 100644
--- a/azalea/src/pathfinder/goals.rs
+++ b/azalea/src/pathfinder/goals.rs
@@ -200,7 +200,7 @@ impl Goal for ReachBlockPosGoal {
let max_pick_range = 6;
let actual_pick_range = 4.5;
- let distance = (self.pos - n).length_sqr();
+ let distance = (self.pos - n).length_squared();
if distance > max_pick_range * max_pick_range {
return false;
}
diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs
index 611ad5c5..88ae5da0 100644
--- a/azalea/src/pathfinder/mod.rs
+++ b/azalea/src/pathfinder/mod.rs
@@ -453,7 +453,7 @@ pub fn timeout_movement(
// don't timeout if we're mining
if let Some(mining) = mining {
// also make sure we're close enough to the block that's being mined
- if mining.pos.distance_to_sqr(&BlockPos::from(position)) < 6_i32.pow(2) {
+ if mining.pos.distance_squared_to(&BlockPos::from(position)) < 6_i32.pow(2) {
// also reset the last_node_reached_at so we don't timeout after we finish
// mining
executing_path.last_node_reached_at = Instant::now();
diff --git a/azalea/src/pathfinder/moves/basic.rs b/azalea/src/pathfinder/moves/basic.rs
index bb931caf..89ba9acc 100644
--- a/azalea/src/pathfinder/moves/basic.rs
+++ b/azalea/src/pathfinder/moves/basic.rs
@@ -228,9 +228,10 @@ fn execute_descend_move(mut ctx: ExecuteCtx) {
let start_center = start.center();
let center = target.center();
- let horizontal_distance_from_target = (center - position).horizontal_distance_sqr().sqrt();
- let horizontal_distance_from_start =
- (start.center() - position).horizontal_distance_sqr().sqrt();
+ let horizontal_distance_from_target = (center - position).horizontal_distance_squared().sqrt();
+ let horizontal_distance_from_start = (start.center() - position)
+ .horizontal_distance_squared()
+ .sqrt();
let dest_ahead = Vec3::new(
start_center.x + (center.x - start_center.x) * 1.5,
@@ -401,8 +402,9 @@ fn execute_downward_move(mut ctx: ExecuteCtx) {
let target_center = target.center();
- let horizontal_distance_from_target =
- (target_center - position).horizontal_distance_sqr().sqrt();
+ let horizontal_distance_from_target = (target_center - position)
+ .horizontal_distance_squared()
+ .sqrt();
if horizontal_distance_from_target > 0.25 {
ctx.look_at(target_center);
diff --git a/azalea/src/pathfinder/moves/mod.rs b/azalea/src/pathfinder/moves/mod.rs
index 28974132..1a435b5f 100644
--- a/azalea/src/pathfinder/moves/mod.rs
+++ b/azalea/src/pathfinder/moves/mod.rs
@@ -157,7 +157,7 @@ impl ExecuteCtx<'_, '_, '_, '_, '_, '_, '_> {
/// of the current node first.
pub fn mine_while_at_start(&mut self, block: BlockPos) -> bool {
let horizontal_distance_from_start = (self.start.center() - self.position)
- .horizontal_distance_sqr()
+ .horizontal_distance_squared()
.sqrt();
let at_start_position =
BlockPos::from(self.position) == self.start && horizontal_distance_from_start < 0.25;