minecraft-data 2.110.0 → 2.113.1

package/minecraft-data/data/bedrock/1.18.11/version.json

@@ -0,0 +1,6 @@
+{
+  "version": 486,
+  "minecraftVersion": "1.18.11",
+  "majorVersion": "1.18",
+  "releaseType": "release"
+}

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

@@ -61,5 +61,11 @@
     "minecraftVersion": "1.18.0",
     "majorVersion": "1.18",
     "releaseType": "release"
+  },
+  {
+    "version": 486,
+    "minecraftVersion": "1.18.11",
+    "majorVersion": "1.18",
+    "releaseType": "release"
   }
 ]

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

@@ -1,7 +1,7 @@
 # Created from MiNET and gophertunnel docs
 # The version below is the latest version this protocol schema was updated for.
 # The output protocol.json will be in the folder for the version
-!version: 1.18.0
+!version: 1.18.11
 
 # Some ProtoDef aliases
 string: ["pstring",{"countType":"varint"}]            # String / array types
@@ -428,7 +428,7 @@ packet_add_player:
    user_id: li64
    links: Links
    device_id: string
-   device_os: li32
+   device_os: DeviceOS
 
 packet_add_entity:
    !id: 0x0d
@@ -1019,9 +1019,12 @@ packet_animate:
       3: wake_up
       4: critical_hit
       5: magic_critical_hit
-      6: row_right
-      7: row_left
+      128: row_right
+      129: row_left
    runtime_entity_id: varint64
+   _: action_id ?
+      if row_right or row_left:
+         boat_rowing_time: lf32
 
 packet_respawn:
    !id: 0x2d
@@ -1276,7 +1279,12 @@ packet_level_chunk:
    z: zigzag32
    # SubChunkCount is the amount of sub chunks that are part of the chunk sent. Depending on if the cache
    # is enabled, a list of blob hashes will be sent, or, if disabled, the sub chunk data.
+   # On newer versions, if this is a negative value it indicates to use the Subchunk Polling mechanism
    sub_chunk_count: varint
+   # HighestSubChunk is the highest sub-chunk at the position that is not all air. It is only set if the
+   # RequestMode is set to protocol.SubChunkRequestModeLimited.
+   highest_subchunk_count: sub_chunk_count ?
+      if -2: lu16
    # CacheEnabled specifies if the client blob cache should be enabled. This system is based on hashes of
    # blobs which are consistent and saved by the client in combination with that blob, so that the server
    # does not have to send the same chunk multiple times. If the client does not yet have a blob with the hash sent,
@@ -1510,6 +1518,8 @@ packet_boss_event:
       6: update_properties
       # S2C: Not implemented :( Intended to alter bar appearance, but these currently produce no effect on client-side whatsoever.
       7: texture
+      # C2S: Client asking the server to resend all boss data.
+      8: query
    _: type?
       if show_bar:
          # BossBarTitle is the title shown above the boss bar. It currently does not function, and instead uses
@@ -1531,7 +1541,7 @@ packet_boss_event:
          # subscribed. It currently does not function. It is only set if the EventType is BossEventShow,
          # BossEventAppearanceProperties or BossEventTexture.
          overlay: varint
-      if register_player or unregister_player:
+      if register_player or unregister_player or query:
          # PlayerUniqueID is the unique ID of the player that is registered to or unregistered from the boss
          # fight. It is set if EventType is either BossEventRegisterPlayer or BossEventUnregisterPlayer.
          player_id: zigzag64
@@ -1697,7 +1707,7 @@ packet_command_block_update:
          # times, whereas if set to true, it will activate only if the previous command block executed
          # successfully. The field is only set if Block is set to true.
          conditional: bool
-      default:
+      if false:
          minecart_entity_runtime_id: varint64
    # Command is the command currently entered in the command block. This is the command that is executed
    # when the command block is activated.
