minecraft-data 3.91.0 → 3.93.0

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

@@ -23,6 +23,7 @@
    entityMetadataLoop: native
    topBitSetTerminatedArray: native
    bitfield: native
+   bitflags: native
    container: native
    switch: native
    void: native
@@ -32,14 +33,8 @@
    anonOptionalNbt: native
    registryEntryHolder: native
    registryEntryHolderSet: native
-   arrayWithLengthOffset: native
    ByteArray: ["buffer", { "countType": "varint" }]
-   string: [
-      "pstring",
-      {
-         "countType": "varint"
-      }
-   ]
+   string: ["pstring", { "countType": "varint" }]
    vec2f:
       x: f32
       y: f32
@@ -60,69 +55,71 @@
       "base": { name: "name", type: "string" },
       "otherwise": { name: "ids", type: "varint" }
    }]
+   ContainerID: u8
    SlotComponentType: varint =>
-   - custom_data
-   - max_stack_size
-   - max_damage
-   - damage
-   - unbreakable
-   - custom_name
-   - item_name
-   - 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
-   - fire_resistant
-   - tool
-   - 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
+      - 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
+      - fire_resistant
+      - tool
+      - 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
 
    SlotComponent:
       type: SlotComponentType
+      ## Ref: client/net/minecraft/core/component/DataComponents.java
       data: type ?
-         # TODO: look into how nbt works here
+         ## TODO: look into how nbt works here
          if custom_data: anonymousNbt
          if max_stack_size: varint
          if max_damage: varint
@@ -142,12 +139,11 @@
                level: varint
             showTooltip: bool
          if can_place_on or can_break:
-            predicates: BlockPredicate[]varint
+            predicates: ItemBlockPredicate[]varint
             showTooltip: bool
          if attribute_modifiers:
             attributes: []varint
                typeId: varint
-               uniqueId: UUID
                name: string
                value: f64
                operation: varint =>
@@ -172,19 +168,12 @@
          if repair_cost: varint
          if creative_slot_lock: void
          if enchantment_glint_override: bool
-         if intangible_projectile: void
-         # Name	Type	Description
-         # Nutrition	VarInt	Non-negative
-         # Saturation Modifier	Float	How much saturation will be given after consuming the item.
-         # Can Always Eat	Boolean	Whether the item can always be eaten, even at full hunger.
-         # Seconds To Eat	Float	How long it takes to consume the item.
-         # Using converts to	Slot Data	This specifies the item produced after consuming the current item. In the Notchian server, this is used for stews, which turn into bowls. Set this to Air if the item should be consumed normally without leaving any other item after.
-         # Number of effects	VarInt	Number of elements in the following array.
-         # Effect	Type ID	Array	Potion Effect	The potion effect. See Potion Effect.
-         # Probability	Float	The probability for this effect to be chosen.
+         if intangible_projectile: anonymousNbt
          if food: 
             nutrition: varint
+            # How much saturation will be given after consuming the item.
             saturationModifier: f32
+            # Whether the item can always be eaten, even at full hunger.
             canAlwaysEat: bool
             secondsToEat: f32
             usingConvertsTo: Slot
@@ -192,272 +181,109 @@
                effect: varint
                probability: f32
          if fire_resistant: void
-         # Name	Type	Description
-         # Number of Rules	VarInt	The number of elements in the following array.
-         # Rule
-         #  Blocks	Array	Block Set	The block this rule applies to. See Block Set.
-         #  Has Speed	Boolean	
-         #  Speed	Optional Float	The speed at which the tool breaks this rules' blocks. Only present if Has Speed is true.
-         #  Has Correct Drop For Blocks	Boolean	
-         #  Correct Drop For Blocks	Optional Boolean	Whether items should drop only if this is the correct tool. Only present if Has Correct Drop For Blocks is true.
-         # Default Mining Speed	Float	The mining speed in case none of the previous rule were matched.
-         # Damage Per Block	VarInt	The amount of damage the item takes per block break.
          if tool:
             rules: []varint
-               blocks: BlockSet[]varint
-               hasSpeed: bool
-               speed: f32
-               hasCorrectDropForBlocks: bool
-               correctDropForBlocks: bool
+               blocks: IDSet
+               # The speed at which the tool breaks this rules' blocks.
+               speed?: f32
+               # Whether items should drop only if this is the correct tool.
+               correctDropForBlocks?: bool
+            # The mining speed in case none of the previous rule were matched.
             defaultMiningSpeed: f32
             damagePerBlock: varint
