sandstone 1.0.0 → 1.1.0

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

@@ -0,0 +1,119 @@
+import type { CaveSurface, VerticalAnchor } from 'sandstone/arguments/generated/data/worldgen.ts'
+import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { RootNBT } from 'sandstone/arguments/nbt.ts'
+import type { NBTFloat, NBTInt, TagClass } from 'sandstone'
+
+export type BiomeCondition = {
+  biome_is: (
+      | Array<Registry['minecraft:worldgen/biome']> | (
+        | Registry['minecraft:worldgen/biome']
+        | `#${Registry['minecraft:tag/worldgen/biome']}`
+        | TagClass<'worldgen/biome'>)),
+}
+
+export type MaterialCondition = NonNullable<({
+  [S in Extract<Registry['minecraft:worldgen/material_condition'], string>]?: ({
+    type: S,
+  } & (S extends keyof SymbolMaterialCondition ? SymbolMaterialCondition[S] : RootNBT))
+}[Registry['minecraft:worldgen/material_condition']])>
+
+export type MaterialConditionRef = MaterialCondition
+
+export type NoiseThresholdCondition = {
+  noise: Registry['minecraft:worldgen/noise'],
+  min_threshold: NBTFloat,
+  max_threshold: NBTFloat,
+  /**
+   * Defaults to `false`.
+   */
+  is_3d?: boolean,
+}
+
+export type NotCondition = {
+  invert: MaterialConditionRef,
+}
+
+export type StoneDepthCondition = {
+  offset: NBTInt,
+  /**
+   * Value:
+   *
+   *  - Floor(`floor`)
+   *  - Ceiling(`ceiling`)
+   */
+  surface_type: CaveSurface,
+  add_surface_depth: boolean,
+  secondary_depth_range: NBTInt,
+}
+
+export type VerticalGradientCondition = {
+  random_name: string,
+  true_at_and_below: VerticalAnchor,
+  false_at_and_above: VerticalAnchor,
+}
+
+export type WaterCondition = {
+  offset: NBTInt,
+  /**
+   * Value:
+   * Range: -20..20
+   */
+  surface_depth_multiplier: NBTInt<{
+    min: -20,
+    max: 20,
+  }>,
+  add_stone_depth: boolean,
+}
+
+export type YAboveCondition = {
+  anchor: VerticalAnchor,
+  /**
+   * Value:
+   * Range: -20..20
+   */
+  surface_depth_multiplier: NBTInt<{
+    min: -20,
+    max: 20,
+  }>,
+  add_stone_depth: boolean,
+}
+type MaterialConditionDispatcherMap = {
+  'biome': MaterialConditionBiome,
+  'minecraft:biome': MaterialConditionBiome,
+  'noise_threshold': MaterialConditionNoiseThreshold,
+  'minecraft:noise_threshold': MaterialConditionNoiseThreshold,
+  'not': MaterialConditionNot,
+  'minecraft:not': MaterialConditionNot,
+  'stone_depth': MaterialConditionStoneDepth,
+  'minecraft:stone_depth': MaterialConditionStoneDepth,
+  'vertical_gradient': MaterialConditionVerticalGradient,
+  'minecraft:vertical_gradient': MaterialConditionVerticalGradient,
+  'water': MaterialConditionWater,
+  'minecraft:water': MaterialConditionWater,
+  'y_above': MaterialConditionYAbove,
+  'minecraft:y_above': MaterialConditionYAbove,
+}
+type MaterialConditionKeys = keyof MaterialConditionDispatcherMap
+type MaterialConditionFallback = (
+  | MaterialConditionBiome
+  | MaterialConditionNoiseThreshold
+  | MaterialConditionNot
+  | MaterialConditionStoneDepth
+  | MaterialConditionVerticalGradient
+  | MaterialConditionWater
+  | MaterialConditionYAbove)
+type MaterialConditionBiome = BiomeCondition
+type MaterialConditionNoiseThreshold = NoiseThresholdCondition
+type MaterialConditionNot = NotCondition
+type MaterialConditionStoneDepth = StoneDepthCondition
+type MaterialConditionVerticalGradient = VerticalGradientCondition
+type MaterialConditionWater = WaterCondition
+type MaterialConditionYAbove = YAboveCondition
+export type SymbolMaterialCondition<CASE extends
+  | 'map'
+  | 'keys'
+  | '%fallback'
+  | '%none'
+  | '%unknown' = 'map'> = CASE extends 'map'
+  ? MaterialConditionDispatcherMap
+  : CASE extends 'keys' ? MaterialConditionKeys : CASE extends '%fallback' ? MaterialConditionFallback : never

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

