minecraft-data 2.113.0 → 2.113.3

package/doc/history.md

@@ -1,3 +1,15 @@
+## 2.113.3
+* update mcdata
+
+## 2.113.2
+* update mcdata
+
+## 2.113.1
+* update mcdata
+
+## 2.113.1
+* Add block state IDs to all versions with block data
+
 ## 2.113.0
 * update mcdata
 

package/lib/indexes.js

@@ -1,6 +1,16 @@
 const indexer = require('./indexer.js')
 
 module.exports = function (mcData) {
+  if (mcData.blocks?.length) {
+    if (!('minStateId' in mcData.blocks[0]) || !('defaultState' in mcData.blocks[0])) {
+      for (const block of mcData.blocks) {
+        block.minStateId = block.id << 4
+        block.maxStateId = block.minStateId + 15
+        block.defaultState = block.minStateId
+      }
+    }
+  }
+
   return {
     biomesById: indexer.buildIndexFromArray(mcData.biomes, 'id'),
     biomesByName: indexer.buildIndexFromArray(mcData.biomes, 'name'),

package/minecraft-data/README.md

@@ -23,6 +23,7 @@ Minecraft-data is language independent, you can use it with these language speci
 | [McData](https://github.com/McEx/McData) | Elixir | protocol |
 | [ProtocolGen](https://github.com/Johni0702/ProtocolGen) | java | generated java files from protocol.json to read and write minecraft packets |
 | [mcdata](https://github.com/wlwanpan/mcdata) | Go | everything |
+| [minecraft-data-rs](https://github.com/Trivernis/minecraft-data-rs) | Rust | everything |
 
 If you want to use minecraft-data in a new language, we advise you to [create a new wrapper](doc/make-a-new-wrapper.md)
 

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

@@ -9238,6 +9238,175 @@
         }
       ]
     ],
+    "SubChunkEntryWithoutCaching": [
+      "array",
+      {
+        "countType": "lu32",
+        "type": [
+          "container",
+          [
+            {
+              "name": "dx",
+              "type": "u8"
+            },
+            {
+              "name": "dy",
+              "type": "u8"
+            },
+            {
+              "name": "dz",
+              "type": "u8"
+            },
+            {
+              "name": "result",
+              "type": [
+                "mapper",
+                {
+                  "type": "u8",
+                  "mappings": {
+                    "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"
+                  }
+                }
+              ]
+            },
+            {
+              "name": "payload",
+              "type": "ByteArray"
+            },
+            {
+              "name": "heightmap_type",
+              "type": [
+                "mapper",
+                {
+                  "type": "u8",
+                  "mappings": {
+                    "0": "no_data",
+                    "1": "has_data",
+                    "2": "too_high",
+                    "3": "too_low"
+                  }
+                }
+              ]
+            },
+            {
+              "name": "heightmap",
+              "type": [
+                "switch",
+                {
+                  "compareTo": "heightmap_type",
+                  "fields": {
+                    "has_data": [
+                      "buffer",
+                      {
+                        "count": 256
+                      }
+                    ]
+                  },
+                  "default": "void"
+                }
+              ]
+            }
+          ]
+        ]
+      }
+    ],
+    "SubChunkEntryWithCaching": [
+      "array",
+      {
+        "countType": "lu32",
+        "type": [
+          "container",
+          [
+            {
+              "name": "dx",
+              "type": "u8"
+            },
+            {
+              "name": "dy",
+              "type": "u8"
+            },
+            {
+              "name": "dz",
+              "type": "u8"
+            },
+            {
+              "name": "result",
+              "type": [
+                "mapper",
+                {
+                  "type": "u8",
+                  "mappings": {
+                    "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"
+                  }
+                }
+              ]
+            },
+            {
+              "name": "payload",
+              "type": [
+                "switch",
+                {
+                  "compareTo": "result",
+                  "fields": {
+                    "success_all_air": "void"
+                  },
+                  "default": "ByteArray"
+                }
+              ]
+            },
+            {
+              "name": "heightmap_type",
+              "type": [
+                "mapper",
+                {
+                  "type": "u8",
+                  "mappings": {
+                    "0": "no_data",
+                    "1": "has_data",
+                    "2": "too_high",
+                    "3": "too_low"
+                  }
+                }
+              ]
+            },
+            {
+              "name": "heightmap",
+              "type": [
+                "switch",
+                {
+                  "compareTo": "heightmap_type",
+                  "fields": {
+                    "has_data": [
+                      "buffer",
+                      {
+                        "count": 256
+                      }
+                    ]
+                  },
+                  "default": "void"
+                }
+              ]
+            },
+            {
+              "name": "blob_id",
+              "type": "lu64"
+            }
+          ]
+        ]
+      }
+    ],
     "packet_subchunk": [
       "container",
       [
@@ -9250,126 +9419,20 @@
           "type": "zigzag32"
         },
         {
-          "name": "x",
-          "type": "zigzag32"
-        },
-        {
-          "name": "y",
-          "type": "zigzag32"
-        },
-        {
-          "name": "z",
-          "type": "zigzag32"
+          "name": "origin",
+          "type": "vec3i"
         },
         {
           "name": "entries",
           "type": [
-            "array",
+            "switch",
             {
-              "countType": "lu32",
-              "type": [
-                "container",
-                [
-                  {
-                    "name": "dx",
-                    "type": "u8"
-                  },
-                  {
-                    "name": "dy",
-                    "type": "u8"
-                  },
-                  {
-                    "name": "dz",
-                    "type": "u8"
-                  },
-                  {
-                    "name": "result",
-                    "type": [
-                      "mapper",
-                      {
-                        "type": "u8",
-                        "mappings": {
-                          "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"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "name": "payload",
-                    "type": [
-                      "switch",
-                      {
-                        "compareTo": "result",
-                        "fields": {
-                          "success_all_air": "void"
-                        },
-                        "default": [
-                          "switch",
-                          {
-                            "compareTo": "../cache_enabled",
-                            "fields": {
-                              "false": "ByteArray"
-                            },
-                            "default": "void"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "name": "heightmap_type",
-                    "type": [
-                      "mapper",
-                      {
-                        "type": "u8",
-                        "mappings": {
-                          "0": "no_data",
-                          "1": "has_data",
-                          "2": "too_high",
-                          "3": "too_low"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "name": "heightmap",
-                    "type": [
-                      "switch",
-                      {
-                        "compareTo": "heightmap_type",
-                        "fields": {
-                          "has_data": [
-                            "buffer",
-                            {
-                              "count": 256
-                            }
-                          ]
-                        },
-                        "default": "void"
-                      }
-                    ]
-                  },
-                  {
-                    "name": "blob_id",
-                    "type": [
-                      "switch",
-                      {
-                        "compareTo": "../cache_enabled",
-                        "fields": {
-                          "true": "lu64"
-                        },
-                        "default": "void"
-                      }
-                    ]
-                  }
-                ]
-              ]
+              "compareTo": "cache_enabled",
+              "fields": {
+                "true": "SubChunkEntryWithCaching",
+                "false": "SubChunkEntryWithoutCaching"
+              },
+              "default": "void"
             }
           ]
         }
@@ -9382,6 +9445,10 @@
           "name": "dimension",
           "type": "zigzag32"
         },
+        {
+          "name": "origin",
+          "type": "vec3i"
+        },
         {
           "name": "requests",
           "type": [
@@ -9392,16 +9459,16 @@
                 "container",
                 [
                   {
-                    "name": "x",
-                    "type": "zigzag32"
+                    "name": "dx",
+                    "type": "u8"
                   },
                   {
-                    "name": "y",
-                    "type": "zigzag32"
+                    "name": "dy",
+                    "type": "u8"
                   },
                   {
-                    "name": "z",
-                    "type": "zigzag32"
+                    "name": "dz",
+                    "type": "u8"
                   }
                 ]
               ]

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

@@ -3283,49 +3283,73 @@ packet_photo_info_request:
    !id: 0xad
    photo_id: zigzag64
 
+SubChunkEntryWithoutCaching: []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: 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 }]'
+
+SubChunkEntryWithCaching: []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: 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: lu64
+
 # 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
-   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
+   origin: vec3i
+   entries: cache_enabled ?
+      if true: SubChunkEntryWithCaching
+      if false: SubChunkEntryWithoutCaching
 
 packet_subchunk_request:
    !id: 0xaf
    dimension: zigzag32
+   # Origin point
+   origin: vec3i
    requests: []lu32
-      x: zigzag32
-      y: zigzag32
-      z: zigzag32
+      dx: u8
+      dy: u8
+      dz: u8
 
 packet_client_start_item_cooldown:
    !id: 0xb0

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

@@ -1,4 +1,46 @@
 [
+  {
+    "minecraftVersion": "1.18.2-rc1",
+    "version": 1073741897,
+    "dataVersion": 2974,
+    "usesNetty": true,
+    "majorVersion": "1.18"
+  },
+  {
+    "minecraftVersion": "1.18.2-pre3",
+    "version": 1073741896,
+    "dataVersion": 2973,
+    "usesNetty": true,
+    "majorVersion": "1.18"
+  },
+  {
+    "minecraftVersion": "1.18.2-pre2",
+    "version": 1073741895,
+    "dataVersion": 2972,
+    "usesNetty": true,
+    "majorVersion": "1.18"
+  },
+  {
+    "minecraftVersion": "1.18.2-pre1",
+    "version": 1073741894,
+    "dataVersion": 2971,
+    "usesNetty": true,
+    "majorVersion": "1.18"
+  },
+  {
+    "minecraftVersion": "22w07a",
+    "version": 1073741892,
+    "dataVersion": 2969,
+    "usesNetty": true,
+    "majorVersion": "1.18"
+  },
+  {
+    "minecraftVersion": "22w06a",
+    "version": 1073741891,
+    "dataVersion": 2968,
+    "usesNetty": true,
+    "majorVersion": "1.18"
+  },
   {
     "minecraftVersion": "22w05a",
     "version": 1073741890,

package/minecraft-data/doc/history.md

@@ -1,3 +1,12 @@
+## 2.113.3
+* bedrock: correction to protocol data for subchunk packets without caching for 1.18.11
+
+## 2.113.2
+* new release because 2.113.1 of nmd already exists
+
+## 2.113.1
+* bedrock: Corrections to protocol data for subchunk packets for 1.18.11
+
 ## 2.113.0
 * bedrock: add 1.18.11 protocol data
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecraft-data",
-  "version": "2.113.0",
+  "version": "2.113.3",
   "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)
+  })
+})