core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update runServer gradle properties

This commit is contained in:
Jason Penilla 2021-11-23 17:09:12 -08:00 committed by MiniDigger | Martin
parent 9ae92d26b8
commit 7665ae86d6
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/removed/1.18/0228-Optimize-IntIdentityHashBiMiap-nextId.patch → patches/removed/1.18/No longer needed/0228-Optimize-IntIdentityHashBiMiap-nextId.patch
View File

@ -7,8 +7,8 @@ Optimizes CrudeIncrementalIntIdentityHashBiMap#nextId()
This is a frequent hotspot for world loading/saving. This is a frequent hotspot for world loading/saving.
1.18 todo: seems like the bitset is too small now? removing this patch fixed 1.18 note: seems like the bitset is too small now? removing this patch fixed
lots of issues related to synchedentitydata and structure gen lots of issues related to synchedentitydata and structure gen. when asked, Tux said "nuke it"
diff --git a/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java b/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java diff --git a/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java b/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java
index dc7528b41aa9a55807a2b3e33d5668e1be681e79..a002218caed08bf4a4072d934e1094c22ee35534 100644 index dc7528b41aa9a55807a2b3e33d5668e1be681e79..a002218caed08bf4a4072d934e1094c22ee35534 100644

26
patches/server/0001-Setup-Gradle-project.patch
View File

@ -28,10 +28,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
+/.factorypath +/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..273746fe476a9a09ebca01c6ecd814b70fe1b4c2 index 0000000000000000000000000000000000000000..a19e05379d81e6f0bb0a78bc734a1cfdd355dc74
--- /dev/null --- /dev/null
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +1,145 @@ @@ -0,0 +1,153 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import io.papermc.paperweight.util.* +import io.papermc.paperweight.util.*
@ -130,29 +130,37 @@ index 0000000000000000000000000000000000000000..273746fe476a9a09ebca01c6ecd814b7
+} +}
+ +
+fun TaskContainer.registerRunTask( +fun TaskContainer.registerRunTask(
+ name: String, block: JavaExec.() -> Unit + name: String,
+ block: JavaExec.() -> Unit
+): TaskProvider<JavaExec> = register<JavaExec>(name) { +): TaskProvider<JavaExec> = register<JavaExec>(name) {
+ group = "paper" + group = "paper"
+ standardInput = System.`in` + standardInput = System.`in`
+ workingDir = rootProject.layout.projectDirectory.dir( + workingDir = rootProject.layout.projectDirectory
+ providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run") + .dir(providers.gradleProperty("paper.runWorkDir").forUseAtConfigurationTime().getOrElse("run"))
+ ).get().asFile + .asFile
+ javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
+ +
+ if (rootProject.childProjects["test-plugin"] != null) { + if (rootProject.childProjects["test-plugin"] != null) {
+ val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile } + val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
+ inputs.file(testPluginJar) + inputs.file(testPluginJar)
+ // args("-add-plugin=${testPluginJar.get().asFile.absolutePath}") // todo - uncomment + args("-add-plugin=${testPluginJar.get().asFile.absolutePath}")
+ } + }
+ +
+ args("--nogui") + args("--nogui")
+ systemProperty("net.kyori.adventure.text.warnWhenLegacyFormattingDetected", true) + systemProperty("net.kyori.adventure.text.warnWhenLegacyFormattingDetected", true)
+ if (project.hasProperty("disableWatchdog")) { + if (providers.gradleProperty("paper.runDisableWatchdog").getOrElse("false") == "true") {
+ systemProperty("disable.watchdog", true) + systemProperty("disable.watchdog", true)
+ } + }
+
+ val memoryGb = providers.gradleProperty("paper.runMemoryGb").forUseAtConfigurationTime().getOrElse("2")
+ val modifiedJvmArgs = jvmArgs ?: arrayListOf()
+ modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G"))
+ jvmArgs = modifiedJvmArgs
+
+ doFirst { + doFirst {
+ workingDir.mkdirs() + workingDir.mkdirs()
+ } + }
+ javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project)) +
+ block(this) + block(this)
+} +}
+ +

2
settings.gradle.kts
View File

@ -10,7 +10,7 @@ rootProject.name = "Paper"
include( include(
"Paper-API", "Paper-API",
"Paper-Server", "Paper-Server",
"Paper-MojangAPI", "Paper-MojangAPI",
) )
val testPlugin = file("test-plugin.settings.gradle.kts") val testPlugin = file("test-plugin.settings.gradle.kts")