Merge branch 'master' into master

Author: ReCore-sys

Cargo.toml

@@ -115,101 +115,102 @@ ferrumc-world-gen = { path = "src/lib/world_gen" }
 ferrumc-inventories = { path = "src/lib/inventories" }
 
 # Asynchronous
-tokio = { version = "1.47.1", features = ["macros", "net", "rt", "sync", "time", "io-util", "test-util"], default-features = false }
+tokio = { version = "1.48.0", features = ["macros", "net", "rt", "sync", "time", "io-util", "test-util"], default-features = false }
 
 # Logging
 tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
 tracing-appender = "0.2.3"
-log = "0.4.27"
-console-subscriber = "0.4.1"
+log = "0.4.28"
 
 # Concurrency/Parallelism
-parking_lot = "0.12.4"
+parking_lot = "0.12.5"
 rayon = "1.11.0"
 crossbeam-channel = "0.5.15"
 rusty_pool = "0.7.0"
 crossbeam-queue = "0.3.12"
 
 # Network
-reqwest = { version = "0.12.22", features = ["json"] }
-ureq = "3.1.0"
+ureq = "3.1.2"
 
 # Error handling
-thiserror = "2.0.15"
+thiserror = "2.0.17"
 
 # Cryptography
-rand = "0.9.2"
+rand = "0.10.0-rc.0"
 fnv = "1.0.7"
 wyhash = "0.6.0"
 ahash = "0.8.12"
 
 # Encoding/Serialization
-serde = { version = "1.0.219", features = ["derive"] }
-serde_json = "1.0.142"
-serde_derive = "1.0.219"
-serde_yaml_ng = "0.9.36"
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.145"
+serde_derive = "1.0.228"
 base64 = "0.22.1"
-bitcode = "0.6.7"
-bitcode_derive = "0.6.7"
-toml = "0.9.5"
+
+# When if bitcode's latest version has been changed, see if clippy still complains about
+# src/lib/net/src/packets/outgoing/chunk_and_light_data.rs
+#bitcode = "0.6.7"
+#bitcode_derive = "0.6.7"
+toml = "0.9.8"
 craftflow-nbt = "2.1.0"
 figment = { version = "0.10.19", features = ["toml", "env"] }
-simd-json = "0.15.1"
+simd-json = "0.17.0"
 
 # Bit manipulation
 byteorder = "1.5.0"
 
 # Data types
 dashmap = "7.0.0-rc2"
-uuid = { version = "1.18.0", features = ["v4", "v3", "serde"] }
-indexmap = { version = "2.10.0", features = ["serde"] }
+uuid = { version = "1.18.1", features = ["v4", "v3", "serde"] }
+indexmap = { version = "2.12.0", features = ["serde"] }
 
 # Macros
 lazy_static = "1.5.0"
-quote = "1.0.40"
+quote = "1.0.41"
 syn = "2.0.106"
 proc-macro2 = "1.0.101"
-proc-macro-crate = "3.3.0"
 paste = "1.0.15"
 maplit = "1.0.2"
 macro_rules_attribute = "0.2.2"
 
 # Magic
 dhat = "0.3.3"
-ctor = "0.4.2"
+ctor = "0.6.0"
 
 # Compression/Decompression
-flate2 = { version = "1.1.2", features = ["zlib"], default-features = false }
+flate2 = { version = "1.1.4", features = ["zlib"], default-features = false }
 lzzzz = "2.0.0"
 yazi = "0.2.1"
-bzip2 = "0.6.0"
-lz4_flex = "0.11.5"
 
 # Database
 heed = "0.22.0"
-moka = "0.12.10"
+moka = "0.12.11"
 
 # CLI
-clap = "4.5.45"
+clap = "4.5.49"
 indicatif = "0.18.0"
 colored = "3.0.0"
 
 # Misc
 deepsize = "0.2.0"
 page_size = "0.6.0"
 enum-ordinalize = "4.3.0"
-regex = "1.11.1"
+regex = "1.12.2"
 noise = "0.9.0"
-ctrlc = "3.4.7"
+ctrlc = "3.5.0"
 num_cpus = "1.17.0"
 typename = "0.1.2"
 bevy_ecs = { version = "0.16.1", features = ["multi_threaded", "trace"] }
 once_cell = "1.21.3"
 
 # I/O
-memmap2 = "0.9.7"
-tempfile = "3.20.0"
+memmap2 = "0.9.8"
+tempfile = "3.23.0"
 
 # Benchmarking
 criterion = { version = "0.7.0", features = ["html_reports"] }
