Merge 60ba34dded into 590dc33fed

2024-11-23 15:57:50 -05:00 · 2024-11-17 01:50:53 +00:00 · 2024-11-17 01:50:53 +00:00 · 3ad4a1f0b7
commit 3ad4a1f0b7
parent 590dc33fed 60ba34dded
4 changed files with 161 additions and 3 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -56,5 +56,6 @@ jobs:
        distribution: 'adopt'
    - name: Install dependencies
      run: npm install
+    - run: cd node_modules && cd minecraft-data && mv minecraft-data minecraft-data-old && git clone -b pc1.21.3 https://github.com/GroobleDierne/minecraft-data.git --depth 1 && node bin/generate_data.js
    - name: Run tests
      run: npm run mochaTest -- -g ${{ matrix.mcVersion }}v
--- a/docs/README.md
+++ b/docs/README.md
@ -13,7 +13,7 @@ Parse and serialize minecraft packets, plus authentication and encryption.

 * Supports Minecraft PC version 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), and 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) and 1.16 (20w13b, 20w14a, 1.16-rc1, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5), 1.17 (21w07a, 1.17, 1.17.1), 1.18 (1.18, 1.18.1 and 1.18.2), 1.19 (1.19, 1.19.1, 1.19.2, 1.19.3, 1.19.4, 1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6, 1.21.1)
+  , 1.15 (1.15, 1.15.1, 1.15.2) and 1.16 (20w13b, 20w14a, 1.16-rc1, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5), 1.17 (21w07a, 1.17, 1.17.1), 1.18 (1.18, 1.18.1 and 1.18.2), 1.19 (1.19, 1.19.1, 1.19.2, 1.19.3, 1.19.4), 1.20 (1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6), 1.21 (1.21, 1.21.1, 1.21.3)
 * Parses all packets and emits events with packet fields as JavaScript
   objects.
 * Send a packet by supplying fields as a JavaScript object.
--- a/src/datatypes/compiler-minecraft.js
+++ b/src/datatypes/compiler-minecraft.js
@ -1,3 +1,4 @@
+/* eslint-disable no-return-assign */
 const UUID = require('uuid-1345')
 const minecraft = require('./minecraft')

@ -41,7 +42,7 @@ module.exports = {
      code += '}'
      return compiler.wrapCode(code)
    }],
