minecraft-data 3.95.1 → 3.96.0

package/minecraft-data/data/pc/common/features.json

@@ -895,5 +895,10 @@
     "name": "chatGlobalIndexAndChecksum",
     "description": "chatGlobalIndexAndChecksum",
     "versions": ["1.21.5", "latest"]
+  },
+  {
+    "name": "entityActionUsesStringMapper",
+    "description": "entity_action packet uses string mappings instead of numeric actionId",
+    "versions": ["1.21.6", "latest"]
   }
 ]

package/minecraft-data/data/pc/common/protocolVersions.json

@@ -1,4 +1,12 @@
 [
+  {
+    "minecraftVersion": "25w33a",
+    "version": 1073742086,
+    "dataVersion": 4538,
+    "usesNetty": true,
+    "majorVersion": "1.21",
+    "releaseType": "snapshot"
+  },
   {
     "minecraftVersion": "25w32a",
     "version": 1073742085,

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

@@ -1,4 +1,4 @@
-!version: 1.21.5
+!version: 1.21.6
 !StartDocs: true
 
 ^types:
@@ -164,7 +164,7 @@
       type: SlotComponentType
       ## Ref: client/net/minecraft/core/component/DataComponents.java
       data: type ?
-         ## TODO: look into how nbt works here
+         ## 'Unit' MC type is functionally void
          if custom_data: anonymousNbt
          if max_stack_size: varint
          if max_damage: varint
@@ -173,13 +173,13 @@
          if custom_name: anonymousNbt
          if item_name: anonymousNbt
          if item_model: string
-         if lore: anonOptionalNbt[]varint
+         if lore: anonymousNbt[]varint
          if rarity: varint =>
          - common
          - uncommon
          - rare
          - epic
-         if enchantments:
+         if enchantments or stored_enchantments:
             enchantments: []varint
                id: varint
                level: varint
@@ -206,7 +206,13 @@
                - armor
                - body
                - saddle
-            showTooltip: bool
+            display:
+               type: varint =>
+                  - default
+                  - hidden
+                  - override
+               component: type ?
+                  if override: anonymousNbt
          if custom_model_data:
             floats: f32[]varint
             flags: bool[]varint
@@ -296,17 +302,14 @@
             swappable: bool
             damageable: bool
             equipOnInteract: bool
+            shearable: bool
+            shearingSound: ItemSoundHolder
          if repairable:
             items: IDSet
          if glider: void
          if tooltip_style: string
          if death_protection:
             effects: ItemConsumeEffect[]varint
-         if stored_enchantments:
-            enchantments: []varint
-               # The ID of the enchantment in the enchantment registry.
-               id: varint
-               level: varint
          if dyed_color: i32
          if map_color: i32
          if map_id: varint
@@ -347,7 +350,11 @@
          if entity_data: anonymousNbt
          if bucket_entity_data: anonymousNbt
          if block_entity_data: anonymousNbt
-         if instrument: ["registryEntryHolder", { "baseName": "instrumentId", "otherwise": { "name": "data", "type": "InstrumentData" } }]
+         if instrument:
+            hasHolder: bool
+            data: hasHolder ?
+               if true: ["registryEntryHolder", { "baseName": "instrumentId", "otherwise": { "name": "data", "type": "InstrumentData" } }]
+               if false: string
          if provides_trim_material:
             hasHolder: bool
             material: hasHolder ?
@@ -791,6 +798,7 @@
       7: player
       8: ambient
       9: voice
+      10: ui
    packedChunkPos:
       z: i32
       x: i32
@@ -944,7 +952,12 @@
          [
             {
                "name": "unused",
-               "size": 3,
+               "size": 2,
+               "signed": false
+            },
+            {
+               "name": "allows_restricted",
+               "size": 1,
                "signed": false
             },
             {
@@ -997,6 +1010,7 @@
             - minecraft:item_stack
             - minecraft:item_predicate
             - minecraft:color
+            - minecraft:hex_color # 1.21.6
             - minecraft:component
             - minecraft:style
             - minecraft:message
@@ -1034,6 +1048,7 @@
             - minecraft:loot_table # 1.20.5
             - minecraft:loot_predicate # 1.20.5
             - minecraft:loot_modifier # 1.20.5
+            - minecraft:dialog # 1.21.6
             - minecraft:uuid
             properties: parser ?
                if brigadier:bool: void
@@ -1179,6 +1194,7 @@
                if minecraft:item_stack: void
                if minecraft:item_predicate: void
                if minecraft:color: void
+               if minecraft:hex_color: void
                if minecraft:component: void
                if minecraft:message: void
                if minecraft:nbt: void
@@ -1222,6 +1238,7 @@
                if minecraft:template_mirror: void
                if minecraft:template_rotation: void
                if minecraft:heightmap: void
+               if minecraft:dialog: void
                if minecraft:uuid: void
             suggestionType: ../flags/has_custom_suggestions ?
                if 1: string
@@ -1304,6 +1321,13 @@
          unknownType: hasKnownType ?
             if false: anonymousNbt
          link: string
+   # MC: ClientboundClearDialogPacket
+   packet_common_clear_dialog:
+      # empty
+   # MC: ServerboundCustomClickActionPacket
+   packet_common_custom_click_action:
+      id: string
+      nbt?: anonymousNbt
 
 ^handshaking.toClient.types:
    packet:
@@ -1482,6 +1506,9 @@
          tagType: string
          tags: tags
    ## (Select known packs is common)
+   # MC: ClientboundShowDialogConfigurationPacket
+   packet_show_dialog:
+      dialog: anonymousNbt
    packet:
       name: varint =>
          - cookie_request
@@ -1501,6 +1528,8 @@
          - select_known_packs
          - custom_report_details
          - server_links
+         - clear_dialog
+         - show_dialog
       params: name ?
          if cookie_request: packet_common_cookie_request
          if custom_payload: packet_custom_payload
@@ -1519,6 +1548,8 @@
          if select_known_packs: packet_common_select_known_packs
          if custom_report_details: packet_common_custom_report_details
          if server_links: packet_common_server_links
+         if clear_dialog: packet_common_clear_dialog
+         if show_dialog: packet_show_dialog
 ^configuration.toServer.types:
    ## (Settings is Common) ##
    ## (Cookie Response is Common) ##
@@ -1549,8 +1580,7 @@
          - pong
          - resource_pack_receive
          - select_known_packs
-         - custom_report_details
-         - server_links
+         - custom_click_action
       params: name ?
          if settings: packet_common_settings
          if cookie_response: packet_common_cookie_response
@@ -1560,8 +1590,7 @@
          if pong: packet_pong
          if resource_pack_receive: packet_resource_pack_receive
          if select_known_packs: packet_common_select_known_packs
-         if custom_report_details: packet_common_custom_report_details
-         if server_links: packet_common_server_links
+         if custom_click_action: packet_common_custom_click_action
 ^play.toClient.types:
    SlotDisplay:
       type: varint =>
@@ -1570,7 +1599,7 @@
          - item
          - item_stack
          - tag
-         - smithing_trim #TODO: Old versions have typo
+         - smithing_trim
          - with_remainder
          - composite
       data: type ?
@@ -1714,7 +1743,11 @@
          default: void
    # MC: ClientboundChangeDifficultyPacket
    packet_difficulty:
-      difficulty: u8
+      difficulty: varint =>
+         0: peaceful
+         1: easy
+         2: normal
+         3: hard
       difficultyLocked: bool
    # MC: ClientboundChunkBatchFinishedPacket
    packet_chunk_batch_finished:
@@ -1853,8 +1886,21 @@
       chunkX: i32
    # MC: ClientboundGameEventPacket
    packet_game_state_change:
-      #TODO: Should be a mapper
-      reason: u8
+      reason: u8 =>
+         0: no_respawn_block_available
+         1: start_raining
+         2: stop_raining
+         3: change_game_mode
+         4: win_game
+         5: demo_event
+         6: play_arrow_hit_sound
+         7: rain_level_change
+         8: thunder_level_change
+         9: puffer_fish_sting
+         10: guardian_elder_effect
+         11: immediate_respawn
+         12: limited_crafting
+         13: level_chunks_load_start
       gameMode: f32
    # MC: ClientboundHorseScreenOpenPacket
    packet_open_horse_window:
@@ -1883,7 +1929,13 @@
       x: i32
       z: i32
       heightmaps: []varint
-         type: varint
+         type: varint =>
+            0: world_surface_wg
+            1: world_surface
+            2: ocean_floor_wg
+            3: ocean_floor
+            4: motion_blocking
+            5: motion_blocking_no_leaves
          data: i64[]varint
       chunkData: ByteArray
       blockEntities: chunkBlockEntity[]varint
@@ -2206,15 +2258,14 @@
    packet_recipe_book_remove:
       recipeIds: varint[]varint
    # MC: ClientboundRecipeBookSettingsPacket
+   RecipeBookSetting:
+      open: bool
+      filtering: bool
    packet_recipe_book_settings:
-      craftingGuiOpen: bool
-      craftingFilteringCraftable: bool
-      smeltingGuiOpen: bool
-      smeltingFilteringCraftable: bool
-      blastGuiOpen: bool
-      blastFilteringCraftable: bool
-      smokerGuiOpen: bool
-      smokerFilteringCraftable: bool
+      crafting: RecipeBookSetting
+      furnace: RecipeBookSetting
+      blast: RecipeBookSetting
+      smoker: RecipeBookSetting
    # MC: ClientboundRemoveEntitiesPacket
    packet_entity_destroy:
       entityIds: varint[]varint
@@ -2383,41 +2434,36 @@
       contents: Slot
    # MC: ClientboundSetPlayerTeamPacket
    packet_teams:
-      #TODO: this should be using a switch
       team: string
-      mode: i8
-      name: mode ?
-         if 0: anonymousNbt
-         if 2: anonymousNbt
-         default: void
-      friendlyFire: mode ?
-         if 0: i8
-         if 2: i8
-         default: void
-      nameTagVisibility: mode ?
-         if 0: varint
-         if 2: varint
-         default: void
-      collisionRule: mode ?
-         if 0: varint
-         if 2: varint
-         default: void
-      formatting: mode ?
-         if 0: varint
-         if 2: varint
-         default: void
-      prefix: mode ?
-         if 0: anonymousNbt
-         if 2: anonymousNbt
-         default: void
-      suffix: mode ?
-         if 0: anonymousNbt
-         if 2: anonymousNbt
+      mode: i8 =>
+         - add
+         - remove
+         - change
+         - join
+         - leave
+      _: mode ?
+         if add or change:
+            name: anonymousNbt
+            flags: ["bitflags", { 
+               "type": "u8", 
+               "flags": ["friendly_fire", "see_friendly_invisible"] 
+            }]
+            nameTagVisibility: varint =>
+               - always
+               - never
+               - hide_for_other_teams
+               - hide_for_own_team
+            collisionRule: varint =>
+               - always
+               - never
+               - push_other_teams
+               - push_own_team
+            formatting: varint
+            prefix: anonymousNbt
+            suffix: anonymousNbt
          default: void
       players: mode ?
-         if 0: string[]varint
-         if 3: string[]varint
-         if 4: string[]varint
+         if add or join or leave: string[]varint
          default: void
    # MC: ClientboundSetScorePacket
    packet_scoreboard_score:
@@ -2565,6 +2611,9 @@
             - generic.attack_speed
             - player.block_break_speed
             - player.block_interaction_range
+            - burning_time
+            - camera_distance
+            - explosion_knockback_resistance
             - player.entity_interaction_range
             - generic.fall_damage_multiplier
             - generic.flying_speed
@@ -2580,6 +2629,12 @@
             - generic.scale
             - zombie.spawn_reinforcements
             - generic.step_height
+            - submerged_mining_speed
+            - sweeping_damage_ratio
+            - tempt_range
+            - water_movement_efficiency
+            - waypoint_transmit_range
+            - waypoint_receive_range
          value: f64
          modifiers: []varint
             uuid: string
@@ -2619,7 +2674,37 @@
       id: varint
       accelerationPower: f64
    ## (ClientboundCustomReportDetailsPacket, ClientboundServerLinksPacket is common)
-
+   # MC: ClientboundTrackedWaypointPacket
+   packet_tracked_waypoint:
+      operation: varint =>
+         0: track
+         1: untrack
+         2: update
+      waypoint:
+         hasUUID: bool
+         _: hasUUID ?
+            if true:
+               uuid: UUID
+            if false:
+               id: string
+         icon:
+            style: string
+            color?: i32 # RGB color with alpha fixed at FF
+         type: varint =>
+            0: empty
+            1: vec3i
+            2: chunk
+            3: azimuth
+         data: type ?
+            if vec3i: vec3i
+            if chunk:
+               chunkX: varint
+               chunkZ: varint
+            if azimuth: f32
+   ## (clear_dialog is common)
+   # MC: ClientboundShowDialogGamePacket
+   packet_show_dialog:
+      dialog: ["registryEntryHolder", { "baseName": "dialog", "otherwise": { "name": "data", "type": "anonymousNbt" } }]
    packet:
       name: varint =>
       - bundle_delimiter
@@ -2753,6 +2838,9 @@
       - set_projectile_power
       - custom_report_details
       - server_links
+      - tracked_waypoint
+      - clear_dialog
+      - show_dialog
       params: name ?
          if bundle_delimiter: void
          if spawn_entity: packet_spawn_entity
@@ -2885,6 +2973,9 @@
          if set_projectile_power: packet_set_projectile_power
          if custom_report_details: packet_common_custom_report_details
          if server_links: packet_common_server_links
+         if tracked_waypoint: packet_tracked_waypoint
+         if clear_dialog: packet_common_clear_dialog
+         if show_dialog: packet_show_dialog
 
 ^play.toServer.types:
    # MC: ServerboundAcceptTeleportationPacket
@@ -2900,7 +2991,18 @@
       selectedItemIndex: varint
    # MC: ServerboundChangeDifficultyPacket
    packet_set_difficulty:
-      newDifficulty: u8
+      newDifficulty: varint =>
+         0: peaceful
+         1: easy
+         2: normal
+         3: hard
+   # MC: ServerboundChangeGameModePacket
+   packet_change_gamemode:
+      mode: varint =>
+         0: survival
+         1: creative
+         2: adventure
+         3: spectator
    # MC: ServerboundChatAckPacket
    packet_message_acknowledgement:
       count: varint
@@ -3105,7 +3207,14 @@
    # MC: ServerboundPlayerCommandPacket
    packet_entity_action:
       entityId: varint
-      actionId: varint
+      actionId: varint =>
+         - leave_bed
+         - start_sprinting
+         - stop_sprinting
+         - start_horse_jump
+         - stop_horse_jump
+         - open_vehicle_inventory
+         - start_elytra_flying
       jumpBoost: varint
    # MC: ServerboundPlayerInputPacket
    # previously: packet_steer_vehicle
@@ -3194,6 +3303,7 @@
       metadata: string
       integrity: f32
       seed: varint
+      # New `strict` flag
       flags: u8 =>
          - ignore_entities
          - show_air
@@ -3252,6 +3362,7 @@
       - query_block_nbt
       - select_bundle_item
       - set_difficulty
+      - change_gamemode
       - message_acknowledgement
       - chat_command
       - chat_command_signed
@@ -3309,15 +3420,17 @@
       - set_test_block
       - update_sign
       - arm_animation
-      - test_instance_block_action
       - spectate
+      - test_instance_block_action
       - block_place
       - use_item
+      - custom_click_action
       params: name ?
          if teleport_confirm: packet_teleport_confirm
          if query_block_nbt: packet_query_block_nbt
          if select_bundle_item: packet_select_bundle_item
          if set_difficulty: packet_set_difficulty
+         if change_gamemode: packet_change_gamemode
          if message_acknowledgement: packet_message_acknowledgement
          if chat_command: packet_chat_command
          if chat_command_signed: packet_chat_command_signed
@@ -3335,6 +3448,7 @@
          if set_slot_state: packet_set_slot_state
          if cookie_response: packet_common_cookie_response
          if custom_payload: packet_custom_payload
+         if debug_sample_subscription: packet_debug_sample_subscription
          if edit_book: packet_edit_book
          if query_entity_nbt: packet_query_entity_nbt
          if use_entity: packet_use_entity
@@ -3373,7 +3487,8 @@
          if set_test_block: packet_set_test_block
          if update_sign: packet_update_sign
          if arm_animation: packet_arm_animation
-         if test_instance_block_action: packet_test_instance_block_action
          if spectate: packet_spectate
+         if test_instance_block_action: packet_test_instance_block_action
          if block_place: packet_block_place
          if use_item: packet_use_item
+         if custom_click_action: packet_common_custom_click_action

package/minecraft-data/doc/history.md

@@ -1,3 +1,10 @@
+## 3.96.0
+* [Update proto.yml for Minecraft 1.21.6 (#1039)](https://github.com/PrismarineJS/minecraft-data/commit/09821c14cc7ced37ac2e2554bc6bc0f84c4390c7) (thanks @rom1504)
+* [Enforce no additional properties for enchantments (#1053)](https://github.com/PrismarineJS/minecraft-data/commit/c7509e277a28753663e5f48433f146eb17773f0d) (thanks @ItsDrike)
+* [Add 25w33a to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/a30c6c4732864d4c30b14e73f7732ce0f15406a3) (thanks @github-actions[bot])
+* [Fix biomes schema validation issues (#1049)](https://github.com/PrismarineJS/minecraft-data/commit/31e0a3f2e7df3ae932fa39159028e52be402937b) (thanks @ItsDrike)
+* [Make items schema strict and document missing fields (#1052)](https://github.com/PrismarineJS/minecraft-data/commit/db4139e7812e998220178d010cda73053e40f75c) (thanks @ItsDrike)
+
 ## 3.95.1
 * [Fix features schema inconsistencies and validation issues (#1047)](https://github.com/PrismarineJS/minecraft-data/commit/c949824c7a34c0f8a5ed2b3d0d3240a964eeadd5) (thanks @rom1504)
 * [Fix bedrock 1.21.100 packet_correct_player_move_prediction (#1044)](https://github.com/PrismarineJS/minecraft-data/commit/b6a81e62cf37e0eb9fdfb3477782219ff6b85adb) (thanks @TSL534)

package/minecraft-data/schemas/biomes_schema.json

@@ -2,9 +2,10 @@
   "title": "biomes",
   "type": "array",
   "uniqueItems": true,
-  "items" : {
+  "items": {
     "title": "biome",
     "type": "object",
+    "additionalProperties": false,
     "properties": {
       "id": {
         "description": "The unique identifier for a biome",
@@ -27,14 +28,15 @@
       },
       "precipitation": {
         "description": "The type of precipitation: none, rain or snow [before 1.19.4]",
-        "type": "string"
+        "type": "string",
+        "enum": ["none", "rain", "snow"]
       },
       "has_precipitation": {
         "description": "True if a biome has any precipitation (rain or snow) [1.19.4+]",
         "type": "boolean"
       },
       "dimension": {
-        "description": "The dimension of a biome: overworld, nether or end",
+        "description": "The dimension of a biome: overworld, nether, end, or the_end (bedrock)",
         "type": "string"
       },
       "displayName": {
@@ -52,6 +54,61 @@
         "type": "number",
         "minimum": 0,
         "maximum": 1
+      },
+      "depth": {
+        "description": "The depth/height variation of the biome terrain",
+        "type": "number"
+      },
+      "climates": {
+        "description": "Climate data for the biome",
+        "type": "array",
+        "minItems": 1,
+        "items": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "temperature": {
+              "description": "Climate temperature value",
+              "type": "number"
+            },
+            "humidity": {
+              "description": "Climate humidity value",
+              "type": "number"
+            },
+            "altitude": {
+              "description": "Climate altitude value",
+              "type": "number"
+            },
+            "weirdness": {
+              "description": "Climate weirdness value",
+              "type": "number"
+            },
+            "offset": {
+              "description": "Climate offset value",
+              "type": "number"
+            }
+          },
+          "required": [
+            "temperature",
+            "humidity",
+            "altitude",
+            "weirdness",
+            "offset"
+          ]
+        }
+      },
+      "name_legacy": {
+        "description": "Legacy name of the biome used in older versions",
+        "type": "string"
+      },
+      "parent": {
+        "description": "Parent biome name for variant biomes",
+        "type": "string"
+      },
+      "child": {
+        "description": "Child biome ID for variant biomes",
+        "type": "integer",
+        "minimum": 0
       }
     },
     "required": [

package/minecraft-data/schemas/enchantments_schema.json

@@ -2,7 +2,7 @@
   "title": "enchantments",
   "type": "array",
   "uniqueItems": true,
-  "items" : {
+  "items": {
     "title": "enchantment",
     "type": "object",
     "properties": {
@@ -99,6 +99,7 @@
       "curse",
       "tradeable",
       "discoverable"
-    ]
+    ],
+    "additionalProperties": false
   }
 }