sandstone-cli 0.6.0 → 0.6.2

package/README.md

@@ -19,7 +19,7 @@ $ npm install -g sandstone-cli
 $ sand COMMAND
 running command...
 $ sand (-v|--version|version)
-sandstone-cli/0.6.0 linux-x64 node-v16.19.0
+sandstone-cli/0.6.2 linux-x64 node-v16.19.1
 $ sand --help [COMMAND]
 USAGE
   $ sand COMMAND
@@ -36,7 +36,7 @@ USAGE
 
 ## `sand build PATH CONFIG-PATH`
 
-Build the datapack. ⛏
+Build the packs. ⛏
 
 ```
 USAGE
@@ -47,7 +47,7 @@ ARGUMENTS
   CONFIG-PATH  [default: .] Path of the sandstone.config.ts folder.
 
 OPTIONS
-  -d, --dry                      Do not save the datapack. Mostly useful with `verbose`.
+  -d, --dry                      Do not save the pack. Mostly useful with `verbose`.
   -h, --help                     show CLI help
   -p, --production               Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to "production".
   -v, --verbose                  Log all resulting resources: functions, advancements...
@@ -55,23 +55,23 @@ OPTIONS
   --autoReload=port              Automatically reload your data pack in-game. Requires to open the world to LAN with
                                  cheats enabled, and to specify the port.
 
+  --clientPath=clientPath        Path of the client folder. Override the value specified in the configuration file.
+
   --description=description      Description of the data pack. Override the value specified in the configuration file.
 
   --formatVersion=formatVersion  Pack format version. Override the value specified in the configuration file.
 
   --fullTrace                    Show the full stack trace on errors.
 
-  --minecraftPath=minecraftPath  Path of the .minecraft folder. Override the value specified in the configuration file.
-
   --name=name                    Name of the data pack. Override the value specified in the configuration file.
 
   --namespace=namespace          The default namespace. Override the value specified in the configuration file.
 
-  --path=path                    The path to save the data pack at. Override the value specified in the configuration
+  --root                         Save the data pack & resource pack in the .minecraft/datapacks &
+                                 .minecraft/resource_packs folders. Override the value specified in the configuration
                                  file.
 
-  --root                         Save the data pack in the `.minecraft/datapacks` folder. Override the value specified
-                                 in the configuration file.
+  --serverPath=serverPath        Path of the server folder. Override the value specified in the configuration file.
 
   --strictErrors                 Stop data pack compilation on type errors.
 
@@ -84,7 +84,7 @@ EXAMPLES
   $ sand build --verbose --dry
 ```
 
-_See code: [src/commands/build.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.0/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.2/src/commands/build.ts)_
 
 ## `sand create PROJECT-NAME`
 
@@ -98,26 +98,27 @@ ARGUMENTS
   PROJECT-NAME  Name of the project folder. This is not the name of the data pack.
 
 OPTIONS
-  -d, --datapack-name=datapack-name  The name of the data pack.
-  -h, --help                         show CLI help
-  -n, --namespace=namespace          The default namespace that will be used.
-  -p, --custom-path=custom-path      The path to save the data pack at. Not compatible with --save-root and --world.
+  -c, --client-path=client-path  The client path to write packs at.
+  -d, --pack-name=pack-name      The name of the data pack.
+  -h, --help                     show CLI help
+  -n, --namespace=namespace      The default namespace that will be used.
 
-  -r, --save-root                    Save the data pack in the .minecraft/datapacks folder. Not compatible with --world
-                                     and --custom-path.
+  -r, --save-root                Save the data pack & resource pack in the .minecraft/datapacks &
+                                 .minecraft/resource_packs folders. Not compatible with --world.
 
-  -w, --world=world                  The world to save the data pack in. Not compatible with --save-root and
-                                     --custom-path.
+  -s, --server-path=server-path  The server path to write the server-side packs at. Not compatible with --world.
 
-  --npm                              Use npm.
+  -w, --world=world              The world to save the packs in. Not compatible with --save-root or --server
 
-  --yarn                             Use yarn instead of npm.
+  --npm                          Use npm.
+
+  --yarn                         Use yarn instead of npm.
 
 EXAMPLE
-  $ sand create my-datapack
+  $ sand create my-pack
 ```
 
-_See code: [src/commands/create.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.0/src/commands/create.ts)_
+_See code: [src/commands/create.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.2/src/commands/create.ts)_
 
 ## `sand help [COMMAND]`
 
@@ -159,11 +160,11 @@ EXAMPLES
   $ sand update --cli --sandstone --skip
 ```
 
-_See code: [src/commands/update.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.0/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.2/src/commands/update.ts)_
 
 ## `sand watch PATH CONFIG-PATH`
 
-Build the datapack, and rebuild it on file change. ⛏
+Build the packs, and rebuild them on file change. ⛏
 
 ```
 USAGE
@@ -174,7 +175,7 @@ ARGUMENTS
   CONFIG-PATH  [default: .] Path of the sandstone.config.ts folder.
 
 OPTIONS
-  -d, --dry                      Do not save the datapack. Mostly useful with `verbose`.
+  -d, --dry                      Do not save the pack. Mostly useful with `verbose`.
   -h, --help                     show CLI help
   -p, --production               Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to "production".
   -v, --verbose                  Log all resulting resources: functions, advancements...
@@ -182,23 +183,23 @@ OPTIONS
   --autoReload=port              Automatically reload your data pack in-game. Requires to open the world to LAN with
                                  cheats enabled, and to specify the port.
 
+  --clientPath=clientPath        Path of the client folder. Override the value specified in the configuration file.
+
   --description=description      Description of the data pack. Override the value specified in the configuration file.
 
   --formatVersion=formatVersion  Pack format version. Override the value specified in the configuration file.
 
   --fullTrace                    Show the full stack trace on errors.
 
-  --minecraftPath=minecraftPath  Path of the .minecraft folder. Override the value specified in the configuration file.
-
   --name=name                    Name of the data pack. Override the value specified in the configuration file.
 
   --namespace=namespace          The default namespace. Override the value specified in the configuration file.
 
-  --path=path                    The path to save the data pack at. Override the value specified in the configuration
+  --root                         Save the data pack & resource pack in the .minecraft/datapacks &
+                                 .minecraft/resource_packs folders. Override the value specified in the configuration
                                  file.
 
-  --root                         Save the data pack in the `.minecraft/datapacks` folder. Override the value specified
-                                 in the configuration file.
+  --serverPath=serverPath        Path of the server folder. Override the value specified in the configuration file.
 
   --strictErrors                 Stop data pack compilation on type errors.
 
@@ -211,5 +212,5 @@ EXAMPLES
   $ sand watch --verbose --dry
 ```
 
