0.15.20 - Update to 1.21.10

Author: ShayBox

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "shaysbot"
-version = "0.15.19"
+version = "0.15.20"
 authors = ["Shayne Hartford <shaybox@shaybox.com>"]
 edition = "2024"
 description = "My personal Minecraft bot using Azalea"
@@ -15,20 +15,23 @@ license = "MIT"
 azalea = { git = "https://github.com/Shays-Forks/azalea" }
 #azalea = { path = "../azalea/azalea" }
 
+[patch.crates-io]
+ncr = { git = "https://github.com/Shays-Forks/ncr-rs", rev = "4004292" }
+
 [dependencies]
 anyhow = "1"
 azalea = { git = "https://github.com/azalea-rs/azalea", default-features = false, features = ["packet-event", "serde"] }
 azalea-viaversion = { git = "https://github.com/azalea-rs/azalea-viaversion", optional = true }
 #azalea-viaversion = { path = "../azalea-viaversion", optional = true }
 base64 = "0.22"
-bevy-discord = { version = "0.6.0", features = ["bot"], optional = true }
+bevy-discord = { version = "0.7.0", features = ["bot"], optional = true }
 bounded-counter = { version = "0.1", features = ["deref", "deref_mut"] }
 chrono = "0.4"
 derive_more = { version = "2", features = ["full"] }
 fastrand = "2"
 itertools = "0.14"
 lazy-regex = "3"
-ncr = { git = "https://github.com/Shays-Forks/ncr-rs", features = ["cfb8", "ecb", "gcm"] }
+ncr = { version = "0.1", features = ["cfb8", "ecb", "gcm"] }
 parking_lot = "0.12"
 semver = "1"
 serde = "1"
@@ -44,7 +47,7 @@ tiny_http = { version = "0.12", optional = true }
 tokio = { version = "1", features = ["full"] }
 toml = "0.9"
 tracing = "0.1"
-tracing-subscriber = "0.3"
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 ureq = { version = "3", features = ["json"] }
 uuid = "1"
 

Cargo.toml

@@ -1,10 +1,10 @@
 use anyhow::Result;
 use azalea::{
+    BlockPos,
     app::{App, Plugin, Update},
     ecs::prelude::*,
     interact::StartUseItemEvent,
     protocol::packets::game::s_interact::InteractionHand,
-    BlockPos,
 };
 
 use crate::prelude::*;
