sandstone 1.1.3 → 1.1.5

package/dist/_internal/index.d.ts

@@ -1,11 +1,11 @@
 import type { JSONTextComponent } from "./types/arguments/jsonTextComponent.js";
 import { SandstoneContext, setSandstoneContext, getSandstoneContext, hasContext, resetContext } from "./types/context.js";
 import type { FillCommand, GiveCommand, SetBlockCommand, AdvancementCommand, AttributeOperationCommand, BossBarCommand, FinalCommandOutput, CloneOptionsCommand, CloneFromDimensionCommand, DamageSourceCommand, DataCommand, DataPackCommand, DebugCommand, DialogCommand, EffectCommand, ExecuteCommand, ExperienceCommand, ForceLoadCommand, ExtractNBTIntRange, LocateCommand, LootCommand, PerfCommand, PlaceCommand, RandomCommand, RecipeCommand, SandstoneCommands, RotateFacingArguments, RideArgumentsCommand, ItemCommand, JFRCommand, ScheduleCommand, ScoreboardCommand, StopwatchCommand, TagArgumentsCommand, TeamCommand, TeleportFacingCommand, TestCommand, TimeCommand, TitleArgumentsCommand, TriggerArgumentsCommand, WaypointCommand, WeatherCommand, WorldBorderCommand, StoreType } from "./types/commands/index.js";
-import { AdvancementClassArguments, AtlasClassArguments, BannerPatternClassArguments, BlockStateArguments, ChatTypeClassArguments, DamageTypeClassArguments, DialogClassArguments, EnchantmentClassArguments, EnchantmentProviderClassArguments, EquipmentClassArguments, FontArguments, InstrumentClassArguments, ItemModelDefinitionClassArguments, ItemModifierClassArguments, JukeboxSongClassArguments, LanguageArguments, LootTableClassArguments, MCFunctionClassArguments, ModelClassArguments, ParticleClassArguments, PlainTextArguments, PostEffectClassArguments, PredicateClassArguments, RecipeClassArguments, ShaderClassArguments, SoundEventArguments, SoundsIndexArguments, SulfurCubeArchetypeClassArguments, TagClassArguments, TestEnvironmentClassArguments, TestInstanceClassArguments, TextureArguments, TimelineClassArguments, TradeSetClassArguments, TrialSpawnerClassArguments, TrimMaterialClassArguments, TrimPatternClassArguments, VariantClassArguments, VillagerTradeClassArguments, WaypointStyleClassArguments, WorldClockClassArguments, MCFunctionClass, TagClass, DamageTypeClass, DataPointPickClass, CustomResourceClass, MacroArgument, AdvancementClass, BannerPatternClass, ChatTypeClass, DialogClass, EnchantmentClass, EnchantmentProviderClass, InstrumentClass, ItemModifierClass, JukeboxSongClass, LootTableClass, PredicateClass, RecipeClass, SulfurCubeArchetypeClass, TagValuesJSON, TestEnvironmentClass, TestInstanceClass, TimelineClass, TradeSetClass, TrialSpawnerClass, TrimMaterialClass, TrimPatternClass, VariantType, VariantClass, VillagerTradeClass, WorldClockClass, AtlasClass, BlockStateJSON, BlockStateClass, BlockStateType, EquipmentClass, FontClass, ItemModelDefinitionInput, ItemModelDefinitionClass, LanguageClass, ModelClass, ParticleClass, PostEffectClass, ShaderClass, SoundEventClass, SoundsIndexClass, PlainTextClass, TextureClass, WaypointStyleClass, MacroLiteral, SandstoneCore, ResourceClass } from "./types/core/index.js";
+import { AdvancementClassArguments, AtlasClassArguments, BannerPatternClassArguments, BlockStateDefinitionArguments, ChatTypeClassArguments, DamageTypeClassArguments, DialogClassArguments, EnchantmentClassArguments, EnchantmentProviderClassArguments, EquipmentClassArguments, FontArguments, InstrumentClassArguments, ItemModelDefinitionClassArguments, ItemModifierClassArguments, JukeboxSongClassArguments, LanguageArguments, LootTableClassArguments, MCFunctionClassArguments, ModelClassArguments, ParticleClassArguments, PlainTextArguments, PostEffectClassArguments, PredicateClassArguments, RecipeClassArguments, ShaderClassArguments, SoundEventArguments, SoundsIndexArguments, SulfurCubeArchetypeClassArguments, TagClassArguments, TestEnvironmentClassArguments, TestInstanceClassArguments, TextureArguments, TimelineClassArguments, TradeSetClassArguments, TrialSpawnerClassArguments, TrimMaterialClassArguments, TrimPatternClassArguments, VariantClassArguments, VillagerTradeClassArguments, WaypointStyleClassArguments, WorldClockClassArguments, MCFunctionClass, DataPointPickClass, CustomResourceClass, MacroArgument, TagValuesJSON, VariantType, BlockStateDefinitionJSON, BlockStateDefinitionType, ItemModelDefinitionInput, ShaderClass, PlainTextClass, MacroLiteral, SandstoneCore, ResourceClass } from "./types/core/index.js";
 import { Flow, Condition } from "./types/flow/index.js";
 import type { BASIC_CONFLICT_STRATEGIES, LiteralUnion, NamespacedLiteralUnion, SetType, AllKeys, MakeInstanceCallable } from "./types/utils.js";