-         # Name	Type	Description
-         # Number of enchantments	VarInt	Number of elements in the following array.
-         # Enchantment	Type ID	Array	VarInt Enum	The ID of the enchantment in the enchantment registry.
-         # Level	VarInt	The level of the enchantment.
-         # Show In Tooltip	Boolean	Whether the list of enchantments should be shown on the item's tooltip.
          if stored_enchantments:
             enchantments: []varint
+               # The ID of the enchantment in the enchantment registry.
                id: varint
                level: varint
+            # 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
          if bundle_contents:
             contents: Slot[]varint
-         # Name	Type	Description
-         # Has Potion ID	Boolean	Whether this potion has an ID in the potion registry. If true, it has the default effects associated with the potion type.
-         # Potion ID	Optional VarInt	The ID of the potion type in the potion registry. Only present if Has Potion ID is true.
-         # Has Custom Color	Boolean	Whether this potion has a custom color. If false, it uses the default color associated with the potion type.
-         # Custom Color	Optional Int	The RGB components of the color, encoded as an integer. Only present if Has Custom Color is true.
-         # Number Of Custom Effects	VarInt	The number of elements in the following array.
-         # Custom Effects	Array of Potion Effect	Any custom effects the potion might have. See Potion Effect.
          if potion_contents:
-            hasPotionId: bool
-            potionId: optvarint
-            hasCustomColor: bool
-            customColor: optvarint
-            customEffects: []varint
-               effect: varint
-               details: EffectDetail
-         # 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.
+            # 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?: 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
-               position: vec3f
+               # 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
                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.
@@ -467,238 +293,227 @@
          if lock: anonymousNbt
          if container_loot: anonymousNbt
 
