Merge branch 'master' into whitelist-new

Author: ReCore-sys

.gitignore

@@ -16,3 +16,5 @@ flame.svg
 .direnv
 result
 result-*
+
+profile.json.gz

Cargo.toml

@@ -34,11 +34,12 @@ members = [
     "src/lib/world",
     "src/lib/world_gen",
     "src/lib/utils/threadpool",
+    "src/lib/registry",
 ]
 
 #================== Lints ==================#
 [workspace.lints.rust]
-unsafe_code = "deny"
+unsafe_code = "allow"
 unused_unsafe = "deny"
 #unsafe_op_in_unsafe_fn = "deny"
 #unused_crate_dependencies = "deny"
@@ -96,17 +97,18 @@ ferrumc-net-codec = { path = "src/lib/net/crates/codec" }
 ferrumc-net-encryption = { path = "src/lib/net/crates/encryption" }
 ferrumc-plugins = { path = "src/lib/plugins" }
 ferrumc-profiling = { path = "src/lib/utils/profiling" }
+ferrumc-registry = { path = "src/lib/registry" }
 ferrumc-state = { path = "src/lib/core/state" }
 ferrumc-storage = { path = "src/lib/storage" }
 ferrumc-text = { path = "src/lib/text" }
+ferrumc-threadpool = { path = "src/lib/utils/threadpool" }
 ferrumc-utils = { path = "src/lib/utils" }
 ferrumc-world = { path = "src/lib/world" }
 ferrumc-world-gen = { path = "src/lib/world_gen" }
-ferrumc-threadpool = { path = "src/lib/utils/threadpool" }
 
 
 # Asynchronous
-tokio = { version = "1.45.1", features = ["full"] }
+tokio = { version = "1.47.1", features = ["macros", "net", "rt", "sync", "time", "io-util", "test-util"], default-features = false }
 
 # Logging
 tracing = "0.1.41"
@@ -123,42 +125,44 @@ rusty_pool = "0.7.0"
 crossbeam-queue = "0.3.12"
 
 # Network
-reqwest = { version = "0.12.19", features = ["json"] }
-ureq = "3.0.11"
+reqwest = { version = "0.12.22", features = ["json"] }
+ureq = "3.0.12"
 
 # Error handling
 thiserror = "2.0.12"
 
 # Cryptography
-rand = "0.9.1"
+rand = "0.9.2"
 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.140"
+serde_json = "1.0.142"
 serde_derive = "1.0.219"
 serde_yaml_ng = "0.9.36"
 base64 = "0.22.1"
 bitcode = "0.6.6"
 bitcode_derive = "0.6.5"
-toml = "0.8.23"
+toml = "0.9.4"
 craftflow-nbt = "2.1.0"
 figment = { version = "0.10.19", features = ["toml", "env"] }
+simd-json = "0.15.1"
+sonic-rs = "0.5.3"
 
 # Bit manipulation
 byteorder = "1.5.0"
 
 # Data types
 dashmap = "7.0.0-rc2"
 uuid = { version = "1.17.0", features = ["v4", "v3", "serde"] }
-indexmap = { version = "2.9.0", features = ["serde"] }
+indexmap = { version = "2.10.0", features = ["serde"] }
 
 # Macros
 lazy_static = "1.5.0"
 quote = "1.0.40"
-syn = "2.0.102"
+syn = "2.0.104"
 proc-macro2 = "1.0.95"
 proc-macro-crate = "3.3.0"
 paste = "1.0.15"
@@ -172,15 +176,16 @@ dhat = "0.3.3"
 flate2 = { version = "1.1.2", features = ["zlib"], default-features = false }
 lzzzz = "2.0.0"
 yazi = "0.2.1"
-bzip2 = "0.5.2"
+bzip2 = "0.6.0"
+lz4_flex = "0.11.5"
 
 # Database
 heed = "0.22.0"
 moka = "0.12.10"
 
 # CLI
-clap = "4.5.40"
-indicatif = "0.17.11"
+clap = "4.5.42"
+indicatif = "0.18.0"
 colored = "3.0.0"
 
 # Misc
@@ -195,8 +200,8 @@ bevy_ecs = { version = "0.16.1", features = ["multi_threaded", "trace"] }
 once_cell = "1.21.3"
 
 # I/O
-memmap2 = "0.9.5"
+memmap2 = "0.9.7"
 tempfile = "3.20.0"
 
 # Benchmarking
-criterion = { version = "0.6.0", features = ["html_reports"] }
+criterion = { version = "0.7.0", features = ["html_reports"] }

assets/data/configs/main-config.toml

@@ -17,6 +17,9 @@ whitelist = false
 # Set to -1 to disable compression.
 network_compression_threshold = 64
 
