minecraft-data 3.91.0 → 3.93.0

package/minecraft-data/data/pc/1.21.3/proto.yml

@@ -34,12 +34,7 @@
    registryEntryHolder: native
    registryEntryHolderSet: native
    ByteArray: ["buffer", { "countType": "varint" }]
-   string: [
-      "pstring",
-      {
-         "countType": "varint"
-      }
-   ]
+   string: ["pstring", { "countType": "varint" }]
    vec2f:
       x: f32
       y: f32
@@ -61,136 +56,77 @@
       "otherwise": { name: "ids", type: "varint" }
    }]
    ContainerID: varint
-   SoundEvent:
-      soundName: string
-      fixedRange?: f32
-   RecipeDisplay:
-      type: varint =>
-      - crafting_shapeless
-      - crafting_shaped
-      - furnace
-      - stonecutter
-      - smithing
-      data: type ?
-         if crafting_shapeless:
-            ingredients: SlotDisplay[]varint
-            result: SlotDisplay
-            craftingStation: SlotDisplay
-         if crafting_shaped:
-            width: varint
-            height: varint
-            ingredients: SlotDisplay[]varint
-            result: SlotDisplay
-            craftingStation: SlotDisplay
-         if furnace:
-            ingredient: SlotDisplay
-            fuel: SlotDisplay
-            result: SlotDisplay
-            craftingStation: SlotDisplay
-            duration: varint
-            experience: f32
-         if stonecutter:
-            ingredient: SlotDisplay
-            result: SlotDisplay
-            craftingStation: SlotDisplay
-         if smithing:
-            template: SlotDisplay
-            base: SlotDisplay
-            addition: SlotDisplay
-            result: SlotDisplay
-            craftingStation: SlotDisplay
-   SlotDisplay:
-      type: varint =>
-      - empty
-      - any_fuel
-      - item
-      - item_stack
-      - tag
-      - smithing_trim
-      - with_remainder
-      - composite
-      data: type ?
-         if empty or any_fuel: void
-         if item: varint
-         if item_stack: Slot
-         if tag: string
-         if simthing_trim:
-            base: SlotDisplay
-            material: SlotDisplay
-            pattern: SlotDisplay
-         if with_remainder:
-            input: SlotDisplay
-            remainder: SlotDisplay
-         if composite: SlotDisplay[]varint
    SlotComponentType: varint =>
-   - custom_data
-   - max_stack_size
-   - max_damage
-   - damage
-   - unbreakable
-   - custom_name
-   - item_name
-   - item_model
-   - lore
-   - rarity
-   - enchantments
-   - can_place_on
-   - can_break
-   - attribute_modifiers
-   - custom_model_data
-   - hide_additional_tooltip
-   - hide_tooltip
-   - repair_cost
-   - creative_slot_lock
-   - enchantment_glint_override
-   - intangible_projectile
-   - food
-   - consumable
-   - use_remainder
-   - use_cooldown
-   - damage_resistant
-   - tool
-   - enchantable
-   - equippable
-   - repairable
-   - glider
-   - tooltip_style
-   - death_protection
-   - stored_enchantments
-   - dyed_color
-   - map_color
-   - map_id
-   - map_decorations
-   - map_post_processing
-   - charged_projectiles
-   - bundle_contents
-   - potion_contents
-   - suspicious_stew_effects
-   - writable_book_content
-   - written_book_content
-   - trim
-   - debug_stick_state
-   - entity_data
-   - bucket_entity_data
-   - block_entity_data
-   - instrument
-   - ominous_bottle_amplifier
-   - jukebox_playable
-   - recipes
-   - lodestone_tracker
-   - firework_explosion
-   - fireworks
-   - profile
-   - note_block_sound
-   - banner_patterns
-   - base_color
-   - pot_decorations
-   - container
-   - block_state
-   - bees
-   - lock
-   - container_loot
+      - custom_data
+      - max_stack_size
+      - max_damage
+      - damage
+      - unbreakable
+      - custom_name
+      - item_name
+      - item_model
+      - lore
+      - rarity
+      - enchantments
+      - can_place_on
+      - can_break
+      - attribute_modifiers
+      - custom_model_data
+      - hide_additional_tooltip
+      - hide_tooltip
+      - repair_cost
+      - creative_slot_lock
+      - enchantment_glint_override
+      - intangible_projectile
+      - food
+      - consumable
+      - use_remainder
+      - use_cooldown
+      - damage_resistant
+      - tool
+      - enchantable
+      - equippable
+      - repairable
+      - glider
+      - tooltip_style
+      - death_protection
+      - stored_enchantments
+      - dyed_color
+      - map_color
+      - map_id
+      - map_decorations
+      - map_post_processing
+      - charged_projectiles
+      - bundle_contents
+      - potion_contents
+      - suspicious_stew_effects
+      - writable_book_content
+      - written_book_content
+      - trim
+      - debug_stick_state
+      - entity_data
+      - bucket_entity_data
+      - block_entity_data
+      - instrument
+      - ominous_bottle_amplifier
+      - jukebox_playable
+      - recipes
+      - lodestone_tracker
+      - firework_explosion
+      - fireworks
+      - profile
+      - note_block_sound
+      - banner_patterns
+      - base_color
+      - pot_decorations
+      - container
+      - block_state
+      - bees
+      - lock
+      - container_loot
 
