Simplify development run JVM arguments

patches/server/0004-Modify-JVM-args-for-development-runs.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Tue, 21 Mar 2023 17:45:34 +0100
-Subject: [PATCH] Modify JVM args for development runs
-
-License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-Gale - https://galemc.org
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 0b3f1508c2d461a11cf26e9e298e15e3650daccf..9c65dd95153ffa1f2ffafb52b28c0912bbc46766 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -173,6 +173,10 @@ fun TaskContainer.registerRunTask(
-     val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
-     minHeapSize = "${memoryGb}G"
-     maxHeapSize = "${memoryGb}G"
-+    // Gale start - modify JVM args for development runs
-+    val modifiedJvmArgs = ArrayList(jvmArgs) ?: arrayListOf()
-+    jvmArgs = modifiedJvmArgs
-+    // Gale end - modify JVM args for development runs
- 
-     doFirst {
-         workingDir.mkdirs()

patches/server/0004-Use-default-Java-installation-for-development-runs.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9c65dd95153ffa1f2ffafb52b28c0912bbc46766..ed232200841977a988814849e4068315710cbe0a 100644
+index 0b3f1508c2d461a11cf26e9e298e15e3650daccf..1f7d0aa2d36b59c23a04e94dc117da987bc1a0b2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -150,6 +150,15 @@ fun TaskContainer.registerRunTask(

patches/server/0005-Enable-virtual-threads-for-development-runs.patch

@@ -7,17 +7,17 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ed232200841977a988814849e4068315710cbe0a..0b4f6466a01fe114a265068c2b4664d5ad4d71e6 100644
+index 1f7d0aa2d36b59c23a04e94dc117da987bc1a0b2..6394d18f32d190e4eee34c40c1aa9ffe65662e6b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -184,6 +184,10 @@ fun TaskContainer.registerRunTask(
+@@ -182,6 +182,10 @@ fun TaskContainer.registerRunTask(
+     val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
+     minHeapSize = "${memoryGb}G"
      maxHeapSize = "${memoryGb}G"
-     // Gale start - modify JVM args for development runs
-     val modifiedJvmArgs = ArrayList(jvmArgs) ?: arrayListOf()
 +    // Gale start - enable virtual threads for development runs
-+    modifiedJvmArgs.add("--enable-preview")
++    jvmArgs("--enable-preview")
-+    modifiedJvmArgs.addAll(listOf("--add-opens=java.base/java.lang=ALL-UNNAMED"))
++    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
 +    // Gale end - enable virtual threads for development runs
-     jvmArgs = modifiedJvmArgs
-     // Gale end - modify JVM args for development runs
  
+     doFirst {
+         workingDir.mkdirs()

patches/server/0006-Gale-branding-changes.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0b4f6466a01fe114a265068c2b4664d5ad4d71e6..e71c29541c2ceaf49a256f2648ac15cf832bb629 100644
+index 6394d18f32d190e4eee34c40c1aa9ffe65662e6b..7d3b8f3c7616b5db72a6fccb51e5543a0e096125 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -78,7 +78,7 @@ tasks.jar {

patches/server/0046-SIMD-support.patch

@@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e71c29541c2ceaf49a256f2648ac15cf832bb629..bee1ab6d6f0ce42ac98e9c47ee69f3ea1f874097 100644
+index 7d3b8f3c7616b5db72a6fccb51e5543a0e096125..394b5044090c1c7b00b30036e4b8be4a6ac58ed1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -63,6 +63,7 @@ tasks.withType<JavaCompile> {
@@ -24,14 +24,14 @@ index e71c29541c2ceaf49a256f2648ac15cf832bb629..bee1ab6d6f0ce42ac98e9c47ee69f3ea
  }
  // Gale end - hide irrelevant compilation warnings
  
-@@ -188,6 +189,7 @@ fun TaskContainer.registerRunTask(
+@@ -186,6 +187,7 @@ fun TaskContainer.registerRunTask(
-     modifiedJvmArgs.add("--enable-preview")
+     jvmArgs("--enable-preview")
-     modifiedJvmArgs.addAll(listOf("--add-opens=java.base/java.lang=ALL-UNNAMED"))
+     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
      // Gale end - enable virtual threads for development runs
-+    modifiedJvmArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support
++    jvmArgs("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support
-     jvmArgs = modifiedJvmArgs
-     // Gale end - modify JVM args for development runs
  
+     doFirst {
+         workingDir.mkdirs()
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 index 985f1a50438b325e33fba5d07e26519171504aab..54458601bbda3a4142c09f717e3b87a079ce096f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java