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

Minecraft fixes (#388)

Browse Source
This commit is contained in:
black-sliver
2022-04-02 04:49:27 +02:00
committed by GitHub
parent 938ab32cda
commit a93b3d79aa
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Launcher.py
View File

@@ -58,9 +58,9 @@ def open_patch():
suffixes += c.file_identifier.suffixes if c.type == Type.CLIENT and \
isinstance(c.file_identifier, SuffixIdentifier) else []
filename = tkinter.filedialog.askopenfilename(filetypes=(('Patches', ' '.join(suffixes)),))
file, component = identify(filename)
file, _, component = identify(filename)
if file and component:
subprocess.Popen([*get_exe(component), file])
launch([*get_exe(component), file], component.cli)
def browse_files():
@@ -142,7 +142,7 @@ components: Iterable[Component] = (
# Factorio
Component('Factorio Client', 'FactorioClient'),
# Minecraft
Component('Minecraft Client', 'MinecraftClient', icon='mcicon',
Component('Minecraft Client', 'MinecraftClient', icon='mcicon', cli=True,
file_identifier=SuffixIdentifier('.apmc')),
# Ocarina of Time
Component('OoT Client', 'OoTClient',
@@ -165,11 +165,11 @@ icon_paths = {
def identify(path: Union[None, str]):
if path is None:
return None, None
return None, None, None
for component in components:
if component.handles_file(path):
return path, component.script_name
return (None, None) if '/' in path or '\\' in path else (None, path)
return path, component.script_name, component
return (None, None, None) if '/' in path or '\\' in path else (None, path, None)
def get_exe(component: Union[str, Component]) -> Optional[Sequence[str]]:
@@ -284,7 +284,7 @@ def main(args: Optional[Union[argparse.Namespace, dict]] = None):
args = {}
if "Patch|Game|Component" in args:
file, component = identify(args["Patch|Game|Component"])
file, component, _ = identify(args["Patch|Game|Component"])
if file:
args['file'] = file
if component: