sandstone 1.1.0 → 1.1.2

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

@@ -6,10 +6,10 @@ import type { RootNBT } from 'sandstone/arguments/nbt.ts'
 import type { NBTInt, StructureClass } from 'sandstone'
 
 export type Element = NonNullable<({
-  [S in Extract<Registry['minecraft:worldgen/structure_pool_element'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:worldgen/structure_pool_element'], string>, string>]?: ({
     element_type: S,
   } & (S extends keyof SymbolTemplatePoolElement ? SymbolTemplatePoolElement[S] : RootNBT))
-}[Registry['minecraft:worldgen/structure_pool_element']])>
+}[Extract<Registry['minecraft:worldgen/structure_pool_element'], string>])>
 
 export type ElementBase = {
   /**

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

@@ -50,10 +50,10 @@ export type DecorationStep = (
   | 'top_layer_modification')
 
 export type FloatProvider<T extends NBTObject> = (T | ({
-  [S in Extract<Registry['minecraft:float_provider_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:float_provider_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolFloatProvider<T> ? SymbolFloatProvider<T>[S] : RootNBT))
-}[Registry['minecraft:float_provider_type']]))
+}[Extract<Registry['minecraft:float_provider_type'], string>]))
 
 export type HeightmapType = (
   | 'MOTION_BLOCKING'
@@ -64,16 +64,16 @@ export type HeightmapType = (
   | 'WORLD_SURFACE_WG')
 
 export type HeightProvider = (({
-  [S in Extract<Registry['minecraft:height_provider_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:height_provider_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolHeightProvider ? SymbolHeightProvider[S] : RootNBT))
-}[Registry['minecraft:height_provider_type']]) | VerticalAnchor)
+}[Extract<Registry['minecraft:height_provider_type'], string>]) | VerticalAnchor)
 
 export type IntProvider<T extends NBTObject> = (T | ({
-  [S in Extract<Registry['minecraft:int_provider_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:int_provider_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolIntProvider<T> ? SymbolIntProvider<T>[S] : RootNBT))
-}[Registry['minecraft:int_provider_type']]))
+}[Extract<Registry['minecraft:int_provider_type'], string>]))
 
 export type TrapezoidHeightProvider = (UniformHeightProvider & {
   plateau?: NBTInt,

package/src/arguments/generated/dispatcher.ts

@@ -1,12 +1,16 @@
+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 {
@@ -23,8 +27,6 @@ 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'
@@ -66,7 +68,7 @@ export {
 
 export { type SymbolDecoratorConfig } from './data/worldgen/feature/decorator.ts'
 
-export { type SymbolDensityFunction } from './data/worldgen/density_function.ts'
+export { type SymbolDensityFunction, type DensityFunctionFallbackType } from './data/worldgen/density_function.ts'
 
 export { type SymbolDialog } from './data/dialog.ts'
 
@@ -128,6 +130,8 @@ export { type SymbolMemoryModule, type MemoryModuleFallbackType } from './util/m
 
 export { type SymbolScoreProvider } from './data/util.ts'
 
+export { type SymbolNumberProvider } from './data/number_provider.ts'
+
 export { type SymbolParticle, type ParticleFallbackType } from './util/particle.ts'
 
 export { type SymbolPlacementModifier } from './data/worldgen/feature/placement.ts'
@@ -165,5 +169,3 @@ 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/resource-paths.ts

@@ -5,16 +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_sound_variant': { path: ['cat_sound_variant'], pack: 'data', ext: '.json' },
   'cat_variant': { path: ['cat_variant'], pack: 'data', ext: '.json' },
   'chat_type': { path: ['chat_type'], pack: 'data', ext: '.json' },
+  'chicken_sound_variant': { path: ['chicken_sound_variant'], pack: 'data', ext: '.json' },
   'chicken_variant': { path: ['chicken_variant'], pack: 'data', ext: '.json' },
+  'cow_sound_variant': { path: ['cow_sound_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' },
@@ -22,7 +22,9 @@ export const RESOURCE_PATHS = {
   'instrument': { path: ['instrument'], pack: 'data', ext: '.json' },
   'jukebox_song': { path: ['jukebox_song'], pack: 'data', ext: '.json' },
   'painting_variant': { path: ['painting_variant'], pack: 'data', ext: '.json' },
+  'pig_sound_variant': { path: ['pig_sound_variant'], pack: 'data', ext: '.json' },
   'pig_variant': { path: ['pig_variant'], pack: 'data', ext: '.json' },
+  'sulfur_cube_archetype': { path: ['sulfur_cube_archetype'], pack: 'data', ext: '.json' },
   'test_instance': { path: ['test_instance'], pack: 'data', ext: '.json' },
   'test_environment': { path: ['test_environment'], pack: 'data', ext: '.json' },
   'timeline': { path: ['timeline'], pack: 'data', ext: '.json' },

package/src/arguments/generated/resources.ts

@@ -3,7 +3,6 @@ import {
   BannerPatternClass,
   ChatTypeClass,
   DamageTypeClass,
-  DecoratedPotPatternClass,
   DialogClass,
   EnchantmentClass,
   EnchantmentProviderClass,
@@ -14,7 +13,6 @@ import {
   LootTableClass,
   PredicateClass,
   RecipeClass,
-  SlotSourceClass,
   StructureClass,
   SulfurCubeArchetypeClass,
   TestEnvironmentClass,
@@ -46,7 +44,6 @@ 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'],
@@ -57,7 +54,6 @@ export const RESOURCE_CLASS_TYPES = [
   [LootTableClass, 'loot_table'],
   [PredicateClass, 'predicate'],
   [RecipeClass, 'recipe'],
-  [SlotSourceClass, 'slot_source'],
   [StructureClass, 'structure'],
   [SulfurCubeArchetypeClass, 'sulfur_cube_archetype'],
   [TestEnvironmentClass, 'test_environment'],

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

@@ -1,4 +1,5 @@
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { TextureType } from 'sandstone/arguments'
 import type { NBTIntArray, NBTList, TextureClass } from 'sandstone'
 
 export type HumanoidArm = ('left' | 'right')
@@ -54,17 +55,17 @@ export type Profile = ({
   /**
    * Skin texture override.
    */
-  texture?: (Registry['minecraft:texture'] | TextureClass),
+  texture?: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   /**
    * Cape texture override.
    */
-  cape?: (Registry['minecraft:texture'] | TextureClass),
+  cape?: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   /**
    * Elytra texture override.
    * If this texture is not present either as override or in player profile, the cape texture is used.
    * If the cape texture is also not present, the default elytra texture is used.
    */
-  elytra?: (Registry['minecraft:texture'] | TextureClass),
+  elytra?: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   /**
    * Model type override.
    *

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

@@ -2,10 +2,10 @@ import type { SymbolMcdocBlockStates } from 'sandstone/arguments/generated/dispa
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 
 export type BlockState = NonNullable<({
-  [S in Extract<Registry['minecraft:block'], string>]?: {
+  [S in Extract<Extract<Registry['minecraft:block'], string>, string>]?: {
     Name: S,
     Properties?: (S extends undefined
       ? SymbolMcdocBlockStates<'%none'> :
       (S extends keyof SymbolMcdocBlockStates ? SymbolMcdocBlockStates[S] : SymbolMcdocBlockStates<'%unknown'>)),
   }
-}[Registry['minecraft:block']])>
+}[Extract<Registry['minecraft:block'], string>])>

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

@@ -3,3 +3,5 @@ export type Direction = ('down' | 'up' | 'north' | 'east' | 'south' | 'west')
 export type DirectionByte = (0 | 1 | 2 | 3 | 4 | 5)
 
 export type DirectionInt = (0 | 1 | 2 | 3 | 4 | 5)
+
+export type VerticalDirection = ('down' | 'up')

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

@@ -2,10 +2,10 @@ import type { SymbolMcdocFluidStates } from 'sandstone/arguments/generated/dispa
 import type { Registry } from 'sandstone/arguments/generated/registry.ts'
 
 export type FluidState = NonNullable<({
-  [S in Extract<Registry['minecraft:fluid'], string>]?: {
+  [S in Extract<Extract<Registry['minecraft:fluid'], string>, string>]?: {
     Name: S,
     Properties?: (S extends undefined
       ? SymbolMcdocFluidStates<'%none'> :
       (S extends keyof SymbolMcdocFluidStates ? SymbolMcdocFluidStates[S] : SymbolMcdocFluidStates<'%unknown'>)),
   }
-}[Registry['minecraft:fluid']])>
+}[Extract<Registry['minecraft:fluid'], string>])>

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

@@ -35,10 +35,10 @@ export type EntityPositionSource = {
 }
 
 export type PositionSource = NonNullable<({
-  [S in Extract<Registry['minecraft:position_source_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:position_source_type'], string>, string>]?: ({
     type: S,
   } & (S extends keyof SymbolPositionSource ? SymbolPositionSource[S] : RootNBT))
-}[Registry['minecraft:position_source_type']])>
+}[Extract<Registry['minecraft:position_source_type'], string>])>
 
 export type ReceivingEvent = {
   game_event: Registry['minecraft:game_event'],

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

@@ -153,12 +153,12 @@ export type OldEntityEffect = {
 }
 
 export type Particle = NonNullable<({
-  [S in Extract<Registry['minecraft:particle_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:particle_type'], string>, string>]?: ({
     type: S,
   } & (S extends undefined
     ? SymbolParticle<'%none'> :
     (S extends keyof SymbolParticle ? SymbolParticle[S] : SymbolParticle<'%unknown'>)))
-}[Registry['minecraft:particle_type']])>
+}[Extract<Registry['minecraft:particle_type'], string>])>
 
 export type SafePositionSource = {
   type: 'block',

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

@@ -0,0 +1,10 @@
+import type { Registry } from 'sandstone/arguments/generated/registry.ts'
+import type { TagClass } from 'sandstone'
+
+export type BlockListRef = ((
+  | Registry['minecraft:block'] | `#${Registry['minecraft:tag/block']}` | TagClass<'block'>)
+  | Array<Registry['minecraft:block']>)
+
+export type ItemListRef = ((
+  | Registry['minecraft:item'] | `#${Registry['minecraft:tag/item']}` | TagClass<'item'>)
+  | Array<Registry['minecraft:item']>)

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

@@ -5,23 +5,14 @@ import type { Profile } from 'sandstone/arguments/generated/util/avatar.ts'
 import type { RGBA } from 'sandstone/arguments/generated/util/color.ts'
 import type { DataComponentPatch } from 'sandstone/arguments/generated/world/component.ts'
 import type { ItemStack } from 'sandstone/arguments/generated/world/item.ts'
-import type { Coordinates, MultipleEntitiesArgument } from 'sandstone/arguments'
+import type { Coordinates, MultipleEntitiesArgument, SingleEntityArgument, TextureType } from 'sandstone/arguments'
 import type { RootNBT } from 'sandstone/arguments/nbt.ts'
-import type {
-  AtlasClass,
-  DataPointClass,
-  DialogClass,
-  FontClass,
-  NBTInt,
-  NBTList,
-  ObjectiveClass,
-  Score,
-  TextureClass,
-} from 'sandstone'
+import type { AtlasClass, DialogClass, FontClass, NBTInt, NBTList, ObjectiveClass, TextureClass } from 'sandstone'
+import type { TextComponentClass } from 'sandstone/variables'
 
 export type BlockNbtText = ({
   block: Coordinates,
-  nbt: `${any}${string}` | DataPointClass,
+  nbt: `${any}${string}`,
   source?: 'block',
   type?: 'nbt',
 } & TextNbtBase)
@@ -39,7 +30,7 @@ export type ChangePage = {
 }
 
 export type ClickEvent = NonNullable<({
-  [S in Extract<ClickEventAction, string>]?: ({
+  [S in Extract<Extract<ClickEventAction, string>, string>]?: ({
     /**
      * Value:
      *
@@ -53,7 +44,7 @@ export type ClickEvent = NonNullable<({
      */
     action: S,
   } & (S extends keyof SymbolClickEvent ? SymbolClickEvent[S] : RootNBT))
