sandstone 1.1.1 → 1.1.2

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

@@ -1,15 +1,22 @@
-import type { LootConditionOf } from 'sandstone/arguments/generated/data/loot/condition.ts'
-import type { LootFunctionOf } from 'sandstone/arguments/generated/data/loot/function.ts'
+import type { LootCondition } from 'sandstone/arguments/generated/data/loot/condition.ts'
+import type { LootFunction } from 'sandstone/arguments/generated/data/loot/function.ts'
+import type { NumberProviderRef } from 'sandstone/arguments/generated/data/number_provider.ts'
 import type { SlotSource } from 'sandstone/arguments/generated/data/slot_source.ts'
-import type { NumberProvider } from 'sandstone/arguments/generated/data/util.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
-import type { LootTableClass, NBTInt } from 'sandstone'
+import type { LootTableClass, NBTInt, NBTList } from 'sandstone'
 
 export type BlockEntityTarget = 'block_entity'
 
 export type CompositePoolEntry = ({
-  children: Array<LootPoolEntry>,
+  /**
+   * Value:
+   * List length range: 1..
+   */
+  children: NBTList<LootPoolEntry, {
+    leftExclusive: false,
+    min: 1,
+  }>,
 } & LootPoolEntryBase)
 
 export type DynamicDrops = ('contents' | 'sherds')
