sandstone 1.0.0 → 1.0.2

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

@@ -26,6 +26,7 @@ import type { ENTITY_SLOTS } from 'sandstone/arguments'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type {
   EnchantmentClass,
+  LabelClass,
   LiteralUnion,
   NBTClass,
   NBTDouble,
@@ -52,9 +53,7 @@ export type BlockPredicate<S = undefined> = {
   blocks?: ((
       | Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
       | Array<Registry['minecraft:block']>),
-  state?: (S extends undefined
-    ? SymbolMcdocBlockStates<'%none'> :
-    (S extends keyof SymbolMcdocBlockStates ? SymbolMcdocBlockStates[S] : SymbolMcdocBlockStates<'%unknown'>)),
+  state?: BlockPredicateState,
   nbt?: ((`${any}${string}` | NBTClass) | (S extends keyof SymbolBlock ? SymbolBlock[S] : RootNBT)),
   /**
    * Match exact data component values on the block entity.
@@ -66,6 +65,8 @@ export type BlockPredicate<S = undefined> = {
   predicates?: DataComponentPredicate,
 }
 
+export type BlockPredicateState = SymbolMcdocBlockStates<'%unknown'>
+
 export type BoatPredicate = {
   /**
    * Value:
@@ -106,12 +107,20 @@ export type DamagePredicate = {
    * Source of the damage (eg: a skeleton shooting an arrow or player igniting tnt).
    */
   source_entity?: EntityPredicate,
-  /**
-   * The type of the damage source.
-   */
   type?: DamageSourcePredicate,
 }
 
+export type DamageSourceFlags = {
+  is_explosion?: boolean,
+  is_fire?: boolean,
+  is_magic?: boolean,
+  is_projectile?: boolean,
+  is_lightning?: boolean,
+  bypasses_armor?: boolean,
+  bypasses_invulnerability?: boolean,
+  bypasses_magic?: boolean,
+}
+
 export type DamageSourcePredicate = {
   /**
    * Damage type tags that the damage type is in.
@@ -132,9 +141,6 @@ export type DamageSourcePredicate = {
 }
 
 export type DamageTagPredicate = {
-  /**
-   * The damage type tag to check.
-   */
   id: (Registry['minecraft:tag/damage_type']),
   /**
    * Whether the damage is expected to have or not have the tag.
@@ -160,6 +166,14 @@ export type EnchantmentPredicate = {
   levels?: MinMaxBounds<NBTInt>,
 }
 
+export type EntityEffectsPredicate = ({
+  [Key in Extract<Registry['minecraft:mob_effect'], string>]?: MobEffectPredicate
+})
+
+export type EntityEquipmentPredicate = ({
+  [Key in Extract<EquipmentSlot, string>]?: ItemPredicate
+})
+
 export type EntityFlagsPredicate = {
   is_on_fire?: boolean,
   is_sneaking?: boolean,
@@ -172,61 +186,42 @@ export type EntityFlagsPredicate = {
   is_fall_flying?: boolean,
 }
 
-export type EntityPredicate<S = undefined> = {
-  type?: ((
-      | Registry['minecraft:entity_type'] | `#${Registry['minecraft:tag/entity_type']}` | TagClass<'entity_type'>)
-      | Array<Registry['minecraft:entity_type']>),
-  type_specific?: EntitySubPredicate,
-  team?: `${any}${string}`,
-  nbt?: ((`${any}${string}` | NBTClass) | (S extends keyof SymbolEntity ? SymbolEntity[S] : RootNBT)),
-  location?: LocationPredicate,
-  distance?: DistancePredicate,
-  flags?: EntityFlagsPredicate,
-  equipment?: ({
-    [Key in Extract<EquipmentSlot, string>]?: ItemPredicate
-  }),
-  vehicle?: EntityPredicate,
-  passenger?: EntityPredicate,
-  stepping_on?: LocationPredicate,
-  /**
-   * The entity that a mob's AI/aggro is targeting.
-   */
-  targeted_entity?: EntityPredicate,
-  effects?: ({
-    [Key in Extract<Registry['minecraft:mob_effect'], string>]?: MobEffectPredicate
-  }),
-  slots?: ({
-    [Key in Extract<LiteralUnion<ENTITY_SLOTS>, string>]?: ItemPredicate
-  }),
-  movement?: MovementPredicate,
-  /**
-   * True every `n` ticks of an entity's lifetime.
-   *
-   * Value:
-   * Range: 1..
-   */
-  periodic_tick?: NBTInt<{
-    min: 1,
-  }>,
+export type EntityPredicate = OldEntityPredicate
+
+export type EntitySlotsPredicate = ({
+  [Key in Extract<LiteralUnion<ENTITY_SLOTS>, string>]?: ItemPredicate
+})
+
+export type EntitySubPredicate = NonNullable<({
+  [S in Extract<Extract<Registry['minecraft:entity_sub_predicate_type'], string>, string>]?: ({
+    type: S,
+  } & (S extends keyof SymbolEntitySubPredicate ? SymbolEntitySubPredicate[S] : RootNBT))
+}[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
+    ? SymbolEntitySubPredicate[Key]
+    : RootNBT)
+})
+
+export type EntityTagPredicate = {
   /**
-   * Whether the block at most 0.5 blocks below the entity is present which can affect its movement.
+   * Must have at least one of the listed tags.
    */
-  movement_affected_by?: LocationPredicate,
+  any_of?: Array<`${any}${string}` | LabelClass>,
   /**
-   * Match exact data component values on the entity.
+   * Must have all the listed tags.
    */
-  components?: DataComponentExactPredicate,
+  all_of?: Array<`${any}${string}` | LabelClass>,
   /**
-   * Test data component values on the entity.
+   * Must have none of the listed tags.
    */
-  predicates?: DataComponentPredicate,
+  none_of?: Array<`${any}${string}` | LabelClass>,
 }
 
-export type EntitySubPredicate = NonNullable<({
-  [S in Extract<Registry['minecraft:entity_sub_predicate_type'], string>]?: ({
-    type: S,
-  } & (S extends keyof SymbolEntitySubPredicate ? SymbolEntitySubPredicate[S] : RootNBT))
-}[Registry['minecraft:entity_sub_predicate_type']])>
+export type EntityTypePredicate = ((
+  | Registry['minecraft:entity_type'] | `#${Registry['minecraft:tag/entity_type']}` | TagClass<'entity_type'>)
+  | Array<Registry['minecraft:entity_type']>)
 
 export type FishingHookPredicate = {
   in_open_water?: boolean,
@@ -241,6 +236,15 @@ export type FluidPredicate = {
   }),
 }
 
+export type FluidPredicateState = ({
+  [Key in `${any}${string}`]?: (MinMaxBounds<NBTInt> | boolean | string)
+})
+
+export type FoodPredicate = {
+  level?: MinMaxBounds<NBTInt>,
+  saturation?: MinMaxBounds<(NBTDouble | number)>,
+}
+
 export type FoxPredicate = {
   /**
    * Value:
@@ -274,6 +278,16 @@ export type HorsePredicate = {
   variant: HorseVariant,
 }
 
+export type InputPredicate = {
+  forward?: boolean,
+  backward?: boolean,
+  left?: boolean,
+  right?: boolean,
+  jump?: boolean,
+  sneak?: boolean,
+  sprint?: boolean,
+}
+
 export type ItemPredicate = {
   items?: ((
       | Registry['minecraft:item'] | `#${Registry['minecraft:tag/item']}` | TagClass<'item'>)
@@ -338,6 +352,19 @@ export type LocationPredicate = {
   can_see_sky?: boolean,
 }
 
+export type LocationPredicateLight = {
+  light?: MinMaxBounds<NBTInt<{
+    min: 0,
+    max: 15,
+  }>>,
+}
+
+export type LocationPredicatePosition = {
+  x?: MinMaxBounds<NBTFloat>,
+  y?: MinMaxBounds<NBTFloat>,
+  z?: MinMaxBounds<NBTFloat>,
+}
+
 export type MobEffectPredicate = {
   amplifier?: MinMaxBounds<NBTInt>,
   duration?: MinMaxBounds<NBTInt>,
@@ -365,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']
@@ -387,6 +458,16 @@ export type ParrotPredicate = {
   variant: ParrotVariant,
 }
 
+export type PlayerAdvancementCriteria = ({
+  [Key in `${any}${string}`]?: boolean
+})
+
+export type PlayerAdvancements = ({
+  [Key in Extract<Registry['minecraft:advancement'], string>]?: (boolean | ({
+    [Key in `${any}${string}`]?: boolean
+  }))
+})
+
 export type PlayerPredicate = {
   advancements?: ({
     [Key in Extract<Registry['minecraft:advancement'], string>]?: (boolean | ({
@@ -421,6 +502,29 @@ export type PlayerPredicate = {
   },
 }
 
+export type PlayerRecipes = ({
+  [Key in Extract<Registry['minecraft:recipe'], string>]?: boolean
+})
+
+export type PostComponentsItemPredicate = {
+  items?: ((
+      | Registry['minecraft:item'] | `#${Registry['minecraft:tag/item']}` | TagClass<'item'>)
+      | Array<Registry['minecraft:item']>),
+  count?: MinMaxBounds<NBTInt>,
+  components?: DataComponentExactPredicate,
+  predicates?: DataComponentPredicate,
+}
+
+export type PreComponentsItemPredicate = {
+  items?: Array<Registry['minecraft:item']>,
+  tag?: (Registry['minecraft:tag/item']),
+  durability?: MinMaxBounds<NBTInt>,
+  potion?: Registry['minecraft:potion'],
+  enchantments?: Array<EnchantmentPredicate>,
+  stored_enchantments?: Array<EnchantmentPredicate>,
+  nbt?: `${any}${string}` | NBTClass,
+}
+
 export type RabbitPredicate = {
   /**
    * Value:
@@ -483,17 +587,15 @@ 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 = {
   /**
-   * The pattern of the tropical fish.
-   *
    * Value:
    *
    *  - Kob(`kob`)
@@ -522,93 +624,33 @@ 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,
   'fishing_hook': EntitySubPredicateFishingHook,
   'minecraft:fishing_hook': EntitySubPredicateFishingHook,
-  '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,
-  'mooshroom': EntitySubPredicateMooshroom,
-  'minecraft:mooshroom': EntitySubPredicateMooshroom,
-  'painting': EntitySubPredicatePainting,
-  'minecraft:painting': EntitySubPredicatePainting,
-  'parrot': EntitySubPredicateParrot,
-  'minecraft:parrot': EntitySubPredicateParrot,
   'player': EntitySubPredicatePlayer,
   'minecraft:player': EntitySubPredicatePlayer,
-  'rabbit': EntitySubPredicateRabbit,
-  'minecraft:rabbit': EntitySubPredicateRabbit,
   'raider': EntitySubPredicateRaider,
   'minecraft:raider': EntitySubPredicateRaider,
-  'salmon': EntitySubPredicateSalmon,
-  'minecraft:salmon': EntitySubPredicateSalmon,
   'sheep': EntitySubPredicateSheep,
   'minecraft:sheep': EntitySubPredicateSheep,
   'slime': EntitySubPredicateSlime,
   'minecraft:slime': EntitySubPredicateSlime,
-  'tropical_fish': EntitySubPredicateTropicalFish,
-  'minecraft:tropical_fish': EntitySubPredicateTropicalFish,
-  'villager': EntitySubPredicateVillager,
-  'minecraft:villager': EntitySubPredicateVillager,
-  'wolf': EntitySubPredicateWolf,
-  'minecraft:wolf': EntitySubPredicateWolf,
 }
 type EntitySubPredicateKeys = keyof EntitySubPredicateDispatcherMap
 type EntitySubPredicateFallback = (
-  | EntitySubPredicateAxolotl
-  | EntitySubPredicateBoat
-  | EntitySubPredicateCat
   | EntitySubPredicateFishingHook
-  | EntitySubPredicateFox
-  | EntitySubPredicateFrog
-  | EntitySubPredicateHorse
   | EntitySubPredicateLightning
-  | EntitySubPredicateLlama
-  | EntitySubPredicateMooshroom
-  | EntitySubPredicatePainting
-  | EntitySubPredicateParrot
   | EntitySubPredicatePlayer
-  | EntitySubPredicateRabbit
   | EntitySubPredicateRaider
-  | EntitySubPredicateSalmon
   | EntitySubPredicateSheep
-  | EntitySubPredicateSlime
-  | EntitySubPredicateTropicalFish
-  | EntitySubPredicateVillager
-  | EntitySubPredicateWolf)
-type EntitySubPredicateAxolotl = AxolotlPredicate
-type EntitySubPredicateBoat = BoatPredicate
-type EntitySubPredicateCat = CatPredicate
+  | EntitySubPredicateSlime)
 type EntitySubPredicateFishingHook = FishingHookPredicate
-type EntitySubPredicateFox = FoxPredicate
-type EntitySubPredicateFrog = FrogPredicate
-type EntitySubPredicateHorse = HorsePredicate
 type EntitySubPredicateLightning = LightningBoltPredicate
-type EntitySubPredicateLlama = LlamaPredicate
-type EntitySubPredicateMooshroom = MooshroomPredicate
-type EntitySubPredicatePainting = PaintingPredicate
-type EntitySubPredicateParrot = ParrotPredicate
 type EntitySubPredicatePlayer = PlayerPredicate
-type EntitySubPredicateRabbit = RabbitPredicate
 type EntitySubPredicateRaider = RaiderPredicate
-type EntitySubPredicateSalmon = SalmonPredicate
 type EntitySubPredicateSheep = SheepPredicate
 type EntitySubPredicateSlime = SlimePredicate
-type EntitySubPredicateTropicalFish = TropicalFishPredicate
-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,
@@ -142,6 +142,11 @@ export type FishingRodHooked = (TriggerBase & {
   rod?: ItemPredicate,
 })
 
+export type HoneyHarvestedBlock = {
+  block?: Registry['minecraft:block'],
+  tag?: (Registry['minecraft:tag/block']),
+}
+
 export type InventoryChanged = (TriggerBase & {
   slots?: {
     /**
@@ -160,6 +165,21 @@ export type InventoryChanged = (TriggerBase & {
   items?: Array<ItemPredicate>,
 })
 
+export type InventoryChangedSlots = {
+  /**
+   * Amount of empty slots.
+   */
+  empty?: MinMaxBounds<NBTInt>,
+  /**
+   * Amount of occupied slots.
+   */
+  occupied?: MinMaxBounds<NBTInt>,
+  /**
+   * Amount of slots that are a full stack.
+   */
+  full?: MinMaxBounds<NBTInt>,
+}
+
 export type ItemDurabilityChanged = (TriggerBase & {
   /**
    * Change in durability (negative numbers are used to indicate a decrease in durability).
@@ -176,7 +196,7 @@ export type ItemDurabilityChanged = (TriggerBase & {
 })
 
 export type ItemUsedOnBlock = (TriggerBase & {
-  location?: Array<LootCondition>,
+  location?: AdvancementPredicateRef,
 })
 
 export type KilledByArrow = (TriggerBase & {
@@ -214,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.
@@ -231,7 +249,7 @@ export type PlacedBlock = (TriggerBase & {
   /**
    * Where the block was placed.
    */
-  location?: Array<LootCondition>,
+  location?: AdvancementPredicateRef,
 })
 
 export type PlayerGeneratesContainerLoot = (TriggerBase & {
@@ -253,6 +271,8 @@ export type PlayerKilledEntity = (TriggerBase & {
   killing_blow?: DamageSourcePredicate,
 })
 
+export type PlayerTrigger = TriggerBase
+
 export type RecipeCrafted = (TriggerBase & {
   recipe_id: (Registry['minecraft:recipe'] | RecipeClass),
   /**
@@ -418,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,
@@ -446,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,
@@ -512,7 +528,6 @@ type TriggerFallback = (
   | TriggerItemUsedOnBlock
   | TriggerKillMobNearSculkCatalyst
   | TriggerKilledByArrow
-  | TriggerKilledByCrossbow
   | TriggerLevitation
   | TriggerLightningStrike
   | TriggerLocation
@@ -526,7 +541,6 @@ type TriggerFallback = (
   | TriggerRecipeCrafted
   | TriggerRecipeUnlocked
   | TriggerRideEntityInLava
-  | TriggerSafelyHarvestHoney
   | TriggerShotCrossbow
   | TriggerSleptInBed
   | TriggerSlideDownBlock
@@ -545,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>
@@ -565,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>
@@ -586,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>
@@ -602,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'