diff options
| author | mat <git@matdoes.dev> | 2025-12-09 01:27:44 +0000 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2025-12-09 13:26:12 +1100 |
| commit | ba3a88336a074f902667d3e13471af62b431da04 (patch) | |
| tree | 4c7052376abfccff8c090192c90d92280154f9c5 | |
| parent | 4fde1ecd61c0f67057df0c55a45ba398da580ae1 (diff) | |
| download | azalea-drasl-ba3a88336a074f902667d3e13471af62b431da04.tar.xz | |
move offline-mode uuid generation to azalea-crypto
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | azalea-auth/Cargo.toml | 1 | ||||
| -rw-r--r-- | azalea-auth/src/lib.rs | 1 | ||||
| -rw-r--r-- | azalea-client/src/account.rs | 2 | ||||
| -rw-r--r-- | azalea-crypto/Cargo.toml | 1 | ||||
| -rw-r--r-- | azalea-crypto/src/lib.rs | 1 | ||||
| -rw-r--r-- | azalea-crypto/src/offline.rs (renamed from azalea-auth/src/offline.rs) | 0 | ||||
| -rw-r--r-- | azalea/examples/steal.rs | 2 | ||||
| -rw-r--r-- | azalea/src/container.rs | 2 |
9 files changed, 6 insertions, 6 deletions
@@ -248,7 +248,6 @@ dependencies = [ "crypto-primes", "env_logger", "indexmap", - "md-5", "reqwest", "rsa", "serde", @@ -390,6 +389,7 @@ dependencies = [ "azalea-buf", "cfb8", "criterion", + "md-5", "num-bigint", "rand 0.10.0-rc.5", "rsa", diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml index 84b06884..acc09d18 100644 --- a/azalea-auth/Cargo.toml +++ b/azalea-auth/Cargo.toml @@ -14,7 +14,6 @@ chrono = { workspace = true, features = ["serde"] } crypto-bigint.workspace = true # TODO: Remove when rsa is fixed. crypto-primes.workspace = true # TODO: Remove when rsa is fixed. indexmap.workspace = true -md-5.workspace = true reqwest = { workspace = true, optional = true, default-features = false, features = [ "json", "rustls-tls", diff --git a/azalea-auth/src/lib.rs b/azalea-auth/src/lib.rs index a024f4d5..6cbee318 100644 --- a/azalea-auth/src/lib.rs +++ b/azalea-auth/src/lib.rs @@ -12,4 +12,3 @@ pub mod sessionserver; pub use auth::*; pub mod game_profile; -pub mod offline; diff --git a/azalea-client/src/account.rs b/azalea-client/src/account.rs index 847029c9..faaa551a 100644 --- a/azalea-client/src/account.rs +++ b/azalea-client/src/account.rs @@ -264,7 +264,7 @@ impl Account { /// Minecraft's offline-mode UUIDv3 algorithm. pub fn uuid_or_offline(&self) -> Uuid { self.uuid - .unwrap_or_else(|| azalea_auth::offline::generate_uuid(&self.username)) + .unwrap_or_else(|| azalea_crypto::offline::generate_uuid(&self.username)) } } diff --git a/azalea-crypto/Cargo.toml b/azalea-crypto/Cargo.toml index a6f12ad3..4fc966d9 100644 --- a/azalea-crypto/Cargo.toml +++ b/azalea-crypto/Cargo.toml @@ -20,6 +20,7 @@ rsa_public_encrypt_pkcs1.workspace = true sha1.workspace = true sha2.workspace = true uuid.workspace = true +md-5.workspace = true [[bench]] harness = false diff --git a/azalea-crypto/src/lib.rs b/azalea-crypto/src/lib.rs index 738c4899..da10f530 100644 --- a/azalea-crypto/src/lib.rs +++ b/azalea-crypto/src/lib.rs @@ -1,5 +1,6 @@ #![doc = include_str!("../README.md")] +pub mod offline; mod signing; use aes::{ diff --git a/azalea-auth/src/offline.rs b/azalea-crypto/src/offline.rs index 737555e8..737555e8 100644 --- a/azalea-auth/src/offline.rs +++ b/azalea-crypto/src/offline.rs diff --git a/azalea/examples/steal.rs b/azalea/examples/steal.rs index 71db1c68..87a1561b 100644 --- a/azalea/examples/steal.rs +++ b/azalea/examples/steal.rs @@ -68,7 +68,7 @@ async fn steal(bot: Client, state: State) -> anyhow::Result<()> { bot.goto(RadiusGoal::new(chest_block.center(), 3.)).await; - let Some(chest) = bot.open_container_at(chest_block, None).await else { + let Some(chest) = bot.open_container_at(chest_block).await else { println!("Couldn't open chest at {chest_block:?}"); continue; }; diff --git a/azalea/src/container.rs b/azalea/src/container.rs index dc85ba96..74c8b1e5 100644 --- a/azalea/src/container.rs +++ b/azalea/src/container.rs @@ -36,7 +36,7 @@ pub trait ContainerClientExt { /// configure this. /// /// ``` - /// # use azalea::{prelude::*, azalea::registry::Block}; + /// # use azalea::{prelude::*, registry::Block}; /// # async fn example(mut bot: azalea::Client) { /// let target_pos = bot /// .world() |