-    arrayWithLengthOffset: ['parametrizable', (compiler, array) => {
+    arrayWithLengthOffset: ['parametrizable', (compiler, array) => { // TODO: remove
      let code = ''
      if (array.countType) {
        code += 'const { value: count, size: countSize } = ' + compiler.callType(array.countType) + '\n'
@ -61,6 +62,56 @@ module.exports = {
      code += '}\n'
      code += 'return { value: data, size }'
      return compiler.wrapCode(code)
+    }],
+    bitflags: ['parametrizable', (compiler, { type, flags, shift, big }) => {
+      let fstr = JSON.stringify(flags)
+      if (Array.isArray(flags)) {
+        fstr = '{'
+        for (const [k, v] of Object.entries(flags)) fstr += `"${v}": ${big ? (1n << BigInt(k)) : (1 << k)}` + (big ? 'n,' : ',')
+        fstr += '}'
+      } else if (shift) {
+        fstr = '{'
+        for (const key in flags) fstr += `"${key}": ${1 << flags[key]},`
+        fstr += '}'
+      }
+      return compiler.wrapCode(`
+        const { value: _value, size } = ${compiler.callType(type, 'offset')}
+        const value = { _value }
+        const flags = ${fstr}
+        for (const key in flags) {
+          value[key] = (_value & flags[key]) == flags[key]
+        }
+        return { value, size }
+      `.trim())
+    }],
+    registryEntryHolder: ['parametrizable', (compiler, opts) => {
+      return compiler.wrapCode(`
+const { value: n, size: nSize } = ${compiler.callType('varint')}
+if (n !== 0) {
+  return { value: { ${opts.baseName}: n - 1 }, size: nSize }
+} else {
+  const holder = ${compiler.callType(opts.otherwise.type)}
+  return { value: { ${opts.otherwise.name}: holder.data }, size: nSize + holder.size }
+}
+      `.trim())
+    }],
+    registryEntryHolderSet: ['parametrizable', (compiler, opts) => {
+      return compiler.wrapCode(`
+  const { value: n, size: nSize } = ${compiler.callType('varint')}
+  if (n === 0) {
+    const base = ${compiler.callType(opts.base.type)}
+    return { value: { ${opts.base.name}: base.value }, size: base.size + nSize }
+  } else {
+    const set = []
+    let accSize = nSize
+    for (let i = 0; i < n - 1; i++) {
+      const entry = ${compiler.callType(opts.otherwise.type)}
+      set.push(entry.value)
+      accSize += entry.size
+    }
+    return { value: { ${opts.otherwise.name}: set }, size: accSize }
+  }
+    `.trim())
    }]
  },
  Write: {
@ -106,6 +157,58 @@ module.exports = {
      code += '}\n'
      code += 'return offset'
      return compiler.wrapCode(code)
+    }],
+    bitflags: ['parametrizable', (compiler, { type, flags, shift, big }) => {
+      let fstr = JSON.stringify(flags)
+      if (Array.isArray(flags)) {
+        fstr = '{'
+        for (const [k, v] of Object.entries(flags)) fstr += `"${v}": ${big ? (1n << BigInt(k)) : (1 << k)}` + (big ? 'n,' : ',')
+        fstr += '}'
+      } else if (shift) {
+        fstr = '{'
+        for (const key in flags) fstr += `"${key}": ${1 << flags[key]},`
+        fstr += '}'
+      }
+      return compiler.wrapCode(`
+        const flags = ${fstr}
+        let val = value._value ${big ? '|| 0n' : ''}
+        for (const key in flags) {
+          if (value[key]) val |= flags[key]
+        }
+        return (ctx.${type})(val, buffer, offset)
+      `.trim())
+    }],
+    registryEntryHolder: ['parametrizable', (compiler, opts) => {
+      const baseName = `value.${opts.baseName}`
+      const otherwiseName = `value.${opts.otherwise.name}`
+      return compiler.wrapCode(`
+if (${baseName}) {
+  offset = ${compiler.callType(`${baseName} + 1`, 'varint')}
+} else if (${otherwiseName}) {
+  offset = ${compiler.callType(`${otherwiseName}`, opts.otherwise.type)}
+} else {
+  throw new Error('registryEntryHolder type requires "${baseName}" or "${otherwiseName}" fields to be set')
+}
+return offset
+      `.trim())
+    }],
+    registryEntryHolderSet: ['parametrizable', (compiler, opts) => {
+      const baseName = `value.${opts.base.name}`
+      const otherwiseName = `value.${opts.otherwise.name}`
+      return compiler.wrapCode(`
+if (${baseName}) {
+  offset = ${compiler.callType(0, 'varint')}
+  offset = ${compiler.callType(`${baseName}`, opts.base.type)}
+} else if (${otherwiseName}) {
+  offset = ${compiler.callType(`${otherwiseName}.length + 1`, 'varint')}
+  for (let i = 0; i < ${otherwiseName}.length; i++) {
+    offset = ${compiler.callType(opts.otherwise.type)}
+  }
+} else {
+  throw new Error('registryEntryHolder type requires "${baseName}" or "${otherwiseName}" fields to be set')
+}
+return offset
+    `.trim())
    }]
  },
  SizeOf: {
@ -149,6 +252,60 @@ module.exports = {
      }
      code += 'return size'
      return compiler.wrapCode(code)
+    }],
+    bitflags: ['parametrizable', (compiler, { type, flags, shift, big }) => {
+      let fstr = JSON.stringify(flags)
+      if (Array.isArray(flags)) {
+        fstr = '{'
+        for (const [k, v] of Object.entries(flags)) fstr += `"${v}": ${big ? (1n << BigInt(k)) : (1 << k)}` + (big ? 'n,' : ',')
+        fstr += '}'
+      } else if (shift) {
+        fstr = '{'
+        for (const key in flags) fstr += `"${key}": ${1 << flags[key]},`
+        fstr += '}'
+      }
+      return compiler.wrapCode(`
+        const flags = ${fstr}
+        let val = value._value ${big ? '|| 0n' : ''}
+        for (const key in flags) {
+          if (value[key]) val |= flags[key]
+        }
+        return (ctx.${type})(val)
+      `.trim())
+    }],
+    registryEntryHolder: ['parametrizable', (compiler, opts) => {
+      const baseName = `value.${opts.baseName}`
+      const otherwiseName = `value.${opts.otherwise.name}`
+      return compiler.wrapCode(`
+let size = 0
+if (${baseName}) {
+  size += ${compiler.callType(`${baseName} + 1`, 'varint')}
+} else if (${otherwiseName}) {
+  size += ${compiler.callType(`${otherwiseName}`, opts.otherwise.type)}
+} else {
+  throw new Error('registryEntryHolder type requires "${baseName}" or "${otherwiseName}" fields to be set')
+}
+return size
+      `.trim())
+    }],
+    registryEntryHolderSet: ['parametrizable', (compiler, opts) => {
+      const baseName = `value.${opts.base.name}`
+      const otherwiseName = `value.${opts.otherwise.name}`
+      return compiler.wrapCode(`
+let size = 0
+if (${baseName}) {
+  size += ${compiler.callType(0, 'varint')}
+  size += ${compiler.callType(`${baseName}`, opts.base.type)}
+} else if (${otherwiseName}) {
+  size += ${compiler.callType(`${otherwiseName}.length + 1`, 'varint')}
+  for (let i = 0; i < ${otherwiseName}.length; i++) {
+    size += ${compiler.callType(opts.otherwise.type)}
+  }
+} else {
+  throw new Error('registryEntryHolder type requires "${baseName}" or "${otherwiseName}" fields to be set')
+}
+return size
+      `.trim())
    }]
  }
 }
--- a/src/version.js
+++ b/src/version.js
@ -2,5 +2,5 @@

 module.exports = {
  defaultVersion: '1.21.1',
-  supportedVersions: ['1.7', '1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.5', '1.17.1', '1.18.2', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20', '1.20.1', '1.20.2', '1.20.4', '1.20.6', '1.21.1']
+  supportedVersions: ['1.7', '1.8.8', '1.9.4', '1.10.2', '1.11.2', '1.12.2', '1.13.2', '1.14.4', '1.15.2', '1.16.5', '1.17.1', '1.18.2', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20', '1.20.1', '1.20.2', '1.20.4', '1.20.6', '1.21.1', '1.21.3']
 }