From 0158a8e7643268bbe9a0e7105b567611f28beb3f Mon Sep 17 00:00:00 2001 From: Alexander Medvedev Date: Thu, 29 Jan 2026 17:02:21 +0100 Subject: [PATCH] Update to 1.21.11 --- .../patchbukkit/PatchBukkitServerBuildInfo.java | 4 ++-- rust/Cargo.lock | 14 +++++++++++--- rust/Cargo.toml | 6 +++--- rust/build.rs | 2 +- rust/src/java/jvm/worker.rs | 1 - 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/java/patchbukkit/src/main/java/org/patchbukkit/PatchBukkitServerBuildInfo.java b/java/patchbukkit/src/main/java/org/patchbukkit/PatchBukkitServerBuildInfo.java index 36905c6..76b20d1 100644 --- a/java/patchbukkit/src/main/java/org/patchbukkit/PatchBukkitServerBuildInfo.java +++ b/java/patchbukkit/src/main/java/org/patchbukkit/PatchBukkitServerBuildInfo.java @@ -35,12 +35,12 @@ public final class PatchBukkitServerBuildInfo implements ServerBuildInfo { @Override public String minecraftVersionId() { - return "1.21.10"; + return "1.21.11"; } @Override public String minecraftVersionName() { - return "1.21.10"; + return "1.21.11"; } @Override diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 39a9f44..49a7f29 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -648,7 +648,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2811,6 +2811,7 @@ checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd" dependencies = [ "deranged", "itoa", + "js-sys", "libc", "num-conv", "num_threads", @@ -2942,6 +2943,12 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" +[[package]] +name = "typed-path" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3015e6ce46d5ad8751e4a772543a30c7511468070e98e64e20165f8f81155b64" + [[package]] name = "typenum" version = "1.19.0" @@ -3477,9 +3484,9 @@ dependencies = [ [[package]] name = "zip" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9013f1222db8a6d680f13a7ccdc60a781199cd09c2fa4eff58e728bb181757fc" +checksum = "c42e33efc22a0650c311c2ef19115ce232583abbe80850bc8b66509ebef02de0" dependencies = [ "aes", "bzip2", @@ -3497,6 +3504,7 @@ dependencies = [ "ppmd-rust", "sha1 0.10.6", "time", + "typed-path", "zeroize", "zopfli", "zstd", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 35dd4a2..620a173 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -14,12 +14,12 @@ pumpkin-api-macros = { git = "https://github.com/Pumpkin-MC/Pumpkin.git", branch async-trait = "0.1" tokio = "1" log = "0.4" -glob = "0.3.2" +glob = "0.3.3" j4rs = { version = "0.24" } j4rs_derive = "0.1" -rust-embed = { version = "8.9.0", features = ["interpolate-folder-path"] } +rust-embed = { version = "8.11.0", features = ["interpolate-folder-path"] } walkdir = "2" -zip = "7.1" +zip = "7.2" serde-saphyr = "0.0.16" serde = { version = "1", features = ["derive"] } diff --git a/rust/build.rs b/rust/build.rs index 7ea73fb..699ae47 100644 --- a/rust/build.rs +++ b/rust/build.rs @@ -91,7 +91,7 @@ fn main() -> Result<(), Box> { "papermc::https://repo.papermc.io/repository/maven-public/", )])) .skip_setting_native_lib() - .with_base_path(&Path::new("./resources").canonicalize().unwrap()) + .with_base_path(Path::new("./resources").canonicalize().unwrap()) .build() .map_err(|err| format!("jvm failed to init: {:?}", err)) .unwrap(); diff --git a/rust/src/java/jvm/worker.rs b/rust/src/java/jvm/worker.rs index 984fb1f..c809e81 100644 --- a/rust/src/java/jvm/worker.rs +++ b/rust/src/java/jvm/worker.rs @@ -2,7 +2,6 @@ use std::path::PathBuf; use anyhow::bail; use j4rs::{Instance, InvocationArg, Jvm, JvmBuilder}; -use pumpkin::plugin::player::player_join::PlayerJoinEvent; use tokio::sync::{mpsc, oneshot}; use crate::{