-   Slot:
-      itemCount: i8
-      _: itemCount ?
-         if 0: void
-         default:
-            itemId: varint
-# https://wiki.vg/Slot_Data#Structured_components
-# +    public static final DataComponentType<CompoundTag> CUSTOM_DATA = new DataComponentType<>(ItemCodecHelper::readAnyTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
-# +    public static final IntComponentType MAX_STACK_SIZE = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final IntComponentType MAX_DAMAGE = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final IntComponentType DAMAGE = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final BooleanComponentType UNBREAKABLE = new BooleanComponentType(ByteBuf::readBoolean, ByteBuf::writeBoolean, BooleanDataComponent::new);
-# +    public static final DataComponentType<Component> CUSTOM_NAME = new DataComponentType<>(ItemCodecHelper::readComponent, ItemCodecHelper::writeComponent, ObjectDataComponent::new);
-# +    public static final DataComponentType<Component> ITEM_NAME = new DataComponentType<>(ItemCodecHelper::readComponent, ItemCodecHelper::writeComponent, ObjectDataComponent::new);
-# +    public static final DataComponentType<List<Component>> LORE = new DataComponentType<>(listReader(ItemCodecHelper::readComponent), listWriter(ItemCodecHelper::writeComponent), ObjectDataComponent::new);
-# +    public static final IntComponentType RARITY = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final DataComponentType<ItemEnchantments> ENCHANTMENTS = new DataComponentType<>(ItemCodecHelper::readItemEnchantments, ItemCodecHelper::writeItemEnchantments, ObjectDataComponent::new);
-# +    public static final DataComponentType<AdventureModePredicate> CAN_PLACE_ON = new DataComponentType<>(ItemCodecHelper::readAdventureModePredicate, ItemCodecHelper::writeAdventureModePredicate, ObjectDataComponent::new);
-# +    public static final DataComponentType<AdventureModePredicate> CAN_BREAK = new DataComponentType<>(ItemCodecHelper::readAdventureModePredicate, ItemCodecHelper::writeAdventureModePredicate, ObjectDataComponent::new);
-# +    public static final DataComponentType<ItemAttributeModifiers> ATTRIBUTE_MODIFIERS = new DataComponentType<>(ItemCodecHelper::readItemAttributeModifiers, ItemCodecHelper::writeItemAttributeModifiers, ObjectDataComponent::new);
-# +    public static final IntComponentType CUSTOM_MODEL_DATA = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final DataComponentType<Unit> HIDE_ADDITIONAL_TOOLTIP = new DataComponentType<>(unitReader(), unitWriter(), ObjectDataComponent::new);
-# +    public static final DataComponentType<Unit> HIDE_TOOLTIP = new DataComponentType<>(unitReader(), unitWriter(), ObjectDataComponent::new);
-# +    public static final IntComponentType REPAIR_COST = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final DataComponentType<Unit> CREATIVE_SLOT_LOCK = new DataComponentType<>(unitReader(), unitWriter(), ObjectDataComponent::new);
-# +    public static final BooleanComponentType ENCHANTMENT_GLINT_OVERRIDE = new BooleanComponentType(ByteBuf::readBoolean, ByteBuf::writeBoolean, BooleanDataComponent::new);
-# +    public static final DataComponentType<CompoundTag> INTANGIBLE_PROJECTILE = new DataComponentType<>(ItemCodecHelper::readAnyTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
-# +    public static final DataComponentType<FoodProperties> FOOD = new DataComponentType<>(ItemCodecHelper::readFoodProperties, ItemCodecHelper::writeFoodProperties, ObjectDataComponent::new);
-# +    public static final DataComponentType<Unit> FIRE_RESISTANT = new DataComponentType<>(unitReader(), unitWriter(), ObjectDataComponent::new);
-# +    public static final DataComponentType<ToolData> TOOL = new DataComponentType<>(ItemCodecHelper::readToolData, ItemCodecHelper::writeToolData, ObjectDataComponent::new);
-# +    public static final DataComponentType<ItemEnchantments> STORED_ENCHANTMENTS = new DataComponentType<>(ItemCodecHelper::readItemEnchantments, ItemCodecHelper::writeItemEnchantments, ObjectDataComponent::new);
-# +    public static final DataComponentType<DyedItemColor> DYED_COLOR = new DataComponentType<>(ItemCodecHelper::readDyedItemColor, ItemCodecHelper::writeDyedItemColor, ObjectDataComponent::new);
-# +    public static final IntComponentType MAP_COLOR = new IntComponentType((helper, input) -> input.readInt(), (helper, output, value) -> output.writeInt(value), IntDataComponent::new);
-# +    public static final IntComponentType MAP_ID = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final DataComponentType<CompoundTag> MAP_DECORATIONS = new DataComponentType<>(ItemCodecHelper::readAnyTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
-# +    public static final IntComponentType MAP_POST_PROCESSING = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final DataComponentType<List<ItemStack>> CHARGED_PROJECTILES = new DataComponentType<>(listReader(ItemCodecHelper::readItemStack), listWriter(ItemCodecHelper::writeItemStack), ObjectDataComponent::new);
-# +    public static final DataComponentType<List<ItemStack>> BUNDLE_CONTENTS = new DataComponentType<>(listReader(ItemCodecHelper::readItemStack), listWriter(ItemCodecHelper::writeItemStack), ObjectDataComponent::new);
-# +    public static final DataComponentType<PotionContents> POTION_CONTENTS = new DataComponentType<>(ItemCodecHelper::readPotionContents, ItemCodecHelper::writePotionContents, ObjectDataComponent::new);
-# +    public static final DataComponentType<List<SuspiciousStewEffect>> SUSPICIOUS_STEW_EFFECTS = new DataComponentType<>(listReader(ItemCodecHelper::readStewEffect), listWriter(ItemCodecHelper::writeStewEffect), ObjectDataComponent::new);
-# +    public static final DataComponentType<WritableBookContent> WRITABLE_BOOK_CONTENT = new DataComponentType<>(ItemCodecHelper::readWritableBookContent, ItemCodecHelper::writeWritableBookContent, ObjectDataComponent::new);
-# +    public static final DataComponentType<WrittenBookContent> WRITTEN_BOOK_CONTENT = new DataComponentType<>(ItemCodecHelper::readWrittenBookContent, ItemCodecHelper::writeWrittenBookContent, ObjectDataComponent::new);
-# +    public static final DataComponentType<ArmorTrim> TRIM = new DataComponentType<>(ItemCodecHelper::readArmorTrim, ItemCodecHelper::writeArmorTrim, ObjectDataComponent::new);
-# +    public static final DataComponentType<CompoundTag> DEBUG_STICK_STATE = new DataComponentType<>(ItemCodecHelper::readAnyTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
-# +    public static final DataComponentType<CompoundTag> ENTITY_DATA = new DataComponentType<>(ItemCodecHelper::readAnyTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
-# +    public static final DataComponentType<CompoundTag> BUCKET_ENTITY_DATA = new DataComponentType<>(ItemCodecHelper::readAnyTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
-# +    public static final DataComponentType<CompoundTag> BLOCK_ENTITY_DATA = new DataComponentType<>(ItemCodecHelper::readAnyTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
-# +    public static final DataComponentType<Holder<Instrument>> INSTRUMENT = new DataComponentType<>(ItemCodecHelper::readInstrument, ItemCodecHelper::writeInstrument, ObjectDataComponent::new);
-# +    public static final IntComponentType OMINOUS_BOTTLE_AMPLIFIER = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final DataComponentType<ListTag> RECIPES = new DataComponentType<>(ItemCodecHelper::readRecipes, ItemCodecHelper::writeRecipes, ObjectDataComponent::new);
-# +    public static final DataComponentType<LodestoneTracker> LODESTONE_TRACKER = new DataComponentType<>(ItemCodecHelper::readLodestoneTarget, ItemCodecHelper::writeLodestoneTarget, ObjectDataComponent::new);
-# +    public static final DataComponentType<Fireworks.FireworkExplosion> FIREWORK_EXPLOSION = new DataComponentType<>(ItemCodecHelper::readFireworkExplosion, ItemCodecHelper::writeFireworkExplosion, ObjectDataComponent::new);
-# +    public static final DataComponentType<Fireworks> FIREWORKS = new DataComponentType<>(ItemCodecHelper::readFireworks, ItemCodecHelper::writeFireworks, ObjectDataComponent::new);
-# +    public static final DataComponentType<GameProfile> PROFILE = new DataComponentType<>(ItemCodecHelper::readResolvableProfile, ItemCodecHelper::writeResolvableProfile, ObjectDataComponent::new);
-# +    public static final DataComponentType<String> NOTE_BLOCK_SOUND = new DataComponentType<>(ItemCodecHelper::readResourceLocation, ItemCodecHelper::writeResourceLocation, ObjectDataComponent::new);
-# +    public static final DataComponentType<List<BannerPatternLayer>> BANNER_PATTERNS = new DataComponentType<>(listReader(ItemCodecHelper::readBannerPatternLayer), listWriter(ItemCodecHelper::writeBannerPatternLayer), ObjectDataComponent::new);
-# +    public static final IntComponentType BASE_COLOR = new IntComponentType(ItemCodecHelper::readVarInt, ItemCodecHelper::writeVarInt, IntDataComponent::new);
-# +    public static final DataComponentType<List<Integer>> POT_DECORATIONS = new DataComponentType<>(listReader(ItemCodecHelper::readVarInt), listWriter(ItemCodecHelper::writeVarInt), ObjectDataComponent::new);
-# +    public static final DataComponentType<List<ItemStack>> CONTAINER = new DataComponentType<>(listReader(ItemCodecHelper::readOptionalItemStack), listWriter(MinecraftCodecHelper::writeOptionalItemStack), ObjectDataComponent::new);
-# +    public static final DataComponentType<BlockStateProperties> BLOCK_STATE = new DataComponentType<>(ItemCodecHelper::readBlockStateProperties, ItemCodecHelper::writeBlockStateProperties, ObjectDataComponent::new);
-# +    public static final DataComponentType<List<BeehiveOccupant>> BEES = new DataComponentType<>(listReader(ItemCodecHelper::readBeehiveOccupant), listWriter(ItemCodecHelper::writeBeehiveOccupant), ObjectDataComponent::new);
-# +    public static final DataComponentType<StringTag> LOCK = new DataComponentType<>(ItemCodecHelper::readLock, ItemCodecHelper::writeLock, ObjectDataComponent::new);
-# +    public static final DataComponentType<CompoundTag> CONTAINER_LOOT = new DataComponentType<>(ItemCodecHelper::readAnyTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
-            addedComponentCount: varint
-            removedComponentCount: varint
-            components: SlotComponent[]$addedComponentCount
-            removeComponents: []$removedComponentCount
-               type: SlotComponentType
+   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
 
