sandstone 1.1.1 → 1.1.2

package/dist/_internal/index.js

@@ -1,4 +1,3 @@
-import { createRequire } from "node:module";
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -40,12 +39,12 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
 // Hoisted class definitions
 
-class ComponentClass {
+class TextComponentClass {
   _toChatComponent() {
     throw new Error("Not implemented");
   }
 }
-ConditionTextComponentClass = class ConditionTextComponentClass extends ComponentClass {
+ConditionTextComponentClass = class ConditionTextComponentClass extends TextComponentClass {
     _toChatComponent() {
       throw new Error("Not implemented");
     }
@@ -68,7 +67,7 @@ VectorClass = class VectorClass {
       return this.toString();
     }
     toNBT() {
-      return this.toString();
+      return `'${this.toString()}'`;
     }
     [Symbol.iterator]() {
       return this.values[Symbol.iterator]();
@@ -265,7 +264,7 @@ Score = class Score extends MacroArgument {
     }
     _toChatComponent() {
       return {
-        score: { name: this.target, objective: this.objective.name }
+        score: { name: `${this.target}`, objective: this.objective }
       };
     }
     _toMinecraftCondition = () => this.sandstonePack._.not(new this.sandstonePack.conditions.Score(this.sandstonePack.core, [
@@ -391,6 +390,7 @@ Score = class Score extends MacroArgument {
       const playerScore = this;
       if (typeof args[0] === "number") {
         return {
+          __conditionClassBrand: true,
           _toMinecraftCondition: () => new this.sandstonePack.conditions.Score(this.sandstonePack.core, [
             `${playerScore.target}`,
             `${playerScore.objective}`,
@@ -401,6 +401,7 @@ Score = class Score extends MacroArgument {
       }
       const endArgs = args[1] ? args : [args[0]];
       return {
+        __conditionClassBrand: true,
         _toMinecraftCondition: () => new this.sandstonePack.conditions.Score(this.sandstonePack.core, [
           `${playerScore.target}`,
           `${playerScore.objective}`,
@@ -435,6 +436,7 @@ Score = class Score extends MacroArgument {
     }
     "!=" = this.notEqualTo;
     matches = (range) => ({
+      __conditionClassBrand: true,
       _toMinecraftCondition: () => new this.sandstonePack.conditions.Score(this.sandstonePack.core, [
         `${this.target}`,
         `${this.objective}`,
@@ -443,17 +445,19 @@ Score = class Score extends MacroArgument {
       ])
     });
     match = (minimum, maximum, callback) => {
-      const { MCFunction, Macro } = this.sandstonePack;
+      const { MCFunction, Macro, core } = this.sandstonePack;
+      const { getCurrentMCFunctionOrThrow } = core;
       if (maximum > 1000) {
         console.warn(`
 Warning: Score.match() will have to create ${maximum - minimum} mcfunction files, this *will* take a while. ` + "Consider only compiling this once and saving it to external resources.");
       }
       const matcher = matchers++;
       const score = this;
-      for (let i = minimum;i < maximum; i++) {
-        MCFunction(`__sandstone:score_match/${matcher}/${i}`, () => callback(i));
+      const parent = getCurrentMCFunctionOrThrow();
+      for (let i = minimum;i <= maximum; i++) {
+        MCFunction(`./score_match/${matcher}/${i}`, () => callback(i));
       }
-      return MCFunction(`__sandstone:score_match/${matcher}`, [score], () => Macro.returnCmd.run.functionCmd(Macro`__sandstone:score_match/${matcher}/${score}`));
+      return MCFunction(`./score_match/${matcher}`, [score], () => Macro.returnCmd.run.functionCmd(Macro`${parent.resource.name}/score_match/${matcher}/${score}`));
     };
     getDecomposer(size, splitsOrCount, componentCount = 31, includeSign = true) {
       if (typeof this.target !== "string" || this.target.search(/-|@/) !== -1) {
@@ -1144,7 +1148,7 @@ class ResourceClass {
     return this.name;
   }
   toNBT() {
-    return this.name;
+    return `'${this.name}'`;
   }
   toJSON() {
     return this.name;
@@ -1357,23 +1361,6 @@ DamageTypeClass = class DamageTypeClass extends ResourceClass {
     _toChatComponent = () => ({ translate: this.translationKey });
     toString = () => this.name;
   };
-DecoratedPotPatternNode = class DecoratedPotPatternNode extends ContainerNode {
-    resource;
-    constructor(sandstoneCore, resource) {
-      super(sandstoneCore);
-      this.resource = resource;
-    }
-    getValue = () => jsonStringify(this.resource.decoratedPotPatternJSON, this.resource._resourceType);
-  };
-DecoratedPotPatternClass = class DecoratedPotPatternClass extends ResourceClass {
-    static resourceType = "decorated_pot_pattern";
-    decoratedPotPatternJSON;
-    constructor(sandstoneCore, name, args) {
-      super(sandstoneCore, { packType: sandstoneCore.pack.dataPack(), extension: "json" }, DecoratedPotPatternNode, DecoratedPotPatternClass.resourceType, sandstoneCore.pack.resourceToPath(name, RESOURCE_PATHS[DecoratedPotPatternClass.resourceType].path), args);
-      this.decoratedPotPatternJSON = args.json;
-      this.handleConflicts();
-    }
-  };
 DialogNode = class DialogNode extends ContainerNode {
     resource;
     constructor(sandstoneCore, resource) {
@@ -1710,6 +1697,9 @@ TagClass = class TagClass extends ResourceClass {
     type;
     tagJSON;
     constructor(sandstoneCore, type, name, args) {
+      if (type === "entity") {
+        console.warn(`[TagClass] Tag type 'entity' is not a valid Minecraft tag registry. Did you mean 'entity_type'?`);
+      }
       super(sandstoneCore, { packType: sandstoneCore.pack.dataPack(), extension: "json" }, TagNode, TagClass.resourceType, sandstoneCore.pack.resourceToPath(name, [RESOURCE_PATHS[TagClass.resourceType].path[0], type]), args);
       this.type = type;
       this.tagJSON = {
@@ -1761,9 +1751,6 @@ TagClass = class TagClass extends ResourceClass {
     toJSON() {
       return this.name;
     }
-    toNBT() {
-      return this.name;
-    }
     _toMinecraftCondition = () => {
       if (this.type === "block" || this.type === "entity_type") {
         return new this.pack.conditions.Tag(this.core, this.type, this.name);
@@ -2004,9 +1991,6 @@ _RawMCFunctionClass = class _RawMCFunctionClass extends CallableResourceClass {
       }
       this.node.body.splice(start, removeItems === "auto" ? fullBody.length : removeItems, ...fullBody);
     }
-    toNBT() {
-      return this.name;
-    }
   };
 MCFunctionClass = makeClassCallable(_RawMCFunctionClass);
 PredicateNode = class PredicateNode extends ContainerNode {
@@ -2089,23 +2073,6 @@ RecipeClass = class RecipeClass extends ResourceClass {
       return this.pack.commands.recipe.take(players, this);
     }
   };
-SlotSourceNode = class SlotSourceNode extends ContainerNode {
-    resource;
-    constructor(sandstoneCore, resource) {
-      super(sandstoneCore);
-      this.resource = resource;
-    }
-    getValue = () => jsonStringify(this.resource.slotSourceJSON, this.resource._resourceType);
-  };
-SlotSourceClass = class SlotSourceClass extends ResourceClass {
-    static resourceType = "slot_source";
-    slotSourceJSON;
-    constructor(sandstoneCore, name, args) {
-      super(sandstoneCore, { packType: sandstoneCore.pack.dataPack(), extension: "json" }, SlotSourceNode, SlotSourceClass.resourceType, sandstoneCore.pack.resourceToPath(name, RESOURCE_PATHS[SlotSourceClass.resourceType].path), args);
-      this.slotSourceJSON = args.json;
-      this.handleConflicts();
-    }
-  };
 StructureNode = class StructureNode extends ContainerNode {
     resource;
     constructor(sandstoneCore, resource) {
@@ -2718,7 +2685,7 @@ ModelClass = class ModelClass extends ResourceClass {
       this.modelJSON = args.json;
       this.handleConflicts();
     }
-    toString = () => `${this.path[0]}:${this.path.slice(2)}`;
+    toString = () => `${this.path[0]}:${this.path.slice(2).join("/")}`;
   };
 ParticleNode = class ParticleNode extends ContainerNode {
     resource;
@@ -2795,7 +2762,7 @@ SoundEventClass = class SoundEventClass extends ResourceClass {
         if (args.addToSounds) {
           let def = this.core.sounds.get(this.path[0]);
           if (!def) {
-            def = this.core.sounds.set(this.path[0], new SoundsClass(this.core, this.path[0], {
+            def = this.core.sounds.set(this.path[0], new SoundsIndexClass(this.core, this.path[0], {
               addToSandstoneCore: true,
               creator: "sandstone"
             })).get(this.path[0]);
@@ -2806,7 +2773,7 @@ SoundEventClass = class SoundEventClass extends ResourceClass {
       this.handleConflicts();
     }
   };
-SoundsNode = class SoundsNode extends ContainerNode {
+SoundsIndexNode = class SoundsIndexNode extends ContainerNode {
     resource;
     constructor(sandstoneCore, resource) {
       super(sandstoneCore);
@@ -2814,11 +2781,11 @@ SoundsNode = class SoundsNode extends ContainerNode {
     }
     getValue = () => jsonStringify(this.resource.soundsJSON, this.resource._resourceType);
   };
-SoundsClass = class SoundsClass extends ResourceClass {
+SoundsIndexClass = class SoundsIndexClass extends ResourceClass {
     static resourceType = "sounds";
     soundsJSON;
     constructor(core, namespace, args) {
-      super(core, { packType: core.pack.resourcePack() }, SoundsNode, SoundsClass.resourceType, core.pack.resourceToPath(`${namespace}:sounds`, RESOURCE_PATHS[SoundsClass.resourceType].path), args);
+      super(core, { packType: core.pack.resourcePack() }, SoundsIndexNode, SoundsIndexClass.resourceType, core.pack.resourceToPath(`${namespace}:sounds`, RESOURCE_PATHS[SoundsIndexClass.resourceType].path), args);
       if (args.definitions !== undefined) {
         this.soundsJSON = args.definitions;
       } else {
@@ -2826,7 +2793,7 @@ SoundsClass = class SoundsClass extends ResourceClass {
       }
     }
     async push(...soundEvents) {
-      if (soundEvents[0] instanceof SoundsClass) {
+      if (soundEvents[0] instanceof SoundsIndexClass) {
         for await (const _sounds of soundEvents) {
           const def = await _sounds.soundsJSON;
           const s = await this.soundsJSON;
@@ -2843,7 +2810,7 @@ SoundsClass = class SoundsClass extends ResourceClass {
       }
     }
     async unshift(...soundEvents) {
-      if (soundEvents[0] instanceof SoundsClass) {
+      if (soundEvents[0] instanceof SoundsIndexClass) {
         for await (const _sounds of soundEvents) {
           const def = await _sounds.soundsJSON;
           const s = await this.soundsJSON;
@@ -2897,52 +2864,54 @@ PlainTextClass = class PlainTextClass extends ResourceClass {
         }
       } else {
         const currentText = text;
-        if (!currentText.text) {
-          throw new Error("Dynamic JSON content is not supported in plaintext");
-        }
-        if (currentText.color) {
-          const { color } = currentText;
-          if (color.startsWith("#")) {
-            throw new Error("Hex codes are not supported in plaintext");
+        if (typeof currentText !== "string") {
+          if (!("text" in currentText)) {
+            throw new Error("Dynamic JSON content is not supported in plaintext");
+          }
+          if (currentText.color) {
+            const { color } = currentText;
+            if (color.startsWith("#")) {
+              throw new Error("Hex codes are not supported in plaintext");
+            }
+            const colors = [
+              "black",
+              "dark_blue",
+              "dark_green",
+              "dark_aqua",
+              "dark_red",
+              "dark_purple",
+              "gold",
+              "gray",
+              "dark_gray",
+              "blue",
+              "green",
+              "aqua",
+              "red",
+              "light_purple",
+              "yellow",
+              "white"
+            ];
+            converted = `§${colors.indexOf(color).toString(16)}`;
+          }
+          if (currentText.obfuscated) {
+            converted += "§k";
+          }
+          if (currentText.bold) {
+            converted += "§l";
+          }
+          if (currentText.strikethrough) {
+            converted += "§m";
+          }
+          if (currentText.underlined) {
+            converted += "§n";
+          }
+          if (currentText.italic) {
+            converted += "§o";
+          }
+          converted += `${currentText.text}`;
+          if (currentText.extra) {
+            converted += this.componentToPlainText(currentText.extra);
           }
-          const colors = [
-            "black",
-            "dark_blue",
-            "dark_green",
-            "dark_aqua",
-            "dark_red",
-            "dark_purple",
-            "gold",
-            "gray",
-            "dark_gray",
-            "blue",
-            "green",
-            "aqua",
-            "red",
-            "light_purple",
-            "yellow",
-            "white"
-          ];
-          converted = `§${colors.indexOf(color).toString(16)}`;
-        }
-        if (currentText.obfuscated) {
-          converted += "§k";
-        }
-        if (currentText.bold) {
-          converted += "§l";
-        }
-        if (currentText.strikethrough) {
-          converted += "§m";
-        }
-        if (currentText.underlined) {
-          converted += "§n";
-        }
-        if (currentText.italic) {
-          converted += "§o";
-        }
-        converted += `${currentText.text}`;
-        if (currentText.extra) {
-          converted += this.componentToPlainText(currentText.extra);
         }
       }
       return converted;
@@ -3001,7 +2970,7 @@ TextureClass = class TextureClass extends ResourceClass {
       this.handleConflicts();
     }
     toString() {
-      return `${this.path[0]}:${this.path.slice(2)}`;
+      return `${this.path[0]}:${this.path.slice(2).join("/")}`;
     }
     videoToAnimation(_path) {
       console.log("[TextureClass#videoToAnimation] Unimplemented");
@@ -3080,6 +3049,7 @@ FunctionCommand = class FunctionCommand extends CommandArguments {
     }
   };
 ExecuteCommandPart = class ExecuteCommandPart extends CommandArguments {
+    NodeType = ExecuteCommandNode;
     nestedExecute = (args, executable = true) => this.subCommand([args], ExecuteCommand, executable);
   };
 ExecuteCommandNode = class ExecuteCommandNode extends ContainerCommandNode {
@@ -4277,7 +4247,7 @@ ItemCommandNode = class ItemCommandNode extends CommandNode {
 ItemSourceCommand = class ItemSourceCommand extends CommandArguments {
     with(item, countOrNBT, count) {
       if (typeof countOrNBT === "object") {
-        return this.finalCommand(["with", `${item}${nbtResolver(countOrNBT)}`, count]);
+        return this.finalCommand(["with", `${item}${componentPatchStringifier(countOrNBT)}`, count]);
       }
       return this.finalCommand(["with", item, countOrNBT]);
     }
@@ -5212,6 +5182,66 @@ OrTransformationVisitor = class OrTransformationVisitor extends GenericSandstone
       };
     };
   };
+OptimizeMacroTemporariesVisitor = class OptimizeMacroTemporariesVisitor extends GenericSandstoneVisitor {
+    visitMCFunctionNode = (functionNode) => {
+      this.genericVisit(functionNode);
+      for (let callIndex = 0;callIndex < functionNode.body.length; callIndex++) {
+        const call = functionNode.body[callIndex];
+        if (!(call instanceof FunctionCommandNode)) {
+          continue;
+        }
+        const callArgs = call.args;
+        if (callArgs[1] !== "with" || callArgs[2] !== "storage" || typeof callArgs[3] !== "string" || typeof callArgs[4] !== "string") {
+          continue;
+        }
+        const macroPoint = { target: callArgs[3], path: callArgs[4] };
+        const copies = [];
+        let setupStart = callIndex;
+        while (setupStart > 0) {
+          const copy = getMacroCopy(functionNode.body[setupStart - 1], macroPoint);
+          if (!copy) {
+            break;
+          }
+          copies.unshift(copy);
+          setupStart--;
+        }
+        if (copies.length === 0 || setupStart === 0 || !isMacroReset(functionNode.body[setupStart - 1], macroPoint)) {
+          continue;
+        }
+        const resetIndex = setupStart - 1;
+        const producers = [];
+        let canOptimize = true;
+        for (const copy of copies) {
+          const matches = [];
+          for (const [index, node] of functionNode.body.slice(0, resetIndex).entries()) {
+            const store = getExecuteStore(node, copy.source);
+            if (store) {
+              matches.push({ index, store });
+            }
+          }
+          if (matches.length !== 1 || referencesStoragePoint(functionNode, copy.source) !== 2) {
+            canOptimize = false;
+            break;
+          }
+          producers.push({ ...matches[0], destination: copy.destination });
+        }
+        if (!canOptimize) {
+          continue;
+        }
+        const producerIndexes = new Set(producers.map((producer) => producer.index));
+        if (producerIndexes.size !== producers.length) {
+          continue;
+        }
+        for (const producer of producers) {
+          producer.store[1] = producer.destination.target;
+          producer.store[2] = producer.destination.path;
+        }
+        functionNode.body.splice(resetIndex, copies.length + 1);
+        callIndex = resetIndex;
+      }
+      return functionNode;
+    };
+  };
 SimplifyExecuteFunctionVisitor = class SimplifyExecuteFunctionVisitor extends GenericSandstoneVisitor {
     visitExecuteCommandNode = (node) => {
       if (node.body.length === 0 || node.body.length > 1) {
@@ -5783,7 +5813,7 @@ ItemModelBuilder = class ItemModelBuilder extends ItemPredicateClass {
         model: this.toItemModel(),
         ...this._handAnimationOnSwap !== undefined && { hand_animation_on_swap: this._handAnimationOnSwap },
         ...this._oversizedInGui !== undefined && { oversized_in_gui: this._oversizedInGui },
-        ...this._swapAnimationScale !== undefined && { swap_animation_scale: NBT.float(this._swapAnimationScale) }
+        ...this._swapAnimationScale !== undefined && { swap_animation_scale: this._swapAnimationScale }
       };
     }
     buildFromPredicates() {
@@ -5807,10 +5837,10 @@ ItemModelBuilder = class ItemModelBuilder extends ItemPredicateClass {
         const value = countTest.value;
         const entries = [];
         if (typeof value === "number") {
-          entries.push({ threshold: NBT.float(value), model: this.onTrueModel || { type: "empty" } });
+          entries.push({ threshold: value, model: this.onTrueModel || { type: "empty" } });
         } else if (value && typeof value === "object") {
           if (value.min !== undefined) {
-            entries.push({ threshold: NBT.float(value.min), model: this.onTrueModel || { type: "empty" } });
+            entries.push({ threshold: value.min, model: this.onTrueModel || { type: "empty" } });
           }
         }
         return {
@@ -6193,8 +6223,8 @@ SelectorClass = class SelectorClass {
           const gamemodes = Array.isArray(gamemode2) ? gamemode2 : [gamemode2];
           result.push(...gamemodes.map((gamemode_) => ["gamemode", gamemode_]));
         },
-        predicate: (predicate3) => {
-          const predicates = Array.isArray(predicate3) ? predicate3 : [predicate3];
+        predicate: (predicate4) => {
+          const predicates = Array.isArray(predicate4) ? predicate4 : [predicate4];
           result.push(...predicates.map((pred) => ["predicate", pred]));
         },
         team: (team2) => {
@@ -6210,19 +6240,23 @@ SelectorClass = class SelectorClass {
         },
         distance: (range_) => result.push(["distance", rangeParser(this.sandstonePack.core, range_)])
       };
-      for (const [baseName, modifier] of Object.entries(modifiers)) {
-        const name = baseName;
-        const value = args[name];
-        if (value !== undefined) {
-          modifier(value);
-          delete args[name];
-        }
-      }
-      Object.entries(args).forEach(([key, value]) => {
-        if (value !== undefined) {
+      Object.entries(args).forEach(([key_, value]) => {
+        const key = key_;
+        if (key in modifiers) {
+          const modifierName = key;
+          modifiers[modifierName](value);
+        } else if (value !== undefined) {
           result.push([key, `${value}`]);
         }
       });
+      const entityType = result.findIndex(([key]) => key === "type");
+      if (entityType !== -1) {
+        result.unshift(...result.splice(entityType, 1));
+      }
+      const predicate3 = result.findIndex(([key]) => key === "predicate");
+      if (predicate3 !== -1) {
+        result.push(...result.splice(predicate3, 1));
+      }
       return `${this.target}[${result.map(([key, value]) => `${key}=${value}`).join(", ")}]`;
     }
     _toMinecraftCondition = () => new this.sandstonePack.conditions.Selector(this.sandstonePack.core, this.toString());
@@ -6239,7 +6273,7 @@ SelectorClass = class SelectorClass {
       return this.toString();
     }
     toNBT() {
-      return this.toString();
+      return `'${this.toString()}'`;
     }
     [util12.inspect.custom]() {
       return formatDebugString(this.constructor.name, this.toString(), undefined, undefined);
@@ -6262,14 +6296,20 @@ class _RawLabelClass {
     if (description)
       this.description = description;
   }
-  LabelHolder = (entity) => {
-    if (typeof entity === "string")
-      return new EntityLabel(this.pack, new SelectorClass(this.pack, entity), this);
+  LabelHolder(entity, selectorArguments) {
+    if (typeof entity === "string") {
+      return new EntityLabel(this.pack, new SelectorClass(this.pack, entity, selectorArguments), this);
+    }
     return new EntityLabel(this.pack, entity, this);
-  };
+  }
   toString = () => `${this.fullName}${this.description ? `; ${this.description}` : ""}`;
   toNBT = () => `'${this.fullName}'`;
-  __call__ = (entity) => this.LabelHolder(entity);
+  __call__(entity, selectorArguments) {
+    if (typeof entity === "string") {
+      return new EntityLabel(this.pack, new SelectorClass(this.pack, entity, selectorArguments), this);
+    }
+    return new EntityLabel(this.pack, entity, this);
+  }
 }
 LabelClass = makeClassCallable(_RawLabelClass);
 LoopArgument = class LoopArgument extends Node {
@@ -6323,7 +6363,7 @@ _RawObjectiveClass = class _RawObjectiveClass {
       }, undefined, options.indent);
     }
     toJSON = this.toString;
-    toNBT = this.toString;
+    toNBT = () => `'${this.toString}'`;
     __call__ = this.ScoreHolder;
   };
 ObjectiveClass = makeClassCallable(_RawObjectiveClass);
@@ -6385,7 +6425,6 @@ SleepClass = class SleepClass extends AwaitNode {
       core.awaitNodes.add(this);
     }
   };
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/variables/abstractClasses.ts
 
@@ -6402,6 +6441,9 @@ class SelectorPickClass {
   toNBT() {
     throw new Error("Not implemented");
   }
+  _toChatComponent() {
+    throw new Error("Not implemented");
+  }
 }
 var ConditionTextComponentClass;
 var init_abstractClasses = __esm(() => {
@@ -6427,7 +6469,7 @@ function relative(...coordinates) {
     return new VectorClass(["~", "~", "~"]);
   }
   if (coordinates.length === 1) {
-    return `~${coordinates[0] || ""}`;
+    return `~${coordinates[0]}`;
   }
   return new VectorClass(coordinates.map((coord) => `~${coord || ""}`));
 }
@@ -6436,7 +6478,7 @@ function local(...coordinates) {
     return new VectorClass(["^", "^", "^"]);
   }
   if (coordinates.length === 1) {
-    return `^${coordinates[0] || ""}`;
+    return `^${coordinates[0]}`;
   }
   return new VectorClass(coordinates.map((coord) => `^${coord || ""}`));
 }
@@ -6468,6 +6510,7 @@ import { coerce } from "semver";
 import * as util from "util";
 function makeCallableProxy(func, object) {
   return new Proxy(func, {
+    apply: (_t, _thisArg, args) => Reflect.apply(func, object, args),
     get: (_t, p, _r) => object[p],
     set: (_t, p, value, _r) => {
       object[p] = value;
@@ -6509,7 +6552,7 @@ function makeCallable(object, func, useProxy = false) {
 }
 function randomUUID() {
   crypto.getRandomValues(uuidBytes);
-  uuidBytes[6] = uuidBytes[6] & 15 | 64;
+  uuidBytes[6] = uuidBytes[6] & 15 | 4 << 4;
   uuidBytes[8] = uuidBytes[8] & 63 | 128;
   const array = [];
   for (let i = 0;i < 4; i++) {
@@ -6581,9 +6624,8 @@ ${indent}${util.styleText(bracketColor, "}")}`;
   const classNameString = util.styleText("green", className);
   return `${classNameString}${realArgsString}${realBodyString}`;
 }
-var fetch, uuidBytes, uuid, capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1), supportedMinecraftVersions, MinecraftVersionSchema, packCategories, PackDependencySchema, PackVersionSchema, PackDataSchema, MetaDataSchema, Set2;
+var uuidBytes, uuid, capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1), supportedMinecraftVersions, MinecraftVersionSchema, packCategories, PackDependencySchema, PackVersionSchema, PackDataSchema, MetaDataSchema, Set2;
 var init_utils = __esm(() => {
-  fetch = Object.hasOwn(globalThis, "fetch") ? globalThis.fetch : async (...args) => (await import("node-fetch")).default(...args);
   uuidBytes = new Uint8Array(16);
   uuid = new DataView(uuidBytes.buffer);
   FormatRegistry.Set("semver", (v) => coerce(v) != null);
@@ -7284,7 +7326,7 @@ var NBTPrimitive, NBTLong, NBTByte, NBTShort, NBTFloat, NBTInt, NBTDouble, NBTTy
     }
     if (nbt.constructor.name !== "Object") {
       if ("toString" in nbt) {
-        return new ResolvedNBT(`${toString}`, false);
+        return new ResolvedNBT(`'${nbt}'`, false);
       } else {
         throw new Error(`[nbtResolver] A ${nbt.constructor?.name} was passed in as an NBT value. Hint: define toNBT or toString if this was intentional`);
       }
@@ -7295,9 +7337,23 @@ var NBTPrimitive, NBTLong, NBTByte, NBTShort, NBTFloat, NBTInt, NBTDouble, NBTTy
     const resolved = resolve(value);
     if (resolved.containsMacro)
       containsMacro = true;
-    return `${key}:${resolved.value}`;
+    return `${formatKey(key)}:${resolved.value}`;
   }).join(",");
   return new ResolvedNBT(`{${objectStr}}`, containsMacro);
+}, SNBT_KEY_REQUIRED_QUOTE_CHARS, formatKey = (key) => {
+  if (key.startsWith('"') && key.endsWith('"') || key.startsWith("'") && key.endsWith("'")) {
+    return key;
+  }
+  if (!SNBT_KEY_REQUIRED_QUOTE_CHARS.test(key)) {
+    return key;
+  }
+  if (key.includes("'")) {
+    if (key.includes('"')) {
+      return `'${key.replace(/'/g, "\\'")}'`;
+    }
+    return `"${key}"`;
+  }
+  return `'${key}'`;
 }, nbtResolver = (nbt) => resolve(nbt);
 var init_NBTs = __esm(() => {
   init_utils();
@@ -7316,6 +7372,7 @@ var init_NBTs = __esm(() => {
     stringify: (nbt) => nbtResolver(nbt).toString(),
     parse: (nbt) => parseNBT(NBT, nbt)
   }, dynamicNBT);
+  SNBT_KEY_REQUIRED_QUOTE_CHARS = /[:,;.\[\]{}'"]/;
 });
 
 // src/variables/parsers.ts
@@ -7570,7 +7627,6 @@ var init_Data = __esm(() => {
   init_NBTs();
   init_Score();
     });
-
 // src/arguments/basics.ts
 class _ShowAlias {
   toNBT() {
@@ -7634,7 +7690,7 @@ var init_clone = __esm(() => {
 // src/commands/implementations/block/setblock.ts
 function blockStateStringifier(state) {
   let resultPairs = [];
-  for (const [key, value] of Object.entries(Object.entries(state))) {
+  for (const [key, value] of Object.entries(state)) {
     resultPairs.push(`${key}=${value}`);
   }
   return `[${resultPairs.join(",")}]`;
@@ -7681,7 +7737,7 @@ var init_attribute = __esm(() => {
   init_parsers();
       });
 
-// src/commands/implementations/entity/clear.ts
+// src/commands/implementations/player/clear.ts
 var ClearCommandNode, ClearCommand;
 var init_clear = __esm(() => {
   init_Macro();
@@ -7738,16 +7794,16 @@ var init_resource_paths = __esm(() => {
     loot_table: { path: ["loot_table"], pack: "data", ext: ".json" },
     predicate: { path: ["predicate"], pack: "data", ext: ".json" },
     recipe: { path: ["recipe"], pack: "data", ext: ".json" },
-    slot_source: { path: ["slot_source"], pack: "data", ext: ".json" },
     structure: { path: ["structure"], pack: "data", ext: ".nbt" },
-    sulfur_cube_archetype: { path: ["sulfur_cube_archetype"], pack: "data", ext: ".json" },
     banner_pattern: { path: ["banner_pattern"], pack: "data", ext: ".json" },
+    cat_sound_variant: { path: ["cat_sound_variant"], pack: "data", ext: ".json" },
     cat_variant: { path: ["cat_variant"], pack: "data", ext: ".json" },
     chat_type: { path: ["chat_type"], pack: "data", ext: ".json" },
+    chicken_sound_variant: { path: ["chicken_sound_variant"], pack: "data", ext: ".json" },
     chicken_variant: { path: ["chicken_variant"], pack: "data", ext: ".json" },
+    cow_sound_variant: { path: ["cow_sound_variant"], pack: "data", ext: ".json" },
     cow_variant: { path: ["cow_variant"], pack: "data", ext: ".json" },
     damage_type: { path: ["damage_type"], pack: "data", ext: ".json" },
-    decorated_pot_pattern: { path: ["decorated_pot_pattern"], pack: "data", ext: ".json" },
     dialog: { path: ["dialog"], pack: "data", ext: ".json" },
     enchantment: { path: ["enchantment"], pack: "data", ext: ".json" },
     enchantment_provider: { path: ["enchantment_provider"], pack: "data", ext: ".json" },
@@ -7755,7 +7811,9 @@ var init_resource_paths = __esm(() => {
     instrument: { path: ["instrument"], pack: "data", ext: ".json" },
     jukebox_song: { path: ["jukebox_song"], pack: "data", ext: ".json" },
     painting_variant: { path: ["painting_variant"], pack: "data", ext: ".json" },
+    pig_sound_variant: { path: ["pig_sound_variant"], pack: "data", ext: ".json" },
     pig_variant: { path: ["pig_variant"], pack: "data", ext: ".json" },
+    sulfur_cube_archetype: { path: ["sulfur_cube_archetype"], pack: "data", ext: ".json" },
     test_instance: { path: ["test_instance"], pack: "data", ext: ".json" },
     test_environment: { path: ["test_environment"], pack: "data", ext: ".json" },
     timeline: { path: ["timeline"], pack: "data", ext: ".json" },
@@ -7856,14 +7914,6 @@ var init_damageType = __esm(() => {
   damageTypes = new Map;
     });
 
-// src/core/resources/datapack/decoratedPotPattern.ts
-var DecoratedPotPatternNode, DecoratedPotPatternClass;
-var init_decoratedPotPattern = __esm(() => {
-  init_arguments();
-  init_nodes();
-  init_resource();
-    });
-
 // src/core/resources/datapack/dialog.ts
 var DialogNode, DialogClass;
 var init_dialog = __esm(() => {
@@ -8032,14 +8082,6 @@ var init_recipe = __esm(() => {
   init_resource();
     });
 
-// src/core/resources/datapack/slotSource.ts
-var SlotSourceNode, SlotSourceClass;
-var init_slotSource = __esm(() => {
-  init_arguments();
-  init_nodes();
-  init_resource();
-    });
-
 // src/core/resources/datapack/structure.ts
 import lodash from "lodash";
 import prismarine from "prismarine-nbt";
@@ -8144,7 +8186,6 @@ var init_datapack = __esm(() => {
   init_bannerPattern();
   init_chatType();
   init_damageType();
-  init_decoratedPotPattern();
   init_dialog();
   init_enchantment();
   init_gametest();
@@ -8155,7 +8196,6 @@ var init_datapack = __esm(() => {
   init_mcfunction();
   init_predicate();
   init_recipe();
-  init_slotSource();
   init_structure();
   init_sulfurCubeArchetype();
   init_tag();
@@ -8241,7 +8281,7 @@ var init_shader = __esm(() => {
 
 // src/core/resources/resourcepack/sound.ts
 import path from "node:path";
-var SoundEventNode, SoundEventClass, SoundsNode, SoundsClass;
+var SoundEventNode, SoundEventClass, SoundsIndexNode, SoundsIndexClass;
 var init_sound = __esm(() => {
   init_arguments();
   init_nodes();
@@ -8328,7 +8368,7 @@ class MCMetaCache {
     const manifest = JSON.parse(await fs2.readFile(this.manifest, "utf-8"));
     let uncached = false;
     this.version = manifest.version;
-    const getZip = async (branch) => new AdmZip(await (await fetch(`https://github.com${this.base}archive/refs/heads/${branch}.zip`)).buffer());
+    const getZip = async (branch) => new AdmZip(Buffer.from(await (await fetch(`https://github.com${this.base}archive/refs/heads/${branch}.zip`)).arrayBuffer()));
     if (!await fs2.pathExists(this.lockFile)) {
       if (manifest.files.length > 10) {
         const archives = {};
@@ -8337,11 +8377,17 @@ class MCMetaCache {
         }
         for await (const [file, text2] of Object.entries(manifest.files)) {
           const _path = file.split("/");
-          let contents = await new Promise((res) => {
-            archives[_path[0]].readFileAsync(_path.slice(1).join("/"), (data) => res(data));
+          let contents = await new Promise((res, rej) => {
+            archives[_path[0]].readFileAsync(_path.slice(1).join("/"), (data) => {
+              if (data === null) {
+                rej("[mcmeta] adm-zip got null");
+              } else {
+                res(data);
+              }
+            });
           });
           if (text2) {
-            contents = contents.toString("utf-8");
+            contents = contents.toString();
           }
           await safeWrite(path2.join(this.path, file), contents);
           this.files.set(file, { contents, text: text2 });
@@ -8370,11 +8416,17 @@ class MCMetaCache {
           }
           for await (const [file, text2] of Object.entries(manifest.files)) {
             const _path = file.split("/");
-            let contents = await new Promise((res) => {
-              archives[_path[0]].readFileAsync(_path.slice(1).join("/"), (data) => res(data));
+            let contents = await new Promise((res, rej) => {
+              archives[_path[0]].readFileAsync(_path.slice(1).join("/"), (data) => {
+                if (data === null) {
+                  rej("[mcmeta] adm-zip got null");
+                } else {
+                  res(data);
+                }
+              });
             });
             if (text2) {
-              contents = contents.toString("utf-8");
+              contents = contents.toString();
             }
             await safeWrite(path2.join(this.path, file), contents);
             this.files.set(file, { contents, text: text2 });
@@ -8397,11 +8449,17 @@ class MCMetaCache {
               if (!archives[branch]) {
                 archives[branch] = await getZip(branch);
               }
-              let contents = await new Promise((res) => {
-                archives[branch].readFileAsync(_path.slice(1).join("/"), (data) => res(data));
+              let contents = await new Promise((res, rej) => {
+                archives[branch].readFileAsync(_path.slice(1).join("/"), (data) => {
+                  if (data === null) {
+                    rej("[mcmeta] adm-zip got null");
+                  } else {
+                    res(data);
+                  }
+                });
               });
               if (text2) {
-                contents = contents.toString("utf-8");
+                contents = contents.toString();
               }
               await safeWrite(path2.join(this.path, file), contents);
               this.files.set(file, { contents, text: text2 });
@@ -8459,7 +8517,7 @@ class MCMetaCache {
       return existing.contents;
     }
     const req = await fetch(`https://raw.githubusercontent.com${this.base}${branch}/${relativePath}`);
-    const file = await (text2 ? req.text() : req.buffer());
+    const file = text2 ? await req.text() : Buffer.from(await req.arrayBuffer());
     const finalPath = path2.join(this.path, fullPath);
     await safeWrite(finalPath, file);
     return this.files.set(fullPath, { text: text2, contents: file }).get(fullPath)?.contents;
@@ -9380,8 +9438,8 @@ var init_forceload = __esm(() => {
 var ItemCommandNode, ItemSourceCommand, ItemCommand;
 var init_item = __esm(() => {
   init_nodes();
-  init_variables2();
   init_parsers();
+  init_give();
       });
 
 // src/commands/implementations/world/locate.ts
@@ -10212,12 +10270,12 @@ class Flow {
       { text: `
 Sandstone Pack Error:
 `, color: "yellow" },
-      error || "[Function Threw]",
-      `
+      typeof error === "string" ? { text: error } : error ?? { text: "[Function Threw]" },
+      { text: `
 
-`,
-      `@ Function ${node.resource.name}. Node ${node.body.length - 1}.
-`
+` },
+      { text: `@ Function ${node.resource.name}. Node ${node.body.length - 1}.
+` }
     ];
     if (broadcast !== false) {
       tellraw2(broadcast || "@a", fullError);
@@ -10270,7 +10328,11 @@ Sandstone Pack Error:
       ]);
     }
     return new CaseStatement([
-      { type: "static", value, callback }
+      {
+        type: "static",
+        value,
+        callback
+      }
     ]);
   }
   biome = (coordinates, biome2) => {
@@ -10461,6 +10523,63 @@ var init_orTransformationVisitor = __esm(() => {
   init_visitor();
   });
 
+// src/pack/visitors/optimizeMacroTemporaries.ts
+var flattenArgs = (args) => args.flatMap((arg) => Array.isArray(arg) ? flattenArgs(arg) : [arg]), referencesStoragePoint = (node, point) => {
+  let references = 0;
+  if (node instanceof CommandNode) {
+    const args = flattenArgs(node.args);
+    for (let i = 0;i < args.length - 1; i++) {
+      if (args[i] === point.target && args[i + 1] === point.path) {
+        references++;
+      }
+    }
+  }
+  if (node instanceof ContainerNode || node instanceof ContainerCommandNode) {
+    for (const child of node.body) {
+      references += referencesStoragePoint(child, point);
+    }
+  }
+  return references;
+}, getMacroCopy = (node, macroPoint) => {
+  if (!(node instanceof DataCommandNode)) {
+    return;
+  }
+  const args = node.args;
+  if (args[0] !== "modify" || args[1] !== "storage" || args[2] !== macroPoint.target || args[4] !== "set" || args[5] !== "from" || args[6] !== "storage" || typeof args[3] !== "string" || typeof args[7] !== "string" || typeof args[8] !== "string") {
+    return;
+  }
+  const parameterPrefix = macroPoint.path ? `${macroPoint.path}.` : "";
+  const destinationPath = args[3];
+  const localPath = destinationPath.slice(parameterPrefix.length);
+  if (!destinationPath.startsWith(parameterPrefix) || !localPath.startsWith("param_") && !localPath.startsWith("env_")) {
+    return;
+  }
+  return {
+    destination: { target: macroPoint.target, path: destinationPath },
+    source: { target: args[7], path: args[8] }
+  };
+}, isMacroReset = (node, macroPoint) => {
+  if (!(node instanceof DataCommandNode)) {
+    return false;
+  }
+  const args = node.args;
+  return args[0] === "modify" && args[1] === "storage" && args[2] === macroPoint.target && args[3] === macroPoint.path && args[4] === "set" && args[5] === "value" && `${args[6]}` === "{}";
+}, getExecuteStore = (node, source) => {
+  if (!(node instanceof ExecuteCommandNode)) {
+    return;
+  }
+  const hasStoreResult = node.args.some((arg) => arg[0] === "store") && node.args.some((arg) => arg[0] === "result");
+  if (!hasStoreResult) {
+    return;
+  }
+  return node.args.find((arg) => arg[0] === "storage" && arg[1] === source.target && arg[2] === source.path);
+}, OptimizeMacroTemporariesVisitor;
+var init_optimizeMacroTemporaries = __esm(() => {
+  init_commands2();
+  init_core();
+  init_visitor();
+  });
+
 // src/pack/visitors/simplifyExecuteFunction.ts
 function getEffectiveSingleCommand(body) {
   const effectiveBody = body.filter((n) => !(n instanceof ElseNode));
@@ -10530,6 +10649,7 @@ var init_visitors2 = __esm(() => {
   init_inlineFunctionCallVisitor();
   init_loopTransformationVisitor();
   init_orTransformationVisitor();
+  init_optimizeMacroTemporaries();
   init_simplifyExecuteFunction();
   init_simplifyReturnRunFunction();
   init_switchTransformationVisitor();
@@ -10925,13 +11045,6 @@ class SandstonePack {
     onConflict: conflictDefaults("damage_type"),
     ...options
   });
-  DecoratedPotPattern = (name, decoratedPotPattern2, options) => new DecoratedPotPatternClass(this.core, name, {
-    json: decoratedPotPattern2,
-    creator: "user",
-    addToSandstoneCore: true,
-    onConflict: conflictDefaults("decorated_pot_pattern"),
-    ...options
-  });
   ItemModifier = (name, itemModifier2, options) => new ItemModifierClass(this.core, name, {
     json: itemModifier2,
     creator: "user",
@@ -10960,13 +11073,6 @@ class SandstonePack {
     onConflict: conflictDefaults("recipe"),
     ...options
   });
-  SlotSource = (name, slotSource2, options) => new SlotSourceClass(this.core, name, {
-    json: slotSource2,
-    creator: "user",
-    addToSandstoneCore: true,
-    onConflict: conflictDefaults("slot_source"),
-    ...options
-  });
   SulfurCubeArchetype = (name, sulfurCubeArchetype2, options) => new SulfurCubeArchetypeClass(this.core, name, {
     json: sulfurCubeArchetype2,
     creator: "user",
@@ -11130,13 +11236,15 @@ class SandstonePack {
     onConflict: conflictDefaults("language"),
     ...options
   });
-  Model = (type, name, json, options) => new ModelClass(this.core, type, name, {
-    json,
-    creator: "user",
-    addToSandstoneCore: true,
-    onConflict: conflictDefaults("model"),
-    ...options
-  });
+  Model(type, name, json, options) {
+    return new ModelClass(this.core, type, name, {
+      json,
+      creator: "user",
+      addToSandstoneCore: true,
+      onConflict: conflictDefaults("model"),
+      ...options
+    });
+  }
   ItemModelDefinition = (name, definition, options) => new ItemModelDefinitionClass(this.core, name, {
     definition,
     creator: "user",
@@ -11153,6 +11261,13 @@ class SandstonePack {
       ...options
     });
   }
+  SoundsIndex = (definitions, namespace, options) => new SoundsIndexClass(this.core, namespace ?? this.defaultNamespace, {
+    definitions,
+    creator: "user",
+    addToSandstoneCore: true,
+    onConflict: conflictDefaults("sounds"),
+    ...options
+  });
   PlainText = (name, text2, options) => new PlainTextClass(this.core, name, {
     text: text2,
     creator: "user",
@@ -11216,6 +11331,7 @@ class SandstonePack {
         new IfElseTransformationVisitor(this),
         new ContainerCommandsToMCFunctionVisitor(this),
         new AwaitBodyVisitor(this),
+        new OptimizeMacroTemporariesVisitor(this),
         new InlineFunctionCallVisitor(this),
         new UnifyChainedExecutesVisitor(this),
         new SimplifyExecuteFunctionVisitor(this),
@@ -22944,6 +23060,7 @@ var init_translation_keys = __esm(() => {
     "block.minecraft.stone_slab",
     "block.minecraft.stone_stairs",
     "block.minecraft.stonecutter",
+    "block.minecraft.straw_bed",
     "block.minecraft.stripped_acacia_log",
     "block.minecraft.stripped_acacia_wood",
     "block.minecraft.stripped_bamboo_block",
@@ -23464,6 +23581,7 @@ var init_translation_keys = __esm(() => {
     "commands.fill.failed",
     "commands.fill.success",
     "commands.fill.toobig",
+    "commands.fillbiome.no_changes",
     "commands.fillbiome.success",
     "commands.fillbiome.success.count",
     "commands.fillbiome.toobig",
@@ -23495,6 +23613,7 @@ var init_translation_keys = __esm(() => {
     "commands.function.success.single.result",
     "commands.gamemode.success.other",
     "commands.gamemode.success.self",
+    "commands.gamerule.not_set",
     "commands.gamerule.query",
     "commands.gamerule.set",
     "commands.give.failed.toomanyitems",
@@ -23561,6 +23680,7 @@ var init_translation_keys = __esm(() => {
     "commands.place.feature.failed",
     "commands.place.feature.invalid",
     "commands.place.feature.success",
+    "commands.place.feature.success.inline",
     "commands.place.jigsaw.failed",
     "commands.place.jigsaw.invalid",
     "commands.place.jigsaw.success",
@@ -23573,6 +23693,17 @@ var init_translation_keys = __esm(() => {
     "commands.playsound.failed",
     "commands.playsound.success.multiple",
     "commands.playsound.success.single",
+    "commands.posteffect.add.failed",
+    "commands.posteffect.add.success.multiple",
+    "commands.posteffect.add.success.single",
+    "commands.posteffect.clear.failed",
+    "commands.posteffect.clear.success.multiple",
+    "commands.posteffect.clear.success.single",
+    "commands.posteffect.list.empty",
+    "commands.posteffect.list.success",
+    "commands.posteffect.remove.failed",
+    "commands.posteffect.remove.success.multiple",
+    "commands.posteffect.remove.success.single",
     "commands.profile_fetch.copy_component",
     "commands.profile_fetch.failed_to_serialize",
     "commands.profile_fetch.give_item",
@@ -23805,15 +23936,20 @@ var init_translation_keys = __esm(() => {
     "commands.time.no_default_clock",
     "commands.time.no_time_marker_found",
     "commands.time.pause",
+    "commands.time.pause.already_paused",
+    "commands.time.pause.already_running",
     "commands.time.query",
     "commands.time.query.absolute",
     "commands.time.query.gametime",
     "commands.time.query.timeline",
     "commands.time.query.timeline.repetitions",
     "commands.time.rate",
+    "commands.time.rate.already_same",
     "commands.time.resume",
     "commands.time.set",
     "commands.time.set.absolute",
+    "commands.time.set.already_at_time",
+    "commands.time.set.already_at_time_marker",
     "commands.time.set.time_marker",
     "commands.time.wrong_timeline_for_clock",
     "commands.title.cleared.multiple",
@@ -24084,6 +24220,7 @@ var init_translation_keys = __esm(() => {
     "death.attack.sting.item",
     "death.attack.sting.player",
     "death.attack.sulfurCubeHot",
+    "death.attack.sulfurCubeHot.item",
     "death.attack.sulfurCubeHot.player",
     "death.attack.sweetBerryBush",
     "death.attack.sweetBerryBush.player",
@@ -24146,6 +24283,8 @@ var init_translation_keys = __esm(() => {
     "debug.gamemodes.select_next",
     "debug.help.help",
     "debug.help.message",
+    "debug.improvedTransparency.off",
+    "debug.improvedTransparency.on",
     "debug.inspect.client.block",
     "debug.inspect.client.entity",
     "debug.inspect.help",
@@ -24358,6 +24497,7 @@ var init_translation_keys = __esm(() => {
     "entity.minecraft.creaking",
     "entity.minecraft.creaking_transient",
     "entity.minecraft.creeper",
+    "entity.minecraft.cushion",
     "entity.minecraft.dark_oak_boat",
     "entity.minecraft.dark_oak_chest_boat",
     "entity.minecraft.dolphin",
@@ -25039,6 +25179,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.birch_boat",
     "item.minecraft.birch_chest_boat",
     "item.minecraft.black_bundle",
+    "item.minecraft.black_cushion",
     "item.minecraft.black_dye",
     "item.minecraft.black_harness",
     "item.minecraft.blade_pottery_shard",
@@ -25047,6 +25188,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.blaze_rod",
     "item.minecraft.blaze_spawn_egg",
     "item.minecraft.blue_bundle",
+    "item.minecraft.blue_cushion",
     "item.minecraft.blue_dye",
     "item.minecraft.blue_egg",
     "item.minecraft.blue_harness",
@@ -25067,6 +25209,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.brewing_stand",
     "item.minecraft.brick",
     "item.minecraft.brown_bundle",
+    "item.minecraft.brown_cushion",
     "item.minecraft.brown_dye",
     "item.minecraft.brown_egg",
     "item.minecraft.brown_harness",
@@ -25142,6 +25285,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.crossbow.projectile.multiple",
     "item.minecraft.crossbow.projectile.single",
     "item.minecraft.cyan_bundle",
+    "item.minecraft.cyan_cushion",
     "item.minecraft.cyan_dye",
     "item.minecraft.cyan_harness",
     "item.minecraft.danger_pottery_shard",
@@ -25200,6 +25344,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.fire_charge",
     "item.minecraft.firework_rocket",
     "item.minecraft.firework_rocket.flight",
+    "item.minecraft.firework_rocket.flight_duration",
     "item.minecraft.firework_rocket.multiple_stars",
     "item.minecraft.firework_rocket.single_star",
     "item.minecraft.firework_star",
@@ -25278,9 +25423,11 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.golden_spear",
     "item.minecraft.golden_sword",
     "item.minecraft.gray_bundle",
+    "item.minecraft.gray_cushion",
     "item.minecraft.gray_dye",
     "item.minecraft.gray_harness",
     "item.minecraft.green_bundle",
+    "item.minecraft.green_cushion",
     "item.minecraft.green_dye",
     "item.minecraft.green_harness",
     "item.minecraft.guardian_spawn_egg",
@@ -25336,12 +25483,15 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.leather_horse_armor",
     "item.minecraft.leather_leggings",
     "item.minecraft.light_blue_bundle",
+    "item.minecraft.light_blue_cushion",
     "item.minecraft.light_blue_dye",
     "item.minecraft.light_blue_harness",
     "item.minecraft.light_gray_bundle",
+    "item.minecraft.light_gray_cushion",
     "item.minecraft.light_gray_dye",
     "item.minecraft.light_gray_harness",
     "item.minecraft.lime_bundle",
+    "item.minecraft.lime_cushion",
     "item.minecraft.lime_dye",
     "item.minecraft.lime_harness",
     "item.minecraft.lingering_potion",
@@ -25375,6 +25525,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.lodestone_compass",
     "item.minecraft.mace",
     "item.minecraft.magenta_bundle",
+    "item.minecraft.magenta_cushion",
     "item.minecraft.magenta_dye",
     "item.minecraft.magenta_harness",
     "item.minecraft.magma_cream",
@@ -25469,6 +25620,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.ominous_bottle",
     "item.minecraft.ominous_trial_key",
     "item.minecraft.orange_bundle",
+    "item.minecraft.orange_cushion",
     "item.minecraft.orange_dye",
     "item.minecraft.orange_harness",
     "item.minecraft.painting",
@@ -25488,6 +25640,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.piglin_spawn_egg",
     "item.minecraft.pillager_spawn_egg",
     "item.minecraft.pink_bundle",
+    "item.minecraft.pink_cushion",
     "item.minecraft.pink_dye",
     "item.minecraft.pink_harness",
     "item.minecraft.pitcher_plant",
@@ -25543,6 +25696,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.pumpkin_pie",
     "item.minecraft.pumpkin_seeds",
     "item.minecraft.purple_bundle",
+    "item.minecraft.purple_cushion",
     "item.minecraft.purple_dye",
     "item.minecraft.purple_harness",
     "item.minecraft.quartz",
@@ -25559,6 +25713,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.raw_iron",
     "item.minecraft.recovery_compass",
     "item.minecraft.red_bundle",
+    "item.minecraft.red_cushion",
     "item.minecraft.red_dye",
     "item.minecraft.red_harness",
     "item.minecraft.redstone",
@@ -25677,6 +25832,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.stone_shovel",
     "item.minecraft.stone_spear",
     "item.minecraft.stone_sword",
+    "item.minecraft.straw_bed",
     "item.minecraft.stray_spawn_egg",
     "item.minecraft.strider_spawn_egg",
     "item.minecraft.string",
@@ -25744,6 +25900,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.wheat",
     "item.minecraft.wheat_seeds",
     "item.minecraft.white_bundle",
+    "item.minecraft.white_cushion",
     "item.minecraft.white_dye",
     "item.minecraft.white_harness",
     "item.minecraft.wild_armor_trim_smithing_template",
@@ -25763,6 +25920,7 @@ var init_translation_keys = __esm(() => {
     "item.minecraft.writable_book",
     "item.minecraft.written_book",
     "item.minecraft.yellow_bundle",
+    "item.minecraft.yellow_cushion",
     "item.minecraft.yellow_dye",
     "item.minecraft.yellow_harness",
     "item.minecraft.zoglin_spawn_egg",
@@ -25870,6 +26028,7 @@ var init_translation_keys = __esm(() => {
     "key.debug.dumpVersion",
     "key.debug.focusPause",
     "key.debug.fpsCharts",
+    "key.debug.improvedTransparency",
     "key.debug.lightmapTexture",
     "key.debug.modifier",
     "key.debug.networkCharts",
@@ -26455,6 +26614,7 @@ var init_translation_keys = __esm(() => {
     "mirror.left_right",
     "mirror.none",
     "mount.onboard",
+    "mount.sit",
     "multiplayer.applyingPack",
     "multiplayer.codeOfConduct.check",
     "multiplayer.codeOfConduct.title",
@@ -26777,6 +26937,8 @@ var init_translation_keys = __esm(() => {
     "options.darkMojangStudiosBackgroundColor.tooltip",
     "options.darknessEffectScale",
     "options.darknessEffectScale.tooltip",
+    "options.debugGuiScale.tooltip",
+    "options.debugGuiScale.unchanged",
     "options.difficulty",
     "options.difficulty.easy",
     "options.difficulty.easy.info",
@@ -26818,6 +26980,7 @@ var init_translation_keys = __esm(() => {
     "options.fullscreen",
     "options.fullscreen.current",
     "options.fullscreen.entry",
+    "options.fullscreen.exclusive.mode",
     "options.fullscreen.resolution",
     "options.fullscreen.unavailable",
     "options.gamma",
@@ -27394,7 +27557,10 @@ var init_translation_keys = __esm(() => {
     "selectWorld.warning.lowDiskSpace.title",
     "selectWorld.world",
     "selectWorld.world_gen_settings_access",
+    "sign.back_text",
+    "sign.click_actions_disabled",
     "sign.edit",
+    "sign.front_text",
     "sleep.not_possible",
     "sleep.players_sleeping",
     "sleep.skipping_night",
@@ -27432,6 +27598,7 @@ var init_translation_keys = __esm(() => {
     "soundCategory.ui",
     "soundCategory.voice",
     "soundCategory.weather",
+    "spectator.cannot_teleport",
     "spectatorMenu.close",
     "spectatorMenu.next_page",
     "spectatorMenu.previous_page",
@@ -27513,6 +27680,7 @@ var init_translation_keys = __esm(() => {
     "stat.minecraft.raid_trigger",
     "stat.minecraft.raid_win",
     "stat.minecraft.sleep_in_bed",
+    "stat.minecraft.sleep_in_straw_bed",
     "stat.minecraft.sneak_time",
     "stat.minecraft.sprint_one_cm",
     "stat.minecraft.strider_one_cm",
@@ -27676,6 +27844,7 @@ var init_translation_keys = __esm(() => {
     "subtitles.block.pointed_dripstone.drip_water",
     "subtitles.block.pointed_dripstone.drip_water_into_cauldron",
     "subtitles.block.pointed_dripstone.land",
+    "subtitles.block.poplar_leaves.ambient",
     "subtitles.block.portal.ambient",
     "subtitles.block.portal.travel",
     "subtitles.block.portal.trigger",
@@ -27712,6 +27881,7 @@ var init_translation_keys = __esm(() => {
     "subtitles.block.sniffer_egg.hatch",
     "subtitles.block.sniffer_egg.plop",
     "subtitles.block.sponge.absorb",
+    "subtitles.block.straw_bed.break_leave",
     "subtitles.block.sweet_berry_bush.pick_berries",
     "subtitles.block.trapdoor.close",
     "subtitles.block.trapdoor.open",
@@ -27913,6 +28083,10 @@ var init_translation_keys = __esm(() => {
     "subtitles.entity.creeper.death",
     "subtitles.entity.creeper.hurt",
     "subtitles.entity.creeper.primed",
+    "subtitles.entity.cushion.break",
+    "subtitles.entity.cushion.get_up",
+    "subtitles.entity.cushion.place",
+    "subtitles.entity.cushion.sit",
     "subtitles.entity.dolphin.ambient",
     "subtitles.entity.dolphin.ambient_water",
     "subtitles.entity.dolphin.attack",
@@ -52327,7 +52501,6 @@ var init_resources3 = __esm(() => {
     [BannerPatternClass, "banner_pattern"],
     [ChatTypeClass, "chat_type"],
     [DamageTypeClass, "damage_type"],
-    [DecoratedPotPatternClass, "decorated_pot_pattern"],
     [DialogClass, "dialog"],
     [EnchantmentClass, "enchantment"],
     [EnchantmentProviderClass, "enchantment_provider"],
@@ -52338,7 +52511,6 @@ var init_resources3 = __esm(() => {
     [LootTableClass, "loot_table"],
     [PredicateClass, "predicate"],
     [RecipeClass, "recipe"],
-    [SlotSourceClass, "slot_source"],
     [StructureClass, "structure"],
     [SulfurCubeArchetypeClass, "sulfur_cube_archetype"],
     [TestEnvironmentClass, "test_environment"],
@@ -52390,7 +52562,6 @@ function normalizeModel(input) {
 var ItemModelBuilder, ItemModelDefinitionNode, ItemModelDefinitionClass;
 var init_itemDefinition = __esm(() => {
   init_arguments();
-  init_nbt();
   init_nodes();
   init_resource();
   init_model();
@@ -52523,6 +52694,7 @@ class EntityLabel {
   _toMinecraftCondition = () => new this.pack.conditions.Label(this.pack.core, this);
   _toSelector = () => this.selector._toSelector();
   toNBT = () => this.selector._toSelector().toNBT();
+  _toChatComponent = () => this.selector._toSelector()._toChatComponent();
 }
 var LabelClass;
 var init_Label = __esm(() => {
@@ -52566,7 +52738,7 @@ class TriggerClass {
     this.name = name;
     this.callback = callback;
     this.pollingEvery = pollingEvery;
-    this.objective = new ObjectiveClass(sandstoneCore2.pack, name, "dummy", undefined, { creator: "sandstone" });
+    this.objective = new ObjectiveClass(sandstoneCore2.pack, name, "trigger", undefined, { creator: "sandstone" });
     const { registerNewObjective, MCFunction, commands: commands2 } = sandstoneCore2.pack;
     registerNewObjective(this.objective);
     if (!sandstoneCore2.checkTriggers[pollingEvery]) {
@@ -52576,12 +52748,12 @@ class TriggerClass {
       });
     }
     sandstoneCore2.checkTriggers[pollingEvery].push(() => {
-      commands2.execute.as(`@a[scores={${name}=1..}]`).run(() => {
+      commands2.execute.as(`@a[scores={${name}=1..}]`).at("@s").run(() => {
         const score2 = this.objective("@s");
         if (callback instanceof _RawMCFunctionClass || typeof callback === "function") {
           callback();
         } else if (callback[0] === "num") {
-          score2.match(1, callback[1], callback[2]);
+          score2.match(1, callback[1], callback[2])();
         } else {
           callback[1](score2);
         }
@@ -52865,7 +53037,7 @@ class UUIDClass {
   toNBT() {
     const selector3 = this._toSelector();
     if (typeof selector3 === "string") {
-      return selector3;
+      return `'${selector3}'`;
     }
     return selector3.toNBT();
   }
@@ -52996,7 +53168,6 @@ var {
   forceload: forceload2,
   gamemode: gamemode2,
   gamerule: gamerule2,
-  give: give2,
   help: help2,
   kill: kill2,
   list: list2,
@@ -53050,6 +53221,7 @@ var {
   xp,
   tell: tell2
 } = commandsProxy2;
+var give2 = (...args) => sandstonePack2.commands.give(...args);
 var setblock2 = (...args) => sandstonePack2.commands.setblock(...args);
 var fill2 = (...args) => sandstonePack2.commands.fill(...args);
 var packMethodsProxy2 = new Proxy({}, {
@@ -53092,7 +53264,6 @@ var {
   BannerPattern,
   ChatType,
   DamageType,
-  DecoratedPotPattern,
   Dialog,
   Enchantment,
   EnchantmentProvider,
@@ -53102,7 +53273,6 @@ var {
   LootTable,
   Predicate,
   Recipe,
-  SlotSource,
   SulfurCubeArchetype,
   Tag,
   TestEnvironment,
@@ -53126,6 +53296,7 @@ var {
   PostEffect,
   Shader,
   SoundEvent,
+  SoundsIndex,
   PlainText,
   Texture,
   WaypointStyle,
@@ -53381,6 +53552,7 @@ export {
   TextureNode,
   TextureClass,
   Texture,
+  TextComponentClass,
   TestInstanceNode,
   TestInstanceClass,
   TestInstance,
@@ -53466,14 +53638,12 @@ export {
   SpectateCommand,
   SpawnPointCommandNode,
   SpawnPointCommand,
-  SoundsNode,
-  SoundsClass,
+  SoundsIndexNode,
+  SoundsIndexClass,
+  SoundsIndex,
   SoundEventNode,
   SoundEventClass,
   SoundEvent,
-  SlotSourceNode,
-  SlotSourceClass,
-  SlotSource,
   SleepClass,
   SingleExecuteNode,
   SingleConditionNode,
@@ -53593,6 +53763,7 @@ export {
   PAINTING_VARIANTS_SET,
   OrTransformationVisitor,
   OrNode,
+  OptimizeMacroTemporariesVisitor,
   ObjectiveClass,
   Objective2 as Objective,
   OUTGOING_RPC_METHODS_SET,
@@ -53784,9 +53955,6 @@ export {
   DefaultGameModeCommandNode,
   DefaultGameModeCommand,
   DefaultCaseNode,
-  DecoratedPotPatternNode,
-  DecoratedPotPatternClass,
-  DecoratedPotPattern,
   DebugCommandNode,
   DebugCommand,
   DataVariable,
@@ -53842,7 +54010,6 @@ export {
   ConditionNode,
   ConditionClass,
   ConditionCaseNode,
-  ComponentClass,
   CommentCommandNode,
   CommentCommand,
   CommandNode,
@@ -53913,5 +54080,5 @@ export {
   ACTIVITIES_SET
 };
 
-//# debugId=CA4E2C8BECB1A0E864756E2164756E21
+//# debugId=B948D6DA5FED7C0E64756E2164756E21
 //# sourceMappingURL=index.js.map