merge main

Author: mat-1

CHANGELOG.md

@@ -12,7 +12,8 @@ is breaking anyways, semantic versioning is not followed.
 
 - Add `Client::query_entity` and `try_query_entity` to complement `query_self`.
 - Add `Client::entity_interact` and `EntityInteractEvent` to interact with entities without checking that they're in the crosshair.
-- Initial support for mob effects, including jump boost, haste, conduit power, and mining fatigue. (@ShayBox)
+- Allow disabling dependencies related to Microsoft auth with the `online-mode` cargo feature.
+- Implement mob effects, including jump boost, haste, conduit power, and mining fatigue. (@ShayBox)
 - Support for the efficiency enchantment.
 - Support for items with attribute modifiers.
 
@@ -44,7 +45,6 @@ is breaking anyways, semantic versioning is not followed.
 - The WritableBookContent and ResolvableProfile data components had the wrong protocol implementations.
 - Resolving server addresses shouldn't be recursive.
 
-
 ## [0.14.0+mc1.21.8] - 2025-09-28
 
 ### Added

Cargo.toml

@@ -90,7 +90,7 @@ uuid = "1.18.1"
 
 azalea-block-macros = { path = "azalea-block/azalea-block-macros", version = "0.14.0" }
 azalea-block = { path = "azalea-block", version = "0.14.0" }
-azalea-auth = { path = "azalea-auth", version = "0.14.0" }
+azalea-auth = { path = "azalea-auth", version = "0.14.0", default-features = false }
 azalea-brigadier = { path = "azalea-brigadier", version = "0.14.0" }
 azalea-buf-macros = { path = "azalea-buf/azalea-buf-macros", version = "0.14.0" }
 azalea-buf = { path = "azalea-buf", version = "0.14.0" }
@@ -104,7 +104,7 @@ azalea-inventory = { path = "azalea-inventory", version = "0.14.0" }
 azalea-language = { path = "azalea-language", version = "0.14.0" }
 azalea-physics = { path = "azalea-physics", version = "0.14.0" }
 azalea-protocol-macros = { path = "azalea-protocol/azalea-protocol-macros", version = "0.14.0" }
-azalea-protocol = { path = "azalea-protocol", version = "0.14.0" }
+azalea-protocol = { path = "azalea-protocol", version = "0.14.0", default-features = false }
 azalea-registry-macros = { path = "azalea-registry/azalea-registry-macros", version = "0.14.0" }
 azalea-registry = { path = "azalea-registry", version = "0.14.0" }
 azalea-world = { path = "azalea-world", version = "0.14.0" }

azalea-auth/Cargo.toml

@@ -15,7 +15,7 @@ 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, default-features = false, features = [
+reqwest = { workspace = true, optional = true, default-features = false, features = [
     "json",
     "rustls-tls",
 ] }
@@ -32,5 +32,9 @@ uuid = { workspace = true, features = ["serde", "v3"] }
 env_logger.workspace = true
 tokio = { workspace = true, features = ["full"] }
 
+[features]
+default = ["online-mode"]
+online-mode = ["dep:reqwest"]
+
 [lints]
 workspace = true

azalea-auth/src/lib.rs

@@ -1,10 +1,15 @@
 #![doc = include_str!("../README.md")]
 
+#[cfg(feature = "online-mode")]
 mod auth;
+#[cfg(feature = "online-mode")]
 pub mod cache;
+#[cfg(feature = "online-mode")]
 pub mod certs;
-pub mod game_profile;
-pub mod offline;
+#[cfg(feature = "online-mode")]
 pub mod sessionserver;
-
+#[cfg(feature = "online-mode")]
 pub use auth::*;
+
+pub mod game_profile;
+pub mod offline;

azalea-auth/src/sessionserver.rs

@@ -1,4 +1,5 @@
 //! Tell Mojang you're joining a multiplayer server.
+
 use std::sync::LazyLock;
 
 use reqwest::StatusCode;

azalea-client/Cargo.toml

@@ -17,7 +17,7 @@ azalea-crypto.workspace = true
 azalea-entity.workspace = true
 azalea-inventory.workspace = true
 azalea-physics.workspace = true
-azalea-protocol.workspace = true
+azalea-protocol = { workspace = true, features = ["packets", "connecting"] }
 azalea-registry.workspace = true
 azalea-world.workspace = true
 bevy_app.workspace = true
@@ -32,7 +32,7 @@ minecraft_folder_path.workspace = true
 parking_lot.workspace = true
 pastey.workspace = true
 regex.workspace = true
-reqwest.workspace = true
+reqwest = { workspace = true, optional = true }
 simdnbt.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["sync"] }
