feat: replace log with tracing (#1460)

* feat: replace log with tracing

* chore: clippy

* fix: revert replacing println!-calls

* fix: await async construct

* fix: lints + incorrect await

* fix: each plugin spawns their own tracing-subscriber

* fix: replace info! with println for commands

* chore: remove env_logger

* fix: added TODO about structured logging

Author: FabseGP

Cargo.lock

@@ -87,7 +87,6 @@ debug = true
 strip = false
 
 [workspace.dependencies]
-log = "0.4"
 tokio = { version = "1.49", default-features = false }
 syn = { version = "2.0", default-features = false, features = ["printing"] }
 

Cargo.toml

@@ -7,7 +7,7 @@ rust-version.workspace = true
 [dependencies]
 pumpkin-util.workspace = true
 serde.workspace = true
-log.workspace = true
+tracing.workspace = true
 uuid.workspace = true
 
 toml.workspace = true

pumpkin-config/Cargo.toml

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::{fs, num::NonZeroU8, path::Path};
+use tracing::{debug, warn};
 pub mod fun;
 pub mod logging;
 pub mod networking;
@@ -189,7 +190,7 @@ pub trait LoadConfiguration {
         Self: Sized + Default + Serialize + DeserializeOwned,
     {
         if !config_dir.exists() {
-            log::debug!("creating new config root folder");
+            debug!("creating new config root folder");
             fs::create_dir(config_dir).expect("Failed to create config root folder");
         }
         let path = config_dir.join(Self::get_path());
@@ -215,7 +216,7 @@ pub trait LoadConfiguration {
                     path.file_name().unwrap().display()
                 );
                 if let Err(err) = fs::write(&path, toml::to_string(&merged_config).unwrap()) {
-                    log::warn!(
+                    warn!(
                         "Couldn't write merged config to {}. Reason: {}",
                         path.display(),
                         err
@@ -227,7 +228,7 @@ pub trait LoadConfiguration {
         } else {
             let content = Self::default();
             if let Err(err) = fs::write(&path, toml::to_string(&content).unwrap()) {
-                log::warn!(
+                warn!(
                     "Couldn't write default config to {:?}. Reason: {}",
                     path.display(),
                     err

pumpkin-config/src/lib.rs

@@ -11,7 +11,7 @@ pumpkin-data.workspace = true
 pumpkin-world.workspace = true
 pumpkin-util.workspace = true
 
-log.workspace = true
+tracing.workspace = true
 tokio.workspace = true
 thiserror.workspace = true
 crossbeam-utils.workspace = true

pumpkin-inventory/Cargo.toml

@@ -14,6 +14,7 @@ use crate::{
         ScreenHandlerFuture, ScreenHandlerListener, ScreenProperty,
     },
 };
+use tracing::debug;
 
 use super::furnace_like_slot::{FurnaceLikeSlot, FurnaceLikeSlotType, FurnaceOutputSlot};
 
@@ -119,7 +120,7 @@ impl ScreenHandler for FurnaceLikeScreenHandler {
             const FUEL_SLOT: i32 = 1; // Note: Slots 0, 1, 2 are Furnace slots.
             const OUTPUT_SLOT: i32 = 2;
 
-            log::debug!("FurnaceLikeScreenHandler::quick_move slot_index={slot_index}");
+            debug!("FurnaceLikeScreenHandler::quick_move slot_index={slot_index}");
 
             let mut stack_left = ItemStack::EMPTY.clone();
 
@@ -163,7 +164,7 @@ impl ScreenHandler for FurnaceLikeScreenHandler {
 
             // Award XP when taking from output slot (slot 2)
             if slot_index == OUTPUT_SLOT {
-                log::debug!("quick_move: taking from output slot, calling on_take_item");
+                debug!("quick_move: taking from output slot, calling on_take_item");
                 slot.on_take_item(player, &stack_left).await;
             }
 

pumpkin-inventory/src/furnace_like/furnace_like_screen_handler.rs

@@ -5,6 +5,8 @@ use pumpkin_world::{
     block::entities::furnace_like_block_entity::ExperienceContainer, inventory::Inventory,
 };
 
+use tracing::debug;
+
 use crate::{
     screen_handler::InventoryPlayer,
     slot::{BoxFuture, Slot},
@@ -118,12 +120,12 @@ impl Slot for FurnaceOutputSlot {
         _stack: &'a pumpkin_world::item::ItemStack,
     ) -> BoxFuture<'a, ()> {
         Box::pin(async move {
-            log::debug!("FurnaceOutputSlot: on_take_item called");
+            debug!("FurnaceOutputSlot: on_take_item called");
             // Extract accumulated experience and award to player
             let experience = self.experience_container.extract_experience();
-            log::debug!("FurnaceOutputSlot: extracted experience = {experience}");
+            debug!("FurnaceOutputSlot: extracted experience = {experience}");
             if experience > 0 {
-                log::debug!("FurnaceOutputSlot: awarding {experience} xp to player");
+                debug!("FurnaceOutputSlot: awarding {experience} xp to player");
                 player.award_experience(experience).await;
             }
             self.mark_dirty().await;

pumpkin-inventory/src/furnace_like/furnace_like_slot.rs

@@ -14,6 +14,7 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicU8, Ordering};
 use tokio::sync::Mutex;
+use tracing::warn;
 
 pub struct PlayerInventory {
     pub main_inventory: [Arc<Mutex<ItemStack>>; Self::MAIN_SIZE],
@@ -401,13 +402,10 @@ impl Inventory for PlayerInventory {
         Box::pin(async move {
             if slot < self.main_inventory.len() {
                 *self.main_inventory[slot].lock().await = stack;
+            } else if let Some(slot) = self.equipment_slots.get(&slot) {
+                self.entity_equipment.lock().await.put(slot, stack).await;
             } else {
-                match self.equipment_slots.get(&slot) {
-                    Some(slot) => {
-                        self.entity_equipment.lock().await.put(slot, stack).await;
-                    }
-                    None => log::warn!("Failed to get Equipment Slot at {slot}"),
-                }
+                warn!("Failed to get Equipment Slot at {slot}");
             }
         })
     }

pumpkin-inventory/src/player/player_inventory.rs

@@ -4,7 +4,6 @@ use crate::{
     slot::{NormalSlot, Slot},
     sync_handler::{SyncHandler, TrackedStack},
 };
-use log::warn;
 use pumpkin_data::{
     data_component_impl::{EquipmentSlot, EquipmentType, EquippableImpl},
     screen::WindowType,
@@ -29,6 +28,7 @@ use std::sync::atomic::{AtomicU32, Ordering};
 use std::{any::Any, collections::HashMap, sync::Arc};
 use std::{cmp::max, pin::Pin};
 use tokio::sync::Mutex;
+use tracing::warn;
 
 const SLOT_INDEX_OUTSIDE: i32 = -999;
 

pumpkin-inventory/src/screen_handler.rs

@@ -29,7 +29,7 @@ uuid.workspace = true
 thiserror.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-log.workspace = true
+tracing.workspace = true
 crossbeam.workspace = true
 
 sha2.workspace = true