Merge pull request #40 from Greelan/pz

Project Zomboid: Allow Java GC algo selection on Windows
This commit is contained in:
PhonicUK 2022-01-18 21:23:04 +00:00 committed by GitHub
commit 9b51cb0b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions

View File

@ -18,7 +18,7 @@ App.ExecutableWin=380870\jre64\bin\java.exe
App.ExecutableLinux=380870/ProjectZomboid64 App.ExecutableLinux=380870/ProjectZomboid64
App.WorkingDir=380870 App.WorkingDir=380870
App.LinuxCommandLineArgs=-Dzomboid.steam={{SteamInt}} -Duser.home=./ -Xmx{{MaxMemory}}m {{CustomJavaArgs}} -- App.LinuxCommandLineArgs=-Dzomboid.steam={{SteamInt}} -Duser.home=./ -Xmx{{MaxMemory}}m {{CustomJavaArgs}} --
App.WindowsCommandLineArgs=-Djava.awt.headless=true -Dzomboid.znetlog=1 -Dzomboid.steam={{SteamInt}} -Duser.home=./ -Xmx{{MaxMemory}}m -XX:+UseZGC -XX:-CreateCoredumpOnCrash -XX:-OmitStackTraceInFastThrow -Djava.library.path=natives/;natives/win64/;. {{CustomJavaArgs}} -cp java/*;java/ zombie.network.GameServer -statistic 0 -- App.WindowsCommandLineArgs=-Djava.awt.headless=true -Dzomboid.znetlog=1 -Dzomboid.steam={{SteamInt}} -Duser.home=./ -Xmx{{MaxMemory}}m {{JavaGCAlgo}} -XX:-CreateCoredumpOnCrash -XX:-OmitStackTraceInFastThrow -Djava.library.path=natives/;natives/win64/;. {{CustomJavaArgs}} -cp java/*;java/ zombie.network.GameServer -statistic 0 --
App.CommandLineArgs={{$PlatformArgs}} -port {{$ApplicationPort1}} -steamport1 {{$ApplicationPort2}} -steamport2 {{$ApplicationPort3}} {{CustomServerArgs}} {{$FormattedArgs}} App.CommandLineArgs={{$PlatformArgs}} -port {{$ApplicationPort1}} -steamport1 {{$ApplicationPort2}} -steamport2 {{$ApplicationPort3}} {{CustomServerArgs}} {{$FormattedArgs}}
App.AppSettings={} App.AppSettings={}
App.EnvironmentVariables={"PATH":"./jre64/bin:%PATH%","LD_LIBRARY_PATH":"./linux64:./natives:./:./jre64/lib/amd64:%LD_LIBRARY_PATH%","LD_PRELOAD":"./jre64/lib/libjsig.so","PZ_CLASSPATH":"java/*;java/","SteamAppId":"108600"} App.EnvironmentVariables={"PATH":"./jre64/bin:%PATH%","LD_LIBRARY_PATH":"./linux64:./natives:./:./jre64/lib/amd64:%LD_LIBRARY_PATH%","LD_PRELOAD":"./jre64/lib/libjsig.so","PZ_CLASSPATH":"java/*;java/","SteamAppId":"108600"}

View File

@ -55,6 +55,22 @@
"IncludeInCommandLine": false, "IncludeInCommandLine": false,
"DefaultValue": "4096" "DefaultValue": "4096"
}, },
{
"DisplayName": "Java Garbage Collection Algorithm (Windows)",
"Category": "Server Settings",
"Description": "Default Java garbage collection algorithm is ZGC, but G1GC can be selected for older Windows versions that cannot use ZGC",
"Keywords": "garbage,collection,algorithm",
"FieldName": "JavaGCAlgo",
"InputType": "enum",
"IsFlagArgument": false,
"ParamFieldName": "JavaGCAlgo",
"IncludeInCommandLine": false,
"DefaultValue": "-XX:+UseZGC",
"EnumValues": {
"-XX:+UseZGC": "ZGC Algorithm (default)",
"-XX:+UseG1GC": "G1GC Algorithm"
}
},
{ {
"DisplayName": "Additional Java Startup Parameters", "DisplayName": "Additional Java Startup Parameters",
"Category": "Server Settings", "Category": "Server Settings",