@@ -43,10 +43,15 @@ uuid.workspace = true
 anyhow.workspace = true
 
 [features]
-default = ["log", "packet-event"]
+default = ["log", "packet-event", "online-mode"]
 # enables bevy_log::LogPlugin by default
 log = ["bevy_log"]
 packet-event = []
+online-mode = [
+    "azalea-auth/online-mode",
+    "azalea-protocol/online-mode",
+    "dep:reqwest",
+]
 
 [lints]
 workspace = true

azalea-client/src/account.rs

@@ -2,14 +2,14 @@
 
 use std::sync::Arc;
 
-use azalea_auth::{
-    AccessTokenResponse,
-    certs::{Certificates, FetchCertificatesError},
-};
+#[cfg(feature = "online-mode")]
+use azalea_auth::AccessTokenResponse;
+#[cfg(feature = "online-mode")]
+use azalea_auth::certs::{Certificates, FetchCertificatesError};
 use bevy_ecs::component::Component;
 use parking_lot::Mutex;
+#[cfg(feature = "online-mode")]
 use thiserror::Error;
-use tracing::trace;
 use uuid::Uuid;
 
 /// Something that can join Minecraft servers.
@@ -58,6 +58,7 @@ pub struct Account {
     ///
     /// This is set when you call [`Self::request_certs`], but you only
     /// need to if the servers you're joining require it.
+    #[cfg(feature = "online-mode")]
     pub certs: Arc<Mutex<Option<Certificates>>>,
 }
 
@@ -67,9 +68,11 @@ pub enum AccountOpts {
     Offline {
         username: String,
     },
+    #[cfg(feature = "online-mode")]
     Microsoft {
         email: String,
     },
+    #[cfg(feature = "online-mode")]
     MicrosoftWithAccessToken {
         msa: Arc<Mutex<azalea_auth::cache::ExpiringValue<AccessTokenResponse>>>,
     },
@@ -88,6 +91,7 @@ impl Account {
             account_opts: AccountOpts::Offline {
                 username: username.to_string(),
             },
+            #[cfg(feature = "online-mode")]
             certs: Arc::new(Mutex::new(None)),
         }
     }