+   # Instead of sending NBT for items over the network, Minecraft since 1.20.5 sends a
+   # list of components that make up the item. This saves bandwidth by not encoding tag names.
    SlotComponent:
       type: SlotComponentType
       ## Ref: client/net/minecraft/core/component/DataComponents.java
@@ -216,7 +152,7 @@
                level: varint
             showTooltip: bool
          if can_place_on or can_break:
-            predicates: BlockPredicate[]varint
+            predicates: ItemBlockPredicate[]varint
             showTooltip: bool
          if attribute_modifiers:
             attributes: []varint
@@ -239,13 +175,17 @@
                - armor
                - body
             showTooltip: bool
-         if custom_model_data: varint
+         if custom_model_data:
+            floats: f32[]varint
+            flags: bool[]varint
+            strings: string[]varint
+            colors: i32[]varint
          if hide_additional_tooltip: void
          if hide_tooltip: void
          if repair_cost: varint
          if creative_slot_lock: void
          if enchantment_glint_override: bool
-         if intangible_projectile: void
+         if intangible_projectile: anonymousNbt
          if food: 
             nutrition: varint
             # How much saturation will be given after consuming the item.
@@ -265,12 +205,9 @@
             - spyglass
             - toot_horn
             - brush
-            sound: ["registryEntryHolder", {
-               "baseName": "soundId",
-               "otherwise": { name: "data", type: "SoundEvent" }
-            }]
+            sound: ItemSoundHolder
             makes_particles: bool
-            effects: ConsumeEffect[]varint
+            effects: ItemConsumeEffect[]varint
          if use_remainder: Slot
          if use_cooldown:
             seconds: f32
@@ -297,10 +234,7 @@
             - chest
             - head
             - body
-            sound: ["registryEntryHolder", {
-               "baseName": "soundId",
-               "otherwise": { name: "data", type: "SoundEvent" }
-            }]
+            sound: ItemSoundHolder
             model?: string
             cameraOverlay?: string
             allowedEntities?: IDSet
@@ -309,9 +243,10 @@
             damageable: bool
          if repairable:
             items: IDSet
+         if glider: void
          if tooltip_style: string
          if death_protection:
-            effects: ConsumeEffect[]varint
+            effects: ItemConsumeEffect[]varint
          if stored_enchantments:
             enchantments: []varint
                # The ID of the enchantment in the enchantment registry.
@@ -320,11 +255,11 @@
             # Whether the list of enchantments should be shown on the item's tooltip.
             showInTooltip: bool
          if dyed_color:
-            color: varint
+            color: i32
             showTooltip: bool
-         if map_color: varint
+         if map_color: i32
          if map_id: varint
-         if map_decorations: anonOptionalNbt
+         if map_decorations: anonymousNbt
          if map_post_processing: varint
          if charged_projectiles:
             projectiles: Slot[]varint
@@ -334,220 +269,77 @@
             # True if this potion has an ID in the potion registry--it has the default effects associated with the potion type.
             potionId?: varint
             # The RGB components of the color, encoded as an integer.
-            customColor?: varint
-            customEffects: PotionEffect[]varint
-            customName: string
-         # Name	Type	Description
-         # Number Of Effects	VarInt	Number of elements in the following array.
-         # Effect	Type ID	Array	VarInt Enum	The ID of the effect in the potion effect type registry.
-         # Duration	VarInt	The duration of the effect.
+            customColor?: i32
+            customEffects: ItemPotionEffect[]varint
+            customName?: string
          if suspicious_stew_effects:
             effects: []varint
+               # The ID of the effect in the potion effect type registry.
                effect: varint
+               # The duration of the effect.
                duration: varint
-         # Name	Type	Description
-         # Number Of Pages	VarInt	Number of elements in the following array.
-         # Page	Raw Content	Array (100)	String (1024)	The raw text of the page.
-         # Has Filtered Content	Boolean	
-         # Filtered Content	Optional String (1024)	The content after passing through chat filters. Only present if Has Filtered Content is true.
          if writable_book_content:
-            pages: BookPage[]varint
-         # Name	Type	Description
-         # Raw Title	String (32)	The raw title of the book.
-         # Has Filtered Title	Boolean	
-         # Filtered Title	Optional String (32)	The title after going through chat filters. Only present if Has Filtered Title is true.
-         # Author	String	
-         # Generation	VarInt	
-         # Number Of Pages	VarInt	Number of elements in the following array.
-         # Page	Raw Content	Array (100)	TextComponent (1024)	The raw text of the page.
-         # Has Filtered Content	Boolean	
-         # Filtered Content	Optional Text Component (1024)	The content after passing through chat filters. Only present if Has Filtered Content is true.
-         # Resolved	Boolean	Whether entity selectors have already been resolved.
+            # Max 100 pages
+            pages: ItemBookPage[]varint
          if written_book_content:
             rawTitle: string
             filteredTitle?: string
             author: string
             generation: varint
-            pages: BookPage[]varint
-            # Whether entity selectors have already been resolved.
+            pages: ItemWrittenBookPage[]varint
             resolved: bool