-}[ClickEventAction])>
+}[Extract<ClickEventAction, string>])>
 
 export type ClickEventAction = (
   | 'open_url'
@@ -72,7 +63,7 @@ export type CopyToClipboard = {
 }
 
 export type CustomAction = NonNullable<({
-  [S in Extract<`${string}:${string}`, string>]?: {
+  [S in Extract<Extract<`${string}:${string}`, string>, string>]?: {
     /**
      * ID of a custom action.
      * Has no functionality on vanilla servers.
@@ -82,7 +73,7 @@ export type CustomAction = NonNullable<({
       ? SymbolMcdocCustomEvent[S]
       : SymbolMcdocCustomEvent<'%unknown'>),
   }
-}[`${string}:${string}`])>
+}[Extract<`${string}:${string}`, string>])>
 
 export type EntityHoverContent = {
   type: Registry['minecraft:entity_type'],
@@ -113,7 +104,7 @@ export type EntityHoverValue = {
 
 export type EntityNbtText = ({
   entity: MultipleEntitiesArgument,
-  nbt: `${any}${string}` | DataPointClass,
+  nbt: `${any}${string}`,
   source?: 'entity',
   type?: 'nbt',
 } & TextNbtBase)
@@ -140,7 +131,7 @@ export type EntityTooltipInfo = {
 }
 
 export type HoverEvent = NonNullable<({
-  [S in Extract<HoverEventAction, string>]?: ({
+  [S in Extract<Extract<HoverEventAction, string>, string>]?: ({
     /**
      * Value:
      *
@@ -150,7 +141,7 @@ export type HoverEvent = NonNullable<({
      */
     action: S,
   } & (S extends keyof SymbolHoverEvent ? SymbolHoverEvent[S] : RootNBT))
-}[HoverEventAction])>
+}[Extract<HoverEventAction, string>])>
 
 export type HoverEventAction = ('show_text' | 'show_item' | 'show_entity')
 
