@kzheart_/mc-pilot 0.1.2 → 0.1.3

package/dist/client/ClientManager.js

@@ -1,9 +1,15 @@
 import { mkdirSync, openSync } from "node:fs";
 import { spawn } from "node:child_process";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { MctError } from "../util/errors.js";
 import { getListeningPids, isProcessRunning, killProcessTree } from "../util/process.js";
 import { WebSocketClient } from "./WebSocketClient.js";
+function getLaunchScriptPath() {
+    const thisFile = fileURLToPath(import.meta.url);
+    // dist/client/ClientManager.js -> scripts/launch-fabric-client.mjs
+    return path.resolve(path.dirname(thisFile), "..", "..", "scripts", "launch-fabric-client.mjs");
+}
 const CLIENT_STATE_FILE = "clients.json";
 function getDefaultSnapshot() {
     return {
@@ -46,11 +52,13 @@ export class ClientManager {
                 await new Promise((resolve) => setTimeout(resolve, 250));
             }
         }
-        const launchCommand = configured.launchCommand;
+        const launchCommand = configured.launchArgs
+            ? [process.execPath, getLaunchScriptPath(), ...configured.launchArgs]
+            : configured.launchCommand;
         if (!launchCommand || launchCommand.length === 0) {
             throw new MctError({
                 code: "INVALID_PARAMS",
-                message: `Client ${options.name} requires launchCommand in config`
+                message: `Client ${options.name} requires launchArgs (or launchCommand) in config`
             }, 4);
         }
         const cwd = configured.workingDir

package/dist/download/client/ClientDownloader.d.ts

@@ -36,7 +36,7 @@ export declare function downloadClientMod(context: CommandContext, options: Down
     jar: string;
     cachePath: string;
     clientName: string;
-    launchCommandConfigured: boolean;
+    launchArgsConfigured: boolean;
     runtimeRootDir: string | undefined;
     runtimeVersionId: string | undefined;
 }>;

package/dist/download/client/ClientDownloader.js

@@ -114,10 +114,8 @@ function resolveLaunchRuntimePaths(context, options) {
             : {})
     };
 }
-function buildLaunchCommand(context, runtimePaths, variant) {
+function buildLaunchArgs(runtimePaths, variant) {
     return [
-        process.execPath,
-        getLaunchScriptPath(),
         "--instance-dir",
         runtimePaths.instanceDir,
         "--meta-dir",
@@ -133,10 +131,8 @@ function buildLaunchCommand(context, runtimePaths, variant) {
         variant.fabricLoaderVersion ?? "0.16.10"
     ];
 }
-function buildManagedLaunchCommand(context, runtimeRootDir, versionId, gameDir) {
+function buildManagedLaunchArgs(runtimeRootDir, versionId, gameDir) {
     return [
-        process.execPath,
-        getLaunchScriptPath(),
         "--runtime-root",
         runtimeRootDir,
         "--version-id",
@@ -202,21 +198,22 @@ export async function downloadClientMod(context, options, dependencies = {}) {
     const managedRuntime = runtimePaths
         ? undefined
         : await prepareManagedRuntimeImpl(variant, clientRootDir, { fetchImpl });
-    const generatedLaunchCommand = runtimePaths
-        ? buildLaunchCommand(context, runtimePaths, variant)
-        : buildManagedLaunchCommand(context, managedRuntime.runtimeRootDir, managedRuntime.versionId, managedRuntime.gameDir);
+    const generatedLaunchArgs = runtimePaths
+        ? buildLaunchArgs(runtimePaths, variant)
+        : buildManagedLaunchArgs(managedRuntime.runtimeRootDir, managedRuntime.versionId, managedRuntime.gameDir);
     latestConfig.clients[clientName] = {
         ...configuredClient,
         version: variant.minecraftVersion,
         wsPort: options.wsPort ?? configuredClient.wsPort ?? DEFAULT_WS_PORT_BASE,
         server: options.server ?? configuredClient.server ?? "localhost:25565",
         workingDir: path.relative(context.cwd, minecraftDir) || ".",
+        launchCommand: undefined,
+        launchArgs: generatedLaunchArgs,
         env: {
             ...configuredClient.env,
             MCT_CLIENT_MOD_VARIANT: variant.id,
             MCT_CLIENT_MOD_JAR: path.relative(context.cwd, targetJarPath)
         },
-        ...(generatedLaunchCommand ? { launchCommand: generatedLaunchCommand } : {})
     };
     await writeConfig(context.configPath, context.cwd, latestConfig);
     return {
@@ -232,7 +229,7 @@ export async function downloadClientMod(context, options, dependencies = {}) {
         jar: targetJarPath,
         cachePath: artifact.cachePath,
         clientName,
-        launchCommandConfigured: Boolean(generatedLaunchCommand),
+        launchArgsConfigured: Boolean(generatedLaunchArgs),
         runtimeRootDir: managedRuntime?.runtimeRootDir,
         runtimeVersionId: managedRuntime?.versionId
     };

package/dist/util/config.d.ts

@@ -13,6 +13,7 @@ export interface MctConfig {
         server?: string;
         headless?: boolean;
         launchCommand?: string[];
+        launchArgs?: string[];
         workingDir?: string;
         env?: Record<string, string>;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kzheart_/mc-pilot",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Minecraft plugin/mod automated testing CLI – control a real Minecraft client to simulate player actions",
   "type": "module",
   "bin": {