sandstone 1.1.0 → 1.1.2

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

@@ -2,12 +2,15 @@ import type { CaveSurface, FloatProvider, IntProvider } from 'sandstone/argument
 import type { BlockPredicate } from 'sandstone/arguments/generated/data/worldgen/feature/block_predicate.ts'
 import type { BlockStateProvider } from 'sandstone/arguments/generated/data/worldgen/feature/block_state_provider.ts'
 import type { ConfiguredDecorator } from 'sandstone/arguments/generated/data/worldgen/feature/decorator.ts'
-import type { PlacedFeatureRef } from 'sandstone/arguments/generated/data/worldgen/feature/placement.ts'
+import type {
+  PlacedFeatureListRef,
+  PlacedFeatureRef,
+} from 'sandstone/arguments/generated/data/worldgen/feature/placement.ts'
 import type { FallenTreeConfig, TreeConfig } from 'sandstone/arguments/generated/data/worldgen/feature/tree.ts'
 import type { ProcessorListRef, RuleTest } from 'sandstone/arguments/generated/data/worldgen/processor_list.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'
+import type { Direction, VerticalDirection } from 'sandstone/arguments/generated/util/direction.ts'
 import type { FluidState } from 'sandstone/arguments/generated/util/fluid_state.ts'
 import type { Rotation, WeightedList } from 'sandstone/arguments/generated/util.ts'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
@@ -47,10 +50,10 @@ export type BlockPileConfig = {
 }
 
 export type BlockPlacer = NonNullable<({
-  [S in Extract<`${string}:${string}`, string>]?: ({
+  [S in Extract<Extract<`${string}:${string}`, string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolBlockPlacer ? SymbolBlockPlacer[S] : RootNBT))
-}[`${string}:${string}`])>
+}[Extract<`${string}:${string}`, string>])>
 
 export type BlockStateRuleProviderEntry = {
   if_true: BlockPredicate,
@@ -75,14 +78,16 @@ export type ColumnsConfig = {
 }
 
 export type ConfiguredFeature = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/feature'], string>]?: {
+  [S in Extract<Extract<Registry['minecraft:worldgen/feature'], string>, string>]?: {
     type: S,
     config: (S extends keyof SymbolFeatureConfig ? SymbolFeatureConfig[S] : RootNBT),
   }
-}[Registry['minecraft:worldgen/feature']])>
+}[Extract<Registry['minecraft:worldgen/feature'], string>])>
 
 export type ConfiguredFeatureRef = (Registry['minecraft:worldgen/configured_feature'] | ConfiguredFeature)
 