-         # Name	Type	Description
-         # Trim Material Type	VarInt	Identifier used to determine the data that follows. It can be either:
-         # 0 - Directly represents a trim material, with the necessary data following.
-         # Anything else - References a trim material in its registry, by the ID of Trim Material Type - 1.
-         # Asset Name	Optional String	See Armor Trim Material Registry. Only present if Trim Material Type is 0.
-         # Ingredient	Optional VarInt	See Armor Trim Material Registry. Only present if Trim Material Type is 0.
-         # Item Model Index	Optional Float	See Armor Trim Material Registry. Only present if Trim Material Type is 0.
-         # Number of Overrides	Optional VarInt	See Armor Trim Material Registry. Only present if Trim Material Type is 0.
-         # Override	Armor Material Type	Optional Array	VarInt Enum	See Armor Trim Material Registry. Only present if Trim Material Type is 0.
-         # Overriden Asset Name	String	See Armor Trim Material Registry. Only present if Trim Material Type is 0.
-         # Description	Optional Text Component	See Armor Trim Material Registry. Only present if Trim Material Type is 0.
-         # Trim Pattern Type	VarInt	Identifier used to determine the data that follows. It can be either:
-         # 0 - Directly represents a trim pattern, with the necessary data following.
-         # Anything else - References a trim pattern in its registry, by the ID of Trim Pattern Type - 1.
-         # Asset Name	Optional String	See Armor Trim Pattern Registry. Only present if Trim Pattern Type is 0.
-         # Template Item	Optional VarInt	See Armor Trim Pattern Registry. Only present if Trim Pattern Type is 0.
-         # Description	Optional Text Component	See Armor Trim Pattern Registry. Only present if Trim Pattern Type is 0.
-         # Decal	Optional Boolean	See Armor Trim Pattern Registry. Only present if Trim Pattern Type is 0.
-         # Show In Tooltip	Boolean	Whether the trim information should be shown on the item's tooltip.
          if trim:
-            # Identifier used to determine the data that follows. It can be either:
-            # 0 - Directly represents a trim material, with the necessary data following.
-            # Anything else - References a trim material in its registry, by the ID of Trim Material Type - 1.
-            materialType: varint
-            _: materialType ?
-               if 0:
-                  assetName: string
-                  ingredientId: varint
-                  itemModelIndex: f32
-                  numberOfOverrides: optvarint
-                  override: []varint
-                     armorMaterialType: varint
-                     overridenAssetName: string
-                  description: string
-            trimPatternType: varint
-            _: trimPatternType ?
-               if 0:
-                  assetName: string
-                  templateItem: varint
-                  description: string
-                  decal: bool
+            material: ["registryEntryHolder", { "baseName": "materialId", "otherwise": { "name": "data", "type": "ArmorTrimMaterial" } }]
+            pattern: ["registryEntryHolder", { "baseName": "patternId", "otherwise": { "name": "data", "type": "ArmorTrimPattern" } }]
             showInTooltip: bool
          if debug_stick_state: anonymousNbt
          if entity_data: anonymousNbt
          if bucket_entity_data: anonymousNbt
          if block_entity_data: anonymousNbt
-         # Name	Type	Description
-         # Instrument Type	VarInt	Identifier used to determine the data that follows. It can be either:
-         # 0 - Directly represents an instrument, with the necessary data following.
-         # Anything else - References an instrument in its registry, by the ID of Instrument Type - 1.
-         # Sound Event	Optional Sound Event	The sound to be played. Only present if Instrument Type is 0.
-         # Use duration	Optional Float	The maximum range of the sound. Only present if Instrument Type is 0.
-         # Range	Optional Float	The range of the instrument. Only present if Instrument Type is 0.
-         if instrument:
-            instrumentType: varint
-            _: instrumentType ?
-               if 0:
-                  soundEvent: string
-                  useDuration: f32
-                  range: f32
+         if instrument: ["registryEntryHolder", { "baseName": "instrumentId", "otherwise": { "name": "data", "type": "InstrumentData" } }]
          if ominous_bottle_amplifier: varint
-         # Name	Type	Description
-         # Direct Mode	Boolean	Whether the jukebox song is specified directly, or just referenced by name.
-         # Jukebox Song Name	Optional Identifier	The name of the jukebox song in its respective registry. Only present if Direct Mode is false.
-         # Jukebox Song Type	Optional VarInt	Identifier used to determine the data that follows. It can be either:
-         # 0 - Directly represents a jukebox song, with the necessary data following.
-         # Anything else - References a jukebox song in its registry, by the ID of Jukebox Song Type - 1.
-         # Only present if Direct Mode is true.  
-         # Sound Event	Optional Sound Event	The sound to be played. Only present if Direct Mode is true and Jukebox Song Type is 0.
-         # Description	Optional Text Component	The description shown in the item lore. Only present if Direct Mode is true and Jukebox Song Type is 0.
-         # Duration	Optional Float	The duration the songs should play for, in seconds. Only present if Direct Mode is true and Jukebox Song Type is 0.
-         # Output	Optional VarInt	The output strength given by a comparator. Between 0 and 15. Only present if Direct Mode is true and Jukebox Song Type is 0.
-         # Show In Tooltip	Boolean	Whether the song should be shown on the item's tooltip.
          if jukebox_playable:
-            directMode: bool
-            _: directMode ?
-               if true:
-                  jukeboxSongName: string
-                  jukeboxSongType: varint
-                  _: jukeboxSongType ?
-                     if 0:
-                        soundEvent:
-                           soundEventType: varint
-                           _: soundEventType ?
-                              if 0:
-                                 soundName: string
-                                 fixedRange?: f32
-                  description: anonymousNbt
-                  duration: f32
-                  output: varint
-               if false:
-                  songLocation: string
+            hasHolder: bool
+            song: hasHolder ?
+               if true: ["registryEntryHolder", { "baseName": "songId", "otherwise": { "name": "data", "type": "JukeboxSongData" } }]
+               if false: string
             showInTooltip: bool
          if recipes: anonymousNbt
-         # Name	Type	Description
-         # Has Global Position	Boolean	Whether this lodestone points to a position, otherwise it spins randomly.
-         # Dimension	Identifier	The dimension the compass points to. Only present if Has Global Position is true.
-         # Position	Position	The position the compass points to. Only present if Has Global Position is true.
-         # Tracked	Boolean	Whether the component is removed when the associated lodestone is broken.
          if lodestone_tracker:
+            # Specified if this lodestone points to a position; otherwise it spins randomly.
             globalPosition?:
                dimension: string
+               # The position the compass points to. Only present if Has Global Position is true.
                position: position
+            # Whether the component is removed when the associated lodestone is broken.
             tracked: bool
-         # Name	Type	Description
-         # Shape	VarInt Enum	Can be one of the following:
-         # 0 - Small ball
-         # 1 - Large ball
-         # 2 - Star
-         # 3 - Creeper
-         # 4 - Burst
-         # Number Of Colors	VarInt	The number of elements in the following array.
-         # Colors	Array of Int	The RGB components of the color, encoded as an integer.
-         # Number Of Fade Colors	VarInt	The number of elements in the following array.
-         # Fade Colors	Array of Int	The RGB components of the color, encoded as an integer.
-         # Has Trail	Boolean	
-         # Has Twinkle	Boolean	
-         if firework_explosion: FireworkExplosion
+         if firework_explosion: ItemFireworkExplosion
          if fireworks:
             flightDuration: varint
-            explosions: FireworkExplosion[]varint
-         # Name	Type	Description
-         # Has Name	Boolean	
-         # Name	Optional String (16)	Only present if Has Name is true.
-         # Has Unique ID	Boolean	
-         # Unique ID	Optional UUID	Only present if Has Unique ID is true.
-         # Number of Properties	VarInt	Number of elements in the following array.
-         # Property	Name	Array	String (64)	
-         # Value	String	
-         # Has Signature	Boolean	
-         # Signature	String (1024)	Only present if Has Signature is true.
+            explosions: ItemFireworkExplosion[]varint
          if profile:
-            hasName: bool
-            name: string
-            hasUniqueId: bool
-            uniqueId: UUID
+            # If the profile has a name, max 16 characters.
+            name?: string
+            uuid?: UUID
             properties: []varint
-               property: string
+               # Max 64 characters
+               name: string
                value: string
-               hasSignature: bool
-               signature: string
+               # Max 1024 characters
+               signature?: string
          if note_block_sound: string
-         # Name	Type	Description
-         # Number of Layers	VarInt	Number of elements in the following array.
-         # Layer	Pattern Type	Array	VarInt	Identifier used to determine the data that follows. It can be either:
-         # 0 - Directly represents a pattern, with the necessary data following.
-         # Anything else - References a pattern in its registry, by the ID of Pattern Type - 1.
-         # Asset ID	Optional Identifier	Identifier of the asset. Only present if Pattern Type is 0.
-         # Translation Key	Optional String	Only present if Pattern Type is 0.
-         # Color	Dye Color	See Dye Color.
          if banner_patterns:
-            layers: []varint
-               patternType: varint
-               _: patternType ?
-                  if 0:
-                     assetId: string
-                     translationKey: string
-               color: varint
+            layers: BannerPatternLayer[]varint
          if base_color: varint
          if pot_decorations:
             # The ID of the items in the item registry.
             decorations: varint[]varint
          if container:
             contents: Slot[]varint
-         # Name	Type	Description
-         # Number of Properties	VarInt	Number of elements in the following array.
-         # Property	Name	Array	String	
-         # Value	String	
          if block_state:
             properties: []varint
-               property: string
+               name: string
                value: string
-         # Name	Type	Description
-         # Number of Bees	VarInt	Number of elements in the following array.
-         # Bee	Entity Data	Array	NBT	
-         # Ticks In Hive	VarInt	
-         # Min Ticks In Hive	VarInt
          if bees:
             bees: []varint
                # Custom data for the entity, always a Compound Tag. Same structure as the minecraft:custom_data component.
@@ -557,48 +349,71 @@
          if lock: anonymousNbt
          if container_loot: anonymousNbt
 
-   Slot:
-      itemCount: varint
-      _: itemCount ?
-         if 0: void
-         default:
-            itemId: varint
-# https://wiki.vg/Slot_Data#Structured_components
-            addedComponentCount: varint
-            removedComponentCount: varint
-            components: SlotComponent[]$addedComponentCount
-            removeComponents: []$removedComponentCount
-               type: SlotComponentType
+   # TODO: add to ClientboundExplodePacket and ClientboundSoundEntityPacket and ClientboundSoundPacket (and maybe other) packet which also use HolderSet
+   ItemSoundEvent:
+      soundName: string
+      fixedRange?: f32
+   ItemSoundHolder: ["registryEntryHolder", {
+      "baseName": "soundId",
+      "otherwise": { name: "data", type: "ItemSoundEvent" }
+   }]
 