@@ -35,9 +35,9 @@ impl Plugin for InteractCommandPlugin {
 // TODO: Add separate Interaction config to store named locations
 impl InteractCommandPlugin {
     pub fn handle_interact_cmd_events(
-        mut cmd_events: EventReader<CmdEvent>,
-        mut msg_events: EventWriter<MsgEvent>,
-        mut block_interact_events: EventWriter<StartUseItemEvent>,
+        mut cmd_events: MessageReader<CmdEvent>,
+        mut msg_events: MessageWriter<MsgEvent>,
+        mut block_interact_events: MessageWriter<StartUseItemEvent>,
     ) {
         for event in cmd_events.read().cloned() {
             let (Cmds::Interact(_plugin), Some(entity)) = (event.cmd, event.entity) else {

src/commands/interact.rs

@@ -29,8 +29,8 @@ impl Plugin for JoinCommandPlugin {
 
 impl JoinCommandPlugin {
     pub fn handle_join_cmd_events(
-        mut cmd_events: EventReader<CmdEvent>,
-        mut msg_events: EventWriter<MsgEvent>,
+        mut cmd_events: MessageReader<CmdEvent>,
+        mut msg_events: MessageWriter<MsgEvent>,
         swarm_state: Res<SwarmState>,
     ) {
         if let Some(event) = cmd_events.read().next() {

src/commands/join.rs

@@ -33,9 +33,9 @@ impl Plugin for LeaveCommandPlugin {
 
 impl LeaveCommandPlugin {
     pub fn handle_leave_cmd_events(
-        mut cmd_events: EventReader<CmdEvent>,
-        mut msg_events: EventWriter<MsgEvent>,
-        mut disconnect_events: EventWriter<DisconnectEvent>,
+        mut cmd_events: MessageReader<CmdEvent>,
+        mut msg_events: MessageWriter<MsgEvent>,
+        mut disconnect_events: MessageWriter<DisconnectEvent>,
         query: Query<(Entity, &GameProfileComponent)>,
     ) {
         for event in cmd_events.read().cloned() {

src/commands/leave.rs

@@ -1,9 +1,9 @@
 use azalea::{
+    BlockPos,
     app::{App, Plugin, Update},
     ecs::prelude::*,
     entity::Position,
     local_player::TabList,
-    BlockPos,
 };
 
 use crate::prelude::*;
@@ -35,9 +35,9 @@ impl PearlCommandPlugin {
     #[allow(clippy::too_many_lines)]
     #[cfg_attr(not(feature = "bot"), allow(unused_variables))]
     pub fn handle_pearl_cmd_events(
-        mut cmd_events: EventReader<CmdEvent>,
-        mut msg_events: EventWriter<MsgEvent>,
-        mut pearl_events: EventWriter<PearlGotoEvent>,
+        mut cmd_events: MessageReader<CmdEvent>,
+        mut msg_events: MessageWriter<MsgEvent>,
+        mut pearl_events: MessageWriter<PearlGotoEvent>,
         query: Query<(&TabList, &Position, &LocalSettings)>,
         settings: Query<&LocalSettings>,
         global_settings: Res<GlobalSettings>,

src/commands/pearl.rs

@@ -5,7 +5,7 @@ use azalea::{
     ecs::prelude::*,
 };
 use serde::Deserialize;
-use ureq::{config::Config, Agent};
+use ureq::{Agent, config::Config};
 
 use crate::prelude::*;
 
@@ -33,8 +33,8 @@ impl Plugin for PlaytimeCommandPlugin {
 
 impl PlaytimeCommandPlugin {
     pub fn handle_playtime_cmd_events(
-        mut cmd_events: EventReader<CmdEvent>,
-        mut msg_events: EventWriter<MsgEvent>,
+        mut cmd_events: MessageReader<CmdEvent>,
+        mut msg_events: MessageWriter<MsgEvent>,
     ) {
         if let Some(event) = cmd_events.read().next() {
             let Cmds::Playtime(_plugin) = event.cmd else {

src/commands/playtime.rs

@@ -6,7 +6,7 @@ use azalea::{
 };
 use chrono::{DateTime, Utc};
 use serde::Deserialize;
-use ureq::{config::Config, Agent};
+use ureq::{Agent, config::Config};
 
 use crate::prelude::*;
 
@@ -34,8 +34,8 @@ impl Plugin for SeenCommandPlugin {
 
 impl SeenCommandPlugin {
     pub fn handle_seen_cmd_events(
-        mut cmd_events: EventReader<CmdEvent>,
-        mut msg_events: EventWriter<MsgEvent>,
+        mut cmd_events: MessageReader<CmdEvent>,
+        mut msg_events: MessageWriter<MsgEvent>,
     ) {
         if let Some(event) = cmd_events.read().next() {
             let Cmds::Seen(_plugin) = event.cmd else {

src/commands/seen.rs

@@ -38,8 +38,8 @@ impl WhitelistCommandPlugin {
     /// # Panics
     /// Will panic if `DeriveTomlConfig::save` fails.
     pub fn handle_whitelist_cmd_events(
-        mut cmd_events: EventReader<CmdEvent>,
-        mut msg_events: EventWriter<MsgEvent>,
+        mut cmd_events: MessageReader<CmdEvent>,
+        mut msg_events: MessageWriter<MsgEvent>,
         mut settings: ResMut<GlobalSettings>,
         tab_list: Res<TabList>,
     ) {

src/commands/whitelist.rs

@@ -24,21 +24,21 @@ pub mod trackers;
 
 use std::{collections::HashMap, sync::Arc, time::Duration};
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use azalea::{
+    DefaultPlugins,
     app::{AppExit, PluginGroup, PluginGroupBuilder},
+    bot::DefaultBotPlugins,
     ecs::prelude::*,
     pong::PongPlugin,
     prelude::*,
-    swarm::{prelude::*, DefaultSwarmPlugins},
-    DefaultBotPlugins,
-    DefaultPlugins,
+    swarm::{DefaultSwarmPlugins, prelude::*},
 };
 #[cfg(feature = "via")]
 use azalea_viaversion::ViaVersionPlugin;
+use bevy_discord::DiscordBotPlugin;
 #[cfg(feature = "bot")]
 use bevy_discord::config::DiscordBotConfig;
-use bevy_discord::DiscordBotPlugin;
 use parking_lot::RwLock;
 use semver::Version;
 #[cfg(feature = "bot")]