update paper

This commit is contained in:
Jason Penilla 2024-12-15 17:03:00 -07:00
parent 017d480115
commit 75a4403f17
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
3 changed files with 3 additions and 27 deletions

2
.gitignore vendored
View File

@ -4,6 +4,8 @@
# Ignore Gradle build output directory # Ignore Gradle build output directory
build build
/run
/fork-server/build.gradle.kts /fork-server/build.gradle.kts
/fork-server/src/vanilla /fork-server/src/vanilla
/paper-server /paper-server

View File

@ -8,7 +8,7 @@ plugins {
paperweight { paperweight {
upstreams.paper { upstreams.paper {
ref = "d98c8f9f5bbde9957d1a1011f09dec52694b32c0" ref = "3a82d04b7e5f4f4f2cbde9d231ceb9a81ef93bbe"
patchFile { patchFile {
path = "paper-server/build.gradle.kts" path = "paper-server/build.gradle.kts"

View File

@ -99,29 +99,3 @@
implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency
// Paper start // Paper start
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
@@ -263,7 +_,7 @@
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
- group = "paper"
+ group = "runs"
mainClass.set("org.bukkit.craftbukkit.Main")
standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory
@@ -324,7 +_,7 @@
}
tasks.registerRunTask("runReobfBundler") {
description = "Spin up a test server from the reobf bundler jar"
- classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createReobfBundlerJar").flatMap { it.outputZip })
+ classpath(tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createReobfBundlerJar").flatMap { it.outputZip })
mainClass.set(null as String?)
}
tasks.registerRunTask("runPaperclip") {
@@ -334,6 +_,6 @@
}
tasks.registerRunTask("runReobfPaperclip") {
description = "Spin up a test server from the reobf Paperclip jar"
- classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createReobfPaperclipJar").flatMap { it.outputZip })
+ classpath(tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createReobfPaperclipJar").flatMap { it.outputZip })
mainClass.set(null as String?)
}