@@ -3197,9 +3207,14 @@ packet_sync_entity_property:
 packet_add_volume_entity:
    !id: 0xa6
    !bound: client
-   # The Runtime Entity ID
-   entity_id: varint64
+   # EntityRuntimeID is the runtime ID of the entity. The runtime ID is unique for each world session, and
+   # entities are generally identified in packets using this runtime ID.
+   runtime_id: varint64
+   # EntityMetadata is a map of entity metadata, which includes flags and data properties that alter in
+   # particular the way the entity looks.
    nbt: nbt
+   json_identifier: string
+   instance_name: string
    engine_version: string
 
 # RemoveVolumeEntity indicates a volume entity to be removed from server to client.
@@ -3268,35 +3283,81 @@ packet_photo_info_request:
    !id: 0xad
    photo_id: zigzag64
 
+# SubChunk sends data about multiple sub-chunks around a center point.
 packet_subchunk:
    !id: 0xae
+   cache_enabled: bool
    dimension: zigzag32
+   # Origin point
    x: zigzag32
    y: zigzag32
    z: zigzag32
-   # Data is the actual sub chunk data, such as the blocks.
-   data: ByteArray
-   request_result: zigzag32 =>
-      0: undefined
-      1: success
-      2: chunk_not_found
-      3: invalid_dimension
-      4: player_not_found
-      5: y_index_out_of_bounds
-   heightmap_type: u8 =>
-      0: no_data
-      1: has_data
-      2: too_high
-      3: too_low
-   heightmap: heightmap_type ?
-      if has_data: '["buffer", { "count": 256 }]'
-   cache_enabled: bool
-   blob_id: cache_enabled ?
-      if true: u64
+   entries: []lu32
+      dx: u8
+      dy: u8
+      dz: u8
+      result: u8 =>
+         0: undefined
+         1: success
+         2: chunk_not_found
+         3: invalid_dimension
+         4: player_not_found
+         5: y_index_out_of_bounds
+         6: success_all_air
+      # Payload has the terrain data, if the chunk isn't empty and caching is disabled
+      payload: result ?
+         if success_all_air: void
+         default: ../cache_enabled ?
+            if false: ByteArray
+      heightmap_type: u8 =>
+         0: no_data
+         1: has_data
+         2: too_high
+         3: too_low
+      heightmap: heightmap_type ?
+         if has_data: '["buffer", { "count": 256 }]'
+      blob_id: ../cache_enabled ?
+         if true: lu64
 
 packet_subchunk_request:
    !id: 0xaf
    dimension: zigzag32
-   x: zigzag32
-   y: zigzag32
-   z: zigzag32
+   requests: []lu32
+      x: zigzag32
+      y: zigzag32
+      z: zigzag32
+
+packet_client_start_item_cooldown:
+   !id: 0xb0
+   # ClientStartItemCooldown is sent by the client to the server to initiate a cooldown on an item. The purpose of this
+   # packet isn't entirely clear.
+   category: string
+   # Duration is the duration of ticks the cooldown should last.
+   duration: zigzag32
+
+# ScriptMessage is used to communicate custom messages from the client to the server, or from the server to the client.
+# While the name may suggest this packet is used for the discontinued scripting API, it is likely instead for the
+# GameTest framework.
+packet_script_message:
+   !id: 0xb1
+   # Message ID is the identifier of the message, used by either party to identify the message data sent.
+   message_id: string
+   # Data contains the data of the message.
+   data: string
+
+# CodeBuilderSource is an Education Edition packet sent by the client to the server to run an operation with a
+packet_code_builder_source:
+   !id: 0xb2
+   # Operation is used to distinguish the operation performed. It is always one of the constants listed above.
+   operation: u8 =>
+   - none
+   - get
+   - set
+   - reset
+   # Category is used to distinguish the category of the operation performed. It is always one of the constants
+   category: u8 =>
+   - none
+   - code_status
+   - instantiation
+   # Value contains extra data about the operation performed. It is always empty unless the operation is
+   value: string

