From 9ec7a3d08ec9f04ee5029e126d28eb6bcb9b9239 Mon Sep 17 00:00:00 2001 From: Alexander Medvedev Date: Thu, 27 Aug 2026 21:56:45 +0200 Subject: [PATCH] small fixes --- rust/Cargo.lock | 65 +++++++----------------- rust/src/java/native_callbacks/entity.rs | 4 +- rust/src/java/native_callbacks/server.rs | 2 +- 3 files changed, 19 insertions(+), 52 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 500805d..988d960 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -612,9 +612,9 @@ dependencies = [ [[package]] name = "chacha20" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" +checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" dependencies = [ "cfg-if", "cpufeatures 0.3.0", @@ -1060,19 +1060,6 @@ version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" -[[package]] -name = "crossfire" -version = "3.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111ce8f7abfbac38b4bc4f32a3a2dda1a8034b873c90c7899f302cc9dbbc05ec" -dependencies = [ - "crossbeam-utils", - "futures-core", - "parking_lot", - "pointers", - "smallvec", -] - [[package]] name = "crypto-bigint" version = "0.5.5" @@ -2514,9 +2501,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d0a00925a9f930d679b6789b721e3a7f9ed110f41b86d2497caa780c3a070a" +checksum = "d7955dfc218a8afb29dfeffd540e3a6e96baeb94fe7138228dd7cc6937fbbf96" dependencies = [ "libc", ] @@ -2990,16 +2977,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "parking_lot" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" -dependencies = [ - "lock_api", - "parking_lot_core", -] - [[package]] name = "parking_lot_core" version = "0.9.12" @@ -3198,12 +3175,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "pointers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcdc93847ad24990939cce6e1804361e903efcb5f99daa5abd87943a9d6d7ba" - [[package]] name = "poly1305" version = "0.8.0" @@ -3512,7 +3483,7 @@ dependencies = [ [[package]] name = "pumpkin" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "aes 0.9.2", "arc-swap", @@ -3578,7 +3549,7 @@ dependencies = [ [[package]] name = "pumpkin-api-macros" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "proc-macro-error2", "proc-macro2", @@ -3589,7 +3560,7 @@ dependencies = [ [[package]] name = "pumpkin-codecs" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "serde_json", "tracing", @@ -3598,7 +3569,7 @@ dependencies = [ [[package]] name = "pumpkin-config" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "pumpkin-util", "serde", @@ -3610,7 +3581,7 @@ dependencies = [ [[package]] name = "pumpkin-data" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "crc-fast", "phf", @@ -3623,7 +3594,7 @@ dependencies = [ [[package]] name = "pumpkin-inventory" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "pumpkin-data", "pumpkin-protocol", @@ -3631,14 +3602,13 @@ dependencies = [ "pumpkin-world", "rand 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 2.0.20", - "tokio", "tracing", ] [[package]] name = "pumpkin-macros" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "heck", "proc-macro-error2", @@ -3651,7 +3621,7 @@ dependencies = [ [[package]] name = "pumpkin-nbt" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "bytes", "cesu8", @@ -3665,7 +3635,7 @@ dependencies = [ [[package]] name = "pumpkin-protocol" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "aes 0.9.2", "async-compression", @@ -3690,7 +3660,7 @@ dependencies = [ [[package]] name = "pumpkin-util" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "base64 0.23.1", "bytes", @@ -3716,13 +3686,12 @@ dependencies = [ [[package]] name = "pumpkin-world" version = "0.1.0-dev+26.2-26.40" -source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#3d69190a3766fd901adc6023f1c1c399d7e591bf" +source = "git+https://github.com/Pumpkin-MC/Pumpkin.git?branch=master#37437ee0a013f3d8a776227516be151f5a490b4c" dependencies = [ "arc-swap", "bitflags 2.13.1", "bytes", "crossbeam", - "crossfire", "dashmap", "flate2", "futures", @@ -3797,7 +3766,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" dependencies = [ - "chacha20 0.10.1", + "chacha20 0.10.2", "getrandom 0.4.3", "rand_core 0.10.1", ] @@ -3807,7 +3776,7 @@ name = "rand" version = "0.10.2" source = "git+https://github.com/rust-random/rand#bb1262f703ca04e4ce56be78e1dc4e204cd6a998" dependencies = [ - "chacha20 0.10.1", + "chacha20 0.10.2", "getrandom 0.4.3", "rand_core 0.10.1", ] diff --git a/rust/src/java/native_callbacks/entity.rs b/rust/src/java/native_callbacks/entity.rs index e59d29b..da798c5 100644 --- a/rust/src/java/native_callbacks/entity.rs +++ b/rust/src/java/native_callbacks/entity.rs @@ -107,9 +107,7 @@ pub fn ffi_native_bridge_teleport_entity_impl(request: TeleportEntityRequest) -> let world = player.living_entity.entity.world.load_full(); let player = player.clone(); ctx.runtime.spawn(async move { - player - .teleport(position, Some(yaw), Some(pitch), world) - .await; + player.teleport(position, Some(yaw), Some(pitch), world); }); }) } diff --git a/rust/src/java/native_callbacks/server.rs b/rust/src/java/native_callbacks/server.rs index d6c218d..8765b8c 100644 --- a/rust/src/java/native_callbacks/server.rs +++ b/rust/src/java/native_callbacks/server.rs @@ -420,7 +420,7 @@ pub fn ffi_native_bridge_create_world_impl( let world_name = name.clone(); let (tx, rx) = tokio::sync::oneshot::channel(); ctx.runtime.spawn(async move { - let world = server.create_world(world_name, dim).await; + let world = server.create_world(world_name, dim); let _ = tx.send(world.uuid); });