sandstone 1.1.3 → 1.2.0

package/src/sandstone.ts

@@ -5,10 +5,10 @@ import type {
   AdvancementClassArguments,
   AtlasClassArguments,
   BannerPatternClassArguments,
-  BlockStateArguments,
+  BlockStateDefinitionArguments,
   ChatTypeClassArguments,
   DamageTypeClassArguments,
-//  DecoratedPotPatternClassArguments,
+  DecoratedPotPatternClassArguments,
   DialogClassArguments,
   EnchantmentClassArguments,
   EnchantmentProviderClassArguments,
@@ -28,7 +28,7 @@ import type {
   PredicateClassArguments,
   RecipeClassArguments,
   ShaderClassArguments,
-//  SlotSourceClassArguments,
+  SlotSourceClassArguments,
   SoundEventArguments,
   SoundsIndexArguments,
   SulfurCubeArchetypeClassArguments,
@@ -238,7 +238,7 @@ type PackNonMethodKeys =
   | 'conditions' | 'objectives' | 'anonymousScoreId' | 'anonymousDataId' | 'constants' | 'tickedLoops'
   | '__rootObjective' | 'packUid'
   | 'reset' | 'appendNode' | 'initMCFunction' | 'save' | 'resourceToPath' | 'rootObjective'
-  | 'setupLantern' | 'dataPack' | 'resourcePack' | 'registerTickedCommands'
+  | 'setupLantern' | 'dataPack' | 'resourcePack' | 'registerTickedCommands' | 'Variant'
 type PackMethodKeys = Exclude<keyof SandstonePack, PackNonMethodKeys>
 
 // Creates a proxy that handles both callable methods and object-based properties.
@@ -295,7 +295,7 @@ export const {
   BannerPattern,
   ChatType,
   DamageType,
-//  DecoratedPotPattern,
+  DecoratedPotPattern,
   Dialog,
   Enchantment,
   EnchantmentProvider,
@@ -305,7 +305,7 @@ export const {
   LootTable,
   Predicate,
   Recipe,
-//  SlotSource,
+  SlotSource,
   SulfurCubeArchetype,
   Tag,
   TestEnvironment,
@@ -315,12 +315,11 @@ export const {
   TrialSpawner,
   TrimMaterial,
   TrimPattern,
-  Variant,
   VillagerTrade,
   WorldClock,
 
   Atlas,
-  BlockState,
+  BlockStateDefinition,
   Equipment,
   Font,
   ItemModelDefinition,
@@ -358,7 +357,40 @@ export const {
   defaultNamespace,
 } = packMethodsProxy
 
-export * from './variables/nbt/NBTs'
+// Variant needs explicit type annotation due to complex generics
+export const Variant: typeof sandstonePack.Variant = ((...args: unknown[]) =>
+  (sandstonePack.Variant as CallableFunction)(...args)) as typeof sandstonePack.Variant
+
+// Explicit re-export (not `export *`) so the library builder can hoist
+// these as top-level imports in the bundled main. Wildcard re-exports
+// make it impossible for the bundler to know which names need to be
+// imported into the bundled main's scope.
+export {
+  NBTAnyValue,
+  NBTByte,
+  NBTByteArray,
+  NBTClass,
+  NBTDouble,
+  NBTFloat,
+  NBTInt,
+  NBTIntArray,
+  NBTList,
+  NBTLong,
+  NBTLongArray,
+  NBTPrimitive,
+  NBTRange,
+  NBTShort,
+  NBTString,
+  NBTTypedArray,
+  NotNBT,
+  ResolvedNBT,
+  type NBTAllArrays,
+  type NBTAllNumberClasses,
+  type NBTAllNumbers,
+  type NBTAllPrimitives,
+  type NBTAllValues,
+  type NBTSimpleClasses,
+} from './variables/nbt/NBTs'
 
 export type { Condition } from './flow'
 export {
@@ -380,7 +412,7 @@ export {
   BannerPatternClass,
   ChatTypeClass,
   DamageTypeClass,
-//  DecoratedPotPatternClass,
+  DecoratedPotPatternClass,
   DialogClass,
   EnchantmentClass,
   EnchantmentProviderClass,
@@ -390,7 +422,7 @@ export {
   LootTableClass,
   PredicateClass,
   RecipeClass,
-//  SlotSourceClass,
+  SlotSourceClass,
   StructureClass,
   SulfurCubeArchetypeClass,
   TagClass,
@@ -407,7 +439,7 @@ export {
 
   // Resourcepack resources
   AtlasClass,
-  BlockStateClass,
+  BlockStateDefinitionClass,
   EquipmentClass,
   FontClass,
   ItemModelDefinitionClass,
@@ -677,7 +709,7 @@ type ContentStrategy =
    * The conflict strategy to use for Slot sources.
    * Will override the defined `default` strategy.
    */
-  // | ContentStrategyKind<'slot_source', NonNullable<SlotSourceClassArguments['onConflict']>>
+   | ContentStrategyKind<'slot_source', NonNullable<SlotSourceClassArguments['onConflict']>>
   /**
    * The conflict strategy to use for Sulfur cube archetypes.
    * Will override the defined `default` strategy.
@@ -717,7 +749,7 @@ type ContentStrategy =
    * The conflict strategy to use for Decorated pot patterns.
    * Will override the defined `default` strategy.
    */
-  // | ContentStrategyKind<'decorated_pot_pattern', NonNullable<DecoratedPotPatternClassArguments['onConflict']>>
+   | ContentStrategyKind<'decorated_pot_pattern', NonNullable<DecoratedPotPatternClassArguments['onConflict']>>
   /**
    * The conflict strategy to use for Dialogs.
    * Will override the defined `default` strategy.
@@ -793,7 +825,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.
@@ -844,6 +876,11 @@ type ContentStrategy =
    * Will override the defined `default` strategy.
    */
   | ContentStrategyKind<'shader', NonNullable<ShaderClassArguments['onConflict']>>
+  /**
+   * The conflict strategy to use for SoundsIndex.
+   * Will override the defined `default` strategy.
+   */
+  | ContentStrategyKind<'sounds', NonNullable<SoundsIndexArguments['onConflict']>>
   /**
    * The conflict strategy to use for Waypoint styles.
    * Will override the defined `default` strategy.

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] }