mcserver-cli 4.2.0__py3-none-any.whl → 4.3.0__py3-none-any.whl

mcserver/__init__.py

@@ -1 +1 @@
-__version__ = "4.2.0"
+__version__ = "4.3.0"

mcserver/cli.py

@@ -1,115 +1,119 @@
-def main() -> int:
-    import argparse
-    import sys
-    from types import FunctionType
-
-    from . import __version__
-    from .modrinth.shared import search_sort_index
-    from .shared import loader_list
-
-    def bound_int(min_integer: int, max_integer: int | None = None) -> FunctionType:
-        def parse(cli_string: str) -> int:
-            try:
-                integer = int(cli_string)
-            except ValueError:
-                raise argparse.ArgumentTypeError(f"{cli_string} is not an integer")
-
-            if integer < min_integer:
-                raise argparse.ArgumentTypeError(
-                    f"{integer} must be higher than or equal to {min_integer}"
-                )
-            if max_integer is not None and integer > max_integer:
-                raise argparse.ArgumentTypeError(
-                    f"{integer} must be between {min_integer} and {max_integer} (inclusive)"
-                )
-            return integer
-
-        return parse
-
-    def command_function(args: argparse.Namespace) -> int:
-        command_name: str = args.command_name
-
-        match command_name:
-            case "add":
-                from .commands import add
-
-                return add(args)
-            case "import":
-                from .commands import import_setup
-
-                return import_setup(args)
-            case "help":
-                from .commands import print_help
-
-                return print_help(args)
-            case "init":
-                from .commands import init
-
-                return init(args)
-            case "list":
-                from .commands import list_projects
-
-                return list_projects(args)
-            case "op_grant":
-                from .commands import op_grant
-
-                return op_grant(args)
-            case "op_list":
-                from .commands import op_list
-
-                return op_list(args)
-            case "op_revoke":
-                from .commands import op_revoke
-
-                return op_revoke(args)
-            case "remove":
-                from .commands import remove_projects
-
-                return remove_projects(args)
-            case "search":
-                from .commands import search
-
-                return search(args)
-            case "show":
-                from .commands import show
-
-                return show(args)
-            case "start":
-                from .commands import start
-
-                return start(args)
-            case "status":
-                from .commands import server_status
-
-                return server_status(args)
-            case "stop":
-                from .commands import stop
-
-                return stop(args)
-            case "update":
-                from .commands import update_projects
-
-                return update_projects(args)
-            case "whitelist_add":
-                from .commands import whitelist_add
-
-                return whitelist_add(args)
-            case "whitelist_list":
-                from .commands import whitelist_list
-
-                return whitelist_list(args)
-            case "whitelist_remove":
-                from .commands import whitelist_remove
-
-                return whitelist_remove(args)
-            case _:
-                import logging as log
-
-                log.error(f"Unknown command: {command_name}")
-                return 1
+import argparse
+import sys
+from types import FunctionType
 
-    # Parser Setup
+from . import __version__
+from .modrinth.shared import search_sort_index
+from .shared import loader_list
+
+
+def bound_int(min_integer: int, max_integer: int | None = None) -> FunctionType:
+    def parse(cli_string: str) -> int:
+        try:
+            integer = int(cli_string)
+        except ValueError:
+            raise argparse.ArgumentTypeError(f"{cli_string} is not an integer")
+
+        if integer < min_integer:
+            raise argparse.ArgumentTypeError(
+                f"{integer} must be higher than or equal to {min_integer}"
+            )
+        if max_integer is not None and integer > max_integer:
+            raise argparse.ArgumentTypeError(
+                f"{integer} must be between {min_integer} and {max_integer} (inclusive)"
+            )
+        return integer
+
+    return parse
+
+
+def command_function(args: argparse.Namespace) -> int:
+    command_name: str = args.command_name
+
+    match command_name:
+        case "add":
+            from .commands import add_projects
+
+            return add_projects(args)
+        case "import":
+            from .commands import import_setup
+
+            return import_setup(args)
+        case "help":
+            from .commands import print_help
+
+            return print_help(args)
+        case "init":
+            from .commands import initialize_server
+
+            return initialize_server(args)
+        case "list":
+            from .commands import list_projects
+
+            return list_projects(args)
+        case "op_grant":
+            from .commands import op_grant
+
+            return op_grant(args)
+        case "op_list":
+            from .commands import op_list
+
+            return op_list(args)
+        case "op_revoke":
+            from .commands import op_revoke
+
+            return op_revoke(args)
+        case "remove":
+            from .commands import remove_projects
+
+            return remove_projects(args)
+        case "search":
+            from .commands import search_projects
 
