sandstone 1.0.0 → 1.1.1

package/src/arguments/generated/registry.ts

@@ -9,12 +9,15 @@ import type { BLOCK_ENTITY_TYPES } from 'sandstone/arguments/generated/_registry
 import type { BLOCK_PREDICATE_TYPES } from 'sandstone/arguments/generated/_registry/block_predicate_types.ts'
 import type { BLOCK_TYPES } from 'sandstone/arguments/generated/_registry/block_types.ts'
 import type { BLOCKS } from 'sandstone/arguments/generated/_registry/blocks.ts'
+import type { CAT_SOUND_VARIANTS } from 'sandstone/arguments/generated/_registry/cat_sound_variants.ts'
 import type { CAT_VARIANTS } from 'sandstone/arguments/generated/_registry/cat_variants.ts'
 import type { CHAT_TYPES } from 'sandstone/arguments/generated/_registry/chat_types.ts'
+import type { CHICKEN_SOUND_VARIANTS } from 'sandstone/arguments/generated/_registry/chicken_sound_variants.ts'
 import type { CHICKEN_VARIANTS } from 'sandstone/arguments/generated/_registry/chicken_variants.ts'
 import type { CHUNK_STATUSES } from 'sandstone/arguments/generated/_registry/chunk_statuses.ts'
 import type { COMMAND_ARGUMENT_TYPES } from 'sandstone/arguments/generated/_registry/command_argument_types.ts'
 import type { CONSUME_EFFECT_TYPES } from 'sandstone/arguments/generated/_registry/consume_effect_types.ts'
+import type { COW_SOUND_VARIANTS } from 'sandstone/arguments/generated/_registry/cow_sound_variants.ts'
 import type { COW_VARIANTS } from 'sandstone/arguments/generated/_registry/cow_variants.ts'
 import type { CREATIVE_MODE_TABS } from 'sandstone/arguments/generated/_registry/creative_mode_tabs.ts'
 import type { CUSTOM_STATS } from 'sandstone/arguments/generated/_registry/custom_stats.ts'
@@ -86,6 +89,7 @@ import type { PAINTING_VARIANTS } from 'sandstone/arguments/generated/_registry/
 import type { PARTICLE_TYPES } from 'sandstone/arguments/generated/_registry/particle_types.ts'
 import type { PERMISSION_CHECK_TYPES } from 'sandstone/arguments/generated/_registry/permission_check_types.ts'
 import type { PERMISSION_TYPES } from 'sandstone/arguments/generated/_registry/permission_types.ts'
+import type { PIG_SOUND_VARIANTS } from 'sandstone/arguments/generated/_registry/pig_sound_variants.ts'
 import type { PIG_VARIANTS } from 'sandstone/arguments/generated/_registry/pig_variants.ts'
 import type { POINT_OF_INTEREST_TYPES } from 'sandstone/arguments/generated/_registry/point_of_interest_types.ts'
 import type { POS_RULE_TESTS } from 'sandstone/arguments/generated/_registry/pos_rule_tests.ts'
@@ -109,6 +113,7 @@ import type { SOUNDS } from 'sandstone/arguments/generated/_registry/sounds.ts'
 import type { SPAWN_CONDITION_TYPES } from 'sandstone/arguments/generated/_registry/spawn_condition_types.ts'
 import type { STAT_TYPES } from 'sandstone/arguments/generated/_registry/stat_types.ts'
 import type { STRUCTURES } from 'sandstone/arguments/generated/_registry/structures.ts'
+import type { SULFUR_CUBE_ARCHETYPES } from 'sandstone/arguments/generated/_registry/sulfur_cube_archetypes.ts'
 import type { TAG_BANNER_PATTERNS } from 'sandstone/arguments/generated/_registry/tag_banner_patterns.ts'
 import type { TAG_BLOCKS } from 'sandstone/arguments/generated/_registry/tag_blocks.ts'
 import type { TAG_DAMAGE_TYPES } from 'sandstone/arguments/generated/_registry/tag_damage_types.ts'
