Merge branch 'master' into plugin-management-system

This commit is contained in:
Charles Le Maux 2024-09-16 01:30:06 +02:00
commit c057e33713

View File

@ -35,7 +35,7 @@ class MinecraftServerManager:
" -XX:MaxTenuringThreshold=1 -Daikars.new.flags=true" " -XX:MaxTenuringThreshold=1 -Daikars.new.flags=true"
" -Dusing.aikars.flags=https://mcutils.com") " -Dusing.aikars.flags=https://mcutils.com")
java: str = f"/usr/lib/jvm/java-{get_sdk_version(version)}-openjdk/bin/java" java: str = f"/usr/lib/jvm/java-{get_sdk_version(version)}-openjdk-amd64/bin/java"
command = f"{java} -Xmx{memory_size} {reg_flags} -jar {jar_file} --nogui" command = f"{java} -Xmx{memory_size} {reg_flags} -jar {jar_file} --nogui"
if modded: if modded:
@ -170,8 +170,9 @@ def version_range_checker(*ranges: tuple[str, str, str], default_sdk: str = "jav
return check_version return check_version
get_sdk_version: Callable[[str], str] = version_range_checker(("1.0", "1.15.2", "11"), get_sdk_version: Callable[[str], str] = version_range_checker(("1.0", "1.13.2", "8"),
("1.16.1", "1.18.1", "17"), ("1.14.1", "1.16.5", "11"),
("1.17.1", "1.18.1", "17"),
default_sdk="21") default_sdk="21")
if __name__ == "__main__": if __name__ == "__main__":