Refactor variable names for clarity in Dev Command
All checks were successful
SteamWarCI Build successful
All checks were successful
SteamWarCI Build successful
This commit is contained in:
@ -80,7 +80,7 @@ class DevCommand : CliktCommand("dev") {
|
||||
setLogConfig(args)
|
||||
val version = findVersion(server) ?: throw CliktError("Unknown Server Version")
|
||||
val worldFile = world?.absolute()?.toFile() ?: File(serverDir, "devtempworld")
|
||||
val jarFile = jar?.absolutePath ?: JARS[server]?.let { VERSIONS[it] } ?: VERSIONS[version]
|
||||
val jarFile = jar?.absolutePath ?: additionalVersions[server]?.let { supportedVersionJars[it] } ?: supportedVersionJars[version]
|
||||
?: throw CliktError("Unknown Server Version")
|
||||
|
||||
if (!worldFile.exists()) {
|
||||
@ -115,7 +115,7 @@ class DevCommand : CliktCommand("dev") {
|
||||
}
|
||||
}
|
||||
|
||||
val OPENJ9_ARGS = arrayOf(
|
||||
val jvmDefaultParams = arrayOf(
|
||||
"-Xmx1G",
|
||||
"-Xgc:excessiveGCratio=80",
|
||||
"-Xsyslog:none",
|
||||
@ -128,9 +128,9 @@ class DevCommand : CliktCommand("dev") {
|
||||
"-XX:+ExitOnOutOfMemoryError"
|
||||
)
|
||||
|
||||
val JAVA17_ARGS = arrayOf("--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED")
|
||||
val jvmArgOverrides = arrayOf("--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED")
|
||||
|
||||
val VERSIONS = mapOf(
|
||||
val supportedVersionJars = mapOf(
|
||||
8 to "/jars/paper-1.8.8.jar",
|
||||
9 to "/jars/spigot-1.9.4.jar",
|
||||
10 to "/jars/paper-1.10.2.jar",
|
||||
@ -143,7 +143,7 @@ class DevCommand : CliktCommand("dev") {
|
||||
21 to "/jars/paper-1.21.6.jar"
|
||||
)
|
||||
|
||||
val JARS = mapOf(
|
||||
val additionalVersions = mapOf(
|
||||
"Tutorial" to 15,
|
||||
"Lobby" to 20
|
||||
)
|
||||
@ -168,8 +168,8 @@ class DevCommand : CliktCommand("dev") {
|
||||
if (isJava8(server)) "/usr/lib/jvm/openj9-8/bin/java" else "java",
|
||||
*jvmArgs.toTypedArray(),
|
||||
*args.toTypedArray(),
|
||||
*OPENJ9_ARGS,
|
||||
*(if (isJava8(server)) arrayOf() else JAVA17_ARGS),
|
||||
*jvmDefaultParams,
|
||||
*(if (isJava8(server)) arrayOf() else jvmArgOverrides),
|
||||
*(if (profile) arrayOf("-javaagent:/jars/LixfelsProfiler.jar=start") else arrayOf()),
|
||||
"-Xshareclasses:nonfatal,name=$server",
|
||||
"-jar",
|
||||
|
||||
Reference in New Issue
Block a user