-   BlockSet:
-      type: varint
-      name: type ?
-         if 0: string
-         default: void
-      # TODO: This will require a custom type ; we need type - 1 length of blockIds
-      blockIds: type ?
-         if 0: void
-         default: ["arrayWithLengthOffset", {"count": "type", "type": "varint", "lengthOffset": -1}]
+   ItemPotionEffect:
+      id: varint
+      details: ItemEffectDetail
 
-   BlockProperty:
-      # Name of the block state property.
+   ItemBlockProperty:
       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
+      value: isExactMatch ?
+         if true:
+            exactValue: string
+         if false:
+            minValue: string
+            maxValue: string
+
 
-   BlockPredicate:
-      blockSet?: BlockSet[]varint
-      properties?: BlockProperty[]varint
+   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
+
+   ArmorTrimMaterial:
+      assetName: string
+      ingredientId: varint
+      overrideArmorAssets: []varint
+         key: string
+         value: string
+      description: anonymousNbt
+
+   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: ["registryEntryHolder", { "baseName": "patternId", "otherwise": { "name": "data", "type": "BannerPattern" } }]
+      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
-      - 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
+         - 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
+         - 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
       ## ## 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.
@@ -733,14 +548,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
    ingredient: Slot[]varint
    position: [
@@ -857,19 +672,26 @@
          }]
          if frog_variant: varint
          if optional_global_pos: ["option", "string"]