-   FireworkExplosion:
+   ItemFireworkExplosion:
       shape: varint =>
-      - small_ball
-      - large_ball
-      - star
-      - creeper
-      - burst
+         - small_ball
+         - large_ball
+         - star
+         - creeper
+         - burst
+      # The RGB components of the color, encoded as an integer.
       colors: i32[]varint
+      # The RGB components of the color, encoded as an integer.
       fadeColors: i32[]varint
+      # Whether the firework has a trail.
       hasTrail: bool
+      # Whether the firework has a twinkle effect.
       hasTwinkle: bool
 
-   BookPage:
-      content: string
-      filteredContent?: string
-
-   EffectDetail:
+   ItemEffectDetail:
       amplifier: varint
       duration: varint
       ambient: bool
       showParticles: bool
       showIcon: bool
-      hiddenEffect?: EffectDetail
+      hiddenEffect?: ItemEffectDetail
 
-   PotionEffect:
+   ItemPotionEffect:
       id: varint
-      details: EffectDetail
+      details: ItemEffectDetail
 
-   ConsumeEffect:
+   ItemBlockProperty:
+      name: string
+      isExactMatch: bool
+      value: isExactMatch ?
+         if true:
+            exactValue: string
+         if false:
+            minValue: string
+            maxValue: string
+
+
+   ItemBlockPredicate:
+      blockSet?: ["registryEntryHolderSet", {
+         "base": { name: "name", type: "string" },
+         "otherwise": { name: "blockIds", type: "varint" }
+      }]
+      properties?: ItemBlockProperty[]varint
+      nbt: anonOptionalNbt
+
+   ItemBookPage:
+      # The raw text of the page. TextComponent, max 1024 characters.
+      content: string
+      filteredContent?: string
+   ItemWrittenBookPage:
+      content: anonymousNbt
+      filteredContent: anonOptionalNbt
+
+   ItemConsumeEffect: # 1.21.3
       type: varint =>
       - apply_effects
       - remove_effects
@@ -607,7 +422,7 @@
       - play_sound
       _: type ?
          if apply_effects:
-            effects: PotionEffect[]varint
+            effects: ItemPotionEffect[]varint
             probability: f32
          if remove_effects:
             effects: IDSet
@@ -615,145 +430,168 @@
          if teleport_randomly:
             diameter: f32
          if play_sound:
-            sound: ["registryEntryHolder", {
-               "baseName": "soundId",
-               "otherwise": { name: "data", type: "SoundEvent" }
-            }]
+            sound: ItemSoundHolder
 
-   BlockProperty:
-      # Name of the block state property.
-      name: string
-      # Whether this is an exact value match, as opposed to ranged.
-      isExactMatch: bool
-      # Value of the block state property. Only present in exact match mode.
-      exactValue?: string
-      # Minimum value of the block state property range. Only present in ranged match mode.
-      minValue?: string
-      # Maximum value of the block state property range. Only present in ranged match mode.
-      maxValue?: string
+   ArmorTrimMaterial:
+      assetName: string
+      ingredientId: varint
+      overrideArmorAssets: []varint
+         key: string
+         value: string
+      description: anonymousNbt
 
-   BlockPredicate:
-      blockSet?: ["registryEntryHolderSet", {
-         "base": { name: "name", type: "string" },
-         "otherwise": { name: "blockIds", type: "varint" }
-      }]
-      properties?: BlockProperty[]varint
-      nbt: anonOptionalNbt
+   ArmorTrimPattern:
+      assetId: string
+      templateItemId: varint
+      description: anonymousNbt
+      decal: bool
+
+   InstrumentData:
+      soundEvent: ItemSoundHolder
+      useDuration: f32
+      range: f32
+      description: anonymousNbt
+
+   JukeboxSongData:
+      soundEvent: ItemSoundHolder
+      description: anonymousNbt
+      lengthInSeconds: f32
+      comparatorOutput: varint
+
+   BannerPattern:
+      assetId: string
+      translationKey: string
+   BannerPatternLayer:
+      pattern: ItemSoundHolder
+      colorId: varint
+
+   Slot:
+      itemCount: varint
+      _: itemCount ?
+         if 0: void
+         default:
+            itemId: varint
+            # https://wiki.vg/Slot_Data#Structured_components
+            addedComponentCount: varint
+            removedComponentCount: varint
+            components: SlotComponent[]$addedComponentCount
+            removeComponents: []$removedComponentCount
+               type: SlotComponentType
 
    Particle:
       # See client/net/minecraft/core/particles/ParticleTypes.java
       type: varint =>