package/minecraft-data/data/bedrock/latest/types.yml

@@ -421,7 +421,11 @@ MetadataFlags2: [ "bitflags", {
       "celebrating_special",
       "unknown95",               # 95
       "ram_attack",
-      "playing_dead"
+      "playing_dead",
+      "in_ascendable_block",
+      "over_descendable_block",
+      "croaking",
+      "eat_mob"
    ]
 }]
 
@@ -818,6 +822,10 @@ ItemStackRequest:
          # that are not fully consumed when used for a recipe should not be destroyed there, but instead, should be
          # turned into their respective resulting items. 
          - create
+         # (as of 1.18.10) Not currently used
+         - place_in_container
+         # (as of 1.18.10) Not currently used
+         - take_out_container
          # LabTableCombineStackRequestAction is sent by the client when it uses a lab table to combine item stacks.
          - lab_table_combine
          # BeaconPaymentStackRequestAction is sent by the client when it submits an item to enable effects from a
@@ -993,6 +1001,7 @@ CommandOrigin:
       12: precompiled
       13: game_director_entity_server # ?
       14: script
+      15: executor
 
    # UUID is the UUID of the command called. This UUID is a bit odd as it is not specified by the server. It
    # is not clear what exactly this UUID is meant to identify, but it is unique for each command called.
@@ -1658,6 +1667,16 @@ SoundType: varint =>
    - convert_to_stray
    - extinguish_candle
    - ambient_candle
+   - sculk_catalyst_bloom
+   - sculk_shrieker_shriek
+   - warden_nearby_close
+   - warden_nearby_closer
+   - warden_nearby_closest
+   - warden_slightly_angry
+   - record_otherside
+   - tongue
+   - crack_iron_golem
+   - repair_iron_golem
    - Undefined
 
 # TODO: remove?
@@ -1761,4 +1780,21 @@ LegacyEntityType: li32 =>
    110: drowned
    111: tropicalfish
    112: cod
-   113: panda
+   113: panda
+
+DeviceOS: li32 =>
+- Undefined
+- Android
+- IOS
+- OSX
+- FireOS
+- GearVR
+- Hololens
+- Win10
+- Win32
+- Dedicated
+- TVOS
+- Orbis
+- NintendoSwitch
+- Xbox
+- WindowsPhone

package/minecraft-data/data/dataPaths.json