+export type CoralConfig = Record<string, never>
+
 export type DecoratedConfig = {
   decorator: ConfiguredDecorator,
   feature: FeatureRef,
@@ -219,13 +224,15 @@ export type GeodeBlockSettings = {
    * Blocks that will not be replaced by the geode.
    */
   cannot_replace: ((
-      | 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']>),
   /**
    * When encountering an invalid block, feature placement is cancelled.
    */
   invalid_blocks: ((
-      | 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']>),
 }
 
@@ -412,10 +419,13 @@ export type LargeDripstoneConfig = {
   floor_to_ceiling_search_range?: NBTInt<{
     min: 1,
   }>,
-  column_radius: IntProvider<NBTInt<{
+  column_radius: (IntProvider<NBTInt<{
+    min: 0,
+    max: 60,
+  }>> | IntProvider<NBTInt<{
     min: 0,
     max: 16,
-  }>>,
+  }>>),
   height_scale: FloatProvider<NBTFloat<{
     leftExclusive: false,
     rightExclusive: false,
@@ -508,6 +518,14 @@ export type ModernPatchConfig = {
 export type MultifaceBlock = ('glow_lichen' | 'sculk_vein')
 
 export type MultifaceGrowthConfig = ({
+  /**
+   * Value:
+   *
+   *  - GlowLichen(`glow_lichen`)
+   *  - SculkVein(`sculk_vein`)
+   */
+  block?: (MultifaceBlock | `minecraft:${MultifaceBlock}`),
+} & {
   /**
    * Value:
    *
@@ -637,6 +655,14 @@ export type OreConfig = {
   }>,
 }
 
+export type OverlayConfig = {
+  /**
+   * The features to generate, in order. \
+   * All features are placed regardless of individual placement success.
+   */
+  features: PlacedFeatureListRef,
+}
+
 export type ProbabilityConfig = {
   /**
    * Value:
@@ -650,6 +676,22 @@ export type ProbabilityConfig = {
   }>,
 }
 
+export type ProjectedSquareConfig = {
+  block: BlockStateProvider,
+  project_through: BlockPredicate,
+  size: IntProvider<NBTInt<{
+    min: 1,
+    max: 16,
+  }>>,
+  /**
+   * Value:
+   * Range: 0..
+   */
+  max_projection_height: NBTInt<{
+    min: 0,
+  }>,
+}
+
 export type RandomBooleanSelector = {
   feature_false: FeatureRef,
   feature_true: FeatureRef,
@@ -669,6 +711,25 @@ export type RandomFeatureEntry = {
   feature: FeatureRef,
 }
 
+export type RandomNeighborSpreadConfig = {
+  block: BlockStateProvider,
+  accepted_neighbors: ((
+      | Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
+      | Array<Registry['minecraft:block']>),
+  can_replace: BlockPredicate,
+  attempts: IntProvider<NBTInt<{
+    min: 1,
+  }>>,
+  xz_offset: IntProvider<NBTInt<{
+    min: -16,
+    max: 16,
+  }>>,
+  y_offset: IntProvider<NBTInt<{
+    min: -16,
+    max: 16,
+  }>>,
+}
+
 export type RandomPatchConfig = ({
   /**
    * How many attempts will be made to find a placement. Defaults to 128.
@@ -801,7 +862,8 @@ export type RootSystemConfig = {
     max: 64,
   }>,
   root_replaceable: ((
-      | 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']>),
   root_state_provider: BlockStateProvider,
   hanging_root_state_provider: BlockStateProvider,
@@ -879,10 +941,10 @@ export type SeaPickleConfig = {
 
 export type SequenceConfig = {
   /**
-   * The features to generate, in order.
+   * The features to generate, in order. \
    * If any feature in the list is not placed, the following features will also be skipped.
    */
-  features: (Array<PlacedFeatureRef> | (`#${string}:${string}` | TagClass<'worldgen/placed_feature'>)),
+  features: PlacedFeatureListRef,
 }
 
 export type SimpleBlockConfig = {
@@ -894,9 +956,35 @@ export type SimpleBlockConfig = {
 }
 
 export type SimpleRandomSelectorConfig = {
-  features: (
-      | Array<FeatureRef> | (
-      Registry['minecraft:worldgen/placed_feature'] | `#${string}:${string}` | TagClass<'worldgen/placed_feature'>)),
+  features: PlacedFeatureListRef,
+}
+
+export type SingleBlockPillarConfig = {
+  block: BlockStateProvider,
+  /**
+   * Defaults to "always true".
+   */
+  can_replace?: BlockPredicate,
+  /**
+   * Value:
+   *
+   *  - Down(`down`)
+   *  - Up(`up`)
+   */
+  direction: VerticalDirection,
+  /**
+   * Defaults to 1.
+   *
+   * Value:
+   * Range: 0..1
+   */
+  chance_to_continue?: NBTFloat<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 0,
+    max: 1,
+  }>,
+  cap_feature?: PlacedFeatureRef,
 }
 
 export type SmallDripstoneConfig = {
@@ -973,6 +1061,9 @@ export type SpeleothemClusterConfig = {
     min: 1,
     max: 64,
   }>,
+  dripstone_block_layer_thickness: IntProvider<NBTInt<{
+    min: 0,
+  }>>,
   speleothem_block_layer_thickness: IntProvider<NBTInt<{
     min: 0,
   }>>,
@@ -986,6 +1077,16 @@ export type SpeleothemClusterConfig = {
     rightExclusive: false,
     min: 0,
   }>>,
+  /**
+   * Value:
+   * Range: 0..1
+   */
+  chance_of_dripstone_column_at_max_distance_from_center: NBTFloat<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 0,
+    max: 1,
+  }>,
   /**
    * Value:
    * Range: 0..1
@@ -996,6 +1097,14 @@ export type SpeleothemClusterConfig = {
     min: 0,
     max: 1,
   }>,
+  /**
+   * Value:
+   * Range: 1..64
+   */
+  max_distance_from_edge_affecting_chance_of_dripstone_column: NBTInt<{
+    min: 1,
+    max: 64,
+  }>,
   /**
    * Value:
    * Range: 1..64
@@ -1020,6 +1129,16 @@ export type SpeleothemConfig = {
   replaceable_blocks: (
       | Array<Registry['minecraft:block']> | (
       Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)),
+  /**
+   * Value:
+   * Range: 0..1
+   */
+  chance_of_taller_dripstone?: NBTFloat<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 0,
+    max: 1,
+  }>,
   /**
    * Value:
    * Range: 0..1
@@ -1201,14 +1320,15 @@ export type VegetationPatchConfig = {
   }>,
   xz_radius: IntProvider<NBTInt>,
   replaceable: ((
-      | 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']>),
   ground_state: BlockStateProvider,
   vegetation_feature: FeatureRef,
 }
 
 export type WeightedRandomFeatureConfig = {
-  features: WeightedList<Registry['minecraft:worldgen/placed_feature']>,
+  features: WeightedList<PlacedFeatureRef>,
 }
 type BlockPlacerDispatcherMap = {
   'column_placer': BlockPlacerColumnPlacer,
@@ -1242,8 +1362,10 @@ type FeatureConfigDispatcherMap = {
   'minecraft:block_column': FeatureConfigBlockColumn,
   'block_pile': FeatureConfigBlockPile,
   'minecraft:block_pile': FeatureConfigBlockPile,
-  'decorated': FeatureConfigDecorated,
-  'minecraft:decorated': FeatureConfigDecorated,
+  'coral_claw': FeatureConfigCoralClaw,
+  'minecraft:coral_claw': FeatureConfigCoralClaw,
+  'coral_tree': FeatureConfigCoralTree,
+  'minecraft:coral_tree': FeatureConfigCoralTree,
   'delta_feature': FeatureConfigDeltaFeature,
   'minecraft:delta_feature': FeatureConfigDeltaFeature,
   'disk': FeatureConfigDisk,
@@ -1254,8 +1376,6 @@ type FeatureConfigDispatcherMap = {
   'minecraft:emerald_ore': FeatureConfigEmeraldOre,
   'end_gateway': FeatureConfigEndGateway,
   'minecraft:end_gateway': FeatureConfigEndGateway,
-  'end_podium': FeatureConfigEndPodium,
-  'minecraft:end_podium': FeatureConfigEndPodium,
   'end_spike': FeatureConfigEndSpike,
   'minecraft:end_spike': FeatureConfigEndSpike,
   'fallen_tree': FeatureConfigFallenTree,
@@ -1264,16 +1384,12 @@ type FeatureConfigDispatcherMap = {
   'minecraft:fill_layer': FeatureConfigFillLayer,
   'flower': FeatureConfigFlower,
   'minecraft:flower': FeatureConfigFlower,
-  'forest_rock': FeatureConfigForestRock,
-  'minecraft:forest_rock': FeatureConfigForestRock,
   'fossil': FeatureConfigFossil,
   'minecraft:fossil': FeatureConfigFossil,
   'geode': FeatureConfigGeode,
   'minecraft:geode': FeatureConfigGeode,
   'glow_lichen': FeatureConfigGlowLichen,
   'minecraft:glow_lichen': FeatureConfigGlowLichen,
-  'growing_plant': FeatureConfigGrowingPlant,
-  'minecraft:growing_plant': FeatureConfigGrowingPlant,
   'huge_brown_mushroom': FeatureConfigHugeBrownMushroom,
   'minecraft:huge_brown_mushroom': FeatureConfigHugeBrownMushroom,
   'huge_fungus': FeatureConfigHugeFungus,
@@ -1326,8 +1442,6 @@ type FeatureConfigDispatcherMap = {
   'minecraft:simple_block': FeatureConfigSimpleBlock,
   'simple_random_selector': FeatureConfigSimpleRandomSelector,
   'minecraft:simple_random_selector': FeatureConfigSimpleRandomSelector,
-  'small_dripstone': FeatureConfigSmallDripstone,
-  'minecraft:small_dripstone': FeatureConfigSmallDripstone,
   'speleothem': FeatureConfigSpeleothem,
   'minecraft:speleothem': FeatureConfigSpeleothem,
   'speleothem_cluster': FeatureConfigSpeleothemCluster,
@@ -1358,22 +1472,20 @@ type FeatureConfigFallback = (
   | FeatureConfigBlockBlob
   | FeatureConfigBlockColumn
   | FeatureConfigBlockPile
-  | FeatureConfigDecorated
+  | FeatureConfigCoralClaw
+  | FeatureConfigCoralTree
   | FeatureConfigDeltaFeature
   | FeatureConfigDisk
   | FeatureConfigDripstoneCluster
   | FeatureConfigEmeraldOre
   | FeatureConfigEndGateway
-  | FeatureConfigEndPodium
   | FeatureConfigEndSpike
   | FeatureConfigFallenTree
   | FeatureConfigFillLayer
   | FeatureConfigFlower
-  | FeatureConfigForestRock
   | FeatureConfigFossil
   | FeatureConfigGeode
   | FeatureConfigGlowLichen
-  | FeatureConfigGrowingPlant
   | FeatureConfigHugeBrownMushroom
   | FeatureConfigHugeFungus
   | FeatureConfigHugeRedMushroom
@@ -1400,7 +1512,6 @@ type FeatureConfigFallback = (
   | FeatureConfigSequence
   | FeatureConfigSimpleBlock
   | FeatureConfigSimpleRandomSelector
-  | FeatureConfigSmallDripstone
   | FeatureConfigSpeleothem
   | FeatureConfigSpeleothemCluster
   | FeatureConfigSpike
@@ -1417,22 +1528,20 @@ type FeatureConfigBasaltColumns = ColumnsConfig
 type FeatureConfigBlockBlob = BlockBlobConfig
 type FeatureConfigBlockColumn = BlockColumnConfig
 type FeatureConfigBlockPile = BlockPileConfig
-type FeatureConfigDecorated = DecoratedConfig
+type FeatureConfigCoralClaw = CoralConfig
+type FeatureConfigCoralTree = CoralConfig
 type FeatureConfigDeltaFeature = DeltaConfig
 type FeatureConfigDisk = DiskConfig
 type FeatureConfigDripstoneCluster = SpeleothemClusterConfig
 type FeatureConfigEmeraldOre = EmeraldOreConfig
 type FeatureConfigEndGateway = EndGatewayConfig
-type FeatureConfigEndPodium = EndPodiumConfig
 type FeatureConfigEndSpike = EndSpikeConfig
 type FeatureConfigFallenTree = FallenTreeConfig
 type FeatureConfigFillLayer = FillLayerConfig
 type FeatureConfigFlower = RandomPatchConfig
-type FeatureConfigForestRock = ForestRockConfig
 type FeatureConfigFossil = FossilConfig
 type FeatureConfigGeode = GeodeConfig
 type FeatureConfigGlowLichen = MultifaceGrowthConfig
-type FeatureConfigGrowingPlant = GrowingPlantConfig
 type FeatureConfigHugeBrownMushroom = HugeMushroomConfig
 type FeatureConfigHugeFungus = HugeFungusConfig
 type FeatureConfigHugeRedMushroom = HugeMushroomConfig
@@ -1459,7 +1568,6 @@ type FeatureConfigSeagrass = ProbabilityConfig
 type FeatureConfigSequence = SequenceConfig
 type FeatureConfigSimpleBlock = SimpleBlockConfig
 type FeatureConfigSimpleRandomSelector = SimpleRandomSelectorConfig
-type FeatureConfigSmallDripstone = SmallDripstoneConfig
 type FeatureConfigSpeleothem = SpeleothemConfig
 type FeatureConfigSpeleothemCluster = SpeleothemClusterConfig
 type FeatureConfigSpike = SpikeConfig

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

@@ -12,10 +12,10 @@ export type BiomeCondition = {
 }
 
 export type MaterialCondition = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/material_condition'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/material_condition'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolMaterialCondition ? SymbolMaterialCondition[S] : RootNBT))
-}[Registry['minecraft:worldgen/material_condition']])>
+}[Extract<Registry['minecraft:worldgen/material_condition'], string>])>
 
 export type MaterialConditionRef = MaterialCondition
 

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

@@ -12,10 +12,10 @@ export type ConditionRule = {
 }
 
 export type MaterialRule = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/material_rule'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/material_rule'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolMaterialRule ? SymbolMaterialRule[S] : SymbolMaterialRule<'%unknown'>))
-}[Registry['minecraft:worldgen/material_rule']])>
+}[Extract<Registry['minecraft:worldgen/material_rule'], string>])>
 
 export type MaterialRuleRef = MaterialRule
 

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

@@ -1,5 +1,8 @@
 import type { CubicSpline, DensityFunctionRef } from 'sandstone/arguments/generated/data/worldgen/density_function.ts'
-import type { ClimateParameters } from 'sandstone/arguments/generated/data/worldgen/dimension/biome_source.ts'
+import type {
+  ClimateParameter,
+  ClimateParameters,
+} from 'sandstone/arguments/generated/data/worldgen/dimension/biome_source.ts'
 import type { MaterialRuleRef } from 'sandstone/arguments/generated/data/worldgen/material_rule.ts'
 import type {
   ConcentricRingsPlacement,
@@ -9,7 +12,16 @@ import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { BlockState } from 'sandstone/arguments/generated/util/block_state.ts'
 import type { NBTDouble, NBTFloat, NBTInt } from 'sandstone'
 
-export type ModernNoiseGeneratorSettings = {
+export type Aquifer = {
+  barrier: DensityFunctionRef,
+  fluid_level_floodedness: DensityFunctionRef,
+  fluid_level_spread: DensityFunctionRef,
+  lava: DensityFunctionRef,
+  exclusion: DensityFunctionRef,
+  surface_level: DensityFunctionRef,
+}
+
+export type NoiseGeneratorFlags = {
   aquifers_enabled: boolean,
   ore_veins_enabled: boolean,
 }
@@ -153,6 +165,29 @@ export type NoiseSlideSettings = {
   offset: NBTInt,
 }
 
+export type OreVeinifier = {
+  ore_block: BlockState,
+  raw_ore_block: BlockState,
+  filler_block: BlockState,
+  /**
+   * Value:
+   * Range: 0..1
+   */
+  raw_ore_chance: NBTFloat<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 0,
+    max: 1,
+  }>,
+  density: DensityFunctionRef,
+  richness: DensityFunctionRef,
+  filler_gap: DensityFunctionRef,
+}
+
+export type SpawnTargetPoint = ({
+  [Key in Extract<Registry['minecraft:worldgen/density_function'], string>]?: ClimateParameter
+})
+
 export type StructureSettings = {
   stronghold?: ConcentricRingsPlacement,
   structures: ({

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

@@ -5,10 +5,6 @@ import type { BlockState } from 'sandstone/arguments/generated/util/block_state.
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { LootTableClass, NBTFloat, NBTInt, TagClass } from 'sandstone'
 
-export type AllOfMatch = {
-  rules: Array<RuleTest>,
-}
-
 export type AppendLoot = {
   loot_table: (Registry['minecraft:loot_table'] | LootTableClass),
 }
@@ -35,10 +31,10 @@ export type BlockAge = {
 }
 
 export type BlockEntityModifier = NonNullable<({
-  [S in Extract<Registry['minecraft:rule_block_entity_modifier'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:rule_block_entity_modifier'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolRuleBlockEntityModifier ? SymbolRuleBlockEntityModifier[S] : RootNBT))
-}[Registry['minecraft:rule_block_entity_modifier']])>
+}[Extract<Registry['minecraft:rule_block_entity_modifier'], string>])>
 
 export type BlockIgnore = {
   blocks: Array<BlockState>,
@@ -75,6 +71,10 @@ export type Capped = {
   }>>,
 }
 
+export type CompositeMatch = {
+  rules: Array<RuleTest>,
+}
+
 export type Gravity = {
   /**
    * Value:
@@ -95,6 +95,10 @@ export type HeightMatch = {
   max_inclusive: NBTInt,
 }
 
+export type InvertedMatch = {
+  rule: RuleTest,
+}
+
 export type LinearPos = {
   /**
    * Value:
@@ -133,16 +137,16 @@ export type LinearPos = {
 }
 
 export type PosRuleTest = NonNullable<({
-  [S in Extract<Registry['minecraft:pos_rule_test'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:pos_rule_test'], string>, string>]?: ({
     predicate_type: S,
   } & (S extends keyof SymbolPosRuleTest ? SymbolPosRuleTest[S] : RootNBT))
-}[Registry['minecraft:pos_rule_test']])>
+}[Extract<Registry['minecraft:pos_rule_test'], string>])>
 
 export type Processor = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/structure_processor'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/structure_processor'], string>, string>]?: ({
     processor_type: S,
   } & (S extends keyof SymbolTemplateProcessor ? SymbolTemplateProcessor[S] : RootNBT))
-}[Registry['minecraft:worldgen/structure_processor']])>
+}[Extract<Registry['minecraft:worldgen/structure_processor'], string>])>
 
 export type ProcessorList = (Array<Processor> | {
   processors: Array<Processor>,
@@ -164,7 +168,8 @@ export type ProcessorRule = {
 
 export type ProtectedBlocks = {
   value: ((
-      | 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']>),
 }
 
@@ -201,10 +206,10 @@ export type Rule = {
 }
 
 export type RuleTest = NonNullable<({
-  [S in Extract<Registry['minecraft:rule_test'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:rule_test'], string>, string>]?: ({
     predicate_type: S,
   } & (S extends keyof SymbolRuleTest ? SymbolRuleTest[S] : RootNBT))
-}[Registry['minecraft:rule_test']])>
+}[Extract<Registry['minecraft:rule_test'], string>])>
 
 export type TagMatch = {
   tag: (Registry['minecraft:tag/block']),
@@ -258,14 +263,10 @@ export type SymbolRuleBlockEntityModifier<CASE extends
     ? RuleBlockEntityModifierKeys
     : CASE extends '%fallback' ? RuleBlockEntityModifierFallback : never
 type RuleTestDispatcherMap = {
-  'all_of': RuleTestAllOf,
-  'minecraft:all_of': RuleTestAllOf,
   'block_match': RuleTestBlockMatch,
   'minecraft:block_match': RuleTestBlockMatch,
   'blockstate_match': RuleTestBlockstateMatch,
   'minecraft:blockstate_match': RuleTestBlockstateMatch,
-  'height_match': RuleTestHeightMatch,
-  'minecraft:height_match': RuleTestHeightMatch,
   'random_block_match': RuleTestRandomBlockMatch,
   'minecraft:random_block_match': RuleTestRandomBlockMatch,
   'random_blockstate_match': RuleTestRandomBlockstateMatch,
@@ -275,17 +276,13 @@ type RuleTestDispatcherMap = {
 }
 type RuleTestKeys = keyof RuleTestDispatcherMap
 type RuleTestFallback = (
-  | RuleTestAllOf
   | RuleTestBlockMatch
   | RuleTestBlockstateMatch
-  | RuleTestHeightMatch
   | RuleTestRandomBlockMatch
   | RuleTestRandomBlockstateMatch
   | RuleTestTagMatch)
-type RuleTestAllOf = AllOfMatch
 type RuleTestBlockMatch = BlockMatch
 type RuleTestBlockstateMatch = BlockStateMatch
-type RuleTestHeightMatch = HeightMatch
 type RuleTestRandomBlockMatch = RandomBlockMatch
 type RuleTestRandomBlockstateMatch = RandomBlockStateMatch
 type RuleTestTagMatch = TagMatch

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

@@ -1,7 +1,7 @@
 import type { MobCategory, SpawnerData } from 'sandstone/arguments/generated/data/worldgen/biome.ts'
 import type { DecorationStep, HeightmapType, HeightProvider } from 'sandstone/arguments/generated/data/worldgen.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
-import type { NonEmptyWeightedList } from 'sandstone/arguments/generated/util.ts'
+import type { FlatWeightedList, NonEmptyWeightedList } from 'sandstone/arguments/generated/util.ts'
 import type { NBTObject, RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { NBTFloat, NBTInt, TagClass } from 'sandstone'
 
@@ -164,10 +164,10 @@ export type OceanRuin = {
 }
 
 export type PoolAlias = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/pool_alias_binding'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/pool_alias_binding'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolWorldgenPoolAliasBinding ? SymbolWorldgenPoolAliasBinding[S] : RootNBT))
-}[Registry['minecraft:worldgen/pool_alias_binding']])>
+}[Extract<Registry['minecraft:worldgen/pool_alias_binding'], string>])>
 
 export type RandomGroupPoolAlias = {
   groups: NonEmptyWeightedList<Array<PoolAlias>>,
@@ -250,11 +250,11 @@ export type SpawnOverride = {
    *  - Full(`full`)
    */
   bounding_box: BoundingBox,
-  spawns: Array<SpawnerData>,
+  spawns: FlatWeightedList<SpawnerData>,
 }
 
 export type Structure = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/structure_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/structure_type'], string>, string>]?: ({
     type: S,
     biomes: (
           | Array<Registry['minecraft:worldgen/biome']> | (
@@ -293,7 +293,7 @@ export type Structure = NonNullable<({
       [Key in Extract<MobCategory, string>]?: SpawnOverride
     }),
   } & (S extends keyof SymbolStructureConfig ? SymbolStructureConfig[S] : RootNBT))
-}[Registry['minecraft:worldgen/structure_type']])>
+}[Extract<Registry['minecraft:worldgen/structure_type'], string>])>
 
 export type StructureRef = (Registry['minecraft:worldgen/structure'] | Structure)
 

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

@@ -75,7 +75,7 @@ export type RandomSpreadPlacement = {
 export type SpreadType = ('linear' | 'triangular')
 
 export type StructurePlacement = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/structure_placement'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/structure_placement'], string>, string>]?: ({
     type: S,
     /**
      * Value:
@@ -120,7 +120,7 @@ export type StructurePlacement = NonNullable<({
   } & (S extends keyof SymbolStructurePlacement
     ? SymbolStructurePlacement[S]
     : SymbolStructurePlacement<'%unknown'>))
-}[Registry['minecraft:worldgen/structure_placement']])>
+}[Extract<Registry['minecraft:worldgen/structure_placement'], string>])>
 
 export type StructureSet = {
   structures: Array<StructureSetElement>,