sandstone 1.0.0 → 1.0.2

package/src/arguments/generated/world/component/predicate.ts

@@ -1,4 +1,8 @@
-import type { EnchantmentPredicate, ItemPredicate } from 'sandstone/arguments/generated/data/advancement/predicate.ts'
+import type {
+  EnchantmentPredicate,
+  EntityEffectsPredicate,
+  ItemPredicate,
+} from 'sandstone/arguments/generated/data/advancement/predicate.ts'
 import type { MinMaxBounds } from 'sandstone/arguments/generated/data/util.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { AttributeOperation } from 'sandstone/arguments/generated/util/attribute.ts'
@@ -109,6 +113,15 @@ export type JukeboxPlayablePredicate = {
       | Array<(Registry['minecraft:jukebox_song'] | JukeboxSongClass)>),
 }
 
+export type PotionsPredicate = {
+  potions?: PotionTypeMatch,
+  effects?: CollectionPredicate<EntityEffectsPredicate>,
+}
+
+export type PotionTypeMatch = ((
+  | Registry['minecraft:potion'] | `#${Registry['minecraft:tag/potion']}` | TagClass<'potion'>)
+  | Array<Registry['minecraft:potion']>)
+
 export type TrimPredicate = {
   material?: ((
       | Registry['minecraft:trim_material'] | `#${string}:${string}` | TagClass<'trim_material'> | TrimMaterialClass)
@@ -160,6 +173,8 @@ type DataComponentPredicateDispatcherMap = {
   'minecraft:stored_enchantments': DataComponentPredicateStoredEnchantments,
   'trim': DataComponentPredicateTrim,
   'minecraft:trim': DataComponentPredicateTrim,
+  'villager/variant': DataComponentPredicateVillagerVariant,
+  'minecraft:villager/variant': DataComponentPredicateVillagerVariant,
   'writable_book_content': DataComponentPredicateWritableBookContent,
   'minecraft:writable_book_content': DataComponentPredicateWritableBookContent,
   'written_book_content': DataComponentPredicateWrittenBookContent,
@@ -179,6 +194,7 @@ type DataComponentPredicateFallback = (
   | DataComponentPredicatePotionContents
   | DataComponentPredicateStoredEnchantments
   | DataComponentPredicateTrim
+  | DataComponentPredicateVillagerVariant
   | DataComponentPredicateWritableBookContent
   | DataComponentPredicateWrittenBookContent
   | DataComponentPredicateFallbackType)
@@ -192,11 +208,12 @@ type DataComponentPredicateEnchantments = Array<EnchantmentPredicate>
 type DataComponentPredicateFireworkExplosion = FireworkExplosionPredicate
 type DataComponentPredicateFireworks = FireworksPredicate
 type DataComponentPredicateJukeboxPlayable = JukeboxPlayablePredicate
-type DataComponentPredicatePotionContents = ((
-  | Registry['minecraft:potion'] | `#${Registry['minecraft:tag/potion']}` | TagClass<'potion'>)
-  | Array<Registry['minecraft:potion']>)
+type DataComponentPredicatePotionContents = PotionTypeMatch
 type DataComponentPredicateStoredEnchantments = Array<EnchantmentPredicate>
 type DataComponentPredicateTrim = TrimPredicate
+type DataComponentPredicateVillagerVariant = ((
+  | Registry['minecraft:villager_type'] | `#${string}:${string}` | TagClass<'villager_type'>)
+  | Array<Registry['minecraft:villager_type']>)
 type DataComponentPredicateWritableBookContent = WritableBookPredicate
 type DataComponentPredicateWrittenBookContent = WrittenBookPredicate
 export type SymbolDataComponentPredicate<CASE extends

package/src/arguments/generated/world/component.ts

@@ -1,5 +1,6 @@
 import type {
   SymbolDataComponent,
+  SymbolDataComponentExistencePredicate,
   SymbolDataComponentPredicate,
   SymbolMcdocCustomData,
 } from 'sandstone/arguments/generated/dispatcher.ts'
@@ -16,7 +17,7 @@ export type CustomDataMap = ({
 })
 
 export type DataComponentExactPredicate = ({
-  [Key in Extract<Registry['minecraft:data_component_type'], string>]?: (Key extends keyof SymbolDataComponent
+  [Key in Extract<PersistentDataComponent, string>]?: (Key extends keyof SymbolDataComponent
     ? SymbolDataComponent[Key]
     : RootNBT)
 })
@@ -28,3 +29,5 @@ export type DataComponentPatch = (({
 }))
 
 export type DataComponentPredicate = Record<string, never>
+
+export type PersistentDataComponent = Registry['minecraft:data_component_type']

package/src/arguments/generated/world/entity/boat.ts

@@ -64,6 +64,7 @@ import type { Endermite } from 'sandstone/arguments/generated/world/entity/mob/e
 import type { Fish, Pufferfish, Salmon, TropicalFish } from 'sandstone/arguments/generated/world/entity/mob/fish.ts'
 import type { Ghast } from 'sandstone/arguments/generated/world/entity/mob/ghast.ts'
 import type { GlowSquid } from 'sandstone/arguments/generated/world/entity/mob/glow_squid.ts'
+import type { HappyGhast } from 'sandstone/arguments/generated/world/entity/mob/happy_ghast.ts'
 import type { IronGolem } from 'sandstone/arguments/generated/world/entity/mob/iron_golem.ts'
 import type { Mannequin } from 'sandstone/arguments/generated/world/entity/mob/mannequin.ts'
 import type { MobBase, Squid } from 'sandstone/arguments/generated/world/entity/mob.ts'
@@ -79,7 +80,7 @@ import type {
 } from 'sandstone/arguments/generated/world/entity/mob/raider.ts'
 import type { Shulker } from 'sandstone/arguments/generated/world/entity/mob/shulker.ts'
 import type { Skeleton } from 'sandstone/arguments/generated/world/entity/mob/skeleton.ts'
-import type { Slime } from 'sandstone/arguments/generated/world/entity/mob/slime.ts'
+import type { Slime, SulfurCube } from 'sandstone/arguments/generated/world/entity/mob/slime.ts'
 import type { SnowGolem } from 'sandstone/arguments/generated/world/entity/mob/snow_golem.ts'
 import type { Tadpole } from 'sandstone/arguments/generated/world/entity/mob/tadpole.ts'
 import type { Vex } from 'sandstone/arguments/generated/world/entity/mob/vex.ts'
@@ -176,8 +177,6 @@ type EntityDispatcherMap = {
   'minecraft:blaze': EntityBlaze,
   'block_display': EntityBlockDisplay,
   'minecraft:block_display': EntityBlockDisplay,
-  'boat': EntityBoat,
-  'minecraft:boat': EntityBoat,
   'bogged': EntityBogged,
   'minecraft:bogged': EntityBogged,
   'breeze': EntityBreeze,
@@ -196,8 +195,6 @@ type EntityDispatcherMap = {
   'minecraft:cherry_boat': EntityCherryBoat,
   'cherry_chest_boat': EntityCherryChestBoat,
   'minecraft:cherry_chest_boat': EntityCherryChestBoat,
-  'chest_boat': EntityChestBoat,
-  'minecraft:chest_boat': EntityChestBoat,
   'chest_minecart': EntityChestMinecart,
   'minecraft:chest_minecart': EntityChestMinecart,
   'chicken': EntityChicken,
@@ -212,8 +209,6 @@ type EntityDispatcherMap = {
   'minecraft:cow': EntityCow,
   'creaking': EntityCreaking,
   'minecraft:creaking': EntityCreaking,
-  'creaking_transient': EntityCreakingTransient,
-  'minecraft:creaking_transient': EntityCreakingTransient,
   'creeper': EntityCreeper,
   'minecraft:creeper': EntityCreeper,
   'dark_oak_boat': EntityDarkOakBoat,
@@ -276,6 +271,8 @@ type EntityDispatcherMap = {
   'minecraft:goat': EntityGoat,
   'guardian': EntityGuardian,
   'minecraft:guardian': EntityGuardian,
+  'happy_ghast': EntityHappyGhast,
+  'minecraft:happy_ghast': EntityHappyGhast,
   'hoglin': EntityHoglin,
   'minecraft:hoglin': EntityHoglin,
   'hopper_minecart': EntityHopperMinecart,
@@ -410,6 +407,8 @@ type EntityDispatcherMap = {
   'minecraft:stray': EntityStray,
   'strider': EntityStrider,
   'minecraft:strider': EntityStrider,
+  'sulfur_cube': EntitySulfurCube,
+  'minecraft:sulfur_cube': EntitySulfurCube,
   'tadpole': EntityTadpole,
   'minecraft:tadpole': EntityTadpole,
   'text_display': EntityTextDisplay,
@@ -454,8 +453,6 @@ type EntityDispatcherMap = {
   'minecraft:zombie_horse': EntityZombieHorse,
   'zombie_nautilus': EntityZombieNautilus,
   'minecraft:zombie_nautilus': EntityZombieNautilus,
-  'zombie_pigman': EntityZombiePigman,
-  'minecraft:zombie_pigman': EntityZombiePigman,
   'zombie_villager': EntityZombieVillager,
   'minecraft:zombie_villager': EntityZombieVillager,
   'zombified_piglin': EntityZombifiedPiglin,
@@ -479,7 +476,6 @@ type EntityFallback = (
   | EntityBirchChestBoat
   | EntityBlaze
   | EntityBlockDisplay
-  | EntityBoat
   | EntityBogged
   | EntityBreeze
   | EntityBreezeWindCharge
@@ -489,7 +485,6 @@ type EntityFallback = (
   | EntityCaveSpider
   | EntityCherryBoat
   | EntityCherryChestBoat
-  | EntityChestBoat
   | EntityChestMinecart
   | EntityChicken
   | EntityCod
@@ -497,7 +492,6 @@ type EntityFallback = (
   | EntityCopperGolem
   | EntityCow
   | EntityCreaking
-  | EntityCreakingTransient
   | EntityCreeper
   | EntityDarkOakBoat
   | EntityDarkOakChestBoat
@@ -529,6 +523,7 @@ type EntityFallback = (
   | EntityGlowSquid
   | EntityGoat
   | EntityGuardian
+  | EntityHappyGhast
   | EntityHoglin
   | EntityHopperMinecart
   | EntityHorse
@@ -596,6 +591,7 @@ type EntityFallback = (
   | EntitySquid
   | EntityStray
   | EntityStrider
+  | EntitySulfurCube
   | EntityTadpole
   | EntityTextDisplay
   | EntityTnt
@@ -618,7 +614,6 @@ type EntityFallback = (
   | EntityZombie
   | EntityZombieHorse
   | EntityZombieNautilus
-  | EntityZombiePigman
   | EntityZombieVillager
   | EntityZombifiedPiglin)
 type EntityAcaciaBoat = Boat
@@ -637,7 +632,6 @@ type EntityBirchBoat = Boat
 type EntityBirchChestBoat = ChestBoat
 type EntityBlaze = MobBase
 type EntityBlockDisplay = BlockDisplay
-type EntityBoat = Boat
 type EntityBogged = Bogged
 type EntityBreeze = MobBase
 type EntityBreezeWindCharge = AcceleratingProjectileBase
@@ -647,7 +641,6 @@ type EntityCat = Cat
 type EntityCaveSpider = MobBase
 type EntityCherryBoat = Boat
 type EntityCherryChestBoat = ChestBoat
-type EntityChestBoat = ChestBoat
 type EntityChestMinecart = ChestMinecart
 type EntityChicken = Chicken
 type EntityCod = Fish
@@ -655,7 +648,6 @@ type EntityCommandBlockMinecart = CommandBlockMinecart
 type EntityCopperGolem = CopperGolem
 type EntityCow = Cow
 type EntityCreaking = Creaking
-type EntityCreakingTransient = Creaking
 type EntityCreeper = Creeper
 type EntityDarkOakBoat = Boat
 type EntityDarkOakChestBoat = ChestBoat
@@ -687,6 +679,7 @@ type EntityGlowItemFrame = ItemFrame
 type EntityGlowSquid = GlowSquid
 type EntityGoat = Goat
 type EntityGuardian = MobBase
+type EntityHappyGhast = HappyGhast
 type EntityHoglin = Hoglin
 type EntityHopperMinecart = HopperMinecart
 type EntityHorse = Horse
@@ -754,6 +747,7 @@ type EntitySpruceChestBoat = ChestBoat
 type EntitySquid = Squid
 type EntityStray = MobBase
 type EntityStrider = Saddled
+type EntitySulfurCube = SulfurCube
 type EntityTadpole = Tadpole
 type EntityTextDisplay = TextDisplay
 type EntityTnt = Tnt
@@ -776,7 +770,6 @@ type EntityZoglin = Zoglin
 type EntityZombie = Zombie
 type EntityZombieHorse = HorseBase
 type EntityZombieNautilus = Tamable
-type EntityZombiePigman = ZombiePigman
 type EntityZombieVillager = ZombieVillager
 type EntityZombifiedPiglin = ZombiePigman
 export type SymbolEntity<CASE extends

package/src/arguments/generated/world/entity/cushion.ts

@@ -0,0 +1,26 @@
+import type { DyeColor } from 'sandstone/arguments/generated/util/color.ts'
+import type { BlockAttachedEntity } from 'sandstone/arguments/generated/world/entity.ts'
+
+export type Cushion = (BlockAttachedEntity & {
+  /**
+   * Value:
+   *
+   *  - White(`white`)
+   *  - Orange(`orange`)
+   *  - Magenta(`magenta`)
+   *  - LightBlue(`light_blue`)
+   *  - Yellow(`yellow`)
+   *  - Lime(`lime`)
+   *  - Pink(`pink`)
+   *  - Gray(`gray`)
+   *  - LightGray(`light_gray`)
+   *  - Cyan(`cyan`)
+   *  - Purple(`purple`)
+   *  - Blue(`blue`)
+   *  - Brown(`brown`)
+   *  - Green(`green`)
+   *  - Red(`red`)
+   *  - Black(`black`)
+   */
+  color?: DyeColor,
+})

package/src/arguments/generated/world/entity/display.ts

@@ -58,6 +58,41 @@ export type Brightness = {
   }>,
 }
 
+export type DecomposedTransformation = {
+  /**
+   * Translation in [x, y, z].
+   *
+   * Value:
+   * List length range: 3
+   */
+  translation: NBTList<NBTFloat, {
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 3,
+    max: 3,
+  }>,
+  /**
+   * Using this rotation is enough for most transformations.
+   */
+  left_rotation: Rotation,
+  /**
+   * For more complex transformations. Applied **before** scaling.
+   */
+  right_rotation: Rotation,
+  /**
+   * Scale in [x, y, z].
+   *
+   * Value:
+   * List length range: 3
+   */
+  scale: NBTList<NBTFloat, {
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 3,
+    max: 3,
+  }>,
+}
+
 export type DisplayBase = (EntityBase & {
   /**
    * Transformation applied to model (after normal entity orientation). Defaults to identity. Interpolated.

package/src/arguments/generated/world/entity/mob/breedable/chicken.ts

@@ -13,5 +13,5 @@ export type Chicken = (Breedable & {
    */
   EggLayTime?: NBTInt,
   variant?: (Registry['minecraft:chicken_variant'] | VariantClass<'chicken'>),
-  sound_variant?: (`${string}:${string}` | VariantClass<'chicken_sound'>),
+  sound_variant?: (Registry['minecraft:chicken_sound_variant'] | VariantClass<'chicken_sound'>),
 })

package/src/arguments/generated/world/entity/mob/breedable/cow.ts

@@ -4,5 +4,5 @@ import type { VariantClass } from 'sandstone'
 
 export type Cow = (Breedable & {
   variant?: (Registry['minecraft:cow_variant'] | VariantClass<'cow'>),
-  sound_variant?: (`${string}:${string}` | VariantClass<'cow_sound'>),
+  sound_variant?: (Registry['minecraft:cow_sound_variant'] | VariantClass<'cow_sound'>),
 })

package/src/arguments/generated/world/entity/mob/breedable/saddled.ts

@@ -4,7 +4,7 @@ import type { VariantClass } from 'sandstone'
 
 export type Pig = (Saddled & {
   variant?: (Registry['minecraft:pig_variant'] | VariantClass<'pig'>),
-  sound_variant?: (`${string}:${string}` | VariantClass<'pig_sound'>),
+  sound_variant?: (Registry['minecraft:pig_sound_variant'] | VariantClass<'pig_sound'>),
 })
 
 export type Saddled = Breedable

package/src/arguments/generated/world/entity/mob/breedable/tamable.ts

@@ -29,7 +29,7 @@ export type Cat = (Tamable & {
    */
   CollarColor?: DyeColorByte,
   variant?: (Registry['minecraft:cat_variant'] | VariantClass<'cat'>),
-  sound_variant?: (`${string}:${string}` | VariantClass<'cat_sound'>),
+  sound_variant?: (Registry['minecraft:cat_sound_variant'] | VariantClass<'cat_sound'>),
 })
 
 export type CatType = (-1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10)

package/src/arguments/generated/world/entity/mob/breedable/villager.ts

@@ -14,7 +14,7 @@ export type Offers = {
 }
 
 export type PlayerReputationPart = NonNullable<({
-  [S in Extract<ReputationPart, string>]?: {
+  [S in Extract<Extract<ReputationPart, string>, string>]?: {
     /**
      * Value:
      *
@@ -64,7 +64,7 @@ export type PlayerReputationPart = NonNullable<({
       max: 4,
     }>,
   }
-}[ReputationPart])>
+}[Extract<ReputationPart, string>])>
 
 export type Recipe = {
   /**

package/src/arguments/generated/world/entity/mob/copper_golem.ts

@@ -3,9 +3,9 @@ import type { NBTLong } from 'sandstone'
 
 export type CopperGolem = (MobBase & {
   /**
-   * Gametime in ticks when the copper golem oxidizes
-   * -2 represents "waxed"
-   * -1 will be replaced with a random time between 504000 and 552000 ticks later
+   * Gametime in ticks when the copper golem oxidizes. \
+   * `-2` represents "waxed" \
+   * `-1` will be replaced with a random time between 504000 and 552000 ticks later
    *
    * Value:
    * Range: -2..

package/src/arguments/generated/world/entity/mob/happy_ghast.ts

@@ -0,0 +1,6 @@
+import type { AgeableMob, MobBase } from 'sandstone/arguments/generated/world/entity/mob.ts'
+import type { NBTInt } from 'sandstone'
+
+export type HappyGhast = (MobBase & AgeableMob & {
+  still_timeout?: NBTInt,
+})

package/src/arguments/generated/world/entity/mob/player.ts

@@ -2,7 +2,7 @@ import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { GlobalPos } from 'sandstone/arguments/generated/util.ts'
 import type { SlottedItem } from 'sandstone/arguments/generated/util/slot.ts'
 import type { AnyEntity } from 'sandstone/arguments/generated/world/entity.ts'
-import type { LivingEntity } from 'sandstone/arguments/generated/world/entity/mob.ts'
+import type { FallDamageLogicData, LivingEntity } from 'sandstone/arguments/generated/world/entity/mob.ts'
 import type { ItemStack } from 'sandstone/arguments/generated/world/item.ts'
 import type { NBTByte, NBTDouble, NBTFloat, NBTInt, NBTIntArray, NBTList, NBTShort, RecipeClass } from 'sandstone'
 
@@ -197,6 +197,16 @@ export type Player = (LivingEntity & {
     min: 3,
     max: 3,
   }>,
+  /**
+   * Value:
+   * Array length range: 3
+   */
+  raid_omen_position?: NBTIntArray<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 3,
+    max: 3,
+  }>,
   /**
    * Entity that the player is riding.
    */
@@ -225,9 +235,15 @@ export type Player = (LivingEntity & {
    * Ender pearls thrown by this player.
    */
   ender_pearls?: Array<EnderPearl>,
+  spawn_extra_particles_on_fall?: boolean,
   CustomName?: never,
   CustomNameVisible?: never,
-})
+} & {
+  /**
+   * Used by the game for wind charges.
+   */
+  ignore_fall_damage_from_current_explosion?: boolean,
+} & FallDamageLogicData)
 
 export type PlayerEquipment = ({
   [Key in Extract<PlayerEquipmentSlot, string>]?: ItemStack

package/src/arguments/generated/world/entity/mob/shulker.ts

@@ -1,4 +1,4 @@
-import type { DyeColorInt } from 'sandstone/arguments/generated/util/color.ts'
+import type { DyeColorByte } from 'sandstone/arguments/generated/util/color.ts'
 import type { MobBase } from 'sandstone/arguments/generated/world/entity/mob.ts'
 
 export type AttachFace = (0 | 1 | 2 | 3 | 4 | 5)
@@ -31,7 +31,7 @@ export type Shulker = (MobBase & {
    *
    *
    */
-  Color?: (DyeColorInt | ShulkerColor),
+  Color?: (DyeColorByte | ShulkerColor),
 })
 
 export type ShulkerColor = (16)

package/src/arguments/generated/world/entity/mob/slime.ts

@@ -1,7 +1,7 @@
-import type { MobBase } from 'sandstone/arguments/generated/world/entity/mob.ts'
+import type { AgeableMob, MobBase } from 'sandstone/arguments/generated/world/entity/mob.ts'
 import type { NBTInt } from 'sandstone'
 
-export type Slime = (MobBase & {
+export type CubeMob = {
   /**
    * Value:
    * Range: 0..126
@@ -13,4 +13,24 @@ export type Slime = (MobBase & {
    * Whether it is on the ground.
    */
   wasOnGround?: boolean,
+}
+
+export type Slime = (MobBase & CubeMob)
+
+export type SulfurCube = (MobBase & AgeableMob & CubeMob & {
+  /**
+   * Value:
+   * Range: 0..
+   */
+  pickup_timer?: NBTInt<{
+    min: 0,
+  }>,
+  from_bucket?: boolean,
+  /**
+   * `-1` represents "not ignited".
+   *
+   * Value:
+   * Range: -1..
+   */
+  fuse?: NBTInt<{}>,
 })

package/src/arguments/generated/world/entity/mob.ts

@@ -39,9 +39,17 @@ export type Attribute = {
 }
 
 export type AttributeModifier = {
-  id?: `${string}:${string}`,
-  amount?: (NBTDouble | number),
   /**
+   * The unique identifier of this attribute modifier.
+   */
+  id: `${string}:${string}`,
+  /**
+   * Change in the attribute.
+   */
+  amount: (NBTDouble | number),
+  /**
+   * The operation used for this modifier.
+   *
    * Value:
    *
    *  - AddValue(`add_value`): Adds all of the modifiers' amounts to the current value of the attribute.
@@ -52,7 +60,7 @@ export type AttributeModifier = {
    *    For every modifier, multiplies the current value of the attribute by `(1 + x)`,
    *    where `x` is the amount of the particular modifier.
    */
-  operation?: AttributeOperation,
+  operation: AttributeOperation,
 }
 
 export type BlockLeash = {
@@ -70,6 +78,10 @@ export type BlockLeash = {
   Z?: NBTInt,
 }
 
+export type Brain = {
+  memories?: Memories,
+}
+
 export type DropChances = ({
   [Key in Extract<EquipmentSlot, string>]?: NBTFloat<{
     leftExclusive: false,
@@ -106,6 +118,19 @@ export type FallDamageLogicData = ({
   }>,
 })
 
+export type LeashOwner = {
+  /**
+   * Value:
+   * Array length range: 4
+   */
+  UUID?: NBTIntArray<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 4,
+    max: 4,
+  }>,
+}
+
 export type LivingEntity = (EntityBase & {
   Health?: NBTFloat,
   /**
@@ -277,6 +302,31 @@ export type MobBase = (LivingEntity & {
   }>,
 })
 
+export type ModernAttributeModifier = {
+  /**
+   * The unique identifier of this attribute modifier.
+   */
+  id: `${string}:${string}`,
+  /**
+   * Change in the attribute.
+   */
+  amount: (NBTDouble | number),
+  /**
+   * The operation used for this modifier.
+   *
+   * Value:
+   *
+   *  - AddValue(`add_value`): Adds all of the modifiers' amounts to the current value of the attribute.
+   *  - AddMultipliedBase(`add_multiplied_base`):
+   *    Multiplies the current value of the attribute by `(1 + x)`,
+   *    where `x` is the sum of the modifiers' amounts.
+   *  - AddMultipliedTotal(`add_multiplied_total`):
+   *    For every modifier, multiplies the current value of the attribute by `(1 + x)`,
+   *    where `x` is the amount of the particular modifier.
+   */
+  operation: AttributeOperation,
+}
+
 export type NeutralMob = {
   /**
    * The time anger ends.

package/src/arguments/generated/world/entity.ts

@@ -6,13 +6,13 @@ import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { LabelClass, NBTDouble, NBTFloat, NBTInt, NBTIntArray, NBTList, NBTShort } from 'sandstone'
 
 export type AnyEntity = NonNullable<({
-  [S in Extract<Registry['minecraft:entity_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:entity_type'], string>, string>]?: ({
     /**
      * The ID of this entity. Not present on player entities.
      */
     id: S,
   } & (S extends keyof SymbolEntity ? SymbolEntity[S] : RootNBT))
-}[Registry['minecraft:entity_type']])>
+}[Extract<Registry['minecraft:entity_type'], string>])>
 
 export type BlockAttachedEntity = (EntityBase & {
   /**

package/src/arguments/generated/world/item/map.ts

@@ -1,6 +1,13 @@
 import type { Display, ItemBase } from 'sandstone/arguments/generated/world/item.ts'
 import type { NBTDouble, NBTFloat, NBTInt } from 'sandstone'
 
+export type ColorDisplay = (Display & {
+  /**
+   * Calculated as `RED << 16 | GREEN << 8 | BLUE`. Each of these fields must be between 0 and 255, inclusive.
+   */
+  MapColor?: NBTInt,
+})
+
 export type Decoration = {
   /**
    * Decoration type.
@@ -116,3 +123,10 @@ export type IconByteId = (
   | 24
   | 25
   | 26)
+
+export type IdentifiedDecoration = (Decoration & {
+  /**
+   * An arbitrary unique string identifying the decoration.
+   */
+  id: string,
+})

package/src/arguments/generated/world/item/shield.ts

@@ -2,6 +2,33 @@ import type { DyeColorInt } from 'sandstone/arguments/generated/util/color.ts'
 import type { BannerPatternLayer } from 'sandstone/arguments/generated/world/block/banner.ts'
 import type { ItemBase } from 'sandstone/arguments/generated/world/item.ts'
 
+export type BlockEntityTag = {
+  /**
+   * Base color.
+   *
+   * Value:
+   *
+   *  - White(`0`)
+   *  - Orange(`1`)
+   *  - Magenta(`2`)
+   *  - LightBlue(`3`)
+   *  - Yellow(`4`)
+   *  - Lime(`5`)
+   *  - Pink(`6`)
+   *  - Gray(`7`)
+   *  - LightGray(`8`)
+   *  - Cyan(`9`)
+   *  - Purple(`10`)
+   *  - Blue(`11`)
+   *  - Brown(`12`)
+   *  - Green(`13`)
+   *  - Red(`14`)
+   *  - Black(`15`)
+   */
+  Base?: DyeColorInt,
+  Patterns?: Array<BannerPatternLayer>,
+}
+
 export type Shield = (ItemBase & {
   /**
    * Banner Data.

package/src/arguments/generated/world/item.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 { SymbolMcdocBlockItemStates } from 'sandstone/arguments/generated/dispatcher.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { LegacyOperation } from 'sandstone/arguments/generated/util/attribute.ts'