@@ -97,6 +101,7 @@ impl Account {
     ///
     /// The cache key is used for avoiding having to log in every time. This is
     /// typically set to the account email, but it can be any string.
+    #[cfg(feature = "online-mode")]
     pub async fn microsoft(cache_key: &str) -> Result<Self, azalea_auth::AuthError> {
         Self::microsoft_with_custom_client_id_and_scope(cache_key, None, None).await
     }
@@ -105,6 +110,7 @@ impl Account {
     /// and `scope`.
     ///
     /// Pass `None` if you want to use default ones.
+    #[cfg(feature = "online-mode")]
     pub async fn microsoft_with_custom_client_id_and_scope(
         cache_key: &str,
         client_id: Option<&str>,
@@ -162,6 +168,7 @@ impl Account {
     /// # Ok(())
     /// # }
     /// ```
+    #[cfg(feature = "online-mode")]
     pub async fn with_microsoft_access_token(
         msa: azalea_auth::cache::ExpiringValue<AccessTokenResponse>,
     ) -> Result<Self, azalea_auth::AuthError> {
@@ -170,6 +177,7 @@ impl Account {
 
     /// Similar to [`Account::with_microsoft_access_token`] but you can use
     /// custom `client_id` and `scope`.
+    #[cfg(feature = "online-mode")]
     pub async fn with_microsoft_access_token_and_custom_client_id_and_scope(
         mut msa: azalea_auth::cache::ExpiringValue<AccessTokenResponse>,
         client_id: Option<&str>,
@@ -178,6 +186,8 @@ impl Account {
         let client = reqwest::Client::new();
 
         if msa.is_expired() {
+            use tracing::trace;
+
             trace!("refreshing Microsoft auth token");
             msa = azalea_auth::refresh_ms_auth_token(
                 &client,
@@ -209,6 +219,7 @@ impl Account {
     /// This requires the `auth_opts` field to be set correctly (which is done
     /// by default if you used the constructor functions). Note that if the
     /// Account is offline-mode then this function won't do anything.
+    #[cfg(feature = "online-mode")]
     pub async fn refresh(&self) -> Result<(), azalea_auth::AuthError> {
         match &self.account_opts {
             // offline mode doesn't need to refresh so just don't do anything lol
@@ -240,6 +251,13 @@ impl Account {
         }
     }
 
+    /// Stub function that does nothing when the `online-mode` feature is
+    /// disabled.
+    #[cfg(not(feature = "online-mode"))]
+    pub async fn refresh(&self) -> Result<(), ()> {
+        Ok(())
+    }
+
     /// Get the UUID of this account.
     ///
     /// If the `uuid` field is None, the UUID will be determined by using
@@ -250,6 +268,7 @@ impl Account {
     }
 }
 
+#[cfg(feature = "online-mode")]
 #[derive(Error, Debug)]
 pub enum RequestCertError {
     #[error("Failed to fetch certificates")]
@@ -261,6 +280,7 @@ pub enum RequestCertError {
 impl Account {
     /// Request the certificates used for chat signing and set it in
     /// [`Self::certs`].
+    #[cfg(feature = "online-mode")]
     pub async fn request_certs(&mut self) -> Result<(), RequestCertError> {
         let access_token = self
             .access_token

azalea-client/src/plugins/chat/handler.rs

@@ -1,14 +1,15 @@
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use azalea_crypto::SignChatMessageOptions;
 use azalea_protocol::packets::{
     Packet,
     game::{ServerboundChat, ServerboundChatCommand, s_chat::LastSeenMessagesUpdate},
 };
 use bevy_ecs::prelude::*;
 
 use super::ChatKind;
-use crate::{Account, chat_signing::ChatSigningSession, packet::game::SendGamePacketEvent};
+use crate::packet::game::SendGamePacketEvent;
+#[cfg(feature = "online-mode")]
+use crate::{Account, chat_signing::ChatSigningSession};
 
 /// Send a chat packet to the server of a specific kind (chat message or
 /// command). Usually you just want [`SendChatEvent`] instead.
@@ -31,7 +32,7 @@ pub struct SendChatKindEvent {
 pub fn handle_send_chat_kind_event(
     mut events: MessageReader<SendChatKindEvent>,
     mut commands: Commands,
-    mut query: Query<(&Account, &mut ChatSigningSession)>,
+    #[cfg(feature = "online-mode")] mut query: Query<(&Account, &mut ChatSigningSession)>,
 ) {
     for event in events.read() {
         let content = event
@@ -47,6 +48,7 @@ pub fn handle_send_chat_kind_event(
             ChatKind::Message => {
                 let salt = azalea_crypto::make_salt();
 
+                #[cfg(feature = "online-mode")]
                 let signature = if let Ok((account, mut chat_session)) = query.get_mut(event.entity)
                 {
                     Some(create_signature(
@@ -59,6 +61,8 @@ pub fn handle_send_chat_kind_event(
                 } else {
                     None
                 };
+                #[cfg(not(feature = "online-mode"))]
+                let signature = None;
 
                 ServerboundChat {
                     message: content,
@@ -85,13 +89,16 @@ pub fn handle_send_chat_kind_event(
     }
 }
 
+#[cfg(feature = "online-mode")]
 pub fn create_signature(
     account: &Account,
     chat_session: &mut ChatSigningSession,
     salt: u64,
     timestamp: SystemTime,
     message: &str,
 ) -> azalea_crypto::MessageSignature {
+    use azalea_crypto::SignChatMessageOptions;
+
     let certs = account.certs.lock();
     let certs = certs.as_ref().expect("certs shouldn't be set back to None");
 

azalea-client/src/plugins/chat_signing.rs

@@ -43,8 +43,8 @@ pub struct RequestCertsTask(pub Task<Result<Certificates, FetchCertificatesError
 pub struct OnlyRefreshCertsAfter {
     pub refresh_at: Instant,
 }
-/// A component that's present when that this client has sent its certificates
-/// to the server.
+/// A component that's present when this client has sent its certificates to the
+/// server.
 ///
 /// This should be removed if you want to re-send the certs.
 ///

azalea-client/src/plugins/disconnect.rs

@@ -11,9 +11,11 @@ use derive_more::Deref;
 use tracing::info;
 
 use super::login::IsAuthenticated;
+#[cfg(feature = "online-mode")]
+use crate::chat_signing;
 use crate::{
-    chat_signing, client::JoinedClientBundle, connection::RawConnection,
-    local_player::InstanceHolder, tick_counter::TicksConnected,
+    client::JoinedClientBundle, connection::RawConnection, local_player::InstanceHolder,
+    tick_counter::TicksConnected,
 };
 
 pub struct DisconnectPlugin;
@@ -69,6 +71,7 @@ pub struct RemoveOnDisconnectBundle {
     /// This makes it not send [`DisconnectEvent`] again.
     pub is_connection_alive: IsConnectionAlive,
     /// Resend our chat signing certs next time.
+    #[cfg(feature = "online-mode")]
     pub chat_signing_session: chat_signing::ChatSigningSession,
     /// They're not authenticated anymore if they disconnected.
     pub is_authenticated: IsAuthenticated,