From de209876376093dc89469d3d512f96aea77e0ce1 Mon Sep 17 00:00:00 2001 From: MC_XiaoHei Date: Fri, 12 Jul 2024 14:50:50 +0800 Subject: [PATCH] [release-skip] fix gradle tasks --- patches/server/0001-Build-changes.patch | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 7a22ac32..f153b32d 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 1a734293c9416f13324bb0edf8f950c9029f8bc4..5025c5df3ee6ed84106782e3f9228874bebe63ca 100644 +index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd6996fa0181c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -62,6 +62,26 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..5025c5df3ee6ed84106782e3f9228874 mainClass.set("org.bukkit.craftbukkit.Main") standardInput = System.`in` workingDir = rootProject.layout.projectDirectory +@@ -213,13 +222,13 @@ tasks.registerRunTask("runReobfBundler") { + classpath(rootProject.tasks.named("createReobfBundlerJar").flatMap { it.outputZip }) + mainClass.set(null as String?) + } +-tasks.registerRunTask("runPaperclip") { +- description = "Spin up a test server from the Mojang mapped Paperclip jar" +- classpath(rootProject.tasks.named("createMojmapPaperclipJar").flatMap { it.outputZip }) ++tasks.registerRunTask("runLeavesclip") { ++ description = "Spin up a test server from the Mojang mapped Leavesclip jar" ++ classpath(rootProject.tasks.named("createMojmapLeavesclipJar").flatMap { it.outputZip }) + mainClass.set(null as String?) + } +-tasks.registerRunTask("runReobfPaperclip") { +- description = "Spin up a test server from the reobf Paperclip jar" +- classpath(rootProject.tasks.named("createReobfPaperclipJar").flatMap { it.outputZip }) ++tasks.registerRunTask("runReobfLeavesclip") { ++ description = "Spin up a test server from the reobf Leavesclip jar" ++ classpath(rootProject.tasks.named("createReobfLeavesclipJar").flatMap { it.outputZip }) + mainClass.set(null as String?) + } diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java index 4b002e8b75d117b726b0de274a76d3596fce015b..03373e5a37a5f90d31434aab921ec8c6b6efef70 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java