Merge pull request #120 from 0xnim/feature/better_logging

LGTM

Author: ReCore-sys

Cargo.toml

@@ -20,7 +20,7 @@ members = [
     "src/lib/net/crates/codec",
     "src/lib/plugins",
     "src/lib/storage",
-    "src/lib/utils", "src/lib/utils/logging", "src/lib/utils/profiling", "src/lib/utils/general_purpose", "src/lib/utils/color",
+    "src/lib/utils", "src/lib/utils/logging", "src/lib/utils/profiling", "src/lib/utils/general_purpose",
     "src/lib/world",
     "src/lib/derive_macros",
     "src/lib/adapters/nbt", "src/lib/adapters/mca",
@@ -83,7 +83,6 @@ ferrumc-profiling = { path = "src/lib/utils/profiling" }
 ferrumc-logging = { path = "src/lib/utils/logging" }
 ferrumc-config = { path = "src/lib/utils/config" }
 ferrumc-general-purpose = { path = "src/lib/utils/general_purpose" }
-ferrumc-color = { path = "src/lib/utils/color" }
 ferrumc-macros = { path = "src/lib/derive_macros" }
 ferrumc-world = { path = "src/lib/world" }
 ferrumc-nbt = { path = "src/lib/adapters/nbt" }
@@ -156,7 +155,6 @@ bzip2 = "0.4.1"
 clap = "4.5.20"
 indicatif = "0.17.8"
 colored = "2.1.0"
-atty = "0.2.14"
 
 # Misc
 deepsize = "0.2.0"

src/lib/derive_macros/Cargo.toml

@@ -3,13 +3,15 @@ name = "ferrumc-macros"
 version = "0.1.0"
 edition = "2021"
 
+[features]
+default = ["colors"]
+colors = []
+
 [lib]
 proc-macro = true
 
 [dependencies]
 colored = { workspace = true }
-ferrumc-color = { workspace = true }
-
 quote = { workspace = true }
 syn = { workspace = true, features = ["full"] }
 thiserror = { workspace = true }

src/lib/derive_macros/src/net/packets/mod.rs

@@ -5,15 +5,11 @@ use std::ops::Add;
 use syn::{parse_macro_input, LitInt, LitStr};
 use colored::Colorize;
 
-use ferrumc_color::supports_color;
-
-
 /// Essentially, this just reads all the files in the directory and generates a match arm for each packet.
 /// (packet_id, state) => { ... }
 pub fn bake_registry(input: TokenStream) -> TokenStream {
-    if supports_color() {
-        colored::control::set_override(true);
-    }
+    #[cfg(feature = "colors")]
+    colored::control::set_override(true);
 
     let manifest_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set");
     let module_path = parse_macro_input!(input as syn::LitStr).value();