feat: add modpack selection functionality and improve modpack management; refactor Minecraft launch process

Author: hampta

src/auth.py

@@ -260,5 +260,16 @@ async def __render_skin(self, skin_url):
                 return resp
             return resp
 
+    @property
+    def username(self):
+        return self.user["user"]["players"][0]["name"]
+
+    @property
+    def uuid(self):
+        return self.user["user"]["players"][0]["uuid"]
+
+    @property
+    def access_token(self):
+        return self.account.get("access_token", "")
 
 account = Auth()

src/config.py

@@ -40,9 +40,6 @@
     f"https://raw.githubusercontent.com/{MODPACK_REPO}/refs/heads/main/README.md"
 )
 
-MODPACK_INDEX_URL = (
-    f"https://raw.githubusercontent.com/{MODPACK_REPO}/refs/heads/main/modrinth.index.json"
-)
 MODPACK_REPO_URL = f"https://github.com/{MODPACK_REPO}"
 LATEST_LAUNCHER_RELEASE_URL = (
     "https://api.github.com/repos/cubedvij/launcher/releases/latest"

src/minecraft_launcher_lib/install.py

@@ -3,6 +3,7 @@
 import shutil
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
+import platform
 from typing import Optional
 
 import httpx
@@ -23,7 +24,9 @@
 
 __all__ = ["install_minecraft_version"]
 
-
+_platform = platform.system().lower()
+if _platform == "darwin":
+    _platform = "osx"
 
 
 def _download_and_extract_native(
@@ -65,7 +68,8 @@ def install_libraries(
     """
     base_path = Path(base_path)
     filtered_libraries = [
-        lib_info for lib_info in libraries
+        lib_info
+        for lib_info in libraries
         if parse_rule_list(lib_info.get("rules", []), {})
     ]
 
@@ -75,8 +79,15 @@ def install_libraries(
     def download_library(lib_info: ClientJsonLibrary) -> None:
         # Download natives if present
         if "classifiers" in lib_info.get("downloads", {}):
-            jar_filename_native = lib_info["downloads"]["artifact"]["path"]
-            libraries_path = base_path / "libraries" / lib_info["path"]
+            jar_filename_native = lib_info["downloads"].get("artifact")
+            if jar_filename_native:
+                jar_filename_native = jar_filename_native["path"]
+            else:
+                jar_filename_native = lib_info["downloads"]["classifiers"][
+                    f"natives-{_platform}"
+                ]["path"]
+            libraries_path = base_path / "libraries" / Path(jar_filename_native).parent
+            libraries_path.mkdir(parents=True, exist_ok=True)
             check_path_inside_minecraft_directory(str(base_path), str(libraries_path))
             _download_and_extract_native(
                 lib_info, libraries_path, jar_filename_native, version_id, base_path
@@ -203,7 +214,10 @@ def do_version_install(
         jobs.append(
             {
                 "url": client_info["url"],
-                "path": base_path / "versions" / versiondata["id"] / f"{versiondata['id']}.jar",
+                "path": base_path
+                / "versions"
+                / versiondata["id"]
+                / f"{versiondata['id']}.jar",
                 "sha1": client_info["sha1"],
                 "minecraft_directory": str(base_path),
             }
@@ -279,4 +293,4 @@ def install_minecraft_version(
                 sha1=version.get("sha1"),
             )
             return
-    raise VersionNotFound(version_id)
+    raise VersionNotFound(version_id)