sandstone 1.1.1 → 1.1.2

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

@@ -5,7 +5,7 @@ import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { BlockState } from 'sandstone/arguments/generated/util/block_state.ts'
 import type { InclusiveRange, NonEmptyWeightedList } from 'sandstone/arguments/generated/util.ts'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
-import type { NBTFloat, NBTInt } from 'sandstone'
+import type { NBTFloat, NBTInt, TagClass } from 'sandstone'
 
 export type BaseNoiseProvider = {
   seed: NBTInt,
@@ -21,10 +21,14 @@ export type BaseNoiseProvider = {
 }
 
 export type BlockStateProvider = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/block_state_provider_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/block_state_provider_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolBlockStateProvider ? SymbolBlockStateProvider[S] : RootNBT))
-}[Registry['minecraft:worldgen/block_state_provider_type']])>
+}[Extract<Registry['minecraft:worldgen/block_state_provider_type'], string>])>
+
+export type CopyPropertiesProvider = {
+  source: BlockStateProvider,
+}
 
 export type DualNoiseProvider = (BaseNoiseProvider & {
   variety: InclusiveRange<NBTInt<{
@@ -71,12 +75,22 @@ export type NoiseThresholdProvider = (BaseNoiseProvider & {
   high_states: Array<BlockState>,
 })
 
+export type RandomBlockStateProvider = {
+  blocks: ((
+      | Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
+      | Array<Registry['minecraft:block']>),
+}
+
 export type RandomizedIntStateProvider = {
   property: string,
   values: IntProvider<NBTInt>,
   source: BlockStateProvider,
 }
 
+export type RotatedStateProvider = {
+  state: BlockState,
+}
+
 export type SimpleStateProvider = {
   state: BlockState,
 }
@@ -116,7 +130,7 @@ type BlockStateProviderDualNoiseProvider = DualNoiseProvider
 type BlockStateProviderNoiseProvider = NoiseProvider
 type BlockStateProviderNoiseThresholdProvider = NoiseThresholdProvider
 type BlockStateProviderRandomizedIntStateProvider = RandomizedIntStateProvider
-type BlockStateProviderRotatedBlockProvider = SimpleStateProvider
+type BlockStateProviderRotatedBlockProvider = RotatedStateProvider
 type BlockStateProviderRuleBasedStateProvider = RuleBasedBlockStateProvider
 type BlockStateProviderSimpleStateProvider = SimpleStateProvider
 type BlockStateProviderWeightedStateProvider = WeightedBlockStateProvider

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

@@ -34,11 +34,11 @@ export type ChanceConfig = {
 }
 
 export type ConfiguredDecorator = NonNullable<({
-  [S in Extract<`${string}:${string}`, string>]?: {
+  [S in Extract<Extract<`${string}:${string}`, string>, string>]?: {
     type: S,
     config: (S extends keyof SymbolDecoratorConfig ? SymbolDecoratorConfig[S] : RootNBT),
   }
-}[`${string}:${string}`])>
+}[Extract<`${string}:${string}`, string>])>
 
 export type CountConfig = {
   count: IntProvider<NBTInt<{
@@ -143,8 +143,6 @@ type DecoratorConfigDispatcherMap = {
   'minecraft:dark_oak_tree': DecoratorConfigDarkOakTree,
   'decorated': DecoratorConfigDecorated,
   'minecraft:decorated': DecoratorConfigDecorated,
-  'depth_average': DecoratorConfigDepthAverage,
-  'minecraft:depth_average': DecoratorConfigDepthAverage,
   'end_gateway': DecoratorConfigEndGateway,
   'minecraft:end_gateway': DecoratorConfigEndGateway,
   'fire': DecoratorConfigFire,
@@ -163,18 +161,12 @@ type DecoratorConfigDispatcherMap = {
   'minecraft:nope': DecoratorConfigNope,
   'range': DecoratorConfigRange,
   'minecraft:range': DecoratorConfigRange,
-  'range_biased': DecoratorConfigRangeBiased,
-  'minecraft:range_biased': DecoratorConfigRangeBiased,
-  'range_very_biased': DecoratorConfigRangeVeryBiased,
-  'minecraft:range_very_biased': DecoratorConfigRangeVeryBiased,
   'spread_32_above': DecoratorConfigSpread32Above,
   'minecraft:spread_32_above': DecoratorConfigSpread32Above,
   'square': DecoratorConfigSquare,
   'minecraft:square': DecoratorConfigSquare,
   'water_depth_threshold': DecoratorConfigWaterDepthThreshold,
   'minecraft:water_depth_threshold': DecoratorConfigWaterDepthThreshold,
-  'water_lake': DecoratorConfigWaterLake,
-  'minecraft:water_lake': DecoratorConfigWaterLake,
 }
 type DecoratorConfigKeys = keyof DecoratorConfigDispatcherMap
 type DecoratorConfigFallback = (
@@ -188,7 +180,6 @@ type DecoratorConfigFallback = (
   | DecoratorConfigCountNoiseBiased
   | DecoratorConfigDarkOakTree
   | DecoratorConfigDecorated
-  | DecoratorConfigDepthAverage
   | DecoratorConfigEndGateway
   | DecoratorConfigFire
   | DecoratorConfigGlowstone
@@ -198,12 +189,9 @@ type DecoratorConfigFallback = (
   | DecoratorConfigLavaLake
   | DecoratorConfigNope
   | DecoratorConfigRange
-  | DecoratorConfigRangeBiased
-  | DecoratorConfigRangeVeryBiased
   | DecoratorConfigSpread32Above
   | DecoratorConfigSquare
-  | DecoratorConfigWaterDepthThreshold
-  | DecoratorConfigWaterLake)
+  | DecoratorConfigWaterDepthThreshold)
 type DecoratorConfigCarvingMask = CarvingMaskConfig
 type DecoratorConfigCaveSurface = CaveSurface
 type DecoratorConfigChance = ChanceConfig
@@ -214,7 +202,6 @@ type DecoratorConfigCountNoise = CountNoiseConfig
 type DecoratorConfigCountNoiseBiased = CountNoiseBiasedConfig
 type DecoratorConfigDarkOakTree = Record<string, never>
 type DecoratorConfigDecorated = DecoratedConfig
-type DecoratorConfigDepthAverage = DepthAverageConfig
 type DecoratorConfigEndGateway = Record<string, never>
 type DecoratorConfigFire = CountConfig
 type DecoratorConfigGlowstone = CountConfig
@@ -224,12 +211,9 @@ type DecoratorConfigIceberg = Record<string, never>
 type DecoratorConfigLavaLake = ChanceConfig
 type DecoratorConfigNope = Record<string, never>
 type DecoratorConfigRange = RangeConfig
-type DecoratorConfigRangeBiased = OldRangeConfig
-type DecoratorConfigRangeVeryBiased = OldRangeConfig
 type DecoratorConfigSpread32Above = Record<string, never>
 type DecoratorConfigSquare = Record<string, never>
 type DecoratorConfigWaterDepthThreshold = WaterDepthThresholdConfig
-type DecoratorConfigWaterLake = ChanceConfig
 export type SymbolDecoratorConfig<CASE extends
   | 'map'
   | 'keys'

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

@@ -7,8 +7,9 @@ import type {
 import type { BlockPredicate } from 'sandstone/arguments/generated/data/worldgen/feature/block_predicate.ts'
 import type { ConfiguredFeatureRef } from 'sandstone/arguments/generated/data/worldgen/feature.ts'
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { VerticalDirection } from 'sandstone/arguments/generated/util/direction.ts'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
-import type { NBTFloat, NBTInt, NBTList } from 'sandstone'
+import type { NBTFloat, NBTInt, NBTList, TagClass } from 'sandstone'
 
 export type BlockPredicateFilter = {
   predicate: BlockPredicate,
@@ -36,14 +37,33 @@ export type CountOnEveryLayerModifier = {
   }>>,
 }
 
+export type CuboidModifier = {
+  xz_size: IntProvider<NBTInt<{
+    min: 1,
+    max: 16,
+  }>>,
+  y_size: IntProvider<NBTInt<{
+    min: 1,
+    max: 16,
+  }>>,
+  /**
+   * Defaults to `true`.
+   */
+  include_interior?: boolean,
+  /**
+   * Defaults to `true`.
+   */
+  include_edges?: boolean,
+}
+
 export type EnvironmentScanModifier = {
   /**
    * Value:
    *
-   *  - Up(`up`)
    *  - Down(`down`)
+   *  - Up(`up`)
    */
-  direction_of_search: SearchDirection,
+  direction_of_search: VerticalDirection,
   /**
    * Value:
    * Range: 1..32
@@ -98,18 +118,74 @@ export type NoiseThresholdCountModifier = {
   above_noise: NBTInt,
 }
 
+export type OffsetModifier = {
+  x: IntProvider<NBTInt<{
+    min: -16,
+    max: 16,
+  }>>,
+  y: IntProvider<NBTInt<{
+    min: -16,
+    max: 16,
+  }>>,
+  z: IntProvider<NBTInt<{
+    min: -16,
+    max: 16,
+  }>>,
+}
+
 export type PlacedFeature = {
   feature: ConfiguredFeatureRef,
   placement: Array<PlacementModifier>,
 }
 
-export type PlacedFeatureRef = (Registry['minecraft:worldgen/placed_feature'] | PlacedFeature)
+/**
+ * *either*
+ *
+ * *item 0*
+ *
+ * *or*
+ *
+ * List length range: 1..
+ *
+ * *or*
+ *
+ * *item 2*
+ *
+ * *or*
+ *
+ * List length range: 1..
+ */
+export type PlacedFeatureListRef = (PlacedFeature | NBTList<PlacedFeature, {
+  leftExclusive: false,
+  min: 1,
+}> | (
+  | Registry['minecraft:worldgen/placed_feature']
+  | `#${string}:${string}`
+  | TagClass<'worldgen/placed_feature'>) | NBTList<Registry['minecraft:worldgen/placed_feature'], {
+    leftExclusive: false,
+    min: 1,
+  }>)
+
+export type PlacedFeatureRef = (PlacedFeature | Registry['minecraft:worldgen/placed_feature'])
 
 export type PlacementModifier = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/placement_modifier_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/placement_modifier_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolPlacementModifier ? SymbolPlacementModifier[S] : RootNBT))
-}[Registry['minecraft:worldgen/placement_modifier_type']])>
+}[Extract<Registry['minecraft:worldgen/placement_modifier_type'], string>])>
+
+export type RandomChanceModifier = {
+  /**
+   * Value:
+   * Range: 0..1
+   */
+  chance: NBTFloat<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 0,
+    max: 1,
+  }>,
+}
 
 export type RandomOffsetModifier = {
   xz_spread: IntProvider<NBTInt<{
@@ -132,8 +208,6 @@ export type RarityFilter = {
   }>,
 }
 
-export type SearchDirection = ('up' | 'down')
-
 export type SurfaceRelativeThresholdFilter = {
   /**
    * Value:
@@ -156,8 +230,6 @@ export type SurfaceWaterDepthFilter = {
 type PlacementModifierDispatcherMap = {
   'block_predicate_filter': PlacementModifierBlockPredicateFilter,
   'minecraft:block_predicate_filter': PlacementModifierBlockPredicateFilter,
-  'carving_mask': PlacementModifierCarvingMask,
-  'minecraft:carving_mask': PlacementModifierCarvingMask,
   'count': PlacementModifierCount,
   'minecraft:count': PlacementModifierCount,
   'count_on_every_layer': PlacementModifierCountOnEveryLayer,
@@ -186,7 +258,6 @@ type PlacementModifierDispatcherMap = {
 type PlacementModifierKeys = keyof PlacementModifierDispatcherMap
 type PlacementModifierFallback = (
   | PlacementModifierBlockPredicateFilter
-  | PlacementModifierCarvingMask
   | PlacementModifierCount
   | PlacementModifierCountOnEveryLayer
   | PlacementModifierEnvironmentScan
@@ -200,7 +271,6 @@ type PlacementModifierFallback = (
   | PlacementModifierSurfaceRelativeThresholdFilter
   | PlacementModifierSurfaceWaterDepthFilter)
 type PlacementModifierBlockPredicateFilter = BlockPredicateFilter
-type PlacementModifierCarvingMask = CarvingMaskModifier
 type PlacementModifierCount = CountModifier
 type PlacementModifierCountOnEveryLayer = CountOnEveryLayerModifier
 type PlacementModifierEnvironmentScan = EnvironmentScanModifier

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

@@ -221,13 +221,13 @@ export type FallenTreeConfig = {
 }
 
 export type FeatureSize = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/feature_size_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/feature_size_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolFeatureSize ? SymbolFeatureSize[S] : RootNBT))
-}[Registry['minecraft:worldgen/feature_size_type']])>
+}[Extract<Registry['minecraft:worldgen/feature_size_type'], string>])>
 
 export type FoliagePlacer = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/foliage_placer_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/foliage_placer_type'], string>, string>]?: ({
     type: S,
     radius: IntProvider<NBTInt<{
       min: 0,
@@ -238,7 +238,7 @@ export type FoliagePlacer = NonNullable<({
       max: 16,
     }>>,
   } & (S extends keyof SymbolFoliagePlacer ? SymbolFoliagePlacer[S] : RootNBT))
-}[Registry['minecraft:worldgen/foliage_placer_type']])>
+}[Extract<Registry['minecraft:worldgen/foliage_placer_type'], string>])>
 
 export type HeightFoliagePlacer = {
   /**
@@ -427,13 +427,13 @@ export type RandomSpreadFoliagePlacer = {
 }
 
 export type RootPlacer = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/root_placer_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/root_placer_type'], string>, string>]?: ({
     type: S,
     root_provider: BlockStateProvider,
     trunk_offset_y: IntProvider<NBTInt>,
     above_root_placement?: AboveRootPlacement,
   } & (S extends keyof SymbolRootPlacer ? SymbolRootPlacer[S] : RootNBT))
-}[Registry['minecraft:worldgen/root_placer_type']])>
+}[Extract<Registry['minecraft:worldgen/root_placer_type'], string>])>
 
 export type ShelfMushroomTreeDecorator = {
   /**
@@ -516,18 +516,20 @@ export type TreeConfig = ({
   trunk_placer: TrunkPlacer,
   foliage_placer: FoliagePlacer,
   decorators: Array<TreeDecorator>,
+} & {
+  below_trunk_provider?: BlockStateProvider,
 } & {
   below_trunk_provider: BlockStateProvider,
 })
 
 export type TreeDecorator = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/tree_decorator_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/tree_decorator_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolTreeDecorator ? SymbolTreeDecorator[S] : RootNBT))
-}[Registry['minecraft:worldgen/tree_decorator_type']])>
+}[Extract<Registry['minecraft:worldgen/tree_decorator_type'], string>])>
 
 export type TrunkPlacer = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/trunk_placer_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/trunk_placer_type'], string>, string>]?: ({
     type: S,
     /**
      * Value:
@@ -554,7 +556,7 @@ export type TrunkPlacer = NonNullable<({
       max: 24,
     }>,
   } & (S extends keyof SymbolTrunkPlacer ? SymbolTrunkPlacer[S] : RootNBT))
-}[Registry['minecraft:worldgen/trunk_placer_type']])>
+}[Extract<Registry['minecraft:worldgen/trunk_placer_type'], string>])>
 
 export type TwoLayersFeatureSize = {
   /**
@@ -646,8 +648,6 @@ 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,7 +662,6 @@ type FoliagePlacerFallback = (
   | FoliagePlacerJungleFoliagePlacer
   | FoliagePlacerMegaPineFoliagePlacer
   | FoliagePlacerPineFoliagePlacer
-  | FoliagePlacerPoplarFoliagePlacer
   | FoliagePlacerRandomSpreadFoliagePlacer
   | FoliagePlacerSpruceFoliagePlacer)
 type FoliagePlacerBlobFoliagePlacer = HeightFoliagePlacer
@@ -672,7 +671,6 @@ 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
@@ -717,8 +715,6 @@ 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 = (
@@ -730,8 +726,7 @@ type TreeDecoratorFallback = (
   | TreeDecoratorCreakingHeart
   | TreeDecoratorLeaveVine
   | TreeDecoratorPaleMoss
-  | TreeDecoratorPlaceOnGround
-  | TreeDecoratorShelfMushroom)
+  | TreeDecoratorPlaceOnGround)
 type TreeDecoratorAlterGround = AlterGroundTreeDecorator
 type TreeDecoratorAttachedToLeaves = AttachedToLeavesTreeDecorator
 type TreeDecoratorAttachedToLogs = AttachedToLogsTreeDecorator
@@ -741,7 +736,6 @@ type TreeDecoratorCreakingHeart = CreakingHeartTreeDecorator
 type TreeDecoratorLeaveVine = LeaveVineTreeDecorator
 type TreeDecoratorPaleMoss = PaleMossTreeDecorator
 type TreeDecoratorPlaceOnGround = PlaceOnGroundTreeDecorator
-type TreeDecoratorShelfMushroom = ShelfMushroomTreeDecorator
 export type SymbolTreeDecorator<CASE extends
   | 'map'
   | 'keys'
@@ -765,8 +759,6 @@ 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,
@@ -781,7 +773,6 @@ type TrunkPlacerFallback = (
   | TrunkPlacerForkingTrunkPlacer
   | TrunkPlacerGiantTrunkPlacer
   | TrunkPlacerMegaJungleTrunkPlacer
-  | TrunkPlacerPoplarTrunkPlacer
   | TrunkPlacerStraightTrunkPlacer
   | TrunkPlacerUpwardsBranchingTrunkPlacer)
 type TrunkPlacerBendingTrunkPlacer = BendingTrunkPlacer
@@ -791,7 +782,6 @@ 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