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

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

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

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

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

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

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

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

@@ -1,6 +1,5 @@
 import asyncio
 import json
-import logging
 from pathlib import Path
 import shutil
 import subprocess
@@ -46,7 +45,7 @@ app = typer.Typer(
 console = Console()
 
 # Configuration
-FABRIC_LOADER_VERSION = "0.18.4"
+FABRIC_LOADER_VERSION = "0.16.9"
 CONFIG_PATH = Path.home() / ".config" / "ModForge-CLI"
 REGISTRY_PATH = CONFIG_PATH / "registry.json"
 MODRINTH_API = CONFIG_PATH / "modrinth_api.json"
@@ -114,6 +113,7 @@ def main_callback(
 
     if verbose:
         # Enable verbose logging
+        import logging
 
         logging.basicConfig(
             level=logging.DEBUG,
@@ -176,8 +176,8 @@ def setup(
     manifest = Manifest(name=name, minecraft=mc, loader=loader, loader_version=loader_version)
     (pack_dir / "ModForge-CLI.json").write_text(manifest.model_dump_json(indent=4))
 
-    # Create Modrinth index
-    # Map loader names to their dependency keys
+    # Create Modrinth index following official format
+    # See: https://docs.modrinth.com/docs/modpacks/format/
     loader_key_map = {
         "fabric": "fabric-loader",
         "quilt": "quilt-loader",
@@ -191,8 +191,8 @@ def setup(
         "game": "minecraft",
         "versionId": "1.0.0",
         "name": name,
-        "dependencies": {"minecraft": mc, loader_key: loader_version},
-        "files": [],  # Only for overrides, not mods
+        "files": [],  # Will be populated during build
+        "dependencies": {loader_key: loader_version, "minecraft": mc},
     }
     (pack_dir / "modrinth.index.json").write_text(json.dumps(index_data, indent=2))
 
@@ -367,7 +367,6 @@ 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)
 
@@ -492,7 +491,6 @@ 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.2.0 → modforge_cli-0.2.1}/src/modforge_cli/core/downloader.py

@@ -34,6 +34,10 @@ class ModDownloader:
 
         self.index = json.loads(index_file.read_text())
 
+        # Ensure files array exists
+        if "files" not in self.index:
+            self.index["files"] = []
+
     def _select_compatible_version(self, versions: list[dict]) -> dict | None:
         """
         Select the most appropriate version based on:
@@ -75,11 +79,11 @@ class ModDownloader:
 
     async def download_all(self, project_ids: Iterable[str]) -> None:
         """
-        Download all mods and update modrinth.index.json dependencies.
+        Download all mods and register them in modrinth.index.json.
 
-        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.
+        The index format follows Modrinth's standard:
+        - files: array of all mods with hashes, URLs, and metadata
+        - dependencies: MC version and loader version
         """
         tasks = [self._download_project(pid) for pid in project_ids]
 
@@ -95,35 +99,9 @@ class ModDownloader:
                 await coro
                 progress.advance(task_id)
 
-        # Update dependencies section with correct loader version
-        self._update_dependencies()
+        # Write updated index
         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)
@@ -171,17 +149,21 @@ class ModDownloader:
         # 4. Download file to mods/ directory
         dest = self.output_dir / primary_file["filename"]
 
-        # Skip if already downloaded and hash matches
-        if dest.exists():
-            existing_hash = hashlib.sha1(dest.read_bytes()).hexdigest()
-            if existing_hash == primary_file["hashes"]["sha1"]:
-                console.print(f"[dim]✓ {primary_file['filename']} (cached)[/dim]")
-                return
-            else:
-                console.print(
-                    f"[yellow]Re-downloading {primary_file['filename']} (hash mismatch)[/yellow]"
-                )
+        # Check if already registered in index
+        existing_entry = next(
+            (f for f in self.index["files"] if f["path"] == f"mods/{primary_file['filename']}"),
+            None,
+        )
 
+        if existing_entry:
+            # Verify hash matches
+            if dest.exists():
+                existing_hash = hashlib.sha1(dest.read_bytes()).hexdigest()
+                if existing_hash == primary_file["hashes"]["sha1"]:
+                    console.print(f"[dim]✓ {primary_file['filename']} (cached)[/dim]")
+                    return
+
+        # Download the file
         try:
             async with self.session.get(primary_file["url"]) as r:
                 if r.status != 200:
@@ -197,14 +179,31 @@ class ModDownloader:
 
         # 5. Verify hash
         sha1 = hashlib.sha1(data).hexdigest()
+        sha512 = hashlib.sha512(data).hexdigest()
+
         if sha1 != primary_file["hashes"]["sha1"]:
-            dest.unlink(missing_ok=True)  # Delete corrupted file
+            dest.unlink(missing_ok=True)
             raise RuntimeError(
                 f"Hash mismatch for {primary_file['filename']}\n"
                 f"  Expected: {primary_file['hashes']['sha1']}\n"
                 f"  Got:      {sha1}"
             )
 
+        # 6. Register in index (Modrinth format)
+        file_entry = {
+            "path": f"mods/{primary_file['filename']}",
+            "hashes": {"sha1": sha1, "sha512": sha512},
+            "env": {"client": "required", "server": "required"},
+            "downloads": [primary_file["url"]],
+            "fileSize": primary_file["size"],
+        }
+
+        # Remove existing entry if present (update scenario)
+        self.index["files"] = [f for f in self.index["files"] if f["path"] != file_entry["path"]]
+
+        # Add new entry
+        self.index["files"].append(file_entry)
+
         console.print(
             f"[green]✓[/green] {primary_file['filename']} "
             f"[dim](v{version.get('version_number')}, {self.loader})[/dim]"

{modforge_cli-0.2.0 → modforge_cli-0.2.1}/src/modforge_cli/core/utils.py

@@ -159,8 +159,8 @@ def install_fabric(
             f"Fabric installation failed:\n{e.stderr}\n\n"
             f"Make sure Java is installed and accessible."
         ) from e
-    except FileNotFoundError:
-        raise RuntimeError("Java not found. Please install Java 17 or higher and try again.")
+    except FileNotFoundError as e:
+        raise RuntimeError("Java not found. Please install Java 17 or higher and try again.") from e
 
 
 def detect_install_method() -> str: