sandstone 1.1.1 → 1.1.3

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

@@ -186,17 +186,17 @@ export type EntityFlagsPredicate = {
   is_fall_flying?: boolean,
 }
 
-export type EntityPredicate = EntitySubPredicateMap
+export type EntityPredicate = (OldEntityPredicate | EntitySubPredicateMap)
 
 export type EntitySlotsPredicate = ({
   [Key in Extract<LiteralUnion<ENTITY_SLOTS>, string>]?: ItemPredicate
 })
 
 export type EntitySubPredicate = NonNullable<({
-  [S in Extract<Registry['minecraft:entity_sub_predicate_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:entity_sub_predicate_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolEntitySubPredicate ? SymbolEntitySubPredicate[S] : RootNBT))
-}[Registry['minecraft:entity_sub_predicate_type']])>
+}[Extract<Registry['minecraft:entity_sub_predicate_type'], string>])>
 
 export type EntitySubPredicateMap = ({
   [Key in Extract<Registry['minecraft:entity_sub_predicate_type'], string>]?: (Key extends keyof SymbolEntitySubPredicate
@@ -392,6 +392,50 @@ export type MovementPredicate = {
   fall_distance?: MinMaxBounds<NBTFloat>,
 }
 
+export type OldEntityPredicate = NonNullable<({
+  [S in Extract<Extract<EntityTypePredicate, string>, string>]?: {
+    type?: S,
+    type_specific?: EntitySubPredicate,
+    team?: `${any}${string}`,
+    nbt?: ((`${any}${string}` | NBTClass) | (S extends keyof SymbolEntity ? SymbolEntity[S] : RootNBT)),
+    location?: LocationPredicate,
+    distance?: DistancePredicate,
+    flags?: EntityFlagsPredicate,
+    equipment?: EntityEquipmentPredicate,
+    vehicle?: EntityPredicate,
+    passenger?: EntityPredicate,
+    stepping_on?: LocationPredicate,
+    /**
+     * Entity that a mob's AI/aggro is targeting.
+     */
+    targeted_entity?: EntityPredicate,
+    effects?: EntityEffectsPredicate,
+    slots?: EntitySlotsPredicate,
+    movement?: MovementPredicate,
+    /**
+     * True every `n` ticks of an entity's lifetime.
+     *
+     * Value:
+     * Range: 1..
+     */
+    periodic_tick?: NBTInt<{
+      min: 1,
+    }>,
+    /**
+     * Whether the block at most 0.5 blocks below the entity is present which can affect its movement.
+     */
+    movement_affected_by?: LocationPredicate,
+    /**
+     * Match exact data component values on the entity.
+     */
+    components?: DataComponentExactPredicate,
+    /**
+     * Test data component values on the entity.
+     */
+    predicates?: DataComponentPredicate,
+  }
+}[Extract<EntityTypePredicate, string>])>
+
 export type PaintingPredicate = {
   variant: ((
         | Registry['minecraft:painting_variant']
@@ -543,12 +587,12 @@ export type SpecificType = (
   | 'villager')
 
 export type StatisticPredicate = NonNullable<({
-  [S in Extract<Registry['minecraft:stat_type'], string>]?: {
+  [S in Extract<Extract<Registry['minecraft:stat_type'], string>, string>]?: {
     type: S,
     stat: (S extends keyof SymbolStatisticType ? SymbolStatisticType[S] : SymbolStatisticType<'%unknown'>),
     value: MinMaxBounds<NBTInt>,
   }
-}[Registry['minecraft:stat_type']])>
+}[Extract<Registry['minecraft:stat_type'], string>])>
 
 export type TropicalFishPredicate = {
   /**
@@ -580,12 +624,6 @@ export type WolfPredicate = {
       | Array<(Registry['minecraft:wolf_variant'] | VariantClass<'wolf'>)>),
 }
 type EntitySubPredicateDispatcherMap = {
-  'axolotl': EntitySubPredicateAxolotl,
-  'minecraft:axolotl': EntitySubPredicateAxolotl,
-  'boat': EntitySubPredicateBoat,
-  'minecraft:boat': EntitySubPredicateBoat,
-  'cat': EntitySubPredicateCat,
-  'minecraft:cat': EntitySubPredicateCat,
   'components': EntitySubPredicateComponents,
   'minecraft:components': EntitySubPredicateComponents,
   'distance': EntitySubPredicateDistance,
@@ -602,30 +640,16 @@ type EntitySubPredicateDispatcherMap = {
   'minecraft:fishing_hook': EntitySubPredicateFishingHook,
   'flags': EntitySubPredicateFlags,
   'minecraft:flags': EntitySubPredicateFlags,
-  'fox': EntitySubPredicateFox,
-  'minecraft:fox': EntitySubPredicateFox,
-  'frog': EntitySubPredicateFrog,
-  'minecraft:frog': EntitySubPredicateFrog,
-  'horse': EntitySubPredicateHorse,
-  'minecraft:horse': EntitySubPredicateHorse,
   'lightning': EntitySubPredicateLightning,
   'minecraft:lightning': EntitySubPredicateLightning,
-  'llama': EntitySubPredicateLlama,
-  'minecraft:llama': EntitySubPredicateLlama,
   'location': EntitySubPredicateLocation,
   'minecraft:location': EntitySubPredicateLocation,
-  'mooshroom': EntitySubPredicateMooshroom,
-  'minecraft:mooshroom': EntitySubPredicateMooshroom,
   'movement': EntitySubPredicateMovement,
   'minecraft:movement': EntitySubPredicateMovement,
   'movement_affected_by': EntitySubPredicateMovementAffectedBy,
   'minecraft:movement_affected_by': EntitySubPredicateMovementAffectedBy,
   'nbt': EntitySubPredicateNbt,
   'minecraft:nbt': EntitySubPredicateNbt,
-  'painting': EntitySubPredicatePainting,
-  'minecraft:painting': EntitySubPredicatePainting,
-  'parrot': EntitySubPredicateParrot,
-  'minecraft:parrot': EntitySubPredicateParrot,
   'passenger': EntitySubPredicatePassenger,
   'minecraft:passenger': EntitySubPredicatePassenger,
   'periodic_tick': EntitySubPredicatePeriodicTick,
@@ -634,12 +658,8 @@ type EntitySubPredicateDispatcherMap = {
   'minecraft:player': EntitySubPredicatePlayer,
   'predicates': EntitySubPredicatePredicates,
   'minecraft:predicates': EntitySubPredicatePredicates,
-  'rabbit': EntitySubPredicateRabbit,
-  'minecraft:rabbit': EntitySubPredicateRabbit,
   'raider': EntitySubPredicateRaider,
   'minecraft:raider': EntitySubPredicateRaider,
-  'salmon': EntitySubPredicateSalmon,
-  'minecraft:salmon': EntitySubPredicateSalmon,
   'sheep': EntitySubPredicateSheep,
   'minecraft:sheep': EntitySubPredicateSheep,
   'slime': EntitySubPredicateSlime,
@@ -652,8 +672,6 @@ type EntitySubPredicateDispatcherMap = {
   'minecraft:targeted_entity': EntitySubPredicateTargetedEntity,
   'team': EntitySubPredicateTeam,
   'minecraft:team': EntitySubPredicateTeam,
-  'tropical_fish': EntitySubPredicateTropicalFish,
-  'minecraft:tropical_fish': EntitySubPredicateTropicalFish,
   'type_specific/cube_mob': EntitySubPredicateTypeSpecificCubeMob,
   'minecraft:type_specific/cube_mob': EntitySubPredicateTypeSpecificCubeMob,
   'type_specific/fishing_hook': EntitySubPredicateTypeSpecificFishingHook,
@@ -668,16 +686,9 @@ type EntitySubPredicateDispatcherMap = {
   'minecraft:type_specific/sheep': EntitySubPredicateTypeSpecificSheep,
   'vehicle': EntitySubPredicateVehicle,
   'minecraft:vehicle': EntitySubPredicateVehicle,
-  'villager': EntitySubPredicateVillager,
-  'minecraft:villager': EntitySubPredicateVillager,
-  'wolf': EntitySubPredicateWolf,
-  'minecraft:wolf': EntitySubPredicateWolf,
 }
 type EntitySubPredicateKeys = keyof EntitySubPredicateDispatcherMap
 type EntitySubPredicateFallback = (
-  | EntitySubPredicateAxolotl
-  | EntitySubPredicateBoat
-  | EntitySubPredicateCat
   | EntitySubPredicateComponents
   | EntitySubPredicateDistance
   | EntitySubPredicateEffects
@@ -686,44 +697,29 @@ type EntitySubPredicateFallback = (
   | EntitySubPredicateEquipment
   | EntitySubPredicateFishingHook
   | EntitySubPredicateFlags
-  | EntitySubPredicateFox
-  | EntitySubPredicateFrog
-  | EntitySubPredicateHorse
   | EntitySubPredicateLightning
-  | EntitySubPredicateLlama
   | EntitySubPredicateLocation
-  | EntitySubPredicateMooshroom
   | EntitySubPredicateMovement
   | EntitySubPredicateMovementAffectedBy
   | EntitySubPredicateNbt
-  | EntitySubPredicatePainting
-  | EntitySubPredicateParrot
   | EntitySubPredicatePassenger
   | EntitySubPredicatePeriodicTick
   | EntitySubPredicatePlayer
   | EntitySubPredicatePredicates
-  | EntitySubPredicateRabbit
   | EntitySubPredicateRaider
-  | EntitySubPredicateSalmon
   | EntitySubPredicateSheep
   | EntitySubPredicateSlime
   | EntitySubPredicateSlots
   | EntitySubPredicateSteppingOn
   | EntitySubPredicateTargetedEntity
   | EntitySubPredicateTeam
-  | EntitySubPredicateTropicalFish
   | EntitySubPredicateTypeSpecificCubeMob
   | EntitySubPredicateTypeSpecificFishingHook
   | EntitySubPredicateTypeSpecificLightning
   | EntitySubPredicateTypeSpecificPlayer
   | EntitySubPredicateTypeSpecificRaider
   | EntitySubPredicateTypeSpecificSheep
-  | EntitySubPredicateVehicle
-  | EntitySubPredicateVillager
-  | EntitySubPredicateWolf)
-type EntitySubPredicateAxolotl = AxolotlPredicate
-type EntitySubPredicateBoat = BoatPredicate
-type EntitySubPredicateCat = CatPredicate
+  | EntitySubPredicateVehicle)
 type EntitySubPredicateComponents = DataComponentExactPredicate
 type EntitySubPredicateDistance = DistancePredicate
 type EntitySubPredicateEffects = EntityEffectsPredicate
@@ -732,34 +728,24 @@ type EntitySubPredicateEntityType = EntityTypePredicate
 type EntitySubPredicateEquipment = EntityEquipmentPredicate
 type EntitySubPredicateFishingHook = FishingHookPredicate
 type EntitySubPredicateFlags = EntityFlagsPredicate
-type EntitySubPredicateFox = FoxPredicate
-type EntitySubPredicateFrog = FrogPredicate
-type EntitySubPredicateHorse = HorsePredicate
 type EntitySubPredicateLightning = LightningBoltPredicate
-type EntitySubPredicateLlama = LlamaPredicate
 type EntitySubPredicateLocation = LocationPredicate
-type EntitySubPredicateMooshroom = MooshroomPredicate
 type EntitySubPredicateMovement = MovementPredicate
 type EntitySubPredicateMovementAffectedBy = LocationPredicate
 type EntitySubPredicateNbt = ((`${any}${string}` | NBTClass) | SymbolEntity<'%fallback'>)
-type EntitySubPredicatePainting = PaintingPredicate
-type EntitySubPredicateParrot = ParrotPredicate
 type EntitySubPredicatePassenger = EntityPredicate
 type EntitySubPredicatePeriodicTick = NBTInt<{
   min: 1,
 }>
 type EntitySubPredicatePlayer = PlayerPredicate
 type EntitySubPredicatePredicates = DataComponentPredicate
-type EntitySubPredicateRabbit = RabbitPredicate
 type EntitySubPredicateRaider = RaiderPredicate
-type EntitySubPredicateSalmon = SalmonPredicate
 type EntitySubPredicateSheep = SheepPredicate
 type EntitySubPredicateSlime = SlimePredicate
 type EntitySubPredicateSlots = EntitySlotsPredicate
 type EntitySubPredicateSteppingOn = LocationPredicate
 type EntitySubPredicateTargetedEntity = EntityPredicate
 type EntitySubPredicateTeam = `${any}${string}`
-type EntitySubPredicateTropicalFish = TropicalFishPredicate
 type EntitySubPredicateTypeSpecificCubeMob = SlimePredicate
 type EntitySubPredicateTypeSpecificFishingHook = FishingHookPredicate
 type EntitySubPredicateTypeSpecificLightning = LightningBoltPredicate
@@ -767,8 +753,6 @@ type EntitySubPredicateTypeSpecificPlayer = PlayerPredicate
 type EntitySubPredicateTypeSpecificRaider = RaiderPredicate
 type EntitySubPredicateTypeSpecificSheep = SheepPredicate
 type EntitySubPredicateVehicle = EntityPredicate
-type EntitySubPredicateVillager = VillagerPredicate
-type EntitySubPredicateWolf = WolfPredicate
 export type SymbolEntitySubPredicate<CASE extends
   | 'map'
   | 'keys'

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

@@ -2,24 +2,26 @@ import type {
   DamagePredicate,
   DamageSourcePredicate,
   DistancePredicate,
+  EntityEffectsPredicate,
   EntityPredicate,
   ItemPredicate,
   LocationPredicate,
-  MobEffectPredicate,
 } from 'sandstone/arguments/generated/data/advancement/predicate.ts'
-import type { LootCondition } from 'sandstone/arguments/generated/data/loot.ts'
+import type { LootCondition } from 'sandstone/arguments/generated/data/loot/condition.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 { NBTObject } from 'sandstone/arguments/nbt.ts'
 import type { LootTableClass, NBTFloat, NBTInt, NBTList, RecipeClass } from 'sandstone'
 
+export type AdvancementPredicateRef = Array<LootCondition>
+
 export type AllayDropItemOnBlock = (TriggerBase & {
-  location?: Array<LootCondition>,
+  location?: AdvancementPredicateRef,
 })
 
 export type AnyBlockUse = (TriggerBase & {
-  location?: Array<LootCondition>,
+  location?: AdvancementPredicateRef,
 })
 
 export type BeeNestDestroyed = (TriggerBase & {
@@ -53,7 +55,7 @@ export type ChanneledLightning = (TriggerBase & {
   victims?: Array<CompositeEntity>,
 })
 
-export type CompositeEntity = (EntityPredicate | Array<LootCondition>)
+export type CompositeEntity = (EntityPredicate | AdvancementPredicateRef)
 
 export type Conditions<C extends NBTObject> = {
   conditions?: C,
@@ -79,13 +81,11 @@ export type DefaultBlockUse = (TriggerBase & {
   /**
    * The location of the block.
    */
-  location?: Array<LootCondition>,
+  location?: AdvancementPredicateRef,
 })
 
 export type EffectsChanged = (TriggerBase & {
-  effects?: ({
-    [Key in Extract<Registry['minecraft:mob_effect'], string>]?: MobEffectPredicate
-  }),
+  effects?: EntityEffectsPredicate,
   source?: CompositeEntity,
 })
 
@@ -95,13 +95,13 @@ export type EnchantedItem = (TriggerBase & {
 })
 
 export type EnterBlock = NonNullable<({
-  [S in Extract<Registry['minecraft:block'], string>]?: (TriggerBase & {
+  [S in Extract<Extract<Registry['minecraft:block'], string>, string>]?: (TriggerBase & {
     block?: S,
     state?: (S extends undefined
       ? SymbolMcdocBlockStates<'%none'> :
       (S extends keyof SymbolMcdocBlockStates ? SymbolMcdocBlockStates[S] : SymbolMcdocBlockStates<'%unknown'>)),
   })
-}[Registry['minecraft:block']])>
+}[Extract<Registry['minecraft:block'], string>])>
 
 export type EntityHurtPlayer = (TriggerBase & {
   damage?: DamagePredicate,
@@ -196,7 +196,7 @@ export type ItemDurabilityChanged = (TriggerBase & {
 })
 
 export type ItemUsedOnBlock = (TriggerBase & {
-  location?: Array<LootCondition>,
+  location?: AdvancementPredicateRef,
 })
 
 export type KilledByArrow = (TriggerBase & {
@@ -234,8 +234,6 @@ export type LightningStrike = (TriggerBase & {
   bystander?: CompositeEntity,
 })
 
-export type Location = TriggerBase
-
 export type NetherTravel = (TriggerBase & {
   /**
    * Where in the Overworld the player was when they travelled to the Nether.
@@ -251,7 +249,7 @@ export type PlacedBlock = (TriggerBase & {
   /**
    * Where the block was placed.
    */
-  location?: Array<LootCondition>,
+  location?: AdvancementPredicateRef,
 })
 
 export type PlayerGeneratesContainerLoot = (TriggerBase & {
@@ -273,6 +271,8 @@ export type PlayerKilledEntity = (TriggerBase & {
   killing_blow?: DamageSourcePredicate,
 })
 
+export type PlayerTrigger = TriggerBase
+
 export type RecipeCrafted = (TriggerBase & {
   recipe_id: (Registry['minecraft:recipe'] | RecipeClass),
   /**
@@ -438,8 +438,6 @@ type TriggerDispatcherMap = {
   'minecraft:kill_mob_near_sculk_catalyst': TriggerKillMobNearSculkCatalyst,
   'killed_by_arrow': TriggerKilledByArrow,
   'minecraft:killed_by_arrow': TriggerKilledByArrow,
-  'killed_by_crossbow': TriggerKilledByCrossbow,
-  'minecraft:killed_by_crossbow': TriggerKilledByCrossbow,
   'levitation': TriggerLevitation,
   'minecraft:levitation': TriggerLevitation,
   'lightning_strike': TriggerLightningStrike,
@@ -466,8 +464,6 @@ type TriggerDispatcherMap = {
   'minecraft:recipe_unlocked': TriggerRecipeUnlocked,
   'ride_entity_in_lava': TriggerRideEntityInLava,
   'minecraft:ride_entity_in_lava': TriggerRideEntityInLava,
-  'safely_harvest_honey': TriggerSafelyHarvestHoney,
-  'minecraft:safely_harvest_honey': TriggerSafelyHarvestHoney,
   'shot_crossbow': TriggerShotCrossbow,
   'minecraft:shot_crossbow': TriggerShotCrossbow,
   'slept_in_bed': TriggerSleptInBed,
@@ -532,7 +528,6 @@ type TriggerFallback = (
   | TriggerItemUsedOnBlock
   | TriggerKillMobNearSculkCatalyst
   | TriggerKilledByArrow
-  | TriggerKilledByCrossbow
   | TriggerLevitation
   | TriggerLightningStrike
   | TriggerLocation
@@ -546,7 +541,6 @@ type TriggerFallback = (
   | TriggerRecipeCrafted
   | TriggerRecipeUnlocked
   | TriggerRideEntityInLava
-  | TriggerSafelyHarvestHoney
   | TriggerShotCrossbow
   | TriggerSleptInBed
   | TriggerSlideDownBlock
@@ -565,7 +559,7 @@ type TriggerFallback = (
   | TriggerVoluntaryExile)
 type TriggerAllayDropItemOnBlock = Conditions<AllayDropItemOnBlock>
 type TriggerAnyBlockUse = Conditions<AnyBlockUse>
-type TriggerAvoidVibration = Conditions<Location>
+type TriggerAvoidVibration = Conditions<PlayerTrigger>
 type TriggerBeeNestDestroyed = Conditions<BeeNestDestroyed>
 type TriggerBredAnimals = Conditions<BredAnimals>
 type TriggerBrewedPotion = Conditions<BrewedPotion>
@@ -585,17 +579,16 @@ type TriggerFallAfterExplosion = Conditions<FallAfterExplosion>
 type TriggerFallFromHeight = Conditions<FallFromHeight>
 type TriggerFilledBucket = Conditions<FilledBucket>
 type TriggerFishingRodHooked = Conditions<FishingRodHooked>
-type TriggerHeroOfTheVillage = Conditions<Location>
+type TriggerHeroOfTheVillage = Conditions<PlayerTrigger>
 type TriggerImpossible = Conditions<TriggerBase>
 type TriggerInventoryChanged = Conditions<InventoryChanged>
 type TriggerItemDurabilityChanged = Conditions<ItemDurabilityChanged>
 type TriggerItemUsedOnBlock = Conditions<ItemUsedOnBlock>
 type TriggerKillMobNearSculkCatalyst = Conditions<KillMobNearSculkCatalyst>
 type TriggerKilledByArrow = Conditions<KilledByArrow>
-type TriggerKilledByCrossbow = Conditions<KilledByCrossbow>
 type TriggerLevitation = Conditions<Levitation>
 type TriggerLightningStrike = Conditions<LightningStrike>
-type TriggerLocation = Conditions<Location>
+type TriggerLocation = Conditions<PlayerTrigger>
 type TriggerNetherTravel = Conditions<NetherTravel>
 type TriggerPlacedBlock = Conditions<PlacedBlock>
 type TriggerPlayerGeneratesContainerLoot = RequiredConditions<PlayerGeneratesContainerLoot>
@@ -606,9 +599,8 @@ type TriggerPlayerShearedEquipment = Conditions<PlayerInteract>
 type TriggerRecipeCrafted = RequiredConditions<RecipeCrafted>
 type TriggerRecipeUnlocked = RequiredConditions<RecipeUnlocked>
 type TriggerRideEntityInLava = Conditions<RideEntityInLava>
-type TriggerSafelyHarvestHoney = Conditions<SafelyHarvestHoney>
 type TriggerShotCrossbow = Conditions<ShotCrossbow>
-type TriggerSleptInBed = Conditions<Location>
+type TriggerSleptInBed = Conditions<PlayerTrigger>
 type TriggerSlideDownBlock = Conditions<SlideDownBlock>
 type TriggerSpearMobs = Conditions<SpearMobs>
 type TriggerStartedRiding = Conditions<TriggerBase>
@@ -622,7 +614,7 @@ type TriggerUsedEnderEye = Conditions<UsedEnderEye>
 type TriggerUsedTotem = Conditions<UsedTotem>
 type TriggerUsingItem = Conditions<UsingItem>
 type TriggerVillagerTrade = Conditions<VillagerTrade>
-type TriggerVoluntaryExile = Conditions<Location>
+type TriggerVoluntaryExile = Conditions<PlayerTrigger>
 export type SymbolTrigger<CASE extends
   | 'map'
   | 'keys'

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

@@ -13,6 +13,7 @@ import type {
   TextureClass,
 } from 'sandstone'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
+import type { TextureType } from 'sandstone/arguments'
 
 export type Advancement = {
   /**
@@ -62,13 +63,13 @@ export type AdvancementCriteriaMap = ({
 })
 
 export type AdvancementCriterion = NonNullable<({
-  [S in Extract<Registry['minecraft:trigger_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:trigger_type'], string>, string>]?: ({
     /**
      * Many triggers can occur multiple times, however, the reward will only be provided multiple times if the advancement is first revoked, which is often done within the function reward.
      */
     trigger: S,
   } & (S extends keyof SymbolTrigger ? SymbolTrigger[S] : RootNBT))
-}[Registry['minecraft:trigger_type']])>
+}[Extract<Registry['minecraft:trigger_type'], string>])>
 
 export type AdvancementDisplay = {
   icon: ItemStackTemplate,
@@ -77,7 +78,7 @@ export type AdvancementDisplay = {
   /**
    * Used for the advancement tab (root advancement only).
    */
-  background?: (Registry['minecraft:texture'] | TextureClass),
+  background?: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   /**
    * Controls the advancement tile frame. Defaults to `task`.
    *

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

@@ -6,13 +6,13 @@ import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 
 export type ClickAction = NonNullable<({
-  [S in Extract<Registry['minecraft:dialog_action_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:dialog_action_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolDialogAction ? SymbolDialogAction[S] : RootNBT))
-}[Registry['minecraft:dialog_action_type']])>
+}[Extract<Registry['minecraft:dialog_action_type'], string>])>
 
 export type DynamicCustomAction = NonNullable<({
-  [S in Extract<`${string}:${string}`, string>]?: {
+  [S in Extract<Extract<`${string}:${string}`, string>, string>]?: {
     /**
      * ID of a custom action.
      * Has no functionality on vanilla servers.
@@ -25,7 +25,7 @@ export type DynamicCustomAction = NonNullable<({
       ? SymbolMcdocCustomDynamicEventAdditions[S]
       : SymbolMcdocCustomDynamicEventAdditions<'%unknown'>),
   }
-}[`${string}:${string}`])>
+}[Extract<`${string}:${string}`, string>])>
 
 export type DynamicRunCommand = {
   /**

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

@@ -5,10 +5,10 @@ import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { NBTInt } from 'sandstone'
 
 export type DialogBody = NonNullable<({
-  [S in Extract<Registry['minecraft:dialog_body_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:dialog_body_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolDialogBody ? SymbolDialogBody[S] : RootNBT))
-}[Registry['minecraft:dialog_body_type']])>
+}[Extract<Registry['minecraft:dialog_body_type'], string>])>
 
 export type ItemBody = {
   item: ItemStackTemplate,

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

@@ -27,7 +27,7 @@ export type BooleanInput = {
 }
 
 export type InputControl = NonNullable<({
-  [S in Extract<Registry['minecraft:input_control_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:input_control_type'], string>, string>]?: ({
     type: S,
     /**
      * The input key, which is used to build macro command and generate custom action payload.
@@ -43,7 +43,7 @@ export type InputControl = NonNullable<({
      */
     key: (`${any}${string}` | SymbolMcdocCustomDynamicEventKeys<'%fallback'>),
   } & (S extends keyof SymbolInputControl ? SymbolInputControl[S] : RootNBT))
-}[Registry['minecraft:input_control_type']])>
+}[Extract<Registry['minecraft:input_control_type'], string>])>
 
 export type MultiLine = {
   /**

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

@@ -50,13 +50,13 @@ export type ConfirmationDialog = (DialogBase & {
 })
 
 export type Dialog = NonNullable<({
-  [S in Extract<Registry['minecraft:dialog_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:dialog_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolDialog ? SymbolDialog[S] : RootNBT))
-}[Registry['minecraft:dialog_type']])>
+}[Extract<Registry['minecraft:dialog_type'], string>])>
 
 export type DialogBase = NonNullable<({
-  [S in Extract<AfterAction, string>]?: ({
+  [S in Extract<Extract<AfterAction, string>, string>]?: ({
     title: Text,
     /**
      * Name to be used for a button leading to this dialog.
@@ -91,7 +91,13 @@ export type DialogBase = NonNullable<({
   } & (S extends undefined
     ? SymbolMcdocDialogAfterAction<'%none'> :
     (S extends keyof SymbolMcdocDialogAfterAction ? SymbolMcdocDialogAfterAction[S] : RootNBT)))
-}[AfterAction])>
+}[Extract<AfterAction, string>])>
+
+export type DialogListRef = (
+  | Dialog
+  | Array<Dialog> | (
+  Registry['minecraft:dialog'] | `#${Registry['minecraft:tag/dialog']}` | TagClass<'dialog'> | DialogClass)
+  | Array<(Registry['minecraft:dialog'] | DialogClass)>)
 
 export type ListDialogBase = (DialogBase & {
   /**
@@ -131,10 +137,7 @@ export type NoticeDialog = (DialogBase & {
 })
 
 export type RedirectDialog = (ButtonListDialogBase & {
-  dialogs: (
-      | Array<((Registry['minecraft:dialog'] | DialogClass) | Dialog)> | (
-      Registry['minecraft:dialog'] | `#${Registry['minecraft:tag/dialog']}` | TagClass<'dialog'> | DialogClass)
-      | Dialog),
+  dialogs: DialogListRef,
 })
 
 export type ServerLinksDialog = ButtonListDialogBase

package/src/arguments/generated/data/enchantment/effect.ts

@@ -259,10 +259,10 @@ export type IgniteEntityEffect = {
 }
 
 export type LocationBasedEffect = NonNullable<({
-  [S in Extract<Registry['minecraft:enchantment_location_based_effect_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:enchantment_location_based_effect_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolLocationBasedEffect ? SymbolLocationBasedEffect[S] : RootNBT))
-}[Registry['minecraft:enchantment_location_based_effect_type']])>
+}[Extract<Registry['minecraft:enchantment_location_based_effect_type'], string>])>
 
 export type MultiplyEffectValue = {
   /**
@@ -422,10 +422,10 @@ export type SummonEntityEffect = {
 }
 
 export type ValueEffect = NonNullable<({
-  [S in Extract<Registry['minecraft:enchantment_value_effect_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:enchantment_value_effect_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolValueEffect ? SymbolValueEffect[S] : RootNBT))
-}[Registry['minecraft:enchantment_value_effect_type']])>
+}[Extract<Registry['minecraft:enchantment_value_effect_type'], string>])>
 type EntityEffectDispatcherMap = {
   'all_of': EntityEffectAllOf,
   'minecraft:all_of': EntityEffectAllOf,
@@ -439,8 +439,6 @@ type EntityEffectDispatcherMap = {
   'minecraft:change_item_damage': EntityEffectChangeItemDamage,
   'damage_entity': EntityEffectDamageEntity,
   'minecraft:damage_entity': EntityEffectDamageEntity,
-  'damage_item': EntityEffectDamageItem,
-  'minecraft:damage_item': EntityEffectDamageItem,
   'explode': EntityEffectExplode,
   'minecraft:explode': EntityEffectExplode,
   'ignite': EntityEffectIgnite,
@@ -468,7 +466,6 @@ type EntityEffectFallback = (
   | EntityEffectApplyMobEffect
   | EntityEffectChangeItemDamage
   | EntityEffectDamageEntity
-  | EntityEffectDamageItem
   | EntityEffectExplode
   | EntityEffectIgnite
   | EntityEffectPlaySound
@@ -484,7 +481,6 @@ type EntityEffectApplyImpulse = ApplyImpulseEntityEffect
 type EntityEffectApplyMobEffect = ApplyMobEffectEntityEffect
 type EntityEffectChangeItemDamage = ChangeItemDamageEffect
 type EntityEffectDamageEntity = DamageEntityEffect
-type EntityEffectDamageItem = DamageItemEffect
 type EntityEffectExplode = ExplodeEntityEffect
 type EntityEffectIgnite = IgniteEntityEffect
 type EntityEffectPlaySound = PlaySoundEntityEffect
@@ -517,8 +513,6 @@ type LocationBasedEffectDispatcherMap = {
   'minecraft:change_item_damage': LocationBasedEffectChangeItemDamage,
   'damage_entity': LocationBasedEffectDamageEntity,
   'minecraft:damage_entity': LocationBasedEffectDamageEntity,
-  'damage_item': LocationBasedEffectDamageItem,
-  'minecraft:damage_item': LocationBasedEffectDamageItem,
   'explode': LocationBasedEffectExplode,
   'minecraft:explode': LocationBasedEffectExplode,
   'ignite': LocationBasedEffectIgnite,
@@ -547,7 +541,6 @@ type LocationBasedEffectFallback = (
   | LocationBasedEffectAttribute
   | LocationBasedEffectChangeItemDamage
   | LocationBasedEffectDamageEntity
-  | LocationBasedEffectDamageItem
   | LocationBasedEffectExplode
   | LocationBasedEffectIgnite
   | LocationBasedEffectPlaySound
@@ -564,7 +557,6 @@ type LocationBasedEffectApplyMobEffect = ApplyMobEffectEntityEffect
 type LocationBasedEffectAttribute = AttributeEffect
 type LocationBasedEffectChangeItemDamage = ChangeItemDamageEffect
 type LocationBasedEffectDamageEntity = DamageEntityEffect
-type LocationBasedEffectDamageItem = DamageItemEffect
 type LocationBasedEffectExplode = ExplodeEntityEffect
 type LocationBasedEffectIgnite = IgniteEntityEffect
 type LocationBasedEffectPlaySound = PlaySoundEntityEffect