+# Verify decompressed packets. This is a good idea to catch any corruption, but it will slow down processing.
+verify_decompressed_packets = true
+
 # Chunk render distance. This is the distance in chunks that the server will load around the player.
 chunk_render_distance = 12
 

src/bin/src/main.rs

@@ -146,11 +146,7 @@ fn handle_import(import_args: ImportArgs) -> Result<(), BinaryError> {
         import_path = root_path.join(import_path);
     }
 
-    if let Err(e) = world.import(
-        import_path,
-        import_args.batch_size,
-        // import_args.max_concurrent_tasks,
-    ) {
+    if let Err(e) = world.import(import_path, ThreadPool::new()) {
         error!("Could not import world: {}", e.to_string());
         return Err(BinaryError::Custom("Could not import world.".to_string()));
     }

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

@@ -91,7 +91,7 @@ pub fn handle(
                     let packet = BlockChangeAck {
                         sequence: event.sequence,
                     };
-                    conn.send_packet(&packet)?;
+                    conn.send_packet_ref(&packet)?;
 
                     chunk.set_block(x & 0xF, y as i32, z & 0xF, DUMMY_BLOCK)?;
                     let ack_packet = BlockChangeAck {
@@ -102,8 +102,8 @@ pub fn handle(
                         location: NetworkPosition { x, y, z },
                         block_id: VarInt::from(DUMMY_BLOCK),
                     };
-                    conn.send_packet(&chunk_packet)?;
-                    conn.send_packet(&ack_packet)?;
+                    conn.send_packet_ref(&chunk_packet)?;
+                    conn.send_packet_ref(&ack_packet)?;
 
                     state.0.world.save_chunk(Arc::new(chunk))?;
                 }

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

@@ -54,12 +54,12 @@ pub fn handle(
                             location: event.location.clone(),
                             block_id: VarInt::from(BlockId::default()),
                         };
-                        conn.send_packet(&block_update_packet)?;
+                        conn.send_packet_ref(&block_update_packet)?;
                         if eid == trigger_eid {
                             let ack_packet = BlockChangeAck {
                                 sequence: event.sequence,
                             };
-                            conn.send_packet(&ack_packet)?;
+                            conn.send_packet_ref(&ack_packet)?;
                         }
                     }
                 }

src/bin/src/packet_handlers/play_packets/player_command.rs

@@ -27,7 +27,7 @@ pub fn handle(
                     if !state.0.players.is_connected(entity) {
                         continue;
                     }
-                    if let Err(err) = conn.send_packet(&packet) {
+                    if let Err(err) = conn.send_packet_ref(&packet) {
                         error!("Failed to send start sneaking packet: {:?}", err);
                     }
                 }
@@ -40,7 +40,7 @@ pub fn handle(
                     if !state.0.players.is_connected(entity) {
                         continue;
                     }
-                    if let Err(err) = conn.send_packet(&packet) {
+                    if let Err(err) = conn.send_packet_ref(&packet) {
                         error!("Failed to send stop sneaking packet: {:?}", err);
                     }
                 }

src/bin/src/packet_handlers/play_packets/player_loaded.rs

@@ -50,7 +50,7 @@ pub fn handle(
                 );
                 // Teleport the player to the world center if their head block is not air
                 let packet = SynchronizePlayerPositionPacket::default();
-                if let Err(e) = conn.send_packet(&packet) {
+                if let Err(e) = conn.send_packet_ref(&packet) {
                     tracing::error!(
                         "Failed to send synchronize player position packet for player {}: {:?}",
                         player,

src/bin/src/packet_handlers/play_packets/set_player_position.rs

@@ -23,6 +23,10 @@ pub fn handle(
     state: Res<GlobalStateResource>,
 ) {
     for (event, eid) in events.0.try_iter() {
+        if !state.0.players.is_connected(eid) {
+            // Player is not connected, skip processing this event
+            continue;
+        }
         let new_rot = None::<Rotation>;
 
         let new_position = Position::new(event.x, event.feet_y, event.z);
@@ -128,7 +132,7 @@ fn update_pos_for_all(
         if !state.players.is_connected(entity) {
             continue;
         }
-        conn.send_packet(&packet)?;
+        conn.send_packet_ref(&packet)?;
     }
 
     Ok(())

src/bin/src/packet_handlers/play_packets/swing_arm.rs

@@ -30,7 +30,7 @@ pub fn handle(
             if !state.0.players.is_connected(entity) {
                 continue; // Skip if the player is not connected
             }
-            if let Err(e) = conn.send_packet(&packet) {
+            if let Err(e) = conn.send_packet_ref(&packet) {
                 error!("Failed to send packet: {}", e);
             }
         }