@@ -230,11 +235,15 @@ import type { SetType } from 'sandstone'
 export type Registry = {
   'minecraft:advancement': ADVANCEMENTS,
   'minecraft:banner_pattern': BANNER_PATTERNS,
+  'minecraft:cat_sound_variant': CAT_SOUND_VARIANTS,
   'minecraft:cat_variant': CAT_VARIANTS,
   'minecraft:chat_type': CHAT_TYPES,
+  'minecraft:chicken_sound_variant': CHICKEN_SOUND_VARIANTS,
   'minecraft:chicken_variant': CHICKEN_VARIANTS,
+  'minecraft:cow_sound_variant': COW_SOUND_VARIANTS,
   'minecraft:cow_variant': COW_VARIANTS,
   'minecraft:damage_type': DAMAGE_TYPES,
+  'minecraft:decorated_pot_pattern': DECORATED_POT_PATTERNS,
   'minecraft:dialog': DIALOGS,
   'minecraft:dimension': DIMENSIONS,
   'minecraft:dimension_type': DIMENSION_TYPES,
@@ -245,9 +254,11 @@ export type Registry = {
   'minecraft:jukebox_song': JUKEBOX_SONGS,
   'minecraft:loot_table': LOOT_TABLES,
   'minecraft:painting_variant': PAINTING_VARIANTS,
+  'minecraft:pig_sound_variant': PIG_SOUND_VARIANTS,
   'minecraft:pig_variant': PIG_VARIANTS,
   'minecraft:recipe': RECIPES,
   'minecraft:structure': STRUCTURES,
+  'minecraft:sulfur_cube_archetype': SULFUR_CUBE_ARCHETYPES,
   'minecraft:test_environment': TEST_ENVIRONMENTS,
   'minecraft:test_instance': TEST_INSTANCES,
   'minecraft:timeline': TIMELINES,
@@ -284,7 +295,10 @@ export type Registry = {
   'minecraft:worldgen/configured_carver': WORLDGEN_CONFIGURED_CARVERS,
   'minecraft:worldgen/configured_feature': WORLDGEN_CONFIGURED_FEATURES,
   'minecraft:worldgen/density_function': WORLDGEN_DENSITY_FUNCTIONS,
+  'minecraft:worldgen/feature': WORLDGEN_FEATURES,
   'minecraft:worldgen/flat_level_generator_preset': WORLDGEN_FLAT_LEVEL_GENERATOR_PRESETS,
+  'minecraft:worldgen/material_condition': WORLDGEN_MATERIAL_CONDITIONS,
+  'minecraft:worldgen/material_rule': WORLDGEN_MATERIAL_RULES,
   'minecraft:worldgen/multi_noise_biome_source_parameter_list': WORLDGEN_MULTI_NOISE_BIOME_SOURCE_PARAMETER_LISTS,
   'minecraft:worldgen/noise': WORLDGEN_NOISES,
   'minecraft:worldgen/noise_settings': WORLDGEN_NOISE_SETTINGS,
@@ -320,7 +334,6 @@ export type Registry = {
   'minecraft:data_component_predicate_type': DATA_COMPONENT_PREDICATE_TYPES,
   'minecraft:data_component_type': DATA_COMPONENT_TYPES,
   'minecraft:debug_subscription': DEBUG_SUBSCRIPTIONS,
-  'minecraft:decorated_pot_pattern': DECORATED_POT_PATTERNS,
   'minecraft:dialog_action_type': DIALOG_ACTION_TYPES,
   'minecraft:dialog_body_type': DIALOG_BODY_TYPES,
   'minecraft:dialog_type': DIALOG_TYPES,
@@ -385,11 +398,8 @@ export type Registry = {
   'minecraft:worldgen/carver': WORLDGEN_CARVERS,
   'minecraft:worldgen/chunk_generator': WORLDGEN_CHUNK_GENERATORS,
   'minecraft:worldgen/density_function_type': WORLDGEN_DENSITY_FUNCTION_TYPES,
-  'minecraft:worldgen/feature': WORLDGEN_FEATURES,
   'minecraft:worldgen/feature_size_type': WORLDGEN_FEATURE_SIZE_TYPES,
   'minecraft:worldgen/foliage_placer_type': WORLDGEN_FOLIAGE_PLACER_TYPES,
-  'minecraft:worldgen/material_condition': WORLDGEN_MATERIAL_CONDITIONS,
-  'minecraft:worldgen/material_rule': WORLDGEN_MATERIAL_RULES,
   'minecraft:worldgen/placement_modifier_type': WORLDGEN_PLACEMENT_MODIFIER_TYPES,
   'minecraft:worldgen/pool_alias_binding': WORLDGEN_POOL_ALIAS_BINDINGS,
   'minecraft:worldgen/root_placer_type': WORLDGEN_ROOT_PLACER_TYPES,
@@ -405,11 +415,15 @@ export type Registry = {
 export const REGISTRIES_SET = new Set([
   'advancement',
   'banner_pattern',
+  'cat_sound_variant',
   'cat_variant',
   'chat_type',
+  'chicken_sound_variant',
   'chicken_variant',
+  'cow_sound_variant',
   'cow_variant',
   'damage_type',
+  'decorated_pot_pattern',
   'dialog',
   'dimension',
   'dimension_type',
@@ -422,10 +436,13 @@ export const REGISTRIES_SET = new Set([
   'jukebox_song',
   'loot_table',
   'painting_variant',
+  'pig_sound_variant',
   'pig_variant',
   'predicate',
   'recipe',
+  'slot_source',
   'structure',
+  'sulfur_cube_archetype',
   'test_environment',
   'test_instance',
   'timeline',
@@ -528,9 +545,12 @@ export const REGISTRIES_SET = new Set([
   'worldgen/density_function_type',
   'worldgen/feature',
   'worldgen/feature_size_type',
+  'worldgen/feature_type',
   'worldgen/foliage_placer_type',
   'worldgen/material_condition',
+  'worldgen/material_condition_type',
   'worldgen/material_rule',
+  'worldgen/material_rule_type',
   'worldgen/placement_modifier_type',
   'worldgen/pool_alias_binding',
   'worldgen/root_placer_type',
@@ -549,7 +569,10 @@ export const REGISTRIES_SET = new Set([
   'worldgen/configured_structure_feature',
   'worldgen/configured_surface_builder',
   'worldgen/density_function',
+  'worldgen/feature',
   'worldgen/flat_level_generator_preset',
+  'worldgen/material_condition',
+  'worldgen/material_rule',
   'worldgen/multi_noise_biome_source_parameter_list',
   'worldgen/noise',
   'worldgen/noise_settings',

package/src/arguments/generated/resource-paths.ts

@@ -5,13 +5,16 @@ export const RESOURCE_PATHS = {
   'loot_table': { path: ['loot_table'], pack: 'data', ext: '.json' },
   'predicate': { path: ['predicate'], pack: 'data', ext: '.json' },
   'recipe': { path: ['recipe'], pack: 'data', ext: '.json' },
+  'slot_source': { path: ['slot_source'], pack: 'data', ext: '.json' },
   'structure': { path: ['structure'], pack: 'data', ext: '.nbt' },
+  'sulfur_cube_archetype': { path: ['sulfur_cube_archetype'], pack: 'data', ext: '.json' },
   'banner_pattern': { path: ['banner_pattern'], pack: 'data', ext: '.json' },
   'cat_variant': { path: ['cat_variant'], pack: 'data', ext: '.json' },
   'chat_type': { path: ['chat_type'], pack: 'data', ext: '.json' },
   'chicken_variant': { path: ['chicken_variant'], pack: 'data', ext: '.json' },
   'cow_variant': { path: ['cow_variant'], pack: 'data', ext: '.json' },
   'damage_type': { path: ['damage_type'], pack: 'data', ext: '.json' },
+  'decorated_pot_pattern': { path: ['decorated_pot_pattern'], pack: 'data', ext: '.json' },
   'dialog': { path: ['dialog'], pack: 'data', ext: '.json' },
   'enchantment': { path: ['enchantment'], pack: 'data', ext: '.json' },
   'enchantment_provider': { path: ['enchantment_provider'], pack: 'data', ext: '.json' },

package/src/arguments/generated/resources.ts

@@ -3,6 +3,7 @@ import {
   BannerPatternClass,
   ChatTypeClass,
   DamageTypeClass,
+  DecoratedPotPatternClass,
   DialogClass,
   EnchantmentClass,
   EnchantmentProviderClass,
@@ -13,7 +14,9 @@ import {
   LootTableClass,
   PredicateClass,
   RecipeClass,
+  SlotSourceClass,
   StructureClass,
+  SulfurCubeArchetypeClass,
   TestEnvironmentClass,
   TestInstanceClass,
   TimelineClass,
@@ -43,6 +46,7 @@ export const RESOURCE_CLASS_TYPES = [
   [BannerPatternClass, 'banner_pattern'],
   [ChatTypeClass, 'chat_type'],
   [DamageTypeClass, 'damage_type'],
+  [DecoratedPotPatternClass, 'decorated_pot_pattern'],
   [DialogClass, 'dialog'],
   [EnchantmentClass, 'enchantment'],
   [EnchantmentProviderClass, 'enchantment_provider'],
@@ -53,7 +57,9 @@ export const RESOURCE_CLASS_TYPES = [
   [LootTableClass, 'loot_table'],
   [PredicateClass, 'predicate'],
   [RecipeClass, 'recipe'],
+  [SlotSourceClass, 'slot_source'],
   [StructureClass, 'structure'],
+  [SulfurCubeArchetypeClass, 'sulfur_cube_archetype'],
   [TestEnvironmentClass, 'test_environment'],
   [TestInstanceClass, 'test_instance'],
   [TimelineClass, 'timeline'],

package/src/arguments/generated/util/effect.ts

@@ -114,11 +114,67 @@ export type MobEffectInstance = {
    * Level I having value 0. Defaults to 0.
    *
    * Value:
-   * Range: 0..
+   * *either*
+   *
+   * *item 0*
+   *
+   * *or*
+   *
+   * Range: 0..255
+   */
+  amplifier?: (NBTByte | NBTInt<{
+    min: 0,
+  }>),
+  /**
+   * Duration of the effect in ticks. Infinite is represented by `-1`.
+   *
+   * Value:
+   * *either*
+   *
+   * *item 0*
+   *
+   * *or*
+   *
+   * Range: 1..
+   */
+  duration?: (-1 | NBTInt<{
+    min: 1,
+  }>),
+  /**
+   * Whether the effect appears as a HUD icon in addition to in the inventory GUI (same behavior as beacons when `true`). Defaults to `false`.
+   */
+  ambient?: boolean,
+  /**
+   * Defaults to `true`.
+   */
+  show_particles?: boolean,
+  /**
+   * Whether the effect appears in the inventory GUI. Defaults to `true`
+   */
+  show_icon?: boolean,
+  /**
+   * A lower amplifier effect of the same type.
+   */
+  hidden_effect?: MobEffectInstance,
+}
+
+export type ModernMobEffect = {
+  id: Registry['minecraft:mob_effect'],
+  /**
+   * Level I having value 0. Defaults to 0.
+   *
+   * Value:
+   * *either*
+   *
+   * *item 0*
+   *
+   * *or*
+   *
+   * Range: 0..255
    */
-  amplifier?: NBTByte<{
+  amplifier?: (NBTByte | NBTInt<{
     min: 0,
-  }>,
+  }>),
   /**
    * Duration of the effect in ticks. Infinite is represented by `-1`.
    *
@@ -151,3 +207,51 @@ export type MobEffectInstance = {
    */
   hidden_effect?: MobEffectInstance,
 }
+
+export type OldMobEffect = {
+  Id?: EffectId,
+  /**
+   * Value:
+   * *either*
+   *
+   * *item 0*
+   *
+   * *or*
+   *
+   * Range: 0..255
+   */
+  Amplifier?: (NBTByte | NBTInt<{
+    min: 0,
+  }>),
+  /**
+   * Duration of the effect in ticks. Infinite is represented by `-1`.
+   *
+   * Value:
+   * *either*
+   *
+   * Range: 1..
+   *
+   * *or*
+   *
+   * *item 1*
+   */
+  Duration?: (NBTInt<{
+    min: 1,
+  }> | -1),
+  /**
+   * Whether particles are semi-transparent. (like with a Beacon)
+   */
+  Ambient?: boolean,
+  /**
+   * Whether particles should be shown.
+   */
+  ShowParticles?: boolean,
+  /**
+   * Whether the effect icon should be shown.
+   */
+  ShowIcon?: boolean,
+  /**
+   * A lower amplifier effect of the same type.
+   */
+  HiddenEffect?: MobEffectInstance,
+}

package/src/arguments/generated/util/particle.ts

@@ -64,6 +64,34 @@ export type FlashParticle = {
   color: TranslucentParticle,
 }
 
+export type GeyserBaseParticle = {
+  /**
+   * Scales the particle size and its burst impulse.
+   *
+   * Value:
+   * Range: 1..
+   */
+  water_blocks: NBTInt<{
+    min: 1,
+  }>,
+  /**
+   * Scales the initial burst impulse
+   */
+  burst_impulse_base: NBTFloat,
+}
+
+export type GeyserParticle = {
+  /**
+   * Scales the particle size and its burst impulse.
+   *
+   * Value:
+   * Range: 1..
+   */
+  water_blocks: NBTInt<{
+    min: 1,
+  }>,
+}
+
 export type ItemParticle = {
   item: ItemStackTemplate,
 }
@@ -88,6 +116,42 @@ export type LegacyTranslucentParticle = NBTList<NBTFloat, {
   max: 4,
 }>
 
+export type OldDustParticle = {
+  r: NBTFloat,
+  g: NBTFloat,
+  b: NBTFloat,
+  /**
+   * Value:
+   * Range: 0.01..4
+   */
+  scale: NBTFloat<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 0,
+  }>,
+}
+
+export type OldDustTransition = {
+  fromColor: DustColor,
+  toColor: DustColor,
+  /**
+   * Value:
+   * Range: 0.01..4
+   */
+  scale: NBTFloat<{
+    leftExclusive: false,
+    rightExclusive: false,
+    min: 0,
+  }>,
+}
+
+export type OldEntityEffect = {
+  r: NBTFloat,
+  g: NBTFloat,
+  b: NBTFloat,
+  a: NBTFloat,
+}
+
 export type Particle = NonNullable<({
   [S in Extract<Registry['minecraft:particle_type'], string>]?: ({
     type: S,
@@ -188,6 +252,14 @@ type ParticleDispatcherMap = {
   'minecraft:falling_dust': ParticleFallingDust,
   'flash': ParticleFlash,
   'minecraft:flash': ParticleFlash,
+  'geyser': ParticleGeyser,
+  'minecraft:geyser': ParticleGeyser,
+  'geyser_base': ParticleGeyserBase,
+  'minecraft:geyser_base': ParticleGeyserBase,
+  'geyser_plume': ParticleGeyserPlume,
+  'minecraft:geyser_plume': ParticleGeyserPlume,
+  'geyser_poof': ParticleGeyserPoof,
+  'minecraft:geyser_poof': ParticleGeyserPoof,
   'instant_effect': ParticleInstantEffect,
   'minecraft:instant_effect': ParticleInstantEffect,
   'item': ParticleItem,
@@ -216,6 +288,10 @@ type ParticleFallback = (
   | ParticleEntityEffect
   | ParticleFallingDust
   | ParticleFlash
+  | ParticleGeyser
+  | ParticleGeyserBase
+  | ParticleGeyserPlume
+  | ParticleGeyserPoof
   | ParticleInstantEffect
   | ParticleItem
   | ParticleSculkCharge
@@ -237,6 +313,10 @@ type ParticleEffect = EffectParticle
 type ParticleEntityEffect = EntityEffectParticle
 type ParticleFallingDust = BlockParticle
 type ParticleFlash = FlashParticle
+type ParticleGeyser = GeyserParticle
+type ParticleGeyserBase = GeyserBaseParticle
+type ParticleGeyserPlume = GeyserParticle
+type ParticleGeyserPoof = GeyserBaseParticle
 type ParticleInstantEffect = EffectParticle
 type ParticleItem = ItemParticle
 type ParticleSculkCharge = SculkChargeParticle

package/src/arguments/generated/util/slot.ts

@@ -1,28 +1,5 @@
-import type { ItemPredicate } from 'sandstone/arguments/generated/data/advancement/predicate.ts'
-import type { BlockEntityTarget, EntityTarget } from 'sandstone/arguments/generated/data/loot.ts'
-import type { ContainerComponents } from 'sandstone/arguments/generated/data/loot/function.ts'
-import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 import type { ItemStack } from 'sandstone/arguments/generated/world/item.ts'
-import type { ENTITY_SLOTS } from 'sandstone/arguments'
-import type { NBTObject, RootNBT } from 'sandstone/arguments/nbt.ts'
-import type { LiteralUnion, NBTInt } from 'sandstone'
-
-export type ContentsSlotSource = {
-  /**
-   * The slots to search.
-   */
-  slot_source: SlotSource,
-  /**
-   * If an item targeted by `slot_source` has this container component, selects all items inside.
-   *
-   * Value:
-   *
-   *  - Container(`container`)
-   *  - BundleContents(`bundle_contents`)
-   *  - ChargedProjectiles(`charged_projectiles`)
-   */
-  component: (ContainerComponents | `minecraft:${ContainerComponents}`),
-}
+import type { NBTObject } from 'sandstone/arguments/nbt.ts'
 
 export type EquipmentSlot = ('mainhand' | 'offhand' | 'head' | 'chest' | 'legs' | 'feet' | 'body' | 'saddle')
 
@@ -39,88 +16,9 @@ export type EquipmentSlotGroup = (
   | 'body'
   | 'saddle')
 
-export type FilterSlotSource = {
-  slot_source: SlotSource,
-  item_filter: ItemPredicate,
-}
-
-export type GroupSlotSource = {
-  terms: Array<SlotSource>,
-}
-
-export type LimitCountSlotSource = {
-  slot_source: SlotSource,
-  /**
-   * Value:
-   * Range: 1..
-   */
-  limit: NBTInt<{
-    min: 1,
-  }>,
-}
-
-export type RangeSlotSource = {
-  /**
-   * Value:
-   * *either*
-   *
-   *
-   *
-   * *or*
-   *
-   * *item 1*
-   */
-  source: (EntityTarget | BlockEntityTarget),
-  slots: LiteralUnion<ENTITY_SLOTS>,
-}
-
-export type SlotSource = (TypedSlotSource | Array<TypedSlotSource>)
-
 export type SlottedItem<T extends NBTObject> = (ItemStack & {
   /**
    * Inventory slot the item is in
    */
   Slot?: T,
 })
-
-export type TypedSlotSource = NonNullable<({
-  [S in Extract<Registry['minecraft:slot_source_type'], string>]?: ({
-    type: S,
-  } & (S extends keyof SymbolSlotSource ? SymbolSlotSource[S] : RootNBT))
-}[Registry['minecraft:slot_source_type']])>
-type SlotSourceDispatcherMap = {
-  'contents': SlotSourceContents,
-  'minecraft:contents': SlotSourceContents,
-  'empty': SlotSourceEmpty,
-  'minecraft:empty': SlotSourceEmpty,
-  'filtered': SlotSourceFiltered,
-  'minecraft:filtered': SlotSourceFiltered,
-  'group': SlotSourceGroup,
-  'minecraft:group': SlotSourceGroup,
-  'limit_slots': SlotSourceLimitSlots,
-  'minecraft:limit_slots': SlotSourceLimitSlots,
-  'slot_range': SlotSourceSlotRange,
-  'minecraft:slot_range': SlotSourceSlotRange,
-}
-type SlotSourceKeys = keyof SlotSourceDispatcherMap
-type SlotSourceFallback = (
-  | SlotSourceContents
-  | SlotSourceEmpty
-  | SlotSourceFiltered
-  | SlotSourceGroup
-  | SlotSourceLimitSlots
-  | SlotSourceSlotRange)
-type SlotSourceContents = ContentsSlotSource
-type SlotSourceEmpty = Record<string, never>
-type SlotSourceFiltered = FilterSlotSource
-type SlotSourceGroup = GroupSlotSource
-type SlotSourceLimitSlots = LimitCountSlotSource
-type SlotSourceSlotRange = RangeSlotSource
-export type SymbolSlotSource<CASE extends
-  | 'map'
-  | 'keys'
-  | '%fallback'
-  | '%none'
-  | '%unknown' = 'map'> = CASE extends 'map'
-  ? SlotSourceDispatcherMap
-  : CASE extends 'keys' ? SlotSourceKeys : CASE extends '%fallback' ? SlotSourceFallback : never