minecraft-data 2.115.2 → 2.117.1

package/data.js

@@ -1102,7 +1102,7 @@ module.exports =
       get particles () { return require("./minecraft-data/data/pc/1.18/particles.json") },
       get blockLoot () { return require("./minecraft-data/data/pc/1.18/blockLoot.json") },
       get entityLoot () { return require("./minecraft-data/data/pc/1.18/entityLoot.json") },
-      get loginPacket () { return require("./minecraft-data/data/pc/1.18/loginPacket.json") },
+      get loginPacket () { return require("./minecraft-data/data/pc/1.18.2/loginPacket.json") },
       get tints () { return require("./minecraft-data/data/pc/1.17/tints.json") },
       get mapIcons () { return require("./minecraft-data/data/pc/1.16/mapIcons.json") }
     }

package/doc/history.md

@@ -1,3 +1,12 @@
+## 2.117.1
+* Add support for custom supportFeature return type
+
+## 2.117.0
+* update mcdata
+
+## 2.116.0
+* update mcdata
+
 ## 2.115.2
 * Add supportFeature support
 

package/index.d.ts

@@ -876,6 +876,58 @@ declare namespace MinecraftData {
       entityLoot: any;
   }
   
+  export interface LoginPacket {
+      entityId: number;
+  
+      /**
+       * introduced in Minecraft 1.16.2
+       */
+      isHardcore?: boolean;
+  
+      gameMode: number;
+  
+      /**
+       * Introduced in Minecraft 1.17
+       */
+      previousGameMode?: number;
+      /**
+       * Introduced in Minecraft 1.17
+       */
+      worldNames?: string[];
+      /**
+       * Introduced in Minecraft 1.17
+       */
+      dimensionCodec?: any;
+  
+      dimension: any;
+  
+      /**
+       * Introduced in Minecraft 1.17
+       */
+      worldName?: string;
+  
+      hashedSeed: number;
+      maxPlayers: number;
+      viewDistance: number;
+  
+      /**
+       * Introduced in Minecraft 1.18
+       */
+      simulationDistance?: number;
+  
+      reducedDebugInfo: boolean;
+      enableRespawnScreen: boolean;
+  
+      /**
+       * Introduced in Minecraft 1.17
+       */
+      isDebug?: boolean;    
+      /**
+       * Introduced in Minecraft 1.17
+       */
+      isFlat?: boolean;
+  }
+  
   export interface IndexedData {
       isNewerOrEqualTo(version: string): boolean;
       isOlderThan(version: string): boolean;
@@ -883,6 +935,8 @@ declare namespace MinecraftData {
       blocksByName: { [name: string]: Block; };
       blocksArray: Block[];
   
+      loginPacket: LoginPacket;
+  
       items: { [id: number]: Item; };
       itemsByName: { [name: string]: Item; };
       itemsArray: Item[];

package/index.js

@@ -55,7 +55,8 @@ module.exports = function (mcVersion, preNetty) {
 
   const majorVersion = toMajor(mcVersion, preNetty)
   if (majorVersion == null) { return null }
-  if (cache[majorVersion.type + '_' + majorVersion.majorVersion]) { return cache[majorVersion.type + '_' + majorVersion.majorVersion] }
+  const cachedName = `${majorVersion.type}_${majorVersion.majorVersion}_${majorVersion.dataVersion}`
+  if (cache[cachedName]) { return cache[cachedName] }
   const mcData = data[majorVersion.type][majorVersion.majorVersion]
   if (mcData == null) { return null }
   const nmcData = mcDataToNode(mcData)
@@ -63,8 +64,8 @@ module.exports = function (mcVersion, preNetty) {
   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
-  nmcData.supportFeature = feature => supportFeature(feature, nmcData.version.minecraftVersion)
+  cache[cachedName] = nmcData
+  nmcData.supportFeature = feature => supportFeature(feature, nmcData.version)
   return nmcData
 }
 

package/lib/supportsFeature.js

@@ -1,31 +1,63 @@
 const features = require('../minecraft-data/data/pc/common/features.json')
-
-const versions = {
-  pc: require('../minecraft-data/data/pc/common/protocolVersions.json'),
-  bedrock: require('../minecraft-data/data/bedrock/common/protocolVersions.json')
-}
-const versionList = versions.pc
-const versionToIndex = Object.fromEntries(versionList.map((version, i) => [version.minecraftVersion, versionList.length - i]))
 const nameToFeature = Object.fromEntries(features.map(feature => [feature.name, feature]))
 
-module.exports = (featureName, minecraftVersion) => {
+function isFeatureInRange (featureName, versionObj) {
   const feature = nameToFeature[featureName]
   if (feature === undefined) {
     throw new Error(`Feature ${feature} doesn't exist`)
   }
 
-  const currentVer = versionToIndex[minecraftVersion]
-  const minVer = versionToIndex[feature.versions[0]]
-  const maxVer = versionToIndex[feature.versions[1]]
-  if (currentVer === undefined) {
-    throw new Error(`Version ${minecraftVersion} doesn't exist`)
+  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
+        }
+      }
+    }
+    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 (minVer === undefined) {
-    throw new Error(`Version ${feature.versions[0]} doesn't exist`)
+  if (maxVer === 'latest') { // no need to check upper bound if upperbound is latest
+    return inRange
   }
-  if (maxVer === undefined) {
-    throw new Error(`Version ${feature.versions[1]} doesn't exist`)
+  if (maxVer.endsWith('_major')) {
+    const ver = removeMajorSuffix(maxVer)
+    inRange = inRange && getVersionObj(majorVersion)['<='](ver)
+  } else {
+    inRange = inRange && versionObj['<='](maxVer)
   }
+  return inRange
+}
+
+function removeMajorSuffix (verStr) {
+  return verStr.replace('_major', '')
+}
 
-  return minVer <= currentVer && currentVer <= maxVer
+function getVersionObj (ver) {
+  return require('minecraft-data')(ver).version
 }
+
+module.exports = isFeatureInRange

package/minecraft-data/data/dataPaths.json

@@ -1101,7 +1101,7 @@
       "particles": "pc/1.18",
       "blockLoot": "pc/1.18",
       "entityLoot": "pc/1.18",
-      "loginPacket": "pc/1.18",
+      "loginPacket": "pc/1.18.2",
       "tints": "pc/1.17",
       "mapIcons": "pc/1.16"
     }