From ea8a8fccb6eb39c97f6cb69e11db5f7d0886172e Mon Sep 17 00:00:00 2001
From: xtex <xtexchooser@duck.com>
Date: Sun, 25 Jun 2023 06:43:38 +0800
Subject: Add ClientBuilder:new_without_log (#93)

* Add ClientBuilder:new_without_log

* 'log' feature

* fix warnings

---------

Co-authored-by: mat <git@matdoes.dev>
---
 azalea-client/Cargo.toml    |  5 +++++
 azalea-client/src/client.rs | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'azalea-client')

diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml
index 0303000f..dc4ff2e0 100644
--- a/azalea-client/Cargo.toml
+++ b/azalea-client/Cargo.toml
@@ -38,3 +38,8 @@ regex = "1.7.0"
 thiserror = "^1.0.34"
 tokio = { version = "^1.24.2", features = ["sync"] }
 uuid = "^1.1.2"
+
+[features]
+default = ["log"]
+# enables bevy_log::LogPlugin by default
+log = []
diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs
index fb977f36..ee133dd5 100644
--- a/azalea-client/src/client.rs
+++ b/azalea-client/src/client.rs
@@ -55,7 +55,6 @@ use bevy_ecs::{
     system::{ResMut, Resource},
     world::World,
 };
-use bevy_log::LogPlugin;
 use bevy_time::{prelude::FixedTime, TimePlugin};
 use derive_more::{Deref, DerefMut};
 use log::{debug, error};
@@ -694,10 +693,10 @@ pub struct DefaultPlugins;
 
 impl PluginGroup for DefaultPlugins {
     fn build(self) -> PluginGroupBuilder {
-        PluginGroupBuilder::start::<Self>()
-            .add(LogPlugin::default())
+        #[allow(unused_mut)]
+        let mut group = PluginGroupBuilder::start::<Self>()
             .add(AmbiguityLoggerPlugin)
-            .add(TimePlugin::default())
+            .add(TimePlugin)
             .add(PacketHandlerPlugin)
             .add(AzaleaPlugin)
             .add(EntityPlugin)
@@ -710,6 +709,11 @@ impl PluginGroup for DefaultPlugins {
             .add(PlayerMovePlugin)
             .add(InteractPlugin)
             .add(RespawnPlugin)
-            .add(TickBroadcastPlugin)
+            .add(TickBroadcastPlugin);
+        #[cfg(feature = "log")]
+        {
+            group = group.add(bevy_log::LogPlugin::default());
+        }
+        group
     }
 }
-- 
cgit v1.2.3