sandstone 1.1.1 → 1.1.2

package/src/arguments/generated/data/util.ts

@@ -1,9 +1,9 @@
-import type { LevelBasedValue } from 'sandstone/arguments/generated/data/enchantment/level_based_value.ts'
 import type { BlockEntityTarget, EntityTarget } from 'sandstone/arguments/generated/data/loot.ts'
-import type { NumericalEnvironmentAttribute } from 'sandstone/arguments/generated/data/worldgen/attribute.ts'
+import type { NumberProviderRef } from 'sandstone/arguments/generated/data/number_provider.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { NBTObject, RootNBT } from 'sandstone/arguments/nbt.ts'
-import type { DataPointClass, NBTFloat, NBTInt, ObjectiveClass, Score } from 'sandstone'
+import type { SingleEntityArgument } from 'sandstone/arguments'
+import type { NBTFloat, NBTInt } from 'sandstone'
 
 export type BinomialIntGenerator = {
   /**
@@ -25,19 +25,10 @@ export type BinomialIntGenerator = {
   }>,
 }
 
-export type BinomialNumberProvider = {
-  n: NumberProvider,
-  p: NumberProvider,
-}
-
 export type ConstantIntGenerator = {
   value: NBTInt,
 }
 
-export type ConstantNumberProvider = {
-  value: NBTFloat,
-}
-
 export type ContextNbtProvider = {
   target: NbtContextTarget,
 }
@@ -59,37 +50,8 @@ export type ContextScoreProvider = {
   target: EntityTarget,
 }
 
-export type EnchantmentLevelProvider = {
-  amount: LevelBasedValue,
-}
-
-export type EnvironmentAttributeNumberProvider = {
-  /**
-   * Value:
-   *
-   *  - CloudHeight(`visual/cloud_height`)
-   *  - FogStartDistance(`visual/fog_start_distance`)
-   *  - MoonAngle(`visual/moon_angle`)
-   *  - StarAngle(`visual/star_angle`)
-   *  - SunAngle(`visual/sun_angle`)
-   *  - WaterFogStartDistance(`visual/water_fog_start_distance`)
-   *  - CloudFogEndDistance(`visual/cloud_fog_end_distance`)
-   *  - FogEndDistance(`visual/fog_end_distance`)
-   *  - SkyFogEndDistance(`visual/sky_fog_end_distance`)
-   *  - WaterFogEndDistance(`visual/water_fog_end_distance`)
-   *  - SkyLightFactor(`visual/sky_light_factor`)
-   *  - StarBrightness(`visual/star_brightness`)
-   *  - MusicVolume(`audio/music_volume`)
-   *  - CatWakingUpGiftChance(`gameplay/cat_waking_up_gift_chance`)
-   *  - SurfaceSlimeSpawnChance(`gameplay/surface_slime_spawn_chance`)
-   *  - TurtleEggHatchChance(`gameplay/turtle_egg_hatch_chance`)
-   *  - SkyLightLevel(`gameplay/sky_light_level`)
-   */
-  attribute: NumericalEnvironmentAttribute,
-}
-
 export type FixedScoreProvider = {
-  name: `${any}${string}` | Score,
+  name: `${any}${string}` | SingleEntityArgument,
 }
 
 export type IntLimiter = {
@@ -101,11 +63,11 @@ export type IntRange = (NBTInt | {
   /**
    * Clamps to an integer.
    */
-  min?: NumberProvider,
+  min?: NumberProviderRef,
   /**
    * Clamps to an integer.
    */
-  max?: NumberProvider,
+  max?: NumberProviderRef,
 })
 
 export type MinMaxBounds<T extends NBTObject> = (T | {
@@ -135,10 +97,10 @@ export type MoonPhase = (
 export type NbtContextTarget = (EntityTarget | BlockEntityTarget)
 
 export type NbtProvider = (NbtContextTarget | ({
-  [S in Extract<Registry['minecraft:loot_nbt_provider_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:loot_nbt_provider_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolNbtProvider ? SymbolNbtProvider[S] : RootNBT))
-}[Registry['minecraft:loot_nbt_provider_type']]))
+}[Extract<Registry['minecraft:loot_nbt_provider_type'], string>]))
 
 export type NbtProviderSource = (
   | 'this'
@@ -150,16 +112,8 @@ export type NbtProviderSource = (
   | 'attacking_player'
   | 'block_entity')
 
-export type NumberProvider = (NBTFloat | ({
-  [S in Extract<Registry['minecraft:loot_number_provider_type'], string>]?: ({
-    type?: S,
-  } & (S extends undefined
-    ? SymbolNumberProvider<'%none'> :
-    (S extends keyof SymbolNumberProvider ? SymbolNumberProvider[S] : RootNBT)))
-}[Registry['minecraft:loot_number_provider_type']]))
-
 export type RandomIntGenerator = (NBTInt | ({
-  [S in Extract<RandomIntGeneratorType, string>]?: ({
+  [S in Extract<Extract<RandomIntGeneratorType, string>, string>]?: ({
     /**
      * Value:
      *
@@ -171,7 +125,7 @@ export type RandomIntGenerator = (NBTInt | ({
   } & (S extends undefined
     ? SymbolRandomIntGenerator<'%none'> :
     (S extends keyof SymbolRandomIntGenerator ? SymbolRandomIntGenerator[S] : RootNBT)))
-}[RandomIntGeneratorType]))
+}[Extract<RandomIntGeneratorType, string>]))
 
 export type RandomIntGeneratorType = ('uniform' | 'binomial' | 'constant')
 
@@ -180,12 +134,6 @@ export type RandomValueBounds = (NBTFloat | {
   max: NBTFloat,
 })
 
-export type ScoreNumberProvider = {
-  target: ScoreProvider,
-  score: `${any}${string}` | ObjectiveClass,
-  scale?: NBTFloat,
-}
-
 /**
  * *either*
  *
@@ -196,10 +144,10 @@ export type ScoreNumberProvider = {
  * *item 1*
  */
 export type ScoreProvider = (EntityTarget | ({
-  [S in Extract<Registry['minecraft:loot_score_provider_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:loot_score_provider_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolScoreProvider ? SymbolScoreProvider[S] : RootNBT))
-}[Registry['minecraft:loot_score_provider_type']]))
+}[Extract<Registry['minecraft:loot_score_provider_type'], string>]))
 
 export type SoundEventRef = (Registry['minecraft:sound_event'] | {
   sound_id: (`${string}:${string}` | ''),
@@ -213,25 +161,11 @@ export type StorageNbtProvider = {
   source: `${string}:${string}`,
 }
 
-export type StorageNumberProvider = {
-  storage: `${string}:${string}`,
-  path: `${any}${string}` | DataPointClass,
-}
-
-export type SumNumberProvider = {
-  summands: Array<NumberProvider>,
-}
-
 export type UniformIntGenerator = {
   min?: NBTInt,
   max?: NBTInt,
 }
 
-export type UniformNumberProvider = {
-  min?: NumberProvider,
-  max?: NumberProvider,
-}
-
 export type WeightedSoundEvent = {
   sound_id: (`${string}:${string}` | ''),
   /**
@@ -257,53 +191,6 @@ export type SymbolNbtProvider<CASE extends
   | '%unknown' = 'map'> = CASE extends 'map'
   ? NbtProviderDispatcherMap
   : CASE extends 'keys' ? NbtProviderKeys : CASE extends '%fallback' ? NbtProviderFallback : never
-type NumberProviderDispatcherMap = {
-  'binomial': NumberProviderBinomial,
-  'minecraft:binomial': NumberProviderBinomial,
-  'constant': NumberProviderConstant,
-  'minecraft:constant': NumberProviderConstant,
-  'enchantment_level': NumberProviderEnchantmentLevel,
-  'minecraft:enchantment_level': NumberProviderEnchantmentLevel,
-  'environment_attribute': NumberProviderEnvironmentAttribute,
-  'minecraft:environment_attribute': NumberProviderEnvironmentAttribute,
-  'score': NumberProviderScore,
-  'minecraft:score': NumberProviderScore,
-  'storage': NumberProviderStorage,
-  'minecraft:storage': NumberProviderStorage,
-  'sum': NumberProviderSum,
-  'minecraft:sum': NumberProviderSum,
-  'uniform': NumberProviderUniform,
-  'minecraft:uniform': NumberProviderUniform,
-}
-type NumberProviderKeys = keyof NumberProviderDispatcherMap
-type NumberProviderFallback = (
-  | NumberProviderBinomial
-  | NumberProviderConstant
-  | NumberProviderEnchantmentLevel
-  | NumberProviderEnvironmentAttribute
-  | NumberProviderScore
-  | NumberProviderStorage
-  | NumberProviderSum
-  | NumberProviderUniform)
-type NumberProviderNoneType = UniformNumberProvider
-type NumberProviderBinomial = BinomialNumberProvider
-type NumberProviderConstant = ConstantNumberProvider
-type NumberProviderEnchantmentLevel = EnchantmentLevelProvider
-type NumberProviderEnvironmentAttribute = EnvironmentAttributeNumberProvider
-type NumberProviderScore = ScoreNumberProvider
-type NumberProviderStorage = StorageNumberProvider
-type NumberProviderSum = SumNumberProvider
-type NumberProviderUniform = UniformNumberProvider
-export type SymbolNumberProvider<CASE extends
-  | 'map'
-  | 'keys'
-  | '%fallback'
-  | '%none'
-  | '%unknown' = 'map'> = CASE extends 'map'
-  ? NumberProviderDispatcherMap
-  : CASE extends 'keys'
-    ? NumberProviderKeys
-    : CASE extends '%fallback' ? NumberProviderFallback : CASE extends '%none' ? NumberProviderNoneType : never
 type RandomIntGeneratorDispatcherMap = {
   'binomial': RandomIntGeneratorBinomial,
   'minecraft:binomial': RandomIntGeneratorBinomial,

package/src/arguments/generated/data/variants/cat.ts

@@ -1,6 +1,7 @@
 import type { SoundEventRef } from 'sandstone/arguments/generated/data/util.ts'
 import type { SpawnPrioritySelectors } from 'sandstone/arguments/generated/data/variants.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { TextureType } from 'sandstone/arguments'
 import type { TextureClass } from 'sandstone'
 
 export type CatSounds = {
@@ -19,9 +20,9 @@ export type CatVariant = ({
   /**
    * The cat texture to use for this variant.
    */
-  asset_id: (Registry['minecraft:texture'] | TextureClass),
+  asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   /**
    * The baby cat texture to use for this variant.
    */
-  baby_asset_id: (Registry['minecraft:texture'] | TextureClass),
+  baby_asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
 } & SpawnPrioritySelectors)

package/src/arguments/generated/data/variants/chicken.ts

@@ -1,6 +1,7 @@
 import type { SoundEventRef } from 'sandstone/arguments/generated/data/util.ts'
 import type { SpawnPrioritySelectors } from 'sandstone/arguments/generated/data/variants.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { TextureType } from 'sandstone/arguments'
 import type { TextureClass } from 'sandstone'
 
 export type ChickenModelType = ('normal' | 'cold')
@@ -23,9 +24,9 @@ export type ChickenVariant = ({
   /**
    * The chicken texture to use for this variant.
    */
-  asset_id: (Registry['minecraft:texture'] | TextureClass),
+  asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   /**
    * The baby chicken texture to use for this variant.
    */
-  baby_asset_id: (Registry['minecraft:texture'] | TextureClass),
+  baby_asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
 } & SpawnPrioritySelectors)

package/src/arguments/generated/data/variants/cow.ts

@@ -1,6 +1,7 @@
 import type { SoundEventRef } from 'sandstone/arguments/generated/data/util.ts'
 import type { SpawnPrioritySelectors } from 'sandstone/arguments/generated/data/variants.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { TextureType } from 'sandstone/arguments'
 import type { TextureClass } from 'sandstone'
 
 export type CowModelType = ('normal' | 'cold' | 'warm')
@@ -24,9 +25,9 @@ export type CowVariant = ({
   /**
    * The cow texture to use for this variant.
    */
-  asset_id: (Registry['minecraft:texture'] | TextureClass),
+  asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   /**
    * The baby cow texture to use for this variant.
    */
-  baby_asset_id: (Registry['minecraft:texture'] | TextureClass),
+  baby_asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
 } & SpawnPrioritySelectors)

package/src/arguments/generated/data/variants/frog.ts

@@ -1,10 +1,11 @@
 import type { SpawnPrioritySelectors } from 'sandstone/arguments/generated/data/variants.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { TextureType } from 'sandstone/arguments'
 import type { TextureClass } from 'sandstone'
 
 export type FrogVariant = ({
   /**
    * The frog texture to use for this variant.
    */
-  asset_id: (Registry['minecraft:texture'] | TextureClass),
+  asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
 } & SpawnPrioritySelectors)

package/src/arguments/generated/data/variants/pig.ts

@@ -1,6 +1,7 @@
 import type { SoundEventRef } from 'sandstone/arguments/generated/data/util.ts'
 import type { SpawnPrioritySelectors } from 'sandstone/arguments/generated/data/variants.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { TextureType } from 'sandstone/arguments'
 import type { TextureClass } from 'sandstone'
 
 export type PigModelType = ('normal' | 'cold')
@@ -24,9 +25,9 @@ export type PigVariant = ({
   /**
    * The pig texture to use for this variant.
    */
-  asset_id: (Registry['minecraft:texture'] | TextureClass),
+  asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   /**
    * The baby pig texture to use for this variant.
    */
-  baby_asset_id: (Registry['minecraft:texture'] | TextureClass),
+  baby_asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
 } & SpawnPrioritySelectors)

package/src/arguments/generated/data/variants/wolf.ts

@@ -1,6 +1,7 @@
 import type { SoundEventRef } from 'sandstone/arguments/generated/data/util.ts'
 import type { SpawnPrioritySelectors } from 'sandstone/arguments/generated/data/variants.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { TextureType } from 'sandstone/arguments'
 import type { TextureClass } from 'sandstone'
 
 export type WolfSounds = {
@@ -24,7 +25,7 @@ export type WolfVariant = ({
 } & SpawnPrioritySelectors)
 
 export type WolfVariantAssetInfo = {
-  wild: (Registry['minecraft:texture'] | TextureClass),
-  tame: (Registry['minecraft:texture'] | TextureClass),
-  angry: (Registry['minecraft:texture'] | TextureClass),
+  wild: (Registry['minecraft:texture'] | TextureClass<TextureType>),
+  tame: (Registry['minecraft:texture'] | TextureClass<TextureType>),
+  angry: (Registry['minecraft:texture'] | TextureClass<TextureType>),
 }

package/src/arguments/generated/data/variants/zombie_nautilus.ts

@@ -1,5 +1,6 @@
 import type { SpawnPrioritySelectors } from 'sandstone/arguments/generated/data/variants.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { TextureType } from 'sandstone/arguments'
 import type { TextureClass } from 'sandstone'
 
 export type ZombieNautilusModelType = ('normal' | 'warm')
@@ -15,5 +16,5 @@ export type ZombieNautilusVariant = ({
   /**
    * The zombie nautilus texture to use for this variant.
    */
-  asset_id: (Registry['minecraft:texture'] | TextureClass),
+  asset_id: (Registry['minecraft:texture'] | TextureClass<TextureType>),
 } & SpawnPrioritySelectors)

package/src/arguments/generated/data/variants.ts

@@ -27,10 +27,10 @@ export type SoundVariant<T extends NBTObject> = {
 }
 
 export type SpawnCondition = NonNullable<({
-  [S in Extract<Registry['minecraft:spawn_condition_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:spawn_condition_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolSpawnCondition ? SymbolSpawnCondition[S] : RootNBT))
-}[Registry['minecraft:spawn_condition_type']])>
+}[Extract<Registry['minecraft:spawn_condition_type'], string>])>
 
 export type SpawnPrioritySelector = {
   /**

package/src/arguments/generated/data/villager_trade.ts

@@ -1,6 +1,6 @@
-import type { NonReferenceItemModifier } from 'sandstone/arguments/generated/data/item_modifier.ts'
-import type { NonReferencePredicate } from 'sandstone/arguments/generated/data/predicate.ts'
-import type { NumberProvider } from 'sandstone/arguments/generated/data/util.ts'
+import type { ItemModifier } from 'sandstone/arguments/generated/data/item_modifier.ts'
+import type { NumberProvider } from 'sandstone/arguments/generated/data/number_provider.ts'
+import type { Predicate } from 'sandstone/arguments/generated/data/predicate.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { ItemStackTemplate, TradeCost } from 'sandstone/arguments/generated/world/item.ts'
 import type { EnchantmentClass, TagClass } from 'sandstone'
@@ -26,7 +26,7 @@ export type VillagerTrade = {
    * Some modifiers can affect the price through the `additional_trade_cost` transient component. \
    * The `additional_trade_cost` component is not saved on the offered item.
    */
-  given_item_modifiers?: Array<NonReferenceItemModifier>,
+  given_item_modifiers?: Array<ItemModifier>,
   /**
    * Maximum number of uses of this trade before the villager has to restock. Defaults to `4`. \
    * Clamps to a positive integer.
@@ -46,7 +46,7 @@ export type VillagerTrade = {
    * Check whether the trade should be offered by the merchant. \
    * Does **not** support the `reference` predicate.
    */
-  merchant_predicate?: NonReferencePredicate,
+  merchant_predicate?: Predicate,
   /**
    * If the offered enchanted book has the specified enchantments, the price will be affected by doubling the `additional_trade_cost` transient component.
    */

package/src/arguments/generated/data/worldgen/attribute/modifier.ts

@@ -51,7 +51,7 @@ export type BooleanAttributeModifier = {
 export type BooleanModifierType = ('override' | 'and' | 'nand' | 'or' | 'nor' | 'xor' | 'xnor')
 
 export type ColorAttributeModifier = NonNullable<({
-  [S in Extract<ColorModifierType, string>]?: {
+  [S in Extract<Extract<ColorModifierType, string>, string>]?: {
     /**
      * Value:
      *
@@ -69,12 +69,12 @@ export type ColorAttributeModifier = NonNullable<({
         ? SymbolEnvironmentAttributeColorModifier[S]
         : SymbolEnvironmentAttributeColorModifier<'%unknown'>)),
   }
-}[ColorModifierType])>
+}[Extract<ColorModifierType, string>])>
 
 export type ColorModifierType = ('override' | 'add' | 'subtract' | 'multiply' | 'alpha_blend' | 'blend_to_gray')
 
 export type FloatAttributeModifier<T extends NBTObject> = ({
-  [S in Extract<FloatModifierType, string>]?: {
+  [S in Extract<Extract<FloatModifierType, string>, string>]?: {
     /**
      * Value:
      *
@@ -93,7 +93,7 @@ export type FloatAttributeModifier<T extends NBTObject> = ({
         ? SymbolEnvironmentAttributeFloatModifier<T>[S]
         : SymbolEnvironmentAttributeFloatModifier<T, '%unknown'>)),
   }
-}[FloatModifierType])
+}[Extract<FloatModifierType, string>])
 
 export type FloatModifierType = ('override' | 'add' | 'subtract' | 'multiply' | 'minimum' | 'maximum' | 'alpha_blend')
 
@@ -113,13 +113,39 @@ export type FloatWithAlpha = {
   }>,
 }
 
+export type ListModifier<E extends NBTObject> = {
+  /**
+   * Value:
+   *
+   *  - Override(`override`)
+   *  - Append(`append`)
+   */
+  modifier: ListModifierType,
+  argument: Array<E>,
+}
+
+export type ListModifierType = ('override' | 'append')
+
+export type MergeableModifier<T extends NBTObject> = {
+  /**
+   * Value:
+   *
+   *  - Override(`override`)
+   *  - Overlay(`overlay`)
+   */
+  modifier: MergeableModifierType,
+  argument: T,
+}
+
+export type MergeableModifierType = ('override' | 'overlay')
+
 export type OverrideModifier<T extends NBTObject> = {
   modifier: 'override',
   argument: T,
 }
 
 export type TranslucentColorAttributeModifier = NonNullable<({
-  [S in Extract<ColorModifierType, string>]?: {
+  [S in Extract<Extract<ColorModifierType, string>, string>]?: {
     /**
      * Value:
      *
@@ -137,7 +163,7 @@ export type TranslucentColorAttributeModifier = NonNullable<({
         ? SymbolEnvironmentAttributeArgbColorModifier[S]
         : RootNBT)),
   }
-}[ColorModifierType])>
+}[Extract<ColorModifierType, string>])>
 type EnvironmentAttributeFloatModifierDispatcherMap<T extends NBTObject> = {
   'alpha_blend': EnvironmentAttributeFloatModifierAlphaBlend<T>,
   'minecraft:alpha_blend': EnvironmentAttributeFloatModifierAlphaBlend<T>,