@@ -1034,6 +1034,7 @@
       "mapIcons": "pc/1.16"
     },
     "1.18": {
+      "attributes": "pc/1.17",
       "blocks": "pc/1.18",
       "blockCollisionShapes": "pc/1.17",
       "biomes": "pc/1.18",
@@ -1057,6 +1058,7 @@
       "mapIcons": "pc/1.16"
     },
     "1.18.1": {
+      "attributes": "pc/1.17",
       "blocks": "pc/1.18",
       "blockCollisionShapes": "pc/1.17",
       "biomes": "pc/1.18",
@@ -1105,13 +1107,16 @@
       "protocol": "bedrock/1.16.201",
       "steve": "bedrock/1.16.201",
       "proto": "bedrock/1.17.0",
-      "types": "bedrock/1.17.0"
+      "types": "bedrock/1.17.0",
+      "windows": "bedrock/1.16.201",
+      "version": "bedrock/1.16.201"
     },
     "1.16.210": {
       "protocol": "bedrock/1.16.210",
       "steve": "bedrock/1.16.201",
       "proto": "bedrock/1.17.0",
-      "types": "bedrock/1.17.0"
+      "types": "bedrock/1.17.0",
+      "version": "bedrock/1.16.210"
     },
     "1.16.220": {
       "blocks": "bedrock/1.16.220",
@@ -1120,7 +1125,8 @@
       "steve": "bedrock/1.16.201",
       "protocol": "bedrock/1.16.220",
       "proto": "bedrock/1.17.0",
-      "types": "bedrock/1.17.0"
+      "types": "bedrock/1.17.0",
+      "version": "bedrock/1.16.220"
     },
     "1.17.0": {
       "blocks": "bedrock/1.17.0",
@@ -1137,7 +1143,8 @@
       "blocksB2J": "bedrock/1.17.0",
       "blocksJ2B": "bedrock/1.17.0",
       "proto": "bedrock/1.17.0",
-      "types": "bedrock/1.17.0"
+      "types": "bedrock/1.17.0",
+      "version": "bedrock/1.17.0"
     },
     "1.17.10": {
       "blocks": "bedrock/1.17.10",
@@ -1156,7 +1163,8 @@
       "blocksB2J": "bedrock/1.17.10",
       "blocksJ2B": "bedrock/1.17.10",
       "proto": "bedrock/1.17.10",
-      "types": "bedrock/1.17.10"
+      "types": "bedrock/1.17.10",
+      "version": "bedrock/1.17.10"
     },
     "1.17.30": {
       "blocks": "bedrock/1.17.10",
@@ -1175,12 +1183,13 @@
       "blocksB2J": "bedrock/1.17.10",
       "blocksJ2B": "bedrock/1.17.10",
       "proto": "bedrock/1.17.30",
-      "types": "bedrock/1.17.30"
+      "types": "bedrock/1.17.30",
+      "version": "bedrock/1.17.30"
     },
     "1.17.40": {
-      "blocks": "bedrock/1.17.10",
-      "blockStates": "bedrock/1.17.10",
-      "blockCollisionShapes": "bedrock/1.17.10",
+      "blocks": "bedrock/1.17.40",
+      "blockStates": "bedrock/1.17.40",
+      "blockCollisionShapes": "bedrock/1.17.40",
       "biomes": "bedrock/1.17.0",
       "items": "bedrock/1.17.10",
       "recipes": "bedrock/1.17.10",
@@ -1194,12 +1203,13 @@
       "blocksB2J": "bedrock/1.17.10",
       "blocksJ2B": "bedrock/1.17.10",
       "proto": "bedrock/1.17.40",
-      "types": "bedrock/1.17.40"
+      "types": "bedrock/1.17.40",
+      "version": "bedrock/1.17.40"
     },
     "1.18.0": {
-      "blocks": "bedrock/1.18.0",
-      "blockStates": "bedrock/1.18.0",
-      "blockCollisionShapes": "bedrock/1.18.0",
+      "blocks": "bedrock/1.17.40",
+      "blockStates": "bedrock/1.17.40",
+      "blockCollisionShapes": "bedrock/1.17.40",
       "biomes": "bedrock/1.18.0",
       "items": "bedrock/1.18.0",
       "recipes": "bedrock/1.18.0",
@@ -1212,8 +1222,29 @@
       "steve": "bedrock/1.16.201",
       "blocksB2J": "bedrock/1.18.0",
       "blocksJ2B": "bedrock/1.18.0",
+      "proto": "bedrock/1.18.0",
+      "types": "bedrock/1.18.0",
+      "version": "bedrock/1.18.0"
+    },
+    "1.18.11": {
+      "blocks": "bedrock/1.17.40",
+      "blockStates": "bedrock/1.17.40",
+      "blockCollisionShapes": "bedrock/1.17.40",
+      "biomes": "bedrock/1.18.0",
+      "items": "bedrock/1.18.0",
+      "recipes": "bedrock/1.18.0",
+      "instruments": "bedrock/1.17.0",
+      "materials": "pc/1.17",
+      "enchantments": "pc/1.17",
+      "effects": "pc/1.17",
+      "protocol": "bedrock/1.18.11",
+      "windows": "bedrock/1.16.201",
+      "steve": "bedrock/1.16.201",
+      "blocksB2J": "bedrock/1.18.0",
+      "blocksJ2B": "bedrock/1.18.0",
       "proto": "bedrock/latest",
-      "types": "bedrock/latest"
+      "types": "bedrock/latest",
+      "version": "bedrock/1.18.11"
     }
   }
 }

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

