minecraft-data 2.93.0 → 2.96.0

package/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [14.x]
 
     steps:
     - uses: actions/checkout@v2

package/data.js

@@ -1012,11 +1012,13 @@ module.exports =
     },
     '1.16.201': {
       get protocol () { return require("./minecraft-data/data/bedrock/1.16.201/protocol.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.16.201/steve.json") },
       proto: __dirname + '/minecraft-data/data/bedrock/1.17.0/proto.yml',
       types: __dirname + '/minecraft-data/data/bedrock/1.17.0/types.yml'
     },
     '1.16.210': {
       get protocol () { return require("./minecraft-data/data/bedrock/1.16.210/protocol.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.16.201/steve.json") },
       proto: __dirname + '/minecraft-data/data/bedrock/1.17.0/proto.yml',
       types: __dirname + '/minecraft-data/data/bedrock/1.17.0/types.yml'
     },
@@ -1059,6 +1061,44 @@ module.exports =
       get steve () { return require("./minecraft-data/data/bedrock/1.16.201/steve.json") },
       get blocksB2J () { return require("./minecraft-data/data/bedrock/1.17.10/blocksB2J.json") },
       get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.17.10/blocksJ2B.json") },
+      proto: __dirname + '/minecraft-data/data/bedrock/1.17.10/proto.yml',
+      types: __dirname + '/minecraft-data/data/bedrock/1.17.10/types.yml'
+    },
+    '1.17.30': {
+      get blocks () { return require("./minecraft-data/data/bedrock/1.17.10/blocks.json") },
+      get blockStates () { return require("./minecraft-data/data/bedrock/1.17.10/blockStates.json") },
+      get blockCollisionShapes () { return require("./minecraft-data/data/bedrock/1.17.10/blockCollisionShapes.json") },
+      get biomes () { return require("./minecraft-data/data/bedrock/1.17.0/biomes.json") },
+      get items () { return require("./minecraft-data/data/bedrock/1.17.10/items.json") },
+      get recipes () { return require("./minecraft-data/data/bedrock/1.17.10/recipes.json") },
+      get instruments () { return require("./minecraft-data/data/bedrock/1.17.0/instruments.json") },
+      get materials () { return require("./minecraft-data/data/pc/1.17/materials.json") },
+      get enchantments () { return require("./minecraft-data/data/pc/1.17/enchantments.json") },
+      get effects () { return require("./minecraft-data/data/pc/1.17/effects.json") },
+      get protocol () { return require("./minecraft-data/data/bedrock/1.17.30/protocol.json") },
+      get windows () { return require("./minecraft-data/data/bedrock/1.16.201/windows.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.16.201/steve.json") },
+      get blocksB2J () { return require("./minecraft-data/data/bedrock/1.17.10/blocksB2J.json") },
+      get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.17.10/blocksJ2B.json") },
+      proto: __dirname + '/minecraft-data/data/bedrock/1.17.30/proto.yml',
+      types: __dirname + '/minecraft-data/data/bedrock/1.17.30/types.yml'
+    },
+    '1.17.40': {
+      get blocks () { return require("./minecraft-data/data/bedrock/1.17.10/blocks.json") },
+      get blockStates () { return require("./minecraft-data/data/bedrock/1.17.10/blockStates.json") },
+      get blockCollisionShapes () { return require("./minecraft-data/data/bedrock/1.17.10/blockCollisionShapes.json") },
+      get biomes () { return require("./minecraft-data/data/bedrock/1.17.0/biomes.json") },
+      get items () { return require("./minecraft-data/data/bedrock/1.17.10/items.json") },
+      get recipes () { return require("./minecraft-data/data/bedrock/1.17.10/recipes.json") },
+      get instruments () { return require("./minecraft-data/data/bedrock/1.17.0/instruments.json") },
+      get materials () { return require("./minecraft-data/data/pc/1.17/materials.json") },
+      get enchantments () { return require("./minecraft-data/data/pc/1.17/enchantments.json") },
+      get effects () { return require("./minecraft-data/data/pc/1.17/effects.json") },
+      get protocol () { return require("./minecraft-data/data/bedrock/1.17.40/protocol.json") },
+      get windows () { return require("./minecraft-data/data/bedrock/1.16.201/windows.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.16.201/steve.json") },
+      get blocksB2J () { return require("./minecraft-data/data/bedrock/1.17.10/blocksB2J.json") },
+      get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.17.10/blocksJ2B.json") },
       proto: __dirname + '/minecraft-data/data/bedrock/latest/proto.yml',
       types: __dirname + '/minecraft-data/data/bedrock/latest/types.yml'
     }

package/doc/api.md

@@ -122,6 +122,10 @@ enchantments indexed by name
 
 unindexed enchantments
 
