morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minecraft: Stop Using Utils.get_options (#4879)

Browse Source
This commit is contained in:
FlitPix
2025-05-22 09:42:54 -04:00
committed by GitHub
parent 8cc6f10634
commit c5e768ffe3
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MinecraftClient.py
View File

@@ -14,6 +14,7 @@ import requests
import Utils import Utils
from Utils import is_windows from Utils import is_windows
from settings import get_settings
atexit.register(input, "Press enter to exit.") atexit.register(input, "Press enter to exit.")
@@ -147,9 +148,11 @@ def find_jdk(version: str) -> str:
if os.path.isfile(jdk_exe): if os.path.isfile(jdk_exe):
return jdk_exe return jdk_exe
else: else:
jdk_exe = shutil.which(options["minecraft_options"].get("java", "java")) jdk_exe = shutil.which(options.java)
if not jdk_exe: if not jdk_exe:
raise Exception("Could not find Java. Is Java installed on the system?") jdk_exe = shutil.which("java") # try to fall back to system java
if not jdk_exe:
raise Exception("Could not find Java. Is Java installed on the system?")
return jdk_exe return jdk_exe
@@ -285,8 +288,8 @@ if __name__ == '__main__':
# Change to executable's working directory # Change to executable's working directory
os.chdir(os.path.abspath(os.path.dirname(sys.argv[0]))) os.chdir(os.path.abspath(os.path.dirname(sys.argv[0])))
options = Utils.get_options() options = get_settings().minecraft_options
channel = args.channel or options["minecraft_options"]["release_channel"] channel = args.channel or options.release_channel
apmc_data = None apmc_data = None
data_version = args.data_version or None data_version = args.data_version or None
@@ -299,8 +302,8 @@ if __name__ == '__main__':
versions = get_minecraft_versions(data_version, channel) versions = get_minecraft_versions(data_version, channel)
forge_dir = options["minecraft_options"]["forge_directory"] forge_dir = options.forge_directory
max_heap = options["minecraft_options"]["max_heap_size"] max_heap = options.max_heap_size
forge_version = args.forge or versions["forge"] forge_version = args.forge or versions["forge"]
java_version = args.java or versions["java"] java_version = args.java or versions["java"]
mod_url = versions["url"] mod_url = versions["url"]

8
worlds/minecraft/__init__.py
View File

@@ -27,9 +27,15 @@ class MinecraftSettings(settings.Group):
any games played on the "beta" channel have a high likelihood of no longer working on the "release" channel. any games played on the "beta" channel have a high likelihood of no longer working on the "release" channel.
""" """
forge_directory: ForgeDirectory = ForgeDirectory("Minecraft Forge server") class JavaExecutable(settings.OptionalUserFilePath):
"""
Path to Java executable. If not set, will attempt to fall back to Java system installation.
"""
forge_directory: ForgeDirectory = ForgeDirectory("Minecraft NeoForge server")
max_heap_size: str = "2G" max_heap_size: str = "2G"
release_channel: ReleaseChannel = ReleaseChannel("release") release_channel: ReleaseChannel = ReleaseChannel("release")
java: JavaExecutable = JavaExecutable("")
class MinecraftWebWorld(WebWorld): class MinecraftWebWorld(WebWorld):