Patch for bitcode, bump deps

Author: ReCore-sys

Cargo.toml

@@ -115,101 +115,104 @@ 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"
+serde_yaml_ng = "0.10.0"
 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"
+proc-macro-crate = "3.4.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/lib/derive_macros/src/lib.rs

@@ -98,6 +98,22 @@ pub fn build_registry_packets(input: TokenStream) -> TokenStream {
     registries_packets::build_mapping(input)
 }
 
+/// A macro to lookup block IDs at compile time.
+///
+/// Feed in the block name as a string literal, and an optional set of properties as a map.
+/// It will output a `BlockId` struct with the correct ID for that block and properties.
+/// Usage:
+/// ```ignore
+/// let block_id = block!("stone");
+/// let another_block_id = block!("minecraft:grass_block", {snowy: true});
+/// ```
+/// Unfortunately, due to current limitations in Rust's proc macros, you will need to import the
+/// `BlockId` struct manually.
+///
+/// The `minecraft:` namespace is optional and will be added automatically if not present.
+///
+/// If the block or properties are invalid, a compile-time error will be thrown that should hopefully
+/// explain the issue.
 #[proc_macro]
 pub fn block(input: TokenStream) -> TokenStream {
     block::block(input)

src/lib/world/src/block_id.rs

@@ -44,6 +44,9 @@ lazy_static! {
 
 /// An ID for a block, and it's state in the world. Use this over `BlockData` unless you need to
 /// modify or read the block's name/properties directly.
+///
+/// This should be used over `BlockData` in most cases, as it's much more efficient to store and pass around.
+/// You can also generate a block's id at runtime with the [ferrumc_macros::block!] macro.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Encode, Decode, DeepSizeOf)]
 pub struct BlockId(pub u32);
 

src/lib/world/src/vanilla_chunk_format.rs

@@ -98,6 +98,11 @@ pub(crate) struct BlockStates {
     pub palette: Option<Vec<BlockData>>,
 }
 
+/// Information about a block's name and properties.
+///
+/// This should be used sparingly, as it's much more efficient to use [BlockId] where possible.
+///
+/// If you want to use it as a literal and the convert to a BlockId, use the [ferrumc_macros::block_data!] macro.
 #[apply(ChunkDerives)]
 #[derive(deepsize::DeepSizeOf, Hash)]
 pub struct BlockData {