modforge-cli 0.1.9.2__tar.gz → 0.2.0__tar.gz

{modforge_cli-0.1.9.2 → modforge_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modforge-cli
-Version: 0.1.9.2
+Version: 0.2.0
 Summary: ModForge-CLI — a Modrinth-based Minecraft modpack builder
 License: MIT
 License-File: LICENSE

{modforge_cli-0.1.9.2 → modforge_cli-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "modforge-cli"
-version = "0.1.9.2"
+version = "0.2.0"
 description = "ModForge-CLI — a Modrinth-based Minecraft modpack builder"
 authors = [{ name = "Frank1o3", email = "jahdy1o3@gmail.com" }]
 license = { text = "MIT" }

{modforge_cli-0.1.9.2 → modforge_cli-0.2.0}/src/modforge_cli/__version__.py

@@ -1,5 +1,5 @@
 """
 Auto-generated file. DO NOT EDIT.
 """
-__version__ = "0.1.9.2"
+__version__ = "0.2.0"
 __author__ = "Frank1o3"

{modforge_cli-0.1.9.2 → modforge_cli-0.2.0}/src/modforge_cli/cli.py

@@ -46,7 +46,7 @@ app = typer.Typer(
 console = Console()
 
 # Configuration
-FABRIC_LOADER_VERSION = "0.16.9"
+FABRIC_LOADER_VERSION = "0.18.4"
 CONFIG_PATH = Path.home() / ".config" / "ModForge-CLI"
 REGISTRY_PATH = CONFIG_PATH / "registry.json"
 MODRINTH_API = CONFIG_PATH / "modrinth_api.json"
@@ -54,6 +54,7 @@ POLICY_PATH = CONFIG_PATH / "policy.json"
 
 # Use versioned URLs to prevent breaking changes
 GITHUB_RAW = "https://raw.githubusercontent.com/Frank1o3/ModForge-CLI"
+VERSION_TAG = "v0.1.8"  # Update this with each release
 
 FABRIC_INSTALLER_URL = (
     "https://maven.fabricmc.net/net/fabricmc/fabric-installer/1.1.1/fabric-installer-1.1.1.jar"
@@ -62,8 +63,8 @@ FABRIC_INSTALLER_SHA256 = (
     "8fa465768bd7fc452e08c3a1e5c8a6b4b5f6a4e64bc7def47f89d8d3a6f4e7b8"  # Replace with actual hash
 )
 
-DEFAULT_MODRINTH_API_URL = f"{GITHUB_RAW}/{__version__}/configs/modrinth_api.json"
-DEFAULT_POLICY_URL = f"{GITHUB_RAW}/{__version__}/configs/policy.json"
+DEFAULT_MODRINTH_API_URL = f"{GITHUB_RAW}/{VERSION_TAG}/configs/modrinth_api.json"
+DEFAULT_POLICY_URL = f"{GITHUB_RAW}/{VERSION_TAG}/configs/policy.json"
 
 # Setup crash logging
 LOG_DIR = setup_crash_logging()
@@ -113,6 +114,7 @@ def main_callback(
 
     if verbose:
         # Enable verbose logging
+
         logging.basicConfig(
             level=logging.DEBUG,
             format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
@@ -175,13 +177,22 @@ def setup(
     (pack_dir / "ModForge-CLI.json").write_text(manifest.model_dump_json(indent=4))
 
     # Create Modrinth index
+    # Map loader names to their dependency keys
+    loader_key_map = {
+        "fabric": "fabric-loader",
+        "quilt": "quilt-loader",
+        "forge": "forge",
+        "neoforge": "neoforge",
+    }
+    loader_key = loader_key_map.get(loader.lower(), loader.lower())
+
     index_data = {
         "formatVersion": 1,
         "game": "minecraft",
         "versionId": "1.0.0",
         "name": name,
-        "dependencies": {"minecraft": mc, loader: "*"},
-        "files": [],
+        "dependencies": {"minecraft": mc, loader_key: loader_version},
+        "files": [],  # Only for overrides, not mods
     }
     (pack_dir / "modrinth.index.json").write_text(json.dumps(index_data, indent=2))
 
@@ -265,7 +276,7 @@ def resolve(pack_name: str | None = None) -> None:
         policy=policy, api=api, mc_version=manifest.minecraft, loader=manifest.loader
     )
 
-    async def do_resolve() -> set[str]:
+    async def do_resolve():
         async with await get_api_session() as session:
             return await resolver.resolve(manifest.mods, session)
 
@@ -356,6 +367,7 @@ def export(pack_name: str | None = None) -> None:
 
         if not installer.exists():
             console.print("[yellow]Downloading Fabric installer...[/yellow]")
+            
 
             urllib.request.urlretrieve(FABRIC_INSTALLER_URL, installer)
 
@@ -375,16 +387,11 @@ def export(pack_name: str | None = None) -> None:
                 loader_version=loader_version,
                 game_dir=pack_path,
             )
+            console.print(f"[green]✓ Fabric {loader_version} installed[/green]")
         except RuntimeError as e:
             console.print(f"[red]{e}[/red]")
             raise typer.Exit(1) from e
 
-        # Update index
-        index_file = pack_path / "modrinth.index.json"
-        index = json.loads(index_file.read_text())
-        index["dependencies"]["fabric-loader"] = loader_version
-        index_file.write_text(json.dumps(index, indent=2))
-
         installer.unlink(missing_ok=True)
 
     # Create .mrpack
@@ -485,6 +492,7 @@ def doctor() -> None:
 
     # Check Java
     try:
+
         result = subprocess.run(["java", "-version"], capture_output=True, text=True, check=True)
         console.print("[green]✓[/green] Java installed")
     except (FileNotFoundError, subprocess.CalledProcessError):

{modforge_cli-0.1.9.2 → modforge_cli-0.2.0}/src/modforge_cli/core/downloader.py

@@ -74,6 +74,13 @@ class ModDownloader:
         return compatible[0]
 
     async def download_all(self, project_ids: Iterable[str]) -> None:
+        """
+        Download all mods and update modrinth.index.json dependencies.
+
+        Note: Modrinth launchers auto-download mods based on dependencies.
+        We download to mods/ folder for local use, but the index only needs
+        the version IDs in dependencies, not file paths.
+        """
         tasks = [self._download_project(pid) for pid in project_ids]
 
         with Progress(
@@ -88,8 +95,35 @@ class ModDownloader:
                 await coro
                 progress.advance(task_id)
 
+        # Update dependencies section with correct loader version
+        self._update_dependencies()
         self.index_file.write_text(json.dumps(self.index, indent=2))
 
+    def _update_dependencies(self) -> None:
+        """
+        Ensure dependencies section has correct MC version and loader.
+        This is what launchers use to setup the game.
+        """
+        if "dependencies" not in self.index:
+            self.index["dependencies"] = {}
+
+        # Set Minecraft version
+        self.index["dependencies"]["minecraft"] = self.mc_version
+
+        # Set loader (fabric-loader, forge, quilt-loader, neoforge)
+        loader_key_map = {
+            "fabric": "fabric-loader",
+            "quilt": "quilt-loader",
+            "forge": "forge",
+            "neoforge": "neoforge",
+        }
+
+        loader_key = loader_key_map.get(self.loader.lower(), self.loader.lower())
+
+        # Use "*" to let launcher pick latest compatible version
+        # Or you can specify exact version if available
+        self.index["dependencies"][loader_key] = "*"
+
     async def _download_project(self, project_id: str) -> None:
         # 1. Fetch all versions for this project
         url = self.api.project_versions(project_id)
@@ -134,15 +168,14 @@ class ModDownloader:
             )
             return
 
-        # 4. Download file
+        # 4. Download file to mods/ directory
         dest = self.output_dir / primary_file["filename"]
 
-        # Skip if already downloaded
+        # Skip if already downloaded and hash matches
         if dest.exists():
-            # Verify existing file hash
             existing_hash = hashlib.sha1(dest.read_bytes()).hexdigest()
             if existing_hash == primary_file["hashes"]["sha1"]:
-                console.print(f"[dim]Skipping {primary_file['filename']} (already exists)[/dim]")
+                console.print(f"[dim]✓ {primary_file['filename']} (cached)[/dim]")
                 return
             else:
                 console.print(
@@ -172,17 +205,7 @@ class ModDownloader:
                 f"  Got:      {sha1}"
             )
 
-        # 6. Register in index
-        self.index["files"].append(
-            {
-                "path": f"mods/{primary_file['filename']}",
-                "hashes": {"sha1": sha1},
-                "downloads": [primary_file["url"]],
-                "fileSize": primary_file["size"],
-            }
-        )
-
         console.print(
             f"[green]✓[/green] {primary_file['filename']} "
-            f"[dim](MC {self.mc_version}, {self.loader})[/dim]"
+            f"[dim](v{version.get('version_number')}, {self.loader})[/dim]"
         )