-         if painting_variant:
-            width: varint
-            height: varint
-            assetId: string
+         if painting_variant: ["registryEntryHolder", {
+            "baseName": "variantId",
+            "otherwise": { name: "variantData", type: "EntityMetadataPaintingVariant" }
+         }]
          if sniffer_state: varint
          if armadillo_state: varint
          if vector3: vec3f
          if quaternion: vec4f
+   EntityMetadataPaintingVariant:
+      width: i32
+      height: i32
+      assetId: string
+      title?: anonymousNbt
+      author?: anonymousNbt
    EntityMetadataWolfVariant:
       wildTexture: string
       tameTexture: string
       angryTexture: string
       biome: IDSet
+
    entityMetadata: ["entityMetadataLoop", { "endVal": 255, "type": "entityMetadataEntry" }]
    minecraft_simple_recipe_format:
       category: varint
@@ -921,7 +743,7 @@
    game_profile:
       name: string
       properties: []varint
-         key: string
+         name: string
          value: string
          signature?: string
    command_node:
@@ -1221,6 +1043,16 @@
    # 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
    # MC: ClientboundCookieRequestPacket
    packet_common_cookie_request:
       cookie: string
@@ -1243,23 +1075,33 @@
          namespace: string
          id: string
          version: string
+   # MC: ClientboundResourcePackPopPacket
+   packet_common_remove_resource_pack:
+      uuid?: UUID
+   # MC: ClientboundResourcePackPushPacket
+   packet_common_add_resource_pack:
+      uuid: UUID
+      url: string
+      hash: string
+      forced: bool
+      promptMessage?: anonymousNbt
    # MC: ClientboundCustomReportDetailsPacket
-   packet_common_custom_report_details:
+   packet_common_custom_report_details: # 1.21.1
       details: []varint
          key: string
          value: string
 
    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).
@@ -1440,16 +1282,6 @@
       entries: []varint
          key: string
          value?: anonymousNbt
-   # MC: ClientboundResourcePackPopPacket
-   packet_remove_resource_pack:
-      uuid?: UUID
-   # MC: ClientboundResourcePackPushPacket
-   packet_add_resource_pack:
-      uuid: UUID
-      url: string
-      hash: string
-      forced: bool
-      promptMessage?: anonymousNbt
    ## (Store cookie and Transfer are Common) ##
    # MC: ClientboundUpdateEnabledFeaturesPacket
    packet_feature_flags:
@@ -1488,8 +1320,8 @@
          if ping: packet_ping
          if reset_chat: packet_reset_chat
          if registry_data: packet_registry_data
-         if remove_resource_pack: packet_remove_resource_pack
-         if add_resource_pack: packet_add_resource_pack
+         if remove_resource_pack: packet_common_remove_resource_pack
+         if add_resource_pack: packet_common_add_resource_pack
          if store_cookie: packet_common_store_cookie
          if transfer: packet_common_transfer
          if feature_flags: packet_feature_flags
