Merge branch 'client-cleanup' into newmain

Author: ReverM

AHITClient.py

@@ -389,10 +389,10 @@ def store_data_package_for_checksum(game: str, data: typing.Dict[str, Any]) -> N
 
 
 def get_default_adjuster_settings(game_name: str) -> Namespace:
-    import LttPAdjuster
+    from worlds.alttp import Adjuster
     adjuster_settings = Namespace()
-    if game_name == LttPAdjuster.GAME_ALTTP:
-        return LttPAdjuster.get_argparser().parse_known_args(args=[])[0]
+    if game_name == Adjuster.GAME_ALTTP:
+        return Adjuster.get_argparser().parse_known_args(args=[])[0]
 
     return adjuster_settings
 

KH1Client.py

@@ -8,10 +8,10 @@
 
 def update_sprites_lttp():
     from tkinter import Tk
-    from LttPAdjuster import get_image_for_sprite
-    from LttPAdjuster import BackgroundTaskProgress
-    from LttPAdjuster import BackgroundTaskProgressNullWindow
-    from LttPAdjuster import update_sprites
+    from worlds.alttp.Adjuster import get_image_for_sprite
+    from worlds.alttp.Adjuster import BackgroundTaskProgress
+    from worlds.alttp.Adjuster import BackgroundTaskProgressNullWindow
+    from worlds.alttp.Adjuster import update_sprites
 
     # Target directories
     input_dir = user_path("data", "sprites", "alttpr")

KH2Client.py

@@ -218,25 +218,6 @@ def install_apworld(apworld_path: str = "") -> None:
               description="Install an APWorld to play games not included with Archipelago by default."),
     Component('Text Client', 'CommonClient', 'ArchipelagoTextClient', func=launch_textclient,
               description="Connect to a multiworld using the text client."),
-    Component('Links Awakening DX Client', 'LinksAwakeningClient',
-              file_identifier=SuffixIdentifier('.apladx')),
-    Component('LttP Adjuster', 'LttPAdjuster'),
-    # Ocarina of Time
-    Component('OoT Client', 'OoTClient',
-              file_identifier=SuffixIdentifier('.apz5')),
-    Component('OoT Adjuster', 'OoTAdjuster'),
-    # TLoZ
-    Component('Zelda 1 Client', 'Zelda1Client', file_identifier=SuffixIdentifier('.aptloz')),
-    # ChecksFinder
-    Component('ChecksFinder Client', 'ChecksFinderClient'),
-    # Starcraft 2
-    Component('Starcraft 2 Client', 'Starcraft2Client'),
-    # Zillion
-    Component('Zillion Client', 'ZillionClient',
-              file_identifier=SuffixIdentifier('.apzl')),
-
-    #MegaMan Battle Network 3
-    Component('MMBN3 Client', 'MMBN3Client', file_identifier=SuffixIdentifier('.apbn3'))
 ]
 
 

Starcraft2Client.py

@@ -473,7 +473,7 @@ async def patch_and_run_game(patch_file, ctx):
     async_start(run_game(comp_path))
 
 
-if __name__ == '__main__':
+def main(*launch_args: str):
 
     Utils.init_logging("AdventureClient")
 
@@ -483,7 +483,7 @@ async def main():
                             help='Path to an ADVNTURE.BIN rom file')
         parser.add_argument('port', default=17242, type=int, nargs="?",
                             help='port for adventure_connector connection')
-        args = parser.parse_args()
+        args = parser.parse_args(launch_args)
 
         ctx = AdventureContext(args.connect, args.password)
         ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop")

Utils.py

@@ -8,7 +8,7 @@
 from BaseClasses import Item, ItemClassification, MultiWorld, Tutorial, LocationProgressType
 from Utils import __version__
 from worlds.AutoWorld import WebWorld, World
-from worlds.LauncherComponents import Component, components, SuffixIdentifier
+from worlds.LauncherComponents import Component, components, SuffixIdentifier, launch, Type
 from .Items import item_table, ItemData, nothing_item_id, event_table, AdventureItem, standard_item_max
 from .Locations import location_table, base_location_id, LocationData, get_random_room_in_regions
 from .Offsets import static_item_data_location, items_ram_start, static_item_element_size, item_position_table, \
@@ -19,8 +19,14 @@
 from .Rom import get_base_rom_bytes, get_base_rom_path, AdventureDeltaPatch, apply_basepatch, AdventureAutoCollectLocation
 from .Rules import set_rules
 
-# Adventure
-components.append(Component('Adventure Client', 'AdventureClient', file_identifier=SuffixIdentifier('.apadvn')))
+
+def launch_client(*args):
+    from .Client import main
+    launch(main, name="AdventureClient", args=args)
+
+
+components.append(Component(display_name='Adventure Client', func=launch_client, component_type=Type.CLIENT,
+                            file_identifier=SuffixIdentifier('.apadvn')))
 
 
 class AdventureSettings(settings.Group):