sandstone-cli 1.1.6 → 1.1.8

package/README.md

@@ -5,7 +5,7 @@ The CLI for Sandstone - the datapack creation library.
 
 [![Version](https://img.shields.io/npm/v/sandstone-cli.svg)](https://npmjs.org/package/sandstone-cli)
 [![Downloads/week](https://img.shields.io/npm/dw/sandstone-cli.svg)](https://npmjs.org/package/sandstone-cli)
-[![License](https://img.shields.io/npm/l/sandstone-cli.svg)](https://github.com/TheMrZZ/sandstone-cli/blob/master/package.json)
+[![License](https://img.shields.io/npm/l/sandstone-cli.svg)](https://github.com/sandstone-mc/sandstone-cli/blob/master/package.json)
 
 <!-- toc -->
 * [Usage](#usage)

package/lib/commands/create.js

@@ -26,7 +26,7 @@ export async function createCommand(_project, opts) {
         default: false,
     })).projectType) === true ? 'library' : 'pack';
     const sv = (v) => new SemVer(v);
-    const versions = [[sv('0.13.6'), sv('0.5.4')], [sv('0.14.0-alpha.13'), sv('0.5.4')], [sv('1.0.0-alpha.4'), sv('1.1.6')]];
+    const versions = [[sv('0.13.6'), sv('0.5.4')], [sv('0.14.0-alpha.13'), sv('0.5.4')], [sv('1.0.0-alpha.5'), sv('1.1.6')]];
     const stableIndex = 0;
     const { version } = await inquirer.prompt({
         name: 'version',
@@ -102,7 +102,7 @@ export async function createCommand(_project, opts) {
             }
             else if (saveChoice === 'world') {
                 const { world } = await inquirer.prompt({
-                    name: 'World',
+                    name: 'world',
                     message: 'What world do you want to save the packs in? >',
                     type: 'list',
                     choices: getWorldsList,
@@ -111,7 +111,7 @@ export async function createCommand(_project, opts) {
             }
             else { // TODO: Add native folder selector
                 const { serverPath } = await inquirer.prompt({
-                    name: 'Server path',
+                    name: 'serverPath',
                     message: 'Where is the server to save the packs in? Relative paths are accepted. >',
                     type: 'input',
                 });
@@ -155,6 +155,7 @@ 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/utils.d.ts

@@ -1,16 +1,5 @@
 export declare function hasYarn(): boolean;
 export declare function hasPnpm(): boolean;
-/**
- * Get the .minecraft path
- */
-export declare function getMinecraftPath(): string;
-export declare function getWorldsList(): string[];
-/**
- * @param worldName The name of the world
- * @param minecraftPath The optional location of the .minecraft folder.
- * If left unspecified, the .minecraft will be found automatically.
- */
-export declare function getWorldPath(worldName: string, minecraftPath?: string | undefined): string;
 /**
  * Recursively search for a file.
  * Starts in the current folder, and go to the parent, recursively.
@@ -29,3 +18,8 @@ export type ProjectFolders = {
 };
 export declare function getProjectFolders(projectFolder: string): ProjectFolders;
 export declare const capitalize: (s: string) => string;
+/**
+ * Get the .minecraft path
+ */
+export declare function getMinecraftPath(): string;
+export declare function getWorldsList(): string[];

package/lib/utils.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
-import os from 'os';
 import path from 'path';
+import os from 'os';
 import { execSync } from 'child_process';
 import chalk from 'chalk-template';
 export function hasYarn() {
@@ -21,53 +21,6 @@ export function hasPnpm() {
         return false;
     }
 }
-/**
- * Get the .minecraft path
- */
-export function getMinecraftPath() {
-    function getMCPath() {
-        switch (os.platform()) {
-            case 'win32':
-                return path.join(os.homedir(), 'AppData/Roaming/.minecraft');
-            case 'darwin':
-                return path.join(os.homedir(), 'Library/Application Support/minecraft');
-            case 'linux':
-            default:
-                return path.join(os.homedir(), '.minecraft');
-        }
-    }
-    const mcPath = getMCPath();
-    if (!fs.existsSync(mcPath)) {
-        throw new Error('Unable to locate the .minecraft folder. Please specify it manually.');
-    }
-    return mcPath;
-}
-export function getWorldsList() {
-    const mcPath = getMinecraftPath();
-    const savesPath = path.join(mcPath, 'saves');
-    return fs.readdirSync(savesPath, { withFileTypes: true }).filter((f) => f.isDirectory).map((f) => f.name);
-}
-/**
- * @param worldName The name of the world
- * @param minecraftPath The optional location of the .minecraft folder.
- * If left unspecified, the .minecraft will be found automatically.
- */
-export function getWorldPath(worldName, minecraftPath = undefined) {
-    let mcPath;
-    if (minecraftPath) {
-        mcPath = minecraftPath;
-    }
-    else {
-        mcPath = getMinecraftPath();
-    }
-    const savesPath = path.join(mcPath, 'saves');
-    const worldPath = path.join(savesPath, worldName);
-    if (!fs.existsSync(worldPath)) {
-        const existingWorlds = fs.readdirSync(savesPath, { withFileTypes: true }).filter((f) => f.isDirectory).map((f) => f.name);
-        throw new Error(`Unable to locate the "${worldPath}" folder. Word ${worldName} does not exists. List of existing worlds: ${JSON.stringify(existingWorlds, null, 2)}`);
-    }
-    return worldPath;
-}
 /**
  * Recursively search for a file.
  * Starts in the current folder, and go to the parent, recursively.
@@ -108,3 +61,29 @@ export function getProjectFolders(projectFolder) {
     };
 }
 export const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
+/**
+ * Get the .minecraft path
+ */
+export function getMinecraftPath() {
+    function getMCPath() {
+        switch (os.platform()) {
+            case 'win32':
+                return path.join(os.homedir(), 'AppData/Roaming/.minecraft');
+            case 'darwin':
+                return path.join(os.homedir(), 'Library/Application Support/minecraft');
+            case 'linux':
+            default:
+                return path.join(os.homedir(), '.minecraft');
+        }
+    }
+    const mcPath = getMCPath();
+    if (!fs.existsSync(mcPath)) {
+        throw new Error('Unable to locate the .minecraft folder. Please specify it manually.');
+    }
+    return mcPath;
+}
+export function getWorldsList() {
+    const mcPath = 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.1.6",
+  "version": "1.1.8",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",
@@ -41,7 +41,7 @@
   },
   "homepage": "https://github.com/sandstone-mc/sandstone-cli#readme",
   "dependencies": {
-    "@types/node": "^20.8.8",
+    "@types/node": "^20.9.0",
     "chalk": "^5.3.0",
     "chalk-template": "^1.1.0",
     "chokidar": "^3.5.3",

package/src/commands/create.ts

@@ -45,7 +45,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
 
   const sv = (v: string) => new SemVer(v)
 
-  const versions = [[sv('0.13.6'), sv('0.5.4')], [sv('0.14.0-alpha.13'), sv('0.5.4')], [sv('1.0.0-alpha.4'), sv('1.1.6')]] as const
+  const versions = [[sv('0.13.6'), sv('0.5.4')], [sv('0.14.0-alpha.13'), sv('0.5.4')], [sv('1.0.0-alpha.5'), sv('1.1.6')]] as const
 
   const stableIndex = 0
 
@@ -134,7 +134,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
         saveOptions.root = true
       } else if (saveChoice === 'world') {
         const { world }: { world: string } = await inquirer.prompt({
-          name: 'World',
+          name: 'world',
           message: 'What world do you want to save the packs in? >',
           type: 'list',
           choices: getWorldsList,
@@ -142,7 +142,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
         saveOptions.world = world
       } else { // TODO: Add native folder selector
         const { serverPath }: { serverPath: string } = await inquirer.prompt({
-          name: 'Server path',
+          name: 'serverPath',
           message: 'Where is the server to save the packs in? Relative paths are accepted. >',
           type: 'input',
         })
@@ -206,6 +206,8 @@ 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/utils.ts

@@ -1,6 +1,6 @@
 import fs from 'fs'
-import os from 'os'
 import path from 'path'
+import os from 'os'
 import { execSync } from 'child_process'
 import chalk from 'chalk-template'
 
@@ -21,67 +21,6 @@ export function hasPnpm(): boolean {
   }
 }
 
-/**
- * Get the .minecraft path
- */
-export function getMinecraftPath(): string {
-  function getMCPath(): string {
-    switch (os.platform()) {
-    case 'win32':
-      return path.join(os.homedir(), 'AppData/Roaming/.minecraft')
-    case 'darwin':
-      return path.join(os.homedir(), 'Library/Application Support/minecraft')
-    case 'linux':
-    default:
-      return path.join(os.homedir(), '.minecraft')
-    }
-  }
-
-  const mcPath = getMCPath()
-
-  if (!fs.existsSync(mcPath)) {
-    throw new Error('Unable to locate the .minecraft folder. Please specify it manually.')
-  }
-
-  return mcPath
-}
-
-export function getWorldsList(): string[] {
-  const mcPath = getMinecraftPath()
-  const savesPath = path.join(mcPath, 'saves')
-
-  return fs.readdirSync(
-    savesPath,
-    { withFileTypes: true }
-  ).filter((f) => f.isDirectory).map((f) => f.name)
-}
-
-/**
- * @param worldName The name of the world
- * @param minecraftPath The optional location of the .minecraft folder.
- * If left unspecified, the .minecraft will be found automatically.
- */
-export function getWorldPath(worldName: string, minecraftPath: string | undefined = undefined): string {
-  let mcPath: string
-
-  if (minecraftPath) {
-    mcPath = minecraftPath
-  } else {
-    mcPath = getMinecraftPath()
-  }
-
-  const savesPath = path.join(mcPath, 'saves')
-  const worldPath = path.join(savesPath, worldName)
-
-  if (!fs.existsSync(worldPath)) {
-    const existingWorlds = fs.readdirSync(savesPath, { withFileTypes: true }).filter((f) => f.isDirectory).map((f) => f.name)
-
-    throw new Error(`Unable to locate the "${worldPath}" folder. Word ${worldName} does not exists. List of existing worlds: ${JSON.stringify(existingWorlds, null, 2)}`)
-  }
-
-  return worldPath
-}
-
 /**
  * Recursively search for a file.
  * Starts in the current folder, and go to the parent, recursively.
@@ -132,4 +71,39 @@ export function getProjectFolders(projectFolder: string): ProjectFolders {
   }
 }
 
-export const capitalize = (s: string) => s.charAt(0).toUpperCase() + s.slice(1)
+export const capitalize = (s: string) => s.charAt(0).toUpperCase() + s.slice(1)
+
+/**
+ * Get the .minecraft path
+ */
+export function getMinecraftPath(): string {
+  function getMCPath(): string {
+    switch (os.platform()) {
+    case 'win32':
+      return path.join(os.homedir(), 'AppData/Roaming/.minecraft')
+    case 'darwin':
+      return path.join(os.homedir(), 'Library/Application Support/minecraft')
+    case 'linux':
+    default:
+      return path.join(os.homedir(), '.minecraft')
+    }
+  }
+
+  const mcPath = getMCPath()
+
+  if (!fs.existsSync(mcPath)) {
+    throw new Error('Unable to locate the .minecraft folder. Please specify it manually.')
+  }
+
+  return mcPath
+}
+
+export function getWorldsList(): string[] {
+  const mcPath = getMinecraftPath()
+  const savesPath = path.join(mcPath, 'saves')
+
+  return fs.readdirSync(
+    savesPath,
+    { withFileTypes: true }
+  ).filter((f) => f.isDirectory).map((f) => f.name)
+}