Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6b0b29a9 Update publishing endpoint
PaperMC/Paper@f6fabc5f Call EntityChangeBlockEvent for copper golem statue changes (#13090)
PaperMC/Paper@1d6ee7db Update adventure
PaperMC/Paper@404e49fd Update to 1.21.9-rc1
PaperMC/Paper@40552742 Fix empty SkinPatch initialization and swapped dynamic/static heuristic in ResolvableProfile build method
This commit is contained in:
granny
2025-09-25 21:55:18 -07:00
parent 465982f814
commit 1f1d4dcb6e
14 changed files with 76 additions and 76 deletions

View File

@@ -59,7 +59,7 @@
implementation("ca.spottedleaf:concurrentutil:0.0.5")
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
@@ -157,6 +_,10 @@
@@ -156,6 +_,10 @@
implementation("org.ow2.asm:asm-commons:9.8")
implementation("org.spongepowered:configurate-yaml:4.2.0")
@@ -70,7 +70,7 @@
// Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed
runtimeOnly("commons-lang:commons-lang:2.6")
runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0")
@@ -201,14 +_,14 @@
@@ -200,14 +_,14 @@
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -90,7 +90,7 @@
"Build-Number" to (build ?: ""),
"Build-Time" to buildTime.toString(),
"Git-Branch" to gitBranch,
@@ -267,7 +_,7 @@
@@ -266,7 +_,7 @@
jvmArgumentProviders.add(provider)
}
@@ -99,7 +99,7 @@
idea {
module {
generatedSourceDirs.add(generatedDir.toFile())
@@ -359,7 +_,7 @@
@@ -358,7 +_,7 @@
mainClass.set(null as String?)
}
@@ -108,7 +108,7 @@
project("paper")
versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
version(paperweight.minecraftVersion)
@@ -374,4 +_,44 @@
@@ -373,4 +_,44 @@
}
}
}