+### minecraft-data.defaultSkin
+
+(bedrock edition) Skin geometry and texture data for default player skin
+
 ## Protocol
 
 ### minecraft-data.protocol
@@ -168,10 +172,36 @@ the version number (example : 47)
 
 the minecraft number (example : 1.8.3)
 
+### minecraft-data.version.type
+
+the version type, currently 'pc' or 'bedrock'
+
 ### minecraft-data.version.majorVersion
 
 the major version (example : 1.8), also the name of the minecraft-data version
 
+### minecraft-data.version.< (other)
+Returns true if the current version is less than than the `other` version's dataVersion
+
+### minecraft-data.version.> (other)
+Returns true if the current version is greater than the `other` version's dataVersion
+
+### minecraft-data.version.== (other)
+Returns true if the current version is equal to the `other` version's dataVersion
+
+### minecraft-data.version.>=, minecraft-data.version.<=
+
+Same as above but also allows equal dataVersion. The other version must be of the same type, the prefix is always implied.
+
+Example Usage: 
+```js
+const mcd = require('minecraft-data')('1.16.4')
+console.log('1.16.4 >= 1.17 ?', mcd.version['>=']('1.17')) // False
+
+const mcd = require('minecraft-data')('bedrock_1.17.0')
+console.log('1.17.0 > 1.16.220 ?', mcd.version['>']('1.16.220')) // True
+```
+
 ## Effects
 
 ### minecraft-data.effects

package/doc/history.md

@@ -1,3 +1,15 @@
+## 2.96.0
+* update mcdata
+
+## 2.95.0
+* update mcdata
+
+## 2.94.0
+* update mcdata
+
+## 2.93.1
+* Update bedrock item and version handling (@extremeheat)
+
 ## 2.93.0
 * update mcdata
 

package/index.d.ts

@@ -799,7 +799,21 @@ declare namespace MinecraftData {
       id: number;
     }[];
   }
