diff --git a/build.gradle.kts b/build.gradle.kts
index f08a125667..7331f7e2f6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "7.0.0" apply false
+    id("com.github.johnrengelman.shadow") version "7.1.0" apply false
     id("io.papermc.paperweight.core") version "1.1.12"
 }
 
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index 0a149bb789..e28a888275 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -28,14 +28,13 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..8dea71d371fb31b50da6b53b0f80030ed1c7c484
+index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b4534df4812
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,170 @@
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
-+import io.papermc.paperweight.util.Git
-+import io.papermc.paperweight.util.path
++import io.papermc.paperweight.util.*
 +import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
 +import java.util.Locale
 +
@@ -178,9 +177,7 @@ index 0000000000000000000000000000000000000000..8dea71d371fb31b50da6b53b0f80030e
 +    doFirst {
 +        workingDir.mkdirs()
 +    }
-+    javaLauncher.set(project.javaToolchains.launcherFor {
-+        languageVersion.set(JavaLanguageVersion.of(project.tasks.compileJava.get().options.release.get()))
-+    })
++    javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
 +    block(this)
 +}
 +
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index 2f6a213042..9174f2e578 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8dea71d371fb31b50da6b53b0f80030ed1c7c484..9248d3701a2ac282d85ab92a515397b5150ffa86 100644
+index b64b0200a6b19f93ba0592ecc6f29b4534df4812..1f4c0f2156c588fcbb3b0329a416dc20a4b355a8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -18,21 +18,24 @@ repositories {
+@@ -17,21 +17,24 @@ repositories {
  dependencies {
      implementation(project(":Paper-API"))
      implementation("jline:jline:2.12.1")
@@ -37,7 +37,7 @@ index 8dea71d371fb31b50da6b53b0f80030ed1c7c484..9248d3701a2ac282d85ab92a515397b5
      testImplementation("junit:junit:4.13.1")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
  }
-@@ -53,6 +56,7 @@ tasks.jar {
+@@ -52,6 +55,7 @@ tasks.jar {
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Bukkit Team",
@@ -45,7 +45,7 @@ index 8dea71d371fb31b50da6b53b0f80030ed1c7c484..9248d3701a2ac282d85ab92a515397b5
          )
          for (tld in setOf("net", "com", "org")) {
              attributes("$tld/bukkit", "Sealed" to true)
-@@ -83,7 +87,7 @@ relocation {
+@@ -82,7 +86,7 @@ relocation {
      sequenceOf(
          "commons-codec:commons-codec" to "org.apache.commons.codec",
          "commons-io:commons-io" to "org.apache.commons.io",
@@ -54,7 +54,7 @@ index 8dea71d371fb31b50da6b53b0f80030ed1c7c484..9248d3701a2ac282d85ab92a515397b5
          "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
          "org.ow2.asm:asm" to "org.objectweb.asm"
      ).forEach { (owner, pack) ->
-@@ -103,9 +107,17 @@ relocation {
+@@ -102,9 +106,17 @@ relocation {
      }
  }
  
diff --git a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
index 3dfe1fd478..564e90ea92 100644
--- a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -19,10 +19,10 @@ Other changes:
     configuration
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9248d3701a2ac282d85ab92a515397b5150ffa86..43f4037dad7394d6ee94b5f91fbdb783428a6f62 100644
+index 1f4c0f2156c588fcbb3b0329a416dc20a4b355a8..9b70376813531718c02082633e9f8105f4879a63 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -17,7 +17,17 @@ repositories {
+@@ -16,7 +16,17 @@ repositories {
  
  dependencies {
      implementation(project(":Paper-API"))
diff --git a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
index c9ce1d8acc..51d4906e60 100644
--- a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,10 +15,10 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 43f4037dad7394d6ee94b5f91fbdb783428a6f62..43ade646a7c69bbc6536ed37eb4c898decc7572c 100644
+index 9b70376813531718c02082633e9f8105f4879a63..fc8ffeea3e808eb1381f85972adffc614937ef6d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -26,7 +26,7 @@ dependencies {
+@@ -25,7 +25,7 @@ dependencies {
            all its classes to check if they are plugins.
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
diff --git a/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 3b0def6d8a..b3cd47759e 100644
--- a/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 43ade646a7c69bbc6536ed37eb4c898decc7572c..18a8049394529fae70d25ec3ddb285f85f6a8160 100644
+index fc8ffeea3e808eb1381f85972adffc614937ef6d..c981944f4a5d40ec14ade9aaa22041887a317e1f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -38,6 +38,7 @@ dependencies {
+@@ -37,6 +37,7 @@ dependencies {
      }
      runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
      runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper
diff --git a/patches/server/0422-Implement-Brigadier-Mojang-API.patch b/patches/server/0422-Implement-Brigadier-Mojang-API.patch
index 1beda688bc..eaa4655a81 100644
--- a/patches/server/0422-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0422-Implement-Brigadier-Mojang-API.patch
@@ -10,10 +10,10 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 18a8049394529fae70d25ec3ddb285f85f6a8160..fd037da8b655b329ef016356519a69ca2621fd4f 100644
+index c981944f4a5d40ec14ade9aaa22041887a317e1f..2c39461ce531cfa8fc0aa6928e0de819640b0553 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -17,6 +17,7 @@ repositories {
+@@ -16,6 +16,7 @@ repositories {
  
  dependencies {
      implementation(project(":Paper-API"))
diff --git a/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 6a5f871800..8c7fbfca2d 100644
--- a/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,23 +6,20 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fd037da8b655b329ef016356519a69ca2621fd4f..03c9f894a2eaa065c456843eef4d3ab1a25565c3 100644
+index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16fdf26fdd 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -1,8 +1,12 @@
+@@ -1,7 +1,9 @@
  import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
  import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 +import io.papermc.paperweight.tasks.BaseTask
- import io.papermc.paperweight.util.Git
-+import io.papermc.paperweight.util.defaultOutput
-+import io.papermc.paperweight.util.openZip
- import io.papermc.paperweight.util.path
+ import io.papermc.paperweight.util.*
  import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
 +import java.nio.file.Files
  import java.util.Locale
  
  plugins {
-@@ -13,6 +17,14 @@ plugins {
+@@ -12,6 +14,14 @@ plugins {
  
  repositories {
      maven("https://libraries.minecraft.net/")
@@ -37,7 +34,7 @@ index fd037da8b655b329ef016356519a69ca2621fd4f..03c9f894a2eaa065c456843eef4d3ab1
  }
  
  dependencies {
-@@ -48,6 +60,8 @@ dependencies {
+@@ -47,6 +57,8 @@ dependencies {
      implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
  
@@ -46,7 +43,7 @@ index fd037da8b655b329ef016356519a69ca2621fd4f..03c9f894a2eaa065c456843eef4d3ab1
      testImplementation("junit:junit:4.13.1")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
  }
-@@ -141,6 +155,44 @@ tasks.shadowJar {
+@@ -140,6 +152,45 @@ tasks.shadowJar {
      transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
  }
  
@@ -62,6 +59,7 @@ index fd037da8b655b329ef016356519a69ca2621fd4f..03c9f894a2eaa065c456843eef4d3ab1
 +    abstract val outputJar: RegularFileProperty
 +
 +    override fun init() {
++        super.init()
 +        outputJar.convention(defaultOutput())
 +    }
 +
diff --git a/patches/server/0430-Implement-Mob-Goal-API.patch b/patches/server/0430-Implement-Mob-Goal-API.patch
index 2e33b52d75..cacb5a3488 100644
--- a/patches/server/0430-Implement-Mob-Goal-API.patch
+++ b/patches/server/0430-Implement-Mob-Goal-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 03c9f894a2eaa065c456843eef4d3ab1a25565c3..e666319d8472bd860442acacc16f595e3bb195f2 100644
+index 3d4271b1c8715b84930d63378865e40671995fb9..de4f525573f222426a693b4d28e15caf4a87a210 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -62,6 +62,7 @@ dependencies {
+@@ -59,6 +59,7 @@ dependencies {
  
      implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
  
diff --git a/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
index 7d17a323f6..cf21b606ab 100644
--- a/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add support for hex color codes in console
 Converts upstream's hex color code legacy format into actual hex color codes in the console.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e666319d8472bd860442acacc16f595e3bb195f2..cb7fa25b28ace6a06d581f300a3ec5d833e41d03 100644
+index de4f525573f222426a693b4d28e15caf4a87a210..149607e8c080b79a20d204382db69fde58c6b513 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -40,6 +40,7 @@ dependencies {
+@@ -37,6 +37,7 @@ dependencies {
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
      implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
diff --git a/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch b/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch
index 2b77495971..4c8cbfe8bd 100644
--- a/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch
+++ b/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add git branch and commit to manifest
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index cb7fa25b28ace6a06d581f300a3ec5d833e41d03..e9cdebd25bec965a52916ee09e358564d42777d0 100644
+index 149607e8c080b79a20d204382db69fde58c6b513..f7f10a029fca29ed131324dda8030bd15abcbead 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -76,6 +76,7 @@ tasks.jar {
+@@ -73,6 +73,7 @@ tasks.jar {
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
          val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
@@ -16,7 +16,7 @@ index cb7fa25b28ace6a06d581f300a3ec5d833e41d03..e9cdebd25bec965a52916ee09e358564
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
-@@ -85,6 +86,8 @@ tasks.jar {
+@@ -82,6 +83,8 @@ tasks.jar {
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Bukkit Team",
              "Multi-Release" to "true", // Paper
diff --git a/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch
index 7ff8d7e2b5..4bcf6a2a70 100644
--- a/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e9cdebd25bec965a52916ee09e358564d42777d0..cb1a931417073908be5c7aa1af710477775b3dbd 100644
+index f7f10a029fca29ed131324dda8030bd15abcbead..aa7fd467e703291756f66e8de2ba400b2cb81d0c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -62,6 +62,7 @@ dependencies {
+@@ -59,6 +59,7 @@ dependencies {
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
  
      implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation