sandstone-cli 1.2.2 → 1.2.4

package/lib/commands/create.js

@@ -110,7 +110,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;

package/lib/commands/watch.js

@@ -5,6 +5,7 @@ import { buildCommand } from './build.js';
 export async function watchCommand(opts) {
     let alreadyBuilding = false;
     let needRebuild = false;
+    // TODO: reimplement auto reload
     // let client: Client | null = null
     // TODO: add support for clients & resources that require restarts & world resets, sandstone-server should override the involved environment variables if mods are present that fix it
     /*if (flags.autoReload !== undefined) {

package/lib/index.js

@@ -24,6 +24,7 @@ build.option.apply(build, BuildDeclares.dry)
     .option.apply(build, BuildDeclares.world)
     .option.apply(build, BuildDeclares.clientPath)
     .option.apply(build, BuildDeclares.serverPath)
+    .option.apply(build, BuildDeclares.enableSymlinks)
     .action(buildCommand);
 const watch = CLI
     .command('watch')
@@ -40,7 +41,8 @@ watch.option.apply(watch, BuildDeclares.dry)
     .option.apply(watch, BuildDeclares.namespace)
     .option.apply(watch, BuildDeclares.world)
     .option.apply(watch, BuildDeclares.clientPath)
-    .option.apply(watch, BuildDeclares.serverPath);
+    .option.apply(watch, BuildDeclares.serverPath)
+    .option.apply(watch, BuildDeclares.enableSymlinks);
 const create = CLI
     .command('create')
     .description('Create a new Sandstone project. ⛏')

package/lib/shared.js

@@ -15,5 +15,5 @@ export const BuildDeclares = {
     clientPath: ['-c, --client-path <path>', 'Path of the client folder. Override the value specified in the configuration file.'],
     serverPath: ['--server-path <path>', 'Path of the server folder. Override the value specified in the configuration file.'],
     // TODO: ssh
-    // TODO: reimplement auto reload
+    enableSymlinks: ['--enable-symlinks', 'Force enable/disable symlinks. Defaults to false. Useful if you want to enable symlinks on Windows.'],
 }; // Haha TypeScript funny

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.2",
+  "version": "1.2.4",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",

package/src/commands/create.ts

@@ -143,7 +143,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

package/src/commands/watch.ts

@@ -28,6 +28,8 @@ export async function watchCommand(opts: WatchOptions) {
     let alreadyBuilding: boolean = false
     let needRebuild: boolean = false
 
+    // TODO: reimplement auto reload
+
     // let client: Client | null = null
 
     // TODO: add support for clients & resources that require restarts & world resets, sandstone-server should override the involved environment variables if mods are present that fix it

package/src/index.ts

@@ -30,6 +30,8 @@ build.option.apply(build, BuildDeclares.dry)
   .option.apply(build, BuildDeclares.world)
   .option.apply(build, BuildDeclares.clientPath)
   .option.apply(build, BuildDeclares.serverPath)
+
+  .option.apply(build, BuildDeclares.enableSymlinks)
   .action(buildCommand)
 
 const watch = CLI
@@ -50,6 +52,8 @@ watch.option.apply(watch, BuildDeclares.dry)
   .option.apply(watch, BuildDeclares.world)
   .option.apply(watch, BuildDeclares.clientPath)
   .option.apply(watch, BuildDeclares.serverPath)
+  
+  .option.apply(watch, BuildDeclares.enableSymlinks)
 
 const create = CLI
   .command('create')

package/src/shared.ts

@@ -15,6 +15,8 @@ export const BuildDeclares = {
     world: ['-w, --world <name>', 'The name of the world to save the packs in. Override the value specified in the configuration file.'],
     clientPath: ['-c, --client-path <path>', 'Path of the client folder. Override the value specified in the configuration file.'],
     serverPath: ['--server-path <path>', 'Path of the server folder. Override the value specified in the configuration file.'],
+
     // TODO: ssh
-    // TODO: reimplement auto reload
+
+    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(