-_See code: [src/commands/watch.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.0/src/commands/watch.ts)_
+_See code: [src/commands/watch.ts](https://github.com/TheMrZZ/sandstone-cli/blob/v0.6.2/src/commands/watch.ts)_
 <!-- commandsstop -->

package/lib/build/buildProject.d.ts

@@ -2,8 +2,9 @@ import { ProjectFolders } from '../utils';
 export declare type BuildOptions = {
     world?: string;
     root?: boolean;
-    path?: string;
-    minecraftPath?: string;
+    clientPath?: string;
+    serverPath?: string;
+    ssh?: string;
     namespace?: string;
     name?: string;
     description?: string;

package/lib/build/buildProject.js

@@ -1,10 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildProject = void 0;
 const path_1 = __importDefault(require("path"));
+const os = __importStar(require("os"));
 const crypto_1 = __importDefault(require("crypto"));
 const util_1 = require("util");
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -13,6 +33,8 @@ const klaw_1 = __importDefault(require("klaw"));
 const madge_1 = __importDefault(require("madge"));
 const graph_1 = require("./graph");
 const chalk_1 = __importDefault(require("chalk"));
+const adm_zip_1 = __importDefault(require("adm-zip"));
+const delete_empty_1 = __importDefault(require("delete-empty"));
 const pe = new pretty_error_1.default();
 // Return the hash of a string
 function hash(stringToHash) {
@@ -33,36 +55,9 @@ async function mkDir(dirPath) {
         // Directory already exists
     }
 }
-const cache = {};
+let cache;
 const dependenciesCache = new graph_1.DependencyGraph({});
 const fileResources = new Map();
-/**
- * Recursively removes empty directories from the given directory.
- *
- * If the directory itself is empty, it is also removed.
- *
- * Code taken from: https://gist.github.com/jakub-g/5903dc7e4028133704a4
- *
- * @param {string} directory Path to the directory to clean up
- */
-async function removeEmptyDirectories(directory) {
-    // lstat does not follow symlinks (in contrast to stat)
-    const fileStats = await fs_extra_1.default.lstat(directory);
-    if (!fileStats.isDirectory()) {
-        return;
-    }
-    let fileNames = await fs_extra_1.default.readdir(directory);
-    if (fileNames.length > 0) {
-        const recursiveRemovalPromises = fileNames.map((fileName) => removeEmptyDirectories(path_1.default.join(directory, fileName)));
-        await Promise.all(recursiveRemovalPromises);
-        // re-evaluate fileNames; after deleting subdirectory
-        // we may have parent directory empty now
-        fileNames = await fs_extra_1.default.readdir(directory);
-    }
-    if (fileNames.length === 0) {
-        await fs_extra_1.default.rmdir(directory);
-    }
-}
 function getNewModules(dependenciesGraph, rawFiles, projectFolder) {
     const rawFilesPath = rawFiles.map(({ path }) => path);
     // Get only the new modules
@@ -85,76 +80,137 @@ function diffMap(map1, map2) {
     return new Map([...map1.entries()].filter(([key, value]) => !map2.has(key)));
 }
 function diffResources(tree1, tree2) {
-    return tree1.diff(tree2);
+    return diffSet(tree1, tree2);
+}
+/**
+ *
+ * @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.
+ */
+async function getClientWorldPath(worldName, minecraftPath = undefined) {
+    let mcPath;
+    if (minecraftPath) {
+        mcPath = minecraftPath;
+    }
+    else {
+        mcPath = await getClientPath();
+    }
+    const savesPath = path_1.default.join(mcPath, 'saves');
+    const worldPath = path_1.default.join(savesPath, worldName);
+    if (!fs_extra_1.default.existsSync(worldPath)) {
+        const existingWorlds = (await fs_extra_1.default.readdir(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;
+}
+/**
+ * Get the .minecraft path
+ */
+async function getClientPath() {
+    function getMCPath() {
+        switch (os.platform()) {
+            case 'win32':
+                return path_1.default.join(os.homedir(), 'AppData/Roaming/.minecraft');
+            case 'darwin':
+                return path_1.default.join(os.homedir(), 'Library/Application Support/minecraft');
+            case 'linux':
+            default:
+                return path_1.default.join(os.homedir(), '.minecraft');
+        }
+    }
+    const mcPath = getMCPath();
+    if (!await fs_extra_1.default.stat(mcPath)) {
+        throw new Error('Unable to locate the .minecraft folder. Please specify it manually.');
+    }
+    return mcPath;
 }
 /**
  * Build the project, but might throw errors.
  *
- * @param options The options to build the project with.
+ * @param cliOptions The options to build the project with.
  *
  * @param projectFolder The folder of the project. It needs a sandstone.config.ts, and it or one of its parent needs a package.json.
  */
-async function _buildProject(options, { absProjectFolder, rootFolder, sandstoneConfigFolder }, changedFiles) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+async function _buildProject(cliOptions, { absProjectFolder, rootFolder, sandstoneConfigFolder }, changedFiles) {
+    var _a, _b, _c, _d, _e, _f, _g;
     const sandstoneLocation = path_1.default.join(rootFolder, 'node_modules/sandstone/');
     // First, read sandstone.config.ts to get all properties
     const sandstoneConfig = require(path_1.default.join(sandstoneConfigFolder, 'sandstone.config.ts')).default;
     const { saveOptions, scripts } = sandstoneConfig;
+    const outputFolder = path_1.default.join(rootFolder, '.sandstone', 'output');
     /// OPTIONS ///
-    // Check if the player overidded the save options
-    const overrideSaveOptions = options.world || options.root || options.path;
-    const world = overrideSaveOptions ? options.world : saveOptions.world;
-    const root = overrideSaveOptions ? options.root : saveOptions.root;
-    const customPath = overrideSaveOptions ? options.path : saveOptions.path;
-    const minecraftPath = (_a = options.minecraftPath) !== null && _a !== void 0 ? _a : sandstoneConfig.minecraftPath;
-    const dataPackName = (_b = options.name) !== null && _b !== void 0 ? _b : sandstoneConfig.name;
-    if ([world, root, customPath].filter(x => x !== undefined).length > 1) {
-        throw new Error(`Expected only 'world', 'root' or 'path'. Got at least two of them: world=${world}, root=${root}, path=${customPath}`);
+    const clientPath = !cliOptions.production ? (cliOptions.clientPath || saveOptions.clientPath || await getClientPath()) : undefined;
+    const server = !cliOptions.production && (cliOptions.serverPath || saveOptions.serverPath || cliOptions.ssh || saveOptions.ssh) ? await (async () => {
+        if (cliOptions.ssh || saveOptions.ssh) {
+            const sshOptions = JSON.stringify(await fs_extra_1.default.readFile(cliOptions.ssh || saveOptions.ssh, 'utf8'));
+            // TODO: implement SFTP
+            return {
+                readFile: async (relativePath, encoding = 'utf8') => { },
+                writeFile: async (relativePath, contents) => { },
+                remove: async (relativePath) => { },
+            };
+        }
+        const serverPath = cliOptions.serverPath || saveOptions.serverPath;
+        return {
+            readFile: async (relativePath, encoding = 'utf8') => await fs_extra_1.default.readFile(path_1.default.join(serverPath, relativePath), encoding),
+            writeFile: async (relativePath, contents) => {
+                if (contents === undefined) {
+                    await fs_extra_1.default.unlink(path_1.default.join(serverPath, relativePath));
+                }
+                else {
+                    await fs_extra_1.default.writeFile(path_1.default.join(serverPath, relativePath), contents);
+                }
+            },
+            remove: async (relativePath) => await fs_extra_1.default.remove(path_1.default.join(serverPath, relativePath))
+        };
+    })() : undefined;
+    let worldName = cliOptions.world || saveOptions.world;
+    // Make sure the world exists
+    if (worldName && !cliOptions.production) {
+        await getClientWorldPath(worldName, clientPath);
+    }
+    const root = cliOptions.root !== undefined ? cliOptions.root : saveOptions.root;
+    const packName = (_a = cliOptions.name) !== null && _a !== void 0 ? _a : sandstoneConfig.name;
+    if (worldName && root) {
+        throw new Error(`Expected only 'world' or 'root'. Got both.`);
     }
     // Important /!\: The below if statements, which set environment variables, must run before importing any Sandstone file.
     // Set the pack ID environment variable
     // Set production/development mode
-    if (options.production) {
+    if (cliOptions.production) {
         process.env.SANDSTONE_ENV = 'production';
     }
     else {
         process.env.SANDSTONE_ENV = 'development';
     }
+    process.env.WORKING_DIR = absProjectFolder;
     if (sandstoneConfig.packUid) {
         process.env.PACK_UID = sandstoneConfig.packUid;
     }
     // Set the namespace
-    const namespace = sandstoneConfig.namespace || options.namespace;
+    const namespace = cliOptions.namespace || sandstoneConfig.namespace;
     if (namespace) {
         process.env.NAMESPACE = namespace;
     }
-    // Set conflict strategies
-    function setStrategy(strategyName, value) {
-        if (value) {
-            process.env[`${strategyName.toUpperCase()}_CONFLICT_STRATEGY`] = value;
+    const { onConflict } = sandstoneConfig;
+    if (onConflict) {
+        for (const resource of Object.entries(onConflict)) {
+            process.env[`${resource[0].toUpperCase()}_CONFLICT_STRATEGY`] = resource[1];
         }
     }
-    const { onConflict } = sandstoneConfig;
-    setStrategy('general', onConflict === null || onConflict === void 0 ? void 0 : onConflict.default);
-    setStrategy('advancement', onConflict === null || onConflict === void 0 ? void 0 : onConflict.advancement);
-    setStrategy('loot_table', onConflict === null || onConflict === void 0 ? void 0 : onConflict.lootTable);
-    setStrategy('mcfunction', onConflict === null || onConflict === void 0 ? void 0 : onConflict.mcFunction);
-    setStrategy('predicate', onConflict === null || onConflict === void 0 ? void 0 : onConflict.predicate);
-    setStrategy('recipe', onConflict === null || onConflict === void 0 ? void 0 : onConflict.recipe);
-    setStrategy('tag', onConflict === null || onConflict === void 0 ? void 0 : onConflict.tag);
+    // JSON indentation
+    process.env.INDENTATION = saveOptions.indentation;
+    // Pack mcmeta
+    process.env.PACK_OPTIONS = JSON.stringify(sandstoneConfig.packs);
     // Configure error display
-    if (!options.fullTrace) {
+    if (!cliOptions.fullTrace) {
         pe.skipNodeFiles();
     }
     /// IMPORTING USER CODE ///
     // The configuration is ready.
     // Now, let's run the beforeAll script
-    const { getDestinationPath } = require(path_1.default.join(sandstoneLocation, 'datapack', 'saveDatapack'));
-    const destinationPath = getDestinationPath(dataPackName, { world, asRootDatapack: root, customPath, minecraftPath });
-    await ((_c = scripts === null || scripts === void 0 ? void 0 : scripts.beforeAll) === null || _c === void 0 ? void 0 : _c.call(scripts, {
-        dataPackName,
-        destination: destinationPath,
-    }));
+    await ((_b = scripts === null || scripts === void 0 ? void 0 : scripts.beforeAll) === null || _b === void 0 ? void 0 : _b.call(scripts));
     // Finally, let's import all .ts & .js files under ./src.
     let error = false;
     // Get the list of all files
@@ -188,28 +244,17 @@ async function _buildProject(options, { absProjectFolder, rootFolder, sandstoneC
     dependenciesCache.merge(dependenciesGraph);
     // Transform resolved dependents into a flat list of files, and sort them by their number of dependencies
     const newModules = getNewModules(dependenciesCache, changedFilesPaths !== null && changedFilesPaths !== void 0 ? changedFilesPaths : rawFiles, absProjectFolder);
-    const { savePack } = require(sandstoneLocation);
-    const { dataPack } = require(sandstoneLocation + '/init');
+    const { sandstonePack } = require(sandstoneLocation);
     // If files changed, we need to clean the cache & delete the related resources
     if (changedFiles) {
         for (const node of newModules) {
-            // For eached changed file, we need to reset the require cache
+            // For each changed file, we need to reset the require cache
             delete require.cache[path_1.default.join(absProjectFolder, node.name)];
             // Then we need to delete all resources the file created
             const oldResources = fileResources.get(node.name);
             if (oldResources) {
-                const { resources, customResources, objectives, rootFunctions } = oldResources;
-                for (const resource of resources) {
-                    dataPack.resources.deleteResource(resource.path, resource.resourceType);
-                }
-                for (const resource of customResources) {
-                    dataPack.customResources.delete(resource);
-                }
-                for (const objective of objectives.keys()) {
-                    dataPack.objectives.delete(objective);
-                }
-                for (const rootFunction of rootFunctions) {
-                    dataPack.rootFunctions.delete(rootFunction);
+                for (const resource of oldResources.resources) {
+                    sandstonePack.core.deleteResource(resource.path, resource.resourceType);
                 }
             }
         }
@@ -218,10 +263,8 @@ async function _buildProject(options, { absProjectFolder, rootFolder, sandstoneC
     for (const node of newModules) {
         const modulePath = path_1.default.join(absProjectFolder, node.name);
         const currentResources = {
-            resources: dataPack.resources.clone(),
-            objectives: new Map([...dataPack.objectives.entries()]),
-            rootFunctions: new Set([...dataPack.rootFunctions]),
-            customResources: new Set([...dataPack.customResources]),
+            resources: new Set([...sandstonePack.core.resourceNodes]),
+            objectives: new Set([...sandstonePack.objectives.entries()])
         };
         // We have a module, let's require it!
         const filePath = path_1.default.resolve(modulePath);
@@ -230,10 +273,6 @@ async function _buildProject(options, { absProjectFolder, rootFolder, sandstoneC
             if (await fs_extra_1.default.pathExists(filePath)) {
                 require(filePath);
             }
-            // Generate the mcfunctions
-            for (const mcfunction of dataPack.rootFunctions) {
-                await mcfunction.generate();
-            }
         }
         catch (e) {
             logError(e, node.name);
@@ -242,10 +281,8 @@ async function _buildProject(options, { absProjectFolder, rootFolder, sandstoneC
         // Now, find the resources that were added by this file & store them.
         // This will be used if those files are changed later.
         const newResources = {
-            resources: diffResources(dataPack.resources, currentResources.resources),
-            customResources: diffSet(dataPack.customResources, currentResources.customResources),
-            rootFunctions: diffSet(dataPack.rootFunctions, currentResources.rootFunctions),
-            objectives: diffMap(dataPack.objectives, currentResources.objectives),
+            resources: diffResources(sandstonePack.core.resourceNodes, currentResources.resources),
+            objectives: diffSet(sandstonePack.objectives, currentResources.objectives),
         };
         fileResources.set(node.name, newResources);
     }
@@ -255,72 +292,223 @@ async function _buildProject(options, { absProjectFolder, rootFolder, sandstoneC
     /// SAVING RESULTS ///
     // Setup the cache if it doesn't exist.
     // This cache is here to avoid writing files on disk when they did not change.
-    const newCache = {
-        files: {}
-    };
-    if (cache[absProjectFolder] === undefined) {
-        cache[absProjectFolder] = {
-            files: {},
-        };
+    const newCache = {};
+    const cacheFile = path_1.default.join(rootFolder, '.sandstone', 'cache.json');
+    if (cache === undefined) {
+        let oldCache;
+        try {
+            const fileRead = await fs_extra_1.default.readFile(cacheFile, 'utf8');
+            if (fileRead) {
+                oldCache = JSON.parse(fileRead);
+            }
+        }
+        catch { }
+        if (oldCache) {
+            cache = oldCache;
+        }
+        else {
+            cache = {};
+        }
     }
     // Save the pack
-    // Run the beforeSave script
-    await ((_d = scripts === null || scripts === void 0 ? void 0 : scripts.beforeSave) === null || _d === void 0 ? void 0 : _d.call(scripts, {
-        dataPackName,
-        destination: destinationPath,
-    }));
-    await savePack(dataPackName, {
-        // Save location
-        world: world,
-        asRootDatapack: root,
-        customPath: customPath,
-        minecraftPath: minecraftPath,
-        indentation: saveOptions.indentation,
-        // Data pack mcmeta
-        description: (_e = options.description) !== null && _e !== void 0 ? _e : sandstoneConfig.description,
-        formatVersion: (_f = options.formatVersion) !== null && _f !== void 0 ? _f : sandstoneConfig.formatVersion,
+    // Run the beforeSave script (TODO: This is where sandstone-server will remove restart env vars)
+    await ((_c = scripts === null || scripts === void 0 ? void 0 : scripts.beforeSave) === null || _c === void 0 ? void 0 : _c.call(scripts));
+    const excludeOption = (_d = saveOptions.resources) === null || _d === void 0 ? void 0 : _d.exclude;
+    const fileExclusions = excludeOption ? {
+        generated: (excludeOption.generated || excludeOption),
+        existing: (excludeOption.existing || excludeOption)
+    } : false;
+    const fileHandlers = ((_e = saveOptions.resources) === null || _e === void 0 ? void 0 : _e.handle) || false;
+    const packTypes = await sandstonePack.save({
         // Additional parameters
-        dryRun: options.dry,
-        verbose: options.verbose,
-        customFileHandler: (_g = saveOptions.customFileHandler) !== null && _g !== void 0 ? _g : (async ({ relativePath, content }) => {
-            var _a;
-            const realPath = path_1.default.join(destinationPath, relativePath);
-            // We hash the real path alongside the content. 
-            // Therefore, if the real path change (for example, the user changed the resulting directory), the file will be recreated.
-            const hashValue = hash(content + realPath);
-            // Add to new cache. We use the relative path as key to make the cache lighter.
-            newCache.files[relativePath] = hashValue;
-            newCache.resultFolder = destinationPath;
-            if (((_a = cache[absProjectFolder].files) === null || _a === void 0 ? void 0 : _a[realPath]) === hashValue) {
-                // Already in cache - skip
-                return;
+        dry: cliOptions.dry,
+        verbose: cliOptions.verbose,
+        fileHandler: (_f = saveOptions.customFileHandler) !== null && _f !== void 0 ? _f : (async (relativePath, content) => {
+            let pathPass = true;
+            if (fileExclusions && fileExclusions.generated) {
+                for (const exclude of fileExclusions.generated) {
+                    if (!Array.isArray(exclude)) {
+                        pathPass = !exclude.test(relativePath);
+                    }
+                }
+            }
+            if (fileHandlers) {
+                for (const handler of fileHandlers) {
+                    if (handler.path.test(relativePath)) {
+                        content = await handler.callback(content);
+                    }
+                }
+            }
+            if (pathPass) {
+                // We hash the relative path alongside the content to ensure unique hash.
+                const hashValue = hash(content + relativePath);
+                // Add to new cache.
+                newCache[relativePath] = hashValue;
+                if (cache[relativePath] === hashValue) {
+                    // Already in cache - skip
+                    return;
+                }
+                // Not in cache: write to disk
+                const realPath = path_1.default.join(outputFolder, relativePath);
+                await mkDir(path_1.default.dirname(realPath));
+                return await fs_extra_1.default.writeFile(realPath, content);
             }
-            // Not in cache: write to disk
-            await mkDir(path_1.default.dirname(realPath));
-            return await fs_extra_1.default.writeFile(realPath, content);
         })
     });
-    // Delete old files that aren't cached anymore
-    const oldFilesNames = new Set(Object.keys(cache[absProjectFolder].files));
-    Object.keys(newCache.files).forEach(name => oldFilesNames.delete(name));
-    const previousResultFolder = (_h = cache === null || cache === void 0 ? void 0 : cache[absProjectFolder]) === null || _h === void 0 ? void 0 : _h.resultFolder;
-    await Promise.allSettled([...oldFilesNames.values()].map(name => (0, util_1.promisify)(fs_extra_1.default.rm)(path_1.default.join(previousResultFolder !== null && previousResultFolder !== void 0 ? previousResultFolder : '', name))));
-    // Delete all empty folders of previous directory
-    if (previousResultFolder !== undefined) {
-        try {
-            await removeEmptyDirectories(previousResultFolder);
+    async function handleResources(packType) {
+        const working = path_1.default.join(rootFolder, 'resources', packType);
+        for await (const file of (0, klaw_1.default)(path_1.default.join(rootFolder, 'resources', packType), { filter: (_path) => {
+                const relativePath = path_1.default.join(packType, _path.split(working)[1]);
+                let pathPass = true;
+                if (fileExclusions && fileExclusions.existing) {
+                    for (const exclude of fileExclusions.existing) {
+                        pathPass = Array.isArray(exclude) ? !exclude[0].test(relativePath) : !exclude.test(relativePath);
+                    }
+                }
+                return pathPass;
+            } })) {
+            const relativePath = path_1.default.join(packType, file.path.split(working)[1]);
+            try {
+                let content = await fs_extra_1.default.readFile(file.path);
+                if (fileHandlers) {
+                    for (const handler of fileHandlers) {
+                        if (handler.path.test(relativePath)) {
+                            content = await handler.callback(content);
+                        }
+                    }
+                }
+                // We hash the relative path alongside the content to ensure unique hash.
+                const hashValue = hash(content + relativePath);
+                // Add to new cache.
+                newCache[relativePath] = hashValue;
+                if (cache[relativePath] !== hashValue) {
+                    // Not in cache: write to disk
+                    const realPath = path_1.default.join(outputFolder, relativePath);
+                    await mkDir(path_1.default.dirname(realPath));
+                    await fs_extra_1.default.writeFile(realPath, content);
+                }
+            }
+            catch (e) { }
         }
-        catch (e) {
-            // Previous directory was deleted by the user himself
+    }
+    async function archiveOutput(packType) {
+        const outputPath = path_1.default.join(rootFolder, '.sandstone/output/archives', `${packName}_${packType.type}`);
+        const archive = new adm_zip_1.default();
+        await archive.addLocalFolderPromise(outputPath, {});
+        await archive.writeZipPromise(`${outputPath}.zip`, { overwrite: true });
+    }
+    // TODO: implement linking to make the cache more useful when not archiving.
+    if (!cliOptions.production) {
+        for await (const _packType of packTypes) {
+            const packType = _packType[1];
+            const outputPath = path_1.default.join(rootFolder, '.sandstone/output', packType.type);
+            if (packType.handleOutput) {
+                await packType.handleOutput('output', async (relativePath, encoding = 'utf8') => await fs_extra_1.default.readFile(path_1.default.join(outputPath, relativePath), encoding), async (relativePath, contents) => {
+                    if (contents === undefined) {
+                        await fs_extra_1.default.unlink(path_1.default.join(outputPath, relativePath));
+                    }
+                    else {
+                        await fs_extra_1.default.writeFile(path_1.default.join(outputPath, relativePath), contents);
+                    }
+                });
+            }
+            handleResources(packType.type);
+            if (packType.archiveOutput) {
+                archiveOutput(packType);
+            }
+            // Handle client
+            if (!(server && packType.networkSides === 'server')) {
+                let fullClientPath;
+                if (worldName) {
+                    fullClientPath = path_1.default.join(clientPath, packType.clientPath);
+                    try {
+                        fullClientPath = fullClientPath.replace('$packName$', packName);
+                    }
+                    catch { }
+                    try {
+                        fullClientPath = fullClientPath.replace('$worldName$', worldName);
+                    }
+                    catch { }
+                }
+                else {
+                    fullClientPath = path_1.default.join(clientPath, packType.rootPath);
+                    try {
+                        fullClientPath = fullClientPath.replace('$packName$', packName);
+                    }
+                    catch { }
+                }
+                if (packType.archiveOutput) {
+                    await fs_extra_1.default.copyFile(`${outputPath}.zip`, `${fullClientPath}.zip`);
+                }
+                else {
+                    await fs_extra_1.default.remove(fullClientPath);
+                    await fs_extra_1.default.copy(outputPath, fullClientPath);
+                }
+                if (packType.handleOutput) {
+                    await packType.handleOutput('client', async (relativePath, encoding = 'utf8') => await fs_extra_1.default.readFile(path_1.default.join(clientPath, relativePath), encoding), async (relativePath, contents) => {
+                        if (contents === undefined) {
+                            fs_extra_1.default.unlink(path_1.default.join(clientPath, relativePath));
+                        }
+                        else {
+                            await fs_extra_1.default.writeFile(path_1.default.join(clientPath, relativePath), contents);
+                        }
+                    });
+                }
+            }
+            // Handle server
+            if (server && (packType.networkSides === 'server' || packType.networkSides === 'both')) {
+                let serverPath = packType.serverPath;
+                try {
+                    serverPath = serverPath.replace('$packName$', packName);
+                }
+                catch { }
+                if (packType.archiveOutput) {
+                    await server.writeFile(await fs_extra_1.default.readFile(`${outputPath}.zip`, 'utf8'), `${serverPath}.zip`);
+                }
+                else {
+                    server.remove(serverPath);
+                    for await (const file of (0, klaw_1.default)(outputPath)) {
+                        await server.writeFile(path_1.default.join(serverPath, file.path.split(outputPath)[1]), await fs_extra_1.default.readFile(file.path));
+                    }
+                }
+                if (packType.handleOutput) {
+                    await packType.handleOutput('server', server.readFile, server.writeFile);
+                }
+            }
+        }
+    }
+    else {
+        for await (const packType of packTypes) {
+            const outputPath = path_1.default.join(rootFolder, '.sandstone/output/archives', `${packName}_${packType.type}`);
+            if (packType.handleOutput) {
+                await packType.handleOutput('output', async (relativePath, encoding = 'utf8') => await fs_extra_1.default.readFile(path_1.default.join(outputPath, relativePath), encoding), async (relativePath, contents) => {
+                    if (contents === undefined) {
+                        await fs_extra_1.default.unlink(path_1.default.join(outputPath, relativePath));
+                    }
+                    else {
+                        await fs_extra_1.default.writeFile(path_1.default.join(outputPath, relativePath), contents);
+                    }
+                });
+            }
+            handleResources(packType.type);
+            if (packType.archiveOutput) {
+                archiveOutput(packType);
+            }
         }
     }
+    // Delete old files that aren't cached anymore
+    const oldFilesNames = new Set(Object.keys(cache));
+    Object.keys(newCache).forEach(name => oldFilesNames.delete(name));
+    await Promise.allSettled([...oldFilesNames.values()].map(name => {
+        return (0, util_1.promisify)(fs_extra_1.default.rm)(path_1.default.join(outputFolder, name));
+    }));
+    await (0, delete_empty_1.default)(outputFolder);
     // Override old cache
-    cache[absProjectFolder] = newCache;
+    cache = newCache;
+    // Write the cache to disk
+    await fs_extra_1.default.writeFile(cacheFile, JSON.stringify(cache));
     // Run the afterAll script
-    await ((_j = scripts === null || scripts === void 0 ? void 0 : scripts.afterAll) === null || _j === void 0 ? void 0 : _j.call(scripts, {
-        dataPackName,
-        destination: destinationPath,
-    }));
+    await ((_g = scripts === null || scripts === void 0 ? void 0 : scripts.afterAll) === null || _g === void 0 ? void 0 : _g.call(scripts));
 }
 /**
  * Build the project. Will log errors and never throw any.
@@ -336,7 +524,7 @@ async function buildProject(options, folders, changedFiles) {
         await _buildProject(options, folders, changedFiles);
     }
     catch (err) {
-        logError(err);
+        console.log(err);
     }
 }
 exports.buildProject = buildProject;
@@ -345,6 +533,7 @@ function logError(err, file) {
         if (file) {
             console.error('  ' + chalk_1.default.bgRed.white('BuildError') + chalk_1.default.gray(':'), `While loading "${file}", the following error happened:\n`);
         }
+        debugger;
         console.error(pe.render(err));
     }
 }

package/lib/commands/build.d.ts

@@ -9,8 +9,8 @@ export default class Build extends Command {
         namespace: import("@oclif/command/lib/flags").IOptionFlag<string | undefined>;
         world: import("@oclif/command/lib/flags").IOptionFlag<string | undefined>;
         root: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-        path: import("@oclif/command/lib/flags").IOptionFlag<string | undefined>;
-        minecraftPath: import("@oclif/command/lib/flags").IOptionFlag<string | undefined>;
+        clientPath: import("@oclif/command/lib/flags").IOptionFlag<string | undefined>;
+        serverPath: import("@oclif/command/lib/flags").IOptionFlag<string | undefined>;
         name: import("@oclif/command/lib/flags").IOptionFlag<string | undefined>;
         description: import("@oclif/command/lib/flags").IOptionFlag<string | undefined>;
         formatVersion: import("@oclif/parser/lib/flags").IOptionFlag<number | undefined>;

package/lib/commands/build.js

@@ -22,7 +22,7 @@ class Build extends command_1.Command {
     }
 }
 exports.default = Build;
-Build.description = 'Build the datapack. ⛏';
+Build.description = 'Build the packs. ⛏';
 Build.examples = [
     '$ sand build',
     '$ sand build --verbose',

package/lib/commands/create.d.ts

@@ -6,11 +6,12 @@ export default class Create extends Command {
         help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
         yarn: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
         npm: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-        'datapack-name': flags.IOptionFlag<string | undefined>;
+        'pack-name': flags.IOptionFlag<string | undefined>;
         namespace: flags.IOptionFlag<string | undefined>;
         'save-root': import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
         world: flags.IOptionFlag<string | undefined>;
-        'custom-path': flags.IOptionFlag<string | undefined>;
+        'server-path': flags.IOptionFlag<string | undefined>;
+        'client-path': flags.IOptionFlag<string | undefined>;
     };
     static args: {
         name: string;

package/lib/commands/create.js

@@ -28,7 +28,7 @@ class Create extends command_1.Command {
         const { args, flags } = this.parse(Create);
         const projectPath = path_1.default.resolve(args['project-name']);
         const projectName = path_1.default.basename(projectPath);
-        const datapackName = await (0, utils_1.getFlagOrPrompt)(flags, 'datapack-name', {
+        const packName = await (0, utils_1.getFlagOrPrompt)(flags, 'pack-name', {
             message: 'Name of your data pack (can be changed later) >',
             type: 'input',
             default: projectName,
@@ -41,27 +41,27 @@ class Create extends command_1.Command {
         else if (flags.world) {
             saveOptions.world = flags.world;
         }
-        else if (flags['custom-path']) {
-            saveOptions.path = flags['custom-path'];
+        else if (flags['server-path']) {
+            saveOptions.serverPath = flags['server-path'];
         }
-        else {
-            // User didn't specify a way to save the file. Ask him.
+        else { // TODO: Add support for ssh
+            // User didn't specify a way to save the file. Ask them.
             const { saveChoice } = await inquirer_1.default.prompt({
                 name: 'saveChoice',
                 type: 'list',
-                message: 'Where do you want your datapack to be saved (can be changed later)?',
+                message: 'Where do you want your packs to be saved (can be changed later)?',
                 choices: [{
-                        name: 'In the root .minecraft/datapacks folder',
+                        name: 'In the root client (.minecraft) folder',
                         value: 'root',
-                        short: '.minecraft/datapacks folder',
+                        short: 'Client folder',
                     }, {
-                        name: 'In the datapacks folder of a world',
+                        name: 'In a world',
                         value: 'world',
-                        short: 'World datapacks folder',
+                        short: 'World',
                     }, {
-                        name: 'At a custom path',
-                        value: 'path',
-                        short: 'Custom path',
+                        name: 'In a server',
+                        value: 'server-path',
+                        short: 'Server path',
                     }],
             });
             if (saveChoice === 'root') {
@@ -69,22 +69,25 @@ class Create extends command_1.Command {
             }
             else if (saveChoice === 'world') {
                 const { world } = await inquirer_1.default.prompt({
-                    name: 'world',
-                    message: 'What world do you want to save the Datapack in? >',
+                    name: 'World',
+                    message: 'What world do you want to save the packs in? >',
                     type: 'list',
                     choices: utils_1.getWorldsList,
                 });
                 saveOptions.world = world;
             }
-            else {
-                const { path } = await inquirer_1.default.prompt({
-                    name: 'path',
-                    message: 'Where do you want to save the data pack? Relative paths are accepted. >',
+            else { // TODO: Add native folder selector
+                const { serverPath } = await inquirer_1.default.prompt({
+                    name: 'Server path',
+                    message: 'Where is the server to save the packs in? Relative paths are accepted. >',
                     type: 'input',
                 });
-                saveOptions.path = path;
+                saveOptions.serverPath = serverPath;
             }
         }
+        if (flags['client-path']) {
+            saveOptions.clientPath = flags['client-path'];
+        }
         const namespace = await (0, utils_1.getFlagOrPrompt)(flags, 'namespace', {
             message: 'Default namespace (can be changed later) >',
             default: 'default',
@@ -115,6 +118,7 @@ class Create extends command_1.Command {
             (0, child_process_1.execSync)('npm install sandstone', { cwd: projectPath });
             (0, child_process_1.execSync)('npm install --save-dev typescript @types/node sandstone-cli', { cwd: projectPath });
         }
+        // TODO: Make profiles for either packs or libraries
         // Merge with the package.json template
         const generatedPackage = JSON.parse(fs_1.default.readFileSync(path_1.default.join(projectPath, 'package.json')).toString());
         /** Remove the `main` property */
@@ -125,12 +129,16 @@ class Create extends command_1.Command {
         const templateFolder = path_1.default.join(__dirname, '../template/');
         await fs_extra_1.default.copy(templateFolder, projectPath);
         // Write the sandstone.json file
-        fs_1.default.writeFileSync(path_1.default.join(projectPath, 'sandstone.config.ts'), `import type { SandstoneConfig } from 'sandstone'
+        fs_1.default.writeFileSync(path_1.default.join(projectPath, 'sandstone.config.ts'), `import type { DatapackConfig, SandstoneConfig } from 'sandstone'
 
 export default {
-  name: ${toJson(datapackName)},
-  description: ${toJson(['A ', { text: 'Sandstone', color: 'gold' }, ' data pack.'])},
-  formatVersion: ${7},
+  name: ${toJson(packName)},
+  packs: {
+    datapack: {
+      description: ${toJson(['A ', { text: 'Sandstone', color: 'gold' }, ' data pack.'])},
+      packFormat: ${11},
+    } as DatapackConfig
+  },
   namespace: ${toJson(namespace)},
   packUid: ${toJson((0, nanoid_1.nanoid)(8))},
   saveOptions: ${toJson(Object.fromEntries(Object.entries(saveOptions).filter(([_, value]) => value !== undefined)))},
@@ -151,17 +159,18 @@ export default {
 exports.default = Create;
 Create.description = 'Create a new Sandstone project.';
 Create.examples = [
-    '$ sand create my-datapack',
+    '$ sand create my-pack',
 ];
 Create.flags = {
     help: command_1.flags.help({ char: 'h' }),
     yarn: command_1.flags.boolean({ description: 'Use yarn instead of npm.', env: 'USE_YARN', exclusive: ['npm'] }),
     npm: command_1.flags.boolean({ description: 'Use npm.', env: 'USE_NPM', exclusive: ['yarn'] }),
-    'datapack-name': command_1.flags.string({ char: 'd', env: 'DATAPACK_NAME', description: 'The name of the data pack.' }),
+    'pack-name': command_1.flags.string({ char: 'd', env: 'PACK_NAME', description: 'The name of the data pack.' }),
     namespace: command_1.flags.string({ char: 'n', env: 'NAMESPACE', description: 'The default namespace that will be used.' }),
-    'save-root': command_1.flags.boolean({ char: 'r', env: 'SAVE_ROOT', description: 'Save the data pack in the .minecraft/datapacks folder. Not compatible with --world and --custom-path.', exclusive: ['world', 'custom-path'] }),
-    world: command_1.flags.string({ char: 'w', env: 'WORLD', description: 'The world to save the data pack in. Not compatible with --save-root and --custom-path.', exclusive: ['save-root', 'custom-path'] }),
-    'custom-path': command_1.flags.string({ char: 'p', env: 'CUSTOM_PATH', description: 'The path to save the data pack at. Not compatible with --save-root and --world.', exclusive: ['save-root', 'world'] }),
+    'save-root': command_1.flags.boolean({ char: 'r', env: 'SAVE_ROOT', description: 'Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Not compatible with --world.', exclusive: ['world'] }),
+    world: command_1.flags.string({ char: 'w', env: 'WORLD', description: 'The world to save the packs in. Not compatible with --save-root or --server', exclusive: ['save-root', 'server'] }),
+    'server-path': command_1.flags.string({ char: 's', env: 'SERVER_PATH', description: 'The server path to write the server-side packs at. Not compatible with --world.', exclusive: ['world'] }),
+    'client-path': command_1.flags.string({ char: 'c', env: 'CLIENT_PATH', description: 'The client path to write packs at.' }),
 };
 Create.args = [{
         name: 'project-name',

package/lib/commands/watch.d.ts

@@ -9,8 +9,8 @@ export default class Watch extends Command {
         namespace: flags.IOptionFlag<string | undefined>;
         world: flags.IOptionFlag<string | undefined>;
         root: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-        path: flags.IOptionFlag<string | undefined>;
-        minecraftPath: flags.IOptionFlag<string | undefined>;
+        clientPath: flags.IOptionFlag<string | undefined>;
+        serverPath: flags.IOptionFlag<string | undefined>;
         name: flags.IOptionFlag<string | undefined>;
         description: flags.IOptionFlag<string | undefined>;
         formatVersion: import("@oclif/parser/lib/flags").IOptionFlag<number | undefined>;

package/lib/commands/watch.js

@@ -15,6 +15,7 @@ class Watch extends command_1.Command {
         let alreadyBuilding = false;
         let needRebuild = false;
         let client = 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) {
             try {
                 client = (await require('minecraft-protocol')).createClient({
@@ -72,7 +73,7 @@ class Watch extends command_1.Command {
     }
 }
 exports.default = Watch;
-Watch.description = 'Build the datapack, and rebuild it on file change. ⛏';
+Watch.description = 'Build the packs, and rebuild them on file change. ⛏';
 Watch.examples = [
     '$ sand watch',
     '$ sand watch --verbose',
@@ -80,13 +81,14 @@ Watch.examples = [
 ];
 Watch.flags = {
     help: command_1.flags.help({ char: 'h' }),
-    dry: command_1.flags.boolean({ char: 'd', description: 'Do not save the datapack. Mostly useful with `verbose`.' }),
+    dry: command_1.flags.boolean({ char: 'd', description: 'Do not save the pack. Mostly useful with `verbose`.' }),
     verbose: command_1.flags.boolean({ char: 'v', description: 'Log all resulting resources: functions, advancements...' }),
     namespace: command_1.flags.string({ description: 'The default namespace. Override the value specified in the configuration file.' }),
     world: command_1.flags.string({ description: 'The world to save the data pack in. Override the value specified in the configuration file.' }),
-    root: command_1.flags.boolean({ description: 'Save the data pack in the `.minecraft/datapacks` folder. Override the value specified in the configuration file.' }),
-    path: command_1.flags.string({ description: 'The path to save the data pack at. Override the value specified in the configuration file.' }),
-    minecraftPath: command_1.flags.string({ name: 'minecraft-path', description: 'Path of the .minecraft folder. Override the value specified in the configuration file.' }),
+    root: command_1.flags.boolean({ description: 'Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.' }),
+    clientPath: command_1.flags.string({ name: 'client-path', description: 'Path of the client folder. Override the value specified in the configuration file.' }),
+    serverPath: command_1.flags.string({ name: 'server-path', description: 'Path of the server folder. Override the value specified in the configuration file.' }),
+    // TODO: ssh
     name: command_1.flags.string({ description: 'Name of the data pack. Override the value specified in the configuration file.' }),
     description: command_1.flags.string({ description: 'Description of the data pack. Override the value specified in the configuration file.' }),
     formatVersion: command_1.flags.integer({ name: 'format', description: 'Pack format version. Override the value specified in the configuration file.' }),

package/lib/template/README.md

@@ -1,6 +1,6 @@
 # Sandstone project
 
-To build the datapack, run:
+To build the packs, run:
 ```ts
 npm run build
 // or
@@ -9,7 +9,7 @@ yarn build
 sand build
 ```
 
-To automatically rebuild the datapack on each change, run:
+To automatically rebuild the packs on each change, run:
 ```ts
 npm run watch
 // or

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.6.0","commands":{"build":{"id":"build","description":"Build the datapack. ⛏","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand build","$ sand build --verbose","$ sand build --verbose --dry"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"dry":{"name":"dry","type":"boolean","char":"d","description":"Do not save the datapack. Mostly useful with `verbose`.","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Log all resulting resources: functions, advancements...","allowNo":false},"namespace":{"name":"namespace","type":"option","description":"The default namespace. Override the value specified in the configuration file."},"world":{"name":"world","type":"option","description":"The world to save the data pack in. Override the value specified in the configuration file."},"root":{"name":"root","type":"boolean","description":"Save the data pack in the `.minecraft/datapacks` folder. Override the value specified in the configuration file.","allowNo":false},"path":{"name":"path","type":"option","description":"The path to save the data pack at. Override the value specified in the configuration file."},"minecraftPath":{"name":"minecraftPath","type":"option","description":"Path of the .minecraft folder. Override the value specified in the configuration file."},"name":{"name":"name","type":"option","description":"Name of the data pack. Override the value specified in the configuration file."},"description":{"name":"description","type":"option","description":"Description of the data pack. Override the value specified in the configuration file."},"formatVersion":{"name":"formatVersion","type":"option","description":"Pack format version. Override the value specified in the configuration file."},"fullTrace":{"name":"fullTrace","type":"boolean","description":"Show the full stack trace on errors.","allowNo":false},"strictErrors":{"name":"strictErrors","type":"boolean","description":"Stop data pack compilation on type errors.","allowNo":false},"production":{"name":"production","type":"boolean","char":"p","description":"Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to \"production\".","allowNo":false},"autoReload":{"name":"autoReload","type":"option","description":"Automatically reload your data pack in-game. Requires to open the world to LAN with cheats enabled, and to specify the port.","helpValue":"port"}},"args":[{"name":"path","description":"Path of the folder containing source files.","required":true,"default":"./src"},{"name":"config-path","description":"Path of the sandstone.config.ts folder.","required":true,"default":"."}]},"create":{"id":"create","description":"Create a new Sandstone project.","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand create my-datapack"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"yarn":{"name":"yarn","type":"boolean","description":"Use yarn instead of npm.","allowNo":false},"npm":{"name":"npm","type":"boolean","description":"Use npm.","allowNo":false},"datapack-name":{"name":"datapack-name","type":"option","char":"d","description":"The name of the data pack."},"namespace":{"name":"namespace","type":"option","char":"n","description":"The default namespace that will be used."},"save-root":{"name":"save-root","type":"boolean","char":"r","description":"Save the data pack in the .minecraft/datapacks folder. Not compatible with --world and --custom-path.","allowNo":false},"world":{"name":"world","type":"option","char":"w","description":"The world to save the data pack in. Not compatible with --save-root and --custom-path."},"custom-path":{"name":"custom-path","type":"option","char":"p","description":"The path to save the data pack at. Not compatible with --save-root and --world."}},"args":[{"name":"project-name","description":"Name of the project folder. This is not the name of the data pack.","required":true}]},"update":{"id":"update","description":"Update Sandstone & Sandstone-CLI.","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand update","$ sand update --cli","$ sand update --sandstone","$ sand update --cli --sandstone --skip"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"cli":{"name":"cli","type":"boolean","description":"Update the Sandstone CLI without asking.","allowNo":false},"sandstone":{"name":"sandstone","type":"boolean","description":"Update the current Sandstone version without asking.","allowNo":false},"skip":{"name":"skip","type":"boolean","description":"Skip all interactive prompts and refuse them.","allowNo":false},"yarn":{"name":"yarn","type":"boolean","description":"Use yarn to install the updates.","allowNo":false},"npm":{"name":"npm","type":"boolean","description":"Use npm to install the updates.","allowNo":false}},"args":[]},"watch":{"id":"watch","description":"Build the datapack, and rebuild it on file change. ⛏","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand watch","$ sand watch --verbose","$ sand watch --verbose --dry"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"dry":{"name":"dry","type":"boolean","char":"d","description":"Do not save the datapack. Mostly useful with `verbose`.","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Log all resulting resources: functions, advancements...","allowNo":false},"namespace":{"name":"namespace","type":"option","description":"The default namespace. Override the value specified in the configuration file."},"world":{"name":"world","type":"option","description":"The world to save the data pack in. Override the value specified in the configuration file."},"root":{"name":"root","type":"boolean","description":"Save the data pack in the `.minecraft/datapacks` folder. Override the value specified in the configuration file.","allowNo":false},"path":{"name":"path","type":"option","description":"The path to save the data pack at. Override the value specified in the configuration file."},"minecraftPath":{"name":"minecraftPath","type":"option","description":"Path of the .minecraft folder. Override the value specified in the configuration file."},"name":{"name":"name","type":"option","description":"Name of the data pack. Override the value specified in the configuration file."},"description":{"name":"description","type":"option","description":"Description of the data pack. Override the value specified in the configuration file."},"formatVersion":{"name":"formatVersion","type":"option","description":"Pack format version. Override the value specified in the configuration file."},"fullTrace":{"name":"fullTrace","type":"boolean","description":"Show the full stack trace on errors.","allowNo":false},"strictErrors":{"name":"strictErrors","type":"boolean","description":"Stop data pack compilation on type errors.","allowNo":false},"production":{"name":"production","type":"boolean","char":"p","description":"Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to \"production\".","allowNo":false},"autoReload":{"name":"autoReload","type":"option","description":"Automatically reload your data pack in-game. Requires to open the world to LAN with cheats enabled, and to specify the port.","helpValue":"port"}},"args":[{"name":"path","description":"Path of the folder containing source files.","required":true,"default":"./src"},{"name":"config-path","description":"Path of the sandstone.config.ts folder.","required":true,"default":"."}]}}}
+{"version":"0.6.2","commands":{"build":{"id":"build","description":"Build the packs. ⛏","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand build","$ sand build --verbose","$ sand build --verbose --dry"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"dry":{"name":"dry","type":"boolean","char":"d","description":"Do not save the pack. Mostly useful with `verbose`.","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Log all resulting resources: functions, advancements...","allowNo":false},"namespace":{"name":"namespace","type":"option","description":"The default namespace. Override the value specified in the configuration file."},"world":{"name":"world","type":"option","description":"The world to save the data pack in. Override the value specified in the configuration file."},"root":{"name":"root","type":"boolean","description":"Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.","allowNo":false},"clientPath":{"name":"clientPath","type":"option","description":"Path of the client folder. Override the value specified in the configuration file."},"serverPath":{"name":"serverPath","type":"option","description":"Path of the server folder. Override the value specified in the configuration file."},"name":{"name":"name","type":"option","description":"Name of the data pack. Override the value specified in the configuration file."},"description":{"name":"description","type":"option","description":"Description of the data pack. Override the value specified in the configuration file."},"formatVersion":{"name":"formatVersion","type":"option","description":"Pack format version. Override the value specified in the configuration file."},"fullTrace":{"name":"fullTrace","type":"boolean","description":"Show the full stack trace on errors.","allowNo":false},"strictErrors":{"name":"strictErrors","type":"boolean","description":"Stop data pack compilation on type errors.","allowNo":false},"production":{"name":"production","type":"boolean","char":"p","description":"Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to \"production\".","allowNo":false},"autoReload":{"name":"autoReload","type":"option","description":"Automatically reload your data pack in-game. Requires to open the world to LAN with cheats enabled, and to specify the port.","helpValue":"port"}},"args":[{"name":"path","description":"Path of the folder containing source files.","required":true,"default":"./src"},{"name":"config-path","description":"Path of the sandstone.config.ts folder.","required":true,"default":"."}]},"create":{"id":"create","description":"Create a new Sandstone project.","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand create my-pack"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"yarn":{"name":"yarn","type":"boolean","description":"Use yarn instead of npm.","allowNo":false},"npm":{"name":"npm","type":"boolean","description":"Use npm.","allowNo":false},"pack-name":{"name":"pack-name","type":"option","char":"d","description":"The name of the data pack."},"namespace":{"name":"namespace","type":"option","char":"n","description":"The default namespace that will be used."},"save-root":{"name":"save-root","type":"boolean","char":"r","description":"Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Not compatible with --world.","allowNo":false},"world":{"name":"world","type":"option","char":"w","description":"The world to save the packs in. Not compatible with --save-root or --server"},"server-path":{"name":"server-path","type":"option","char":"s","description":"The server path to write the server-side packs at. Not compatible with --world."},"client-path":{"name":"client-path","type":"option","char":"c","description":"The client path to write packs at."}},"args":[{"name":"project-name","description":"Name of the project folder. This is not the name of the data pack.","required":true}]},"update":{"id":"update","description":"Update Sandstone & Sandstone-CLI.","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand update","$ sand update --cli","$ sand update --sandstone","$ sand update --cli --sandstone --skip"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"cli":{"name":"cli","type":"boolean","description":"Update the Sandstone CLI without asking.","allowNo":false},"sandstone":{"name":"sandstone","type":"boolean","description":"Update the current Sandstone version without asking.","allowNo":false},"skip":{"name":"skip","type":"boolean","description":"Skip all interactive prompts and refuse them.","allowNo":false},"yarn":{"name":"yarn","type":"boolean","description":"Use yarn to install the updates.","allowNo":false},"npm":{"name":"npm","type":"boolean","description":"Use npm to install the updates.","allowNo":false}},"args":[]},"watch":{"id":"watch","description":"Build the packs, and rebuild them on file change. ⛏","pluginName":"sandstone-cli","pluginType":"core","aliases":[],"examples":["$ sand watch","$ sand watch --verbose","$ sand watch --verbose --dry"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"dry":{"name":"dry","type":"boolean","char":"d","description":"Do not save the pack. Mostly useful with `verbose`.","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Log all resulting resources: functions, advancements...","allowNo":false},"namespace":{"name":"namespace","type":"option","description":"The default namespace. Override the value specified in the configuration file."},"world":{"name":"world","type":"option","description":"The world to save the data pack in. Override the value specified in the configuration file."},"root":{"name":"root","type":"boolean","description":"Save the data pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.","allowNo":false},"clientPath":{"name":"clientPath","type":"option","description":"Path of the client folder. Override the value specified in the configuration file."},"serverPath":{"name":"serverPath","type":"option","description":"Path of the server folder. Override the value specified in the configuration file."},"name":{"name":"name","type":"option","description":"Name of the data pack. Override the value specified in the configuration file."},"description":{"name":"description","type":"option","description":"Description of the data pack. Override the value specified in the configuration file."},"formatVersion":{"name":"formatVersion","type":"option","description":"Pack format version. Override the value specified in the configuration file."},"fullTrace":{"name":"fullTrace","type":"boolean","description":"Show the full stack trace on errors.","allowNo":false},"strictErrors":{"name":"strictErrors","type":"boolean","description":"Stop data pack compilation on type errors.","allowNo":false},"production":{"name":"production","type":"boolean","char":"p","description":"Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to \"production\".","allowNo":false},"autoReload":{"name":"autoReload","type":"option","description":"Automatically reload your data pack in-game. Requires to open the world to LAN with cheats enabled, and to specify the port.","helpValue":"port"}},"args":[{"name":"path","description":"Path of the folder containing source files.","required":true,"default":"./src"},{"name":"config-path","description":"Path of the sandstone.config.ts folder.","required":true,"default":"."}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sandstone-cli",
   "description": "The CLI for Sandstone - the data pack creation library.",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "contributors": [
     {
       "name": "TheMrZZ - Florian ERNST",
@@ -22,10 +22,14 @@
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^3",
     "@oclif/plugin-warn-if-update-available": "^1.7.0",
-    "@types/node": "^18.11.18",
+    "@types/adm-zip": "^0.5.0",
+    "@types/delete-empty": "^3.0.2",
+    "@types/node": "^18.14.0",
     "@types/semver": "^7.3.4",
+    "adm-zip": "^0.5.10",
     "chalk": "^4.1.0",
     "chokidar": "^3.4.3",
+    "delete-empty": "^3.0.0",
     "fs-extra": "^9.0.1",
     "inquirer": "^7.3.3",
     "klaw": "^3.0.0",
@@ -42,7 +46,7 @@
     "@oclif/dev-cli": "^1",
     "@types/fs-extra": "^9.0.4",
     "@types/inquirer": "^7.3.1",
-    "@types/klaw": "^3.0.1",
+    "@types/klaw": "^3.0.3",
     "@types/lodash.debounce": "^4.0.6",
     "@types/madge": "^5.0.0",
     "@types/nodemon": "^1.19.0",