minecraft-data 3.8.0 → 3.9.0

package/minecraft-data/data/dataPaths.json

@@ -1325,13 +1325,13 @@
       "version": "bedrock/1.18.30"
     },
     "1.19.1": {
-      "blocks": "bedrock/1.18.30",
-      "blockStates": "bedrock/1.18.30",
-      "blockCollisionShapes": "bedrock/1.18.30",
-      "biomes": "bedrock/1.18.0",
-      "entities": "bedrock/1.18.11",
-      "items": "bedrock/1.18.30",
-      "recipes": "bedrock/1.18.30",
+      "blocks": "bedrock/1.19.1",
+      "blockStates": "bedrock/1.19.1",
+      "blockCollisionShapes": "bedrock/1.19.1",
+      "biomes": "bedrock/1.19.1",
+      "entities": "bedrock/1.19.1",
+      "items": "bedrock/1.19.1",
+      "recipes": "bedrock/1.19.1",
       "instruments": "bedrock/1.17.0",
       "materials": "pc/1.17",
       "enchantments": "pc/1.17",
@@ -1339,20 +1339,20 @@
       "protocol": "bedrock/1.19.1",
       "windows": "bedrock/1.16.201",
       "steve": "bedrock/1.16.201",
-      "blocksB2J": "bedrock/1.18.30",
-      "blocksJ2B": "bedrock/1.18.30",
+      "blocksB2J": "bedrock/1.19.1",
+      "blocksJ2B": "bedrock/1.19.1",
       "proto": "bedrock/1.19.1",
       "types": "bedrock/1.19.1",
       "version": "bedrock/1.19.1"
     },
     "1.19.10": {
-      "blocks": "bedrock/1.18.30",
-      "blockStates": "bedrock/1.18.30",
-      "blockCollisionShapes": "bedrock/1.18.30",
-      "biomes": "bedrock/1.18.0",
-      "entities": "bedrock/1.18.11",
-      "items": "bedrock/1.18.30",
-      "recipes": "bedrock/1.18.30",
+      "blocks": "bedrock/1.19.1",
+      "blockStates": "bedrock/1.19.1",
+      "blockCollisionShapes": "bedrock/1.19.1",
+      "biomes": "bedrock/1.19.1",
+      "entities": "bedrock/1.19.1",
+      "items": "bedrock/1.19.10",
+      "recipes": "bedrock/1.19.10",
       "instruments": "bedrock/1.17.0",
       "materials": "pc/1.17",
       "enchantments": "pc/1.17",
@@ -1360,8 +1360,8 @@
       "protocol": "bedrock/1.19.10",
       "windows": "bedrock/1.16.201",
       "steve": "bedrock/1.16.201",
-      "blocksB2J": "bedrock/1.18.30",
-      "blocksJ2B": "bedrock/1.18.30",
+      "blocksB2J": "bedrock/1.19.1",
+      "blocksJ2B": "bedrock/1.19.1",
       "proto": "bedrock/latest",
       "types": "bedrock/latest",
       "version": "bedrock/1.19.10"

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

@@ -1,4 +1,11 @@
 [
+  {
+    "minecraftVersion": "1.19.1-rc2",
+    "version": 1073741924,
+    "dataVersion": 3115,
+    "usesNetty": true,
+    "majorVersion": "1.19"
+  },
   {
     "minecraftVersion": "1.19.1-pre6",
     "version": 1073741923,

package/minecraft-data/doc/history.md

@@ -1,3 +1,8 @@
+## 3.9.0
+* bedrock: Add bedrock 1.19 data (#600)
+* bedrock: protocol corrections
+* pc: Add 1.19.1-rc2 to protocol versions
+
 ## 3.8.0
 
 * [1.19] update features and add some @rob9315

package/minecraft-data/tools/js/compileProtocol.js

@@ -52,20 +52,45 @@ function convert (ver, path) {
   return version
 }
 
+function validate (ver, path) {
+  process.chdir(path || join(__dirname, '../../data/bedrock/' + ver))
+  console.log(process.cwd())
+  const version = genProtoSchema()
+
+  const expected = JSON.stringify({ types: getJSON('./proto.json') })
+  // If you crash here, no protocol.json was generated - run `npm run build`
+  const actual = JSON.stringify(getJSON(`../${version}/protocol.json`))
+
+  fs.unlinkSync('./proto.json') // remove temp file
+  fs.unlinkSync('./packet_map.yml') // remove temp file
+
+  // Make sure the protocol_expected.json file equals the protocol.json file; otherwise the JSON must be rebuilt
+  if (expected !== actual) {
+    throw Error(`${ver} (${version}) / protocol.json is desynced from yaml, please run 'npm run build'`)
+  }
+
+  console.log('ok', `../${version}/protocol.json`)
+  return version
+}
+
+function all (fn) {
+  const versions = require('../../data/dataPaths.json').bedrock
+  for (const versionId in versions) {
+    console.log('⏳', fn.name, 'protocol for bedrock', versionId)
+    const ver = versions[versionId]
+    if (ver.proto) {
+      fn(ver.proto.includes('latest') ? 'latest' : versionId)
+    }
+  }
+}
+
 // If no argument, build everything
 if (!module.parent) {
   if (!process.argv[2]) {
-    const versions = require('../../data/dataPaths.json').bedrock
-    for (const versionId in versions) {
-      console.log('Compiling bedrock protocol', versionId)
-      const ver = versions[versionId]
-      if (ver.proto) {
-        convert(ver.proto.includes('latest') ? 'latest' : versionId)
-      }
-    }
+    all(convert)
   } else { // build the specified version
     convert(process.argv[2])
   }
 }
 
-module.exports = { convert }
+module.exports = { convert, validate, all }

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

@@ -0,0 +1,8 @@
+/* eslint-env mocha */
+const protocolTools = require('../compileProtocol')
+
+describe('protocol yaml', () => {
+  it('should be valid and in sync with json', () => {
+    protocolTools.all(protocolTools.validate)
+  })
+})

package/package.json

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