sandstone-cli 1.2.3 → 1.2.5

package/lib/commands/create.js

@@ -68,6 +68,9 @@ export async function createCommand(_project, opts) {
     // Find the save directory
     const saveOptions = {};
     if (version[0].major === 1) {
+        if (opts.clientPath) {
+            saveOptions.clientPath = opts.clientPath;
+        }
         if (opts.root) {
             saveOptions.root = true;
         }
@@ -110,7 +113,7 @@ export async function createCommand(_project, opts) {
                         name: 'world',
                         message: 'What world do you want to save the packs in? >',
                         type: 'list',
-                        choices: getWorldsList,
+                        choices: () => getWorldsList(saveOptions.clientPath),
                     });
                     saveOptions.world = world;
                     break;
@@ -125,9 +128,6 @@ export async function createCommand(_project, opts) {
                 case 'none': break;
             }
         }
-        if (opts.clientPath) {
-            saveOptions.clientPath = opts.clientPath;
-        }
     }
     let packageManager = 'npm';
     const yarn = hasYarn();

package/lib/utils.d.ts

@@ -22,4 +22,4 @@ export declare const capitalize: (s: string) => string;
  * Get the .minecraft path
  */
 export declare function getMinecraftPath(): string;
-export declare function getWorldsList(): string[];
+export declare function getWorldsList(clientPath?: string): string[];

package/lib/utils.js

@@ -82,8 +82,8 @@ export function getMinecraftPath() {
     }
     return mcPath;
 }
-export function getWorldsList() {
-    const mcPath = getMinecraftPath();
+export function getWorldsList(clientPath) {
+    const mcPath = clientPath || getMinecraftPath();
     const savesPath = path.join(mcPath, 'saves');
     return fs.readdirSync(savesPath, { withFileTypes: true }).filter((f) => f.isDirectory).map((f) => f.name);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandstone-cli",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",

package/src/commands/create.ts

@@ -103,6 +103,10 @@ export async function createCommand(_project: string, opts: CreateOptions) {
   } = {}
 
   if (version[0].major === 1) {
+    if (opts.clientPath) {
+      saveOptions.clientPath = opts.clientPath
+    }
+
     if (opts.root) {
       saveOptions.root = true
     } else if (opts.world) {
@@ -143,7 +147,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
             name: 'world',
             message: 'What world do you want to save the packs in? >',
             type: 'list',
-            choices: getWorldsList,
+            choices: () => getWorldsList(saveOptions.clientPath),
           })
           saveOptions.world = world
           break
@@ -159,9 +163,6 @@ export async function createCommand(_project: string, opts: CreateOptions) {
         case 'none': break
       }
     }
-    if (opts.clientPath) {
-      saveOptions.clientPath = opts.clientPath
-    }
   }
 
   let packageManager = 'npm'

package/src/shared.ts

@@ -17,6 +17,6 @@ export const BuildDeclares = {
     serverPath: ['--server-path <path>', 'Path of the server folder. Override the value specified in the configuration file.'],
 
     // TODO: ssh
-    
+
     enableSymlinks: ['--enable-symlinks', 'Force enable/disable symlinks. Defaults to false. Useful if you want to enable symlinks on Windows.'],
   } as unknown as Record<string, [string, string, RegExp, boolean]> // Haha TypeScript funny

package/src/utils.ts

@@ -98,8 +98,8 @@ export function getMinecraftPath(): string {
   return mcPath
 }
 
-export function getWorldsList(): string[] {
-  const mcPath = getMinecraftPath()
+export function getWorldsList(clientPath?: string): string[] {
+  const mcPath = clientPath || getMinecraftPath()
   const savesPath = path.join(mcPath, 'saves')
 
   return fs.readdirSync(