-      - angry_villager
-      - block
-      - block_marker
-      - bubble
-      - cloud
-      - crit
-      - damage_indicator
-      - dragon_breath
-      - dripping_lava
-      - falling_lava
-      - landing_lava
-      - dripping_water
-      - falling_water
-      - dust
-      - dust_color_transition
-      - effect
-      - elder_guardian
-      - enchanted_hit
-      - enchant
-      - end_rod
-      - entity_effect
-      - explosion_emitter
-      - explosion
-      - gust
-      - small_gust
-      - gust_emitter_large
-      - gust_emitter_small
-      - sonic_boom
-      - falling_dust
-      - firework
-      - fishing
-      - flame
-      - infested
-      - cherry_leaves
-      - sculk_soul
-      - sculk_charge
-      - sculk_charge_pop
-      - soul_fire_flame
-      - soul
-      - flash
-      - happy_villager
-      - composter
-      - heart
-      - instant_effect
-      - item
-      - vibration
-      - trail
-      - item_slime
-      - item_cobweb
-      - item_snowball
-      - large_smoke
-      - lava
-      - mycelium
-      - note
-      - poof
-      - portal
-      - rain
-      - smoke
-      - white_smoke
-      - sneeze
-      - spit
-      - squid_ink
-      - sweep_attack
-      - totem_of_undying
-      - underwater
-      - splash
-      - witch
-      - bubble_pop
-      - current_down
-      - bubble_column_up
-      - nautilus
-      - dolphin
-      - campfire_cosy_smoke
-      - campfire_signal_smoke
-      - dripping_honey
-      - falling_honey
-      - landing_honey
-      - falling_nectar
-      - falling_spore_blossom
-      - ash
-      - crimson_spore
-      - warped_spore
-      - spore_blossom_air
-      - dripping_obsidian_tear
-      - falling_obsidian_tear
-      - landing_obsidian_tear
-      - reverse_portal
-      - white_ash
-      - small_flame
-      - snowflake
-      - dripping_dripstone_lava
-      - falling_dripstone_lava
-      - dripping_dripstone_water
-      - falling_dripstone_water
-      - glow_squid_ink
-      - glow
-      - wax_on
-      - wax_off
-      - electric_spark
-      - scrape
-      - shriek
-      - egg_crack
-      - dust_plume
-      - trial_spawner_detected_player
-      - trial_spawner_detected_player_ominous
-      - vault_connection
-      - dust_pillar
-      - ominous_spawning
-      - raid_omen
-      - trial_omen
-      - block_crumble
+         - angry_villager
+         - block
+         - block_marker
+         - bubble
+         - cloud
+         - crit
+         - damage_indicator
+         - dragon_breath
+         - dripping_lava
+         - falling_lava
+         - landing_lava
+         - dripping_water
+         - falling_water
+         - dust
+         - dust_color_transition
+         - effect
+         - elder_guardian
+         - enchanted_hit
+         - enchant
+         - end_rod
+         - entity_effect
+         - explosion_emitter
+         - explosion
+         - gust
+         - small_gust
+         - gust_emitter_large
+         - gust_emitter_small
+         - sonic_boom
+         - falling_dust
+         - firework
+         - fishing
+         - flame
+         - infested
+         - cherry_leaves
+         - sculk_soul
+         - sculk_charge
+         - sculk_charge_pop
+         - soul_fire_flame
+         - soul
+         - flash
+         - happy_villager
+         - composter
+         - heart
+         - instant_effect
+         - item
+         - vibration
+         - trail
+         - item_slime
+         - item_cobweb
+         - item_snowball
+         - large_smoke
+         - lava
+         - mycelium
+         - note
+         - poof
+         - portal
+         - rain
+         - smoke
+         - white_smoke
+         - sneeze
+         - spit
+         - squid_ink
+         - sweep_attack
+         - totem_of_undying
+         - underwater
+         - splash
+         - witch
+         - bubble_pop
+         - current_down
+         - bubble_column_up
+         - nautilus
+         - dolphin
+         - campfire_cosy_smoke
+         - campfire_signal_smoke
+         - dripping_honey
+         - falling_honey
+         - landing_honey
+         - falling_nectar
+         - falling_spore_blossom
+         - ash
+         - crimson_spore
+         - warped_spore
+         - spore_blossom_air
+         - dripping_obsidian_tear
+         - falling_obsidian_tear
+         - landing_obsidian_tear
+         - reverse_portal
+         - white_ash
+         - small_flame
+         - snowflake
+         - dripping_dripstone_lava
+         - falling_dripstone_lava
+         - dripping_dripstone_water
+         - falling_dripstone_water
+         - glow_squid_ink
+         - glow
+         - wax_on
+         - wax_off
+         - electric_spark
+         - scrape
+         - shriek
+         - egg_crack
+         - dust_plume
+         - trial_spawner_detected_player
+         - trial_spawner_detected_player_ominous
+         - vault_connection
+         - dust_pillar
+         - ominous_spawning
+         - raid_omen
+         - trial_omen
+         - block_crumble
       ## ## Tips for reviewing particle data (as of 1.20.5)
       ## Inside the registry code, each particle can have an associated "options" type and
       ## each options type can add additional data to be encoded.
@@ -788,14 +626,14 @@
          if sculk_charge: f32
          if shriek: varint
          if vibration:
-            position_type: varint =>
+            positionType: varint =>
             - block
             - entity
-            position: position_type ?
+            position: positionType ?
                if block: position
                if entity:
                   entityId: varint
