sandstone 1.1.0 → 1.1.2

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

@@ -4,16 +4,14 @@ import type {
   LocationBasedEffect,
   ValueEffect,
 } from 'sandstone/arguments/generated/data/enchantment/effect.ts'
-import type { NonReferencePredicate } from 'sandstone/arguments/generated/data/predicate.ts'
+import type { Predicate } from 'sandstone/arguments/generated/data/predicate.ts'
 import type { SoundEventRef } from 'sandstone/arguments/generated/data/util.ts'
-import type { Registry } from 'sandstone/arguments/generated/registry.ts'
-import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 
 export type AmmoUseEnchantmentEffect = {
   /**
    * Predicate context: Item Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of ammunition being used up. \
    * `0` has a side effect of applying `intangible_projectile` component to the projectile item.
@@ -25,7 +23,7 @@ export type ArmorEffectivenessEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Determines armor effectiveness; `0.0` for no effect, `1.0` for full effect.
    */
@@ -38,7 +36,7 @@ export type BlockExperienceEnchantmentEffect = {
   /**
    * Predicate context: Item Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of experience awarded.
    */
@@ -64,7 +62,7 @@ export type DamageEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Damage dealt by the weapon.
    */
@@ -75,7 +73,7 @@ export type DamageImmunityEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Dummy value; this is a boolean effect.
    */
@@ -86,7 +84,7 @@ export type DamageProtectionEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Damage reduction factor. \
    * Provides `factor * 4%` of damage reduction, capped at 80%.
@@ -95,16 +93,14 @@ export type DamageProtectionEnchantmentEffect = {
 }
 
 export type EnchantmentEffectComponentMap = ({
-  [Key in Extract<Registry['minecraft:enchantment_effect_component_type'], string>]?: (Key extends keyof SymbolEffectComponent
-    ? SymbolEffectComponent[Key]
-    : RootNBT)
+  [Key in Extract<keyof SymbolEffectComponent, string>]?: SymbolEffectComponent[Key]
 })
 
 export type EquipmentDropsEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Chance between `0.0` and `1.0` of an equipped piece dropping. \
    * If the drop chance on mob is 0, the chance will not be affected by this effect.
@@ -122,7 +118,7 @@ export type FishingLuckBonusEnchantmentEffect = {
    *
    * `this` is the player fishing.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of luck being added.
    */
@@ -135,7 +131,7 @@ export type FishingTimeReductionEnchantmentEffect = {
    *
    * `this` is the player fishing.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Time reduction in seconds (higher values mean less time until a fish bites).
    */
@@ -148,7 +144,7 @@ export type HitBlockEnchantmentEffect = {
    *
    * `this` is the entity hitting the Block, unless during a projectile attack, then, `this` is the projectile.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * On the entity hitting the Block
    */
@@ -159,7 +155,7 @@ export type ItemDamageEnchantmentEffect = {
   /**
    * Predicate context: Item Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of damage being dealt to the item.
    */
@@ -170,7 +166,7 @@ export type KnockbackEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of knockback being applied.
    */
@@ -181,7 +177,7 @@ export type LocationChangedEnchantmentEffect = {
   /**
    * Predicate context: Location Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * On the entity changing location.
    */
@@ -194,7 +190,7 @@ export type MobExperienceEnchantmentEffect = {
    *
    * `this` is the killed mob.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of experience awarded.
    */
@@ -205,7 +201,7 @@ export type PostAttackEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Examples:
    * - A Fire Aspect Enchant would specify that when the attacker is enchanted, the `ignite` effect is applied, and the affected party is the victim.
@@ -236,7 +232,7 @@ export type PostPiercingAttackEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * The effect to apply on attacker.
    */
@@ -249,7 +245,7 @@ export type ProjectileCountEnchantmentEffect = {
    *
    * `this` is the entity drawing the weapon.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of projectiles being loaded/drawn. \
    * All projectile items except the first one will have `intangible_projectile` component applied.
@@ -263,7 +259,7 @@ export type ProjectilePiercingEnchantmentEffect = {
    *
    * Tool is the ammunition item.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of entities the projectile will pierce through before despawning.
    */
@@ -276,7 +272,7 @@ export type ProjectileSpawnedEnchantmentEffect = {
    *
    * `this` is the newly spawned projectile.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * On the newly spawned projectile.
    */
@@ -289,7 +285,7 @@ export type ProjectileSpreadEnchantmentEffect = {
    *
    * `this` is the entity shooting the projectile.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Maximum spread of projectiles measured in degrees from the aim line.
    */
@@ -300,7 +296,7 @@ export type RepairWithXpEnchantmentEffect = {
   /**
    * Predicate context: Item Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of durability increase per experience point, `mending` uses 2x.
    */
@@ -311,7 +307,7 @@ export type SmashDamagePerBlockFallenEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of damage dealt per block fallen.
    */
@@ -324,7 +320,7 @@ export type TickEnchantmentEffect = {
    *
    * `this` is the entity with the Enchanted Item.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * On every tick. Performance recommendation: don't use with `run_function` unless necessary.
    */
@@ -337,7 +333,7 @@ export type TridentReturnAccelerationEnchantmentEffect = {
    *
    * `this` is the trident entity.
    */
-  requirements?: NonReferencePredicate,
+  requirements?: Predicate,
   /**
    * Amount of acceleration applied to the returning trident.
    */

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

@@ -21,10 +21,10 @@ export type FractionLevelValue = {
 export type LevelBasedValue = (NBTFloat | LevelBasedValueMap)
 
 export type LevelBasedValueMap = NonNullable<({
-  [S in Extract<Registry['minecraft:enchantment_level_based_value_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:enchantment_level_based_value_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolLevelBasedValue ? SymbolLevelBasedValue[S] : RootNBT))
-}[Registry['minecraft:enchantment_level_based_value_type']])>
+}[Extract<Registry['minecraft:enchantment_level_based_value_type'], string>])>
 
 export type LinearLevelValue = {
   /**

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

@@ -34,10 +34,10 @@ export type ByCostWithDifficultyEnchantmentProvider = {
 }
 
 export type EnchantmentProvider = NonNullable<({
-  [S in Extract<Registry['minecraft:enchantment_provider_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:enchantment_provider_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolEnchantmentProvider ? SymbolEnchantmentProvider[S] : RootNBT))
-}[Registry['minecraft:enchantment_provider_type']])>
+}[Extract<Registry['minecraft:enchantment_provider_type'], string>])>
 
 /**
  * *either*

package/src/arguments/generated/data/gametest/test_environment.ts

@@ -62,10 +62,10 @@ export type IntGameRule = {
 }
 
 export type TestEnvironment = NonNullable<({
-  [S in Extract<Registry['minecraft:test_environment_definition_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:test_environment_definition_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolTestEnvironmentDefinition ? SymbolTestEnvironmentDefinition[S] : RootNBT))
-}[Registry['minecraft:test_environment_definition_type']])>
+}[Extract<Registry['minecraft:test_environment_definition_type'], string>])>
 
 export type TimelineAttributesTestEnvironment = {
   timelines: Array<(Registry['minecraft:timeline'] | TimelineClass)>,
@@ -104,8 +104,6 @@ type TestEnvironmentDefinitionDispatcherMap = {
   'minecraft:function': TestEnvironmentDefinitionFunction,
   'game_rules': TestEnvironmentDefinitionGameRules,
   'minecraft:game_rules': TestEnvironmentDefinitionGameRules,
-  'time_of_day': TestEnvironmentDefinitionTimeOfDay,
-  'minecraft:time_of_day': TestEnvironmentDefinitionTimeOfDay,
   'timeline_attributes': TestEnvironmentDefinitionTimelineAttributes,
   'minecraft:timeline_attributes': TestEnvironmentDefinitionTimelineAttributes,
   'weather': TestEnvironmentDefinitionWeather,
@@ -118,7 +116,6 @@ type TestEnvironmentDefinitionFallback = (
   | TestEnvironmentDefinitionDifficulty
   | TestEnvironmentDefinitionFunction
   | TestEnvironmentDefinitionGameRules
-  | TestEnvironmentDefinitionTimeOfDay
   | TestEnvironmentDefinitionTimelineAttributes
   | TestEnvironmentDefinitionWeather)
 type TestEnvironmentDefinitionAllOf = AllOffTestEnvironment
@@ -126,7 +123,6 @@ type TestEnvironmentDefinitionClockTime = ClockTimeTestEnvironment
 type TestEnvironmentDefinitionDifficulty = DifficultyTestEnvironment
 type TestEnvironmentDefinitionFunction = FunctionTestEnvironment
 type TestEnvironmentDefinitionGameRules = GameRulesTestEnvironment
-type TestEnvironmentDefinitionTimeOfDay = TimeOfDayTestEnvironment
 type TestEnvironmentDefinitionTimelineAttributes = TimelineAttributesTestEnvironment
 type TestEnvironmentDefinitionWeather = WeatherTestEnvironment
 export type SymbolTestEnvironmentDefinition<CASE extends

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

@@ -94,10 +94,10 @@ export type TestData = {
 }
 
 export type TestInstance = NonNullable<({
-  [S in Extract<Registry['minecraft:test_instance_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:test_instance_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolTestInstance ? SymbolTestInstance[S] : RootNBT))
-}[Registry['minecraft:test_instance_type']])>
+}[Extract<Registry['minecraft:test_instance_type'], string>])>
 type TestInstanceDispatcherMap = {
   'block_based': TestInstanceBlockBased,
   'minecraft:block_based': TestInstanceBlockBased,

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

@@ -1,5 +1,3 @@
-import type { LootFunction, NonReferenceLootFunction } from 'sandstone/arguments/generated/data/loot.ts'
+import type { LootFunction } from 'sandstone/arguments/generated/data/loot/function.ts'
 
 export type ItemModifier = (LootFunction | Array<LootFunction>)
-
-export type NonReferenceItemModifier = (NonReferenceLootFunction | Array<NonReferenceLootFunction>)

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

@@ -5,11 +5,13 @@ import type {
   LocationPredicate,
 } from 'sandstone/arguments/generated/data/advancement/predicate.ts'
 import type { LevelBasedValue } from 'sandstone/arguments/generated/data/enchantment/level_based_value.ts'
-import type { EntityTarget, LootCondition } from 'sandstone/arguments/generated/data/loot.ts'
-import type { IntRange, NumberProvider } from 'sandstone/arguments/generated/data/util.ts'
+import type { EntityTarget } from 'sandstone/arguments/generated/data/loot.ts'
+import type { NumberProviderRef } from 'sandstone/arguments/generated/data/number_provider.ts'
+import type { PredicateListRef, PredicateRef } from 'sandstone/arguments/generated/data/predicate.ts'
+import type { IntRange } from 'sandstone/arguments/generated/data/util.ts'
 import type { SymbolEnvironmentAttribute, SymbolMcdocBlockStates } from 'sandstone/arguments/generated/dispatcher.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
-import type { NBTObject, RootNBT } from 'sandstone/arguments/nbt.ts'
+import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type {
   EnchantmentClass,
   NBTFloat,
@@ -20,6 +22,24 @@ import type {
   WorldClockClass,
 } from 'sandstone'
 
+export type AllOf = {
+  /**
+   * Passes when all of these conditions pass.
+   */
+  terms: PredicateListRef,
+}
+
+export type Alternative = {
+  terms: Array<LootCondition>,
+}
+
+export type AnyOf = {
+  /**
+   * Passes when any of these conditions pass.
+   */
+  terms: PredicateListRef,
+}
+
 export type BlockStateProperty = {
   block: Registry['minecraft:block'],
   properties?: SymbolMcdocBlockStates<'%none'>,
@@ -72,13 +92,17 @@ export type EntityScores = {
 }
 
 export type EnvironmentAttributeCheck = NonNullable<({
-  [S in Extract<Registry['minecraft:environment_attribute'], string>]?: {
+  [S in Extract<Extract<Registry['minecraft:environment_attribute'], string>, string>]?: {
     attribute: S,
     value: (S extends keyof SymbolEnvironmentAttribute
       ? SymbolEnvironmentAttribute[S]
       : SymbolEnvironmentAttribute<'%unknown'>),
   }
-}[Registry['minecraft:environment_attribute']])>
+}[Extract<Registry['minecraft:environment_attribute'], string>])>
+
+export type Inverted = {
+  term: PredicateRef,
+}
 
 export type KilledByPlayer = {
   inverse?: boolean,
@@ -91,8 +115,11 @@ export type LocationCheck = {
   predicate: LocationPredicate,
 }
 
-// TODO: Make this actually work properly
-export type LootConditionOf<C extends NBTObject> = Array<LootCondition>
+export type LootCondition = NonNullable<({
+  [S in Extract<Extract<Registry['minecraft:loot_condition_type'], string>, string>]?: ({
+    condition: S,
+  } & (S extends keyof SymbolLootCondition ? SymbolLootCondition[S] : RootNBT))
+}[Extract<Registry['minecraft:loot_condition_type'], string>])>
 
 export type MatchTool = {
   predicate: ItemPredicate,
@@ -102,7 +129,7 @@ export type RandomChance = {
   /**
    * Clamps to a float between `0` & `1` (inclusive).
    */
-  chance: NumberProvider,
+  chance: NumberProviderRef,
 }
 
 export type RandomChanceWithEnchantedBonus = {
@@ -177,7 +204,7 @@ export type ValueCheck = {
   /**
    * Clamps to an integer.
    */
-  value: NumberProvider,
+  value: NumberProviderRef,
   /**
    * Passes when `value` is within this range.
    */
@@ -188,134 +215,91 @@ export type WeatherCheck = {
   raining?: boolean,
   thundering?: boolean,
 }
-type LootConditionDispatcherMap<C extends NBTObject> = {
-  'all_of': LootConditionAllOf<C>,
-  'minecraft:all_of': LootConditionAllOf<C>,
-  'alternative': LootConditionAlternative<C>,
-  'minecraft:alternative': LootConditionAlternative<C>,
-  'any_of': LootConditionAnyOf<C>,
-  'minecraft:any_of': LootConditionAnyOf<C>,
-  'block_state_property': LootConditionBlockStateProperty<C>,
-  'minecraft:block_state_property': LootConditionBlockStateProperty<C>,
-  'damage_source_properties': LootConditionDamageSourceProperties<C>,
-  'minecraft:damage_source_properties': LootConditionDamageSourceProperties<C>,
-  'enchantment_active_check': LootConditionEnchantmentActiveCheck<C>,
-  'minecraft:enchantment_active_check': LootConditionEnchantmentActiveCheck<C>,
-  'entity_properties': LootConditionEntityProperties<C>,
-  'minecraft:entity_properties': LootConditionEntityProperties<C>,
-  'entity_scores': LootConditionEntityScores<C>,
-  'minecraft:entity_scores': LootConditionEntityScores<C>,
-  'environment_attribute_check': LootConditionEnvironmentAttributeCheck<C>,
-  'minecraft:environment_attribute_check': LootConditionEnvironmentAttributeCheck<C>,
-  'inverted': LootConditionInverted<C>,
-  'minecraft:inverted': LootConditionInverted<C>,
-  'killed_by_player': LootConditionKilledByPlayer<C>,
-  'minecraft:killed_by_player': LootConditionKilledByPlayer<C>,
-  'location_check': LootConditionLocationCheck<C>,
-  'minecraft:location_check': LootConditionLocationCheck<C>,
-  'match_tool': LootConditionMatchTool<C>,
-  'minecraft:match_tool': LootConditionMatchTool<C>,
-  'random_chance': LootConditionRandomChance<C>,
-  'minecraft:random_chance': LootConditionRandomChance<C>,
-  'random_chance_with_enchanted_bonus': LootConditionRandomChanceWithEnchantedBonus<C>,
-  'minecraft:random_chance_with_enchanted_bonus': LootConditionRandomChanceWithEnchantedBonus<C>,
-  'random_chance_with_looting': LootConditionRandomChanceWithLooting<C>,
-  'minecraft:random_chance_with_looting': LootConditionRandomChanceWithLooting<C>,
-  'reference': LootConditionReference<C>,
-  'minecraft:reference': LootConditionReference<C>,
-  'table_bonus': LootConditionTableBonus<C>,
-  'minecraft:table_bonus': LootConditionTableBonus<C>,
-  'time_check': LootConditionTimeCheck<C>,
-  'minecraft:time_check': LootConditionTimeCheck<C>,
-  'value_check': LootConditionValueCheck<C>,
-  'minecraft:value_check': LootConditionValueCheck<C>,
-  'weather_check': LootConditionWeatherCheck<C>,
-  'minecraft:weather_check': LootConditionWeatherCheck<C>,
-}
-type LootConditionKeys = keyof LootConditionDispatcherMap<NBTObject>
-type LootConditionFallback<C extends NBTObject> = (
-  | LootConditionAllOf<C>
-  | LootConditionAlternative<C>
-  | LootConditionAnyOf<C>
-  | LootConditionBlockStateProperty<C>
-  | LootConditionDamageSourceProperties<C>
-  | LootConditionEnchantmentActiveCheck<C>
-  | LootConditionEntityProperties<C>
-  | LootConditionEntityScores<C>
-  | LootConditionEnvironmentAttributeCheck<C>
-  | LootConditionInverted<C>
-  | LootConditionKilledByPlayer<C>
-  | LootConditionLocationCheck<C>
-  | LootConditionMatchTool<C>
-  | LootConditionRandomChance<C>
-  | LootConditionRandomChanceWithEnchantedBonus<C>
-  | LootConditionRandomChanceWithLooting<C>
-  | LootConditionReference<C>
-  | LootConditionTableBonus<C>
-  | LootConditionTimeCheck<C>
-  | LootConditionValueCheck<C>
-  | LootConditionWeatherCheck<C>)
-export type LootConditionAllOf<C extends NBTObject> = {
-  /**
-   * Passes when all of these conditions pass.
-   */
-  terms: Array<LootConditionOf<C>>,
+type LootConditionDispatcherMap = {
+  'all_of': LootConditionAllOf,
+  'minecraft:all_of': LootConditionAllOf,
+  'any_of': LootConditionAnyOf,
+  'minecraft:any_of': LootConditionAnyOf,
+  'block_state_property': LootConditionBlockStateProperty,
+  'minecraft:block_state_property': LootConditionBlockStateProperty,
+  'damage_source_properties': LootConditionDamageSourceProperties,
+  'minecraft:damage_source_properties': LootConditionDamageSourceProperties,
+  'enchantment_active_check': LootConditionEnchantmentActiveCheck,
+  'minecraft:enchantment_active_check': LootConditionEnchantmentActiveCheck,
+  'entity_properties': LootConditionEntityProperties,
+  'minecraft:entity_properties': LootConditionEntityProperties,
+  'entity_scores': LootConditionEntityScores,
+  'minecraft:entity_scores': LootConditionEntityScores,
+  'environment_attribute_check': LootConditionEnvironmentAttributeCheck,
+  'minecraft:environment_attribute_check': LootConditionEnvironmentAttributeCheck,
+  'inverted': LootConditionInverted,
+  'minecraft:inverted': LootConditionInverted,
+  'killed_by_player': LootConditionKilledByPlayer,
+  'minecraft:killed_by_player': LootConditionKilledByPlayer,
+  'location_check': LootConditionLocationCheck,
+  'minecraft:location_check': LootConditionLocationCheck,
+  'match_tool': LootConditionMatchTool,
+  'minecraft:match_tool': LootConditionMatchTool,
+  'random_chance': LootConditionRandomChance,
+  'minecraft:random_chance': LootConditionRandomChance,
+  'random_chance_with_enchanted_bonus': LootConditionRandomChanceWithEnchantedBonus,
+  'minecraft:random_chance_with_enchanted_bonus': LootConditionRandomChanceWithEnchantedBonus,
+  'reference': LootConditionReference,
+  'minecraft:reference': LootConditionReference,
+  'table_bonus': LootConditionTableBonus,
+  'minecraft:table_bonus': LootConditionTableBonus,
+  'time_check': LootConditionTimeCheck,
+  'minecraft:time_check': LootConditionTimeCheck,
+  'value_check': LootConditionValueCheck,
+  'minecraft:value_check': LootConditionValueCheck,
+  'weather_check': LootConditionWeatherCheck,
+  'minecraft:weather_check': LootConditionWeatherCheck,
 }
-
-export type LootConditionAlternative<C extends NBTObject> = {
-  terms: Array<LootConditionOf<C>>,
-}
-
-export type LootConditionAnyOf<C extends NBTObject> = {
-  /**
-   * Passes when any of these conditions pass.
-   */
-  terms: Array<LootConditionOf<C>>,
-}
-
-export type LootConditionBlockStateProperty<C extends NBTObject> = BlockStateProperty
-
-export type LootConditionDamageSourceProperties<C extends NBTObject> = DamageSourceProperties
-
-export type LootConditionEnchantmentActiveCheck<C extends NBTObject> = EnchantmentActiveCheck
-
-export type LootConditionEntityProperties<C extends NBTObject> = EntityProperties
-
-export type LootConditionEntityScores<C extends NBTObject> = EntityScores
-
-export type LootConditionEnvironmentAttributeCheck<C extends NBTObject> = EnvironmentAttributeCheck
-
-export type LootConditionInverted<C extends NBTObject> = {
-  term: LootConditionOf<C>,
-}
-
-export type LootConditionKilledByPlayer<C extends NBTObject> = KilledByPlayer
-
-export type LootConditionLocationCheck<C extends NBTObject> = LocationCheck
-
-export type LootConditionMatchTool<C extends NBTObject> = MatchTool
-
-export type LootConditionRandomChance<C extends NBTObject> = RandomChance
-
-export type LootConditionRandomChanceWithEnchantedBonus<C extends NBTObject> = RandomChanceWithEnchantedBonus
-
-export type LootConditionRandomChanceWithLooting<C extends NBTObject> = RandomChanceWithLooting
-
-export type LootConditionReference<C extends NBTObject> = Reference
-
-export type LootConditionTableBonus<C extends NBTObject> = TableBonus
-
-export type LootConditionTimeCheck<C extends NBTObject> = TimeCheck
-
-export type LootConditionValueCheck<C extends NBTObject> = ValueCheck
-
-export type LootConditionWeatherCheck<C extends NBTObject> = WeatherCheck
-
-export type SymbolLootCondition<C extends NBTObject, CASE extends
+type LootConditionKeys = keyof LootConditionDispatcherMap
+type LootConditionFallback = (
+  | LootConditionAllOf
+  | LootConditionAnyOf
+  | LootConditionBlockStateProperty
+  | LootConditionDamageSourceProperties
+  | LootConditionEnchantmentActiveCheck
+  | LootConditionEntityProperties
+  | LootConditionEntityScores
+  | LootConditionEnvironmentAttributeCheck
+  | LootConditionInverted
+  | LootConditionKilledByPlayer
+  | LootConditionLocationCheck
+  | LootConditionMatchTool
+  | LootConditionRandomChance
+  | LootConditionRandomChanceWithEnchantedBonus
+  | LootConditionReference
+  | LootConditionTableBonus
+  | LootConditionTimeCheck
+  | LootConditionValueCheck
+  | LootConditionWeatherCheck)
+type LootConditionAllOf = AllOf
+type LootConditionAnyOf = AnyOf
+type LootConditionBlockStateProperty = BlockStateProperty
+type LootConditionDamageSourceProperties = DamageSourceProperties
+type LootConditionEnchantmentActiveCheck = EnchantmentActiveCheck
+type LootConditionEntityProperties = EntityProperties
+type LootConditionEntityScores = EntityScores
+type LootConditionEnvironmentAttributeCheck = EnvironmentAttributeCheck
+type LootConditionInverted = Inverted
+type LootConditionKilledByPlayer = KilledByPlayer
+type LootConditionLocationCheck = LocationCheck
+type LootConditionMatchTool = MatchTool
+type LootConditionRandomChance = RandomChance
+type LootConditionRandomChanceWithEnchantedBonus = RandomChanceWithEnchantedBonus
+type LootConditionReference = Reference
+type LootConditionTableBonus = TableBonus
+type LootConditionTimeCheck = TimeCheck
+type LootConditionValueCheck = ValueCheck
+type LootConditionWeatherCheck = WeatherCheck
+export type SymbolLootCondition<CASE extends
   | 'map'
   | 'keys'
   | '%fallback'
   | '%none'
   | '%unknown' = 'map'> = CASE extends 'map'
-  ? LootConditionDispatcherMap<C>
-  : CASE extends 'keys' ? LootConditionKeys : CASE extends '%fallback' ? LootConditionFallback<C> : never
+  ? LootConditionDispatcherMap
+  : CASE extends 'keys' ? LootConditionKeys : CASE extends '%fallback' ? LootConditionFallback : never