@@ -0,0 +1,52 @@
+import type { MaterialConditionRef } from 'sandstone/arguments/generated/data/worldgen/material_condition.ts'
+import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { BlockState } from 'sandstone/arguments/generated/util/block_state.ts'
+
+export type BlockRule = {
+  result_state: BlockState,
+}
+
+export type ConditionRule = {
+  if_true: MaterialConditionRef,
+  then_run: MaterialRuleRef,
+}
+
+export type MaterialRule = NonNullable<({
+  [S in Extract<Registry['minecraft:worldgen/material_rule'], string>]?: ({
+    type: S,
+  } & (S extends keyof SymbolMaterialRule ? SymbolMaterialRule[S] : SymbolMaterialRule<'%unknown'>))
+}[Registry['minecraft:worldgen/material_rule']])>
+
+export type MaterialRuleRef = MaterialRule
+
+export type SequenceRule = {
+  sequence: Array<MaterialRuleRef>,
+}
+type MaterialRuleDispatcherMap = {
+  'block': MaterialRuleBlock,
+  'minecraft:block': MaterialRuleBlock,
+  'condition': MaterialRuleCondition,
+  'minecraft:condition': MaterialRuleCondition,
+  'sequence': MaterialRuleSequence,
+  'minecraft:sequence': MaterialRuleSequence,
+}
+type MaterialRuleKeys = keyof MaterialRuleDispatcherMap
+type MaterialRuleFallback = (
+  | MaterialRuleBlock
+  | MaterialRuleCondition
+  | MaterialRuleSequence
+  | MaterialRuleFallbackType)
+export type MaterialRuleFallbackType = Record<string, never>
+type MaterialRuleBlock = BlockRule
+type MaterialRuleCondition = ConditionRule
+type MaterialRuleSequence = SequenceRule
+export type SymbolMaterialRule<CASE extends
+  | 'map'
+  | 'keys'
+  | '%fallback'
+  | '%none'
+  | '%unknown' = 'map'> = CASE extends 'map'
+  ? MaterialRuleDispatcherMap
+  : CASE extends 'keys'
+    ? MaterialRuleKeys
+    : CASE extends '%fallback' ? MaterialRuleFallback : CASE extends '%unknown' ? MaterialRuleFallbackType : never

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

@@ -1,14 +1,19 @@
 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 { MaterialRuleRef } from 'sandstone/arguments/generated/data/worldgen/material_rule.ts'
 import type {
   ConcentricRingsPlacement,
   RandomSpreadPlacement,
 } from 'sandstone/arguments/generated/data/worldgen/structure_set.ts'
