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

mcserver/__init__.py

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

mcserver/commands/search.py

@@ -60,12 +60,11 @@ def search(args: Namespace) -> int:
                 )
 
     if game_version is None or loader_name is None:
-        server_default_config = default_configs["server"]
         server_config_path = paths.configs_dir / "server.json"
 
         if server_config_path.exists():
             server_config = config.read_config(
-                "server", server_default_config["format_version"]
+                "server", default_configs["server"]["format_version"]
             )
             if game_version is None and "game_version" in server_config:
                 game_version = server_config["game_version"]
@@ -112,14 +111,8 @@ def search(args: Namespace) -> int:
     if loader_name is not None:
         search_facets.append([f"project_type:{project_label}"])
         search_facets.append([f"categories:{loader_name}"])
-
-    # Searching for mods| with 'thdilos-fox-origin'| for| Minecraft 1.20.1,| Fabric| sorted by relevance...
-    # Searching for plugins with 'skinsrestorer' for Minecraft 1.20.1, Paper sorted by downloads...
-    # Searching for mods with 'thdilos-fox-origin' for Fabric sorted by relevance...
-    # Searching for mods for Fabric sorted by relevance...
-    # Searching for mods for Minecraft 1.20.1, Fabric sorted by relevance...
-    # Searching for mod for Minecraft 1.20.1, Fabric sorted by relevance...
-    # Wait, I don't really support datapack for now. no searching for vanilla lol
+    else:
+        search_facets.append(["project_type:mod","project_type:plugin"])
 
     search_info = f"Searching {pluralize(project_label, search_limit)}"
     if search_query:
@@ -146,16 +139,16 @@ def search(args: Namespace) -> int:
 
     search_hits = search_result["search_hits"]
 
+    if search_result["total_hits"] == 0:
+        logger.error(f"No {project_label} found.")
+        return 1
+
     if page_number > total_pages:
         logger.error(
             f"Page number is larger than total pages of {total_pages} available"
         )
         return 1
 
-    if search_result["total_hits"] == 0:
-        logger.error(f"No {project_label} found.")
-        return 1
-
     logger.info(
         f"Showing {len(search_hits)} {pluralize(project_label, len(search_hits))} out of {total_hits:,} {pluralize(project_label, total_hits)} (Page {page_number} out of {total_pages})"
     )
@@ -164,7 +157,10 @@ def search(args: Namespace) -> int:
         slug_or_id = hit["project_slug"] if "project_slug" in hit else hit["project_id"]
         project_author = f"by {hit['author_username']}"
 
-        environments = hit["environments"]
+        environments: list[Environment] = hit["environments"]
+        if len(environments) == 0:
+            environments.append("No environment")
+
         readable_environments: list[str] = []
         for environment in environments:
             readable_environments.append(project_environment_name(environment))
@@ -176,7 +172,7 @@ def search(args: Namespace) -> int:
         print(
             f"> {', '.join(readable_environments)}"
         )
-        print(f"> https://modrinth.com/{hit['project_type']}/{slug_or_id}")
+        print(f"> https://modrinth.com/{hit['all_project_types'][0]}/{slug_or_id}")
         print(
             f"  {hit['short_description']}"
         )

mcserver/shared.py

@@ -245,7 +245,7 @@ def project_environment_name(project_environment):
         "singleplayer_only": "Singleplayer only",
     }
 
-    return project_environments[project_environment]
+    return project_environments.get(project_environment, project_environment)
 
 
 def print_status(message: str, dynamic: str | None = None):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mcserver-cli
-Version: 4.0.0
+Version: 4.2.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
@@ -69,4 +69,3 @@ mcserver stop
 
 ## Note
 This is a **Personal Project**, things may be unstable.
-Please do not feed my creation into AI :>

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

@@ -1,4 +1,4 @@
-mcserver/__init__.py,sha256=SQa6Ci17DORmGXi_wkOW9pPlUojF-qtjH6NV1WOThsU,22
+mcserver/__init__.py,sha256=pU56ZDjCDnUbINe39hYuKXHy9UI9Tf4xjWgnxBlxEDk,22
 mcserver/__main__.py,sha256=3-WYJCtLQ8TbzmLMYBiAsm9PC89DwjXc6s_J-izMEz8,30
 mcserver/app.py,sha256=giOF7rFvz9V1RG975l_nvFBMKebvzRsTUyq7wbz7HNU,777
 mcserver/caching.py,sha256=oLIQuiBqlJLxSTCVyrtHoYEZvmtnb3duxhhE-P5bOR8,411
@@ -10,7 +10,7 @@ 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/shared.py,sha256=t_8_bDDRzw0-Tmf9I_RGmgRrk1QsXUF1g4049oCRnrk,7283
+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
@@ -22,7 +22,7 @@ mcserver/commands/op_list.py,sha256=IpojvVqFLd7zwVFm7NjC9dsIVyVVP1gVI0PoVs3aGXc,
 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=Ek9HqXkQTA6TgColaMZMKDkQCW81JzLQSmFh_E_gvbg,6740
+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
@@ -62,8 +62,8 @@ mcserver/server_files/ops.py,sha256=PFhR95aNTJ_sHorZct8hNQLV1OaSL9vOdxf6PqYaxKw,
 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.0.0.dist-info/METADATA,sha256=VHrXQ-Kh8b9DHTR2XCuWv4z9o2MUnVFdtOUzVHC_0tw,2080
-mcserver_cli-4.0.0.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
-mcserver_cli-4.0.0.dist-info/entry_points.txt,sha256=p7uN6UdTzjea7nGIkhjiYDYd7wznkxz9amUPY_fpz24,47
-mcserver_cli-4.0.0.dist-info/licenses/LICENSE,sha256=OzeasqJgwxVpwtMkEYOLoDPUnIDSbVcW62rk-voA3eI,1076
-mcserver_cli-4.0.0.dist-info/RECORD,,
+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,,