@minecraft-docker/mcctl 1.12.1 → 1.14.0

package/dist/lib/prerequisite-display.js

@@ -0,0 +1,42 @@
+import { colors, log } from '@minecraft-docker/shared';
+/**
+ * Display a PrerequisiteReport as a formatted table.
+ * Returns true if all mandatory prerequisites are satisfied.
+ */
+export function displayPrerequisiteReport(report) {
+    for (const r of report.results) {
+        const versionStr = r.version ?? 'not found';
+        // Only add 'v' prefix if version looks like a semver number
+        const displayVersion = r.version && /^\d/.test(r.version) ? `v${versionStr}` : versionStr;
+        const requiredStr = `(${r.required})`;
+        if (r.satisfied) {
+            console.log(`  ✓ ${r.name.padEnd(18)} ${colors.green(displayVersion)}  ${colors.dim(requiredStr)}`);
+        }
+        else if (r.optional) {
+            console.log(`  ⚠ ${r.name.padEnd(18)} ${colors.yellow(displayVersion)}  ${colors.dim(requiredStr)}`);
+            if (r.hint) {
+                console.log(`    ${colors.dim(r.hint)}`);
+            }
+        }
+        else {
+            console.log(`  ✗ ${r.name.padEnd(18)} ${colors.red(versionStr)}  ${colors.dim(requiredStr)}`);
+            if (r.hint) {
+                console.log(`    ${colors.dim(r.hint)}`);
+            }
+        }
+    }
+    if (!report.allSatisfied) {
+        console.log('');
+        const failed = report.results.filter(r => !r.optional && !r.satisfied);
+        for (const f of failed) {
+            if (!f.installed) {
+                log.error(`${f.name} is not installed`);
+            }
+            else {
+                log.error(`${f.name} version ${f.version} does not meet minimum requirement ${f.required}`);
+            }
+        }
+    }
+    return report.allSatisfied;
+}
+//# sourceMappingURL=prerequisite-display.js.map

package/dist/lib/prerequisite-display.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prerequisite-display.js","sourceRoot":"","sources":["../../src/lib/prerequisite-display.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAEvD;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAA0B;IAClE,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,IAAI,WAAW,CAAC;QAC5C,4DAA4D;QAC5D,MAAM,cAAc,GAAG,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;QAC1F,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,QAAQ,GAAG,CAAC;QAEtC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC;aAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACrG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;gBACX,OAAO,CAAC,GAAG,CAAC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAC9F,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;gBACX,OAAO,CAAC,GAAG,CAAC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACvE,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;YACvB,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;gBACjB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,mBAAmB,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,OAAO,sCAAsC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC9F,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC,YAAY,CAAC;AAC7B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minecraft-docker/mcctl",
-  "version": "1.12.1",
+  "version": "1.14.0",
   "description": "CLI tool for managing Docker Minecraft servers with mc-router",
   "type": "module",
   "bin": {
@@ -55,8 +55,9 @@
   ],
   "dependencies": {
     "@clack/prompts": "^0.8.0",
-    "@minecraft-docker/mod-source-modrinth": "^1.12.1",
-    "@minecraft-docker/shared": "^1.12.1",
+    "@minecraft-docker/mod-source-modrinth": "^1.14.0",
+    "@minecraft-docker/shared": "^1.14.0",
+    "better-sqlite3": "^12.6.2",
     "commander": "^12.0.0",
     "js-yaml": "^4.1.0",
     "picocolors": "^1.1.0",
@@ -65,6 +66,7 @@
     "tar": "^7.5.4"
   },
   "devDependencies": {
+    "@types/better-sqlite3": "^7.6.13",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.10.0",
     "@types/tar": "^6.1.13",

package/scripts/create-server.sh

@@ -13,11 +13,14 @@
 #                  - Hostname: <server-name>.local
 #
 # Options:
-#   -t, --type TYPE      Server type: PAPER (default), VANILLA, FORGE, FABRIC
+#   -t, --type TYPE      Server type: PAPER (default), VANILLA, FORGE, FABRIC, MODRINTH, AUTO_CURSEFORGE
 #   -v, --version VER    Minecraft version (e.g., 1.21.1, 1.20.4)
 #   -s, --seed NUMBER    World seed for new world generation
 #   -u, --world-url URL  Download world from ZIP URL
 #   -w, --world NAME     Use existing world from worlds/ directory (creates symlink)
+#   --modpack SLUG       Modpack slug (required for MODRINTH/AUTO_CURSEFORGE)
+#   --modpack-version VER  Modpack version (optional)
+#   --mod-loader LOADER  Mod loader: fabric, forge, neoforge, quilt (optional)
 #   --no-start           Don't start the server after creation
 #   --start              Start the server after creation (default)
 #
@@ -222,6 +225,9 @@ MC_VERSION=""
 WORLD_SEED=""
 WORLD_URL=""
 WORLD_NAME=""
+MODPACK_SLUG=""
+MODPACK_VERSION=""
+MOD_LOADER=""
 START_SERVER="true"
 
 # Show usage
@@ -232,11 +238,14 @@ show_usage() {
     echo "  server-name  : Name for the new server (lowercase, no spaces)"
     echo ""
     echo "Options:"
-    echo "  -t, --type TYPE      Server type: PAPER (default), VANILLA, FORGE, FABRIC"
+    echo "  -t, --type TYPE      Server type: PAPER (default), VANILLA, FORGE, FABRIC, MODRINTH, AUTO_CURSEFORGE"
     echo "  -v, --version VER    Minecraft version (e.g., 1.21.1, 1.20.4)"
     echo "  -s, --seed NUMBER    World seed for new world generation"
     echo "  -u, --world-url URL  Download world from ZIP URL"
     echo "  -w, --world NAME     Use existing world from worlds/ directory (creates symlink)"
+    echo "  --modpack SLUG       Modpack slug (required for MODRINTH/AUTO_CURSEFORGE)"
+    echo "  --modpack-version VER  Modpack version (optional)"
+    echo "  --mod-loader LOADER  Mod loader: fabric, forge, neoforge, quilt (optional)"
     echo "  --no-start           Don't start the server after creation"
     echo "  --start              Start the server after creation (default)"
     echo ""
@@ -249,6 +258,7 @@ show_usage() {
     echo "  $0 myserver --seed 12345"
     echo "  $0 myserver --world-url https://example.com/world.zip"
     echo "  $0 myserver --world existing-world -v 1.21.1 --no-start"
+    echo "  $0 myserver -t MODRINTH --modpack fabric-example --modpack-version 1.0.0"
 }
 
 # Check if first argument exists
@@ -286,6 +296,18 @@ while [[ $# -gt 0 ]]; do
             WORLD_NAME="$2"
             shift 2
             ;;
+        --modpack)
+            MODPACK_SLUG="$2"
+            shift 2
+            ;;
+        --modpack-version)
+            MODPACK_VERSION="$2"
+            shift 2
+            ;;
+        --mod-loader)
+            MOD_LOADER="$2"
+            shift 2
+            ;;
         --no-start)
             START_SERVER="false"
             shift