@@ -41,8 +48,6 @@ export type ItemPoolEntry = ({
 
 export type ItemStackTarget = 'tool'
 
-export type LootCondition = LootConditionOf<Registry['minecraft:loot_condition_type']>
-
 export type LootConditionType = (
   | 'alternative'
   | 'block_state_property'
@@ -61,7 +66,7 @@ export type LootConditionType = (
   | 'time_check'
   | 'weather_check')
 
-export type LootContextType = (
+export type LootContextParamSets = (
   | 'empty'
   | 'chest'
   | 'command'
@@ -88,7 +93,8 @@ export type LootContextType = (
   | 'block_interact'
   | 'entity_interact'
   | 'villager_trade'
-  | 'command_slot_source')
+  | 'command_slot_source'
+  | 'container_process')
 
 export type LootEntryType = (
   | 'alternatives'
@@ -100,8 +106,6 @@ export type LootEntryType = (
   | 'sequence'
   | 'tag')
 
-export type LootFunction = LootFunctionOf<Registry['minecraft:loot_function_type'], Registry['minecraft:loot_condition_type']>
-
 export type LootFunctionType = (
   | 'apply_bonus'
   | 'copy_name'
@@ -125,19 +129,20 @@ export type LootFunctionType = (
   | 'set_nbt'
   | 'set_stew_effect')
 
-export type LootPool = {
-  rolls: NumberProvider,
-  bonus_rolls?: NumberProvider,
+export type LootPool = ({
+  rolls: NumberProviderRef,
+  bonus_rolls?: NumberProviderRef,
   entries: Array<LootPoolEntry>,
+} & {
   functions?: Array<LootFunction>,
   conditions?: Array<LootCondition>,
-}
+})
 
 export type LootPoolEntry = NonNullable<({
-  [S in Extract<Registry['minecraft:loot_pool_entry_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:loot_pool_entry_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolLootPoolEntry ? SymbolLootPoolEntry[S] : RootNBT))
-}[Registry['minecraft:loot_pool_entry_type']])>
+}[Extract<Registry['minecraft:loot_pool_entry_type'], string>])>
 
 export type LootPoolEntryBase = {
   conditions?: Array<LootCondition>,
@@ -174,8 +179,9 @@ export type LootTable = {
    *  - EntityInteract(`entity_interact`)
    *  - VillagerTrade(`villager_trade`)
    *  - CommandSlotSource(`command_slot_source`)
+   *  - ContainerProcess(`container_process`)
    */
-  type?: (LootContextType | `minecraft:${LootContextType}`),
+  type?: (LootContextParamSets | `minecraft:${LootContextParamSets}`),
   pools?: Array<LootPool>,
   functions?: Array<LootFunction>,
   /**
@@ -186,13 +192,13 @@ export type LootTable = {
   random_sequence?: `${string}:${string}`,
 }
 
+export type LootTableListRef = Array<LootTable>
+
 export type LootTablePoolEntry = ({
   value: ((Registry['minecraft:loot_table'] | LootTableClass) | LootTable),
 } & SingletonPoolEntry)
 
-export type NonReferenceLootCondition = LootConditionOf<Registry['minecraft:loot_condition_type']>
-
-export type NonReferenceLootFunction = LootFunctionOf<Registry['minecraft:loot_function_type'], Registry['minecraft:loot_condition_type']>
+export type LootTableRef = LootTable
 
 export type SingletonPoolEntry = ({
   /**
@@ -212,8 +218,10 @@ export type SlotsPoolEntry = ({
 
 export type TagPoolEntry = ({
   name: (Registry['minecraft:tag/item']),
+} & {
   /**
-   * If `true`, drops a random item from the tag. If `false`, drops all items in the tag.
+   * If `true`, drops a random item from the tag. \
+   * If `false`, drops all items in the tag.
    */
   expand: boolean,
 } & SingletonPoolEntry)

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

@@ -0,0 +1,153 @@
+import type { LevelBasedValue } from 'sandstone/arguments/generated/data/enchantment/level_based_value.ts'
+import type { PredicateRef } from 'sandstone/arguments/generated/data/predicate.ts'
+import type { ScoreProvider } from 'sandstone/arguments/generated/data/util.ts'
+import type { NumericalEnvironmentAttribute } from 'sandstone/arguments/generated/data/worldgen/attribute.ts'
+import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { NonEmptyWeightedList } from 'sandstone/arguments/generated/util.ts'
+import type { RootNBT } from 'sandstone/arguments/nbt.ts'
+import type { DataPointClass, NBTFloat, ObjectiveClass } from 'sandstone'
+
+export type BinomialNumberProvider = {
+  n: NumberProviderRef,
+  p: NumberProviderRef,
+}
+
+export type ConditionalValueNumberProvider = {
+  condition: PredicateRef,
+  on_true: NumberProviderRef,
+  /**
+   * Defaults to constant 0.
+   */
+  on_false?: NumberProviderRef,
+}
+
+export type ConstantNumberProvider = {
+  value: NBTFloat,
+}
+
+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`)
+   *  - CreatureWorldgenSpawnProbability(`gameplay/creature_world_gen_spawn_probability`)
+   *  - SurfaceSlimeSpawnChance(`gameplay/surface_slime_spawn_chance`)
+   *  - TurtleEggHatchChance(`gameplay/turtle_egg_hatch_chance`)
+   *  - SkyLightLevel(`gameplay/sky_light_level`)
+   */
+  attribute: NumericalEnvironmentAttribute,
+}
+
+export type NumberDispatcher = {
+  cases: Array<{
+    condition: PredicateRef,
+    number_provider: NumberProviderRef,
+  }>,
+  /**
+   * Defaults to constant 0.
+   */
+  default?: NumberProviderRef,
+}
+
+export type NumberProvider = (NBTFloat | ({
+  [S in Extract<Extract<Registry['minecraft:loot_number_provider_type'], string>, string>]?: ({
+    /**
+     * Defaults to `minecraft:uniform`.
+     */
+    type?: S,
+  } & (S extends undefined
+    ? SymbolNumberProvider<'%none'> :
+    (S extends keyof SymbolNumberProvider ? SymbolNumberProvider[S] : RootNBT)))
+}[Extract<Registry['minecraft:loot_number_provider_type'], string>]))
+
+export type NumberProviderListRef = Array<NumberProvider>
+
+export type NumberProviderRef = NumberProvider
+
+export type ScoreNumberProvider = {
+  target: ScoreProvider,
+  score: `${any}${string}` | ObjectiveClass,
+  scale?: NBTFloat,
+}
+
+export type StorageNumberProvider = {
+  storage: `${string}:${string}`,
+  path: `${any}${string}` | DataPointClass,
+}
+
+export type SumNumberProvider = {
+  summands: NumberProviderListRef,
+}
+
+export type UniformNumberProvider = {
+  min?: NumberProviderRef,
+  max?: NumberProviderRef,
+}
+
+export type WeightedNumberProvider = {
+  distribution: NonEmptyWeightedList<NumberProviderRef>,
+}
+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

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

@@ -1,5 +1,7 @@
-import type { LootCondition, NonReferenceLootCondition } from 'sandstone/arguments/generated/data/loot.ts'
-
-export type NonReferencePredicate = (NonReferenceLootCondition | Array<NonReferenceLootCondition>)
+import type { LootCondition } from 'sandstone/arguments/generated/data/loot/condition.ts'
 
 export type Predicate = (LootCondition | Array<LootCondition>)
+
+export type PredicateListRef = Array<LootCondition>
+
+export type PredicateRef = Predicate

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

@@ -1,9 +1,22 @@
 import type { MinMaxBounds } from 'sandstone/arguments/generated/data/util.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { FireworkShape } from 'sandstone/arguments/generated/world/component/item.ts'
+import type { PotionsPredicate } from 'sandstone/arguments/generated/world/component/predicate.ts'
 import type { ItemStack, ItemStackTemplate } from 'sandstone/arguments/generated/world/item.ts'
 import type { CRAFTING_INGREDIENT, PatternKeys, StringSmallerThan4 } from 'sandstone/arguments'
-import type { NBTFloat, NBTInt, NBTList, TagClass, TrimPatternClass } from 'sandstone'
+import type { NBTFloat, NBTInt, NBTList, RecipeClass, TagClass, TrimPatternClass } from 'sandstone'
+
+export type Brewing = {
+  /**
+   * The original potion.
+   */
+  input: PotionIngredient,
+  /**
+   * The ingredient.
+   */
+  reagent: PotionIngredient,
+  output: ItemStackTemplate,
+}
 
 export type CookingBookCategory = ('food' | 'blocks' | 'misc')
 
@@ -353,11 +366,20 @@ export type OptionalSmithingIngredients = {
   template?: Ingredient,
 }
 
+export type PotionIngredient = {
+  item: Ingredient,
+  potion_contents?: PotionsPredicate,
+}
+
 export type Recipe = NonNullable<({
-  [S in Extract<Registry['minecraft:recipe_serializer'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:recipe_serializer'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolRecipeSerializer ? SymbolRecipeSerializer[S] : SymbolRecipeSerializer<'%unknown'>))
-}[Registry['minecraft:recipe_serializer']])>
+}[Extract<Registry['minecraft:recipe_serializer'], string>])>
+
+export type RecipeListRef = ((
+  | Registry['minecraft:recipe'] | `#${string}:${string}` | TagClass<'recipe'> | RecipeClass)
+  | Array<(Registry['minecraft:recipe'] | RecipeClass)>)
 
 export type RequiredSmithingIngredients = {
   /**
@@ -482,8 +504,6 @@ type RecipeSerializerDispatcherMap = {
   'minecraft:crafting_transmute': RecipeSerializerCraftingTransmute,
   'smelting': RecipeSerializerSmelting,
   'minecraft:smelting': RecipeSerializerSmelting,
-  'smithing': RecipeSerializerSmithing,
-  'minecraft:smithing': RecipeSerializerSmithing,
   'smithing_transform': RecipeSerializerSmithingTransform,
   'minecraft:smithing_transform': RecipeSerializerSmithingTransform,
   'smithing_trim': RecipeSerializerSmithingTrim,
@@ -511,7 +531,6 @@ type RecipeSerializerFallback = (
   | RecipeSerializerCraftingSpecialShielddecoration
   | RecipeSerializerCraftingTransmute
   | RecipeSerializerSmelting
-  | RecipeSerializerSmithing
   | RecipeSerializerSmithingTransform
   | RecipeSerializerSmithingTrim
   | RecipeSerializerSmoking
@@ -534,7 +553,6 @@ type RecipeSerializerCraftingSpecialMapextending = CraftingSpecialMapExtending
 type RecipeSerializerCraftingSpecialShielddecoration = CraftingSpecialShieldDecoration
 type RecipeSerializerCraftingTransmute = CraftingTransmute
 type RecipeSerializerSmelting = Smelting
-type RecipeSerializerSmithing = Smithing
 type RecipeSerializerSmithingTransform = SmithingTransform
 type RecipeSerializerSmithingTrim = SmithingTrim
 type RecipeSerializerSmoking = Smelting

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

@@ -3,14 +3,14 @@ import type { BlockEntityTarget, EntityTarget } from 'sandstone/arguments/genera
 import type { ContainerComponents } from 'sandstone/arguments/generated/data/loot/function.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { ENTITY_SLOTS } from 'sandstone/arguments'
-import type { NBTObject, RootNBT } from 'sandstone/arguments/nbt.ts'
-import type { LiteralUnion, NBTInt, SlotSourceClass } from 'sandstone'
+import type { RootNBT } from 'sandstone/arguments/nbt.ts'
+import type { LiteralUnion, NBTInt } from 'sandstone'
 
-export type ContentsSlotSource<S extends NBTObject> = {
+export type ContentsSlotSource = {
   /**
    * The slots to search.
    */
-  slot_source: SlotSourceOf<S>,
+  slot_source: SlotSource,
   /**
    * If an item targeted by `slot_source` has this container component, selects all items inside.
    *
@@ -23,17 +23,17 @@ export type ContentsSlotSource<S extends NBTObject> = {
   component: (ContainerComponents | `minecraft:${ContainerComponents}`),
 }
 
-export type FilterSlotSource<S extends NBTObject> = {
-  slot_source: SlotSourceOf<S>,
+export type FilterSlotSource = {
+  slot_source: SlotSource,
   item_filter: ItemPredicate,
 }
 
-export type GroupSlotSource<S extends NBTObject> = {
-  terms: Array<SlotSourceOf<S>>,
+export type GroupSlotSource = {
+  terms: SlotSource,
 }
 
-export type LimitCountSlotSource<S extends NBTObject> = {
-  slot_source: SlotSourceOf<S>,
+export type LimitCountSlotSource = {
+  slot_source: SlotSource,
   /**
    * Value:
    * Range: 1..
@@ -59,61 +59,46 @@ export type RangeSlotSource = ({
   slots: LiteralUnion<ENTITY_SLOTS>,
 })
 
-export type SlotSource = SlotSourceOf<Registry['minecraft:slot_source_type']>
+export type SlotSource = (TypedSlotSource | Array<SlotSource>)
 
-export type SlotSourceOf<S extends NBTObject> = (TypedSlotSourceOf<S> | Array<TypedSlotSourceOf<S>>)
-
-export type TypedSlotSourceOf<S extends NBTObject> = ({
-  [S in keyof SlotSourceDispatcherMap<S>]?: ({
+export type TypedSlotSource = NonNullable<({
+  [S in Extract<Extract<Registry['minecraft:slot_source_type'], string>, string>]?: ({
     type: S,
-  } & (S extends keyof SlotSourceDispatcherMap<S> ? SlotSourceDispatcherMap<S>[S] : RootNBT))
-}[keyof SlotSourceDispatcherMap<S>])
-type SlotSourceDispatcherMap<S extends NBTObject> = {
-  'contents': SlotSourceContents<S>,
-  'minecraft:contents': SlotSourceContents<S>,
-  'empty': SlotSourceEmpty<S>,
-  'minecraft:empty': SlotSourceEmpty<S>,
-  'filtered': SlotSourceFiltered<S>,
-  'minecraft:filtered': SlotSourceFiltered<S>,
-  'group': SlotSourceGroup<S>,
-  'minecraft:group': SlotSourceGroup<S>,
-  'limit_slots': SlotSourceLimitSlots<S>,
-  'minecraft:limit_slots': SlotSourceLimitSlots<S>,
-  'reference': SlotSourceReference<S>,
-  'minecraft:reference': SlotSourceReference<S>,
-  'slot_range': SlotSourceSlotRange<S>,
-  'minecraft:slot_range': SlotSourceSlotRange<S>,
+  } & (S extends keyof SymbolSlotSource ? SymbolSlotSource[S] : RootNBT))
+}[Extract<Registry['minecraft:slot_source_type'], string>])>
+type SlotSourceDispatcherMap = {
+  'contents': SlotSourceContents,
+  'minecraft:contents': SlotSourceContents,
+  'empty': SlotSourceEmpty,
+  'minecraft:empty': SlotSourceEmpty,
+  'filtered': SlotSourceFiltered,
+  'minecraft:filtered': SlotSourceFiltered,
+  'group': SlotSourceGroup,
+  'minecraft:group': SlotSourceGroup,
+  'limit_slots': SlotSourceLimitSlots,
+  'minecraft:limit_slots': SlotSourceLimitSlots,
+  'slot_range': SlotSourceSlotRange,
+  'minecraft:slot_range': SlotSourceSlotRange,
 }
-type SlotSourceKeys = keyof SlotSourceDispatcherMap<NBTObject>
-type SlotSourceFallback<S extends NBTObject> = (
-  | SlotSourceContents<S>
-  | SlotSourceEmpty<S>
-  | SlotSourceFiltered<S>
-  | SlotSourceGroup<S>
-  | SlotSourceLimitSlots<S>
-  | SlotSourceReference<S>
-  | SlotSourceSlotRange<S>)
-export type SlotSourceContents<S extends NBTObject> = ContentsSlotSource<S>
-
-export type SlotSourceEmpty<S extends NBTObject> = Record<string, never>
-
-export type SlotSourceFiltered<S extends NBTObject> = FilterSlotSource<S>
-
-export type SlotSourceGroup<S extends NBTObject> = GroupSlotSource<S>
-
-export type SlotSourceLimitSlots<S extends NBTObject> = LimitCountSlotSource<S>
-
-export type SlotSourceReference<S extends NBTObject> = {
-  name: (`${string}:${string}` | SlotSourceClass),
-}
-
-export type SlotSourceSlotRange<S extends NBTObject> = RangeSlotSource
-
-export type SymbolSlotSource<S extends NBTObject, CASE extends
+type SlotSourceKeys = keyof SlotSourceDispatcherMap
+type SlotSourceFallback = (
+  | SlotSourceContents
+  | SlotSourceEmpty
+  | SlotSourceFiltered
+  | SlotSourceGroup
+  | SlotSourceLimitSlots
+  | SlotSourceSlotRange)
+type SlotSourceContents = ContentsSlotSource
+type SlotSourceEmpty = Record<string, never>
+type SlotSourceFiltered = FilterSlotSource
+type SlotSourceGroup = GroupSlotSource
+type SlotSourceLimitSlots = LimitCountSlotSource
+type SlotSourceSlotRange = RangeSlotSource
+export type SymbolSlotSource<CASE extends
   | 'map'
   | 'keys'
   | '%fallback'
   | '%none'
   | '%unknown' = 'map'> = CASE extends 'map'
-  ? SlotSourceDispatcherMap<S>
-  : CASE extends 'keys' ? SlotSourceKeys : CASE extends '%fallback' ? SlotSourceFallback<S> : never
+  ? SlotSourceDispatcherMap
+  : CASE extends 'keys' ? SlotSourceKeys : CASE extends '%fallback' ? SlotSourceFallback : never

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

@@ -1,4 +1,4 @@
-import type { NumberProvider } from 'sandstone/arguments/generated/data/util.ts'
+import type { NumberProvider } from 'sandstone/arguments/generated/data/number_provider.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { TagClass, VillagerTradeClass } from 'sandstone'