-import type { ObjectiveClass, Score, SelectorClass, LabelClass, UUIDClass, DataPointClass, ItemPredicateClass, DATA_TYPES, TriggerHandler, TriggerClass, _RawLabelClass, TargetlessDataClass, TargetFor, DataClass, DATA_PATH, TargetlessDataPointClass, ResolveNBTClass, DataIndexMap, DataArray, SelectorEntityType, SelectorProperties, UUIDinNumber, UUIDOptions, UUIDinScore, SelectorPickClass, ItemPredicateItem, SleepClass } from "./types/variables/index.js";
-import type { AdvancementClass, BannerPatternClass, ChatTypeClass, DamageTypeClass, DialogClass, EnchantmentClass, EnchantmentProviderClass, InstrumentClass, ItemModifierClass, JukeboxSongClass, LootTableClass, PredicateClass, RecipeClass, StructureClass, SulfurCubeArchetypeClass, TagClass, TestEnvironmentClass, TestInstanceClass, TimelineClass, TradeSetClass, TrialSpawnerClass, TrimMaterialClass, TrimPatternClass, VariantClass, VillagerTradeClass, WorldClockClass, AtlasClass, BlockStateClass, EquipmentClass, FontClass, ItemModelDefinitionClass, LanguageClass, ModelClass, ParticleClass, PostEffectClass, SoundEventClass, SoundsIndexClass, TextureClass, WaypointStyleClass } from "./types/core/resources.js";
+import { ObjectiveClass, Score, SelectorClass, LabelClass, UUIDClass, DataPointClass, ItemPredicateClass, DATA_TYPES, TriggerHandler, TriggerClass, _RawLabelClass, TargetlessDataClass, TargetFor, DataClass, DATA_PATH, TargetlessDataPointClass, ResolveNBTClass, DataIndexMapType, DataArrayType, SelectorEntityType, SelectorProperties, UUIDinNumber, UUIDOptions, UUIDinScore, SelectorPickClass, ItemPredicateItem, SleepClass } from "./types/variables/index.js";
+import { AdvancementClass, BannerPatternClass, ChatTypeClass, DamageTypeClass, DialogClass, EnchantmentClass, EnchantmentProviderClass, InstrumentClass, ItemModifierClass, JukeboxSongClass, LootTableClass, PredicateClass, RecipeClass, StructureClass, SulfurCubeArchetypeClass, TagClass, TestEnvironmentClass, TestInstanceClass, TimelineClass, TradeSetClass, TrialSpawnerClass, TrimMaterialClass, TrimPatternClass, VariantClass, VillagerTradeClass, WorldClockClass, AtlasClass, BlockStateDefinitionClass, EquipmentClass, FontClass, ItemModelDefinitionClass, LanguageClass, ModelClass, ParticleClass, PostEffectClass, SoundEventClass, SoundsIndexClass, TextureClass, WaypointStyleClass } from "./types/core/resources/index.js";
 import type { SingleEntityArgumentOf, MultiplePlayersArgumentOf, Coordinates, GAMEMODES, DIFFICULTIES, MultipleEntitiesArgument, RootNBT, MessageOrSelector, AbsoluteCoordinates, SOUND_SOURCES, Rotation, SinglePlayerArgumentOf, ColumnCoordinates, ObjectiveArgument, MCDocToJSON, SymbolResource, RecipeJSON, REGISTRIES, SOUND_TYPES, TEXTURE_TYPES, OBJECTIVE_CRITERIA, NBTObject, TimeArgument } from "./types/arguments/index.js";
 import type { ITEMS } from "./types/arguments/generated/_registry/items.js";
 import type { DAMAGE_TYPES } from "./types/arguments/generated/_registry/damage_types.js";
