diff --git a/.gitignore b/.gitignore index 2bb19f1..7f35200 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ # Ignore Gradle build output directory build +/run + /fork-server/build.gradle.kts /fork-server/src/vanilla /paper-server diff --git a/build.gradle.kts b/build.gradle.kts index 9a9bb9c..c290fa0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { paperweight { upstreams.paper { - ref = "d98c8f9f5bbde9957d1a1011f09dec52694b32c0" + ref = "3a82d04b7e5f4f4f2cbde9d231ceb9a81ef93bbe" patchFile { path = "paper-server/build.gradle.kts" diff --git a/fork-server/build.gradle.kts.patch b/fork-server/build.gradle.kts.patch index 2a9237a..51f0746 100644 --- a/fork-server/build.gradle.kts.patch +++ b/fork-server/build.gradle.kts.patch @@ -99,29 +99,3 @@ implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency // Paper start implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ -@@ -263,7 +_,7 @@ - name: String, - block: JavaExec.() -> Unit - ): TaskProvider = register(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("createReobfBundlerJar").flatMap { it.outputZip }) -+ classpath(tasks.named("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("createReobfPaperclipJar").flatMap { it.outputZip }) -+ classpath(tasks.named("createReobfPaperclipJar").flatMap { it.outputZip }) - mainClass.set(null as String?) - }