@@ -1,4 +1,11 @@
 [
+  {
+    "minecraftVersion": "22w05a",
+    "version": 1073741890,
+    "dataVersion": 2967,
+    "usesNetty": true,
+    "majorVersion": "1.18"
+  },
   {
     "minecraftVersion": "22w03a",
     "version": 1073741889,

package/minecraft-data/doc/history.md

@@ -1,3 +1,12 @@
+## 2.113.0
+* bedrock: add 1.18.11 protocol data
+
+## 2.112.0
+* bedrock: version data parity, block state and protocol fixes
+
+## 2.111.0
+* pc: add missing attributes pointer for 1.18
+
 ## 2.110.0
 * pc: add cake outshapes (@nickelpro, @SaubereSache)
 

package/minecraft-data/schemas/version_schema.json

@@ -14,7 +14,11 @@
     "majorVersion": {
       "type": "string",
       "pattern": "[0-9]+\\.[0-9]+[a-z]?"
+    },
+    "releaseType": {
+      "type": "string",
+      "pattern": "[a-z]+"
     }
   },
   "additionalProperties": false
-}
+}

package/minecraft-data/tools/js/test/audit_datapaths.js

@@ -0,0 +1,33 @@
+/* eslint-env mocha */
+
+const fs = require('fs')
+const { join } = require('path')
+const assert = require('assert')
+
+describe('audit dataPaths', function () {
+  const dataPaths = require('../../../data/dataPaths.json')
+  it('should have a dataPath for each file', function () {
+    require('./version_iterator')(function (p, versionString) {
+      const [type, version] = versionString.split(' ')
+      const dp = dataPaths[type][version]
+      const files = fs.readdirSync(p).map(f => f.split('.')[0])
+      for (const file of files) {
+        assert(dp[file], `missing dataPath for ${type} ${version} ${file}`)
+      }
+    })
+  })
+
+  it('dataPath should point to valid files', function () {
+    for (const version in dataPaths) {
+      for (const type in dataPaths[version]) {
+        const dp = dataPaths[version][type]
+        for (const file in dp) {
+          const path = dp[file]
+          const p = join(__dirname, '../../../data/' + path + '/' + file)
+          const exists = fs.existsSync(p + '.json') || fs.existsSync(p + '.yml')
+          assert(exists, `missing file for ${type} ${version} ${file}, path: ${p}`)
+        }
+      }
+    }
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecraft-data",
-  "version": "2.110.0",
+  "version": "2.113.1",
   "description": "Provide easy access to minecraft data in node.js",
   "main": "index.js",
   "tonicExampleFilename": "example.js",

package/test/load.js

@@ -21,3 +21,26 @@ describe('load', () => {
     assert.strictEqual(firstDataVersion.isNewerOrEqualTo('15w31c'), true) // no dataVersion
   })
 })
+
+describe('versions with block data have block state IDs', () => {
+  const mcData = require('minecraft-data')
+  const versions = require('minecraft-data').versions
+  let oks = 0
+  for (const type in versions) {
+    for (const version of versions[type]) {
+      it(type + ' ' + version.minecraftVersion, () => {
+        const data = mcData(type + '_' + version.minecraftVersion)
+        if (data?.blocks) {
+          for (const block of data.blocksArray) {
+            assert.ok(block.defaultState > -1)
+            oks++
+          }
+        }
+      })
+    }
+  }
+  after(() => {
+    console.log(oks, 'OKs')
+    assert(oks > 0)
+  })
+})

package/typings/index-template.d.ts

@@ -60,6 +60,7 @@ export interface IndexedData {
 
     biomes: { [id: number]: Biome; };
     biomesArray: Biome[];
+    biomesByName: { [name: string]: Biome; };
 
     recipes: { [id: number]: Recipe[]; };