+            return search_projects(args)
+        case "show":
+            from .commands import show_projects
+
+            return show_projects(args)
+        case "start":
+            from .commands import start_server
+
+            return start_server(args)
+        case "status":
+            from .commands import server_status
+
+            return server_status(args)
+        case "stop":
+            from .commands import stop_server
+
+            return stop_server(args)
+        case "update":
+            from .commands import update_projects
+
+            return update_projects(args)
+        case "whitelist_add":
+            from .commands import whitelist_add
+
+            return whitelist_add(args)
+        case "whitelist_list":
+            from .commands import whitelist_list
+
+            return whitelist_list(args)
+        case "whitelist_remove":
+            from .commands import whitelist_remove
+
+            return whitelist_remove(args)
+        case _:
+            import logging
+
+            logger = logging.getLogger(__name__)
+
+            logger.error(f"Unknown command: {command_name}")
+            return 1
+
+
+def main() -> int:
+    # Parser Setup
     parser = argparse.ArgumentParser(
         prog="mcserver",
         description="A CLI tool for managing Minecraft: Java Edition servers.",
@@ -328,5 +332,15 @@ def main() -> int:
 
     whitelist_list_command.set_defaults(command_name="whitelist_list")
 
+    # 'whitelist remove'
+    whitelist_remove_command = whitelist_subcommands.add_parser(
+        "remove",
+        help="Remove players from the whitelist",
+        description="List all whitelisted players.",
+    )
+
+    whitelist_remove_command.set_defaults(command_name="whitelist_remove")
+    whitelist_remove_command.add_argument("players", nargs="+", type=str, help="List of player names or UUIDs")
+
     args = parser.parse_args()
     return args.func(args)

mcserver/commands/__init__.py

@@ -1,37 +1,37 @@
-from .add import add
-from .import_setup import main as import_setup
-from .init import init
-from .list_projects import main as list_projects
-from .op_grant import main as op_grant
-from .op_list import main as op_list
-from .op_revoke import main as op_revoke
-from .print_help import main as print_help
-from .remove_projects import main as remove_projects
-from .search import search
-from .server_status import main as server_status
-from .show import show
-from .start import start
-from .stop import stop
-from .update_projects import main as update_projects
-from .whitelist_add import main as whitelist_add
-from .whitelist_list import main as whitelist_list
-from .whitelist_remove import main as whitelist_remove
+from .add_projects import run as add_projects
+from .import_setup import run as import_setup
+from .initialize_server import run as initialize_server
+from .list_projects import run as list_projects
+from .op_grant import run as op_grant
+from .op_list import run as op_list
+from .op_revoke import run as op_revoke
+from .print_help import run as print_help
+from .remove_projects import run as remove_projects
+from .search_projects import run as search_projects
+from .server_status import run as server_status
+from .show_projects import run as show_projects
+from .start_server import run as start_server
+from .stop_server import run as stop_server
+from .update_projects import run as update_projects
+from .whitelist_add import run as whitelist_add
+from .whitelist_list import run as whitelist_list
+from .whitelist_remove import run as whitelist_remove
 
 __all__ = [
-    "add",
+    "add_projects",
     "import_setup",
-    "init",
+    "initialize_server",
     "list_projects",
     "op_grant",
     "op_list",
     "op_revoke",
     "print_help",
     "remove_projects",
-    "search",
+    "search_projects",
     "server_status",
-    "show",
-    "start",
-    "stop",
+    "show_projects",
+    "start_server",
+    "stop_server",
     "update_projects",
     "whitelist_add",
     "whitelist_list",

mcserver/commands/{add.py → add_projects.py}

@@ -3,7 +3,7 @@ from argparse import Namespace
 
 from .. import config, paths, shared
 from ..modrinth import apis as modrinth_apis
-from ..modrinth import project_records, slug_index
+from ..modrinth import project_records
 from ..resolver import (
     Dependency,
     human_to_resolver,
@@ -13,13 +13,18 @@ from ..resolver import (
 
 logger = logging.getLogger(__name__)
 
-def add(args: Namespace) -> int:
+
+def run(args: Namespace) -> int:
     projects: list[str] = args.projects
 
     if not (paths.configs_dir / "server.json").exists():
-        logger.error("Configuration file for server does not exist, is server initialized?")
+        logger.error(
+            "Configuration file for server does not exist, is server initialized?"
+        )
 
-    server_config = config.read_config("server", shared.default_configs["server"]["format_version"])
+    server_config = config.read_config(
+        "server", shared.default_configs["server"]["format_version"]
+    )
     game_version = server_config["game_version"]
     loader_name = server_config["loader"]["name"]
 
@@ -35,11 +40,12 @@ def add(args: Namespace) -> int:
         dependencies: list[Dependency] = []
         if project_records.record_exists(project_id):
             project_record = project_records.read_record(project_id)
-            for dependency_id, dependency_type in project_record["dependencies"].items():
-                dependencies.append({
-                    "project_id": dependency_id,
-                    "dependency_type": dependency_type
-                })
+            for dependency_id, dependency_type in project_record[
+                "dependencies"
+            ].items():
+                dependencies.append(
+                    {"project_id": dependency_id, "dependency_type": dependency_type}
+                )
 
         else:
             project_version = modrinth_apis.get_project_versions(
@@ -64,7 +70,9 @@ def add(args: Namespace) -> int:
 
         return human_to_resolver(dependencies)
 
-    resolved_dependencies = resolve_dependencies(projects, get_dependencies, required_only)
+    resolved_dependencies = resolve_dependencies(
+        projects, get_dependencies, required_only
+    )
     print(resolved_dependencies)
     return 0
 
@@ -154,7 +162,6 @@ def add(args: Namespace) -> int:
     #     ]
     #     return a
 
-
     # server_config = config.read_config(
     #     "server", shared.default_configs["server"]["format_version"]
     # )

mcserver/commands/import_setup.py

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def main(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     file: str = args.file
     import logging as log
 

mcserver/commands/{init.py → initialize_server.py}

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def init(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     from ..modrinth.shared import SearchSortIndex
 
     # CLI Arguments

mcserver/commands/list_projects.py

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def main(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     import logging as log
 
     log.error("Command is not implemented yet.")

mcserver/commands/op_grant.py

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def main(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     players: list[str] = args.players
     import logging as log
 

mcserver/commands/op_list.py

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def main(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     import logging as log
 
     from ..server_files import ops

mcserver/commands/op_revoke.py

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def main(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     players: list[str] = args.players
     import logging as log
 

mcserver/commands/print_help.py

@@ -1,7 +1,7 @@
 import argparse
 
 
-def main(args: argparse.Namespace) -> int:
+def run(args: argparse.Namespace) -> int:
     parser: argparse.ArgumentParser = args.parser
     parser.print_help()
     return 0

mcserver/commands/remove_projects.py

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def main(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     import logging as log
 
     log.error("Command is not implemented yet.")

mcserver/commands/{search.py → search_projects.py}

@@ -18,7 +18,7 @@ from ..shared import (
 logger = logging.getLogger(__name__)
 
 
-def search(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     search_query: list[str] = args.search_query
     search_limit: int | None = args.search_limit
     page_number: int = args.page_number
@@ -112,7 +112,7 @@ def search(args: Namespace) -> int:
         search_facets.append([f"project_type:{project_label}"])
         search_facets.append([f"categories:{loader_name}"])
     else:
-        search_facets.append(["project_type:mod","project_type:plugin"])
+        search_facets.append(["project_type:mod", "project_type:plugin"])
 
     search_info = f"Searching {pluralize(project_label, search_limit)}"
     if search_query:
@@ -165,17 +165,13 @@ def search(args: Namespace) -> int:
         for environment in environments:
             readable_environments.append(project_environment_name(environment))
 
+        print(f"{hit['project_name']} ({slug_or_id}) {project_author}")
         print(
-            f"{hit['project_name']} ({slug_or_id}) {project_author}"
-        )
-        print(f"> Downloads: {format_number(hit['download_count'])} | Follows: {format_number(hit['follower_count'])}")
-        print(
-            f"> {', '.join(readable_environments)}"
+            f"> Downloads: {format_number(hit['download_count'])} | Follows: {format_number(hit['follower_count'])}"
         )
+        print(f"> {', '.join(readable_environments)}")
         print(f"> https://modrinth.com/{hit['all_project_types'][0]}/{slug_or_id}")
-        print(
-            f"  {hit['short_description']}"
-        )
+        print(f"  {hit['short_description']}")
 
         if (count + 1) < len(search_hits):
             print()  # Print newline for readability

mcserver/commands/server_status.py

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def main(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     import logging as log
 
     log.error("Command is not implemented yet.")

mcserver/commands/{show.py → show_projects.py}

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def show(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     projects: list[str] = args.projects
 
     import logging

mcserver/commands/{start.py → start_server.py}

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def start(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     import logging as log
 
     from .. import state

mcserver/commands/{stop.py → stop_server.py}

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def stop(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     import logging as log
     import os
     from signal import SIGTERM

mcserver/commands/update_projects.py

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def main(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     import logging as log
 
     log.error("Command is not implemented yet.")

mcserver/commands/whitelist_add.py

@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 
-def main(args: Namespace) -> int:
+def run(args: Namespace) -> int:
     players: list[str] = args.players
     import logging as log
 

mcserver/commands/whitelist_list.py

@@ -1,18 +1,19 @@
 import argparse
+import logging
 
+from ..server_files import whitelist
+from ..shared import pluralize
 
-def main(args: argparse.Namespace) -> int:
-    import logging as log
+logger = logging.getLogger(__name__)
 
-    from ..server_files import whitelist
-    from ..shared import pluralize
 
-    whitelist_file = whitelist.whitelist_file
+def run(args: argparse.Namespace) -> int:
+    whitelist_file = whitelist.whitelist_file_path
     if not whitelist_file.exists():
-        log.error(f"Whitelist file ({whitelist_file}) does not exist!")
+        logger.error(f"Whitelist file ({whitelist_file}) does not exist!")
         return 1
 
-    whitelisted_players = whitelist.list_entries()
+    whitelisted_players = whitelist.list_players()
 
     player_list: list[str] = []
     for player in whitelisted_players:
@@ -20,10 +21,10 @@ def main(args: argparse.Namespace) -> int:
 
     player_count: int = len(player_list)
     if player_count == 0:
-        log.info("There are no whitelisted players.")
+        logger.info("There are no whitelisted players.")
         return 0
     else:
-        log.info(
+        logger.info(
             f"There {pluralize('is', player_count)} whitelisted {pluralize('player', player_count)}:"
         )
 

mcserver/commands/whitelist_remove.py

@@ -1,33 +1,39 @@
-from argparse import Namespace
+import argparse
+import logging
 
+from ..server_files import whitelist
+from ..shared import pluralize
 
-def main(args: Namespace) -> int:
-    players: list[str] = args.players
-    import logging as log
+logger = logging.getLogger(__name__)
 
-    # from uuid import UUID
-    # from ..server_files.whitelist import remove_players
-    # from ..minecraft.player_identity import PlayerID
+def run(args: argparse.Namespace) -> int:
+    player_identifiers: list[str] = args.players
 
-    log.error("Command is not implemented yet.")
-    # player_ids: list[PlayerID] = []
-    # for player in players:
-    #     try:
-    #         UUID(player)
-    #         log.debug(f"{player} is likely an UUID")
-    #         player_id: PlayerID = {"player_uuid": player}
+    player_uuids: list[str] = []
+    player_names: list[str] = []
+    for player in player_identifiers:
+        if len(player) > 16:
+            logger.debug(f"{player} is probably an UUID")
+            player_uuids.append(player)
+        else:
+            logger.debug(f"{player} is probably a name")
+            player_names.append(player)
 
-    #         player_ids.append(player_id)
-    #     except ValueError:
-    #         log.debug(f"{player} is likely a name")
-    #         player_id: PlayerID = {"player_name": player}
+    removed_players = whitelist.remove_players(player_uuids, player_names)
 
-    #         player_ids.append(player_id)
+    player_count: int = len(removed_players)
+    if player_count == 0:
+        logger.info("No matching player found.")
+        return 0
 
-    # try:
-    #     remove_players(player_ids)
-    # except FileNotFoundError as error:
-    #     log.error(error)
-    #     return 1
+    player_list: list[str] = []
+    for player in removed_players:
+        player_list.append(f"{player['player_name']} ({player['player_uuid']})")
 
-    return 1
+    logger.info(
+        f"There {pluralize('is', player_count)} {player_count} {pluralize('player', player_count)} that {pluralize('is', player_count)} removed:"
+    )
+
+    player_list.sort()
+    print("\n".join(player_list))
+    return 0

mcserver/config.py

@@ -2,11 +2,14 @@
 # Standard
 import copy
 import json
+import logging
 from typing import Any
 
 # MCServer
 from .paths import configs_dir
 
+logger = logging.getLogger(__name__)
+
 
 class ConfigVersionError(Exception):
     pass
@@ -38,6 +41,8 @@ def write_config(
 
     configuration_data.update(copy.deepcopy(config_data))
     config_json = json.dumps(configuration_data, indent=2)
+
+    logger.debug(f"Writing configuration data for {config_name}")
     config_path.write_text(config_json)
 
 
@@ -60,6 +65,7 @@ def read_config(config_name: str, current_format_version: int) -> dict[str, Any]
             f"Configuration file for '{config_name}' does not exist"
         )
 
+    logger.debug(f"Reading configuration for {config_name}")
     config_json = config_path.read_text()
     config_data = json.loads(config_json)
 

mcserver/metadata.py

@@ -8,7 +8,10 @@ from .paths import metadata_file
 
 metadata_format_version = 1
 
-class MetadataFormatVersionError(Exception): pass
+
+class MetadataFormatVersionError(Exception):
+    pass
+
 
 class MCServerMetadata(TypedDict):
     version: str
@@ -21,7 +24,10 @@ class Metadata(TypedDict):
 
 # Functions
 def set_metadata(mcserver_version: str) -> None:
-    metadata: Metadata = {"format_version": metadata_format_version,"mcserver": {"version": mcserver_version}}
+    metadata: Metadata = {
+        "format_version": metadata_format_version,
+        "mcserver": {"version": mcserver_version},
+    }
 
     metadata_data: str = json.dumps(metadata)
     metadata_file.write_text(metadata_data)
@@ -31,5 +37,7 @@ def get_metadata() -> Metadata:
     metadata_data = metadata_file.read_text()
     metadata: Metadata = json.loads(metadata_data)
     if metadata["format_version"] > metadata_format_version:
-        raise MetadataFormatVersionError("Existing metadata format version is higher than current metadata format version")
+        raise MetadataFormatVersionError(
+            "Existing metadata format version is higher than current metadata format version"
+        )
     return metadata

mcserver/modrinth/apis/get_project_informations.py

@@ -1,5 +1,10 @@
+import json
+import logging
+
 from ..typings import ProjectInformation
 
+logger = logging.getLogger(__name__)
+
 
 class GetProjectInformationsError(Exception):
     pass
@@ -17,9 +22,6 @@ def get_project_informations(project_ids: list[str] | str) -> list[ProjectInform
     if isinstance(project_ids, str):
         project_ids = [project_ids]
 
-    import json
-    import logging as log
-
     from ... import networking
     from .. import constants, shared
     from ..typings import (
@@ -49,35 +51,29 @@ def get_project_informations(project_ids: list[str] | str) -> list[ProjectInform
         # Checks
         project_status: ProjectStatus = information["status"]
         if project_status not in shared.PROJECT_STATUS:
-            log.warning(f"Unknown project status: {project_status}")
+            logger.warning(f"Unknown project status: {project_status}")
 
         project_type: ProjectType = information["project_type"]
         if project_type not in shared.PROJECT_TYPE:
-            log.warning(f"Unknown project type: {project_type}")
+            logger.warning(f"Unknown project type: {project_type}")
 
         monetization_status: MonetizationStatus = information["monetization_status"]
         if monetization_status not in shared.MONETIZATION_STATUS:
-            log.warning(f"Unknown monetization status: {monetization_status}")
-
-        requested_project_status: RequestedProjectStatus = information[
-            "requested_status"
-        ]
-        if requested_project_status not in shared.REQUESTED_PROJECT_STATUS:
-            log.warning(f"Unknown monetization status: {monetization_status}")
+            logger.warning(f"Unknown monetization status: {monetization_status}")
 
         client_side: EnvironmentSide = information["client_side"]
         if client_side not in shared.ENVIRONMENT_SIDE:
-            log.warning(f"Unknown client side: {client_side}")
+            logger.warning(f"Unknown client side: {client_side}")
 
         server_side: EnvironmentSide = information["server_side"]
         if server_side not in shared.ENVIRONMENT_SIDE:
-            log.warning(f"Unknown server side: {server_side}")
+            logger.warning(f"Unknown server side: {server_side}")
 
         # Lists
         environments: list[Environment] = information["environment"]
         for environment in environments:
             if environment not in shared.ENVIRONMENT:
-                log.warning(f"Unknown environment: {environment}")
+                logger.warning(f"Unknown environment: {environment}")
 
         gallery: list[GalleryImage] = []
         for image in information["gallery"]:
@@ -159,6 +155,17 @@ def get_project_informations(project_ids: list[str] | str) -> list[ProjectInform
             project_information["organization_id"] = information["organization"]
 
         if "requested_status" in information:
+            requested_project_status: RequestedProjectStatus | None = information[
+                "requested_status"
+            ]
+            if (
+                requested_project_status is not None
+                and requested_project_status not in shared.REQUESTED_PROJECT_STATUS
+            ):
+                logger.warning(
+                    f"Unknown requested_project_status status: {monetization_status}"
+                )
+
             project_information["requested_project_status"] = requested_project_status
 
         if "approved" in information:

mcserver/modrinth/apis/get_project_versions.py

@@ -158,7 +158,10 @@ def get_project_versions(
             requested_status_version: RequestedVersionStatus = version[
                 "requested_status"
             ]
-            if requested_status_version is not None and requested_status_version not in shared.REQUESTED_VERSION_STATUS:
+            if (
+                requested_status_version is not None
+                and requested_status_version not in shared.REQUESTED_VERSION_STATUS
+            ):
                 logger.info(
                     f"Unknown requested_status_version: {requested_status_version}"
                 )

mcserver/modrinth/project_records.py

@@ -43,6 +43,7 @@ class ProjectRecordData(ProjectRecordPayload):
 def record_exists(project_id: str) -> bool:
     return (project_records_dir / f"{project_id}.json").exists()
 
+
 def write_record(project_id: str, record_payload: ProjectRecordPayload) -> None:
     """Write a record for a project record (create a new record or overwrite it)
     Args:

mcserver/resolver.py

@@ -83,9 +83,7 @@ def resolver_to_human(dependency_graph: dict[str, Project]) -> list[ProjectData]
         }
 
         if "highest_type" in project:
-            project_data["highest_type"] = dependency_types2[
-                project["highest_type"]
-            ]
+            project_data["highest_type"] = dependency_types2[project["highest_type"]]
 
         projects.append(project_data)
 

mcserver/server_files/paths.py

@@ -0,0 +1,3 @@
+from ..paths import current_dir
+
+whitelist_file_path = current_dir / "whitelist.json"

mcserver/server_files/whitelist.py

@@ -1,184 +1,138 @@
-# Modules
-# Standard
 import json
-import logging as log
-from pathlib import Path
+import logging
 from typing import TypedDict
-from uuid import UUID
 
-# MCServer
-from mcserver.minecraft.player_identity import (
-    PlayerID,
-    PlayerUUID,
-    normalize_player_uuid,
-)
+from ..minecraft.player_identity import PlayerUUID
+from .paths import whitelist_file_path
 
-# Paths
-whitelist_file = Path("whitelist.json")
+logger = logging.getLogger(__name__)
 
 
-# TypedDicts
-class WhitelistEntry(TypedDict):
+class WhitelistedPlayer(TypedDict):
     player_uuid: PlayerUUID
     player_name: str
 
 
-class WhitelistFileEntry(TypedDict):
+class WhitelistedFilePlayer(TypedDict):
     uuid: str
     name: str
 
-
-# Functions
-# Add Players
-def add_player(player_uuid: PlayerUUID, player_name: str) -> None:
-    whitelist_entry: WhitelistEntry = {
-        "player_uuid": player_uuid,
-        "player_name": player_name,
-    }
-
-    add_players(whitelist_entry)
-
-
-def add_players(whitelist_entries: list[WhitelistEntry] | WhitelistEntry) -> None:
-    """Add entries to the whitelist file
+def remove_players(player_uuids: list[str] | str | None = None, player_names: list[str] | str | None = None) -> list[WhitelistedPlayer]:
+    """Remove players from the whitelist that matches either the UUIDs or names
+    
     Args:
-        whitelist_entries: List of or an entry of player to be whitelisted
-
+        player_uuids: List of player UUIDs to be removed
+        player_names: List of player names to be removed
+    
     Raises:
-        FileNotFoundError: Whitelist file does not exist
-        json.JSONDecodeError: Cannot parse JSON of whitelist data
-    """
-    if not whitelist_file.exists():
-        raise FileNotFoundError(f"Whitelist file ({whitelist_file}) does not exist")
-
-    if not isinstance(whitelist_entries, list):
-        whitelist_entries = [whitelist_entries]
-
-    with open(whitelist_file, mode="r+") as file:
-        whitelist_json: list[WhitelistFileEntry] = json.load(file)
-
-        for entry in whitelist_entries:
-            whitelist_entry: WhitelistFileEntry = {
-                "uuid": str(normalize_player_uuid(entry["player_uuid"])),
-                "name": entry.get("player_name", ""),
-            }
-
-            whitelist_json.append(whitelist_entry)
-
-        file.seek(0)
-        json.dump(whitelist_json, file, indent=2)
-        file.truncate()
-
+        ValueError: Must provide at least a player UUID or player name
+    
+    Returns:
+        List of whitelisted players that are removed"""
+    if player_uuids is None:
+        player_uuids = []
+    
+    if player_names is None:
+        player_names = []
+
+    if isinstance(player_uuids, str):
+        player_uuids = [player_uuids]
+
+    if isinstance(player_names, str):
+        player_names = [player_names]
+
+    if not player_uuids and not player_names:
+        raise ValueError("Must provide at least a player UUID or player name")
+
+    uuids: set[str] = set(player_uuids)
+    names: set[str] = set(player_names)
+
+    removed_players: list[WhitelistedPlayer] = []
+    with open(whitelist_file_path, mode="r+") as whitelist_file:
+        whitelist_data: list[WhitelistedFilePlayer] = json.load(whitelist_file)
+
+        new_whitelist_data: list[WhitelistedFilePlayer] = []
+        for whitelisted_file_player in whitelist_data:
+            if whitelisted_file_player["uuid"] in uuids or whitelisted_file_player["name"] in names:
+                logger.debug(f"Whitelisted player {whitelisted_file_player['name']} ({whitelisted_file_player['uuid']}) is removed")
+                whitelisted_player: WhitelistedPlayer = {
+                    "player_uuid": whitelisted_file_player["uuid"],
+                    "player_name": whitelisted_file_player["name"]
+                }
+
+                removed_players.append(whitelisted_player)
+                continue
 
-# Remove Players
-def remove_player(
-    player_uuid: PlayerUUID | None = None, player_name: str | None = None
-) -> None:
-    if player_uuid is None and player_name is None:
-        raise ValueError(
-            "At least one of 'player_uuid' or 'player_name' must be provided"
-        )
+            new_whitelist_data.append(whitelisted_file_player)
+        
+        whitelist_file.seek(0)
+        json.dump(new_whitelist_data, whitelist_file, indent=2)
+        whitelist_file.truncate()
 
-    player_id: PlayerID = {}
-    if player_uuid is not None:
-        player_uuid = normalize_player_uuid(player_uuid)
-        player_id["player_uuid"] = normalize_player_uuid(player_uuid)
+    return removed_players
 
-    if player_name is not None:
-        player_id["player_name"] = player_name
 
-    remove_players(player_id)
 
+# def remove_players(player_ids: list[PlayerID] | PlayerID) -> None:
+#     """Remove player entries matching the exact UUIDs or names
 
-def remove_players(player_ids: list[PlayerID] | PlayerID) -> None:
-    """Remove player entries matching the exact UUIDs or names
+#     Args:
+#         player_ids: Player UUIDs and/or names object
 
-    Args:
-        player_ids: Player UUIDs and/or names object
+#     Returns:
+#         None: Returns nothing
 
-    Returns:
-        None: Returns nothing
+#     Raises:
+#         FileNotFoundError: The 'whitelist.json' file not found
+#     """
+#     if not isinstance(player_ids, list):
+#         player_ids = [player_ids]
 
-    Raises:
-        FileNotFoundError: The 'whitelist.json' file not found
-    """
-    if not isinstance(player_ids, list):
-        player_ids = [player_ids]
-
-    player_uuids: set[PlayerUUID | None] = set()
-    player_names: set[str | None] = set()
-    for player_id in player_ids:
-        if "player_uuid" in player_id:
-            player_uuids.add(player_id["player_uuid"])
-
-        if "player_name" in player_id:
-            player_names.add(player_id["player_name"])
-
-    if not whitelist_file.exists():
-        raise FileNotFoundError(f"File '{whitelist_file}' is not found.")
-
-    with open(whitelist_file, mode="r+") as file:
-        whitelist_data: list[WhitelistFileEntry] = json.load(file)
-        new_whitelist_data: list[WhitelistFileEntry] = []
-        for player in whitelist_data:
-            player_uuid = player["uuid"]
-            player_name = player["name"]
-
-            if player_uuid in player_uuids or player_name in player_names:
-                log.debug(
-                    f"Removed player '{player_name}' ({player_uuid}) from the whitelisted player list"
-                )
-                continue
+#     player_uuids: set[PlayerUUID | None] = set()
+#     player_names: set[str | None] = set()
+#     for player_id in player_ids:
+#         if "player_uuid" in player_id:
+#             player_uuids.add(player_id["player_uuid"])
 
-            new_whitelist_data.append(player)
+#         if "player_name" in player_id:
+#             player_names.add(player_id["player_name"])
 
-        file.seek(0)
-        json.dump(new_whitelist_data, file, indent=2)
-        file.truncate()
+#     if not whitelist_file.exists():
+#         raise FileNotFoundError(f"File '{whitelist_file}' is not found.")
 
+#     with open(whitelist_file, mode="r+") as file:
+#         whitelist_data: list[WhitelistFileEntry] = json.load(file)
+#         new_whitelist_data: list[WhitelistFileEntry] = []
+#         for player in whitelist_data:
+#             player_uuid = player["uuid"]
+#             player_name = player["name"]
 
-# TODO: add 'update_player' and 'update_players', just use plain dict.update() because it has no depth
-
-
-# List Entries
-def list_entries() -> list[WhitelistEntry]:
-    """Return a list of whitelist entries from the whitelist file
-    Raises:
-        FileNotFoundError: Whitelist file does not exist
-        json.JSONDecodeError: Cannot parse JSON of whitelist file
-
-    Returns:
-        List of whitelist entries
-    """
-    if not whitelist_file.exists():
-        raise FileNotFoundError(f"Whitelist file ({whitelist_file}) does not exist")
+#             if player_uuid in player_uuids or player_name in player_names:
+#                 log.debug(
+#                     f"Removed player '{player_name}' ({player_uuid}) from the whitelisted player list"
+#                 )
+#                 continue
 
-    whitelist_data: str = whitelist_file.read_text()
+#             new_whitelist_data.append(player)
 
-    # NOTE: A custom TypedDict for entry from JSON with NotRequired so we can get notified for edge cases where the field does no exist
-    whitelist_json: list[WhitelistFileEntry] = json.loads(whitelist_data)
+#         file.seek(0)
+#         json.dump(new_whitelist_data, file, indent=2)
+#         file.truncate()
 
-    whitelist_entries: list[WhitelistEntry] = []
-    for file_entry in whitelist_json:
-        if "uuid" not in file_entry:
-            log.warning("Invalid whitelist entry: missing 'uuid'")
-            continue
 
-        if "name" not in file_entry:
-            log.warning("Invalid whitelist entry: missing 'name'")
-            continue
 
-        file_entry_uuid = file_entry["uuid"]
+def list_players() -> list[WhitelistedPlayer]:
+    logger.debug(f"Reading whitelist file {whitelist_file_path}")
+    whitelist_json = whitelist_file_path.read_text()
+    whitelist_data: list[WhitelistedFilePlayer] = json.loads(whitelist_json)
 
-        try:
-            whitelist_entry: WhitelistEntry = {
-                "player_uuid": UUID(file_entry_uuid),
-                "player_name": file_entry["name"],
-            }
-        except ValueError:
-            log.error(f"Invalid UUID in whitelist: '{file_entry_uuid}'")
-            continue
+    whitelisted_players: list[WhitelistedPlayer] = []
+    for player in whitelist_data:
+        whitelisted_player: WhitelistedPlayer = {
+            "player_uuid": player["uuid"],
+            "player_name": player["name"],
+        }
 
-        whitelist_entries.append(whitelist_entry)
+        whitelisted_players.append(whitelisted_player)
 
-    return whitelist_entries
+    return whitelisted_players

{mcserver_cli-4.2.0.dist-info → mcserver_cli-4.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mcserver-cli
-Version: 4.2.0
+Version: 4.3.0
 Summary: A CLI tool to manage Minecraft: Java Edition servers.
 Project-URL: Homepage, https://github.com/Othecat35/MCServer
 Project-URL: Repository, https://github.com/Othecat35/MCServer.git

{mcserver_cli-4.2.0.dist-info → mcserver_cli-4.3.0.dist-info}/RECORD

@@ -1,36 +1,36 @@
-mcserver/__init__.py,sha256=pU56ZDjCDnUbINe39hYuKXHy9UI9Tf4xjWgnxBlxEDk,22
+mcserver/__init__.py,sha256=wPyEHmYopdmpH4340zhwFNBFQBGN743kwlSVDWO73rA,22
 mcserver/__main__.py,sha256=3-WYJCtLQ8TbzmLMYBiAsm9PC89DwjXc6s_J-izMEz8,30
 mcserver/app.py,sha256=giOF7rFvz9V1RG975l_nvFBMKebvzRsTUyq7wbz7HNU,777
 mcserver/caching.py,sha256=oLIQuiBqlJLxSTCVyrtHoYEZvmtnb3duxhhE-P5bOR8,411
-mcserver/cli.py,sha256=VHKxS3BGN_Gl_2BP1nqDJew7U6fR42VJz09JhNwwLp0,9587
-mcserver/config.py,sha256=OlSWod2QC0nZS88Dm5Sg2QTv-j8c57h86b98mJZiVT4,1955
+mcserver/cli.py,sha256=Oh4YNfGe8IY_7ZYiFoqY5HwsVGL2XBI3NMMGNCQJJ5o,9817
+mcserver/config.py,sha256=JlIATmTETwVTmXzrmONDBbYddj_aB4hcn8zYu5CQHTQ,2136
 mcserver/constants.py,sha256=ME5f4dv1PbqyQ6G1lQkKtvHQ4b722De4xu5B5Vp1Hw8,480
-mcserver/metadata.py,sha256=q0JSwKGc8NSRswNRniZPyWrWTpAnUS8fs4CJk160S8U,925
+mcserver/metadata.py,sha256=sPstt7jrtPh1_kthje-loQ6UYB2c5m496IOJFYeGxjI,977
 mcserver/mysterious.py,sha256=giH_NRs7CuV51NACh3AUIIXKEKowHKb6DFGQQVPgtxE,642
 mcserver/networking.py,sha256=EdJE5pNL5e4wSitbXQtxMUkjiRT3w2nLkObDaZQnwCk,4865
 mcserver/paths.py,sha256=ZwCKOj4VdVgEzq30ZtnZyGjTgW5S3CiuX3Su-csgb2k,462
-mcserver/resolver.py,sha256=1MXeCZjk7gw-3fXGoR7HH2roR6FXFxCuAoi_2VtvDKA,7375
+mcserver/resolver.py,sha256=28oO8HOr0JnU66KFSkP7mArmRAHPi13y3q92QpLEmqQ,7345
 mcserver/shared.py,sha256=_v8QAM3jpkUSHzWBjgLSKbnjh4M3bfRNUG2LKmGdUcE,7308
 mcserver/state.py,sha256=L0JUtKVZ6qWlpYqD42rnzbn65Qcaa1xKaBWmkIXVT-c,1992
-mcserver/commands/__init__.py,sha256=5axkZLKMUK0X0pLoTGalQLkW-2uJsInnSu3XslVQYpA,1038
-mcserver/commands/add.py,sha256=hy_gnsYbiscPMeiOenYlIFQ-GLl6C_APoRRx7HREK40,8612
-mcserver/commands/import_setup.py,sha256=VS0Uj1zUihOwqBfI2v2n24piDbsDtMcaFGbFq97Frqc,182
-mcserver/commands/init.py,sha256=xR8ZtMRhHcKx0eAv1EMcmEsmv2jqjndScZe0y38J2EQ,5740
-mcserver/commands/list_projects.py,sha256=TttnyAyy5v8Wmrf5T21E-Fqz5qmjSOYooL_w3kXxS4g,156
-mcserver/commands/op_grant.py,sha256=vAJ_i_YRYqvMfnphsTe7PEw5mFyoBB7vXJNv9JHxwKA,194
-mcserver/commands/op_list.py,sha256=IpojvVqFLd7zwVFm7NjC9dsIVyVVP1gVI0PoVs3aGXc,829
-mcserver/commands/op_revoke.py,sha256=vAJ_i_YRYqvMfnphsTe7PEw5mFyoBB7vXJNv9JHxwKA,194
-mcserver/commands/print_help.py,sha256=30nMXGL2epEGSOaavJWfspsc28iru-IGH43_NQiI8r8,148
-mcserver/commands/remove_projects.py,sha256=TttnyAyy5v8Wmrf5T21E-Fqz5qmjSOYooL_w3kXxS4g,156
-mcserver/commands/search.py,sha256=igU1bxw-oq-HyKl4b1f74lU_Ve7vS-yiK9rYeo6MWKE,6294
-mcserver/commands/server_status.py,sha256=TttnyAyy5v8Wmrf5T21E-Fqz5qmjSOYooL_w3kXxS4g,156
-mcserver/commands/show.py,sha256=MBtzFP4YPlSRzMyZ7yYThLUC6tT0tjskOutmbV8vlFc,4030
-mcserver/commands/start.py,sha256=8vgrmpSrz0Ev5S85jRimJ6HV6T-H8zMIf5HvBUJQfQ8,5766
-mcserver/commands/stop.py,sha256=nfu_-CtEm2J0heo2M9sKva_2taxxDS06wLHissXLdHc,556
-mcserver/commands/update_projects.py,sha256=TttnyAyy5v8Wmrf5T21E-Fqz5qmjSOYooL_w3kXxS4g,156
-mcserver/commands/whitelist_add.py,sha256=vAJ_i_YRYqvMfnphsTe7PEw5mFyoBB7vXJNv9JHxwKA,194
-mcserver/commands/whitelist_list.py,sha256=jOUf9_rh10gO9ocvpuFEY_xcIRQdA-Ig0GTicBi2LWM,891
-mcserver/commands/whitelist_remove.py,sha256=swnddGpaVD7-jDyrVAAjepW4C8RuGbdrWjJixX3BcNg,928
+mcserver/commands/__init__.py,sha256=h-rdpn8r32rrHIZzs9fFu3pYWuc3KoRZIJO8IX0vU3U,1230
+mcserver/commands/add_projects.py,sha256=ceEdcBrf7lcziRjNoPtLUJJ_UV3TLdMkSufCN_RaEVY,8660
+mcserver/commands/import_setup.py,sha256=NbByM4seH0dAYo2QEj37VsL_J_Mtvg0S7NTsTFbcneA,181
+mcserver/commands/initialize_server.py,sha256=sjNRNot01joQrC7wp064h-rIkMSxfs229Dhj5Xfh0Is,5739
+mcserver/commands/list_projects.py,sha256=XG7U6oMVxQrTuV_GFCsp5aYZJphjyYwFDZiiURnjzNw,155
+mcserver/commands/op_grant.py,sha256=eWiNmnGfCNAIXCHFcsbnbYdtwJKbHv-Xd2uOUNpyg8w,193
+mcserver/commands/op_list.py,sha256=tsvIMYyDiZOgDtBMReEmxDO1j1a8x5EG0o_4qsoOSbM,828
+mcserver/commands/op_revoke.py,sha256=eWiNmnGfCNAIXCHFcsbnbYdtwJKbHv-Xd2uOUNpyg8w,193
+mcserver/commands/print_help.py,sha256=aOb20JvvfEteXDI9Q8fd-2vNCRXgxP6rFGLXfSGeP_Q,147
+mcserver/commands/remove_projects.py,sha256=XG7U6oMVxQrTuV_GFCsp5aYZJphjyYwFDZiiURnjzNw,155
+mcserver/commands/search_projects.py,sha256=rNNejVL5o00m6CzTO36acKdJeoKFZ8anYAHIM9VQsFc,6248
+mcserver/commands/server_status.py,sha256=XG7U6oMVxQrTuV_GFCsp5aYZJphjyYwFDZiiURnjzNw,155
+mcserver/commands/show_projects.py,sha256=2mnuV8z8Ws1GSX_iMGsI5lrdu32ZsvAHI11eq7NAdlc,4029
+mcserver/commands/start_server.py,sha256=Sbu6JQ2gP0G7Taxz_rTw1FwQ2IT71Hx36_gq3ta2rps,5764
+mcserver/commands/stop_server.py,sha256=l3-OiInwPlj1ApWQ8ZTqBsMKmkAPCh1MAjoqYLnHnO4,555
+mcserver/commands/update_projects.py,sha256=XG7U6oMVxQrTuV_GFCsp5aYZJphjyYwFDZiiURnjzNw,155
+mcserver/commands/whitelist_add.py,sha256=eWiNmnGfCNAIXCHFcsbnbYdtwJKbHv-Xd2uOUNpyg8w,193
+mcserver/commands/whitelist_list.py,sha256=W1lFgGzd8mOhuwNIqklvqXQdQMXIfUpeXxF-HqSICM0,922
+mcserver/commands/whitelist_remove.py,sha256=zXulEJziIxzWg6sPl96KtHxI3kQPNf-sgHtvI49eZkM,1177
 mcserver/fabricmc/meta.py,sha256=aQl_qPKLic0wM-CdhJimLvkP277nunD_kcZQQN0p9So,1113
 mcserver/legacy_fabric/meta.py,sha256=FRrPm4QZq3uuH7zscjyHPs-zoFW7uREIz3iWaX_Tqxs,911
 mcserver/minecraft/api.py,sha256=7twGWNv6UytlzJJ5kSCpVZzkXjBVDxTMY-t3VoKNAzA,2704
@@ -38,13 +38,13 @@ mcserver/minecraft/player_identity.py,sha256=LDvL5vFs5i-67nezUB4G12FrmQoZCT0ID94
 mcserver/modrinth/constants.py,sha256=5KqG45wBp7ZoRbf9tsFi_w1hSi-vxFEu6XE11MrAHF4,51
 mcserver/modrinth/modpack.py,sha256=uBx51G8sxQZEK127EMyXEZbyFMayps9pPGzTa49Vk6w,2957
 mcserver/modrinth/paths.py,sha256=wDoBiWkR-xZG3FCQdB1nct82kh5yksWunt98uwyAxLw,75
-mcserver/modrinth/project_records.py,sha256=0PYJ1tUR6TplaQNZapl9x28W-aEJM5IsTulDMRO1PfQ,3447
+mcserver/modrinth/project_records.py,sha256=bDFlALFELhIrr4-elLkJk3YrCsvOJBr1u8QB5DqifOk,3448
 mcserver/modrinth/projects.py,sha256=86EksO7F1sQZvIqMWVH9g4FmU2xIFUGcmvqgT6ZQP-E,2342
 mcserver/modrinth/shared.py,sha256=-bVTwhYxif2jufZ_jcH5Gifa4d7uUtq_SGVgHfVXsyQ,3013
 mcserver/modrinth/slug_index.py,sha256=h3NxJQP_Rs8BsLm24w62n-ZoqaSvfImeLY0z7kMrulo,3331
 mcserver/modrinth/apis/__init__.py,sha256=gCQwcpU3Duj2AfVKtcnm8wb91EqiQT3nsLbABYa6JC0,261
-mcserver/modrinth/apis/get_project_informations.py,sha256=E3Nr7FIl91CbbP9ilZzh-Mus6s-Uv2Q10vjBt5ErJbE,8076
-mcserver/modrinth/apis/get_project_versions.py,sha256=t7KKPw6xbzhvudL8nf8Hq3Ka6YFV65bcGS5jfP39k_w,6052
+mcserver/modrinth/apis/get_project_informations.py,sha256=C05s0PfUyLfc72bJlctDb4vTWpAS6tN-jWOjjNMLIB0,8286
+mcserver/modrinth/apis/get_project_versions.py,sha256=DDWjufayTaaHXVGENtz8490yTTT6oSdb60Si4DMRsbM,6100
 mcserver/modrinth/apis/search_projects.py,sha256=bUDkbCPqukhLGBZhFyFvH_HxwoUDF2nt7U8ecZgPutA,5501
 mcserver/modrinth/typings/__init__.py,sha256=XJgVGGVRfD_xuB8ZHzaEsjolzrawgw_TmcZ0G5qFV_A,1082
 mcserver/modrinth/typings/project_information.py,sha256=1G1ID3zbXQr_ftZh9QAKZfPKTcgZAqbshRMeA16swuc,6101
@@ -59,11 +59,12 @@ mcserver/quiltmc/meta.py,sha256=BVbvGCfQ1_ft9i1KJFSFDnuvFoSoDz2lcWF-nr4nMdI,1385
 mcserver/server_files/banned_ips.py,sha256=3kfG9fck8JLvSnrfWl9eVj-ztClsld3Z9G4RxCyPtUw,3581
 mcserver/server_files/banned_players.py,sha256=qMSuwRdn_PzMCUD9CEOyy3plbfCmf_StauwbrgU5RXI,5050
 mcserver/server_files/ops.py,sha256=PFhR95aNTJ_sHorZct8hNQLV1OaSL9vOdxf6PqYaxKw,4032
+mcserver/server_files/paths.py,sha256=RHCYfNKAh6fXjFuEfp-O5rgaM962astjdHSplGFug0g,86
 mcserver/server_files/properties.py,sha256=5WPigqET70Xh61NIIP0KRaTyir9qwjpjC-HmkKrB6j4,1119
 mcserver/server_files/usercaches.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcserver/server_files/whitelist.py,sha256=ZROjMwTu-7MILA6W8dCgmyTnLyq-9d_tcHYkmBzq-Lo,5467
-mcserver_cli-4.2.0.dist-info/METADATA,sha256=ZBMiWhinCn3mRhO2vVOBeL9CxzEAIC0Yur17cEJ9SUU,2038
-mcserver_cli-4.2.0.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
-mcserver_cli-4.2.0.dist-info/entry_points.txt,sha256=p7uN6UdTzjea7nGIkhjiYDYd7wznkxz9amUPY_fpz24,47
-mcserver_cli-4.2.0.dist-info/licenses/LICENSE,sha256=OzeasqJgwxVpwtMkEYOLoDPUnIDSbVcW62rk-voA3eI,1076
-mcserver_cli-4.2.0.dist-info/RECORD,,
+mcserver/server_files/whitelist.py,sha256=7POUqusctgntxehwU3w2ngVIzuTy6Wtze95bBLM6AhM,4556
+mcserver_cli-4.3.0.dist-info/METADATA,sha256=ZjSrxoRsTx6tcXbDDMXSTyd5YkW9dzECWGLhEzCXSjM,2038
+mcserver_cli-4.3.0.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+mcserver_cli-4.3.0.dist-info/entry_points.txt,sha256=p7uN6UdTzjea7nGIkhjiYDYd7wznkxz9amUPY_fpz24,47
+mcserver_cli-4.3.0.dist-info/licenses/LICENSE,sha256=OzeasqJgwxVpwtMkEYOLoDPUnIDSbVcW62rk-voA3eI,1076
+mcserver_cli-4.3.0.dist-info/RECORD,,