@@ -1498,16 +1330,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
+   ## (Settings is Common) ##
    ## (Cookie Response is Common) ##
    # MC: ServerboundCustomPayloadPacket
    packet_custom_payload:
@@ -1539,7 +1362,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
@@ -1550,7 +1373,6 @@
          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
    # World state information for spawn and respawn packets
    SpawnInfo:
       dimension: varint
@@ -1680,21 +1502,21 @@
       rootIndex: varint
    # MC: ClientboundContainerClosePacket
    packet_close_window:
-      windowId: u8
+      windowId: ContainerID
    # MC: ClientboundContainerSetContentPacket
    packet_window_items:
-      windowId: u8
+      windowId: ContainerID
       stateId: varint
       items: Slot[]varint
       carriedItem: Slot
    # MC: ClientboundContainerSetDataPacket
    packet_craft_progress_bar:
-      windowId: u8
+      windowId: ContainerID
       property: i16
       value: i16
    # MC: ClientboundContainerSetSlotPacket
    packet_set_slot:
-      windowId: i8
+      windowId: ContainerID
       stateId: varint
       slot: i16
       item: Slot
@@ -1748,18 +1570,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
@@ -1782,13 +1600,7 @@
       block_interaction_type: varint
       small_explosion_particle: Particle
       large_explosion_particle: Particle
-      soundId: varint
-      _: soundId ?
-         if 0:
-            soundName: string
-            range?: f32
-         default:
-            
+      sound: ItemSoundHolder
    # MC: ClientboundForgetLevelChunkPacket
    packet_unload_chunk:
       chunkZ: i32
@@ -1799,7 +1611,7 @@
       gameMode: f32
    # MC: ClientboundHorseScreenOpenPacket
    packet_open_horse_window:
-      windowId: u8
+      windowId: ContainerID
       nbSlots: varint
       entityId: i32
    # MC: ClientboundHurtAnimationPacket
@@ -1913,7 +1725,7 @@
          ]
    # MC: ClientboundMerchantOffersPacket
    packet_trade_list:
-      windowId: varint
+      windowId: ContainerID
       ## https://github.com/extremeheat/extracted_minecraft_data/blob/client1.20.5/client/net/minecraft/world/item/trading/MerchantOffer.java#L210
       trades: []varint
          inputItem1:
@@ -1987,7 +1799,7 @@
       id: i64
    # MC: ClientboundPlaceGhostRecipePacket
    packet_craft_recipe_response:
-      windowId: i8
+      windowId: ContainerID
       recipe: string
    # MC: ClientboundPlayerAbilitiesPacket
    packet_abilities:
@@ -2013,7 +1825,7 @@
       filterTypeMask: filterType ?
          if 2: i64[]varint
          default: void
-      type: ChatTypes
+      type: ChatTypesHolder
       networkName: anonymousNbt
       networkTargetName?: anonymousNbt
    # MC: ClientboundPlayerCombatEndPacket
@@ -2031,308 +1843,37 @@
       players: UUID[]varint
    # MC: ClientboundPlayerInfoUpdatePacket
    packet_player_info:
-      action: i8
+      ## ClientboundPlayerInfoUpdatePacket.java#L160
+      action: ["bitflags", {
+         "type": "u8",
+         "flags": [
+            "add_player",
+            "initialize_chat",
+            "update_game_mode",
+            "update_listed",
+            "update_latency",
+            "update_display_name"
+         ]
+      }]
       data: []varint
          uuid: UUID
-         player: ../action ?
-            if 1: game_profile
-            if 3: game_profile
-            if 5: game_profile
-            if 7: game_profile
-            if 9: game_profile
-            if 11: game_profile
-            if 13: game_profile
-            if 15: game_profile
-            if 17: game_profile
-            if 19: game_profile
-            if 21: game_profile
-            if 23: game_profile
-            if 25: game_profile
-            if 27: game_profile
-            if 29: game_profile
-            if 31: game_profile
-            if 33: game_profile
-            if 35: game_profile
-            if 37: game_profile
-            if 39: game_profile
-            if 41: game_profile
-            if 43: game_profile
-            if 45: game_profile
-            if 47: game_profile
-            if 49: game_profile
-            if 51: game_profile
-            if 53: game_profile
-            if 55: game_profile
-            if 57: game_profile
-            if 59: game_profile
-            if 61: game_profile
-            if 63: game_profile
+         player: ../action/add_player ?
+            if true: game_profile
             default: void
