Pumpkin-MC/PatchBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 1.21.11

Browse Source
This commit is contained in:
Alexander Medvedev 2026-01-29 17:02:21 +01:00
parent 3b9966833e
commit 0158a8e764
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/patchbukkit/src/main/java/org/patchbukkit/PatchBukkitServerBuildInfo.java
View File

@ -35,12 +35,12 @@ public final class PatchBukkitServerBuildInfo implements ServerBuildInfo {
@Override @Override
public String minecraftVersionId() { public String minecraftVersionId() {
return "1.21.10"; return "1.21.11";
} }
@Override @Override
public String minecraftVersionName() { public String minecraftVersionName() {
return "1.21.10"; return "1.21.11";
} }
@Override @Override

14
rust/Cargo.lock generated
View File

@ -648,7 +648,7 @@ dependencies = [
"libc", "libc",
"option-ext", "option-ext",
"redox_users", "redox_users",
"windows-sys 0.59.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@ -2811,6 +2811,7 @@ checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd"
dependencies = [ dependencies = [
"deranged", "deranged",
"itoa", "itoa",
"js-sys",
"libc", "libc",
"num-conv", "num-conv",
"num_threads", "num_threads",
@ -2942,6 +2943,12 @@ version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
[[package]]
name = "typed-path"
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3015e6ce46d5ad8751e4a772543a30c7511468070e98e64e20165f8f81155b64"
[[package]] [[package]]
name = "typenum" name = "typenum"
version = "1.19.0" version = "1.19.0"
@ -3477,9 +3484,9 @@ dependencies = [
[[package]] [[package]]
name = "zip" name = "zip"
version = "7.1.0" version = "7.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9013f1222db8a6d680f13a7ccdc60a781199cd09c2fa4eff58e728bb181757fc" checksum = "c42e33efc22a0650c311c2ef19115ce232583abbe80850bc8b66509ebef02de0"
dependencies = [ dependencies = [
"aes", "aes",
"bzip2", "bzip2",
@ -3497,6 +3504,7 @@ dependencies = [
"ppmd-rust", "ppmd-rust",
"sha1 0.10.6", "sha1 0.10.6",
"time", "time",
"typed-path",
"zeroize", "zeroize",
"zopfli", "zopfli",
"zstd", "zstd",

6
rust/Cargo.toml
View File

@ -14,12 +14,12 @@ pumpkin-api-macros = { git = "https://github.com/Pumpkin-MC/Pumpkin.git", branch
async-trait = "0.1" async-trait = "0.1"
tokio = "1" tokio = "1"
log = "0.4" log = "0.4"
glob = "0.3.2" glob = "0.3.3"
j4rs = { version = "0.24" } j4rs = { version = "0.24" }
j4rs_derive = "0.1" 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" walkdir = "2"
zip = "7.1" zip = "7.2"
serde-saphyr = "0.0.16" serde-saphyr = "0.0.16"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }

2
rust/build.rs
View File

@ -91,7 +91,7 @@ fn main() -> Result<(), Box<dyn Error>> {
"papermc::https://repo.papermc.io/repository/maven-public/", "papermc::https://repo.papermc.io/repository/maven-public/",
)])) )]))
.skip_setting_native_lib() .skip_setting_native_lib()
.with_base_path(&Path::new("./resources").canonicalize().unwrap()) .with_base_path(Path::new("./resources").canonicalize().unwrap())
.build() .build()
.map_err(|err| format!("jvm failed to init: {:?}", err)) .map_err(|err| format!("jvm failed to init: {:?}", err))
.unwrap(); .unwrap();

1
rust/src/java/jvm/worker.rs
View File

@ -2,7 +2,6 @@ use std::path::PathBuf;
use anyhow::bail; use anyhow::bail;
use j4rs::{Instance, InvocationArg, Jvm, JvmBuilder}; use j4rs::{Instance, InvocationArg, Jvm, JvmBuilder};
use pumpkin::plugin::player::player_join::PlayerJoinEvent;
use tokio::sync::{mpsc, oneshot}; use tokio::sync::{mpsc, oneshot};
use crate::{ use crate::{