Minecraft: Update to new options system. (#3765)

* Move to new options system.
switch to using self.random
reformat rules file.

* further reformats

* fix tests to use new options system.

* fix slot data to not use self.multiworld

* I hate python

* new starting_items docstring to prepare for 1.20.5+ item components.
fix invalid json being output to starting_items

* more typing fixes.

* stupid quotes around type declarations

* removed unused variable in ItemPool.py
change null check in Structures.py

* update rules "self" variable to a "world: MinecraftWorld" variable

* get key, and not value for required bosses.

worlds/minecraft/__init__.py

@@ -9,7 +9,7 @@ from BaseClasses import Region, Entrance, Item, Tutorial, ItemClassification, Lo
 from worlds.AutoWorld import World, WebWorld
 
 from . import Constants
-from .Options import minecraft_options
+from .Options import MinecraftOptions
 from .Structures import shuffle_structures
 from .ItemPool import build_item_pool, get_junk_item_names
 from .Rules import set_rules
@@ -83,8 +83,9 @@ class MinecraftWorld(World):
     structures, and materials to create a portal to another world. Defeat the Ender Dragon, and claim
     victory!
     """
-    game: str = "Minecraft"
-    option_definitions = minecraft_options
+    game = "Minecraft"
+    options_dataclass = MinecraftOptions
+    options: MinecraftOptions
     settings: typing.ClassVar[MinecraftSettings]
     topology_present = True
     web = MinecraftWebWorld()
@@ -95,20 +96,20 @@ class MinecraftWorld(World):
     def _get_mc_data(self) -> Dict[str, Any]:
         exits = [connection[0] for connection in Constants.region_info["default_connections"]]
         return {
-            'world_seed': self.multiworld.per_slot_randoms[self.player].getrandbits(32),
+            'world_seed': self.random.getrandbits(32),
             'seed_name': self.multiworld.seed_name,
-            'player_name': self.multiworld.get_player_name(self.player),
+            'player_name': self.player_name,
             'player_id': self.player,
             'client_version': client_version,
             'structures': {exit: self.multiworld.get_entrance(exit, self.player).connected_region.name for exit in exits},
-            'advancement_goal': self.multiworld.advancement_goal[self.player].value,
-            'egg_shards_required': min(self.multiworld.egg_shards_required[self.player].value,
-                                       self.multiworld.egg_shards_available[self.player].value),
-            'egg_shards_available': self.multiworld.egg_shards_available[self.player].value,
-            'required_bosses': self.multiworld.required_bosses[self.player].current_key,
-            'MC35': bool(self.multiworld.send_defeated_mobs[self.player].value),
-            'death_link': bool(self.multiworld.death_link[self.player].value),
-            'starting_items': str(self.multiworld.starting_items[self.player].value),
+            'advancement_goal': self.options.advancement_goal.value,
+            'egg_shards_required': min(self.options.egg_shards_required.value,
+                                       self.options.egg_shards_available.value),
+            'egg_shards_available': self.options.egg_shards_available.value,
+            'required_bosses': self.options.required_bosses.current_key,
+            'MC35': bool(self.options.send_defeated_mobs.value),
+            'death_link': bool(self.options.death_link.value),
+            'starting_items': json.dumps(self.options.starting_items.value),
             'race': self.multiworld.is_race,
         }
 
@@ -129,7 +130,7 @@ class MinecraftWorld(World):
         loc.place_locked_item(self.create_event_item(event_name))
         region.locations.append(loc)
 
-    def create_event_item(self, name: str) -> None:
+    def create_event_item(self, name: str) -> Item:
         item = self.create_item(name)
         item.classification = ItemClassification.progression
         return item
@@ -176,15 +177,10 @@ class MinecraftWorld(World):
             f.write(b64encode(bytes(json.dumps(data), 'utf-8')))
 
     def fill_slot_data(self) -> dict:
-        slot_data = self._get_mc_data()
-        for option_name in minecraft_options:
-            option = getattr(self.multiworld, option_name)[self.player]
-            if slot_data.get(option_name, None) is None and type(option.value) in {str, int}:
-                slot_data[option_name] = int(option.value)
-        return slot_data
+        return self._get_mc_data()
 
     def get_filler_item_name(self) -> str:
-        return get_junk_item_names(self.multiworld.random, 1)[0]
+        return get_junk_item_names(self.random, 1)[0]
 
 
 class MinecraftLocation(Location):