sandstone 1.1.3 → 1.2.0

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

@@ -516,8 +516,6 @@ export type TreeConfig = ({
   trunk_placer: TrunkPlacer,
   foliage_placer: FoliagePlacer,
   decorators: Array<TreeDecorator>,
-} & {
-  below_trunk_provider?: BlockStateProvider,
 } & {
   below_trunk_provider: BlockStateProvider,
 })
@@ -648,6 +646,8 @@ type FoliagePlacerDispatcherMap = {
   'minecraft:mega_pine_foliage_placer': FoliagePlacerMegaPineFoliagePlacer,
   'pine_foliage_placer': FoliagePlacerPineFoliagePlacer,
   'minecraft:pine_foliage_placer': FoliagePlacerPineFoliagePlacer,
+  'poplar_foliage_placer': FoliagePlacerPoplarFoliagePlacer,
+  'minecraft:poplar_foliage_placer': FoliagePlacerPoplarFoliagePlacer,
   'random_spread_foliage_placer': FoliagePlacerRandomSpreadFoliagePlacer,
   'minecraft:random_spread_foliage_placer': FoliagePlacerRandomSpreadFoliagePlacer,
   'spruce_foliage_placer': FoliagePlacerSpruceFoliagePlacer,
@@ -662,6 +662,7 @@ type FoliagePlacerFallback = (
   | FoliagePlacerJungleFoliagePlacer
   | FoliagePlacerMegaPineFoliagePlacer
   | FoliagePlacerPineFoliagePlacer
+  | FoliagePlacerPoplarFoliagePlacer
   | FoliagePlacerRandomSpreadFoliagePlacer
   | FoliagePlacerSpruceFoliagePlacer)
 type FoliagePlacerBlobFoliagePlacer = HeightFoliagePlacer
@@ -671,6 +672,7 @@ type FoliagePlacerFancyFoliagePlacer = HeightFoliagePlacer
 type FoliagePlacerJungleFoliagePlacer = HeightFoliagePlacer
 type FoliagePlacerMegaPineFoliagePlacer = MegaPineFoliagePlacer
 type FoliagePlacerPineFoliagePlacer = PineFoliagePlacer
+type FoliagePlacerPoplarFoliagePlacer = PoplarFoliagePlacer
 type FoliagePlacerRandomSpreadFoliagePlacer = RandomSpreadFoliagePlacer
 type FoliagePlacerSpruceFoliagePlacer = SprucePineFoliagePlacer
 export type SymbolFoliagePlacer<CASE extends
@@ -715,6 +717,8 @@ type TreeDecoratorDispatcherMap = {
   'minecraft:pale_moss': TreeDecoratorPaleMoss,
   'place_on_ground': TreeDecoratorPlaceOnGround,
   'minecraft:place_on_ground': TreeDecoratorPlaceOnGround,
+  'shelf_mushroom': TreeDecoratorShelfMushroom,
+  'minecraft:shelf_mushroom': TreeDecoratorShelfMushroom,
 }
 type TreeDecoratorKeys = keyof TreeDecoratorDispatcherMap
 type TreeDecoratorFallback = (
@@ -726,7 +730,8 @@ type TreeDecoratorFallback = (
   | TreeDecoratorCreakingHeart
   | TreeDecoratorLeaveVine
   | TreeDecoratorPaleMoss
-  | TreeDecoratorPlaceOnGround)
+  | TreeDecoratorPlaceOnGround
+  | TreeDecoratorShelfMushroom)
 type TreeDecoratorAlterGround = AlterGroundTreeDecorator
 type TreeDecoratorAttachedToLeaves = AttachedToLeavesTreeDecorator
 type TreeDecoratorAttachedToLogs = AttachedToLogsTreeDecorator
@@ -736,6 +741,7 @@ type TreeDecoratorCreakingHeart = CreakingHeartTreeDecorator
 type TreeDecoratorLeaveVine = LeaveVineTreeDecorator
 type TreeDecoratorPaleMoss = PaleMossTreeDecorator
 type TreeDecoratorPlaceOnGround = PlaceOnGroundTreeDecorator
+type TreeDecoratorShelfMushroom = ShelfMushroomTreeDecorator
 export type SymbolTreeDecorator<CASE extends
   | 'map'
   | 'keys'
@@ -759,6 +765,8 @@ type TrunkPlacerDispatcherMap = {
   'minecraft:giant_trunk_placer': TrunkPlacerGiantTrunkPlacer,
   'mega_jungle_trunk_placer': TrunkPlacerMegaJungleTrunkPlacer,
   'minecraft:mega_jungle_trunk_placer': TrunkPlacerMegaJungleTrunkPlacer,
+  'poplar_trunk_placer': TrunkPlacerPoplarTrunkPlacer,
+  'minecraft:poplar_trunk_placer': TrunkPlacerPoplarTrunkPlacer,
   'straight_trunk_placer': TrunkPlacerStraightTrunkPlacer,
   'minecraft:straight_trunk_placer': TrunkPlacerStraightTrunkPlacer,
   'upwards_branching_trunk_placer': TrunkPlacerUpwardsBranchingTrunkPlacer,
@@ -773,6 +781,7 @@ type TrunkPlacerFallback = (
   | TrunkPlacerForkingTrunkPlacer
   | TrunkPlacerGiantTrunkPlacer
   | TrunkPlacerMegaJungleTrunkPlacer
+  | TrunkPlacerPoplarTrunkPlacer
   | TrunkPlacerStraightTrunkPlacer
   | TrunkPlacerUpwardsBranchingTrunkPlacer)
 type TrunkPlacerBendingTrunkPlacer = BendingTrunkPlacer
@@ -782,6 +791,7 @@ type TrunkPlacerFancyTrunkPlacer = Record<string, never>
 type TrunkPlacerForkingTrunkPlacer = Record<string, never>
 type TrunkPlacerGiantTrunkPlacer = Record<string, never>
 type TrunkPlacerMegaJungleTrunkPlacer = Record<string, never>
+type TrunkPlacerPoplarTrunkPlacer = PoplarTrunkPlacer
 type TrunkPlacerStraightTrunkPlacer = Record<string, never>
 type TrunkPlacerUpwardsBranchingTrunkPlacer = UpwardsBranchingTrunkPlacer
 export type SymbolTrunkPlacer<CASE extends

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

@@ -67,26 +67,50 @@ export type ColumnPlacer = {
 }
 
 export type ColumnsConfig = {
+  block: BlockStateProvider,
+  can_replace: BlockPredicate,
+  continue_through: BlockPredicate,
+  cannot_place_on: ((
+      | Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
+      | Array<Registry['minecraft:block']>),
   reach: IntProvider<NBTInt<{
     min: 0,
     max: 3,
   }>>,
+  column_reach: IntProvider<NBTInt<{
+    min: 0,
+    max: 3,
+  }>>,
+  column_count: IntProvider<NBTInt<{
+    min: 1,
+  }>>,
   height: IntProvider<NBTInt<{
     min: 1,
     max: 10,
   }>>,
+  /**
+   * The effective reach is limited by `height`.
+   */
+  cluster_reach: IntProvider<NBTInt<{
+    min: 0,
+    max: 13,
+  }>>,
 }
 
 export type ConfiguredFeature = NonNullable<({
-  [S in Extract<Extract<Registry['minecraft:worldgen/feature'], string>, string>]?: {
+  [S in Extract<Extract<(
+      | Registry['minecraft:worldgen/feature']
+      | Registry['minecraft:worldgen/feature_type']), string>, string>]?: ({
     type: S,
     config: (S extends keyof SymbolFeatureConfig ? SymbolFeatureConfig[S] : RootNBT),
-  }
-}[Extract<Registry['minecraft:worldgen/feature'], string>])>
+  } & (S extends keyof SymbolFeatureConfig ? SymbolFeatureConfig[S] : RootNBT))
+}[Extract<(Registry['minecraft:worldgen/feature'] | Registry['minecraft:worldgen/feature_type']), string>])>
 
-export type ConfiguredFeatureRef = (Registry['minecraft:worldgen/configured_feature'] | ConfiguredFeature)
+export type ConfiguredFeatureRef = (`${string}:${string}` | Registry['minecraft:worldgen/feature'] | ConfiguredFeature)
 
-export type CoralConfig = Record<string, never>
+export type CoralConfig = {
+  feature: PlacedFeatureRef,
+}
 
 export type DecoratedConfig = {
   decorator: ConfiguredDecorator,
@@ -224,15 +248,13 @@ export type GeodeBlockSettings = {
    * Blocks that will not be replaced by the geode.
    */
   cannot_replace: ((
-      | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>) | (
-      Registry['minecraft: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:tag/block']}` | TagClass<'block'>) | (
-      Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
+      | Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
       | Array<Registry['minecraft:block']>),
 }
 
@@ -419,13 +441,10 @@ export type LargeDripstoneConfig = {
   floor_to_ceiling_search_range?: NBTInt<{
     min: 1,
   }>,
-  column_radius: (IntProvider<NBTInt<{
-    min: 0,
-    max: 60,
-  }>> | IntProvider<NBTInt<{
+  column_radius: IntProvider<NBTInt<{
     min: 0,
     max: 16,
-  }>>),
+  }>>,
   height_scale: FloatProvider<NBTFloat<{
     leftExclusive: false,
     rightExclusive: false,
@@ -518,14 +537,6 @@ 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:
    *
@@ -862,8 +873,7 @@ export type RootSystemConfig = {
     max: 64,
   }>,
   root_replaceable: ((
-      | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>) | (
-      Registry['minecraft: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,
@@ -1061,9 +1071,6 @@ export type SpeleothemClusterConfig = {
     min: 1,
     max: 64,
   }>,
-  dripstone_block_layer_thickness: IntProvider<NBTInt<{
-    min: 0,
-  }>>,
   speleothem_block_layer_thickness: IntProvider<NBTInt<{
     min: 0,
   }>>,
@@ -1077,16 +1084,6 @@ 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
@@ -1097,14 +1094,6 @@ 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
@@ -1129,16 +1118,6 @@ 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
@@ -1320,8 +1299,7 @@ export type VegetationPatchConfig = {
   }>,
   xz_radius: IntProvider<NBTInt>,
   replaceable: ((
-      | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>) | (
-      Registry['minecraft: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,
@@ -1370,12 +1348,12 @@ type FeatureConfigDispatcherMap = {
   'minecraft:delta_feature': FeatureConfigDeltaFeature,
   'disk': FeatureConfigDisk,
   'minecraft:disk': FeatureConfigDisk,
-  'dripstone_cluster': FeatureConfigDripstoneCluster,
-  'minecraft:dripstone_cluster': FeatureConfigDripstoneCluster,
   'emerald_ore': FeatureConfigEmeraldOre,
   '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,
@@ -1416,10 +1394,14 @@ type FeatureConfigDispatcherMap = {
   'minecraft:no_surface_ore': FeatureConfigNoSurfaceOre,
   'ore': FeatureConfigOre,
   'minecraft:ore': FeatureConfigOre,
-  'pointed_dripstone': FeatureConfigPointedDripstone,
-  'minecraft:pointed_dripstone': FeatureConfigPointedDripstone,
+  'overlay': FeatureConfigOverlay,
+  'minecraft:overlay': FeatureConfigOverlay,
+  'projected_random_patchy_square': FeatureConfigProjectedRandomPatchySquare,
+  'minecraft:projected_random_patchy_square': FeatureConfigProjectedRandomPatchySquare,
   'random_boolean_selector': FeatureConfigRandomBooleanSelector,
   'minecraft:random_boolean_selector': FeatureConfigRandomBooleanSelector,
+  'random_neighbor_spread': FeatureConfigRandomNeighborSpread,
+  'minecraft:random_neighbor_spread': FeatureConfigRandomNeighborSpread,
   'random_patch': FeatureConfigRandomPatch,
   'minecraft:random_patch': FeatureConfigRandomPatch,
   'random_selector': FeatureConfigRandomSelector,
@@ -1442,6 +1424,8 @@ type FeatureConfigDispatcherMap = {
   'minecraft:simple_block': FeatureConfigSimpleBlock,
   'simple_random_selector': FeatureConfigSimpleRandomSelector,
   'minecraft:simple_random_selector': FeatureConfigSimpleRandomSelector,
+  'single_block_pillar': FeatureConfigSingleBlockPillar,
+  'minecraft:single_block_pillar': FeatureConfigSingleBlockPillar,
   'speleothem': FeatureConfigSpeleothem,
   'minecraft:speleothem': FeatureConfigSpeleothem,
   'speleothem_cluster': FeatureConfigSpeleothemCluster,
@@ -1450,6 +1434,8 @@ type FeatureConfigDispatcherMap = {
   'minecraft:spike': FeatureConfigSpike,
   'spring_feature': FeatureConfigSpringFeature,
   'minecraft:spring_feature': FeatureConfigSpringFeature,
+  'stepped_column_cluster': FeatureConfigSteppedColumnCluster,
+  'minecraft:stepped_column_cluster': FeatureConfigSteppedColumnCluster,
   'template': FeatureConfigTemplate,
   'minecraft:template': FeatureConfigTemplate,
   'tree': FeatureConfigTree,
@@ -1476,9 +1462,9 @@ type FeatureConfigFallback = (
   | FeatureConfigCoralTree
   | FeatureConfigDeltaFeature
   | FeatureConfigDisk
-  | FeatureConfigDripstoneCluster
   | FeatureConfigEmeraldOre
   | FeatureConfigEndGateway
+  | FeatureConfigEndPodium
   | FeatureConfigEndSpike
   | FeatureConfigFallenTree
   | FeatureConfigFillLayer
@@ -1499,8 +1485,10 @@ type FeatureConfigFallback = (
   | FeatureConfigNoBonemealFlower
   | FeatureConfigNoSurfaceOre
   | FeatureConfigOre
-  | FeatureConfigPointedDripstone
+  | FeatureConfigOverlay
+  | FeatureConfigProjectedRandomPatchySquare
   | FeatureConfigRandomBooleanSelector
+  | FeatureConfigRandomNeighborSpread
   | FeatureConfigRandomPatch
   | FeatureConfigRandomSelector
   | FeatureConfigReplaceSingleBlock
@@ -1512,10 +1500,12 @@ type FeatureConfigFallback = (
   | FeatureConfigSequence
   | FeatureConfigSimpleBlock
   | FeatureConfigSimpleRandomSelector
+  | FeatureConfigSingleBlockPillar
   | FeatureConfigSpeleothem
   | FeatureConfigSpeleothemCluster
   | FeatureConfigSpike
   | FeatureConfigSpringFeature
+  | FeatureConfigSteppedColumnCluster
   | FeatureConfigTemplate
   | FeatureConfigTree
   | FeatureConfigTwistingVines
@@ -1532,9 +1522,9 @@ 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
@@ -1555,8 +1545,10 @@ type FeatureConfigNetherrackReplaceBlobs = NetherrackReplaceBlobsConfig
 type FeatureConfigNoBonemealFlower = RandomPatchConfig
 type FeatureConfigNoSurfaceOre = OreConfig
 type FeatureConfigOre = OreConfig
-type FeatureConfigPointedDripstone = SpeleothemConfig
+type FeatureConfigOverlay = OverlayConfig
+type FeatureConfigProjectedRandomPatchySquare = ProjectedSquareConfig
 type FeatureConfigRandomBooleanSelector = RandomBooleanSelector
+type FeatureConfigRandomNeighborSpread = RandomNeighborSpreadConfig
 type FeatureConfigRandomPatch = RandomPatchConfig
 type FeatureConfigRandomSelector = RandomSelector
 type FeatureConfigReplaceSingleBlock = ReplaceSingleBlockConfig
@@ -1568,10 +1560,12 @@ type FeatureConfigSeagrass = ProbabilityConfig
 type FeatureConfigSequence = SequenceConfig
 type FeatureConfigSimpleBlock = SimpleBlockConfig
 type FeatureConfigSimpleRandomSelector = SimpleRandomSelectorConfig
+type FeatureConfigSingleBlockPillar = SingleBlockPillarConfig
 type FeatureConfigSpeleothem = SpeleothemConfig
 type FeatureConfigSpeleothemCluster = SpeleothemClusterConfig
 type FeatureConfigSpike = SpikeConfig
 type FeatureConfigSpringFeature = SpringConfig
+type FeatureConfigSteppedColumnCluster = ColumnsConfig
 type FeatureConfigTemplate = TemplateConfig
 type FeatureConfigTree = TreeConfig
 type FeatureConfigTwistingVines = TwistingVinesConfig

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

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

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

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

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

@@ -34,11 +34,14 @@ export type NoiseGeneratorSettings = ({
    * If true, mobs will not spawn during generation.
    */
   disable_mob_generation: boolean,
+  aquifers?: Aquifer,
+  ore_veins?: Array<OreVeinifier>,
   legacy_random_source: boolean,
   noise: NoiseSettings,
   noise_router: NoiseRouter,
-  spawn_target: Array<ClimateParameters>,
+  spawn_target: (Array<ClimateParameters> | Array<SpawnTargetPoint>),
   surface_rule: MaterialRuleRef,
+  material_rule: MaterialRuleRef,
 } & {
   aquifers_enabled: boolean,
   ore_veins_enabled: boolean,

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

@@ -168,8 +168,7 @@ export type ProcessorRule = {
 
 export type ProtectedBlocks = {
   value: ((
-      | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>) | (
-      Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
+      | Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
       | Array<Registry['minecraft:block']>),
 }
 
@@ -263,10 +262,18 @@ export type SymbolRuleBlockEntityModifier<CASE extends
     ? RuleBlockEntityModifierKeys
     : CASE extends '%fallback' ? RuleBlockEntityModifierFallback : never
 type RuleTestDispatcherMap = {
+  'all_of': RuleTestAllOf,
+  'minecraft:all_of': RuleTestAllOf,
+  'any_of': RuleTestAnyOf,
+  'minecraft:any_of': RuleTestAnyOf,
   'block_match': RuleTestBlockMatch,
   'minecraft:block_match': RuleTestBlockMatch,
   'blockstate_match': RuleTestBlockstateMatch,
   'minecraft:blockstate_match': RuleTestBlockstateMatch,
+  'height_match': RuleTestHeightMatch,
+  'minecraft:height_match': RuleTestHeightMatch,
+  'not': RuleTestNot,
+  'minecraft:not': RuleTestNot,
   'random_block_match': RuleTestRandomBlockMatch,
   'minecraft:random_block_match': RuleTestRandomBlockMatch,
   'random_blockstate_match': RuleTestRandomBlockstateMatch,
@@ -276,13 +283,21 @@ type RuleTestDispatcherMap = {
 }
 type RuleTestKeys = keyof RuleTestDispatcherMap
 type RuleTestFallback = (
+  | RuleTestAllOf
+  | RuleTestAnyOf
   | RuleTestBlockMatch
   | RuleTestBlockstateMatch
+  | RuleTestHeightMatch
+  | RuleTestNot
   | RuleTestRandomBlockMatch
   | RuleTestRandomBlockstateMatch
   | RuleTestTagMatch)
+type RuleTestAllOf = CompositeMatch
+type RuleTestAnyOf = CompositeMatch
 type RuleTestBlockMatch = BlockMatch
 type RuleTestBlockstateMatch = BlockStateMatch
+type RuleTestHeightMatch = HeightMatch
+type RuleTestNot = InvertedMatch
 type RuleTestRandomBlockMatch = RandomBlockMatch
 type RuleTestRandomBlockstateMatch = RandomBlockStateMatch
 type RuleTestTagMatch = TagMatch

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

@@ -100,6 +100,8 @@ export type VerticalAnchor = ({
   above_bottom: NBTInt,
 } | {
   below_top: NBTInt,
+} | {
+  relative_to_sea_level: NBTInt,
 })
 
 export type WeightListHeightProvider = {
@@ -200,6 +202,8 @@ type IntProviderDispatcherMap<T extends NBTObject> = {
   'minecraft:trapezoid': IntProviderTrapezoid<T>,
   'uniform': IntProviderUniform<T>,
   'minecraft:uniform': IntProviderUniform<T>,
+  'very_biased_to_bottom': IntProviderVeryBiasedToBottom<T>,
+  'minecraft:very_biased_to_bottom': IntProviderVeryBiasedToBottom<T>,
   'weighted_list': IntProviderWeightedList<T>,
   'minecraft:weighted_list': IntProviderWeightedList<T>,
 }
@@ -211,6 +215,7 @@ type IntProviderFallback<T extends NBTObject> = (
   | IntProviderConstant<T>
   | IntProviderTrapezoid<T>
   | IntProviderUniform<T>
+  | IntProviderVeryBiasedToBottom<T>
   | IntProviderWeightedList<T>)
 export type IntProviderBiasedToBottom<T extends NBTObject> = UniformIntProvider<T>
 
@@ -228,6 +233,8 @@ export type IntProviderTrapezoid<T extends NBTObject> = {
 
 export type IntProviderUniform<T extends NBTObject> = UniformIntProvider<T>
 
+export type IntProviderVeryBiasedToBottom<T extends NBTObject> = UniformIntProvider<T>
+
 export type IntProviderWeightedList<T extends NBTObject> = {
   distribution: NonEmptyWeightedList<IntProvider<T>>,
 }

package/src/arguments/generated/dispatcher.ts

@@ -1,16 +1,12 @@
-export { type SymbolMcdocBlockStateKeys, type McdocBlockStateKeysFallbackType } from './_builtin/block_state_keys.ts'
-
-export { type SymbolMcdocBlockStates, type McdocBlockStatesFallbackType } from './_builtin/block_states.ts'
-
-export { type SymbolMcdocFluidStates, type McdocFluidStatesFallbackType } from './_builtin/fluid_states.ts'
-
-export { type SymbolMcdocFluidStateKeys } from './_builtin/fluid_state_keys.ts'
-
 export {
   type SymbolMcdocBlockItemStates,
   type McdocBlockItemStatesFallbackType,
 } from './_builtin/block_item_states.ts'
 
+export { type SymbolMcdocBlockStateKeys, type McdocBlockStateKeysFallbackType } from './_builtin/block_state_keys.ts'
+
+export { type SymbolMcdocBlockStates, type McdocBlockStatesFallbackType } from './_builtin/block_states.ts'
+
 export { type SymbolMcdocCustomData, type McdocCustomDataFallbackType } from './_builtin/custom_data.ts'
 
 export {
@@ -27,6 +23,8 @@ export { type SymbolMcdocCustomEvent, type McdocCustomEventFallbackType } from '
 
 export { type SymbolMcdocDialogAfterAction } from './_builtin/dialog_after_action.ts'
 
+export { type SymbolMcdocFluidStates, type McdocFluidStatesFallbackType } from './_builtin/fluid_states.ts'
+
 export { type SymbolMcdocMarkerData, type McdocMarkerDataFallbackType } from './_builtin/marker_data.ts'
 
 export { type SymbolLootFunction } from './data/loot/function.ts'
@@ -169,3 +167,5 @@ export { type SymbolTestInstance } from './data/gametest.ts'
 export { type SymbolTrigger } from './data/advancement/trigger.ts'
 
 export { type SymbolUniformValue } from './_dispatcher/uniform_value.ts'
+
+export { type SymbolMcdocFluidStateKeys } from './_builtin/fluid_state_keys.ts'

package/src/arguments/generated/registry-sets.ts

@@ -38,12 +38,16 @@ export { JUKEBOX_SONGS_SET } from './_registry/jukebox_songs.ts'
 
 export { LOOT_TABLES_SET } from './_registry/loot_tables.ts'
 
+export { NUMBER_PROVIDERS_SET } from './_registry/number_providers.ts'
+
 export { PAINTING_VARIANTS_SET } from './_registry/painting_variants.ts'
 
 export { PIG_SOUND_VARIANTS_SET } from './_registry/pig_sound_variants.ts'
 
 export { PIG_VARIANTS_SET } from './_registry/pig_variants.ts'
 
+export { PREDICATES_SET } from './_registry/predicates.ts'
+
 export { RECIPES_SET } from './_registry/recipes.ts'
 
 export { STRUCTURES_SET } from './_registry/structures.ts'
@@ -104,9 +108,9 @@ export { TAG_POINT_OF_INTEREST_TYPES_SET } from './_registry/tag_point_of_intere
 
 export { TAG_POTIONS_SET } from './_registry/tag_potions.ts'
 
-export { TAG_WORLDGEN_BIOMES_SET } from './_registry/tag_worldgen_biomes.ts'
+export { TAG_WORLDGEN_FEATURES_SET } from './_registry/tag_worldgen_features.ts'
 
-export { TAG_WORLDGEN_CONFIGURED_FEATURES_SET } from './_registry/tag_worldgen_configured_features.ts'
+export { TAG_WORLDGEN_BIOMES_SET } from './_registry/tag_worldgen_biomes.ts'
 
 export {
   TAG_WORLDGEN_FLAT_LEVEL_GENERATOR_PRESETS_SET,
@@ -118,9 +122,7 @@ export { TAG_WORLDGEN_WORLD_PRESETS_SET } from './_registry/tag_worldgen_world_p
 
 export { WORLDGEN_BIOMES_SET } from './_registry/worldgen_biomes.ts'
 
-export { WORLDGEN_CONFIGURED_CARVERS_SET } from './_registry/worldgen_configured_carvers.ts'
-
-export { WORLDGEN_CONFIGURED_FEATURES_SET } from './_registry/worldgen_configured_features.ts'
+export { WORLDGEN_CARVERS_SET } from './_registry/worldgen_carvers.ts'
 
 export { WORLDGEN_DENSITY_FUNCTIONS_SET } from './_registry/worldgen_density_functions.ts'
 
@@ -186,8 +188,6 @@ export { BLOCK_ENTITY_TYPES_SET } from './_registry/block_entity_types.ts'
 
 export { BLOCK_PREDICATE_TYPES_SET } from './_registry/block_predicate_types.ts'
 
-export { BLOCK_TYPES_SET } from './_registry/block_types.ts'
-
 export { CHUNK_STATUSES_SET } from './_registry/chunk_statuses.ts'
 
 export { COMMAND_ARGUMENT_TYPES_SET } from './_registry/command_argument_types.ts'
@@ -326,7 +326,7 @@ export { WORLDGEN_BIOME_SOURCES_SET } from './_registry/worldgen_biome_sources.t
 
 export { WORLDGEN_BLOCK_STATE_PROVIDER_TYPES_SET } from './_registry/worldgen_block_state_provider_types.ts'
 
-export { WORLDGEN_CARVERS_SET } from './_registry/worldgen_carvers.ts'
+export { WORLDGEN_CARVER_TYPES_SET } from './_registry/worldgen_carver_types.ts'
 
 export { WORLDGEN_CHUNK_GENERATORS_SET } from './_registry/worldgen_chunk_generators.ts'
 
@@ -334,8 +334,14 @@ export { WORLDGEN_DENSITY_FUNCTION_TYPES_SET } from './_registry/worldgen_densit
 
 export { WORLDGEN_FEATURE_SIZE_TYPES_SET } from './_registry/worldgen_feature_size_types.ts'
 
+export { WORLDGEN_FEATURE_TYPES_SET } from './_registry/worldgen_feature_types.ts'
+
 export { WORLDGEN_FOLIAGE_PLACER_TYPES_SET } from './_registry/worldgen_foliage_placer_types.ts'
 
+export { WORLDGEN_MATERIAL_CONDITION_TYPES_SET } from './_registry/worldgen_material_condition_types.ts'
+
+export { WORLDGEN_MATERIAL_RULE_TYPES_SET } from './_registry/worldgen_material_rule_types.ts'
+
 export { WORLDGEN_PLACEMENT_MODIFIER_TYPES_SET } from './_registry/worldgen_placement_modifier_types.ts'
 
 export { WORLDGEN_POOL_ALIAS_BINDINGS_SET } from './_registry/worldgen_pool_alias_bindings.ts'