Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago into minecraft

test/hollow_knight/__init__.py

@@ -1,3 +1,4 @@
+from worlds.hk import Options
 from BaseClasses import MultiWorld
 from worlds.hk.Regions import create_regions
 from worlds.hk import gen_hollow
@@ -9,7 +10,6 @@ class TestVanilla(TestBase):
     def setUp(self):
         self.world = MultiWorld(1)
         self.world.game[1] = "Hollow Knight"
-        import Options
         for hk_option in Options.hollow_knight_randomize_options:
             setattr(self.world, hk_option, {1: True})
         for hk_option, option in Options.hollow_knight_skip_options.items():

test/minecraft/TestMinecraft.py

@@ -1,3 +1,4 @@
+import worlds.minecraft.Options
 from test.TestBase import TestBase
 from BaseClasses import MultiWorld
 from worlds import AutoWorld