From 942c015158d59398a4a77e8348faa33c9e5d7bd9 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Tue, 15 Jun 2021 22:10:05 -0700
Subject: [PATCH] Update runDev task for Gradle 7.1 deprecations

also no longer disable watchdog by default, instead require `disableWatchdog` Gradle property to be set
---
 patches/server/Setup-Gradle-project.patch | 39 ++++++++++++-----------
 work/Bukkit                               |  2 +-
 work/CraftBukkit                          |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index e047d94701..1662dce7f2 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -25,10 +25,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 +import io.papermc.paperweight.util.Git
 +import io.papermc.paperweight.util.path
-+import org.gradle.api.file.FileTreeElement
 +import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
-+import java.util.Date
 +import java.text.SimpleDateFormat
++import java.util.Date
 +
 +plugins {
 +    java
@@ -114,20 +113,24 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
 +}
 +
-+fun TaskContainer.registerRunTask(name: String, block: JavaExec.() -> Unit): TaskProvider<JavaExec> =
-+    register<JavaExec>(name) {
-+        group = "Paper"
-+        workingDir = rootProject.layout.projectDirectory.dir(
-+            providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
-+        ).get().asFile
-+        doFirst {
-+            workingDir.mkdirs()
-+        }
-+        standardInput = System.`in`
-+        args("--nogui")
-+        systemProperty("net.kyori.adventure.text.warnWhenLegacyFormattingDetected", true)
-+        block(this)
++fun TaskContainer.registerRunTask(
++    name: String, block: JavaExec.() -> Unit
++): TaskProvider<JavaExec> = register<JavaExec>(name) {
++    group = "paper"
++    standardInput = System.`in`
++    workingDir = rootProject.layout.projectDirectory.dir(
++        providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
++    ).get().asFile
++    args("--nogui")
++    systemProperty("net.kyori.adventure.text.warnWhenLegacyFormattingDetected", true)
++    if (project.hasProperty("disableWatchdog")) {
++        systemProperty("disable.watchdog", true)
 +    }
++    doFirst {
++        workingDir.mkdirs()
++    }
++    block(this)
++}
 +
 +tasks.registerRunTask("runShadow") {
 +    description = "Spin up a test server from the shadowJar archiveFile"
@@ -141,10 +144,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +tasks.registerRunTask("runDev") {
 +    description = "Spin up a non-shaded non-remapped test server"
-+    classpath = project.convention.getPlugin(JavaPluginConvention::class.java)
-+        .sourceSets.getByName("main").runtimeClasspath
-+    main = "org.bukkit.craftbukkit.Main"
-+    systemProperty("disable.watchdog", true)
++    classpath = java.sourceSets.main.get().runtimeClasspath
++    mainClass.set("org.bukkit.craftbukkit.Main")
 +}
 +
 +class ModifiedLog4j2PluginsCacheFileTransformer : Transformer by Log4j2PluginsCacheFileTransformer() {
diff --git a/work/Bukkit b/work/Bukkit
index e9ce88b99c..ebb0e28d11 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit e9ce88b99c08332877866313784cd84e9d9b54fb
+Subproject commit ebb0e28d11747aa0bb4bb39fad8979ccfaa925b6
diff --git a/work/CraftBukkit b/work/CraftBukkit
index d7ef1e91fa..f992ce6097 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit d7ef1e91fa6431aa649b4bfcdabdbbef8ba41267
+Subproject commit f992ce6097f846ed5967fc797d98ae3e84ef1b10