minecraft-data 3.14.0 → 3.14.1

package/doc/history.md

@@ -1,5 +1,9 @@
 # History
 
+## 3.14.1
+
+* Support supportFeature on bedrock
+
 ## 3.14.0
 
 * update `minecraft-data`

package/index.js

@@ -68,7 +68,7 @@ module.exports = function (mcVersion, preNetty) {
   nmcData.isOlderThan = version => nmcData.version['<'](version)
   nmcData.version = Object.assign(majorVersion, nmcData.version)
   cache[cachedName] = nmcData
-  nmcData.supportFeature = feature => supportFeature(feature, nmcData.version)
+  nmcData.supportFeature = supportFeature(nmcData.version, protocolVersions[nmcData.type])
   return nmcData
 }
 

package/lib/supportsFeature.js

@@ -1,63 +1,51 @@
-const features = require('../minecraft-data/data/pc/common/features.json')
-const nameToFeature = Object.fromEntries(features.map(feature => [feature.name, feature]))
+const features = {
+  pc: require('../minecraft-data/data/pc/common/features.json'),
+  bedrock: require('../minecraft-data/data/bedrock/common/features.json')
+}
+
+module.exports = (versionObj, allVersions) => {
+  // Keep a dictionary of majorVersion => oldest / newest release
+  // Relies on descending order in minecraft-data's protocolVersions list
+  const newestMajor = allVersions.reduce((acc, cur) => { acc[cur.majorVersion] = acc[cur.majorVersion] || cur; return acc }, {})
+  const oldestMajor = allVersions.reduce((acc, cur) => { acc[cur.majorVersion] = cur; return acc }, {})
+
+  function isVersionInRange (minVer, maxVer) {
+    if (minVer.endsWith('_major')) {
+      minVer = oldestMajor[removeMajorSuffix(minVer)].minecraftVersion
+    }
+    if (maxVer.endsWith('_major')) {
+      maxVer = newestMajor[removeMajorSuffix(maxVer)].minecraftVersion
+    } else if (maxVer === 'latest') {
+      return versionObj['>='](minVer)
+    }
 
-function isFeatureInRange (featureName, versionObj) {
-  const feature = nameToFeature[featureName]
-  if (feature === undefined) {
-    throw new Error(`Feature ${feature} doesn't exist`)
+    return versionObj['>='](minVer) && versionObj['<='](maxVer)
   }
 
-  if (feature.values) {
-    for (const { value, versions, version } of feature.values) { // we're using feature.version
-      if (version) {
-        const ver = version.replace('_major', '')
-        if (!/^\d\.\d+$/.test(ver)) {
-          throw new Error(`Not a correct major version value, instead the version is: "${version}"`)
-        }
-        if (versionObj.majorVersion === ver) {
-          return value
-        }
-      } else { // we're using feature.versions
-        const [minVer, maxVer] = versions
-        if (isVersionInRange(minVer, versionObj, maxVer)) {
-          return value
+  const featureList = features[versionObj.type].map(feature => [feature.name, feature])
+
+  const map = {}
+  for (const [featureName, feature] of featureList) {
+    if (feature.values) {
+      for (const { value, versions, version } of feature.values) { // we're using feature.version
+        if (version) {
+          if (isVersionInRange(version, version)) map[featureName] = value
+        } else {
+          if (isVersionInRange(...versions)) map[featureName] = value
         }
       }
+    } else {
+      const [minVer, maxVer] = feature.versions
+      map[featureName] = isVersionInRange(minVer, maxVer)
     }
-    return null // if we didn't match anything, return null
-  } else {
-    const [minVer, maxVer] = feature.versions
-    return isVersionInRange(minVer, versionObj, maxVer)
   }
-}
 
-function isVersionInRange (minVer, versionObj, maxVer) {
-  let inRange = true
-  const { majorVersion } = versionObj
-  if (minVer.endsWith('_major')) {
-    const ver = removeMajorSuffix(minVer)
-    inRange = inRange && getVersionObj(majorVersion)['>='](ver)
-  } else {
-    inRange = inRange && versionObj['>='](minVer)
-  }
-  if (maxVer === 'latest') { // no need to check upper bound if upperbound is latest
-    return inRange
-  }
-  if (maxVer.endsWith('_major')) {
-    const ver = removeMajorSuffix(maxVer)
-    inRange = inRange && getVersionObj(majorVersion)['<='](ver)
-  } else {
-    inRange = inRange && versionObj['<='](maxVer)
-  }
-  return inRange
+  return featureName => map[featureName] || false
 }
 
 function removeMajorSuffix (verStr) {
+  if (!/^\d\.\d+_major$/.test(verStr)) {
+    throw new Error(`Not a correct major version value: "${verStr}"`)
+  }
   return verStr.replace('_major', '')
 }
-
-function getVersionObj (ver) {
-  return require('minecraft-data')(ver).version
-}
-
-module.exports = isFeatureInRange

package/package.json

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

package/test/load.js

@@ -81,4 +81,17 @@ describe('supportFeature', () => {
       assert.equal(newVal, v, `Failed on mc version ${k} | Expected: ${v}, Got: ${newVal}`)
     }
   })
+
+  it('handles "_major" correctly on itemSerializationUsesBlockId', function () {
+    const mcData1Dot9 = require('minecraft-data')('1.9')
+    const mcData1Dot17 = require('minecraft-data')('1.12.2')
+    assert.equal(mcData1Dot9.supportFeature('itemSerializationUsesBlockId'), true)
+    assert.equal(mcData1Dot17.supportFeature('itemSerializationUsesBlockId'), true)
+  })
+
+  it('works on bedrock', function () {
+    const mcData = require('minecraft-data')('bedrock_1.18.0')
+    assert.equal(mcData.supportFeature('newRecipeSchema'), true)
+    assert.equal(mcData.supportFeature('fakeRecipeSchema'), false)
+  })
 })