sandstone 1.0.0 → 1.0.2

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 = {
   /**
@@ -57,14 +58,18 @@ export type Advancement = {
   sends_telemetry_event?: boolean,
 }
 
+export type AdvancementCriteriaMap = ({
+  [Key in `${any}${string}`]?: AdvancementCriterion
+})
+
 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,
@@ -73,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`.
    *
@@ -110,9 +115,9 @@ export type AdvancementIcon = {
 
 export type AdvancementRewards = {
   /**
-   * Function to run as the player (not at). Function group tags are not allowed.
+   * XP to add.
    */
-  function?: (`${string}:${string}` | MCFunctionClass),
+  experience?: NBTInt,
   /**
    * Loot tables to give.
    */
@@ -122,9 +127,9 @@ export type AdvancementRewards = {
    */
   recipes?: Array<(Registry['minecraft:recipe'] | RecipeClass)>,
   /**
-   * XP to add.
+   * Function to run as and at the player. Function tags are not allowed.
    */
-  experience?: NBTInt,
+  function?: (`${string}:${string}` | MCFunctionClass),
 }
 
 export type Trigger = (

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

@@ -10,8 +10,8 @@ export type ChatDecoration = ({
 export type ChatDecorationParameter = ('sender' | 'content' | 'team_name' | 'target')
 
 export type ChatType = {
-  chat?: ChatDecoration,
-  narration?: ChatDecoration,
+  chat: ChatDecoration,
+  narration: ChatDecoration,
 }
 
 export type Narration = {
@@ -27,6 +27,12 @@ export type Narration = {
 
 export type NarrationPriority = ('chat' | 'system')
 
+export type OldChatType = {
+  chat?: TextDisplay,
+  overlay?: TextDisplay,
+  narration?: Narration,
+}
+
 export type TextDisplay = {
   decoration?: ChatDecoration,
 }

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

@@ -0,0 +1,8 @@
+export type DecoratedPotPattern = {
+  /**
+   * Value:
+   *
+   * Value: A texture ID within a path root of `(namespace)/textures/entity/decorated_pot/`
+   */
+  asset_id: `${string}:${string}`,
+}

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,29 @@ 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 = {
+  /**
+   * Value:
+   * Range: 1..
+   */
+  max_lines?: NBTInt<{
+    min: 1,
+  }>,
+  /**
+   * Height of the input.
+   * If this field is not present:
+   * - If `max_lines` is present, the height will be chosen to fit the maximum number of lines. The chosen height is capped at 512.
+   * - If `max_lines` is also not present, the height will be chosen to fit 4 lines.
+   *
+   * Value:
+   * Range: 1..512
+   */
+  height?: NBTInt<{
+    min: 1,
+  }>,
+}
 
 export type NumberRangeInput = {
   /**

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

@@ -5,7 +5,7 @@ import type { SymbolMcdocDialogAfterAction } from 'sandstone/arguments/generated
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { Text } from 'sandstone/arguments/generated/util/text.ts'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
-import type { DialogClass, NamespacedLiteralUnion, NBTInt, NBTList, TagClass } from 'sandstone'
+import type { DialogClass, NBTInt, NBTList, TagClass } from 'sandstone'
 
 export type AfterAction = ('close' | 'none' | 'wait_for_response')
 
@@ -50,13 +50,13 @@ export type ConfirmationDialog = (DialogBase & {
 })
 
 export type Dialog = NonNullable<({
-  [S in NamespacedLiteralUnion<keyof SymbolDialog>]?: ({
+  [S in Extract<Extract<Registry['minecraft:dialog_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolDialog ? SymbolDialog[S] : RootNBT))
-}[NamespacedLiteralUnion<keyof SymbolDialog>])>
+}[Extract<Registry['minecraft:dialog_type'], string>])>
 
 export type DialogBase = NonNullable<({
-  [S in NamespacedLiteralUnion<keyof SymbolMcdocDialogAfterAction>]?: ({
+  [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)))
-}[NamespacedLiteralUnion<keyof SymbolMcdocDialogAfterAction>])>
+}[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

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 { LootCondition } from 'sandstone/arguments/generated/data/loot.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?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * Amount of experience awarded.
    */
@@ -64,7 +62,7 @@ export type DamageEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * Damage dealt by the weapon.
    */
@@ -75,7 +73,7 @@ export type DamageImmunityEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * Dummy value; this is a boolean effect.
    */
@@ -86,7 +84,7 @@ export type DamageProtectionEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * Amount of luck being added.
    */
@@ -135,7 +131,7 @@ export type FishingTimeReductionEnchantmentEffect = {
    *
    * `this` is the player fishing.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * On the entity hitting the Block
    */
@@ -159,7 +155,7 @@ export type ItemDamageEnchantmentEffect = {
   /**
    * Predicate context: Item Parameters.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * Amount of damage being dealt to the item.
    */
@@ -170,7 +166,7 @@ export type KnockbackEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * Amount of knockback being applied.
    */
@@ -181,7 +177,7 @@ export type LocationChangedEnchantmentEffect = {
   /**
    * Predicate context: Location Parameters.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * On the entity changing location.
    */
@@ -194,7 +190,7 @@ export type MobExperienceEnchantmentEffect = {
    *
    * `this` is the killed mob.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * Amount of experience awarded.
    */
@@ -205,7 +201,7 @@ export type PostAttackEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * The effect to apply on attacker.
    */
@@ -249,7 +245,7 @@ export type ProjectileCountEnchantmentEffect = {
    *
    * `this` is the entity drawing the weapon.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * On the newly spawned projectile.
    */
@@ -289,7 +285,7 @@ export type ProjectileSpreadEnchantmentEffect = {
    *
    * `this` is the entity shooting the projectile.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  requirements?: Predicate,
   /**
    * Amount of durability increase per experience point, `mending` uses 2x.
    */
@@ -311,7 +307,7 @@ export type SmashDamagePerBlockFallenEnchantmentEffect = {
   /**
    * Predicate context: Damage Parameters.
    */
-  requirements?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  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?: (LootCondition | Array<LootCondition>),
+  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

@@ -23,11 +23,31 @@ export type ClockTimeTestEnvironment = {
   }>,
 }
 
+export type Difficulty = ('peaceful' | 'easy' | 'normal' | 'hard')
+
+export type DifficultyTestEnvironment = {
+  /**
+   * Value:
+   *
+   *  - Peaceful(`peaceful`)
+   *  - Easy(`easy`)
+   *  - Normal(`normal`)
+   *  - Hard(`hard`)
+   */
+  difficulty: Difficulty,
+}
+
 export type FunctionTestEnvironment = {
   setup?: (`${string}:${string}` | MCFunctionClass),
   teardown?: (`${string}:${string}` | MCFunctionClass),
 }
 
+export type GameRuleMap = ({
+  [Key in Extract<Registry['minecraft:game_rule'], string>]?: (Key extends keyof SymbolGameRule
+    ? SymbolGameRule[Key]
+    : RootNBT)
+})
+
 export type GameRulesTestEnvironment = {
   rules: ({
     [Key in Extract<Registry['minecraft:game_rule'], string>]?: (Key extends keyof SymbolGameRule
@@ -42,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)>,

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

@@ -1,5 +1,6 @@
 import type { TestEnvironment } from 'sandstone/arguments/generated/data/gametest/test_environment.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { Rotation } from 'sandstone/arguments/generated/util.ts'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { NBTInt, StructureClass, TestEnvironmentClass } from 'sandstone'
 
@@ -12,8 +13,6 @@ export type FunctionTestInstance = (TestData & {
   function: Registry['minecraft:test_function'],
 })
 
-export type Rotation = ('none' | 'clockwise_90' | '180' | 'counterclockwise_90')
-
 export type TestData = {
   /**
    * The test environment to run this test as part of.
@@ -95,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,3 +1,3 @@
-import type { LootFunction } from 'sandstone/arguments/generated/data/loot.ts'
+import type { LootFunction } from 'sandstone/arguments/generated/data/loot/function.ts'
 
 export type ItemModifier = (LootFunction | Array<LootFunction>)