@@ -300,7 +322,7 @@ while [[ $# -gt 0 ]]; do
             ;;
         *)
             # For backward compatibility: if it looks like a server type, use it
-            if [[ "$1" =~ ^(PAPER|VANILLA|FORGE|FABRIC|NEOFORGE|QUILT|SPIGOT)$ ]]; then
+            if [[ "$1" =~ ^(PAPER|VANILLA|FORGE|FABRIC|NEOFORGE|QUILT|SPIGOT|MODRINTH|AUTO_CURSEFORGE)$ ]]; then
                 SERVER_TYPE="$1"
                 shift
             else
@@ -325,6 +347,15 @@ if [ "$WORLD_OPTIONS_COUNT" -gt 1 ]; then
     exit 1
 fi
 
+# Validate modpack options for MODRINTH and AUTO_CURSEFORGE types
+if [[ "$SERVER_TYPE" =~ ^(MODRINTH|AUTO_CURSEFORGE)$ ]]; then
+    if [ -z "$MODPACK_SLUG" ]; then
+        echo -e "${RED}Error: --modpack SLUG is required for $SERVER_TYPE server type${NC}"
+        echo "Example: $0 $SERVER_NAME -t $SERVER_TYPE --modpack fabric-example"
+        exit 1
+    fi
+fi
+
 # Validate server name (lowercase, alphanumeric, hyphens only)
 if [[ ! "$SERVER_NAME" =~ ^[a-z][a-z0-9-]*$ ]]; then
     echo -e "${RED}Error: Server name must start with a letter and contain only lowercase letters, numbers, and hyphens${NC}"
@@ -440,6 +471,35 @@ if [ -f "$CONFIG_FILE" ]; then
             sed -i "s/^LEVEL=.*/LEVEL=$WORLD_NAME/" "$CONFIG_FILE"
         fi
     fi
+
+    # Apply modpack options
+    if [ -n "$MODPACK_SLUG" ]; then
+        echo "" >> "$CONFIG_FILE"
+        echo "# Modpack Configuration" >> "$CONFIG_FILE"
+        if [[ "$SERVER_TYPE" == "MODRINTH" ]]; then
+            echo "MODRINTH_MODPACK=$MODPACK_SLUG" >> "$CONFIG_FILE"
+            echo "   Modpack: $MODPACK_SLUG (Modrinth)"
+            if [ -n "$MODPACK_VERSION" ]; then
+                echo "MODRINTH_VERSION=$MODPACK_VERSION" >> "$CONFIG_FILE"
+                echo "   Modpack version: $MODPACK_VERSION"
+            fi
+            if [ -n "$MOD_LOADER" ]; then
+                echo "MODRINTH_LOADER=$MOD_LOADER" >> "$CONFIG_FILE"
+                echo "   Mod loader: $MOD_LOADER"
+            fi
+        elif [[ "$SERVER_TYPE" == "AUTO_CURSEFORGE" ]]; then
+            echo "CF_SLUG=$MODPACK_SLUG" >> "$CONFIG_FILE"
+            echo "   Modpack: $MODPACK_SLUG (CurseForge)"
+            if [ -n "$MODPACK_VERSION" ]; then
+                echo "CF_VERSION=$MODPACK_VERSION" >> "$CONFIG_FILE"
+                echo "   Modpack version: $MODPACK_VERSION"
+            fi
+            if [ -n "$MOD_LOADER" ]; then
+                echo "CF_LOADER=$MOD_LOADER" >> "$CONFIG_FILE"
+                echo "   Mod loader: $MOD_LOADER"
+            fi
+        fi
+    fi
 fi
 
 # Create data and logs directories

package/templates/.env.example

@@ -52,7 +52,7 @@ COMPOSE_PROJECT_NAME=minecraft
 # BACKUP_AUTO_ON_STOP=true
 
 # =============================================================================
-# Admin Service Configuration (Optional)
+# Management Console Configuration (Optional)
 # =============================================================================
 # Web-based management UI for Minecraft servers.
 # Start with: mcctl admin service start