-         chatSession: ../action ?
-            if 2: chat_session
-            if 3: chat_session
-            if 6: chat_session
-            if 7: chat_session
-            if 10: chat_session
-            if 11: chat_session
-            if 14: chat_session
-            if 15: chat_session
-            if 18: chat_session
-            if 19: chat_session
-            if 22: chat_session
-            if 23: chat_session
-            if 26: chat_session
-            if 27: chat_session
-            if 30: chat_session
-            if 31: chat_session
-            if 34: chat_session
-            if 35: chat_session
-            if 38: chat_session
-            if 39: chat_session
-            if 42: chat_session
-            if 43: chat_session
-            if 46: chat_session
-            if 47: chat_session
-            if 50: chat_session
-            if 51: chat_session
-            if 54: chat_session
-            if 55: chat_session
-            if 58: chat_session
-            if 59: chat_session
-            if 62: chat_session
-            if 63: chat_session
+         chatSession: ../action/initialize_chat ?
+            if true: chat_session
             default: void
-         gamemode: ../action ?
-            if 4: varint
-            if 5: varint
-            if 6: varint
-            if 7: varint
-            if 12: varint
-            if 13: varint
-            if 14: varint
-            if 15: varint
-            if 20: varint
-            if 21: varint
-            if 22: varint
-            if 23: varint
-            if 28: varint
-            if 29: varint
-            if 30: varint
-            if 31: varint
-            if 36: varint
-            if 37: varint
-            if 38: varint
-            if 39: varint
-            if 44: varint
-            if 45: varint
-            if 46: varint
-            if 47: varint
-            if 52: varint
-            if 53: varint
-            if 54: varint
-            if 55: varint
-            if 60: varint
-            if 61: varint
-            if 62: varint
-            if 63: varint
+         gamemode: ../action/update_game_mode ?
+            if true: varint
             default: void
-         listed: ../action ?
-            if 8: bool
-            if 9: bool
-            if 10: bool
-            if 11: bool
-            if 12: bool
-            if 13: bool
-            if 14: bool
-            if 15: bool
-            if 24: bool
-            if 25: bool
-            if 26: bool
-            if 27: bool
-            if 28: bool
-            if 29: bool
-            if 30: bool
-            if 31: bool
-            if 40: bool
-            if 41: bool
-            if 42: bool
-            if 43: bool
-            if 44: bool
-            if 45: bool
-            if 46: bool
-            if 47: bool
-            if 56: bool
-            if 57: bool
-            if 58: bool
-            if 59: bool
-            if 60: bool
-            if 61: bool
-            if 62: bool
-            if 63: bool
+         listed: ../action/update_listed ?
+            if true: varint
             default: void
-         latency: ../action ?
-            if 16: varint
-            if 17: varint
-            if 18: varint
-            if 19: varint
-            if 20: varint
-            if 21: varint
-            if 22: varint
-            if 23: varint
-            if 24: varint
-            if 25: varint
-            if 26: varint
-            if 27: varint
-            if 28: varint
-            if 29: varint
-            if 30: varint
-            if 31: varint
-            if 48: varint
-            if 49: varint
-            if 50: varint
-            if 51: varint
-            if 52: varint
-            if 53: varint
-            if 54: varint
-            if 55: varint
-            if 56: varint
-            if 57: varint
-            if 58: varint
-            if 59: varint
-            if 60: varint
-            if 61: varint
-            if 62: varint
-            if 63: varint
+         latency: ../action/update_latency ?
+            if true: varint
             default: void
-         displayName: ../action ?
-            if 32: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 33: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 34: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 35: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 36: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 37: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 38: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 39: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 40: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 41: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 42: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 43: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 44: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 45: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 46: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 47: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 48: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 49: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 50: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 51: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 52: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 53: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 54: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 55: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 56: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 57: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 58: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 59: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 60: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 61: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 62: [
-               "option",
-               "anonymousNbt"
-            ]
-            if 63: [
-               "option",
-               "anonymousNbt"
-            ]
+         displayName: ../action/update_display_name ?
+            if true: ["option", "anonymousNbt"]
             default: void
    # MC: ClientboundPlayerLookAtPacket
    packet_face_player:
