sandstone 1.1.3 → 1.2.0

package/src/arguments/generated/_registry/worldgen_trunk_placer_types.ts

@@ -13,6 +13,7 @@ export const WORLDGEN_TRUNK_PLACER_TYPES_SET = new Set([
   'forking_trunk_placer',
   'giant_trunk_placer',
   'mega_jungle_trunk_placer',
+  'poplar_trunk_placer',
   'straight_trunk_placer',
   'upwards_branching_trunk_placer',
 ] as const)

package/src/arguments/generated/assets/atlas.ts

@@ -52,7 +52,7 @@ export type PalettedPermutations = {
  */
 export type PaletteRef = `${string}:${string}`
 
-export type PaletteTexture = (Registry['minecraft:texture'] | TextureClass<TextureType>)
+export type PaletteTexture = ((Registry['minecraft:texture'] | TextureClass<TextureType>) | PaletteRef)
 
 export type PermutationsMap = ({
   [Key in `${any}${string}`]?: PaletteTexture

package/src/arguments/generated/assets/equipment.ts

@@ -1,3 +1,4 @@
+import type { PaletteRef } from 'sandstone/arguments/generated/assets/atlas.ts'
 import type { RGB } from 'sandstone/arguments/generated/util/color.ts'
 import type { NBTObject } from 'sandstone/arguments/nbt.ts'
 
@@ -14,6 +15,12 @@ export type Equipment = {
    * List of layers for each model layer type.
    */
   layers: Layers,
+  /**
+   * Replaces palette textures provided by trim materials.
+   */
+  trim_palette_replacements?: ({
+    [Key in Extract<PaletteRef, string>]?: PaletteRef
+  }),
 }
 
 export type Layer<T extends NBTObject> = ({

package/src/arguments/generated/assets/item_definition.ts

@@ -1133,8 +1133,6 @@ export type SymbolSelectItemProperty<CASE extends
 type SpecialItemModelDispatcherMap = {
   'banner': SpecialItemModelBanner,
   'minecraft:banner': SpecialItemModelBanner,
-  'bed': SpecialItemModelBed,
-  'minecraft:bed': SpecialItemModelBed,
   'book': SpecialItemModelBook,
   'minecraft:book': SpecialItemModelBook,
   'chest': SpecialItemModelChest,
@@ -1143,39 +1141,29 @@ type SpecialItemModelDispatcherMap = {
   'minecraft:copper_golem_statue': SpecialItemModelCopperGolemStatue,
   'end_cube': SpecialItemModelEndCube,
   'minecraft:end_cube': SpecialItemModelEndCube,
-  'hanging_sign': SpecialItemModelHangingSign,
-  'minecraft:hanging_sign': SpecialItemModelHangingSign,
   'head': SpecialItemModelHead,
   'minecraft:head': SpecialItemModelHead,
   'shulker_box': SpecialItemModelShulkerBox,
   'minecraft:shulker_box': SpecialItemModelShulkerBox,
-  'standing_sign': SpecialItemModelStandingSign,
-  'minecraft:standing_sign': SpecialItemModelStandingSign,
 }
 type SpecialItemModelKeys = keyof SpecialItemModelDispatcherMap
 type SpecialItemModelFallback = (
   | SpecialItemModelBanner
-  | SpecialItemModelBed
   | SpecialItemModelBook
   | SpecialItemModelChest
   | SpecialItemModelCopperGolemStatue
   | SpecialItemModelEndCube
-  | SpecialItemModelHangingSign
   | SpecialItemModelHead
   | SpecialItemModelShulkerBox
-  | SpecialItemModelStandingSign
   | SpecialItemModelFallbackType)
 export type SpecialItemModelFallbackType = Record<string, never>
 type SpecialItemModelBanner = Banner
-type SpecialItemModelBed = Bed
 type SpecialItemModelBook = Book
 type SpecialItemModelChest = Chest
 type SpecialItemModelCopperGolemStatue = CopperGolemStatue
 type SpecialItemModelEndCube = EndCube
-type SpecialItemModelHangingSign = HangingSign
 type SpecialItemModelHead = Head
 type SpecialItemModelShulkerBox = ShulkerBox
-type SpecialItemModelStandingSign = StandingSign
 export type SymbolSpecialItemModel<CASE extends
   | 'map'
   | 'keys'

package/src/arguments/generated/assets/model.ts

@@ -215,6 +215,17 @@ export type ModelElement = {
   }),
   rotation?: ModelElementRotation,
   shade?: boolean,
+  /**
+   * Value:
+   *
+   *  - Down(`down`)
+   *  - Up(`up`)
+   *  - North(`north`)
+   *  - East(`east`)
+   *  - South(`south`)
+   *  - West(`west`)
+   */
+  shade_direction_override?: Direction,
   /**
    * Value:
    * Range: 0..15

package/src/arguments/generated/assets/texture_meta.ts

@@ -327,6 +327,12 @@ export type TextureMeta = {
       rightExclusive: false,
     }>,
   },
+  /**
+   * Required for armor trim textures.
+   */
+  palette?: {
+    base_palette: PaletteRef,
+  },
 }
 
 export type TileScaling = {

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

@@ -25,6 +25,7 @@ import type { BoatType } from 'sandstone/arguments/generated/world/entity/boat.t
 import type { ENTITY_SLOTS } from 'sandstone/arguments'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type {
+  DamageTypeClass,
   EnchantmentClass,
   LabelClass,
   LiteralUnion,
@@ -141,7 +142,13 @@ export type DamageSourcePredicate = {
 }
 
 export type DamageTagPredicate = {
-  id: (Registry['minecraft:tag/damage_type']),
+  id: ((
+      | Registry['minecraft:tag/damage_type']) | (
+        | Registry['minecraft:damage_type']
+        | `#${Registry['minecraft:tag/damage_type']}`
+        | TagClass<'damage_type'>
+        | DamageTypeClass)
+      | Array<(Registry['minecraft:damage_type'] | DamageTypeClass)>),
   /**
    * Whether the damage is expected to have or not have the tag.
    */
@@ -186,7 +193,7 @@ export type EntityFlagsPredicate = {
   is_fall_flying?: boolean,
 }
 
-export type EntityPredicate = (OldEntityPredicate | EntitySubPredicateMap)
+export type EntityPredicate = EntitySubPredicateMap
 
 export type EntitySlotsPredicate = ({
   [Key in Extract<LiteralUnion<ENTITY_SLOTS>, string>]?: ItemPredicate
@@ -636,12 +643,8 @@ type EntitySubPredicateDispatcherMap = {
   'minecraft:entity_type': EntitySubPredicateEntityType,
   'equipment': EntitySubPredicateEquipment,
   'minecraft:equipment': EntitySubPredicateEquipment,
-  'fishing_hook': EntitySubPredicateFishingHook,
-  'minecraft:fishing_hook': EntitySubPredicateFishingHook,
   'flags': EntitySubPredicateFlags,
   'minecraft:flags': EntitySubPredicateFlags,
-  'lightning': EntitySubPredicateLightning,
-  'minecraft:lightning': EntitySubPredicateLightning,
   'location': EntitySubPredicateLocation,
   'minecraft:location': EntitySubPredicateLocation,
   'movement': EntitySubPredicateMovement,
@@ -654,16 +657,8 @@ type EntitySubPredicateDispatcherMap = {
   'minecraft:passenger': EntitySubPredicatePassenger,
   'periodic_tick': EntitySubPredicatePeriodicTick,
   'minecraft:periodic_tick': EntitySubPredicatePeriodicTick,
-  'player': EntitySubPredicatePlayer,
-  'minecraft:player': EntitySubPredicatePlayer,
   'predicates': EntitySubPredicatePredicates,
   'minecraft:predicates': EntitySubPredicatePredicates,
-  'raider': EntitySubPredicateRaider,
-  'minecraft:raider': EntitySubPredicateRaider,
-  'sheep': EntitySubPredicateSheep,
-  'minecraft:sheep': EntitySubPredicateSheep,
-  'slime': EntitySubPredicateSlime,
-  'minecraft:slime': EntitySubPredicateSlime,
   'slots': EntitySubPredicateSlots,
   'minecraft:slots': EntitySubPredicateSlots,
   'stepping_on': EntitySubPredicateSteppingOn,
@@ -695,20 +690,14 @@ type EntitySubPredicateFallback = (
   | EntitySubPredicateEntityTags
   | EntitySubPredicateEntityType
   | EntitySubPredicateEquipment
-  | EntitySubPredicateFishingHook
   | EntitySubPredicateFlags
-  | EntitySubPredicateLightning
   | EntitySubPredicateLocation
   | EntitySubPredicateMovement
   | EntitySubPredicateMovementAffectedBy
   | EntitySubPredicateNbt
   | EntitySubPredicatePassenger
   | EntitySubPredicatePeriodicTick
-  | EntitySubPredicatePlayer
   | EntitySubPredicatePredicates
-  | EntitySubPredicateRaider
-  | EntitySubPredicateSheep
-  | EntitySubPredicateSlime
   | EntitySubPredicateSlots
   | EntitySubPredicateSteppingOn
   | EntitySubPredicateTargetedEntity
@@ -726,9 +715,7 @@ type EntitySubPredicateEffects = EntityEffectsPredicate
 type EntitySubPredicateEntityTags = EntityTagPredicate
 type EntitySubPredicateEntityType = EntityTypePredicate
 type EntitySubPredicateEquipment = EntityEquipmentPredicate
-type EntitySubPredicateFishingHook = FishingHookPredicate
 type EntitySubPredicateFlags = EntityFlagsPredicate
-type EntitySubPredicateLightning = LightningBoltPredicate
 type EntitySubPredicateLocation = LocationPredicate
 type EntitySubPredicateMovement = MovementPredicate
 type EntitySubPredicateMovementAffectedBy = LocationPredicate
@@ -737,11 +724,7 @@ type EntitySubPredicatePassenger = EntityPredicate
 type EntitySubPredicatePeriodicTick = NBTInt<{
   min: 1,
 }>
-type EntitySubPredicatePlayer = PlayerPredicate
 type EntitySubPredicatePredicates = DataComponentPredicate
-type EntitySubPredicateRaider = RaiderPredicate
-type EntitySubPredicateSheep = SheepPredicate
-type EntitySubPredicateSlime = SlimePredicate
 type EntitySubPredicateSlots = EntitySlotsPredicate
 type EntitySubPredicateSteppingOn = LocationPredicate
 type EntitySubPredicateTargetedEntity = EntityPredicate

package/src/arguments/generated/data/advancement/trigger.ts

@@ -8,13 +8,18 @@ import type {
   LocationPredicate,
 } from 'sandstone/arguments/generated/data/advancement/predicate.ts'
 import type { LootCondition } from 'sandstone/arguments/generated/data/loot/condition.ts'
+import type { LootTableListRef } from 'sandstone/arguments/generated/data/loot.ts'
+import type { PredicateRef } from 'sandstone/arguments/generated/data/predicate.ts'
+import type { RecipeListRef } from 'sandstone/arguments/generated/data/recipe.ts'
 import type { MinMaxBounds } from 'sandstone/arguments/generated/data/util.ts'
 import type { SymbolMcdocBlockStates } from 'sandstone/arguments/generated/dispatcher.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { BlockListRef } from 'sandstone/arguments/generated/util/registry_ref.ts'
+import type { PotionsPredicate } from 'sandstone/arguments/generated/world/component/predicate.ts'
 import type { NBTObject } from 'sandstone/arguments/nbt.ts'
 import type { LootTableClass, NBTFloat, NBTInt, NBTList, RecipeClass } from 'sandstone'
 
-export type AdvancementPredicateRef = Array<LootCondition>
+export type AdvancementPredicateRef = (Array<LootCondition> | PredicateRef)
 
 export type AllayDropItemOnBlock = (TriggerBase & {
   location?: AdvancementPredicateRef,
@@ -24,17 +29,23 @@ export type AnyBlockUse = (TriggerBase & {
   location?: AdvancementPredicateRef,
 })
 
-export type BeeNestDestroyed = (TriggerBase & {
-  block?: Registry['minecraft:block'],
-  /**
-   * Number of bees that were inside the bee nest/beehive before it was broken.
-   */
-  num_bees_inside?: NBTInt,
-  /**
-   * Item used to break the block.
-   */
-  item?: ItemPredicate,
-})
+export type BeeNestDestroyed = NonNullable<({
+  [S in Extract<Extract<BlockListRef, string>, string>]?: (TriggerBase & {
+    block?: Registry['minecraft:block'],
+    blocks?: S,
+    state?: (S extends undefined
+      ? SymbolMcdocBlockStates<'%none'> :
+      (S extends keyof SymbolMcdocBlockStates ? SymbolMcdocBlockStates[S] : SymbolMcdocBlockStates<'%unknown'>)),
+    /**
+     * Number of bees that were inside the bee nest/beehive before it was broken.
+     */
+    num_bees_inside?: NBTInt,
+    /**
+     * Item used to break the block.
+     */
+    item?: ItemPredicate,
+  })
+}[Extract<BlockListRef, string>])>
 
 export type BredAnimals = (TriggerBase & {
   parent?: CompositeEntity,
@@ -43,7 +54,7 @@ export type BredAnimals = (TriggerBase & {
 })
 
 export type BrewedPotion = (TriggerBase & {
-  potion?: Registry['minecraft:potion'],
+  potion?: (Registry['minecraft:potion'] | PotionsPredicate),
 })
 
 export type ChangedDimension = (TriggerBase & {
@@ -97,6 +108,7 @@ export type EnchantedItem = (TriggerBase & {
 export type EnterBlock = NonNullable<({
   [S in Extract<Extract<Registry['minecraft:block'], string>, string>]?: (TriggerBase & {
     block?: S,
+    blocks?: BlockListRef,
     state?: (S extends undefined
       ? SymbolMcdocBlockStates<'%none'> :
       (S extends keyof SymbolMcdocBlockStates ? SymbolMcdocBlockStates[S] : SymbolMcdocBlockStates<'%unknown'>)),
@@ -254,6 +266,7 @@ export type PlacedBlock = (TriggerBase & {
 
 export type PlayerGeneratesContainerLoot = (TriggerBase & {
   loot_table: (Registry['minecraft:loot_table'] | LootTableClass),
+  loot_tables: LootTableListRef,
 })
 
 export type PlayerHurtEntity = (TriggerBase & {
@@ -275,6 +288,7 @@ export type PlayerTrigger = TriggerBase
 
 export type RecipeCrafted = (TriggerBase & {
   recipe_id: (Registry['minecraft:recipe'] | RecipeClass),
+  recipes: RecipeListRef,
   /**
    * Value:
    * List length range: 1..9
@@ -289,6 +303,7 @@ export type RecipeCrafted = (TriggerBase & {
 
 export type RecipeUnlocked = (TriggerBase & {
   recipe: (Registry['minecraft:recipe'] | RecipeClass),
+  recipes: RecipeListRef,
 })
 
 export type RequiredConditions<C extends NBTObject> = {
@@ -317,6 +332,7 @@ export type ShotCrossbow = (TriggerBase & {
 
 export type SlideDownBlock = (TriggerBase & {
   block?: Registry['minecraft:block'],
+  blocks?: BlockListRef,
 })
 
 export type SpearMobs = (TriggerBase & {

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

@@ -1,3 +1,4 @@
+import type { LootTableListRef } from 'sandstone/arguments/generated/data/loot.ts'
 import type { SymbolTrigger } from 'sandstone/arguments/generated/dispatcher.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { Text } from 'sandstone/arguments/generated/util/text.ts'
@@ -121,7 +122,7 @@ export type AdvancementRewards = {
   /**
    * Loot tables to give.
    */
-  loot?: Array<(Registry['minecraft:loot_table'] | LootTableClass)>,
+  loot?: (Array<(Registry['minecraft:loot_table'] | LootTableClass)> | LootTableListRef),
   /**
    * Recipes to unlock.
    */

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

@@ -97,7 +97,7 @@ export type DialogListRef = (
   | Dialog
   | Array<Dialog> | (
   Registry['minecraft:dialog'] | `#${Registry['minecraft:tag/dialog']}` | TagClass<'dialog'> | DialogClass)
-  | Array<(Registry['minecraft:dialog'] | DialogClass)>)
+  | Array<((Registry['minecraft:dialog'] | DialogClass) | Dialog)>)
 
 export type ListDialogBase = (DialogBase & {
   /**

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

@@ -1,3 +1,9 @@
 import type { LootFunction } from 'sandstone/arguments/generated/data/loot/function.ts'
+import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { ItemModifierClass, TagClass } from 'sandstone'
 
-export type ItemModifier = (LootFunction | Array<LootFunction>)
+export type ItemModifier = (
+  | LootFunction
+  | Array<LootFunction>
+  | Array<ItemModifier> | (
+  `${string}:${string}` | `#${string}:${string}` | TagClass<'item_modifier'> | ItemModifierClass))

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

@@ -1,4 +1,5 @@
 import type {
+  BlockPredicate,
   DamageSourcePredicate,
   EntityPredicate,
   ItemPredicate,
@@ -118,7 +119,10 @@ export type LocationCheck = {
 export type LootCondition = NonNullable<({
   [S in Extract<Extract<Registry['minecraft:loot_condition_type'], string>, string>]?: ({
     condition: S,
-  } & (S extends keyof SymbolLootCondition ? SymbolLootCondition[S] : RootNBT))
+    type: S,
+  } & (S extends keyof SymbolLootCondition
+    ? SymbolLootCondition[S]
+    : RootNBT) & (S extends keyof SymbolLootCondition ? SymbolLootCondition[S] : RootNBT))
 }[Extract<Registry['minecraft:loot_condition_type'], string>])>
 
 export type MatchTool = {
@@ -168,7 +172,7 @@ export type Reference = {
   /**
    * A cyclic reference causes a parsing failure.
    */
-  name: (`${string}:${string}` | PredicateClass),
+  name: (Registry['minecraft:predicate'] | PredicateClass),
 }
 
 export type TableBonus = {
@@ -238,6 +242,8 @@ type LootConditionDispatcherMap = {
   'minecraft:killed_by_player': LootConditionKilledByPlayer,
   'location_check': LootConditionLocationCheck,
   'minecraft:location_check': LootConditionLocationCheck,
+  'match_block': LootConditionMatchBlock,
+  'minecraft:match_block': LootConditionMatchBlock,
   'match_tool': LootConditionMatchTool,
   'minecraft:match_tool': LootConditionMatchTool,
   'random_chance': LootConditionRandomChance,
@@ -268,6 +274,7 @@ type LootConditionFallback = (
   | LootConditionInverted
   | LootConditionKilledByPlayer
   | LootConditionLocationCheck
+  | LootConditionMatchBlock
   | LootConditionMatchTool
   | LootConditionRandomChance
   | LootConditionRandomChanceWithEnchantedBonus
@@ -287,6 +294,7 @@ type LootConditionEnvironmentAttributeCheck = EnvironmentAttributeCheck
 type LootConditionInverted = Inverted
 type LootConditionKilledByPlayer = KilledByPlayer
 type LootConditionLocationCheck = LocationCheck
+type LootConditionMatchBlock = BlockPredicate
 type LootConditionMatchTool = MatchTool
 type LootConditionRandomChance = RandomChance
 type LootConditionRandomChanceWithEnchantedBonus = RandomChanceWithEnchantedBonus

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

@@ -8,6 +8,7 @@ import type {
 } from 'sandstone/arguments/generated/data/loot.ts'
 import type { LootCondition } from 'sandstone/arguments/generated/data/loot/condition.ts'
 import type { NumberProviderRef } from 'sandstone/arguments/generated/data/number_provider.ts'
+import type { PredicateRef } from 'sandstone/arguments/generated/data/predicate.ts'
 import type { IntRange, NbtProvider } from 'sandstone/arguments/generated/data/util.ts'
 import type { SymbolDataComponent, SymbolMcdocBlockStateKeys } from 'sandstone/arguments/generated/dispatcher.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
@@ -175,6 +176,7 @@ export type BinomialWithBonusCountFormula = {
 
 export type Conditions = {
   conditions?: Array<LootCondition>,
+  condition?: PredicateRef,
 }
 
 export type ContainerComponents = ('container' | 'bundle_contents' | 'charged_projectiles')
@@ -354,6 +356,15 @@ export type ExplorationMap = ({
    * Generated structure to locate. Accepts any of the structure types used by the `/locate` command. Defaults to buried treasure.
    */
   destination?: (Registry['minecraft:tag/worldgen/structure']),
+} & {
+  /**
+   * Generated structure to locate. Accepts any of the structure types used by the `/locate` command.
+   */
+  destination: ((
+        | Registry['minecraft:worldgen/structure']
+        | `#${Registry['minecraft:tag/worldgen/structure']}`
+        | TagClass<'worldgen/structure'>)
+      | Array<Registry['minecraft:worldgen/structure']>),
 } & {
   /**
    * The icon used to mark the destination on the map. Accepts any of the map icon text IDs (case insensitive).
@@ -475,7 +486,10 @@ export type ListOperationMode = ('append' | 'insert' | 'replace_all' | 'replace_
 export type LootFunction = NonNullable<({
   [S in Extract<Extract<Registry['minecraft:loot_function_type'], string>, string>]?: ({
     function: S,
-  } & (S extends keyof SymbolLootFunction ? SymbolLootFunction[S] : RootNBT))
+    type: S,
+  } & (S extends keyof SymbolLootFunction
+    ? SymbolLootFunction[S]
+    : RootNBT) & (S extends keyof SymbolLootFunction ? SymbolLootFunction[S] : RootNBT))
 }[Extract<Registry['minecraft:loot_function_type'], string>])>
 
 export type LootingEnchant = (EnchantedCountBase & Conditions)
@@ -554,12 +568,12 @@ export type ReplaceSectionListOperation = {
   }>,
 }
 
-export type Sequence = {
+export type Sequence = ({
   /**
    * List of functions to apply to this item.
    */
-  functions: Array<LootFunction>,
-}
+  functions: (Array<LootFunction> | ItemModifier),
+} & Conditions)
 
 export type SetAttributes = ({
   /**
@@ -748,6 +762,10 @@ export type SetLootTable = ({
    * The loot table to set to the container block item.
    */
   name: (Registry['minecraft:loot_table'] | LootTableClass),
+  /**
+   * The loot table to set to the container block item.
+   */
+  tag: (Registry['minecraft:loot_table'] | LootTableClass),
   /**
    * The container seed to use. Defaults to a random seed.
    */

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

@@ -1,10 +1,13 @@
+import type { ItemModifier } from 'sandstone/arguments/generated/data/item_modifier.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 { PredicateRef } from 'sandstone/arguments/generated/data/predicate.ts'
 import type { SlotSource } from 'sandstone/arguments/generated/data/slot_source.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { ItemListRef } from 'sandstone/arguments/generated/util/registry_ref.ts'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
-import type { LootTableClass, NBTInt, NBTList } from 'sandstone'
+import type { LootTableClass, NBTInt, NBTList, TagClass } from 'sandstone'
 
 export type BlockEntityTarget = 'block_entity'
 
@@ -136,6 +139,9 @@ export type LootPool = ({
 } & {
   functions?: Array<LootFunction>,
   conditions?: Array<LootCondition>,
+} & {
+  modifier?: ItemModifier,
+  condition?: PredicateRef,
 })
 
 export type LootPoolEntry = NonNullable<({
@@ -144,9 +150,12 @@ export type LootPoolEntry = NonNullable<({
   } & (S extends keyof SymbolLootPoolEntry ? SymbolLootPoolEntry[S] : RootNBT))
 }[Extract<Registry['minecraft:loot_pool_entry_type'], string>])>
 
-export type LootPoolEntryBase = {
+export type LootPoolEntryBase = ({
   conditions?: Array<LootCondition>,
-}
+} & {
+  modifier?: ItemModifier,
+  condition?: PredicateRef,
+})
 
 export type LootTable = {
   /**
@@ -184,6 +193,7 @@ export type LootTable = {
   type?: (LootContextParamSets | `minecraft:${LootContextParamSets}`),
   pools?: Array<LootPool>,
   functions?: Array<LootFunction>,
+  modifier?: ItemModifier,
   /**
    * Value:
    *
@@ -192,13 +202,23 @@ export type LootTable = {
   random_sequence?: `${string}:${string}`,
 }
 
-export type LootTableListRef = Array<LootTable>
+export type LootTableListRef = (
+  | Array<LootTable>
+  | LootTable | (
+  Registry['minecraft:loot_table'] | `#${string}:${string}` | TagClass<'loot_table'> | LootTableClass)
+  | Array<((Registry['minecraft:loot_table'] | LootTableClass) | LootTable)>)
 
 export type LootTablePoolEntry = ({
-  value: ((Registry['minecraft:loot_table'] | LootTableClass) | LootTable),
+  value: ((Registry['minecraft:loot_table'] | LootTableClass) | LootTable | LootTableListRef),
+  /**
+   * If `true`, randomly selects a loot table to drop. \
+   * If `false`, drops all loot tables. \
+   * Defaults to `false`.
+   */
+  expand?: boolean,
 } & SingletonPoolEntry)
 
-export type LootTableRef = LootTable
+export type LootTableRef = (LootTable | (Registry['minecraft:loot_table'] | LootTableClass))
 
 export type SingletonPoolEntry = ({
   /**
@@ -218,12 +238,20 @@ export type SlotsPoolEntry = ({
 
 export type TagPoolEntry = ({
   name: (Registry['minecraft:tag/item']),
+  items: ItemListRef,
 } & {
   /**
    * If `true`, drops a random item from the tag. \
    * If `false`, drops all items in the tag.
    */
   expand: boolean,
+} & {
+  /**
+   * If `true`, randomly selects an item to drop. \
+   * If `false`, drops all items. \
+   * Defaults to `false`.
+   */
+  expand?: boolean,
 } & SingletonPoolEntry)
 type LootPoolEntryDispatcherMap = {
   'alternatives': LootPoolEntryAlternatives,

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

@@ -5,7 +5,7 @@ import type { NumericalEnvironmentAttribute } from 'sandstone/arguments/generate
 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'
+import type { DataPointClass, NBTFloat, ObjectiveClass, TagClass } from 'sandstone'
 
 export type BinomialNumberProvider = {
   n: NumberProviderRef,
@@ -75,11 +75,21 @@ export type NumberProvider = (NBTFloat | ({
   } & (S extends undefined
     ? SymbolNumberProvider<'%none'> :
     (S extends keyof SymbolNumberProvider ? SymbolNumberProvider[S] : RootNBT)))
+}[Extract<Registry['minecraft:loot_number_provider_type'], string>]) | ({
+  [S in Extract<Extract<Registry['minecraft:loot_number_provider_type'], string>, string>]?: ({
+    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 NumberProviderListRef = (
+  | Array<NumberProvider>
+  | NumberProvider | (
+  Registry['minecraft:number_provider'] | `#${string}:${string}` | TagClass<'number_provider'>)
+  | Array<(Registry['minecraft:number_provider'] | NumberProvider)>)
 
-export type NumberProviderRef = NumberProvider
+export type NumberProviderRef = (NumberProvider | Registry['minecraft:number_provider'])
 
 export type ScoreNumberProvider = {
   target: ScoreProvider,
@@ -107,12 +117,16 @@ export type WeightedNumberProvider = {
 type NumberProviderDispatcherMap = {
   'binomial': NumberProviderBinomial,
   'minecraft:binomial': NumberProviderBinomial,
+  'conditional_value': NumberProviderConditionalValue,
+  'minecraft:conditional_value': NumberProviderConditionalValue,
   'constant': NumberProviderConstant,
   'minecraft:constant': NumberProviderConstant,
   'enchantment_level': NumberProviderEnchantmentLevel,
   'minecraft:enchantment_level': NumberProviderEnchantmentLevel,
   'environment_attribute': NumberProviderEnvironmentAttribute,
   'minecraft:environment_attribute': NumberProviderEnvironmentAttribute,
+  'number_dispatcher': NumberProviderNumberDispatcher,
+  'minecraft:number_dispatcher': NumberProviderNumberDispatcher,
   'score': NumberProviderScore,
   'minecraft:score': NumberProviderScore,
   'storage': NumberProviderStorage,
@@ -121,26 +135,34 @@ type NumberProviderDispatcherMap = {
   'minecraft:sum': NumberProviderSum,
   'uniform': NumberProviderUniform,
   'minecraft:uniform': NumberProviderUniform,
+  'weighted_list': NumberProviderWeightedList,
+  'minecraft:weighted_list': NumberProviderWeightedList,
 }
 type NumberProviderKeys = keyof NumberProviderDispatcherMap
 type NumberProviderFallback = (
   | NumberProviderBinomial
+  | NumberProviderConditionalValue
   | NumberProviderConstant
   | NumberProviderEnchantmentLevel
   | NumberProviderEnvironmentAttribute
+  | NumberProviderNumberDispatcher
   | NumberProviderScore
   | NumberProviderStorage
   | NumberProviderSum
-  | NumberProviderUniform)
+  | NumberProviderUniform
+  | NumberProviderWeightedList)
 type NumberProviderNoneType = UniformNumberProvider
 type NumberProviderBinomial = BinomialNumberProvider
+type NumberProviderConditionalValue = ConditionalValueNumberProvider
 type NumberProviderConstant = ConstantNumberProvider
 type NumberProviderEnchantmentLevel = EnchantmentLevelProvider
 type NumberProviderEnvironmentAttribute = EnvironmentAttributeNumberProvider
+type NumberProviderNumberDispatcher = NumberDispatcher
 type NumberProviderScore = ScoreNumberProvider
 type NumberProviderStorage = StorageNumberProvider
 type NumberProviderSum = SumNumberProvider
 type NumberProviderUniform = UniformNumberProvider
+type NumberProviderWeightedList = WeightedNumberProvider
 export type SymbolNumberProvider<CASE extends
   | 'map'
   | 'keys'