@@ -175,6 +166,7 @@ export type Keybind = (
   | 'key.debug.dumpVersion'
   | 'key.debug.focusPause'
   | 'key.debug.fpsCharts'
+  | 'key.debug.improvedTransparency'
   | 'key.debug.lightmapTexture'
   | 'key.debug.modifier'
   | 'key.debug.networkCharts'
@@ -240,6 +232,7 @@ export type KeybindText = ({
    *  - DebugDumpVersion(`key.debug.dumpVersion`)
    *  - DebugFocusPause(`key.debug.focusPause`)
    *  - DebugFpsCharts(`key.debug.fpsCharts`)
+   *  - DebugImprovedTransparency(`key.debug.improvedTransparency`)
    *  - DebugLightmapTexture(`key.debug.lightmapTexture`)
    *  - DebugModifier(`key.debug.modifier`)
    *  - DebugNetworkCharts(`key.debug.networkCharts`)
@@ -323,13 +316,13 @@ export type RunCommand = {
 
 export type ScoreHolder = {
   objective: `${any}${string}` | ObjectiveClass,
-  name: `${any}${string}` | Score,
+  name: `${any}${string}` | SingleEntityArgument,
 }
 
 export type ScoreText = ({
   score: {
     objective: `${any}${string}` | ObjectiveClass,
-    name: `${any}${string}` | Score,
+    name: `${any}${string}` | SingleEntityArgument,
   },
   type?: 'score',
 } & TextBase)
@@ -344,28 +337,7 @@ export type ShowDialog = {
   dialog: ((Registry['minecraft:dialog'] | DialogClass) | Dialog),
 }
 
-export type ShowEntity = ({
-  contents?: {
-    type: Registry['minecraft:entity_type'],
-    /**
-     * Value:
-     * *either*
-     *
-     * List length range: 4
-     *
-     * *or*
-     *
-     * *item 1*
-     */
-    id: (NBTList<NBTInt, {
-      leftExclusive: false,
-      rightExclusive: false,
-      min: 4,
-      max: 4,
-    }> | string),
-    name?: Text,
-  },
-} & {
+export type ShowEntity = {
   id: Registry['minecraft:entity_type'],
   /**
    * Value:
@@ -384,7 +356,7 @@ export type ShowEntity = ({
     max: 4,
   }> | string),
   name?: Text,
-})
+}
 
 export type ShowItem = ItemStack
 
@@ -397,14 +369,14 @@ export type SpriteText = ({
    * Defaults to `minecraft:blocks`.
    */
   atlas?: (Registry['minecraft:atlas'] | AtlasClass),
-  sprite: (Registry['minecraft:texture'] | TextureClass),
+  sprite: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   object?: 'atlas',
   type?: 'object',
 } & ObjectTextConfig & TextBase)
 
 export type StorageNbtText = ({
   storage: `${string}:${string}`,
-  nbt: `${any}${string}` | DataPointClass,
+  nbt: `${any}${string}`,
   source?: 'storage',
   type?: 'nbt',
 } & TextNbtBase)
@@ -413,10 +385,7 @@ export type SuggestCommand = {
   command: `${any}${string}`,
 }
 
-export type Text = (string | TextObject | NBTList<(string | TextObject), {
-  leftExclusive: false,
-  min: 1,
-}>)
+export type Text = (string | TextObject | TextComponentClass | Text[])
 
 export type TextBase = ({
   /**
@@ -478,7 +447,7 @@ export type TextObject = (({
 } & TextBase) | ({
   score: {
     objective: `${any}${string}` | ObjectiveClass,
-    name: `${any}${string}` | Score,
+    name: `${any}${string}` | SingleEntityArgument,
   },
   type?: 'score',
 } & TextBase) | ({
@@ -503,6 +472,7 @@ export type TextObject = (({
    *  - DebugDumpVersion(`key.debug.dumpVersion`)
    *  - DebugFocusPause(`key.debug.focusPause`)
    *  - DebugFpsCharts(`key.debug.fpsCharts`)
+   *  - DebugImprovedTransparency(`key.debug.improvedTransparency`)
    *  - DebugLightmapTexture(`key.debug.lightmapTexture`)
    *  - DebugModifier(`key.debug.modifier`)
    *  - DebugNetworkCharts(`key.debug.networkCharts`)
@@ -554,17 +524,17 @@ export type TextObject = (({
   type?: 'keybind',
 } & TextBase) | ({
   block: Coordinates,
-  nbt: `${any}${string}` | DataPointClass,
+  nbt: `${any}${string}`,
   source?: 'block',
   type?: 'nbt',
 } & TextNbtBase) | ({
   entity: MultipleEntitiesArgument,
-  nbt: `${any}${string}` | DataPointClass,
+  nbt: `${any}${string}`,
   source?: 'entity',
   type?: 'nbt',
 } & TextNbtBase) | ({
   storage: `${string}:${string}`,
-  nbt: `${any}${string}` | DataPointClass,
+  nbt: `${any}${string}`,
   source?: 'storage',
   type?: 'nbt',
 } & TextNbtBase) | ({
@@ -572,7 +542,7 @@ export type TextObject = (({
    * Defaults to `minecraft:blocks`.
    */
   atlas?: (Registry['minecraft:atlas'] | AtlasClass),
-  sprite: (Registry['minecraft:texture'] | TextureClass),
+  sprite: (Registry['minecraft:texture'] | TextureClass<TextureType>),
   object?: 'atlas',
   type?: 'object',
 } & ObjectTextConfig & TextBase) | ({

package/src/arguments/generated/util.ts

@@ -10,6 +10,18 @@ export type Filterable<T extends NBTObject> = ({
   filtered?: T,
 } | T)
 
+export type FlatWeightedEntry<T extends NBTObject> = ({
+  /**
+   * Value:
+   * Range: 0..
+   */
+  weight: NBTInt<{
+    min: 0,
+  }>,
+} & T)
+
+export type FlatWeightedList<T extends NBTObject> = Array<FlatWeightedEntry<T>>
+
 export type GlobalPos = {
   /**
    * Coordinates of the location in [x, y, z]
@@ -39,6 +51,11 @@ export type InclusiveRange<T extends NBTObject> = (T | NBTList<T, {
   max_inclusive: T,
 })
 
+export type NonEmptyFlatWeightedList<T extends NBTObject> = NBTList<FlatWeightedEntry<T>, {
+  leftExclusive: false,
+  min: 1,
+}>
+
 export type NonEmptyWeightedList<T extends NBTObject> = NBTList<WeightedEntry<T>, {
   leftExclusive: false,
   min: 1,

package/src/arguments/generated/world/block/furnace.ts

@@ -30,19 +30,19 @@ export type Furnace = (BlockEntity & Nameable & Lockable & {
   }),
 } & {
   /**
-   * Total ticks the item will take to be smelted.
+   * The total amount of time the current cooking process will take. Defaults to `0`.
    */
   cooking_total_time?: NBTShort,
   /**
-   * Ticks the item has been smelting for.
+   * The amount of time that the current cooking process has taken so far. Defaults to `0`.
    */
   cooking_time_spent?: NBTShort,
   /**
-   * Ticks until the current fuel runs out.
+   * The amount of burn time remaining. Defaults to `0`.
    */
   lit_time_remaining?: NBTShort,
   /**
-   * Total ticks the current fuel will burn.
+   * The total amount of burn time that was added in the last refuel. Defaults to `0`.
    */
   lit_total_time?: NBTShort,
 })

package/src/arguments/generated/world/block/sign.ts

@@ -1,7 +1,6 @@
 import type { DyeColor } from 'sandstone/arguments/generated/util/color.ts'
-import type { Text } from 'sandstone/arguments/generated/util/text.ts'
 import type { BlockEntity } from 'sandstone/arguments/generated/world/block.ts'
-import type { NBTList } from 'sandstone'
+import type { SignText } from 'sandstone/arguments/generated/world/component/block.ts'
 
 export type OldSign = (BlockEntity & {
   /**
@@ -54,43 +53,3 @@ export type Sign = (BlockEntity & {
    */
   is_waxed?: boolean,
 })
-
-/**
- * List length range: 4
- */
-export type SignLines = NBTList<Text, {
-  leftExclusive: false,
-  rightExclusive: false,
-  min: 4,
-  max: 4,
-}>
-
-export type SignText = {
-  messages: SignLines,
-  /**
-   * Shown to players with the profanity filter enabled on Realms.
-   */
-  filtered_messages?: SignLines,
-  /**
-   * Value:
-   *
-   *  - White(`white`)
-   *  - Orange(`orange`)
-   *  - Magenta(`magenta`)
-   *  - LightBlue(`light_blue`)
-   *  - Yellow(`yellow`)
-   *  - Lime(`lime`)
-   *  - Pink(`pink`)
-   *  - Gray(`gray`)
-   *  - LightGray(`light_gray`)
-   *  - Cyan(`cyan`)
-   *  - Purple(`purple`)
-   *  - Blue(`blue`)
-   *  - Brown(`brown`)
-   *  - Green(`green`)
-   *  - Red(`red`)
-   *  - Black(`black`)
-   */
-  color?: DyeColor,
-  has_glowing_text?: boolean,
-}

package/src/arguments/generated/world/block.ts

@@ -20,10 +20,10 @@ export type BlockEntity = {
 }
 
 export type BlockEntityData = NonNullable<({
-  [S in Extract<Registry['minecraft:block_entity_type'], string>]?: ({
+  [S in Extract<Extract<Registry['minecraft:block_entity_type'], string>, string>]?: ({
     id: S,
   } & (S extends keyof SymbolBlockEntity ? SymbolBlockEntity[S] : RootNBT))
-}[Registry['minecraft:block_entity_type']])>
+}[Extract<Registry['minecraft:block_entity_type'], string>])>
 
 export type Lockable = {
   /**