@loontail/minecraft-kit 0.2.0 → 0.3.0

package/README.md

@@ -2,6 +2,8 @@
 
 A stateless TypeScript Minecraft launcher library and interactive CLI for vanilla, Fabric, and modern Forge.
 
+**Documentation:** https://loontail.github.io/minecraft-kit/
+
 ## Features
 
 - Resolve and install vanilla Minecraft, Fabric, and modern Forge.

package/dist/cli/index.js

@@ -515,14 +515,16 @@ function planLibraryDownloads(input) {
       );
       if (!seenPaths.has(targetPath)) {
         seenPaths.add(targetPath);
-        downloads.push({
-          kind: InstallActionKinds.DOWNLOAD_FILE,
-          url: artifact.url,
-          target: targetPath,
-          ...artifact.sha1 !== void 0 ? { expectedSha1: artifact.sha1 } : {},
-          ...artifact.size !== void 0 ? { expectedSize: artifact.size } : {},
-          category: input.category
-        });
+        if (artifact.url) {
+          downloads.push({
+            kind: InstallActionKinds.DOWNLOAD_FILE,
+            url: artifact.url,
+            target: targetPath,
+            ...artifact.sha1 !== void 0 ? { expectedSha1: artifact.sha1 } : {},
+            ...artifact.size !== void 0 ? { expectedSize: artifact.size } : {},
+            category: input.category
+          });
+        }
         classpathFiles.push(targetPath);
       }
     }
