Added Support for Multiple Bots, Advanced Anti AFK Plugin and Discord Plugin (#10)

* RELEASE 0.3.0-alpha.6

* Moved to Minecraft Version 1.20.6

* Moved to Better 1.20.6

* Removed Chat feedback

* Fix: stone miner movement (#6)

* Optimized Imports

* Added Support for multiple bots (#8)

* Added support for multiple bots

* Added `Config` resource

* updated todos

* Improved distance calculation for `StopPathfinding`

* Added version check for `config.json`

* Advanced Anti-AFK (#7)

* Added Advanced Anti AFK

* fixed anti-afk

* Integrated Task Manager to support newer Anti AFK Plugin

* Added newer anti-afk plugin to `aether-core`

* Created `rust-toolchain` for entire workspace

* Updated documentation

* Added Chat Feedback back

* updated .gitignore

* Added Discord Plugin

* Added Discord Chat Bridge Plugin

* fix: Added support for multiple bots

* Integrated Discord Plugin with `aether-core`

Author: AS1100K

.gitignore

@@ -12,3 +12,8 @@ Cargo.lock
 
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
+
+.idea
+.DS_Store
+config.json
+log.txt

Cargo.toml

@@ -4,7 +4,7 @@ members = [
     "examples/anti-afk",
     "examples/stone-miner",
     "plugins/anti-afk",
-    "plugins/auto-mine",
+    "plugins/auto-mine", "plugins/discord",
     "plugins/task-manager"
 ]
 

README.md

@@ -1,11 +1,18 @@
 # Aether
 Minecraft Bots written in rust mainly developed for 2b2t.
 
+This repository currently supports minecraft version `1.20.6` and uses self-maintained version of [azalea better-1.20.6](https://github.com/as1100k-forks/azalea.git)
+which has more features and fixes.
+
+There is `mc-1.21` branch which directly uses [azalea](https://github.com/azalea-rs/azalea.git) but is not mainly
+worked on. Once, `azalea-viaversion` will work or `2b2t.org` will directly support `1.21` then this repository will
+be completely migrated to `1.21`.
+
 ## TODOs / Future Goals
 _For Project related TODOs head to the project's `README.md`_
 
 - [ ] A Java Plugin that can be used to send command to bot via HTTP
-- [ ] Make the code more modular by breaking it into features
+- [x] Make the code more modular by breaking it into features/plugins
 - [ ] Map Art Bot which can create map arts
 - [ ] Storage Manager Bot which can manage storage
 - [ ] Advanced Pathfinding [Example](https://github.com/adepierre/Botcraft/blob/master/Visuals/pathfinding_climb.gif)

aether-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aether-core"
-version = "0.3.0-alpha.5"
+version = "0.3.0-alpha.6"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,17 +13,18 @@ opt-level = 3
 [profile.release]
 strip = "debuginfo"
 lto = true
+codegen-units = 1
+panic = "abort"
 
 [dependencies]
 anyhow = "1.0.83"
-azalea = { git = "https://github.com/azalea-rs/azalea" }
-# This is temp dependecy until, the PR got merge
-azalea-viaversion = { git = "https://github.com/EnderKill98/azalea-viaversion", branch = "feature/update-via-proxy" }
+azalea = { git = "https://github.com/as1100k-forks/azalea.git", branch = "better-1.20.6" }
 azalea-task-manager = { path = "../plugins/task-manager", features = ["anti-afk"] }
 azalea-anti-afk = { path = "../plugins/anti-afk" }
+azalea-discord = { path = "../plugins/discord", features = ["chat-bridge"] }
+serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
 tokio = { version = "1.37.0", features = ["macros"] }
-serde = { version = "1.0.201", features = ["derive"] }
 parking_lot = "0.12.2"
 log = { version = "0.4.21" }
 rand = "0.8.5"

aether-core/README.md

@@ -5,9 +5,9 @@ This bot is created to server the main purpose of loading the pearl on 2b2t.
 ## TODOs
 
 - [ ] Better way to send chat messages with delay
-- [ ] Integration with Discord
+- [x] Integration with Discord
 - [ ] Split Code into multiple features
-- [ ] Support Multiple Bots
+- [x] Support Multiple Bots
 - [ ] Add More Roles like `Storage Manager`, `AFK at Farms`, etc.
 - [ ] Update `config.json` via commands
 - [ ] Move from Chat Listener to HTTP Listener for Commands

aether-core/config.example.json

@@ -1,17 +1,31 @@
 {
-  "username": "_aether",
-  "server": "10.9.12.3",
-  "mode": "Offline",
-  "email": null,
-  "role": "Pearl",
-  "afk_location": [355, 71, 83],
+  "server": "10.9.12.13",
   "members": [
     "AS1100K"
   ],
-  "pearl_locations": [
+  "bots": [
     {
-      "owner": "AS1100K",
-      "cords": [376, 71, 83]
+      "username": "_aether",
+      "mode": "Offline",
+      "email": null,
+      "role": "Pearl",
+      "render_distance": 5,
+      "afk_location": [355, 71, 83],
+      "pearl_locations": [
+        {
+          "owner": "AS1100K",
+          "cords": [376, 71, 83]
+        }
+      ],
+      "chat_bridge": "webhook",
+      "log_bridge": "webhook",
+      "queue_bridge": "webhook"
+    },
+    {
+      "username": "_aether_2",
+      "mode": "Offline",
+      "role": "AFKAdvanced"
     }
-  ]
+  ],
+  "version": 2
 }

aether-core/rust-toolchain

@@ -1,40 +1,76 @@
 use crate::command::Command;
 use crate::handle_command::handle_commands;
 use crate::utils::parse_chat_content;
-use crate::{msg, State};
 use azalea::chat::ChatPacket;
 use azalea::Client;
-use log::info;
+use log::{info, warn};
 use azalea_anti_afk::AntiAFKClientExt;
+use azalea_anti_afk::config::AntiAFKConfig;
+use azalea_discord::chat_bridge::DiscordChatBridgeExt;
+use azalea_discord::{DiscordExt, SendDiscordMessage};
+use crate::config::{Bot, Config};
 
-pub async fn handle_chat(client: Client, chat: ChatPacket, mut state: State) -> anyhow::Result<()> {
+pub async fn handle_chat(client: Client, chat: ChatPacket, mut state: Bot) -> anyhow::Result<()> {
     let (username, content, is_whisper) = parse_chat_content(&chat);
 
     if let Some(ref uname) = username {
-        if uname == &state.config.username || !state.config.members.contains(uname) {
+        if uname == &state.username || !client.ecs.lock().resource::<Config>().members.contains(uname) {
             return Ok(());
         }
     } else if username.is_none() {
         if content.starts_with("Server") {
-            for member in state.config.members {
-                msg!(client, member, content);
-            }
+            warn!("{}", content);
         } else if content == "Connected to the server.".to_string() {
             info!("Connected to the Server, updating the state.");
-            state.game_information.set_connection_state(true);
-            client.set_anti_afk(true);
+            state.set_connection_state(true);
+
+            if state.chat_bridge.is_some() {
+                client.set_discord_chat_bridge(true, "2b2t Server", state.chat_bridge)
+            } else if state.queue_bridge.is_some() {
+                client.set_discord_chat_bridge(false, "", None)
+            }
+
+            let central_afk_location = if let Some(afk_location) = state.afk_location {
+                Some(afk_location.to_vec3_floored())
+            } else {
+                None
+            };
+
+            let anti_afk_config = AntiAFKConfig {
+                jump: true,
+                sneak: true,
+                walk: true,
+                flip_lever: true,
+                central_afk_location
+            };
+
+            client.set_anti_afk(true, Some(anti_afk_config));
         } else if content == "You have lost connection to the server" {
             {
                 info!("Lost Connection to the server, back to queue");
-                state.game_information.set_connection_state(false);
+                state.set_connection_state(false);
+                if state.log_bridge.is_some() {
+                    client.send_discord_message(SendDiscordMessage {
+                        webhook: state.log_bridge.unwrap(),
+                        contents: "Lost Connection to the server, back to queue. Aww".to_string(),
+                        username: Some(state.username),
+                        avatar_url: Some(format!("https://crafatar.com/avatars/{}", client.uuid())),
+                    });
+                }
+
+                if state.queue_bridge.is_some() {
+                    client.set_discord_chat_bridge(true, "2b2t Server", state.queue_bridge)
+                } else if state.chat_bridge.is_some() {
+                    client.set_discord_chat_bridge(false, "", None)
+                }
             }
         }
 
         return Ok(());
     }
 
-    if *state.game_information.is_connected.lock() && is_whisper {
-        let command: Command = Command::parse(content.as_str()).await;
+    if *state.is_connected.lock() && is_whisper {
+        let command: Command = Command::parse(content.as_str(), &state).await;
         handle_commands(command, username.unwrap(), client, chat, state).await?;
     }
 

aether-core/src/chat.rs

@@ -1,16 +1,38 @@
-use crate::config::Role;
-use crate::State;
+use crate::config::Bot;
 use azalea::protocol::packets::game::clientbound_player_combat_kill_packet::ClientboundPlayerCombatKillPacket;
 use azalea::protocol::packets::game::serverbound_client_command_packet::Action::PerformRespawn;
 use azalea::protocol::packets::game::serverbound_client_command_packet::ServerboundClientCommandPacket;
 use azalea::{Client, ClientInformation};
 use log::info;
 use std::sync::Arc;
 use azalea_anti_afk::AntiAFKClientExt;
+use azalea_anti_afk::config::AntiAFKConfig;
+use azalea_discord::{DiscordExt, SendDiscordMessage};
+use azalea_discord::chat_bridge::DiscordChatBridgeExt;
 
-pub async fn handle_init(client: Client, state: State) -> anyhow::Result<()> {
-    info!("Initialized bot");
-    if state.config.role == Role::Pearl {
+pub async fn handle_init(client: Client, state: Bot) -> anyhow::Result<()> {
+    info!("Initialized bot, {}", state.username);
+    if state.log_bridge.is_some() {
+        client.send_discord_message(SendDiscordMessage {
+            webhook: state.log_bridge.unwrap(),
+            contents: "Initialized bot".to_string(),
+            username: Some(state.username),
+            avatar_url: Some(format!("https://crafatar.com/avatars/{}", client.uuid())),
+        });
+    }
+
+    if state.queue_bridge.is_some() {
+        client.set_discord_chat_bridge(true, "2b2t Server", state.queue_bridge)
+    }
+
+    if state.render_distance.is_some_and(|rd| rd <= 32) {
+        client
+            .set_client_information(ClientInformation {
+                view_distance: state.render_distance.unwrap(),
+                ..Default::default()
+            })
+            .await?;
+    } else {
         client
             .set_client_information(ClientInformation {
                 view_distance: 5,
@@ -24,16 +46,38 @@ pub async fn handle_init(client: Client, state: State) -> anyhow::Result<()> {
 
 pub async fn handle_death(
     client: Client,
-    _state: State,
-    _death: Option<Arc<ClientboundPlayerCombatKillPacket>>,
+    state: Bot,
+    death: Option<Arc<ClientboundPlayerCombatKillPacket>>,
 ) -> anyhow::Result<()> {
-    info!("The bot has died, respawning.");
+    info!("{} has died, respawning.", state.username);
+    if state.log_bridge.is_some() {
+        client.send_discord_message(SendDiscordMessage {
+            webhook: state.log_bridge.unwrap(),
+            contents: format!("I died. ```{:?}```", death),
+            username: Some(state.username),
+            avatar_url: Some(format!("https://crafatar.com/avatars/{}", client.uuid())),
+        });
+    }
     let respawn_command_packet = ServerboundClientCommandPacket {
         action: PerformRespawn,
     };
 
+    let central_afk_location = if let Some(afk_location) = state.afk_location {
+        Some(afk_location.to_vec3_floored())
+    } else {
+        None
+    };
+
+    let anti_afk_config = AntiAFKConfig {
+        jump: true,
+        sneak: true,
+        walk: true,
+        flip_lever: true,
+        central_afk_location
+    };
+
     client.write_packet(respawn_command_packet.get())?;
-    client.set_anti_afk(true);
+    client.set_anti_afk(true, Some(anti_afk_config));
 
     Ok(())
 }

aether-core/src/client.rs

@@ -1,3 +1,5 @@
+use crate::config::{Bot, Role};
+
 pub enum Command {
     PearlLoad,
     PearlSet(i32, i32, i32),
@@ -7,20 +9,31 @@ pub enum Command {
 }
 
 impl Command {
-    pub async fn parse(input: &str) -> Command {
+    pub async fn parse(input: &str, state: &Bot) -> Command {
         let parts: Vec<&str> = input.split_whitespace().collect();
 
+        // TODO: Port all the commands to discord and only support necessary ones via minecraft chat
         match parts.as_slice() {
-            ["!pearl", "load"] => Command::PearlLoad,
+            ["!pearl", "load"] => {
+                if state.role == Role::Pearl {
+                    Command::PearlLoad
+                } else {
+                    Command::Unknown
+                }
+            },
             ["!pearl", "set", x, y, z] => {
-                let x = x.parse::<i32>();
-                let y = y.parse::<i32>();
-                let z = z.parse::<i32>();
+                if state.role == Role::Pearl {
+                    let x = x.parse::<i32>();
+                    let y = y.parse::<i32>();
+                    let z = z.parse::<i32>();
 
-                if x.is_ok() && y.is_ok() && z.is_ok() {
-                    Command::PearlSet(x.unwrap(), y.unwrap(), z.unwrap())
+                    if x.is_ok() && y.is_ok() && z.is_ok() {
+                        Command::PearlSet(x.unwrap(), y.unwrap(), z.unwrap())
+                    } else {
+                        Command::InvalidArguments
+                    }
                 } else {
-                    Command::InvalidArguments
+                    Command::Unknown
                 }
             }
             ["!help"] => Command::Help,