-import type { SurfaceRule } from 'sandstone/arguments/generated/data/worldgen/surface_rule.ts'
 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 = {
+  aquifers_enabled: boolean,
+  ore_veins_enabled: boolean,
+}
+
 export type NoiseGeneratorSettings = ({
   default_block: BlockState,
   default_fluid: BlockState,
@@ -21,7 +26,7 @@ export type NoiseGeneratorSettings = ({
   noise: NoiseSettings,
   noise_router: NoiseRouter,
   spawn_target: Array<ClimateParameters>,
-  surface_rule: SurfaceRule,
+  surface_rule: MaterialRuleRef,
 } & {
   aquifers_enabled: boolean,
   ore_veins_enabled: boolean,

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

@@ -5,6 +5,10 @@ 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),
 }
@@ -86,6 +90,11 @@ export type Gravity = {
   offset: NBTInt,
 }
 
+export type HeightMatch = {
+  min_inclusive: NBTInt,
+  max_inclusive: NBTInt,
+}
+
 export type LinearPos = {
   /**
    * Value:
@@ -139,6 +148,10 @@ export type ProcessorList = (Array<Processor> | {
   processors: Array<Processor>,
 })
 
+export type ProcessorListObject = {
+  processors: Array<Processor>,
+}
+
 export type ProcessorListRef = (Registry['minecraft:worldgen/processor_list'] | ProcessorList)
 
 export type ProcessorRule = {
@@ -150,7 +163,9 @@ export type ProcessorRule = {
 }
 
 export type ProtectedBlocks = {
-  value: (`#${Registry['minecraft:tag/block']}` | TagClass<'block'>),
+  value: ((
+      | Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
+      | Array<Registry['minecraft:block']>),
 }
 
 export type RandomBlockMatch = {
@@ -243,10 +258,14 @@ 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,
@@ -256,13 +275,17 @@ 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

@@ -11,6 +11,23 @@ export type BoundingBox = ('piece' | 'full')
 
 export type BuriedTreasure = Record<string, never>
 
+export type DimensionPaddingConfig = {
+  /**
+   * Value:
+   * Range: 0..
+   */
+  bottom?: NBTInt<{
+    min: 0,
+  }>,
+  /**
+   * Value:
+   * Range: 0..
+   */
+  top?: NBTInt<{
+    min: 0,
+  }>,
+}
+
 export type DirectPoolAlias = {
   alias: `${string}:${string}`,
   target: Registry['minecraft:worldgen/template_pool'],
@@ -88,10 +105,10 @@ export type Jigsaw<S = undefined> = ({
 export type JigsawDistanceLimits<T extends NBTObject> = {
   horizontal: T,
   /**
-   * Defaults to 4096
+   * Defaults to 4064
    *
    * Value:
-   * Range: 1..4096
+   * Range: 1..4064
    */
   vertical?: NBTInt<{
     min: 1,
@@ -281,6 +298,66 @@ export type Structure = NonNullable<({
 export type StructureRef = (Registry['minecraft:worldgen/structure'] | Structure)
 
 export type TerrainAdaptation = ('none' | 'beard_thin' | 'beard_box' | 'bury' | 'encapsulate')
+
+export type TrickyTrialsStructureConfig = {
+  /**
+   * Value:
+   * *either*
+   *
+   * Range: 0..
+   *
+   * *or*
+   *
+   * *item 1*
+   */
+  dimension_padding?: (NBTInt<{
+    min: 0,
+  }> | {
+    /**
+     * Value:
+     * Range: 0..
+     */
+    bottom?: NBTInt<{
+      min: 0,
+    }>,
+    /**
+     * Value:
+     * Range: 0..
+     */
+    top?: NBTInt<{
+      min: 0,
+    }>,
+  }),
+  /**
+   * Value:
+   *
+   *  - ApplyWaterlogging(`apply_waterlogging`)
+   *  - IgnoreWaterlogging(`ignore_waterlogging`)
+   */
+  liquid_settings?: LiquidSettings,
+}
+
+export type WildUpdateStructureConfig<S = undefined> = {
+  start_height: HeightProvider,
+  start_jigsaw_name?: `${string}:${string}`,
+  /**
+   * Value:
+   *
+   *  - MotionBlocking(`MOTION_BLOCKING`)
+   *  - MotionBlockingNoLeaves(`MOTION_BLOCKING_NO_LEAVES`)
+   *  - OceanFloor(`OCEAN_FLOOR`)
+   *  - OceanFloorWorldgen(`OCEAN_FLOOR_WG`)
+   *  - WorldSurface(`WORLD_SURFACE`)
+   *  - WorldSurfaceWorldgen(`WORLD_SURFACE_WG`)
+   */
+  project_start_to_heightmap?: HeightmapType,
+  max_distance_from_center: (S extends undefined
+    ? SymbolJigsawMaxDistanceFromCenter<'%none'> :
+    (S extends keyof SymbolJigsawMaxDistanceFromCenter
+      ? SymbolJigsawMaxDistanceFromCenter[S]
+      : SymbolJigsawMaxDistanceFromCenter<'%unknown'>)),
+  use_expansion_hack: boolean,
+}
 type JigsawMaxDistanceFromCenterDispatcherMap = {
   'beard_box': JigsawMaxDistanceFromCenterBeardBox,
   'minecraft:beard_box': JigsawMaxDistanceFromCenterBeardBox,

package/src/arguments/generated/data/worldgen/structure_set.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, TagClass } from 'sandstone'
 
 export type ConcentricRingsPlacement = {
@@ -118,7 +117,9 @@ export type StructurePlacement = NonNullable<({
       min: 3,
       max: 3,
     }>,
-  } & (S extends keyof SymbolStructurePlacement ? SymbolStructurePlacement[S] : RootNBT))
+  } & (S extends keyof SymbolStructurePlacement
+    ? SymbolStructurePlacement[S]
+    : SymbolStructurePlacement<'%unknown'>))
 }[Registry['minecraft:worldgen/structure_placement']])>
 
 export type StructureSet = {
@@ -145,7 +146,11 @@ type StructurePlacementDispatcherMap = {
   'minecraft:random_spread': StructurePlacementRandomSpread,
 }
 type StructurePlacementKeys = keyof StructurePlacementDispatcherMap
-type StructurePlacementFallback = (StructurePlacementConcentricRings | StructurePlacementRandomSpread)
+type StructurePlacementFallback = (
+  | StructurePlacementConcentricRings
+  | StructurePlacementRandomSpread
+  | StructurePlacementFallbackType)
+export type StructurePlacementFallbackType = Record<string, never>
 type StructurePlacementConcentricRings = ConcentricRingsPlacement
 type StructurePlacementRandomSpread = RandomSpreadPlacement
 export type SymbolStructurePlacement<CASE extends
@@ -155,4 +160,8 @@ export type SymbolStructurePlacement<CASE extends
   | '%none'
   | '%unknown' = 'map'> = CASE extends 'map'
   ? StructurePlacementDispatcherMap
-  : CASE extends 'keys' ? StructurePlacementKeys : CASE extends '%fallback' ? StructurePlacementFallback : never
+  : CASE extends 'keys'
+    ? StructurePlacementKeys
+    : CASE extends '%fallback'
+      ? StructurePlacementFallback
+      : CASE extends '%unknown' ? StructurePlacementFallbackType : never

package/src/arguments/generated/dispatcher.ts

@@ -54,6 +54,11 @@ export { type SymbolHoverEvent } from './util/text.ts'
 
 export { type SymbolTintSource } from './assets/item_definition.ts'
 
+export {
+  type SymbolDataComponentExistencePredicate,
+  type DataComponentExistencePredicateFallbackType,
+} from './_dispatcher/data_component_existence_predicate.ts'
+
 export {
   type SymbolDataComponentPredicate,
   type DataComponentPredicateFallbackType,
@@ -115,6 +120,10 @@ export { type SymbolLootCondition } from './data/loot/condition.ts'
 
 export { type SymbolLootPoolEntry } from './data/loot.ts'
 
+export { type SymbolMaterialCondition } from './data/worldgen/material_condition.ts'
+
+export { type SymbolMaterialRule, type MaterialRuleFallbackType } from './data/worldgen/material_rule.ts'
+
 export { type SymbolMemoryModule, type MemoryModuleFallbackType } from './util/memory.ts'
 
 export { type SymbolScoreProvider } from './data/util.ts'
@@ -133,7 +142,7 @@ export { type SymbolReputationPartValue } from './_dispatcher/reputation_part_va
 
 export { type SymbolResource } from './_dispatcher/resource.ts'
 
-export { type SymbolSlotSource } from './util/slot.ts'
+export { type SymbolSlotSource } from './data/slot_source.ts'
 
 export { type SymbolSoundType } from './_dispatcher/sound_type.ts'
 
@@ -145,9 +154,7 @@ export { type SymbolStatisticType, type StatisticTypeFallbackType } from './_dis
 
 export { type SymbolStorage, type StorageFallbackType } from './data/storage.ts'
 
-export { type SymbolStructurePlacement } from './data/worldgen/structure_set.ts'
-
-export { type SymbolSurfaceRule } from './data/worldgen/surface_rule.ts'
+export { type SymbolStructurePlacement, type StructurePlacementFallbackType } from './data/worldgen/structure_set.ts'
 
 export { type SymbolTemplatePoolElement } from './data/worldgen/template_pool.ts'
 

package/src/arguments/generated/pack.ts

@@ -30,6 +30,14 @@ export type Pack = {
   overlays?: PackOverlays,
 }
 
+export type PackBase = {
+  description: Text,
+  pack_format?: NBTInt,
+  supported_formats?: InclusiveRange<NBTInt>,
+  min_format?: PackFormat,
+  max_format?: PackFormat,
+}
+
 export type PackFeatures = {
   enabled: Array<(FeatureFlag | `minecraft:${FeatureFlag}`)>,
 }

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

@@ -2,16 +2,24 @@ export { ADVANCEMENTS_SET } from './_registry/advancements.ts'
 
 export { BANNER_PATTERNS_SET } from './_registry/banner_patterns.ts'
 
+export { CAT_SOUND_VARIANTS_SET } from './_registry/cat_sound_variants.ts'
+
 export { CAT_VARIANTS_SET } from './_registry/cat_variants.ts'
 
 export { CHAT_TYPES_SET } from './_registry/chat_types.ts'
 
+export { CHICKEN_SOUND_VARIANTS_SET } from './_registry/chicken_sound_variants.ts'
+
 export { CHICKEN_VARIANTS_SET } from './_registry/chicken_variants.ts'
 
+export { COW_SOUND_VARIANTS_SET } from './_registry/cow_sound_variants.ts'
+
 export { COW_VARIANTS_SET } from './_registry/cow_variants.ts'
 
 export { DAMAGE_TYPES_SET } from './_registry/damage_types.ts'
 
+export { DECORATED_POT_PATTERNS_SET } from './_registry/decorated_pot_patterns.ts'
+
 export { DIALOGS_SET } from './_registry/dialogs.ts'
 
 export { DIMENSIONS_SET } from './_registry/dimensions.ts'
@@ -32,12 +40,16 @@ export { LOOT_TABLES_SET } from './_registry/loot_tables.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 { RECIPES_SET } from './_registry/recipes.ts'
 
 export { STRUCTURES_SET } from './_registry/structures.ts'
 
+export { SULFUR_CUBE_ARCHETYPES_SET } from './_registry/sulfur_cube_archetypes.ts'
+
 export { TEST_ENVIRONMENTS_SET } from './_registry/test_environments.ts'
 
 export { TEST_INSTANCES_SET } from './_registry/test_instances.ts'
@@ -112,8 +124,14 @@ export { WORLDGEN_CONFIGURED_FEATURES_SET } from './_registry/worldgen_configure
 
 export { WORLDGEN_DENSITY_FUNCTIONS_SET } from './_registry/worldgen_density_functions.ts'
 
+export { WORLDGEN_FEATURES_SET } from './_registry/worldgen_features.ts'
+
 export { WORLDGEN_FLAT_LEVEL_GENERATOR_PRESETS_SET } from './_registry/worldgen_flat_level_generator_presets.ts'
 
+export { WORLDGEN_MATERIAL_CONDITIONS_SET } from './_registry/worldgen_material_conditions.ts'
+
+export { WORLDGEN_MATERIAL_RULES_SET } from './_registry/worldgen_material_rules.ts'
+
 export {
   WORLDGEN_MULTI_NOISE_BIOME_SOURCE_PARAMETER_LISTS_SET,
 } from './_registry/worldgen_multi_noise_biome_source_parameter_lists.ts'
@@ -186,8 +204,6 @@ export { DATA_COMPONENT_TYPES_SET } from './_registry/data_component_types.ts'
 
 export { DEBUG_SUBSCRIPTIONS_SET } from './_registry/debug_subscriptions.ts'
 
-export { DECORATED_POT_PATTERNS_SET } from './_registry/decorated_pot_patterns.ts'
-
 export { DIALOG_ACTION_TYPES_SET } from './_registry/dialog_action_types.ts'
 
 export { DIALOG_BODY_TYPES_SET } from './_registry/dialog_body_types.ts'
@@ -316,16 +332,10 @@ export { WORLDGEN_CHUNK_GENERATORS_SET } from './_registry/worldgen_chunk_genera
 
 export { WORLDGEN_DENSITY_FUNCTION_TYPES_SET } from './_registry/worldgen_density_function_types.ts'
 
-export { WORLDGEN_FEATURES_SET } from './_registry/worldgen_features.ts'
-
 export { WORLDGEN_FEATURE_SIZE_TYPES_SET } from './_registry/worldgen_feature_size_types.ts'
 
 export { WORLDGEN_FOLIAGE_PLACER_TYPES_SET } from './_registry/worldgen_foliage_placer_types.ts'
 
-export { WORLDGEN_MATERIAL_CONDITIONS_SET } from './_registry/worldgen_material_conditions.ts'
-
-export { WORLDGEN_MATERIAL_RULES_SET } from './_registry/worldgen_material_rules.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'