@@ -531,14 +533,16 @@ function planLibraryDownloads(input) {
       const targetPath = path.join(targetPaths.librariesDir(input.directory), native.relativePath);
       if (!seenPaths.has(targetPath)) {
         seenPaths.add(targetPath);
-        downloads.push({
-          kind: InstallActionKinds.DOWNLOAD_FILE,
-          url: native.url,
-          target: targetPath,
-          ...native.sha1 !== void 0 ? { expectedSha1: native.sha1 } : {},
-          ...native.size !== void 0 ? { expectedSize: native.size } : {},
-          category: input.category
-        });
+        if (native.url) {
+          downloads.push({
+            kind: InstallActionKinds.DOWNLOAD_FILE,
+            url: native.url,
+            target: targetPath,
+            ...native.sha1 !== void 0 ? { expectedSha1: native.sha1 } : {},
+            ...native.size !== void 0 ? { expectedSize: native.size } : {},
+            category: input.category
+          });
+        }
       }
       nativeExtractions.push({
         kind: InstallActionKinds.EXTRACT_NATIVE,
@@ -1342,7 +1346,7 @@ async function buildProcessorActions(input) {
       continue;
     }
     if (!evaluateRules([], { system: input.system })) ;
-    const action = await buildProcessorAction({
+    const action = buildProcessorAction({
       processor,
       directory: input.directory,
       tokens,
@@ -1357,19 +1361,11 @@ function processorAppliesToClient(processor) {
   if (!processor.sides || processor.sides.length === 0) return true;
   return processor.sides.includes("client");
 }
-async function buildProcessorAction(input) {
+function buildProcessorAction(input) {
   const jarPath = path.join(
     targetPaths.librariesDir(input.directory),
     mavenRelativePathFor(input.processor.jar)
   );
-  const mainClass = await readJarMainClass(jarPath);
-  if (!mainClass) {
-    throw new MinecraftKitError(
-      "FORGE_INSTALLER_INVALID",
-      `Processor jar has no Main-Class: ${input.processor.jar}`,
-      { context: { filePath: jarPath } }
-    );
-  }
   const classpath = [
     jarPath,
     ...input.processor.classpath.map(
@@ -1388,7 +1384,6 @@ async function buildProcessorAction(input) {
   return {
     kind: InstallActionKinds.RUN_FORGE_PROCESSOR,
     index: input.index,
-    mainClass,
     classpath,
     args,
     outputs
@@ -1730,16 +1725,32 @@ function isWrite(action) {
 }
 async function runProcessor(input) {
   const startedAt = Date.now();
+  const processorJar = input.action.classpath[0];
+  if (processorJar === void 0) {
+    throw new MinecraftKitError(
+      "FORGE_INSTALLER_INVALID",
+      "Forge processor has an empty classpath",
+      { context: { processorIndex: input.action.index } }
+    );
+  }
+  const mainClass = await readJarMainClass(processorJar);
+  if (!mainClass) {
+    throw new MinecraftKitError(
+      "FORGE_INSTALLER_INVALID",
+      `Forge processor jar has no Main-Class: ${processorJar}`,
+      { context: { filePath: processorJar } }
+    );
+  }
   const classpathSeparator = process.platform === "win32" ? ";" : ":";
   const args = [
     "-cp",
     input.action.classpath.join(classpathSeparator),
-    input.action.mainClass,
+    mainClass,
     ...input.action.args
   ];
   input.onEvent?.({
     type: "forge:processor-started",
-    processor: { index: input.action.index, mainClass: input.action.mainClass },
+    processor: { index: input.action.index, mainClass },
     total: input.total
   });
   const stderrTail = [];
@@ -1754,11 +1765,11 @@ async function runProcessor(input) {
   if (exit.code !== 0) {
     throw new MinecraftKitError(
       "FORGE_PROCESSOR_FAILED",
-      `Forge processor exited with code ${exit.code ?? "(signal)"}: ${input.action.mainClass}`,
+      `Forge processor exited with code ${exit.code ?? "(signal)"}: ${mainClass}`,
       {
         context: {
           exitCode: exit.code ?? void 0,
-          mainClass: input.action.mainClass,
+          mainClass,
           stderr: stderrTail.join("\n")
         }
       }
@@ -1766,7 +1777,7 @@ async function runProcessor(input) {
   }
   input.onEvent?.({
     type: "forge:processor-completed",
-    processor: { index: input.action.index, mainClass: input.action.mainClass },
+    processor: { index: input.action.index, mainClass },
     exitCode: exit.code ?? 0,
     durationMs: Date.now() - startedAt
   });
@@ -1781,7 +1792,7 @@ async function runProcessor(input) {
     }
     input.onEvent?.({
       type: "forge:processor-output-verified",
-      processor: { index: input.action.index, mainClass: input.action.mainClass },
+      processor: { index: input.action.index, mainClass },
       path: outputPath
     });
   }
@@ -3861,6 +3872,7 @@ async function runInstallWithProgress(ctx, target, label) {
     planSpinner.stop(`Plan ready: ${plan.totalActions} actions, ${formatBytes(plan.totalBytes)}.`);
   } catch (error) {
     planSpinner.stop("Planning failed.");
+    ctx.ui.log("error", formatUserError(error));
     throw error;
   }
   const renderer = new ProgressRenderer({
@@ -3901,7 +3913,7 @@ async function runInstallFromSelection(ctx, sel) {
     await runInstallWithProgress(ctx, target, describeLoader(sel));
     return "ok";
   } catch {
-    return "directory";
+    return "cancelled";
   }
 }
 async function runStandaloneRuntimeInstallWithProgress(ctx, input) {
@@ -3918,6 +3930,7 @@ async function runStandaloneRuntimeInstallWithProgress(ctx, input) {
     planSpinner.stop(`Plan ready: ${plan.totalActions} files, ${formatBytes(plan.totalBytes)}.`);
   } catch (error) {
     planSpinner.stop("Planning failed.");
+    ctx.ui.log("error", formatUserError(error));
     throw error;
   }
   const renderer = new ProgressRenderer({
@@ -4530,6 +4543,7 @@ async function scenarioInstallMinecraft(ctx) {
       if (!ok.value) return "cancelled";
       const result = await runInstallFromSelection(ctx, sel);
       if (result === "ok") return "completed";
+      if (result === "cancelled") return "cancelled";
       step = result;
     }
   }