diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index fe0ad0cf3..deeac0965 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -247,13 +247,27 @@ PZ_JVM_FLAGS = ("-XX:+UseG1GC", "-XX:TieredStopAtLevel=1") def zomboid_vm_args(args): - updated = [arg for arg in args if arg != "-XX:+UseZGC"] + updated = [arg for arg in args if not re.fullmatch(r"-XX:\+Use\w*GC", arg) or arg == "-XX:+UseG1GC"] for flag in PZ_JVM_FLAGS: if flag not in updated: updated.append(flag) return updated +def zomboid_rewrite(node): + changed = False + if isinstance(node, dict): + for key, value in node.items(): + if key == "vmArgs" and isinstance(value, list) and all(isinstance(arg, str) for arg in value): + updated = zomboid_vm_args(value) + if updated != value: + node[key] = updated + changed = True + elif isinstance(value, dict): + changed |= zomboid_rewrite(value) + return changed + + def project_zomboid_jvm(command): if len(command) <= 2: return @@ -264,13 +278,8 @@ def project_zomboid_jvm(command): try: with settings.open(encoding="utf-8-sig") as source: data = json.load(source) - args = data.get("vmArgs") - if not isinstance(args, list) or not all(isinstance(arg, str) for arg in args): + if not zomboid_rewrite(data): return - updated = zomboid_vm_args(args) - if updated == args: - return - data["vmArgs"] = updated handle, staged = tempfile.mkstemp(prefix=".droiddeck-", dir=settings.parent) try: with os.fdopen(handle, "w", encoding="utf-8") as target: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index c07a37371..6d51eef0d 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -2047,6 +2047,17 @@ class ProjectZomboidJvmTest(unittest.TestCase): MODULE["project_zomboid_jvm"](command) self.assertEqual(settings.read_text(), before) + def test_other_collectors_and_windows_specific_lists_are_rewritten(self): + with tempfile.TemporaryDirectory() as tmp: + settings, command = self.launch(tmp) + settings.write_text(json.dumps({"vmArgs": ["-XX:+UseParallelGC", "-Xmx1g"], + "windows": {"10.0.17134": {"vmArgs": ["-XX:+UseZGC", "-XX:+UseG1GC"]}}})) + MODULE["project_zomboid_jvm"](command) + data = json.loads(settings.read_text()) + flags = ["-XX:+UseG1GC", "-XX:TieredStopAtLevel=1"] + self.assertEqual(data["vmArgs"], ["-Xmx1g"] + flags) + self.assertEqual(data["windows"]["10.0.17134"]["vmArgs"], flags) + def test_other_games_and_unreadable_files_are_left_alone(self): with tempfile.TemporaryDirectory() as tmp: settings, command = self.launch(tmp, stem="Other")