@@ -2347,6 +1888,12 @@
       entity_feet_eyes: isEntity ?
          if true: varint
          default: void
+
+   # Relative.java
+   PositionUpdateRelatives: ["bitflags", {
+      "type": "u8",
+      "flags": ["x", "y", "z", "yaw", "pitch"]
+   }]
    # MC: ClientboundPlayerPositionPacket
    packet_position:
       x: f64
@@ -2354,7 +1901,7 @@
       z: f64
       yaw: f32
       pitch: f32
-      flags: i8
+      flags: PositionUpdateRelatives
       teleportId: varint
    # MC: ClientboundRecipePacket
    packet_unlock_recipes:
@@ -2382,16 +1929,6 @@
    packet_reset_score:
       entity_name: string
       objective_name?: string
-   # MC: ClientboundResourcePackPopPacket
-   packet_remove_resource_pack:
-      uuid?: UUID
-   # MC: ClientboundResourcePackPushPacket
-   packet_add_resource_pack:
-      uuid: UUID
-      url: string
-      hash: string
-      forced: bool
-      promptMessage?: anonymousNbt
    # MC: ClientboundRespawnPacket
    packet_respawn:
       worldState: SpawnInfo
@@ -2607,12 +2144,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
@@ -2620,12 +2152,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
@@ -2798,10 +2325,10 @@
             if minecraft:crafting_shaped:
                group: string
                category: varint
-               width: varint
-               height: varint
-               ingredients: []$width
-                  _: ingredient[]$height
+               gridWidth: varint
+               gridHeight: varint
+               ingredients: []$gridWidth
+                  _: ingredient[]$gridHeight
                result: Slot
                showNotification: bool
             if minecraft:crafting_special_armordye: minecraft_simple_recipe_format
@@ -3039,8 +2566,8 @@
          if entity_destroy: packet_entity_destroy
          if remove_entity_effect: packet_remove_entity_effect
          if reset_score: packet_reset_score
-         if remove_resource_pack: packet_remove_resource_pack
-         if add_resource_pack: packet_add_resource_pack
+         if remove_resource_pack: packet_common_remove_resource_pack
+         if add_resource_pack: packet_common_add_resource_pack
          if respawn: packet_respawn
          if entity_head_rotation: packet_entity_head_rotation
          if multi_block_change: packet_multi_block_change
@@ -3159,16 +2686,6 @@
    # MC: ServerboundClientCommandPacket
    packet_client_command:
       actionId: varint
-   # MC: ServerboundClientInformationPacket
-   packet_settings:
-      locale: string
-      viewDistance: i8
-      chatFlags: varint
-      chatColors: bool
-      skinParts: u8
-      mainHand: varint
-      enableTextFiltering: bool
-      enableServerListing: bool
    # MC: ServerboundCommandSuggestionPacket
    packet_tab_complete:
       transactionId: varint
@@ -3178,11 +2695,11 @@
       # Empty
    # MC: ServerboundContainerButtonClickPacket
    packet_enchant_item:
-      windowId: i8
+      windowId: ContainerID
       enchantment: i8
    # MC: ServerboundContainerClickPacket
    packet_window_click:
-      windowId: u8
+      windowId: ContainerID
       stateId: varint
       slot: i16
       mouseButton: i8
@@ -3193,7 +2710,7 @@
       cursorItem: Slot
    # MC: ServerboundContainerClosePacket
    packet_close_window:
-      windowId: u8
+      windowId: ContainerID
    # MC: ServerboundContainerSlotStateChangedPacket
    packet_set_slot_state:
       slot_id: varint
@@ -3285,7 +2802,7 @@
       id: i64
    # MC: ServerboundPlaceRecipePacket
    packet_craft_recipe_request:
-      windowId: i8
+      windowId: ContainerID
       recipe: string
       makeAll: bool
    # MC: ServerboundPlayerAbilitiesPacket
@@ -3485,7 +3002,7 @@
          if chat_session_update: packet_chat_session_update
          if chunk_batch_received: packet_chunk_batch_received
          if client_command: packet_client_command
-         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