diff --git a/worlds/minecraft/Locations.py b/worlds/minecraft/Locations.py index aff4c403..0cc75ce5 100644 --- a/worlds/minecraft/Locations.py +++ b/worlds/minecraft/Locations.py @@ -1,4 +1,4 @@ -from BaseClasses import Region, Entrance, Location, MultiWorld, Item +from BaseClasses import Location import typing class AdvData(typing.NamedTuple): diff --git a/worlds/minecraft/Regions.py b/worlds/minecraft/Regions.py index 75469271..91d21ca3 100644 --- a/worlds/minecraft/Regions.py +++ b/worlds/minecraft/Regions.py @@ -1,5 +1,5 @@ -def link_minecraft_structures(world, player: int): +def link_minecraft_structures(world, player): # Link mandatory connections first for (exit, region) in mandatory_connections: diff --git a/worlds/minecraft/Rules.py b/worlds/minecraft/Rules.py index 4a1316b6..b1c4da8f 100644 --- a/worlds/minecraft/Rules.py +++ b/worlds/minecraft/Rules.py @@ -1,9 +1,8 @@ from ..generic.Rules import set_rule from .Locations import exclusion_table, events_table -from BaseClasses import Region, Entrance, Location, MultiWorld, Item from Options import AdvancementGoal -def set_rules(world: MultiWorld, player: int): +def set_rules(world, player): def reachable_locations(state): postgame_advancements = set(exclusion_table['postgame'].keys()) diff --git a/worlds/minecraft/__init__.py b/worlds/minecraft/__init__.py index 4e27215f..2f74447f 100644 --- a/worlds/minecraft/__init__.py +++ b/worlds/minecraft/__init__.py @@ -73,13 +73,14 @@ class MinecraftWorld(World): def generate_output(self): - import base64, json + import json + from base64 import b64encode from Utils import output_path data = self._get_mc_data() filename = f"AP_{self.world.seed_name}_P{self.player}_{self.world.get_player_names(self.player)}.apmc" with open(output_path(filename), 'wb') as f: - f.write(base64.b64encode(bytes(json.dumps(data), 'utf-8'))) + f.write(b64encode(bytes(json.dumps(data), 'utf-8'))) def fill_slot_data(self):