Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-20 15:39:37 +00:00
Code Issues Releases Activity

1.19.4

Browse Source 
still WIP
This commit is contained in:
Dreeam
2023-03-22 10:06:35 -04:00
parent 4ac45c36f9
commit 8efb01c852
39 changed files with 250 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
patches/server/0037-Fix-build-system-issues.patch
View File

@@ -5,28 +5,23 @@ Subject: [PATCH] Fix build system issues
diff --git a/build.gradle.kts b/build.gradle.kts
index 1b4d00c5b5794b065737f0ca2e61ec8a79a5fa48..4edfa9998d160026765a35806fad2d959ce84de4 100644
index 63a819196ddcad8106c7358172176c41031c70cd..3ef66e60ef5c8645ed6b88328a33ef332bb1ea27 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -198,15 +198,14 @@ fun TaskContainer.registerRunTask(
systemProperty("gale.detect.thread.blocks", true) // Gale - base thread pool - watch for blocking base threads
val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
- val modifiedJvmArgs = jvmArgs ?: arrayListOf()
- modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G"))
+ minHeapSize = "${memoryGb}G"
+ maxHeapSize = "${memoryGb}G"
// Gale start - enable virtual threads for development runs
@@ -198,14 +198,8 @@ fun TaskContainer.registerRunTask(
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")
- modifiedJvmArgs.addAll(listOf("--add-opens=java.base/java.lang=ALL-UNNAMED"))
+ args("--enable-preview")
+ args(listOf("--add-opens=java.base/java.lang=ALL-UNNAMED"))
// Gale end - enable virtual threads for development runs
- // Gale end - enable virtual threads for development runs
- modifiedJvmArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support
- modifiedJvmArgs.add("-XX:+AllowRedefinitionToAddDeleteMethods") // Gale - base thread pool - watch for blocking base threads
- jvmArgs = modifiedJvmArgs
+ args("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support
+ args("-XX:+AllowRedefinitionToAddDeleteMethods") // Gale - base thread pool - watch for blocking base threads
+ args("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support // Leaf - Fix build system issues
+ args("-XX:+AllowRedefinitionToAddDeleteMethods") // Gale - base thread pool - watch for blocking base threads // Leaf - Fix build system issues
// Gale end - modify JVM args for development runs
doFirst {
workingDir.mkdirs()