sandstone 1.1.1 → 1.1.2

package/src/arguments/generated/data/worldgen/attribute.ts

@@ -7,6 +7,10 @@ import type {
   ColorModifierType,
   FloatAttributeModifier,
   FloatModifierType,
+  ListModifier,
+  ListModifierType,
+  MergeableModifier,
+  MergeableModifierType,
   OverrideModifier,
   TranslucentColorAttributeModifier,
 } from 'sandstone/arguments/generated/data/worldgen/attribute/modifier.ts'
@@ -21,7 +25,7 @@ import type { StringARGB, StringRGB } from 'sandstone/arguments/generated/util/c
 import type { Particle } from 'sandstone/arguments/generated/util/particle.ts'
 import type { Text } from 'sandstone/arguments/generated/util/text.ts'
 import type { NBTObject, RootNBT } from 'sandstone/arguments/nbt.ts'
-import type { NBTFloat, NBTInt } from 'sandstone'
+import type { NBTFloat, NBTInt, NBTList } from 'sandstone'
 
 export type AmbientParticle = {
   particle: Particle,
@@ -47,7 +51,7 @@ export type ARGBColorAttribute = {
   value: StringARGB,
   modifier: TranslucentColorAttributeModifier,
   attribute_track: ({
-    [S in Extract<ColorModifierType, string>]?: (AttributeTrackBase & {
+    [S in Extract<Extract<ColorModifierType, string>, string>]?: (AttributeTrackBase & {
       /**
        * Value:
        *
@@ -59,7 +63,11 @@ export type ARGBColorAttribute = {
        *  - BlendToGray(`blend_to_gray`)
        */
       modifier?: S,
-      keyframes: Array<{
+      /**
+       * Value:
+       * List length range: 1..
+       */
+      keyframes: NBTList<{
         /**
          * Value:
          * Range: 0..
@@ -72,9 +80,12 @@ export type ARGBColorAttribute = {
           (S extends keyof SymbolEnvironmentAttributeArgbColorModifier
             ? SymbolEnvironmentAttributeArgbColorModifier[S]
             : RootNBT)),
+      }, {
+        leftExclusive: false,
+        min: 1,
       }>,
     })
-  }[ColorModifierType]),
+  }[Extract<ColorModifierType, string>]),
 }
 
 export type BackgroundMusic = {
@@ -131,7 +142,11 @@ export type BooleanAttribute = {
      *  - Xnor(`xnor`)
      */
     modifier?: BooleanModifierType,
-    keyframes: Array<{
+    /**
+     * Value:
+     * List length range: 1..
+     */
+    keyframes: NBTList<{
       /**
        * Value:
        * Range: 0..
@@ -140,6 +155,9 @@ export type BooleanAttribute = {
         min: 0,
       }>,
       value: boolean,
+    }, {
+      leftExclusive: false,
+      min: 1,
     }>,
   }),
 }
@@ -149,7 +167,11 @@ export type DiscreteAttribute<T extends NBTObject> = {
   modifier: OverrideModifier<T>,
   attribute_track: (AttributeTrackBase & {
     modifier?: 'override',
-    keyframes: Array<{
+    /**
+     * Value:
+     * List length range: 1..
+     */
+    keyframes: NBTList<{
       /**
        * Value:
        * Range: 0..
@@ -158,6 +180,9 @@ export type DiscreteAttribute<T extends NBTObject> = {
         min: 0,
       }>,
       value: T,
+    }, {
+      leftExclusive: false,
+      min: 1,
     }>,
   }),
 }
@@ -180,7 +205,7 @@ export type FloatAttribute<T extends NBTObject> = {
   value: T,
   modifier: FloatAttributeModifier<T>,
   attribute_track: ({
-    [S in Extract<FloatModifierType, string>]?: (AttributeTrackBase & {
+    [S in Extract<Extract<FloatModifierType, string>, string>]?: (AttributeTrackBase & {
       /**
        * Value:
        *
@@ -193,7 +218,11 @@ export type FloatAttribute<T extends NBTObject> = {
        *  - AlphaBlend(`alpha_blend`)
        */
       modifier?: S,
-      keyframes: Array<{
+      /**
+       * Value:
+       * List length range: 1..
+       */
+      keyframes: NBTList<{
         /**
          * Value:
          * Range: 0..
@@ -206,13 +235,78 @@ export type FloatAttribute<T extends NBTObject> = {
           (S extends keyof SymbolEnvironmentAttributeFloatModifier<T>
             ? SymbolEnvironmentAttributeFloatModifier<T>[S]
             : SymbolEnvironmentAttributeFloatModifier<T, '%unknown'>)),
+      }, {
+        leftExclusive: false,
+        min: 1,
       }>,
     })
-  }[FloatModifierType]),
+  }[Extract<FloatModifierType, string>]),
 }
 
 export type GlobalEnvironmentAttributeMap = EnvironmentAttributeMap<Registry['minecraft:environment_attribute']>
 
+export type ListAttribute<E extends NBTObject> = {
+  value: Array<E>,
+  modifier: ListModifier<E>,
+  attribute_track: (AttributeTrackBase & {
+    /**
+     * Value:
+     *
+     *  - Override(`override`)
+     *  - Append(`append`)
+     */
+    modifier?: ListModifierType,
+    /**
+     * Value:
+     * List length range: 1..
+     */
+    keyframes: NBTList<{
+      /**
+       * Value:
+       * Range: 0..
+       */
+      ticks: NBTInt<{
+        min: 0,
+      }>,
+      value: Array<E>,
+    }, {
+      leftExclusive: false,
+      min: 1,
+    }>,
+  }),
+}
+
+export type MergeableAttribute<T extends NBTObject> = {
+  value: T,
+  modifier: MergeableModifier<T>,
+  attribute_track: (AttributeTrackBase & {
+    /**
+     * Value:
+     *
+     *  - Override(`override`)
+     *  - Overlay(`overlay`)
+     */
+    modifier?: MergeableModifierType,
+    /**
+     * Value:
+     * List length range: 1..
+     */
+    keyframes: NBTList<{
+      /**
+       * Value:
+       * Range: 0..
+       */
+      ticks: NBTInt<{
+        min: 0,
+      }>,
+      value: T,
+    }, {
+      leftExclusive: false,
+      min: 1,
+    }>,
+  }),
+}
+
 export type NumericalEnvironmentAttribute = (
   | 'visual/cloud_height'
   | 'visual/fog_start_distance'
@@ -228,6 +322,7 @@ export type NumericalEnvironmentAttribute = (
   | 'visual/star_brightness'
   | 'audio/music_volume'
   | 'gameplay/cat_waking_up_gift_chance'
+  | 'gameplay/creature_world_gen_spawn_probability'
   | 'gameplay/surface_slime_spawn_chance'
   | 'gameplay/turtle_egg_hatch_chance'
   | 'gameplay/sky_light_level')
@@ -240,7 +335,7 @@ export type RGBColorAttribute = {
   value: StringRGB,
   modifier: ColorAttributeModifier,
   attribute_track: ({
-    [S in Extract<ColorModifierType, string>]?: (AttributeTrackBase & {
+    [S in Extract<Extract<ColorModifierType, string>, string>]?: (AttributeTrackBase & {
       /**
        * Value:
        *
@@ -252,7 +347,11 @@ export type RGBColorAttribute = {
        *  - BlendToGray(`blend_to_gray`)
        */
       modifier?: S,
-      keyframes: Array<{
+      /**
+       * Value:
+       * List length range: 1..
+       */
+      keyframes: NBTList<{
         /**
          * Value:
          * Range: 0..
@@ -265,9 +364,12 @@ export type RGBColorAttribute = {
           (S extends keyof SymbolEnvironmentAttributeColorModifier
             ? SymbolEnvironmentAttributeColorModifier[S]
             : SymbolEnvironmentAttributeColorModifier<'%unknown'>)),
+      }, {
+        leftExclusive: false,
+        min: 1,
       }>,
     })
-  }[ColorModifierType]),
+  }[Extract<ColorModifierType, string>]),
 }
 
 export type TriState = (boolean | 'default')
@@ -470,7 +572,7 @@ type EnvironmentAttributeGameplayTurtleEggHatchChance = FloatAttribute<NBTFloat<
 type EnvironmentAttributeGameplayVillagerActivity = DiscreteAttribute<Registry['minecraft:activity']>
 type EnvironmentAttributeGameplayWaterEvaporates = BooleanAttribute
 type EnvironmentAttributeVisualAmbientLightColor = RGBColorAttribute
-type EnvironmentAttributeVisualAmbientParticles = DiscreteAttribute<Array<AmbientParticle>>
+type EnvironmentAttributeVisualAmbientParticles = ListAttribute<AmbientParticle>
 type EnvironmentAttributeVisualBlockLightTint = RGBColorAttribute
 type EnvironmentAttributeVisualCloudColor = ARGBColorAttribute
 type EnvironmentAttributeVisualCloudFogEndDistance = FloatAttribute<NBTFloat<{

package/src/arguments/generated/data/worldgen/biome.ts

@@ -1,14 +1,15 @@
 import type { SoundEventRef } from 'sandstone/arguments/generated/data/util.ts'
 import type { PositionalEnvironmentAttributeMap } from 'sandstone/arguments/generated/data/worldgen/attribute.ts'
-import type { CarverRef } from 'sandstone/arguments/generated/data/worldgen/carver.ts'
+import type { CarverListRef } from 'sandstone/arguments/generated/data/worldgen/carver.ts'
 import type { CarveStep } from 'sandstone/arguments/generated/data/worldgen.ts'
 import type { PlacedFeatureRef } from 'sandstone/arguments/generated/data/worldgen/feature/placement.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { StringRGB } from 'sandstone/arguments/generated/util/color.ts'
+import type { FlatWeightedList } from 'sandstone/arguments/generated/util.ts'
 import type { Particle } from 'sandstone/arguments/generated/util/particle.ts'
 import type { NBTDouble, NBTFloat, NBTInt, NBTList, TagClass } from 'sandstone'
 
-export type Biome = {
+export type Biome = ({
   attributes?: PositionalEnvironmentAttributeMap,
   temperature: NBTFloat,
   downfall: NBTFloat,
@@ -20,28 +21,8 @@ export type Biome = {
    *  - Frozen(`frozen`)
    */
   temperature_modifier?: TemperatureModifier,
-  /**
-   * Value:
-   * Range: 0..1
-   */
-  creature_spawn_probability?: NBTFloat<{
-    leftExclusive: false,
-    rightExclusive: false,
-    min: 0,
-    max: 1,
-  }>,
   effects: BiomeEffects,
-  spawners: ({
-    [Key in Extract<MobCategory, string>]?: Array<SpawnerData>
-  }),
-  spawn_costs: ({
-    [Key in Extract<Registry['minecraft:entity_type'], string>]?: MobSpawnCost
-  }),
-  carvers: (
-      | Array<CarverRef> | (
-        | Registry['minecraft:worldgen/configured_carver']
-        | `#${string}:${string}`
-        | TagClass<'worldgen/configured_carver'>)),
+  carvers: CarverListRef,
   /**
    * Value:
    * List length range: ..11
@@ -49,7 +30,7 @@ export type Biome = {
   features: NBTList<(Array<PlacedFeatureRef> | (`#${string}:${string}` | TagClass<'worldgen/placed_feature'>)), {
     rightExclusive: false,
   }>,
-}
+} & NaturalMobSpawns)
 
 export type BiomeCategory = (
   | 'beach'
@@ -141,11 +122,7 @@ export type BiomeSoundAdditions = {
 }
 
 export type CarversPerStep = ({
-  [Key in Extract<CarveStep, string>]?: (
-      | Array<CarverRef> | (
-        | Registry['minecraft:worldgen/configured_carver']
-        | `#${string}:${string}`
-        | TagClass<'worldgen/configured_carver'>))
+  [Key in Extract<CarveStep, string>]?: CarverListRef
 })
 
 export type GrassColorModifier = ('none' | 'dark_forest' | 'swamp')
@@ -172,13 +149,32 @@ export type MoodSound = {
   offset: NBTFloat,
 }
 
+export type NaturalMobSpawns = {
+  /**
+   * Value:
+   * Range: 0..0.9999999
+   */
+  creature_spawn_probability?: NBTFloat<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 0,
+  }>,
+  spawners: SpawnerDataMap,
+  spawn_costs: ({
+    [Key in Extract<`${string}:${string}`, string>]?: MobSpawnCost
+  }),
+}
+
 export type Precipitation = ('none' | 'rain' | 'snow')
 
 export type SpawnerData = {
   type: Registry['minecraft:entity_type'],
-  weight: NBTInt,
   minCount: NBTInt,
   maxCount: NBTInt,
 }
 
+export type SpawnerDataMap = ({
+  [Key in Extract<MobCategory, string>]?: FlatWeightedList<SpawnerData>
+})
+
 export type TemperatureModifier = ('none' | 'frozen')

package/src/arguments/generated/data/worldgen/carver.ts

@@ -4,10 +4,10 @@ import type { BlockState } from 'sandstone/arguments/generated/util/block_state.
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { NBTFloat, NBTInt, TagClass } from 'sandstone'
 
-export type CanyonConfig = {
+export type CanyonConfig = (CarverConfigBase & {
   vertical_rotation: FloatProvider<NBTFloat>,
   shape: CanyonShape,
-}
+})
 
 export type CanyonShape = {
   distance_factor: FloatProvider<NBTFloat>,
@@ -24,7 +24,7 @@ export type CanyonShape = {
   vertical_radius_center_factor: NBTFloat,
 }
 
-export type CarverConfigBase<S = undefined> = ({
+export type CarverConfigBase = ({
   /**
    * Value:
    * Range: 0..1
@@ -43,7 +43,7 @@ export type CarverConfigBase<S = undefined> = ({
   yScale: FloatProvider<NBTFloat>,
   lava_level: VerticalAnchor,
   debug_settings?: CarverDebugSettings,
-} & (S extends keyof SymbolCarverConfig ? SymbolCarverConfig[S] : RootNBT))
+})
 
 export type CarverDebugSettings = {
   debug_mode?: boolean,
@@ -53,49 +53,29 @@ export type CarverDebugSettings = {
   barrier_state: BlockState,
 }
 
-export type CarverRef = (Registry['minecraft:worldgen/configured_carver'] | ConfiguredCarver)
+export type CarverListRef = (
+  | ConfiguredCarver
+  | Array<ConfiguredCarver> | (
+  Registry['minecraft:worldgen/configured_carver'] | `#${string}:${string}` | TagClass<'worldgen/configured_carver'>)
+  | Array<Registry['minecraft:worldgen/configured_carver']>)
+
+export type CarverRef = (ConfiguredCarver | Registry['minecraft:worldgen/configured_carver'])
 
-export type CaveConfig = {
+export type CaveConfig = (CarverConfigBase & {
   horizontal_radius_multiplier: FloatProvider<NBTFloat>,
   vertical_radius_multiplier: FloatProvider<NBTFloat>,
   floor_level: FloatProvider<NBTFloat<{
     leftExclusive: false,
     rightExclusive: false,
   }>>,
-}
+})
 
 export type ConfiguredCarver = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/carver'], string>]?: {
+  [S in Extract<Extract<Registry['minecraft:worldgen/carver'], string>, string>]?: {
     type: S,
-    config: ({
-      /**
-       * Value:
-       * Range: 0..1
-       */
-      probability: NBTFloat<{
-        leftExclusive: false,
-        rightExclusive: false,
-        min: 0,
-        max: 1,
-      }>,
-      replaceable?: (
-              | Array<Registry['minecraft:block']> | (
-              Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)),
-    } & {
-      y: HeightProvider,
-      yScale: FloatProvider<NBTFloat>,
-      lava_level: VerticalAnchor,
-      debug_settings?: CarverDebugSettings,
-    } & (S extends keyof SymbolCarverConfig ? SymbolCarverConfig[S] : RootNBT)),
+    config: (S extends keyof SymbolCarverConfig ? SymbolCarverConfig[S] : RootNBT),
   }
-}[Registry['minecraft:worldgen/carver']])>
-
-export type ModernCarverConfig = {
-  y: HeightProvider,
-  yScale: FloatProvider<NBTFloat>,
-  lava_level: VerticalAnchor,
-  debug_settings?: CarverDebugSettings,
-}
+}[Extract<Registry['minecraft:worldgen/carver'], string>])>
 type CarverConfigDispatcherMap = {
   'canyon': CarverConfigCanyon,
   'minecraft:canyon': CarverConfigCanyon,

package/src/arguments/generated/data/worldgen/density_function.ts

@@ -1,5 +1,4 @@
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
-import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { NBTFloat, NBTInt, NBTList } from 'sandstone'
 
 export type Clamp = {
@@ -18,10 +17,10 @@ export type CubicSpline = (NBTFloat | {
 })
 
 export type DensityFunction = (NoiseRange | ({
-  [S in Extract<Registry['minecraft:worldgen/density_function_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/density_function_type'], string>, string>]?: ({
     type: S,
-  } & (S extends keyof SymbolDensityFunction ? SymbolDensityFunction[S] : RootNBT))
-}[Registry['minecraft:worldgen/density_function_type']]))
+  } & (S extends keyof SymbolDensityFunction ? SymbolDensityFunction[S] : SymbolDensityFunction<'%unknown'>))
+}[Extract<Registry['minecraft:worldgen/density_function_type'], string>]))
 
 export type DensityFunctionRef = (Registry['minecraft:worldgen/density_function'] | DensityFunction)
 
@@ -66,6 +65,12 @@ export type InvervalSelect = {
   }>,
 }
 
+export type Lerp = {
+  alpha: DensityFunctionRef,
+  first: DensityFunctionRef,
+  second: DensityFunctionRef,
+}
+
 export type Noise = {
   noise: Registry['minecraft:worldgen/noise'],
   xz_scale: NBTFloat,
@@ -110,6 +115,14 @@ export type RangeChoice = {
 
 export type RarityType = ('type_1' | 'type_2')
 
+export type Round = {
+  input: DensityFunctionRef,
+  /**
+   * Defaults to constant 1.
+   */
+  multiple?: DensityFunctionRef,
+}
+
 export type Shift = {
   argument: Registry['minecraft:worldgen/noise'],
 }
@@ -242,8 +255,6 @@ type DensityFunctionDispatcherMap = {
   'minecraft:square': DensityFunctionSquare,
   'squeeze': DensityFunctionSqueeze,
   'minecraft:squeeze': DensityFunctionSqueeze,
-  'terrain_shaper_spline': DensityFunctionTerrainShaperSpline,
-  'minecraft:terrain_shaper_spline': DensityFunctionTerrainShaperSpline,
   'weird_scaled_sampler': DensityFunctionWeirdScaledSampler,
   'minecraft:weird_scaled_sampler': DensityFunctionWeirdScaledSampler,
   'y_clamped_gradient': DensityFunctionYClampedGradient,
@@ -281,9 +292,10 @@ type DensityFunctionFallback = (
   | DensityFunctionSpline
   | DensityFunctionSquare
   | DensityFunctionSqueeze
-  | DensityFunctionTerrainShaperSpline
   | DensityFunctionWeirdScaledSampler
-  | DensityFunctionYClampedGradient)
+  | DensityFunctionYClampedGradient
+  | DensityFunctionFallbackType)
+export type DensityFunctionFallbackType = Record<string, never>
 type DensityFunctionAbs = OneArgument
 type DensityFunctionAdd = TwoArguments
 type DensityFunctionBlendDensity = OneArgument
@@ -314,7 +326,6 @@ type DensityFunctionSlide = OneArgument
 type DensityFunctionSpline = Spline
 type DensityFunctionSquare = OneArgument
 type DensityFunctionSqueeze = OneArgument
-type DensityFunctionTerrainShaperSpline = TerrainShaperSpline
 type DensityFunctionWeirdScaledSampler = WeirdScaledSampler
 type DensityFunctionYClampedGradient = YClampedGradient
 export type SymbolDensityFunction<CASE extends
@@ -324,4 +335,8 @@ export type SymbolDensityFunction<CASE extends
   | '%none'
   | '%unknown' = 'map'> = CASE extends 'map'
   ? DensityFunctionDispatcherMap
-  : CASE extends 'keys' ? DensityFunctionKeys : CASE extends '%fallback' ? DensityFunctionFallback : never
+  : CASE extends 'keys'
+    ? DensityFunctionKeys
+    : CASE extends '%fallback'
+      ? DensityFunctionFallback
+      : CASE extends '%unknown' ? DensityFunctionFallbackType : never

package/src/arguments/generated/data/worldgen/dimension/biome_source.ts

@@ -8,10 +8,10 @@ export type BiomeNoiseEntry = {
 }
 
 export type BiomeSource = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/biome_source'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/biome_source'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolBiomeSource ? SymbolBiomeSource[S] : RootNBT))
-}[Registry['minecraft:worldgen/biome_source']])>
+}[Extract<Registry['minecraft:worldgen/biome_source'], string>])>
 
 export type Checkerboard = {
   /**
@@ -82,14 +82,14 @@ export type Fixed = {
 }
 
 export type MultiNoise = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/multi_noise_biome_source_parameter_list'], string>]?: (MultiNoiseBase & {
+  [S in Extract<Extract<Registry['minecraft:worldgen/multi_noise_biome_source_parameter_list'], string>, string>]?: (MultiNoiseBase & {
     preset?: S,
   } & (S extends undefined
     ? SymbolMultiNoiseBiomeSource<'%none'> :
     (S extends keyof SymbolMultiNoiseBiomeSource
       ? SymbolMultiNoiseBiomeSource[S]
       : SymbolMultiNoiseBiomeSource<'%unknown'>)))
-}[Registry['minecraft:worldgen/multi_noise_biome_source_parameter_list']])>
+}[Extract<Registry['minecraft:worldgen/multi_noise_biome_source_parameter_list'], string>])>
 
 export type MultiNoiseBase = Record<string, never>
 
@@ -126,21 +126,13 @@ type BiomeSourceDispatcherMap = {
   'minecraft:multi_noise': BiomeSourceMultiNoise,
   'the_end': BiomeSourceTheEnd,
   'minecraft:the_end': BiomeSourceTheEnd,
-  'vanilla_layered': BiomeSourceVanillaLayered,
-  'minecraft:vanilla_layered': BiomeSourceVanillaLayered,
 }
 type BiomeSourceKeys = keyof BiomeSourceDispatcherMap
-type BiomeSourceFallback = (
-  | BiomeSourceCheckerboard
-  | BiomeSourceFixed
-  | BiomeSourceMultiNoise
-  | BiomeSourceTheEnd
-  | BiomeSourceVanillaLayered)
+type BiomeSourceFallback = (BiomeSourceCheckerboard | BiomeSourceFixed | BiomeSourceMultiNoise | BiomeSourceTheEnd)
 type BiomeSourceCheckerboard = Checkerboard
 type BiomeSourceFixed = Fixed
 type BiomeSourceMultiNoise = MultiNoise
 type BiomeSourceTheEnd = TheEnd
-type BiomeSourceVanillaLayered = VanillaLayered
 export type SymbolBiomeSource<CASE extends
   | 'map'
   | 'keys'

package/src/arguments/generated/data/worldgen/dimension/chunk_generator.ts

@@ -5,10 +5,10 @@ import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { NBTInt, TagClass } from 'sandstone'
 
 export type ChunkGenerator = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/chunk_generator'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/chunk_generator'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolChunkGenerator ? SymbolChunkGenerator[S] : RootNBT))
-}[Registry['minecraft:worldgen/chunk_generator']])>
+}[Extract<Registry['minecraft:worldgen/chunk_generator'], string>])>
 
 export type Flat = {
   settings: FlatGeneratorSettings,

package/src/arguments/generated/data/worldgen/dimension.ts

@@ -85,7 +85,8 @@ export type DimensionType = {
    * Defining what blocks keep fire infinitely burning.
    */
   infiniburn: ((
-      | Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
+      | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>) | (
+      Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
       | Array<Registry['minecraft:block']>),
   /**
    * The minimum height in which blocks can exist.

package/src/arguments/generated/data/worldgen/feature/block_predicate.ts

@@ -1,3 +1,4 @@
+import type { VerticalAnchor } from 'sandstone/arguments/generated/data/worldgen.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { BlockState } from 'sandstone/arguments/generated/util/block_state.ts'
 import type { Direction } from 'sandstone/arguments/generated/util/direction.ts'
@@ -5,10 +6,10 @@ import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { NBTInt, NBTList, TagClass } from 'sandstone'
 
 export type BlockPredicate = NonNullable<({
-  [S in Extract<Registry['minecraft:block_predicate_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:block_predicate_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolBlockPredicate ? SymbolBlockPredicate[S] : RootNBT))
-}[Registry['minecraft:block_predicate_type']])>
+}[Extract<Registry['minecraft:block_predicate_type'], string>])>
 
 export type CombiningPredicate = {
   predicates: Array<BlockPredicate>,
@@ -28,6 +29,11 @@ export type HasSturdyFacePredicate = (PredicateOffset & {
   direction: Direction,
 })
 
+export type HeightRangePredicate = {
+  min_inclusive: VerticalAnchor,
+  max_inclusive: VerticalAnchor,
+}
+
 export type InsideWorldBoundsPredicate = PredicateOffset
 
 export type MatchingBiomesPredicate = {
@@ -95,6 +101,8 @@ type BlockPredicateDispatcherMap = {
   'minecraft:any_of': BlockPredicateAnyOf,
   'has_sturdy_face': BlockPredicateHasSturdyFace,
   'minecraft:has_sturdy_face': BlockPredicateHasSturdyFace,
+  'height_range': BlockPredicateHeightRange,
+  'minecraft:height_range': BlockPredicateHeightRange,
   'inside_world_bounds': BlockPredicateInsideWorldBounds,
   'minecraft:inside_world_bounds': BlockPredicateInsideWorldBounds,
   'matching_biomes': BlockPredicateMatchingBiomes,
@@ -117,6 +125,7 @@ type BlockPredicateFallback = (
   | BlockPredicateAllOf
   | BlockPredicateAnyOf
   | BlockPredicateHasSturdyFace
+  | BlockPredicateHeightRange
   | BlockPredicateInsideWorldBounds
   | BlockPredicateMatchingBiomes
   | BlockPredicateMatchingBlockTag
@@ -128,6 +137,7 @@ type BlockPredicateFallback = (
 type BlockPredicateAllOf = CombiningPredicate
 type BlockPredicateAnyOf = CombiningPredicate
 type BlockPredicateHasSturdyFace = HasSturdyFacePredicate
+type BlockPredicateHeightRange = HeightRangePredicate
 type BlockPredicateInsideWorldBounds = InsideWorldBoundsPredicate
 type BlockPredicateMatchingBiomes = MatchingBiomesPredicate
 type BlockPredicateMatchingBlockTag = MatchingBlockTagPredicate