sandstone 1.1.1 → 1.1.2

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

@@ -1,7 +1,9 @@
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { DyeColor } from 'sandstone/arguments/generated/util/color.ts'
+import type { Text } from 'sandstone/arguments/generated/util/text.ts'
 import type { AnyEntity } from 'sandstone/arguments/generated/world/entity.ts'
 import type { ItemStackTemplate } from 'sandstone/arguments/generated/world/item.ts'
-import type { LootTableClass, NBTInt, NBTLong } from 'sandstone'
+import type { LootTableClass, NBTInt, NBTList, NBTLong } from 'sandstone'
 
 export type ContainerLoot = {
   loot_table: (Registry['minecraft:loot_table'] | LootTableClass),
@@ -36,3 +38,43 @@ export type PotDecorations = {
   right?: ItemStackTemplate,
   front?: ItemStackTemplate,
 }
+
+/**
+ * List length range: 4
+ */
+export type SignLines = NBTList<Text, {
+  leftExclusive: false,
+  rightExclusive: false,
+  min: 4,
+  max: 4,
+}>
+
+export type SignText = {
+  messages: SignLines,
+  /**
+   * Shown to players with the profanity filter enabled on Realms.
+   */
+  filtered_messages?: SignLines,
+  /**
+   * 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,
+  has_glowing_text?: boolean,
+}

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

@@ -3,6 +3,7 @@ import type { DamageType } from 'sandstone/arguments/generated/data/damage_type.
 import type { TrimMaterial, TrimPattern } from 'sandstone/arguments/generated/data/trim.ts'
 import type { SoundEventRef } from 'sandstone/arguments/generated/data/util.ts'
 import type { Instrument } from 'sandstone/arguments/generated/data/variants/instrument.ts'
+import type { BlockStateProvider } from 'sandstone/arguments/generated/data/worldgen/feature/block_state_provider.ts'
 import type {
   SymbolMcdocBlockItemStates,
   SymbolMcdocBlockStateKeys,
@@ -11,6 +12,7 @@ import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { AttributeOperation } from 'sandstone/arguments/generated/util/attribute.ts'
 import type { Profile } from 'sandstone/arguments/generated/util/avatar.ts'
 import type { DyeColor, RGB } from 'sandstone/arguments/generated/util/color.ts'
+import type { Direction } from 'sandstone/arguments/generated/util/direction.ts'
 import type { MobEffectInstance } from 'sandstone/arguments/generated/util/effect.ts'
 import type { Filterable, GlobalPos } from 'sandstone/arguments/generated/util.ts'
 import type { EquipmentSlot, EquipmentSlotGroup } from 'sandstone/arguments/generated/util/slot.ts'
@@ -33,14 +35,15 @@ import type {
 import type { AnyEntity } from 'sandstone/arguments/generated/world/entity.ts'
 import type { ItemStackTemplate } from 'sandstone/arguments/generated/world/item.ts'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
+import type { TextureType } from 'sandstone/arguments'
 import type {
   BannerPatternClass,
   DamageTypeClass,
-  DecoratedPotPatternClass,
   EquipmentClass,
   InstrumentClass,
   ItemModelDefinitionClass,
   JukeboxSongClass,
+  LootTableClass,
   NBTByte,
   NBTClass,
   NBTDouble,
@@ -56,7 +59,19 @@ import type {
   VariantClass,
 } from 'sandstone'
 
-export type AdventureModePredicate = (Array<BlockPredicate> | BlockPredicate)
+/**
+ * *either*
+ *
+ * List length range: 1..
+ *
+ * *or*
+ *
+ * *item 1*
+ */
+export type AdventureModePredicate = (NBTList<BlockPredicate, {
+  leftExclusive: false,
+  min: 1,
+}> | BlockPredicate)
 
 export type ApplyEffectsConsumeEffect = {
   effects: Array<MobEffectInstance>,
@@ -150,7 +165,7 @@ export type AttackRange = {
 }
 
 export type AttributeDisplay = NonNullable<({
-  [S in Extract<AttributeDisplayType, string>]?: ({
+  [S in Extract<Extract<AttributeDisplayType, string>, string>]?: ({
     /**
      * Value:
      *
@@ -160,7 +175,7 @@ export type AttributeDisplay = NonNullable<({
      */
     type: S,
   } & (S extends keyof SymbolAttributeDisplay ? SymbolAttributeDisplay[S] : RootNBT))
-}[AttributeDisplayType])>
+}[Extract<AttributeDisplayType, string>])>
 
 export type AttributeDisplayTextOverride = {
   /**
@@ -279,8 +294,91 @@ export type blocks_attacks = {
       | Array<(Registry['minecraft:damage_type'] | DamageTypeClass)>),
 }
 
+export type BlockTransformDropStrategy = ('clicked_face' | 'from_middle')
+
+export type BlockTransformer = {
+  /**
+   * If the provider returns no result, the next transformer will be attempted.
+   */
+  block_state_provider: BlockStateProvider,
+  /**
+   * Defaults to not playing sound.
+   */
+  sound?: SoundEventRef,
+  /**
+   * Defaults to `none`.
+   *
+   * Value:
+   *
+   *  - None(`none`)
+   *  - Scrape(`scrape`)
+   *  - WaxOn(`wax_on`)
+   *  - WaxOff(`wax_off`)
+   */
+  particle?: BlockTransformParticle,
+  /**
+   * If a disallowed face is interacted with, the next transformer will be attempted. \
+   * Defaults to empty (allowing all faces).
+   */
+  disallowed_faces?: Array<Direction>,
+  /**
+   * The loot to drop on a successful transformation. \
+   * Defaults to drop nothing.
+   */
+  loot?: (Registry['minecraft:loot_table'] | LootTableClass),
+  /**
+   * Where the `loot` should drop. \
+   * Defaults to `from_middle`.
+   *
+   * Value:
+   *
+   *  - ClickedFace(`clicked_face`)
+   *  - FromMiddle(`from_middle`)
+   */
+  drop_strategy?: BlockTransformDropStrategy,
+  /**
+   * How nearby blocks are affected by the transformation. \
+   * Defaults to `single_block`.
+   *
+   * Value:
+   *
+   *  - SingleBlock(`single_block`)
+   *  - CopperChest(`copper_chest`): If the original block and the transformed block are both copper chests of any kind, the transform applies to the other half of the double chest.
+   */
+  transform_type?: BlockTransformType,
+  /**
+   * Whether the transformed block should update based on neighboring blocks. \
+   * Defaults to `true`.
+   */
+  update_from_neighbors?: boolean,
+  /**
+   * Only has effect on stackable items. \
+   * Defaults to `true`.
+   */
+  consume_on_use?: boolean,
+  /**
+   * Only has effect on unstackable items. \
+   * Defauls to 1.
+   *
+   * Value:
+   * Range: 0..
+   */
+  item_damage_per_use?: NBTInt<{
+    min: 0,
+  }>,
+}
+
+export type BlockTransformParticle = ('none' | 'scrape' | 'wax_on' | 'wax_off')
+
+export type BlockTransformType = ('single_block' | 'copper_chest')
+
 export type BookGeneration = (0 | 1 | 2 | 3)
 
+export type BrewingFuel = {
+  uses: `${string}:${string}`,
+  speed_multiplier: `${string}:${string}`,
+}
+
 export type BucketEntityData = {
   /**
    * Whether it should have an AI.
@@ -302,11 +400,35 @@ export type BucketEntityData = {
    * Whether the entity should take damage.
    */
   Invulnerable?: boolean,
+  /**
+   * Whether the entity should not despawn naturally.
+   */
+  PersistenceRequired?: boolean,
   Health?: NBTFloat,
   /**
    * Turns into the expiry time of the memory module `has_hunting_cooldown` for axolotls.
    */
   HuntingCooldown?: NBTLong,
+  /**
+   * The age for axolotl and tadpole.
+   */
+  Age?: NBTInt,
+  /**
+   * The age locked state for axolotl and tadpole.
+   */
+  AgeLocked?: boolean,
+  /**
+   * The age for sulfur cube.
+   */
+  age?: NBTInt,
+  /**
+   * The age locked state for sulfur cube.
+   */
+  age_locked?: boolean,
+}
+
+export type Compostable = {
+  layers: `${string}:${string}`,
 }
 
 export type Consumable = {
@@ -355,10 +477,15 @@ export type Consumable = {
 }
 
 export type ConsumeEffect = NonNullable<({
-  [S in Extract<Registry['minecraft:consume_effect_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:consume_effect_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolConsumeEffect ? SymbolConsumeEffect[S] : RootNBT))
-}[Registry['minecraft:consume_effect_type']])>
+}[Extract<Registry['minecraft:consume_effect_type'], string>])>
+
+export type CookingFuel = {
+  burn_time: `${string}:${string}`,
+  speed_multiplier: `${string}:${string}`,
+}
 
 export type CustomModelData = {
   floats?: Array<NBTFloat>,
@@ -478,7 +605,7 @@ export type Equippable = {
   /**
    * The overlay texture that should render in first person when equipped.
    */
-  camera_overlay?: (Registry['minecraft:texture'] | TextureClass),
+  camera_overlay?: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   /**
    * Limits which entities can equip this item.
    */
@@ -734,6 +861,27 @@ export type MapDecorations = ({
   [Key in `${any}${string}`]?: MapDecoration
 })
 
+export type MobVisibility = {
+  /**
+   * Entities to match.
+   */
+  targeting_entity_types: ((
+      | Registry['minecraft:entity_type'] | `#${Registry['minecraft:tag/entity_type']}` | TagClass<'entity_type'>)
+      | Array<Registry['minecraft:entity_type']>),
+  /**
+   * Visibility factor, with `0.0` reducing the range at which mobs detects the entity to `2`, while `10.0` increases the detection range tenfold.
+   * While multiple items with this component stack, the maximum vision will still never exceed `10.0`.
+   *
+   * Value:
+   * Range: 0..10
+   */
+  visibility: NBTFloat<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 0,
+  }>,
+}
+
 export type PiercingWeapon = {
   /**
    * Whether the attack deals knockback.
@@ -944,6 +1092,18 @@ export type UseEffects = {
   interact_vibrations?: boolean,
 }
 
+export type VillagerFood = {
+  /**
+   * How much hunger the item satiates in the Villager once eaten.
+   *
+   * Value:
+   * Range: 1..
+   */
+  nutrition: NBTInt<{
+    min: 1,
+  }>,
+}
+
 export type Weapon = {
   /**
    * The amount to damage to the weapon item for each attack performed. Defaults to `1`.
@@ -1128,8 +1288,6 @@ type DataComponentDispatcherMap = {
   'minecraft:entity_data': DataComponentEntityData,
   'equippable': DataComponentEquippable,
   'minecraft:equippable': DataComponentEquippable,
-  'fire_resistant': DataComponentFireResistant,
-  'minecraft:fire_resistant': DataComponentFireResistant,
   'firework_explosion': DataComponentFireworkExplosion,
   'minecraft:firework_explosion': DataComponentFireworkExplosion,
   'fireworks': DataComponentFireworks,
@@ -1142,10 +1300,6 @@ type DataComponentDispatcherMap = {
   'minecraft:frog/variant': DataComponentFrogVariant,
   'glider': DataComponentGlider,
   'minecraft:glider': DataComponentGlider,
-  'hide_additional_tooltip': DataComponentHideAdditionalTooltip,
-  'minecraft:hide_additional_tooltip': DataComponentHideAdditionalTooltip,
-  'hide_tooltip': DataComponentHideTooltip,
-  'minecraft:hide_tooltip': DataComponentHideTooltip,
   'horse/variant': DataComponentHorseVariant,
   'minecraft:horse/variant': DataComponentHorseVariant,
   'instrument': DataComponentInstrument,
@@ -1208,8 +1362,6 @@ type DataComponentDispatcherMap = {
   'minecraft:profile': DataComponentProfile,
   'provides_banner_patterns': DataComponentProvidesBannerPatterns,
   'minecraft:provides_banner_patterns': DataComponentProvidesBannerPatterns,
-  'provides_pottery_pattern': DataComponentProvidesPotteryPattern,
-  'minecraft:provides_pottery_pattern': DataComponentProvidesPotteryPattern,
   'provides_trim_material': DataComponentProvidesTrimMaterial,
   'minecraft:provides_trim_material': DataComponentProvidesTrimMaterial,
   'rabbit/variant': DataComponentRabbitVariant,
@@ -1258,6 +1410,8 @@ type DataComponentDispatcherMap = {
   'minecraft:use_effects': DataComponentUseEffects,
   'use_remainder': DataComponentUseRemainder,
   'minecraft:use_remainder': DataComponentUseRemainder,
+  'villager_food': DataComponentVillagerFood,
+  'minecraft:villager_food': DataComponentVillagerFood,
   'villager/variant': DataComponentVillagerVariant,
   'minecraft:villager/variant': DataComponentVillagerVariant,
   'weapon': DataComponentWeapon,
@@ -1319,15 +1473,12 @@ type DataComponentFallback = (
   | DataComponentEnchantments
   | DataComponentEntityData
   | DataComponentEquippable
-  | DataComponentFireResistant
   | DataComponentFireworkExplosion
   | DataComponentFireworks
   | DataComponentFood
   | DataComponentFoxVariant
   | DataComponentFrogVariant
   | DataComponentGlider
-  | DataComponentHideAdditionalTooltip
-  | DataComponentHideTooltip
   | DataComponentHorseVariant
   | DataComponentInstrument
   | DataComponentIntangibleProjectile
@@ -1359,7 +1510,6 @@ type DataComponentFallback = (
   | DataComponentPotionDurationScale
   | DataComponentProfile
   | DataComponentProvidesBannerPatterns
-  | DataComponentProvidesPotteryPattern
   | DataComponentProvidesTrimMaterial
   | DataComponentRabbitVariant
   | DataComponentRarity
@@ -1384,6 +1534,7 @@ type DataComponentFallback = (
   | DataComponentUseCooldown
   | DataComponentUseEffects
   | DataComponentUseRemainder
+  | DataComponentVillagerFood
   | DataComponentVillagerVariant
   | DataComponentWeapon
   | DataComponentWolfCollar
@@ -1438,15 +1589,12 @@ type DataComponentEnchantmentGlintOverride = boolean
 type DataComponentEnchantments = EnchantmentLevels
 type DataComponentEntityData = (AnyEntity | (`${any}${string}` | NBTClass))
 type DataComponentEquippable = Equippable
-type DataComponentFireResistant = Record<string, never>
 type DataComponentFireworkExplosion = Explosion
 type DataComponentFireworks = Fireworks
 type DataComponentFood = Food
 type DataComponentFoxVariant = FoxType
 type DataComponentFrogVariant = (Registry['minecraft:frog_variant'] | VariantClass<'frog'>)
 type DataComponentGlider = Record<string, never>
-type DataComponentHideAdditionalTooltip = Record<string, never>
-type DataComponentHideTooltip = Record<string, never>
 type DataComponentHorseVariant = HorseVariant
 type DataComponentInstrument = ((Registry['minecraft:instrument'] | InstrumentClass) | Instrument)
 type DataComponentIntangibleProjectile = Record<string, never>
@@ -1501,7 +1649,6 @@ type DataComponentProvidesBannerPatterns = ((
     | TagClass<'banner_pattern'>
     | BannerPatternClass)
   | Array<(Registry['minecraft:banner_pattern'] | BannerPatternClass)>)
-type DataComponentProvidesPotteryPattern = (Registry['minecraft:decorated_pot_pattern'] | DecoratedPotPatternClass)
 type DataComponentProvidesTrimMaterial = (Registry['minecraft:trim_material'] | TrimMaterialClass)
 type DataComponentRabbitVariant = RabbitVariant
 type DataComponentRarity = Rarity
@@ -1528,6 +1675,7 @@ type DataComponentUnbreakable = Unbreakable
 type DataComponentUseCooldown = UseCooldown
 type DataComponentUseEffects = UseEffects
 type DataComponentUseRemainder = ItemStackTemplate
+type DataComponentVillagerFood = VillagerFood
 type DataComponentVillagerVariant = Registry['minecraft:villager_type']
 type DataComponentWeapon = Weapon
 type DataComponentWolfCollar = DyeColor

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)
@@ -195,9 +208,7 @@ 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 = ((

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

@@ -177,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,
@@ -197,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,
@@ -213,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,
@@ -363,10 +357,6 @@ type EntityDispatcherMap = {
   'minecraft:player': EntityPlayer,
   'polar_bear': EntityPolarBear,
   'minecraft:polar_bear': EntityPolarBear,
-  'poplar_boat': EntityPoplarBoat,
-  'minecraft:poplar_boat': EntityPoplarBoat,
-  'popolar_chest_boat': EntityPopolarChestBoat,
-  'minecraft:popolar_chest_boat': EntityPopolarChestBoat,
   'potion': EntityPotion,
   'minecraft:potion': EntityPotion,
   'pufferfish': EntityPufferfish,
@@ -463,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,
@@ -488,7 +476,6 @@ type EntityFallback = (
   | EntityBirchChestBoat
   | EntityBlaze
   | EntityBlockDisplay
-  | EntityBoat
   | EntityBogged
   | EntityBreeze
   | EntityBreezeWindCharge
@@ -498,7 +485,6 @@ type EntityFallback = (
   | EntityCaveSpider
   | EntityCherryBoat
   | EntityCherryChestBoat
-  | EntityChestBoat
   | EntityChestMinecart
   | EntityChicken
   | EntityCod
@@ -506,7 +492,6 @@ type EntityFallback = (
   | EntityCopperGolem
   | EntityCow
   | EntityCreaking
-  | EntityCreakingTransient
   | EntityCreeper
   | EntityDarkOakBoat
   | EntityDarkOakChestBoat
@@ -581,8 +566,6 @@ type EntityFallback = (
   | EntityPillager
   | EntityPlayer
   | EntityPolarBear
-  | EntityPoplarBoat
-  | EntityPopolarChestBoat
   | EntityPotion
   | EntityPufferfish
   | EntityRabbit
@@ -631,7 +614,6 @@ type EntityFallback = (
   | EntityZombie
   | EntityZombieHorse
   | EntityZombieNautilus
-  | EntityZombiePigman
   | EntityZombieVillager
   | EntityZombifiedPiglin)
 type EntityAcaciaBoat = Boat
@@ -650,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
@@ -660,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
@@ -668,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
@@ -743,8 +722,6 @@ type EntityPiglinBrute = PiglinBase
 type EntityPillager = Pillager
 type EntityPlayer = Player
 type EntityPolarBear = PolarBear
-type EntityPoplarBoat = Boat
-type EntityPopolarChestBoat = ChestBoat
 type EntityPotion = Potion
 type EntityPufferfish = Pufferfish
 type EntityRabbit = Rabbit
@@ -793,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/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.ts

@@ -141,6 +141,10 @@ export type LivingEntity = (EntityBase & {
    * Timer since it has been damaged. Counts down to zero.
    */
   HurtTime?: NBTShort,
+  /**
+   * Ticks since it was last damaged, from its creation.
+   */
+  HurtByTimestamp?: NBTInt,
   /**
    * Timer since it was marked as dead. Counts down to zero.
    */

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.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'