-                  entity_eye_height: f32
+                  entityEyeHeight: f32
             ticks: varint
          if trail:
             target: vec3f64
@@ -977,7 +815,7 @@
    game_profile:
       name: string
       properties: []varint
-         key: string
+         name: string
          value: string
          signature?: string
    command_node:
@@ -1277,6 +1115,20 @@
    # These are packets that are shared between multiple states.
    # They are defined here to avoid duplication.
    # =====
+   # MC: ServerboundClientInformationPacket
+   packet_common_settings:
+      locale: string
+      viewDistance: i8
+      chatFlags: varint
+      chatColors: bool
+      skinParts: u8
+      mainHand: varint
+      enableTextFiltering: bool
+      enableServerListing: bool
+      particleStatus: varint =>
+      - all
+      - decreased
+      - minimal
    # MC: ClientboundCookieRequestPacket
    packet_common_cookie_request:
       cookie: string
@@ -1316,16 +1168,16 @@
       promptMessage?: anonymousNbt
 
    ServerLinkType: varint =>
-   - bug_report
-   - community_guidelines
-   - support
-   - status
-   - feedback
-   - community
-   - website
-   - forums
-   - news
-   - announcements
+      - bug_report
+      - community_guidelines
+      - support
+      - status
+      - feedback
+      - community
+      - website
+      - forums
+      - news
+      - announcements
    # MC: ClientboundServerLinksPacket
    # This packet contains a list of links that the Notchian client will display in the menu 
    # available from the pause menu. Link labels can be built-in or custom (i.e., any text).
@@ -1553,17 +1405,7 @@
          if custom_report_details: packet_common_custom_report_details
          if server_links: packet_common_server_links
 ^configuration.toServer.types:
-   # MC: ServerboundClientInformationPacket
-   packet_settings:
-      locale: string
-      viewDistance: i8
-      chatFlags: varint
-      chatColors: bool
-      skinParts: u8
-      mainHand: varint
-      enableTextFiltering: bool
-      enableServerListing: bool
-      particles: varint
+   ## (Settings is Common) ##
    ## (Cookie Response is Common) ##
    # MC: ServerboundCustomPayloadPacket
    packet_custom_payload:
@@ -1595,7 +1437,7 @@
       - custom_report_details
       - server_links
       params: name ?
-         if settings: packet_settings
+         if settings: packet_common_settings
          if cookie_response: packet_common_cookie_response
          if custom_payload: packet_custom_payload
          if finish_configuration: packet_finish_configuration
@@ -1606,7 +1448,64 @@
          if custom_report_details: packet_common_custom_report_details
          if server_links: packet_common_server_links
 ^play.toClient.types:
-   # World state information for spawn and respawn packets
+   SlotDisplay:
+      type: varint =>
+      - empty
+      - any_fuel
+      - item
+      - item_stack
+      - tag
+      - smithing_trim
+      - with_remainder
+      - composite
+      data: type ?
+         if empty or any_fuel: void
+         if item: varint
+         if item_stack: Slot
+         if tag: string
+         if smithing_trim:
+            base: SlotDisplay
+            material: SlotDisplay
+            pattern: SlotDisplay
+         if with_remainder:
+            input: SlotDisplay
+            remainder: SlotDisplay
+         if composite: SlotDisplay[]varint
+   RecipeDisplay:
+      type: varint =>
+      - crafting_shapeless
+      - crafting_shaped
+      - furnace
+      - stonecutter
+      - smithing
+      data: type ?
+         if crafting_shapeless:
+            ingredients: SlotDisplay[]varint
+            result: SlotDisplay
+            craftingStation: SlotDisplay
+         if crafting_shaped:
+            width: varint
+            height: varint
+            ingredients: SlotDisplay[]varint
+            result: SlotDisplay
+            craftingStation: SlotDisplay
+         if furnace:
+            ingredient: SlotDisplay
+            fuel: SlotDisplay
+            result: SlotDisplay
+            craftingStation: SlotDisplay
+            duration: varint
+            experience: f32
+         if stonecutter:
+            ingredient: SlotDisplay
+            result: SlotDisplay
+            craftingStation: SlotDisplay
+         if smithing:
+            template: SlotDisplay
+            base: SlotDisplay
+            addition: SlotDisplay
+            result: SlotDisplay
+            craftingStation: SlotDisplay
    # World state information for spawn and respawn packets
    SpawnInfo:
       dimension: varint
@@ -1806,18 +1705,14 @@
       parameters: ChatTypeParameterType[]varint
       style: anonymousNbt
    ChatTypes:
-      # Either the extra data is retrieved from the registry (via this ID+1 if non-zero), or it's supplied inline in the chat packet
-      registryIndex: varint
-      _: registryIndex ?
-         if 0:
-            chat: ChatType
-            narration: ChatType
-         default: void
+      chat: ChatType
+      narration: ChatType
+   ChatTypesHolder: ["registryEntryHolder", { "baseName": "chatType", "otherwise": { name: "data", type: "ChatTypes" } }]
 
    # MC: ClientboundDisguisedChatPacket
    packet_profileless_chat:
       message: anonymousNbt
-      type: ChatTypes
+      type: ChatTypesHolder
       name: anonymousNbt
       target?: anonymousNbt
    # MC: ClientboundEntityEventPacket
