sandstone-cli 1.2.1 → 1.2.3

package/lib/commands/create.js

@@ -82,9 +82,9 @@ export async function createCommand(_project, opts) {
             const { saveChoice } = await inquirer.prompt({
                 name: 'saveChoice',
                 type: 'list',
-                message: 'Where do you want your pack(s) to be saved (can be changed later)?',
+                message: 'Where do you want your pack(s) to be exported to (can be changed later)?',
                 choices: [{
-                        name: 'In the root client (.minecraft) folder',
+                        name: 'In the root client (.minecraft/datapacks & .minecraft/resourcepacks) folder(s)',
                         value: 'root',
                         short: 'Client folder',
                     }, {
@@ -95,27 +95,34 @@ export async function createCommand(_project, opts) {
                         name: 'In a server',
                         value: 'server-path',
                         short: 'Server path',
+                    }, {
+                        name: 'N/A',
+                        value: 'none',
+                        short: 'None',
                     }],
             });
-            if (saveChoice === 'root') {
-                saveOptions.root = true;
-            }
-            else if (saveChoice === 'world') {
-                const { world } = await inquirer.prompt({
-                    name: 'world',
-                    message: 'What world do you want to save the packs in? >',
-                    type: 'list',
-                    choices: getWorldsList,
-                });
-                saveOptions.world = world;
-            }
-            else { // TODO: Add native folder selector
-                const { serverPath } = await inquirer.prompt({
-                    name: 'serverPath',
-                    message: 'Where is the server to save the packs in? Relative paths are accepted. >',
-                    type: 'input',
-                });
-                saveOptions.serverPath = serverPath;
+            switch (saveChoice) {
+                case 'root':
+                    saveOptions.root = true;
+                    break;
+                case 'world':
+                    const { world } = await inquirer.prompt({
+                        name: 'world',
+                        message: 'What world do you want to save the packs in? >',
+                        type: 'list',
+                        choices: getWorldsList,
+                    });
+                    saveOptions.world = world;
+                    break;
+                case 'server-path':
+                    const { serverPath } = await inquirer.prompt({
+                        name: 'serverPath',
+                        message: 'Where is the server to save the packs in? Relative paths are accepted. >',
+                        type: 'input',
+                    });
+                    saveOptions.serverPath = serverPath;
+                    break;
+                case 'none': break;
             }
         }
         if (opts.clientPath) {
@@ -146,7 +153,6 @@ export async function createCommand(_project, opts) {
     exec(`git checkout ${projectType}-${version[0]}`);
     exec('npx rimraf -rf .git');
     exec(`${packageManager} install`);
-    // TODO: Make profiles for either packs or libraries
     const configPath = path.join(projectPath, `${projectType === 'library' ? 'test/' : ''}sandstone.config.ts`);
     // Merge with the config values
     let templateConfig = await fs.readFile(configPath, 'utf8');
@@ -155,7 +161,6 @@ export async function createCommand(_project, opts) {
     templateConfig = templateConfig.replace('namespace: \'default\'', `namespace: ${toJson(namespace)}`);
     // TODO: packFormat
     const optsJson = toJson(Object.fromEntries(Object.entries(saveOptions).filter(([_, value]) => value !== undefined)));
-    console.log(saveOptions, optsJson);
     if (optsJson !== '{}') {
         templateConfig = templateConfig.replace('saveOptions: {}', `saveOptions: ${optsJson}`);
     }

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/package.json

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

package/src/commands/create.ts

@@ -111,12 +111,12 @@ export async function createCommand(_project: string, opts: CreateOptions) {
       saveOptions.serverPath = opts.serverPath
     } else { // TODO: Add support for ssh
       // User didn't specify a way to save the file. Ask them.
-      const { saveChoice }: { saveChoice: 'root' | 'world' | 'server-path' } = await inquirer.prompt({
+      const { saveChoice }: { saveChoice: 'root' | 'world' | 'server-path' | 'none' } = await inquirer.prompt({
         name: 'saveChoice',
         type: 'list',
-        message: 'Where do you want your pack(s) to be saved (can be changed later)?',
+        message: 'Where do you want your pack(s) to be exported to (can be changed later)?',
         choices: [{
-          name: 'In the root client (.minecraft) folder',
+          name: 'In the root client (.minecraft/datapacks & .minecraft/resourcepacks) folder(s)',
           value: 'root',
           short: 'Client folder',
         }, {
@@ -127,27 +127,36 @@ export async function createCommand(_project: string, opts: CreateOptions) {
           name: 'In a server',
           value: 'server-path',
           short: 'Server path',
+        }, {
+          name: 'N/A',
+          value: 'none',
+          short: 'None',
         }],
       })
 
-      if (saveChoice === 'root') {
-        saveOptions.root = true
-      } else if (saveChoice === 'world') {
-        const { world }: { world: string } = await inquirer.prompt({
-          name: 'world',
-          message: 'What world do you want to save the packs in? >',
-          type: 'list',
-          choices: getWorldsList,
-        })
-        saveOptions.world = world
-      } else { // TODO: Add native folder selector
-        const { serverPath }: { serverPath: string } = await inquirer.prompt({
-          name: 'serverPath',
-          message: 'Where is the server to save the packs in? Relative paths are accepted. >',
-          type: 'input',
-        })
-
-        saveOptions.serverPath = serverPath
+      switch (saveChoice) {
+        case 'root':
+          saveOptions.root = true
+          break
+        case 'world':
+          const { world }: { world: string } = await inquirer.prompt({
+            name: 'world',
+            message: 'What world do you want to save the packs in? >',
+            type: 'list',
+            choices: getWorldsList,
+          })
+          saveOptions.world = world
+          break
+        case 'server-path':
+          const { serverPath }: { serverPath: string } = await inquirer.prompt({
+            name: 'serverPath',
+            message: 'Where is the server to save the packs in? Relative paths are accepted. >',
+            type: 'input',
+          })
+
+          saveOptions.serverPath = serverPath
+          break
+        case 'none': break
       }
     }
     if (opts.clientPath) {
@@ -189,8 +198,6 @@ export async function createCommand(_project: string, opts: CreateOptions) {
 
   exec(`${packageManager} install`)
 
-  // TODO: Make profiles for either packs or libraries
-
   const configPath = path.join(projectPath, `${projectType === 'library' ? 'test/' : ''}sandstone.config.ts`)
 
   // Merge with the config values
@@ -206,8 +213,6 @@ export async function createCommand(_project: string, opts: CreateOptions) {
 
   const optsJson = toJson(Object.fromEntries(Object.entries(saveOptions).filter(([_, value]) => value !== undefined)))
 
-  console.log(saveOptions, optsJson)
-
   if (optsJson !== '{}') {
     templateConfig = templateConfig.replace('saveOptions: {}', `saveOptions: ${optsJson}`)
   }

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