sandstone 1.1.2 → 1.1.4

package/src/pack/pack.ts

@@ -24,12 +24,11 @@ import type {
   AdvancementClassArguments,
   AtlasClassArguments,
   BannerPatternClassArguments,
-  BlockStateArguments,
-  BlockStateJSON,
+  BlockStateDefinitionArguments,
+  BlockStateDefinitionJSON,
   ChatTypeClassArguments,
   DamageTypeClassArguments,
   DataPointPickClass,
-//  DecoratedPotPatternClassArguments,
   DialogClassArguments,
   EnchantmentClassArguments,
   EnchantmentProviderClassArguments,
@@ -52,7 +51,6 @@ import type {
   PredicateClassArguments,
   RecipeClassArguments,
   ShaderClassArguments,
-//  SlotSourceClassArguments,
   SoundEventArguments,
   SoundsIndexArguments,
   SulfurCubeArchetypeClassArguments,
@@ -76,10 +74,9 @@ import {
   AdvancementClass,
   AtlasClass,
   BannerPatternClass,
-  BlockStateClass,
+  BlockStateDefinitionClass,
   ChatTypeClass,
   DamageTypeClass,
-//  DecoratedPotPatternClass,
   DialogClass,
   EnchantmentClass,
   EnchantmentProviderClass,
@@ -102,7 +99,6 @@ import {
   RecipeClass,
   SandstoneCore,
   ShaderClass,
-//  SlotSourceClass,
   SoundEventClass,
   SoundsIndexClass,
   SulfurCubeArchetypeClass,
@@ -140,9 +136,11 @@ import type {
 } from 'sandstone/variables'
 import {
   coordinatesParser,
-  DataArray,
+  DataArrayType,
+  DataArrayInternal,
   DataClass,
-  DataIndexMap,
+  DataIndexMapType,
+  DataIndexMapInternal,
   DataPointClass,
   ItemPredicateClass,
   LabelClass,
@@ -316,11 +314,11 @@ export class SandstonePack {
     }
     return {
       datapack: {
-        packFormat: 61,
+        packFormat: 111,
         description: 'A Sandstone datapack',
       },
       resourcepack: {
-        packFormat: 46,
+        packFormat: 92,
         description: 'A Sandstone resource pack',
       },
     }
@@ -446,7 +444,7 @@ export class SandstonePack {
     let pack = this.packTypes.get('datapack') as 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') as DataPack
     }
 
@@ -457,7 +455,7 @@ export class SandstonePack {
     let pack = this.packTypes.get('resourcepack') as 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') as ResourcePack
@@ -832,14 +830,14 @@ export class SandstonePack {
     initialize: INITIAL,
     dataPoint?: DataPointClass<'storage'>,
   ) {
-    return DataIndexMap(this, initialize, dataPoint) as DataIndexMap<INITIAL>
+    return DataIndexMapInternal(this, initialize, dataPoint) as DataIndexMapType<INITIAL>
   }
 
   DataArray<INITIAL extends readonly NBTObject[] | readonly [string, DataPointClass | DataPointPickClass]>(
     initialize: INITIAL,
     dataPoint?: DataPointClass<'storage'>,
   ) {
-    return DataArray(this, initialize, dataPoint) as DataArray<INITIAL>
+    return DataArrayInternal(this, initialize, dataPoint) as DataArrayType<INITIAL>
   }
 
   getTempStorage = (name: string) => {
@@ -1123,15 +1121,6 @@ export class SandstonePack {
       ...options,
     })
 
-  // DecoratedPotPattern = (name: string, decoratedPotPattern: NonNullable<SymbolResource['decorated_pot_pattern']>, options?: Partial<DecoratedPotPatternClassArguments>) =>
-  //   new DecoratedPotPatternClass(this.core, name, {
-  //     json: decoratedPotPattern,
-  //     creator: 'user',
-  //     addToSandstoneCore: true,
-  //     onConflict: conflictDefaults('decorated_pot_pattern') as DecoratedPotPatternClassArguments['onConflict'],
-  //     ...options,
-  //   })
-
   ItemModifier = (name: string, itemModifier: ItemModifierClassArguments['json'], options?: Omit<Partial<ItemModifierClassArguments>, 'json'>) =>
     new ItemModifierClass(this.core, name, {
       json: itemModifier,
@@ -1172,15 +1161,6 @@ export class SandstonePack {
       ...options,
     })
 
-  // SlotSource = (name: string, slotSource: NonNullable<SymbolResource['slot_source']>, options?: Partial<SlotSourceClassArguments>) =>
-  //   new SlotSourceClass(this.core, name, {
-  //     json: slotSource,
-  //     creator: 'user',
-  //     addToSandstoneCore: true,
-  //     onConflict: conflictDefaults('slot_source') as SlotSourceClassArguments['onConflict'],
-  //     ...options,
-  //   })
-
   SulfurCubeArchetype = (name: string, sulfurCubeArchetype: SulfurCubeArchetypeClassArguments['json'], options?: Omit<Partial<SulfurCubeArchetypeClassArguments>, 'json'>) =>
     new SulfurCubeArchetypeClass(this.core, name, {
       json: sulfurCubeArchetype,
@@ -1366,16 +1346,16 @@ export class SandstonePack {
       ...options,
     })
 
-  BlockState<JSON extends BlockStateJSON>(
+  BlockStateDefinition<JSON extends BlockStateDefinitionJSON>(
     name: string,
     json: JSON,
-    options?: Omit<Partial<BlockStateArguments<JSON>>, 'json'>,
+    options?: Omit<Partial<BlockStateDefinitionArguments<JSON>>, 'json'>,
   ) {
-    return new BlockStateClass(this.core, name, {
+    return new BlockStateDefinitionClass(this.core, name, {
       json,
       creator: 'user',
       addToSandstoneCore: true,
-      onConflict: conflictDefaults('blockstate') as BlockStateArguments<JSON>['onConflict'],
+      onConflict: conflictDefaults('block_definition') as BlockStateDefinitionArguments<JSON>['onConflict'],
       ...options,
     })
   }

package/src/sandstone.ts

@@ -5,10 +5,9 @@ import type {
   AdvancementClassArguments,
   AtlasClassArguments,
   BannerPatternClassArguments,
-  BlockStateArguments,
+  BlockStateDefinitionArguments,
   ChatTypeClassArguments,
   DamageTypeClassArguments,
-//  DecoratedPotPatternClassArguments,
   DialogClassArguments,
   EnchantmentClassArguments,
   EnchantmentProviderClassArguments,
@@ -28,7 +27,6 @@ import type {
   PredicateClassArguments,
   RecipeClassArguments,
   ShaderClassArguments,
-//  SlotSourceClassArguments,
   SoundEventArguments,
   SoundsIndexArguments,
   SulfurCubeArchetypeClassArguments,
@@ -295,7 +293,6 @@ export const {
   BannerPattern,
   ChatType,
   DamageType,
-//  DecoratedPotPattern,
   Dialog,
   Enchantment,
   EnchantmentProvider,
@@ -305,7 +302,6 @@ export const {
   LootTable,
   Predicate,
   Recipe,
-//  SlotSource,
   SulfurCubeArchetype,
   Tag,
   TestEnvironment,
@@ -320,7 +316,7 @@ export const {
   WorldClock,
 
   Atlas,
-  BlockState,
+  BlockStateDefinition,
   Equipment,
   Font,
   ItemModelDefinition,
@@ -380,7 +376,6 @@ export {
   BannerPatternClass,
   ChatTypeClass,
   DamageTypeClass,
-//  DecoratedPotPatternClass,
   DialogClass,
   EnchantmentClass,
   EnchantmentProviderClass,
@@ -390,7 +385,6 @@ export {
   LootTableClass,
   PredicateClass,
   RecipeClass,
-//  SlotSourceClass,
   StructureClass,
   SulfurCubeArchetypeClass,
   TagClass,
@@ -407,7 +401,7 @@ export {
 
   // Resourcepack resources
   AtlasClass,
-  BlockStateClass,
+  BlockStateDefinitionClass,
   EquipmentClass,
   FontClass,
   ItemModelDefinitionClass,
@@ -673,11 +667,6 @@ type ContentStrategy =
    * 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.
-   */
-  // | ContentStrategyKind<'slot_source', NonNullable<SlotSourceClassArguments['onConflict']>>
   /**
    * The conflict strategy to use for Sulfur cube archetypes.
    * Will override the defined `default` strategy.
@@ -713,11 +702,6 @@ type ContentStrategy =
    * 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.
-   */
-  // | ContentStrategyKind<'decorated_pot_pattern', NonNullable<DecoratedPotPatternClassArguments['onConflict']>>
   /**
    * The conflict strategy to use for Dialogs.
    * Will override the defined `default` strategy.
@@ -793,7 +777,7 @@ type ContentStrategy =
    * 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/src/utils.ts

@@ -721,4 +721,6 @@ export type SmartRange<Min extends number, Max extends number> = (
       : ToNegative<PositiveRange<1, Abs<Min>>> | 0 | PositiveRange<1, Max>
     :
       PositiveRange<Min, Max>
-)
+)
+
+export type AllowConst<T> = T | (readonly [T])[0]

package/src/variables/DataSets.ts

@@ -456,7 +456,7 @@ export class DataArrayClass<INITIAL extends DataArrayInitial> extends IterableDa
   }
 }
 
-export function DataIndexMap<INITIAL extends DataIndexMapInitial>(
+export function DataIndexMapInternal<INITIAL extends DataIndexMapInitial>(
   pack: SandstonePack,
   initialize: INITIAL,
   dataPoint?: DataPointClass<'storage'>,
@@ -486,11 +486,11 @@ export function DataIndexMap<INITIAL extends DataIndexMapInitial>(
   }
 }
 
-export type DataIndexMap<INITIAL extends DataIndexMapInitial> = DataIndexMapClass<INITIAL> & {
+export type DataIndexMapType<INITIAL extends DataIndexMapInitial> = DataIndexMapClass<INITIAL> & {
   [K in keyof INITIAL]: DataIndexMapInitial[`${any}${string}`]
 } & { [K in string]: DataIndexMapInitial[`${any}${string}`] }
 
-export function DataArray<INITIAL extends DataArrayInitial>(
+export function DataArrayInternal<INITIAL extends DataArrayInitial>(
   pack: SandstonePack,
   initialize: INITIAL,
   dataPoint?: DataPointClass<'storage'>,
@@ -520,6 +520,6 @@ export function DataArray<INITIAL extends DataArrayInitial>(
   }
 }
 
-export type DataArray<INITIAL extends DataArrayInitial> = DataArrayClass<INITIAL> & {
+export type DataArrayType<INITIAL extends DataArrayInitial> = DataArrayClass<INITIAL> & {
   [K in keyof INITIAL]: DataArrayInitial[number]
 } & { [K in number]: DataArrayInitial[number] }

package/src/core/resources/datapack/decoratedPotPattern.ts.disable

@@ -1,47 +0,0 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
-import { ContainerNode } from '../../nodes'
-import type { SandstoneCore } from '../../sandstoneCore'
-import type { ResourceClassArguments, ResourceNode } from '../resource'
-import { ResourceClass, jsonStringify } from '../resource'
-
-/**
- * A node representing a Minecraft decorated pot pattern.
- */
-export class DecoratedPotPatternNode extends ContainerNode implements ResourceNode<DecoratedPotPatternClass> {
-  constructor(
-    sandstoneCore: SandstoneCore,
-    public resource: DecoratedPotPatternClass,
-  ) {
-    super(sandstoneCore)
-  }
-
-  getValue = () => jsonStringify(this.resource.decoratedPotPatternJSON, this.resource._resourceType as keyof typeof RESOURCE_PATHS)
-}
-
-export type DecoratedPotPatternClassArguments = {
-  /**
-   * The decorated pot pattern's JSON.
-   */
-  json: SymbolResource[(typeof DecoratedPotPatternClass)['resourceType']]
-} & ResourceClassArguments<'default'>
-
-export class DecoratedPotPatternClass extends ResourceClass<DecoratedPotPatternNode> {
-  static readonly resourceType = 'decorated_pot_pattern' as const
-
-  public decoratedPotPatternJSON: NonNullable<DecoratedPotPatternClassArguments['json']>
-
-  constructor(sandstoneCore: SandstoneCore, name: string, args: DecoratedPotPatternClassArguments) {
-    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()
-  }
-}

package/src/core/resources/datapack/slotSource.ts.disable

@@ -1,47 +0,0 @@
-import { RESOURCE_PATHS, type SymbolResource } from 'sandstone/arguments'
-import { ContainerNode } from '../../nodes'
-import type { SandstoneCore } from '../../sandstoneCore'
-import type { ResourceClassArguments, ResourceNode } from '../resource'
-import { ResourceClass, jsonStringify } from '../resource'
-
-/**
- * A node representing a Minecraft slot source.
- */
-export class SlotSourceNode extends ContainerNode implements ResourceNode<SlotSourceClass> {
-  constructor(
-    sandstoneCore: SandstoneCore,
-    public resource: SlotSourceClass,
-  ) {
-    super(sandstoneCore)
-  }
-
-  getValue = () => jsonStringify(this.resource.slotSourceJSON, this.resource._resourceType as keyof typeof RESOURCE_PATHS)
-}
-
-export type SlotSourceClassArguments = {
-  /**
-   * The slot source's JSON.
-   */
-  json: NonNullable<SymbolResource[(typeof SlotSourceClass)['resourceType']]>
-} & ResourceClassArguments<'default'>
-
-export class SlotSourceClass extends ResourceClass<SlotSourceNode> {
-  static readonly resourceType = 'slot_source' as const
-
-  public slotSourceJSON: NonNullable<SlotSourceClassArguments['json']>
-
-  constructor(sandstoneCore: SandstoneCore, name: string, args: SlotSourceClassArguments) {
-    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()
-  }
-}