@@ -1838,16 +1733,12 @@
       onGround: bool
    # MC: ClientboundExplodePacket
    packet_explosion:
-      center: vec3f
+      x: f64
+      y: f64
+      z: f64
       playerKnockback?: vec3f
       explosionParticle: Particle
-      soundId: varint
-      _: soundId ?
-         if 0:
-            soundName: string
-            range?: f32
-         default:
-            
+      sound: ItemSoundHolder
    # MC: ClientboundForgetLevelChunkPacket
    packet_unload_chunk:
       chunkZ: i32
@@ -2014,7 +1905,7 @@
       pitch: i8
       onGround: bool
    # MC: ClientboundMoveMinecartPacket
-   packet_move_minecart:
+   packet_move_minecart: # 1.21.3
       entityId: varint
       steps: []varint
          position: vec3f
@@ -2081,7 +1972,7 @@
       filterTypeMask: filterType ?
          if 2: i64[]varint
          default: void
-      type: ChatTypes
+      type: ChatTypesHolder
       networkName: anonymousNbt
       networkTargetName?: anonymousNbt
    # MC: ClientboundPlayerCombatEndPacket
@@ -2099,6 +1990,7 @@
       players: UUID[]varint
    # MC: ClientboundPlayerInfoUpdatePacket
    packet_player_info:
+      ## ClientboundPlayerInfoUpdatePacket.java#L160
       action: ["bitflags", {
          "type": "u8",
          "flags": [
@@ -2108,7 +2000,7 @@
             "update_listed",
             "update_latency",
             "update_display_name",
-            "update_priority"
+            "update_list_order"
          ]
       }]
       data: []varint
@@ -2129,9 +2021,9 @@
             if true: varint
             default: void
          displayName: ../action/update_display_name ?
-            if true: anonOptionalNbt
+            if true: ["option", "anonymousNbt"]
             default: void
-         listPriority: ../action/update_priority ?
+         listPriority: ../action/update_list_order ?
             if true: varint
             default: void
 
@@ -2154,19 +2046,6 @@
       "type": "u32",
       "flags": ["x", "y", "z", "yaw", "pitch", "dx", "dy", "dz", "yawDelta"]
    }]
-   # PositionUpdateRelatives: ["bitfield", [
-   #    # unused bits on top
-   #    { "name": "unused", "size": 23, "signed": false },
-   #    { "name": "yawDelta", "size": 1, "signed": false },
-   #    { "name": "dz", "size": 1, "signed": false },
-   #    { "name": "dy", "size": 1, "signed": false },
-   #    { "name": "dx", "size": 1, "signed": false },
-   #    { "name": "pitch", "size": 1, "signed": false },
-   #    { "name": "yaw", "size": 1, "signed": false },
-   #    { "name": "z", "size": 1, "signed": false },
-   #    { "name": "y", "size": 1, "signed": false },
-   #    { "name": "x", "size": 1, "signed": false },
-   # ]]
    # MC: ClientboundPlayerPositionPacket
    packet_position:
       teleportId: varint
@@ -2237,6 +2116,7 @@
    packet_reset_score:
       entity_name: string
       objective_name?: string
+   ## (remove_resource_pack is common)
    # MC: ClientboundRespawnPacket
    packet_respawn:
       worldState: SpawnInfo
@@ -2460,12 +2340,7 @@
       fadeOut: i32
    # MC: ClientboundSoundEntityPacket
    packet_entity_sound_effect:
-      soundId: varint
-      soundEvent: soundId ?
-         if 0:
-            resource: string
-            range?: f32
-         default: void
+      sound: ItemSoundHolder
       soundCategory: soundSource
       entityId: varint
       volume: f32
@@ -2473,12 +2348,7 @@
       seed: i64
    # MC: ClientboundSoundPacket
    packet_sound_effect:
-      soundId: varint
-      soundEvent: soundId ?
-         if 0:
-            resource: string
-            range?: f32
-         default: void
+      sound: ItemSoundHolder
       soundCategory: soundSource
       x: i32
       y: i32
@@ -2974,20 +2844,7 @@
    # MC: ServerboundClientTickEndPacket
    packet_tick_end:
       # Empty
-   # MC: ServerboundClientInformationPacket
-   packet_settings:
-      locale: string
-      viewDistance: i8
-      chatFlags: varint
-      chatColors: bool
-      skinParts: u8
-      mainHand: varint
-      enableTextFiltering: bool
-      enableServerListing: bool
-      particleStatus: varint =>
-      - all
-      - decreased
-      - minimal
+   ## (Settings is common) ##
    # MC: ServerboundCommandSuggestionPacket
    packet_tab_complete:
       transactionId: varint
@@ -3319,7 +3176,7 @@
          if chunk_batch_received: packet_chunk_batch_received
          if client_command: packet_client_command
          if tick_end: packet_tick_end
-         if settings: packet_settings
+         if settings: packet_common_settings
          if tab_complete: packet_tab_complete
          if configuration_acknowledged: packet_configuration_acknowledged
          if enchant_item: packet_enchant_item
@@ -3365,4 +3222,4 @@
          if arm_animation: packet_arm_animation
          if spectate: packet_spectate
          if block_place: packet_block_place
-         if use_item: packet_use_item
+         if use_item: packet_use_item