0.15.18 - Update to 1.21.8

ShayBox · ShayBox · commit 9bf8c738abdf · 2025-08-13T15:09:49.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shaysbot"
-version = "0.15.17"
+version = "0.15.18"
 authors = ["Shayne Hartford <shaybox@shaybox.com>"]
 edition = "2024"
 description = "My personal Minecraft bot using Azalea"
@@ -42,7 +42,7 @@ strum = { version = "0.27", features = ["derive"] }
 terminal-link = "0.1"
 tiny_http = { version = "0.12", optional = true }
 tokio = { version = "1", features = ["full"] }
-toml = "0.8"
+toml = "0.9"
 tracing = "0.1"
 tracing-subscriber = "0.3"
 ureq = { version = "3", features = ["json"] }
diff --git a/Makefile.toml b/Makefile.toml
@@ -0,0 +1,9 @@
+[tasks.build-aarch64]
+command = "cross"
+args = ["build", "--release", "--target", "aarch64-unknown-linux-gnu"]
+
+[tasks.upload-vps]
+dependencies = ["build-aarch64"]
+script = '''
+scp target/aarch64-unknown-linux-gnu/release/shaysbot pearl@vps:/home/pearl/.local/bin/shaysbot
+'''
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Compiled with [GitHub Actions](.github/workflows/release.yml) using the [**Debug
 
 Prerequisites:
 
-- 2GIB of RAM/SWAP
+- 2GIB of RAM/SWAP (To build locally, much less to run)
 - Update
     - ArchLinux: `sudo pacman -Syu`
     - Debian/Ubuntu: `sudo apt update && sudo apt upgrade`
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "nightly-2025-06-18"
diff --git a/src/commands/interact.rs b/src/commands/interact.rs
@@ -2,7 +2,8 @@ use anyhow::Result;
 use azalea::{
     app::{App, Plugin, Update},
     ecs::prelude::*,
-    interact::BlockInteractEvent,
+    interact::StartUseItemEvent,
+    protocol::packets::game::s_interact::InteractionHand,
     BlockPos,
 };
 
@@ -36,7 +37,7 @@ impl InteractCommandPlugin {
     pub fn handle_interact_cmd_events(
         mut cmd_events: EventReader<CmdEvent>,
         mut msg_events: EventWriter<MsgEvent>,
-        mut block_interact_events: EventWriter<BlockInteractEvent>,
+        mut block_interact_events: EventWriter<StartUseItemEvent>,
     ) {
         for event in cmd_events.read().cloned() {
             let (Cmds::Interact(_plugin), Some(entity)) = (event.cmd, event.entity) else {
@@ -70,7 +71,11 @@ impl InteractCommandPlugin {
                 return;
             };
 
-            block_interact_events.write(BlockInteractEvent { entity, position });
+            block_interact_events.write(StartUseItemEvent {
+                entity,
+                hand: InteractionHand::MainHand,
+                force_block: Some(position),
+            });
             msg_events.write(msg_event);
         }
 
diff --git a/src/commands/leave.rs b/src/commands/leave.rs
@@ -2,7 +2,7 @@ use azalea::{
     app::{App, Plugin, Update},
     disconnect::DisconnectEvent,
     ecs::prelude::*,
-    GameProfileComponent,
+    player::GameProfileComponent,
 };
 
 use crate::prelude::*;
diff --git a/src/commands/pearl.rs b/src/commands/pearl.rs
@@ -2,8 +2,8 @@ use azalea::{
     app::{App, Plugin, Update},
     ecs::prelude::*,
     entity::Position,
+    local_player::TabList,
     BlockPos,
-    TabList,
 };
 
 use crate::prelude::*;
diff --git a/src/commands/whitelist.rs b/src/commands/whitelist.rs
@@ -1,8 +1,8 @@
 use azalea::{
     app::{App, Plugin, Update},
     ecs::prelude::*,
-    PlayerInfo,
-    TabList,
+    local_player::TabList,
+    player::PlayerInfo,
 };
 #[cfg(feature = "bot")]
 use serde::Deserialize;
diff --git a/src/modules/auto_eat.rs b/src/modules/auto_eat.rs
@@ -10,6 +10,7 @@ use azalea::{
         Inventory,
         InventorySet,
     },
+    local_player::Hunger,
     mining::continue_mining_block,
     packet::game::{handle_outgoing_packets, SendPacketEvent},
     physics::PhysicsSet,
@@ -20,7 +21,6 @@ use azalea::{
         ServerboundUseItem,
     },
     registry::Item,
-    Hunger,
 };
 
 use crate::prelude::*;
@@ -109,10 +109,10 @@ impl AutoEatPlugin {
             }
 
             let packet = ServerboundGamePacket::UseItem(ServerboundUseItem {
-                hand:     InteractionHand::MainHand,
-                pitch:    direction.x_rot,
-                yaw:      direction.y_rot,
-                sequence: 0,
+                hand:  InteractionHand::MainHand,
+                x_rot: direction.x_rot(),
+                y_rot: direction.y_rot(),
+                seq:   0,
             });
 
             packet_events.write(SendPacketEvent {
diff --git a/src/modules/auto_kill.rs b/src/modules/auto_kill.rs
@@ -15,7 +15,6 @@ use azalea::{
     physics::PhysicsSet,
     prelude::*,
     registry::Item,
-    world::MinecraftEntityId,
     LookAtEvent,
 };
 
@@ -42,7 +41,7 @@ impl AutoKillPlugin {
     pub fn handle_auto_kill(
         mut query: Query<(Entity, &LocalSettings, &GameTicks, &Inventory, &Pathfinder)>,
         entities: EntityFinder<With<AbstractMonster>>,
-        targets: Query<(&MinecraftEntityId, &Position, Option<&EyeHeight>)>,
+        targets: Query<(&Position, Option<&EyeHeight>)>,
         mut container_click_events: EventWriter<ContainerClickEvent>,
         mut look_at_events: EventWriter<LookAtEvent>,
         mut attack_events: EventWriter<AttackEvent>,
@@ -60,7 +59,7 @@ impl AutoKillPlugin {
                 continue;
             };
 
-            let Ok((target_id, target_pos, target_eye_height)) = targets.get(target) else {
+            let Ok((target_pos, target_eye_height)) = targets.get(target) else {
                 continue;
             };
 
@@ -107,10 +106,7 @@ impl AutoKillPlugin {
                 }
             }
 
-            attack_events.write(AttackEvent {
-                entity,
-                target: *target_id,
-            });
+            attack_events.write(AttackEvent { entity, target });
         }
     }
 }
diff --git a/src/modules/auto_leave.rs b/src/modules/auto_leave.rs
@@ -1,16 +1,16 @@
 use azalea::{
-    app::{App, Plugin, PreUpdate, Update},
+    app::{App, Plugin, Update},
     auto_reconnect::start_rejoin_on_disconnect,
     connection::RawConnection,
     disconnect::DisconnectEvent,
     ecs::prelude::*,
     events::disconnect_listener,
-    packet::game::{ReceiveGamePacketEvent, SendPacketEvent},
+    local_player::TabList,
+    packet::game::{PingEvent, ReceiveGamePacketEvent, SendPacketEvent},
+    player::GameProfileComponent,
     protocol::packets::game::{ClientboundGamePacket, ServerboundGamePacket, ServerboundPong},
     registry::EntityKind,
     FormattedText,
-    GameProfileComponent,
-    TabList,
 };
 use itertools::Itertools;
 
@@ -24,7 +24,7 @@ pub struct AutoLeavePlugin;
 impl Plugin for AutoLeavePlugin {
     fn build(&self, app: &mut App) {
         app.insert_resource(SwarmState::default())
-            .add_systems(PreUpdate, Self::handle_ping_packets)
+            .add_observer(Self::handle_ping_packets)
             .add_systems(
                 Update,
                 (
@@ -152,24 +152,18 @@ impl AutoLeavePlugin {
     }
 
     pub fn handle_ping_packets(
-        mut packet_events: EventReader<ReceiveGamePacketEvent>,
+        trigger: Trigger<PingEvent>,
         query: Query<&GrimDisconnect>,
         mut commands: Commands,
     ) {
-        for event in packet_events.read() {
-            let ClientboundGamePacket::Ping(packet) = event.packet.as_ref() else {
-                continue;
-            };
-
-            if query.get(event.entity).is_ok() {
-                continue;
-            }
-
-            commands.trigger(SendPacketEvent {
-                sent_by: event.entity,
-                packet:  ServerboundGamePacket::Pong(ServerboundPong { id: packet.id }),
-            });
+        if query.get(trigger.target()).is_ok() {
+            return;
         }
+
+        commands.trigger(SendPacketEvent {
+            sent_by: trigger.target(),
+            packet:  ServerboundGamePacket::Pong(ServerboundPong { id: trigger.0.id }),
+        });
     }
 
     pub fn handle_requeue(
diff --git a/src/modules/auto_pearl.rs b/src/modules/auto_pearl.rs
@@ -1,22 +1,14 @@
-use std::sync::Arc;
-
 use azalea::{
     app::{App, Plugin, Update},
-    chunks::handle_receive_chunk_events,
+    chunks::handle_receive_chunk_event,
     core::direction::Direction,
     ecs::prelude::*,
     interact::handle_swing_arm_event,
     inventory::InventorySet,
+    local_player::TabList,
     mining::MiningSet,
     packet::game::{handle_outgoing_packets, SendPacketEvent},
-    pathfinder::{
-        astar::PathfinderTimeout,
-        goals::RadiusGoal,
-        goto_listener,
-        moves::default_move,
-        GotoEvent,
-        Pathfinder,
-    },
+    pathfinder::{goals::RadiusGoal, goto_listener, GotoEvent, Pathfinder},
     physics::PhysicsSet,
     prelude::*,
     protocol::packets::game::{
@@ -26,7 +18,6 @@ use azalea::{
         ServerboundUseItemOn,
     },
     BlockPos,
-    TabList,
     Vec3,
 };
 use uuid::Uuid;
@@ -47,7 +38,7 @@ impl Plugin for AutoPearlPlugin {
                     Self::handle_resend_pearl_events,
                     Self::handle_goto_pearl_events
                         .before(goto_listener)
-                        .after(handle_receive_chunk_events),
+                        .after(handle_receive_chunk_event),
                     Self::handle_pull_pearl_events
                         .before(handle_outgoing_packets)
                         .before(handle_swing_arm_event)
@@ -122,15 +113,11 @@ impl AutoPearlPlugin {
             }
 
             let pos = event.block_pos.to_vec3_floored();
-            let goal = RadiusGoal { radius: 3.0, pos };
-            goto_events.write(GotoEvent {
-                entity:        event.entity,
-                goal:          Arc::new(goal),
-                successors_fn: default_move,
-                allow_mining:  false,
-                min_timeout:   PathfinderTimeout::Time(Duration::from_secs(10)),
-                max_timeout:   PathfinderTimeout::Time(Duration::from_secs(10)),
-            });
+            goto_events.write(
+                GotoEvent::new(event.entity, RadiusGoal { radius: 3.0, pos })
+                    .with_allow_mining(false)
+                    .with_retry_on_no_path(false),
+            );
 
             pearl_pull_events.write(PearlPullEvent(event.0));
         }
@@ -171,26 +158,24 @@ impl AutoPearlPlugin {
                     inside:       false,
                     world_border: false,
                 },
-                sequence:  0,
+                seq:       0,
             });
 
             send_packet_events.write(SendPacketEvent {
                 sent_by: event.entity,
                 packet,
             });
 
+            let goal = RadiusGoal {
+                pos:    event.idle_goal.coords,
+                radius: event.idle_goal.radius + 1.0,
+            };
             if event.idle_goal != IdleGoal::default() {
-                goto_events.write(GotoEvent {
-                    entity:        event.entity,
-                    goal:          Arc::new(RadiusGoal {
-                        pos:    event.idle_goal.coords,
-                        radius: event.idle_goal.radius + 1.0,
-                    }),
-                    successors_fn: default_move,
-                    allow_mining:  false,
-                    min_timeout:   PathfinderTimeout::Time(Duration::from_secs(10)),
-                    max_timeout:   PathfinderTimeout::Time(Duration::from_secs(10)),
-                });
+                goto_events.write(
+                    GotoEvent::new(event.entity, goal)
+                        .with_allow_mining(false)
+                        .with_retry_on_no_path(false),
+                );
             }
         }
     }
diff --git a/src/modules/discord_logger.rs b/src/modules/discord_logger.rs
@@ -1,14 +1,14 @@
 use azalea::{
     app::{App, Plugin, Update},
-    blocks::Block,
+    blocks::BlockTrait,
     disconnect::DisconnectEvent,
     ecs::prelude::*,
+    local_player::TabList,
     packet::{game::ReceiveGamePacketEvent, login::ReceiveLoginPacketEvent},
+    player::GameProfileComponent,
     prelude::*,
     protocol::packets::game::ClientboundGamePacket,
     registry::EntityKind,
-    GameProfileComponent,
-    TabList,
 };
 use bevy_discord::res::DiscordHttpResource;
 use serenity::{
@@ -141,7 +141,7 @@ impl DiscordLoggerPlugin {
                 return; /* Missing Channel ID */
             }
 
-            let block = Box::<dyn Block>::from(*block_state);
+            let block = Box::<dyn BlockTrait>::from(*block_state);
             if block.id().ends_with("shulker_box") {
                 let block_name = block.as_registry_block();
                 let username = game_profile.name.clone();
@@ -174,7 +174,7 @@ impl DiscordLoggerPlugin {
                 return; /* Missing Channel ID */
             }
 
-            let block = Box::<dyn Block>::from(packet.block_state);
+            let block = Box::<dyn BlockTrait>::from(packet.block_state);
             if block.id().ends_with("shulker_box") {
                 let block_name = block.as_registry_block();
                 let username = game_profile.name.clone();
diff --git a/src/parsers/http_api.rs b/src/parsers/http_api.rs
@@ -1,11 +1,11 @@
 use std::{collections::VecDeque, io::Read, str::FromStr, sync::Mutex};
 
 use azalea::{
-    TabList,
     app::{App, Plugin, Startup, Update},
     ecs::prelude::*,
+    local_player::TabList,
 };
-use base64::{Engine, prelude::BASE64_STANDARD};
+use base64::{prelude::BASE64_STANDARD, Engine};
 use tiny_http::{Header, Request, Response, Server};
 
 use crate::prelude::*;
diff --git a/src/parsers/minecraft.rs b/src/parsers/minecraft.rs
@@ -10,7 +10,7 @@ use azalea::{
     app::{App, Plugin, Update},
     chat::{handle_send_chat_event, handler::SendChatKindEvent, ChatKind, ChatReceivedEvent},
     ecs::prelude::*,
-    TabList,
+    local_player::TabList,
 };
 use ncr::{
     encoding::{
diff --git a/src/trackers/ender_pearl.rs b/src/trackers/ender_pearl.rs
diff --git a/src/trackers/player_profile.rs b/src/trackers/player_profile.rs

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[toolchain]`
`2`		`-channel = "nightly"`
	`2`	`+channel = "nightly-2025-06-18"`