+
+
+bitcode = { git = "https://github.com/SoftbearStudios/bitcode" }
+bitcode_derive = { git = "https://github.com/SoftbearStudios/bitcode" }

src/bin/src/packet_handlers/play_packets/place_block.rs

@@ -14,6 +14,7 @@ use tracing::{debug, error, trace};
 
 use ferrumc_inventories::hotbar::Hotbar;
 use ferrumc_inventories::inventory::Inventory;
+use ferrumc_world::block_id::BlockId;
 use once_cell::sync::Lazy;
 use std::collections::HashMap;
 use std::str::FromStr;
@@ -128,9 +129,12 @@ pub fn handle(
                         continue 'ev_loop;
                     }
 
-                    if let Err(err) =
-                        chunk.set_block(x & 0xF, y as i32, z & 0xF, VarInt::new(*mapped_block_id))
-                    {
+                    if let Err(err) = chunk.set_block(
+                        x & 0xF,
+                        y as i32,
+                        z & 0xF,
+                        BlockId(*mapped_block_id as u32),
+                    ) {
                         error!("Failed to set block: {:?}", err);
                         continue 'ev_loop;
                     }

src/bin/src/packet_handlers/play_packets/player_action.rs

@@ -9,7 +9,6 @@ use ferrumc_net::PlayerActionReceiver;
 use ferrumc_net_codec::net_types::var_int::VarInt;
 use ferrumc_state::GlobalStateResource;
 use ferrumc_world::block_id::BlockId;
-use ferrumc_world::vanilla_chunk_format::BlockData;
 use tracing::{debug, error, trace};
 
 pub fn handle(
@@ -42,7 +41,7 @@ pub fn handle(
                         event.location.y as i32,
                         event.location.z.abs() % 16,
                     );
-                    chunk.set_block(relative_x, relative_y, relative_z, BlockData::default())?;
+                    chunk.set_block(relative_x, relative_y, relative_z, BlockId::default())?;
                     // Save the chunk to disk
                     state.0.world.save_chunk(Arc::new(chunk))?;
                     for (eid, conn) in query {

src/lib/derive_macros/Cargo.toml

@@ -21,3 +21,7 @@ regex = { workspace = true }
 craftflow-nbt = { workspace = true }
 indexmap = { workspace = true, features = ["serde"] }
 bitcode = { workspace = true }
+simd-json = { workspace = true }
+
+[dev-dependencies]
+ferrumc-world = { workspace = true }

src/lib/derive_macros/src/block/matches.rs

@@ -0,0 +1,62 @@
+use crate::block::JSON_FILE;
+use proc_macro::TokenStream;
+use quote::quote;
+use simd_json::base::{ValueAsObject, ValueAsScalar};
+use simd_json::derived::ValueObjectAccess;
+
+struct Input {
+    name: String,
+    id_var: syn::Expr,
+}
+
+impl syn::parse::Parse for Input {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let name_lit: syn::LitStr = input.parse()?;
+        let _comma: syn::Token![,] = input.parse()?;
+        let id_var: syn::Expr = input.parse()?;
+        Ok(Input {
+            name: name_lit.value(),
+            id_var,
+        })
+    }
+}
+
+// match_block!("stone", block_id); -> "if block_id == BlockId(1) { ... }
+// match_block!("dirt", block_id); -> "if block_name == BlockId( { ... }
+pub fn matches_block(input: TokenStream) -> TokenStream {
+    let input = syn::parse_macro_input!(input as Input);
+    let block_name = &input.name;
+    let block_name = if block_name.starts_with("minecraft:") {
+        block_name.to_string()
+    } else {
+        format!("minecraft:{}", block_name)
+    };
+    let block_id_var = &input.id_var;
+    let mut buf = JSON_FILE.to_vec();
+    let v = simd_json::to_owned_value(&mut buf).unwrap();
+    let filtered_names = v
+        .as_object()
+        .unwrap()
+        .iter()
+        .filter(|(_, v)| v.get("name").as_str() == Some(&block_name))
+        .map(|(k, v)| (k.parse::<u32>().unwrap(), v))
+        .collect::<Vec<_>>();
+    if filtered_names.is_empty() {
+        return syn::Error::new_spanned(
+            &input.id_var,
+            format!("Block name '{}' not found in registry", block_name),
+        )
+        .to_compile_error()
+        .into();
+    }
+    let mut arms = Vec::new();
+    for (id, _) in filtered_names {
+        arms.push(quote! {
+            #block_id_var == BlockId(#id)
+        });
+    }
+    let joined = quote! {
+        #(#arms)||*
+    };
+    joined.into()
+}