@@ -2128,7 +2128,7 @@ export declare const RawResource: {
     'minecraft:worldgen/world_preset': WorldPreset;
     zombie_nautilus_variant: ZombieNautilusVariant;
     'minecraft:zombie_nautilus_variant': ZombieNautilusVariant;
-}[`${T}_variant`]>, options?: Omit<Partial<VariantClassArguments<T>>, "variant"> | undefined) => VariantClass<T>, VillagerTrade: (name: string, villagerTrade: VillagerTradeClassArguments["json"], options?: Omit<Partial<VillagerTradeClassArguments>, "json">) => VillagerTradeClass, WorldClock: (name: string, worldClock: WorldClockClassArguments["json"], options?: Omit<Partial<WorldClockClassArguments>, "json">) => WorldClockClass, Atlas: (name: string, json: AtlasClassArguments["json"], options?: Omit<Partial<AtlasClassArguments>, "json">) => AtlasClass, BlockState: <JSON extends BlockStateJSON>(name: string, json: JSON, options?: Omit<Partial<BlockStateArguments<JSON>>, "json"> | undefined) => BlockStateClass<JSON, Extract<AllKeys<JSON>, BlockStateType>>, Equipment: (name: string, json: EquipmentClassArguments["json"], options?: Omit<Partial<EquipmentClassArguments>, "json">) => EquipmentClass, Font: (name: string, providers: FontArguments["providers"], options?: Omit<Partial<FontArguments>, "providers">) => FontClass, ItemModelDefinition: (name: string, definition: ItemModelDefinitionInput, options?: Omit<Partial<ItemModelDefinitionClassArguments>, "definition">) => ItemModelDefinitionClass, Language: (name: string, language: LanguageArguments["language"], options?: Omit<Partial<LanguageArguments>, "language">) => LanguageClass, Model: <Type extends LiteralUnion<"block" | "item">>(type: Type, name: string, json: ModelClassArguments["json"], options?: Omit<Partial<ModelClassArguments>, "json">) => ModelClass<Type>, ParticleResource: (name: string, json: ParticleClassArguments["json"], options?: Omit<Partial<ParticleClassArguments>, "json">) => ParticleClass, PostEffect: (name: string, json: PostEffectClassArguments["json"], options?: Omit<Partial<PostEffectClassArguments>, "json">) => PostEffectClass, Shader: (name: string, json: ShaderClassArguments["json"], options?: Omit<Partial<ShaderClassArguments>, "json">) => ShaderClass, SoundEvent: <Type extends SOUND_TYPES>(type: Type, name: string, sound: SoundEventArguments["sound"], options?: Omit<Partial<SoundEventArguments>, "sound">) => SoundEventClass<Type>, SoundsIndex: (definitions: SoundsIndexArguments["definitions"], namespace?: string, options?: Omit<Partial<SoundsIndexArguments>, "definitions">) => SoundsIndexClass, PlainText: (name: string, text: PlainTextArguments["text"], options?: Partial<PlainTextArguments>) => PlainTextClass, Texture: <Type extends LiteralUnion<TEXTURE_TYPES>>(type: Type, name: string, texture: ArrayBuffer | Buffer<ArrayBufferLike> | Promise<ArrayBuffer | Buffer<ArrayBufferLike>> | undefined, options?: Partial<TextureArguments<Type>> | undefined) => TextureClass<Type>, WaypointStyle: (name: string, json: WaypointStyleClassArguments["json"], options?: Omit<Partial<WaypointStyleClassArguments>, "json">) => WaypointStyleClass, Objective: {
+}[`${T}_variant`]>, options?: Omit<Partial<VariantClassArguments<T>>, "variant"> | undefined) => VariantClass<T>, VillagerTrade: (name: string, villagerTrade: VillagerTradeClassArguments["json"], options?: Omit<Partial<VillagerTradeClassArguments>, "json">) => VillagerTradeClass, WorldClock: (name: string, worldClock: WorldClockClassArguments["json"], options?: Omit<Partial<WorldClockClassArguments>, "json">) => WorldClockClass, Atlas: (name: string, json: AtlasClassArguments["json"], options?: Omit<Partial<AtlasClassArguments>, "json">) => AtlasClass, BlockStateDefinition: <JSON extends BlockStateDefinitionJSON>(name: string, json: JSON, options?: Omit<Partial<BlockStateDefinitionArguments<JSON>>, "json"> | undefined) => BlockStateDefinitionClass<JSON, Extract<AllKeys<JSON>, BlockStateDefinitionType>>, Equipment: (name: string, json: EquipmentClassArguments["json"], options?: Omit<Partial<EquipmentClassArguments>, "json">) => EquipmentClass, Font: (name: string, providers: FontArguments["providers"], options?: Omit<Partial<FontArguments>, "providers">) => FontClass, ItemModelDefinition: (name: string, definition: ItemModelDefinitionInput, options?: Omit<Partial<ItemModelDefinitionClassArguments>, "definition">) => ItemModelDefinitionClass, Language: (name: string, language: LanguageArguments["language"], options?: Omit<Partial<LanguageArguments>, "language">) => LanguageClass, Model: <Type extends LiteralUnion<"block" | "item">>(type: Type, name: string, json: ModelClassArguments["json"], options?: Omit<Partial<ModelClassArguments>, "json">) => ModelClass<Type>, ParticleResource: (name: string, json: ParticleClassArguments["json"], options?: Omit<Partial<ParticleClassArguments>, "json">) => ParticleClass, PostEffect: (name: string, json: PostEffectClassArguments["json"], options?: Omit<Partial<PostEffectClassArguments>, "json">) => PostEffectClass, Shader: (name: string, json: ShaderClassArguments["json"], options?: Omit<Partial<ShaderClassArguments>, "json">) => ShaderClass, SoundEvent: <Type extends SOUND_TYPES>(type: Type, name: string, sound: SoundEventArguments["sound"], options?: Omit<Partial<SoundEventArguments>, "sound">) => SoundEventClass<Type>, SoundsIndex: (definitions: SoundsIndexArguments["definitions"], namespace?: string, options?: Omit<Partial<SoundsIndexArguments>, "definitions">) => SoundsIndexClass, PlainText: (name: string, text: PlainTextArguments["text"], options?: Partial<PlainTextArguments>) => PlainTextClass, Texture: <Type extends LiteralUnion<TEXTURE_TYPES>>(type: Type, name: string, texture: ArrayBuffer | Buffer<ArrayBufferLike> | Promise<ArrayBuffer | Buffer<ArrayBufferLike>> | undefined, options?: Partial<TextureArguments<Type>> | undefined) => TextureClass<Type>, WaypointStyle: (name: string, json: WaypointStyleClassArguments["json"], options?: Omit<Partial<WaypointStyleClassArguments>, "json">) => WaypointStyleClass, Objective: {
     create: (name: string, criteria?: LiteralUnion<OBJECTIVE_CRITERIA>, display?: JSONTextComponent, options?: {
         alreadyExists?: boolean;
         useDefaultNamespace?: boolean;
@@ -2149,10 +2149,10 @@ export declare const RawResource: {
 }, DataVariable: {
     (initialValue?: NBTObject | DataPointClass<any> | DataPointPickClass, name?: string): DataPointClass<"storage">;
     (score: Score, storeType?: StoreType, scale?: number, name?: string): DataPointClass<"storage">;
-}, getTempStorage: (name: string) => DataPointClass<"storage">, ResolveNBT: (nbt: NBTObject, dataPoint?: DataPointClass<"storage">) => ResolveNBTClass, DataIndexMap: <INITIAL extends RootNBT | Record<string, DataPointClass | DataPointPickClass>>(initialize: INITIAL, dataPoint?: DataPointClass<"storage">) => DataIndexMap<INITIAL>, DataArray: <INITIAL extends readonly NBTObject[] | readonly [
+}, getTempStorage: (name: string) => DataPointClass<"storage">, ResolveNBT: (nbt: NBTObject, dataPoint?: DataPointClass<"storage">) => ResolveNBTClass, DataIndexMap: <INITIAL extends RootNBT | Record<string, DataPointClass | DataPointPickClass>>(initialize: INITIAL, dataPoint?: DataPointClass<"storage">) => DataIndexMapType<INITIAL>, DataArray: <INITIAL extends readonly NBTObject[] | readonly [
     string,
     DataPointClass | DataPointPickClass
-]>(initialize: INITIAL, dataPoint?: DataPointClass<"storage">) => DataArray<INITIAL>, Selector: {
+]>(initialize: INITIAL, dataPoint?: DataPointClass<"storage">) => DataArrayType<INITIAL>, Selector: {
     (target: "@e"): SelectorClass<false, false, false>;
     (target: "@a"): SelectorClass<false, false, true>;
     (target: "@s" | "@n"): SelectorClass<false, true, false>;
@@ -2394,10 +2394,6 @@ ContentStrategyKind<'default', BASIC_CONFLICT_STRATEGIES>
  * Will override the defined `default` strategy.
  */
  | ContentStrategyKind<'recipe', NonNullable<RecipeClassArguments['onConflict']>>
-/**
- * The conflict strategy to use for Slot sources.
- * Will override the defined `default` strategy.
- */
 /**
  * The conflict strategy to use for Sulfur cube archetypes.
  * Will override the defined `default` strategy.
@@ -2433,10 +2429,6 @@ ContentStrategyKind<'default', BASIC_CONFLICT_STRATEGIES>
  * Will override the defined `default` strategy.
  */
  | ContentStrategyKind<'chat_type', NonNullable<ChatTypeClassArguments['onConflict']>>
-/**
- * The conflict strategy to use for Decorated pot patterns.
- * Will override the defined `default` strategy.
- */
 /**
  * The conflict strategy to use for Dialogs.
  * Will override the defined `default` strategy.
@@ -2511,7 +2503,7 @@ ContentStrategyKind<'default', BASIC_CONFLICT_STRATEGIES>
  * The conflict strategy to use for Block states.
  * Will override the defined `default` strategy.
  */
- | ContentStrategyKind<'block_state', NonNullable<BlockStateArguments<any>['onConflict']>>
+ | ContentStrategyKind<'block_definition', NonNullable<BlockStateDefinitionArguments<any>['onConflict']>>
 /**
  * The conflict strategy to use for Fonts.
  * Will override the defined `default` strategy.

package/dist/_internal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/sandstone.ts"],"names":[],"mappings":"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","file":"index.d.ts"}
+{"version":3,"sources":["../../src/sandstone.ts"],"names":[],"mappings":"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","file":"index.d.ts"}

package/dist/_internal/index.js

@@ -2508,68 +2508,68 @@ AtlasClass = class AtlasClass extends ResourceClass {
       }
     }
   };
-BlockStateNode = class BlockStateNode extends ContainerNode {
+BlockStateDefinitionNode = class BlockStateDefinitionNode extends ContainerNode {
     resource;
     constructor(sandstoneCore, resource) {
       super(sandstoneCore);
       this.resource = resource;
     }
-    getValue = () => jsonStringify(this.resource.blockStateJSON, this.resource._resourceType);
+    getValue = () => jsonStringify(this.resource.blockStateDefinitionJSON, this.resource._resourceType);
   };
-BlockStateClass = class BlockStateClass extends ResourceClass {
+BlockStateDefinitionClass = class BlockStateDefinitionClass extends ResourceClass {
     static resourceType = "block_definition";
-    blockStateJSON;
+    blockStateDefinitionJSON;
     type;
     constructor(core, name, args) {
-      super(core, { packType: core.pack.resourcePack() }, BlockStateNode, BlockStateClass.resourceType, core.pack.resourceToPath(name, RESOURCE_PATHS[BlockStateClass.resourceType].path), args);
-      this.blockStateJSON = args.json;
-      this.type = Object.keys(this.blockStateJSON)[0];
+      super(core, { packType: core.pack.resourcePack() }, BlockStateDefinitionNode, BlockStateDefinitionClass.resourceType, core.pack.resourceToPath(name, RESOURCE_PATHS[BlockStateDefinitionClass.resourceType].path), args);
+      this.blockStateDefinitionJSON = args.json;
+      this.type = Object.keys(this.blockStateDefinitionJSON)[0];
       this.handleConflicts();
     }
     push(...states) {
       if (this.type === "variants") {
-        if (states[0] instanceof BlockStateClass) {
+        if (states[0] instanceof BlockStateDefinitionClass) {
           for (const state of states) {
-            this.blockStateJSON.variants = { ...this.blockStateJSON.variants, ...state.blockStateJSON.variants };
+            this.blockStateDefinitionJSON.variants = { ...this.blockStateDefinitionJSON.variants, ...state.blockStateDefinitionJSON.variants };
           }
         } else {
           for (const state of states) {
-            this.blockStateJSON.variants = { ...this.blockStateJSON.variants, ...state.variants };
+            this.blockStateDefinitionJSON.variants = { ...this.blockStateDefinitionJSON.variants, ...state.variants };
           }
         }
       }
       if (this.type === "multipart") {
-        if (states[0] instanceof BlockStateClass) {
+        if (states[0] instanceof BlockStateDefinitionClass) {
           for (const state of states) {
-            this.blockStateJSON.multipart.push(...state.blockStateJSON.multipart);
+            this.blockStateDefinitionJSON.multipart.push(...state.blockStateDefinitionJSON.multipart);
           }
         } else {
           for (const state of states) {
-            this.blockStateJSON.multipart.push(...state.multipart);
+            this.blockStateDefinitionJSON.multipart.push(...state.multipart);
           }
         }
       }
     }
     unshift(...states) {
       if (this.type === "variants") {
-        if (states[0] instanceof BlockStateClass) {
+        if (states[0] instanceof BlockStateDefinitionClass) {
           for (const state of states) {
-            this.blockStateJSON.variants = { ...state.blockStateJSON.variants, ...this.blockStateJSON.variants };
+            this.blockStateDefinitionJSON.variants = { ...state.blockStateDefinitionJSON.variants, ...this.blockStateDefinitionJSON.variants };
           }
         } else {
           for (const state of states) {
-            this.blockStateJSON.variants = { ...state.variants, ...this.blockStateJSON.variants };
+            this.blockStateDefinitionJSON.variants = { ...state.variants, ...this.blockStateDefinitionJSON.variants };
           }
         }
       }
       if (this.type === "multipart") {
-        if (states[0] instanceof BlockStateClass) {
+        if (states[0] instanceof BlockStateDefinitionClass) {
           for (const state of states) {
-            this.blockStateJSON.multipart.unshift(...state.blockStateJSON.multipart);
+            this.blockStateDefinitionJSON.multipart.unshift(...state.blockStateDefinitionJSON.multipart);
           }
         } else {
           for (const state of states) {
-            this.blockStateJSON.multipart.unshift(...state.multipart);
+            this.blockStateDefinitionJSON.multipart.unshift(...state.multipart);
           }
         }
       }
@@ -4408,6 +4408,7 @@ WorldBorderCommand = class WorldBorderCommand extends CommandArguments {
     };
   };
 ConditionNode = class ConditionNode extends Node {
+    preNodes;
   };
 SingleConditionNode = class SingleConditionNode extends ConditionNode {
     getValue = (negated = false) => {
@@ -4564,9 +4565,13 @@ DataPointEqualsConditionNode = class DataPointEqualsConditionNode extends Single
       this.value = value;
       const { DataVariable, Variable, commands: commands2 } = sandstoneCore2.pack;
       const { execute: execute2 } = commands2;
+      const mcFunction = sandstoneCore2.getCurrentMCFunctionOrThrow();
+      const before = mcFunction.body.length;
       const anon = DataVariable(this.dataPoint);
       this.conditional = Variable();
       execute2.store.result(this.conditional).run(() => anon.set(this.value));
+      const after = mcFunction.body.length;
+      this.preNodes = mcFunction.body.splice(before, after - before);
     }
     getValue = (negated) => (negated ? ["if", ...this.getCondition()] : ["unless", ...this.getCondition()]).join(" ");
     getCondition() {
@@ -4631,7 +4636,11 @@ CommandConditionNode = class CommandConditionNode extends SingleConditionNode {
       this.result = result;
       const store = sandstoneCore2.pack.commands.execute.store[type];
       this.variable = sandstoneCore2.pack.Variable(undefined, "condition");
+      const mcFunction = sandstoneCore2.getCurrentMCFunctionOrThrow();
+      const before = mcFunction.body.length;
       command(store(this.variable));
+      const after = mcFunction.body.length;
+      this.preNodes = mcFunction.body.splice(before, after - before);
     }
     getCondition() {
       if (this.type === "success") {
@@ -5128,54 +5137,186 @@ LoopTransformationVisitor = class LoopTransformationVisitor extends GenericSands
     visitForINode = this.visitLoopNode;
     visitForOfNode = this.visitLoopNode;
   };
+FunctionReturnConditionNode = class FunctionReturnConditionNode extends ConditionNode {
+    sandstoneCore;
+    functionName;
+    constructor(sandstoneCore2, functionName) {
+      super(sandstoneCore2);
+      this.sandstoneCore = sandstoneCore2;
+      this.functionName = functionName;
+    }
+    getValue = () => `if function ${this.functionName}`;
+  };
 OrTransformationVisitor = class OrTransformationVisitor extends GenericSandstoneVisitor {
     visitIfNode = (node_) => {
-      const { preNodes, conditionNode } = this.parseConditionNode(node_.condition);
+      const { preNodes, conditionNode } = this.parseConditionNode(node_.condition, node_.parentMCFunction);
       node_.condition = conditionNode;
       return [...preNodes, this.genericVisit(node_)];
     };
-    parseConditionNode = (node) => {
+    parseConditionNode = (node, parentMCFunction) => {
       if (node instanceof OrNode) {
-        return this.parseOrNode(node);
+        return this.parseOrNode(node, parentMCFunction);
       }
       if (node instanceof AndNode) {
-        return this.parseAndNode(node);
+        return this.parseAndNode(node, parentMCFunction);
       }
       if (node instanceof NotNode) {
-        return this.parseNotNode(node);
+        return this.parseNotNode(node, parentMCFunction);
       }
-      return { preNodes: [], conditionNode: node };
+      return { preNodes: [...node.preNodes ?? []], conditionNode: node };
     };
-    parseOrNode = (node) => {
-      const variable = this.core.pack.Variable(undefined, "condition");
-      const conditionNode = variable.equalTo(1)._toMinecraftCondition();
-      const realPreNodes = [new ScoreboardCommandNode(this.pack, "players", "reset", variable)];
-      const orExecuteNodes = node.conditions.map((condition2) => {
-        const { preNodes, conditionNode: parsedConditionNode } = this.parseConditionNode(condition2);
-        realPreNodes.push(...preNodes);
-        const ifNode = new IfNode(this.core, parsedConditionNode);
-        ifNode.body = [new ScoreboardCommandNode(this.pack, "players", "set", variable, 1)];
-        return ifNode;
+    parseOrNode = (node, parentMCFunction) => {
+      if (node.conditions.length === 1) {
+        return this.parseConditionNode(node.conditions[0], parentMCFunction);
+      }
+      const parentName = parentMCFunction?.resource.name ?? "__sandstone";
+      const orMCFunction = new MCFunctionClass(this.core, `${parentName}/or_check`, {
+        addToSandstoneCore: true,
+        creator: "sandstone",
+        onConflict: "rename"
       });
+      this.core.enterMCFunction(orMCFunction);
+      try {
+        for (const condition2 of node.conditions) {
+          this.pushCheckBranch(orMCFunction.node, this.parseConditionNode(condition2, orMCFunction.node), false, new ReturnCommandNode(this.pack, [1]));
+        }
+        orMCFunction.node.body.push(new ReturnCommandNode(this.pack, [0]));
+      } finally {
+        this.core.exitMCFunction();
+      }
       return {
-        preNodes: [...realPreNodes, ...orExecuteNodes],
-        conditionNode
+        preNodes: [],
+        conditionNode: new FunctionReturnConditionNode(this.core, orMCFunction.name)
       };
     };
-    parseAndNode = (node) => {
-      const finalPreNodes = [];
-      const conditionNode = new AndNode(node.sandstoneCore, node.conditions.map((condition2) => {
-        const { preNodes, conditionNode: conditionNode2 } = this.parseConditionNode(condition2);
-        finalPreNodes.push(...preNodes);
-        return conditionNode2;
-      }));
+    parseAndNode = (node, parentMCFunction) => {
+      if (node.conditions.length === 1) {
+        return this.parseConditionNode(node.conditions[0], parentMCFunction);
+      }
+      const parsed = node.conditions.map((condition2) => this.parseConditionNode(condition2, parentMCFunction));
+      const anyHasCommands = parsed.some((p) => (p.preNodes ?? []).length > 0);
+      if (!anyHasCommands) {
+        const finalPreNodes = [];
+        const conditionNode = new AndNode(node.sandstoneCore, parsed.map((p) => {
+          finalPreNodes.push(...p.preNodes);
+          return p.conditionNode;
+        }));
+        return { preNodes: finalPreNodes, conditionNode };
+      }
+      const parentName = parentMCFunction?.resource.name ?? "__sandstone";
+      const andMCFunction = new MCFunctionClass(this.core, `${parentName}/and_check`, {
+        addToSandstoneCore: true,
+        creator: "sandstone",
+        onConflict: "rename"
+      });
+      this.core.enterMCFunction(andMCFunction);
+      try {
+        let batch = { preNodes: [], conditionNodes: [] };
+        const flushBatch = () => {
+          if (batch.conditionNodes.length === 0 && batch.preNodes.every((pn) => pn.length === 0)) {
+            batch = { preNodes: [], conditionNodes: [] };
+            return;
+          }
+          const tracker = this.core.pack.Variable(undefined, "and_batch");
+          this.pushBatchedCheckBranch(andMCFunction.node, batch.preNodes.flat(), batch.conditionNodes, tracker);
+          batch = { preNodes: [], conditionNodes: [] };
+        };
+        for (const p of parsed) {
+          if (p.preNodes.length === 0) {
+            batch.preNodes.push(p.preNodes);
+            batch.conditionNodes.push(p.conditionNode);
+          } else {
+            flushBatch();
+            this.pushFailFastBranch(andMCFunction.node, p, new ReturnCommandNode(this.pack, [0]));
+          }
+        }
+        flushBatch();
+        andMCFunction.node.body.push(new ReturnCommandNode(this.pack, [1]));
+      } finally {
+        this.core.exitMCFunction();
+      }
       return {
-        preNodes: finalPreNodes,
-        conditionNode
+        preNodes: [],
+        conditionNode: new FunctionReturnConditionNode(this.core, andMCFunction.name)
       };
     };
-    parseNotNode = (node) => {
-      const { preNodes, conditionNode } = this.parseConditionNode(node.condition);
+    pushBatchedCheckBranch = (targetMCFunction, preNodes, conditionNodes, tracker) => {
+      for (const n of preNodes) {
+        targetMCFunction.body.push(n);
+      }
+      targetMCFunction.body.push(new ScoreboardCommandNode(this.pack, "players", "reset", tracker));
+      const args = [];
+      for (const c of conditionNodes) {
+        const condStr = c.getValue(false);
+        const match = condStr.match(/^(if|unless)\s+([\s\S]+)$/);
+        if (!match) {
+          throw new Error(`OrTransformationVisitor: unexpected condition getValue() shape: ${condStr}`);
+        }
+        const [, keyword, condBody] = match;
+        args.push([keyword, condBody]);
+      }
+      if (args.length === 0) {
+        targetMCFunction.body.push(new ScoreboardCommandNode(this.pack, "players", "set", tracker, 1));
+      } else {
+        const executeNode = new ExecuteCommandNode(this.pack, args, {
+          isSingleExecute: true,
+          body: []
+        });
+        targetMCFunction.enterContext(executeNode, false);
+        executeNode.body = [new ScoreboardCommandNode(this.pack, "players", "set", tracker, 1)];
+        targetMCFunction.body.push(executeNode);
+        targetMCFunction.exitContext();
+      }
+      const failCheckNode = new ExecuteCommandNode(this.pack, [["unless", `score ${tracker} matches 1`]], {
+        isSingleExecute: true,
+        body: []
+      });
+      targetMCFunction.enterContext(failCheckNode, false);
+      failCheckNode.body = [new ReturnCommandNode(this.pack, [0])];
+      targetMCFunction.body.push(failCheckNode);
+      targetMCFunction.exitContext();
+    };
+    pushCheckBranch = (targetMCFunction, parsed, negated, bodyNode) => {
+      for (const n of parsed.preNodes) {
+        targetMCFunction.body.push(n);
+      }
+      const condStr = parsed.conditionNode.getValue(negated);
+      const match = condStr.match(/^(if|unless)\s+([\s\S]+)$/);
+      if (!match) {
+        throw new Error(`OrTransformationVisitor: unexpected condition getValue() shape: ${condStr}`);
+      }
+      const [, keyword, condBody] = match;
+      const executeNode = new ExecuteCommandNode(this.pack, [[keyword, condBody]], {
+        isSingleExecute: true,
+        body: []
+      });
+      targetMCFunction.enterContext(executeNode, false);
+      executeNode.body = [bodyNode];
+      targetMCFunction.body.push(executeNode);
+      targetMCFunction.exitContext();
+    };
+    pushFailFastBranch = (targetMCFunction, parsed, bodyNode) => {
+      for (const n of parsed.preNodes) {
+        targetMCFunction.body.push(n);
+      }
+      const condStr = parsed.conditionNode.getValue(true);
+      const match = condStr.match(/^(if|unless)\s+([\s\S]+)$/);
+      if (!match) {
+        throw new Error(`OrTransformationVisitor: unexpected condition getValue() shape: ${condStr}`);
+      }
+      const flippedKeyword = match[1] === "if" ? "unless" : "if";
+      const condBody = match[2];
+      const executeNode = new ExecuteCommandNode(this.pack, [[flippedKeyword, condBody]], {
+        isSingleExecute: true,
+        body: []
+      });
+      targetMCFunction.enterContext(executeNode, false);
+      executeNode.body = [bodyNode];
+      targetMCFunction.body.push(executeNode);
+      targetMCFunction.exitContext();
+    };
+    parseNotNode = (node, parentMCFunction) => {
+      const { preNodes, conditionNode } = this.parseConditionNode(node.condition, parentMCFunction);
       return {
         preNodes,
         conditionNode: new NotNode(node.sandstoneCore, conditionNode)
@@ -6429,6 +6570,7 @@ SleepClass = class SleepClass extends AwaitNode {
 // src/variables/abstractClasses.ts
 
 class ConditionClass {
+  preNodes;
   _toMinecraftCondition() {
     throw new Error("Not implemented");
   }
@@ -8216,7 +8358,7 @@ var init_atlas = __esm(() => {
     });
 
 // src/core/resources/resourcepack/blockstate.ts
-var BlockStateNode, BlockStateClass;
+var BlockStateDefinitionNode, BlockStateDefinitionClass;
 var init_blockstate = __esm(() => {
   init_arguments();
   init_nodes();
@@ -10255,8 +10397,14 @@ class Flow {
     this.sandstoneCore = sandstoneCore2;
   }
   if = (condition2, callback) => new IfStatement(this.sandstoneCore, conditionToNode(condition2), callback);
-  and = (...conditions) => new AndNode(this.sandstoneCore, conditions.map((condition2) => conditionToNode(condition2)));
-  or = (...conditions) => new OrNode(this.sandstoneCore, conditions.map((condition2) => conditionToNode(condition2)));
+  and(...args) {
+    const conditions = args[0] instanceof Array ? args[0] : args;
+    return new AndNode(this.sandstoneCore, conditions.map((condition2) => conditionToNode(condition2)));
+  }
+  or(...args) {
+    const conditions = args[0] instanceof Array ? args[0] : args;
+    return new OrNode(this.sandstoneCore, conditions.map((condition2) => conditionToNode(condition2)));
+  }
   not = (condition2) => new NotNode(this.sandstoneCore, conditionToNode(condition2));
   get return() {
     return this.sandstoneCore.pack.commands.returnCmd;
@@ -10516,12 +10664,13 @@ var init_loopTransformationVisitor = __esm(() => {
   });
 
 // src/pack/visitors/orTransformationVisitor.ts
-var OrTransformationVisitor;
+var FunctionReturnConditionNode, OrTransformationVisitor;
 var init_orTransformationVisitor = __esm(() => {
   init_commands2();
+  init_core();
   init_flow();
   init_visitor();
-  });
+    });
 
 // src/pack/visitors/optimizeMacroTemporaries.ts
 var flattenArgs = (args) => args.flatMap((arg) => Array.isArray(arg) ? flattenArgs(arg) : [arg]), referencesStoragePoint = (node, point) => {
@@ -10668,11 +10817,11 @@ class SandstonePack {
     }
     return {
       datapack: {
-        packFormat: 61,
+        packFormat: 111,
         description: "A Sandstone datapack"
       },
       resourcepack: {
-        packFormat: 46,
+        packFormat: 92,
         description: "A Sandstone resource pack"
       }
     };
@@ -10749,7 +10898,7 @@ class SandstonePack {
   dataPack() {
     let pack = this.packTypes.get("datapack");
     if (!pack) {
-      const options = this.packOptions.datapack ?? { packFormat: 98, description: "A Sandstone datapack" };
+      const options = this.packOptions.datapack ?? { packFormat: 111, description: "A Sandstone datapack" };
       pack = this.packTypes.set("datapack", new DataPack(false, options)).get("datapack");
     }
     return pack;
@@ -10757,16 +10906,17 @@ class SandstonePack {
   resourcePack() {
     let pack = this.packTypes.get("resourcepack");
     if (!pack) {
-      const options = this.packOptions.resourcepack ?? { packFormat: 79, description: "A Sandstone resource pack" };
+      const options = this.packOptions.resourcepack ?? { packFormat: 92, description: "A Sandstone resource pack" };
       pack = this.packTypes.set("resourcepack", new ResourcePack(options)).get("resourcepack");
     }
     return pack;
   }
   setupLantern = () => {
-    const loadStatus = this.Objective.create("load.status", "dummy", undefined, { useDefaultNamespace: false });
+    const loadStatus = this.Objective.create("load.status", "dummy", undefined, { useDefaultNamespace: false, alreadyExists: true });
     const privateInit = this.Tag("function", "load:_private/init", [
       this.MCFunction("load:_private/init", () => {
         this.commands.comment("Reset scoreboards so packs can set values accurate for current load.");
+        this.commands.scoreboard.objectives.add(loadStatus.name, "dummy");
         loadStatus.reset();
       })
     ]);
@@ -10903,10 +11053,10 @@ class SandstonePack {
     return anonymousData;
   }
   DataIndexMap(initialize, dataPoint2) {
-    return DataIndexMap(this, initialize, dataPoint2);
+    return DataIndexMapInternal(this, initialize, dataPoint2);
   }
   DataArray(initialize, dataPoint2) {
-    return DataArray(this, initialize, dataPoint2);
+    return DataArrayInternal(this, initialize, dataPoint2);
   }
   getTempStorage = (name) => {
     if (tempStorage) {
@@ -11213,12 +11363,12 @@ class SandstonePack {
     onConflict: conflictDefaults("atlas"),
     ...options
   });
-  BlockState(name, json, options) {
-    return new BlockStateClass(this.core, name, {
+  BlockStateDefinition(name, json, options) {
+    return new BlockStateDefinitionClass(this.core, name, {
       json,
       creator: "user",
       addToSandstoneCore: true,
-      onConflict: conflictDefaults("blockstate"),
+      onConflict: conflictDefaults("block_definition"),
       ...options
     });
   }
@@ -52523,7 +52673,7 @@ var init_resources3 = __esm(() => {
     [VillagerTradeClass, "villager_trade"],
     [WorldClockClass, "world_clock"],
     [AtlasClass, "atlas"],
-    [BlockStateClass, "block_definition"],
+    [BlockStateDefinitionClass, "block_definition"],
     [EquipmentClass, "equipment"],
     [FontClass, "font"],
     [ItemModelDefinitionClass, "item_definition"],
@@ -52577,7 +52727,7 @@ var init_ItemPredicate = __esm(() => {
   });
 
 // src/variables/DataSets.ts
-function DataIndexMap(pack2, initialize, dataPoint2) {
+function DataIndexMapInternal(pack2, initialize, dataPoint2) {
   const indexMap = new DataIndexMapClass(pack2, initialize, dataPoint2);
   return new Proxy(indexMap, {
     get(target, p, receiver) {
@@ -52595,7 +52745,7 @@ function DataIndexMap(pack2, initialize, dataPoint2) {
     }
   });
 }
-function DataArray(pack2, initialize, dataPoint2) {
+function DataArrayInternal(pack2, initialize, dataPoint2) {
   const array = new DataArrayClass(pack2, initialize, dataPoint2);
   return new Proxy(array, {
     get(target, p, receiver) {
@@ -53286,7 +53436,7 @@ var {
   VillagerTrade,
   WorldClock,
   Atlas,
-  BlockState,
+  BlockStateDefinition,
   Equipment,
   Font,
   ItemModelDefinition,
@@ -53310,8 +53460,8 @@ var {
   DataVariable,
   getTempStorage,
   ResolveNBT: ResolveNBT2,
-  DataIndexMap: DataIndexMap2,
-  DataArray: DataArray2,
+  DataIndexMap,
+  DataArray,
   Selector: Selector2,
   UUID: UUID2,
   ItemPredicate: ItemPredicate2,
@@ -53973,14 +54123,16 @@ export {
   DataModifyFromCommand,
   DataModifyCommand,
   DataMergeCommand,
+  DataIndexMapInternal,
   DataIndexMapClass,
-  DataIndexMap2 as DataIndexMap,
+  DataIndexMap,
   DataGetCommand,
   DataCommandNode,
   DataCommand,
   DataClass,
+  DataArrayInternal,
   DataArrayClass,
-  DataArray2 as DataArray,
+  DataArray,
   Data2 as Data,
   DamageTypeNode,
   DamageTypeClass,
@@ -54044,9 +54196,9 @@ export {
   BossBarCommandNode,
   BossBarCommand,
   BlocksConditionNode,
-  BlockStateNode,
-  BlockStateClass,
-  BlockState,
+  BlockStateDefinitionNode,
+  BlockStateDefinitionClass,
+  BlockStateDefinition,
   BlockConditionNode,
   BiomeConditionNode,
   BannerPatternNode,
@@ -54080,5 +54232,5 @@ export {
   ACTIVITIES_SET
 };
 
-//# debugId=B948D6DA5FED7C0E64756E2164756E21
+//# debugId=4AE8B281EBDAB42264756E2164756E21
 //# sourceMappingURL=index.js.map