-    
+    // This will interface will merge with the generated one
+  export interface Version {
+      // Returns true if the current version is greater than or equal to the `other` version's dataVersion
+      ['>='](other)
+      // Returns true if the current version is greater than the `other` version's dataVersion
+      ['>'](other)
+      // Returns true if the current version is less than the `other` version's dataVersion
+      ['<'](other)
+      // Returns true if the current version is less than than or equal to the `other` version's dataVersion
+      ['<='](other)
+      // Returns true if the current version is equal to the `other` version's dataVersion
+      ['=='](other)
+      type: 'pc' | 'bedrock'
+  }
+  
   export interface VersionSet {
       pc: { [version: string]: Version };
       bedrock: { [version: string]: Version };

package/index.js

@@ -13,7 +13,8 @@ const types = ['pc', 'bedrock']
 types.forEach(function (type) {
   for (let i = 0; i < protocolVersions[type].length; i++) {
     if (!protocolVersions[type][i].dataVersion) {
-      protocolVersions[type][i].dataVersion = -i
+      // We start top to bottom, so the ones at the bottom should be greater
+      protocolVersions[type][i].dataVersion = -protocolVersions[type].length + i
     }
   }
   versionsByMinecraftVersion[type] = indexer.buildIndexFromArray(protocolVersions[type], 'minecraftVersion')
@@ -22,10 +23,32 @@ types.forEach(function (type) {
   postNettyVersionsByProtocolVersion[type] = indexer.buildIndexFromArrayNonUnique(protocolVersions[type].filter(function (e) { return e.usesNetty }), 'version')
 })
 
+function Version (type, version, majorVersion) {
+  const versions = versionsByMinecraftVersion[type]
+  // Allows comparisons against majorVersion even if `other` is not present in the versions.json (e.g. 1.17.0 exists but not 1.17)
+  for (const version in versions) {
+    const ver = versions[version]
+    versions[ver.majorVersion] = versions[ver.majorVersion] || ver
+  }
+  // TODO: Data for Minecraft classic is missing in protocolVersions.json, move this to its own type ?
+  const v1 = versions[version]?.dataVersion ?? 0
+  const raise = other => { throw new RangeError(`Version '${other}' not found in [${Object.keys(versions).join(' ; ')}] for ${type}`) }
+  this['>='] = other => versions[other] ? v1 >= versions[other].dataVersion : raise(other)
+  this['>'] = other => versions[other] ? v1 > versions[other].dataVersion : raise(other)
+  this['<'] = other => versions[other] ? v1 < versions[other].dataVersion : raise(other)
+  this['<='] = other => versions[other] ? v1 <= versions[other].dataVersion : raise(other)
+  this['=='] = other => versions[other] ? v1 === versions[other].dataVersion : raise(other)
+  this.type = type
+  this.majorVersion = majorVersion
+  return this
+}
+
 const cache = {} // prevent reindexing when requiring multiple time the same version
 
 module.exports = function (mcVersion, preNetty) {
   preNetty = preNetty || false
+  mcVersion = String(mcVersion).replace('pe_', 'bedrock_')
+
   const majorVersion = toMajor(mcVersion, preNetty)
   if (majorVersion == null) { return null }
   if (cache[majorVersion.type + '_' + majorVersion.majorVersion]) { return cache[majorVersion.type + '_' + majorVersion.majorVersion] }
@@ -33,20 +56,16 @@ module.exports = function (mcVersion, preNetty) {
   if (mcData == null) { return null }
   const nmcData = mcDataToNode(mcData)
   nmcData.type = majorVersion.type
-  nmcData.isNewerOrEqualTo = function (version) {
-    const v1 = versionsByMinecraftVersion[this.type][this.version.minecraftVersion].dataVersion
-    const v2 = versionsByMinecraftVersion[this.type][version].dataVersion
-    return v1 >= v2
-  }
-  nmcData.isOlderThan = function (version) {
-    const v1 = versionsByMinecraftVersion[this.type][this.version.minecraftVersion].dataVersion
-    const v2 = versionsByMinecraftVersion[this.type][version].dataVersion
-    return v1 < v2
-  }
+  nmcData.isNewerOrEqualTo = version => nmcData.version['>='](version)
+  nmcData.isOlderThan = version => nmcData.version['<'](version)
+  nmcData.version = Object.assign(majorVersion, nmcData.version)
   cache[majorVersion.type + '_' + majorVersion.majorVersion] = nmcData
+
   return nmcData
 }
 
+module.exports.Version = Version
+
 // adapt the version, most often doesn't convert to major version, can even convert to minor version when possible
 function toMajor (mcVersion, preNetty, typeArg) {
   const parts = (mcVersion + '').split('_')
@@ -68,10 +87,7 @@ function toMajor (mcVersion, preNetty, typeArg) {
   } else if (versionsByMajorVersion[type][version]) {
     majorVersion = versionsByMajorVersion[type][version].minecraftVersion
   }
-  return {
-    majorVersion: majorVersion,
-    type: type
-  }
+  return new Version(type, version, majorVersion)
 }
 
 module.exports.supportedVersions = {

package/lib/loader.js

@@ -8,6 +8,8 @@ function mcDataToNode (mcData) {
     blocksArray: mcData.blocks,
     blocksByStateId: indexes.blocksByStateId,
 
+    blockStates: mcData.blockStates, // bedrock
+
     blockCollisionShapes: mcData.blockCollisionShapes,
 
     biomes: indexes.biomesById,
@@ -46,6 +48,9 @@ function mcDataToNode (mcData) {
 
     protocol: mcData.protocol,
     protocolComments: mcData.protocolComments,
+    protocolYaml: [mcData.proto, mcData.types], // bedrock
+
+    defaultSkin: mcData.steve, // bedrock
 
     version: mcData.version,
 

package/minecraft-data/README.md

@@ -10,7 +10,7 @@ Language independent module providing minecraft data for minecraft clients, serv
 Supports
 * Minecraft PC version 0.30c (classic), 1.7.10, 1.8.8, 1.9 (15w40b, 1.9, 1.9.1-pre2, 1.9.2, 1.9.4),
  1.10 (16w20a, 1.10-pre1, 1.10, 1.10.1, 1.10.2), 1.11 (16w35a, 1.11, 1.11.2), 1.12 (17w15a, 17w18b, 1.12-pre4, 1.12, 1.12.1, 1.12.2), 1.13 (17w50a, 1.13, 1.13.1, 1.13.2-pre1, 1.13.2-pre2, 1.13.2), 1.14 (1.14, 1.14.1, 1.14.3, 1.14.4), 1.15 (1.15, 1.15.1, 1.15.2), 1.16 (20w13b, 20w14a, 1.16-rc1, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5), and 1.17
-* Minecraft bedrock version 0.14, 0.15, 1.0, 1.16.201, 1.16.210, 1.16.220, 1.17.0, 1.17.10
+* Minecraft bedrock version 0.14, 0.15, 1.0, 1.16.201, 1.16.210, 1.16.220, 1.17.0, 1.17.10, 1.17.30, 1.17.40
 
 ## Wrappers
 
@@ -53,7 +53,7 @@ Data provided:
 | Foods | list of foods each with there id, saturation, foodpoints and more |
 | Commands | a tree structure for vanilla minecraft server commands, and some info needed to implement sub-parsers.
 | Legacy | mappings between legacy (1.12) and post-flattening (1.13+) blocks and items ids
-
+| Skin data | (bedrock edition) Skin geometry and texture data for steve skin
 
 See more information about this data in the [documentation](http://prismarinejs.github.io/minecraft-data/)