aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock84
-rw-r--r--Cargo.toml8
-rw-r--r--README.md6
-rw-r--r--azalea-chat/Cargo.toml (renamed from minecraft-chat/Cargo.toml)2
-rw-r--r--azalea-chat/src/base_component.rs (renamed from minecraft-chat/src/base_component.rs)0
-rw-r--r--azalea-chat/src/component.rs (renamed from minecraft-chat/src/component.rs)0
-rw-r--r--azalea-chat/src/events.rs (renamed from minecraft-chat/src/events.rs)0
-rw-r--r--azalea-chat/src/lib.rs (renamed from minecraft-chat/src/lib.rs)0
-rw-r--r--azalea-chat/src/style.rs (renamed from minecraft-chat/src/style.rs)0
-rw-r--r--azalea-chat/src/text_component.rs (renamed from minecraft-chat/src/text_component.rs)0
-rw-r--r--azalea-chat/src/translatable_component.rs (renamed from minecraft-chat/src/translatable_component.rs)0
-rw-r--r--azalea-chat/tests/integration_test.rs (renamed from minecraft-chat/tests/integration_test.rs)2
-rw-r--r--azalea-client/Cargo.toml (renamed from minecraft-client/Cargo.toml)6
-rw-r--r--azalea-client/src/connect.rs (renamed from minecraft-client/src/connect.rs)2
-rw-r--r--azalea-client/src/crypt.rs (renamed from minecraft-client/src/crypt.rs)0
-rw-r--r--azalea-client/src/lib.rs (renamed from minecraft-client/src/lib.rs)2
-rw-r--r--azalea-client/src/ping.rs (renamed from minecraft-client/src/ping.rs)2
-rw-r--r--azalea-core/Cargo.toml (renamed from minecraft-core/Cargo.toml)2
-rw-r--r--azalea-core/src/lib.rs (renamed from minecraft-core/src/lib.rs)0
-rw-r--r--azalea-core/src/serializable_uuid.rs (renamed from minecraft-core/src/serializable_uuid.rs)0
-rw-r--r--azalea-protocol/Cargo.toml (renamed from minecraft-protocol/Cargo.toml)4
-rw-r--r--azalea-protocol/src/connect.rs (renamed from minecraft-protocol/src/connect.rs)0
-rw-r--r--azalea-protocol/src/lib.rs (renamed from minecraft-protocol/src/lib.rs)0
-rw-r--r--azalea-protocol/src/mc_buf.rs (renamed from minecraft-protocol/src/mc_buf.rs)0
-rw-r--r--azalea-protocol/src/packets/game/mod.rs (renamed from minecraft-protocol/src/packets/game/mod.rs)0
-rw-r--r--azalea-protocol/src/packets/handshake/client_intention_packet.rs (renamed from minecraft-protocol/src/packets/handshake/client_intention_packet.rs)0
-rw-r--r--azalea-protocol/src/packets/handshake/mod.rs (renamed from minecraft-protocol/src/packets/handshake/mod.rs)0
-rw-r--r--azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs (renamed from minecraft-protocol/src/packets/login/clientbound_custom_query_packet.rs)0
-rw-r--r--azalea-protocol/src/packets/login/clientbound_hello_packet.rs (renamed from minecraft-protocol/src/packets/login/clientbound_hello_packet.rs)0
-rw-r--r--azalea-protocol/src/packets/login/mod.rs (renamed from minecraft-protocol/src/packets/login/mod.rs)0
-rw-r--r--azalea-protocol/src/packets/login/serverbound_hello_packet.rs (renamed from minecraft-protocol/src/packets/login/serverbound_hello_packet.rs)0
-rw-r--r--azalea-protocol/src/packets/mod.rs (renamed from minecraft-protocol/src/packets/mod.rs)0
-rw-r--r--azalea-protocol/src/packets/status/clientbound_status_response_packet.rs (renamed from minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs)2
-rw-r--r--azalea-protocol/src/packets/status/mod.rs (renamed from minecraft-protocol/src/packets/status/mod.rs)0
-rw-r--r--azalea-protocol/src/packets/status/serverbound_status_request_packet.rs (renamed from minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs)0
-rw-r--r--azalea-protocol/src/read.rs (renamed from minecraft-protocol/src/read.rs)0
-rw-r--r--azalea-protocol/src/resolver.rs (renamed from minecraft-protocol/src/resolver.rs)0
-rw-r--r--azalea-protocol/src/write.rs (renamed from minecraft-protocol/src/write.rs)0
-rw-r--r--bot/Cargo.toml6
-rw-r--r--bot/src/main.rs2
40 files changed, 67 insertions, 63 deletions
diff --git a/Cargo.lock b/Cargo.lock
index f2728389..e999fcc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -31,6 +31,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
+name = "azalea-chat"
+version = "0.1.0"
+dependencies = [
+ "lazy_static",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "azalea-client"
+version = "0.1.0"
+dependencies = [
+ "azalea-protocol",
+]
+
+[[package]]
+name = "azalea-core"
+version = "0.1.0"
+dependencies = [
+ "uuid",
+]
+
+[[package]]
+name = "azalea-protocol"
+version = "0.1.0"
+dependencies = [
+ "async-recursion",
+ "async-trait",
+ "azalea-chat",
+ "byteorder",
+ "bytes",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+ "trust-dns-resolver",
+]
+
+[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -40,8 +80,8 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
name = "bot"
version = "0.1.0"
dependencies = [
- "minecraft-client",
- "minecraft-protocol",
+ "azalea-client",
+ "azalea-protocol",
"tokio",
]
@@ -285,46 +325,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
[[package]]
-name = "minecraft-chat"
-version = "0.1.0"
-dependencies = [
- "lazy_static",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "minecraft-client"
-version = "0.1.0"
-dependencies = [
- "minecraft-protocol",
-]
-
-[[package]]
-name = "minecraft-core"
-version = "0.1.0"
-dependencies = [
- "uuid",
-]
-
-[[package]]
-name = "minecraft-protocol"
-version = "0.1.0"
-dependencies = [
- "async-recursion",
- "async-trait",
- "byteorder",
- "bytes",
- "minecraft-chat",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-util",
- "trust-dns-resolver",
-]
-
-[[package]]
name = "mio"
version = "0.7.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index a4ad743a..22f3e5a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,8 +2,8 @@
members = [
"bot",
- "minecraft-client",
- "minecraft-protocol",
- "minecraft-chat",
- "minecraft-core",
+ "azalea-client",
+ "azalea-protocol",
+ "azalea-chat",
+ "azalea-core",
]
diff --git a/README.md b/README.md
index 06f78a52..539e1fdb 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
-# this library doesn't have a name yet idk what to call it
+# Azalea
+
+A Minecraft botting library
+
+I named this Azalea because it sounds like a cool word and this is a cool library.
diff --git a/minecraft-chat/Cargo.toml b/azalea-chat/Cargo.toml
index aa803864..7019e5bf 100644
--- a/minecraft-chat/Cargo.toml
+++ b/azalea-chat/Cargo.toml
@@ -1,6 +1,6 @@
[package]
edition = "2021"
-name = "minecraft-chat"
+name = "azalea-chat"
version = "0.1.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/minecraft-chat/src/base_component.rs b/azalea-chat/src/base_component.rs
index fa39a11c..fa39a11c 100644
--- a/minecraft-chat/src/base_component.rs
+++ b/azalea-chat/src/base_component.rs
diff --git a/minecraft-chat/src/component.rs b/azalea-chat/src/component.rs
index 1ed1f836..1ed1f836 100644
--- a/minecraft-chat/src/component.rs
+++ b/azalea-chat/src/component.rs
diff --git a/minecraft-chat/src/events.rs b/azalea-chat/src/events.rs
index a547169e..a547169e 100644
--- a/minecraft-chat/src/events.rs
+++ b/azalea-chat/src/events.rs
diff --git a/minecraft-chat/src/lib.rs b/azalea-chat/src/lib.rs
index b7035e13..b7035e13 100644
--- a/minecraft-chat/src/lib.rs
+++ b/azalea-chat/src/lib.rs
diff --git a/minecraft-chat/src/style.rs b/azalea-chat/src/style.rs
index 4e3b24de..4e3b24de 100644
--- a/minecraft-chat/src/style.rs
+++ b/azalea-chat/src/style.rs
diff --git a/minecraft-chat/src/text_component.rs b/azalea-chat/src/text_component.rs
index 6c43f8b7..6c43f8b7 100644
--- a/minecraft-chat/src/text_component.rs
+++ b/azalea-chat/src/text_component.rs
diff --git a/minecraft-chat/src/translatable_component.rs b/azalea-chat/src/translatable_component.rs
index 0709f7bf..0709f7bf 100644
--- a/minecraft-chat/src/translatable_component.rs
+++ b/azalea-chat/src/translatable_component.rs
diff --git a/minecraft-chat/tests/integration_test.rs b/azalea-chat/tests/integration_test.rs
index aac12875..1278adfa 100644
--- a/minecraft-chat/tests/integration_test.rs
+++ b/azalea-chat/tests/integration_test.rs
@@ -1,4 +1,4 @@
-use minecraft_chat::{
+use azalea_chat::{
component::Component,
style::{Ansi, ChatFormatting, TextColor},
};
diff --git a/minecraft-client/Cargo.toml b/azalea-client/Cargo.toml
index 10a0ecbf..7e22f727 100644
--- a/minecraft-client/Cargo.toml
+++ b/azalea-client/Cargo.toml
@@ -1,9 +1,9 @@
[package]
-name = "minecraft-client"
-version = "0.1.0"
edition = "2021"
+name = "azalea-client"
+version = "0.1.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-minecraft-protocol = { path = "../minecraft-protocol" } \ No newline at end of file
+azalea-protocol = {path = "../azalea-protocol"}
diff --git a/minecraft-client/src/connect.rs b/azalea-client/src/connect.rs
index 5eedbf96..fad5fa92 100644
--- a/minecraft-client/src/connect.rs
+++ b/azalea-client/src/connect.rs
@@ -1,5 +1,5 @@
///! Connect to Minecraft servers.
-use minecraft_protocol::{
+use azalea_protocol::{
connect::HandshakeConnection,
packets::{
handshake::client_intention_packet::ClientIntentionPacket,
diff --git a/minecraft-client/src/crypt.rs b/azalea-client/src/crypt.rs
index e69de29b..e69de29b 100644
--- a/minecraft-client/src/crypt.rs
+++ b/azalea-client/src/crypt.rs
diff --git a/minecraft-client/src/lib.rs b/azalea-client/src/lib.rs
index d4ceebde..8c1bcfe9 100644
--- a/minecraft-client/src/lib.rs
+++ b/azalea-client/src/lib.rs
@@ -1,4 +1,4 @@
-//! Significantly abstract minecraft-protocol so it's actually useable for bots.
+//! Significantly abstract azalea-protocol so it's actually useable for bots.
pub mod connect;
pub mod ping;
diff --git a/minecraft-client/src/ping.rs b/azalea-client/src/ping.rs
index ff869d4e..87ccdf66 100644
--- a/minecraft-client/src/ping.rs
+++ b/azalea-client/src/ping.rs
@@ -1,5 +1,5 @@
///! Ping Minecraft servers.
-use minecraft_protocol::{
+use azalea_protocol::{
connect::HandshakeConnection,
packets::{
handshake::client_intention_packet::ClientIntentionPacket,
diff --git a/minecraft-core/Cargo.toml b/azalea-core/Cargo.toml
index e36cc03e..1aa59fe9 100644
--- a/minecraft-core/Cargo.toml
+++ b/azalea-core/Cargo.toml
@@ -1,6 +1,6 @@
[package]
edition = "2021"
-name = "minecraft-core"
+name = "azalea-core"
version = "0.1.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/minecraft-core/src/lib.rs b/azalea-core/src/lib.rs
index 592988a3..592988a3 100644
--- a/minecraft-core/src/lib.rs
+++ b/azalea-core/src/lib.rs
diff --git a/minecraft-core/src/serializable_uuid.rs b/azalea-core/src/serializable_uuid.rs
index 91b5f2d8..91b5f2d8 100644
--- a/minecraft-core/src/serializable_uuid.rs
+++ b/azalea-core/src/serializable_uuid.rs
diff --git a/minecraft-protocol/Cargo.toml b/azalea-protocol/Cargo.toml
index 3cbf663b..2b8a97f2 100644
--- a/minecraft-protocol/Cargo.toml
+++ b/azalea-protocol/Cargo.toml
@@ -1,6 +1,6 @@
[package]
edition = "2021"
-name = "minecraft-protocol"
+name = "azalea-protocol"
version = "0.1.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -8,9 +8,9 @@ version = "0.1.0"
[dependencies]
async-recursion = "^0.3.2"
async-trait = "0.1.51"
+azalea-chat = {path = "../azalea-chat"}
byteorder = "^1.4.3"
bytes = "^1.1.0"
-minecraft-chat = {path = "../minecraft-chat"}
serde = {version = "1.0.130", features = ["serde_derive"]}
serde_json = "^1.0.72"
thiserror = "^1.0.30"
diff --git a/minecraft-protocol/src/connect.rs b/azalea-protocol/src/connect.rs
index f6dd9fe7..f6dd9fe7 100644
--- a/minecraft-protocol/src/connect.rs
+++ b/azalea-protocol/src/connect.rs
diff --git a/minecraft-protocol/src/lib.rs b/azalea-protocol/src/lib.rs
index 684add45..684add45 100644
--- a/minecraft-protocol/src/lib.rs
+++ b/azalea-protocol/src/lib.rs
diff --git a/minecraft-protocol/src/mc_buf.rs b/azalea-protocol/src/mc_buf.rs
index 54ba1f7d..54ba1f7d 100644
--- a/minecraft-protocol/src/mc_buf.rs
+++ b/azalea-protocol/src/mc_buf.rs
diff --git a/minecraft-protocol/src/packets/game/mod.rs b/azalea-protocol/src/packets/game/mod.rs
index a3ef2541..a3ef2541 100644
--- a/minecraft-protocol/src/packets/game/mod.rs
+++ b/azalea-protocol/src/packets/game/mod.rs
diff --git a/minecraft-protocol/src/packets/handshake/client_intention_packet.rs b/azalea-protocol/src/packets/handshake/client_intention_packet.rs
index 868626b3..868626b3 100644
--- a/minecraft-protocol/src/packets/handshake/client_intention_packet.rs
+++ b/azalea-protocol/src/packets/handshake/client_intention_packet.rs
diff --git a/minecraft-protocol/src/packets/handshake/mod.rs b/azalea-protocol/src/packets/handshake/mod.rs
index 01010e1e..01010e1e 100644
--- a/minecraft-protocol/src/packets/handshake/mod.rs
+++ b/azalea-protocol/src/packets/handshake/mod.rs
diff --git a/minecraft-protocol/src/packets/login/clientbound_custom_query_packet.rs b/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs
index 093176eb..093176eb 100644
--- a/minecraft-protocol/src/packets/login/clientbound_custom_query_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs
diff --git a/minecraft-protocol/src/packets/login/clientbound_hello_packet.rs b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs
index 36a48706..36a48706 100644
--- a/minecraft-protocol/src/packets/login/clientbound_hello_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs
diff --git a/minecraft-protocol/src/packets/login/mod.rs b/azalea-protocol/src/packets/login/mod.rs
index f0ed6717..f0ed6717 100644
--- a/minecraft-protocol/src/packets/login/mod.rs
+++ b/azalea-protocol/src/packets/login/mod.rs
diff --git a/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
index 32a6dadc..32a6dadc 100644
--- a/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs
+++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
diff --git a/minecraft-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs
index a074b570..a074b570 100644
--- a/minecraft-protocol/src/packets/mod.rs
+++ b/azalea-protocol/src/packets/mod.rs
diff --git a/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs b/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs
index 920e3484..1d8a3aa4 100644
--- a/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs
+++ b/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs
@@ -1,4 +1,4 @@
-use minecraft_chat::component::Component;
+use azalea_chat::component::Component;
use serde::Deserialize;
use serde_json::Value;
use tokio::io::BufReader;
diff --git a/minecraft-protocol/src/packets/status/mod.rs b/azalea-protocol/src/packets/status/mod.rs
index ac6a34e1..ac6a34e1 100644
--- a/minecraft-protocol/src/packets/status/mod.rs
+++ b/azalea-protocol/src/packets/status/mod.rs
diff --git a/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs b/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs
index 6a58da1f..6a58da1f 100644
--- a/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs
+++ b/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs
diff --git a/minecraft-protocol/src/read.rs b/azalea-protocol/src/read.rs
index 6f242e8b..6f242e8b 100644
--- a/minecraft-protocol/src/read.rs
+++ b/azalea-protocol/src/read.rs
diff --git a/minecraft-protocol/src/resolver.rs b/azalea-protocol/src/resolver.rs
index 24687a6e..24687a6e 100644
--- a/minecraft-protocol/src/resolver.rs
+++ b/azalea-protocol/src/resolver.rs
diff --git a/minecraft-protocol/src/write.rs b/azalea-protocol/src/write.rs
index 3d8540eb..3d8540eb 100644
--- a/minecraft-protocol/src/write.rs
+++ b/azalea-protocol/src/write.rs
diff --git a/bot/Cargo.toml b/bot/Cargo.toml
index f1c89a99..fd6ad067 100644
--- a/bot/Cargo.toml
+++ b/bot/Cargo.toml
@@ -1,11 +1,11 @@
[package]
+edition = "2021"
name = "bot"
version = "0.1.0"
-edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-minecraft-client = { path = "../minecraft-client" }
-minecraft-protocol = { path = "../minecraft-protocol" }
+azalea-client = {path = "../azalea-client"}
+azalea-protocol = {path = "../azalea-protocol"}
tokio = "^1.14.0"
diff --git a/bot/src/main.rs b/bot/src/main.rs
index 19959ce5..9cfd7f9a 100644
--- a/bot/src/main.rs
+++ b/bot/src/main.rs
@@ -1,4 +1,4 @@
-use minecraft_client::connect::join_server;
+use azalea_client::connect::join_server;
use tokio::runtime::Runtime;
async fn bot() {