minecraft-data 3.78.0 → 3.80.0

package/minecraft-data/doc/history.md

@@ -1,3 +1,22 @@
+## 3.80.0
+* [Add bedrock 1.21.50 protocol data (#945)](https://github.com/PrismarineJS/minecraft-data/commit/b0c5492bc709673ba684e2fc0fe034ff069f9c50) (thanks @CreeperG16)
+* [bedrock: fix serverbound_loading_screen malformed packet (#944)](https://github.com/PrismarineJS/minecraft-data/commit/9753666c64c00d1307e8ad93a3f1e1d74f3c7586) (thanks @JSbETms)
+* [Add 1.21.3 to readme](https://github.com/PrismarineJS/minecraft-data/commit/6dc131a5b286da399ad0201ba977e7766cd3a5f6) (thanks @rom1504)
+
+## 3.79.0
+* [Java 1.21.3 Support (#936)](https://github.com/PrismarineJS/minecraft-data/commit/2442f47dc991c587c8090a9469170dd86cfa0ee4) (thanks @GroobleDierne)
+* [Add 1.21.4 to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/f88f2699c43dc48a12a2bdf5fd0109dc0ebc94b7) (thanks @github-actions[bot])
+* [Add 1.21.4-rc3 to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/e0e23d27777f5e9d64d9797fd5dd69616875cf63) (thanks @github-actions[bot])
+* [Add 1.21.4-rc2 to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/564c0a6c1765d1462a33b2f65f74c77bff50144c) (thanks @github-actions[bot])
+* [Add 1.21.4-rc1 to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/ccbaf7685dc1239ffbd2129a66ae76ea276d8bb4) (thanks @github-actions[bot])
+* [Add 1.21.4-pre3 to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/bb89a33f423dab1bf6f64a59aad12c547c369a99) (thanks @github-actions[bot])
+* [Add 1.21.4-pre2 to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/42a2f3806fd6a22f8ed79f98fb0757f906cf0266) (thanks @github-actions[bot])
+* [Add 1.21.4-pre1 to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/9cfa6ea955af24d6f481484ebe5d8221a2265421) (thanks @github-actions[bot])
+* [Add 24w46a to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/dd1c067ce05464831dd2855a06cf0ed74bc48cd0) (thanks @github-actions[bot])
+* [Add 24w45a to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/27e699e134a5dcc39c3a94ae7735d27f8ea3040f) (thanks @github-actions[bot])
+* [Add 24w44a to pc protocolVersions.json](https://github.com/PrismarineJS/minecraft-data/commit/fc60c49b07c937cb31d617b7ec7e6abcf78a8ce8) (thanks @github-actions[bot])
+* [Add 1.21 data (protocol compliant w/ 1.21.1) (#935)](https://github.com/PrismarineJS/minecraft-data/commit/f1130aea931b948d2ecaecf34ecfe0116bfd4172) (thanks @GroobleDierne)
+
 ## 3.78.0
 * [Add pc 1.21.1 data (#925)](https://github.com/PrismarineJS/minecraft-data/commit/d56346a4e32defcd28d9ba6750957c12001e78d6) (thanks @extremeheat)
 * [Add incrementedChatType feature (#932)](https://github.com/PrismarineJS/minecraft-data/commit/8ef58b15fec74c6a276d0c83cfc741d6fb4e072a) (thanks @SuperGamerTron)

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

@@ -2,8 +2,9 @@ const fs = require('fs')
 const cp = require('child_process')
 const { globSync } = require('glob')
 const version = process.argv[2]
+const mcdataVersion = process.argv[3] || process.argv[2]
 if (!version) {
-  console.log('Usage: node extractEntityMetadata.js <version>')
+  console.log('Usage: node extractEntityMetadata.js <codeVersion> [mcdataVersion]')
   process.exit(1)
 }
 
@@ -11,28 +12,49 @@ if (!fs.existsSync(version)) {
   cp.execSync(`git clone -b client${version} https://github.com/extremeheat/extracted_minecraft_data.git ${version} --depth 1`, { stdio: 'inherit' })
 }
 
+// decompiler may either put static defs inline (static varname = value) or keep decl and def in seperate blocks (static varname; static{varname = val, ..}) so normalize it
+function prepLines (raw) {
+  const lines = raw.replaceAll(' {\n', ' {;\n').split(';')
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i].trim()
+    if (line.includes('static final') && !line.includes(' = ')) {
+      const varName = line.split(' ').pop()
+      for (let j = 0; j < lines.length; j++) {
+        const line2 = lines[j].trim()
+        if (line2.startsWith(varName + ' = ')) {
+          lines[i] = line.replace(varName, line2)
+          lines[j] = ''
+        }
+      }
+    }
+  }
+  return lines
+}
+
 function getEntityTypes () {
   const entityTypes = fs.readFileSync(`./${version}/client/net/minecraft/world/entity/EntityType.java`, 'utf8')
-  const entityTypesLines = entityTypes.split(';')
+  const entityTypesLines = prepLines(entityTypes)
   const classNameTo = {}
+  const nameToClass = {}
   for (const line of entityTypesLines) {
     if (line.includes('= register(')) {
       // Given the line: public static final EntityType<Allay> ALLAY = register( "allay", EntityType.Builder.<Allay>of(Allay::new, MobCategory.CREATURE).sized(0.35F, 0.6F).clientTrackingRange(8).updateInterval(2) );
       // we extract Allay and "allay"
-      const regex = line.match(/EntityType<(.*)> (.*) = register\(\W+"([a-z0-9_]+)"/)
+      const regex = line.match(/EntityType<(.*)> (.*) = register\(\W*"([a-z0-9_]+)"/)
       if (regex) {
         const [, type, , name] = regex
         classNameTo[type] = name
+        nameToClass[name] = type
       }
     }
   }
-  return classNameTo
+  return [classNameTo, nameToClass]
 }
 
 function getEntityMetadataSerializers () {
   const output = []
   const entityTypes = fs.readFileSync(`./${version}/client/net/minecraft/network/syncher/EntityDataSerializers.java`, 'utf8')
-  const entityTypesLines = entityTypes.split(';')
+  const entityTypesLines = prepLines(entityTypes)
   for (const line of entityTypesLines) {
     if (line.includes('registerSerializer')) {
       // From:       registerSerializer(BYTE);
@@ -48,7 +70,7 @@ function getEntityMetadataSerializers () {
 }
 
 const serializers = getEntityMetadataSerializers()
-const classNameToRegistryName = getEntityTypes()
+const [classNameToRegistryName, entityNameToClass] = getEntityTypes()
 
 const allEntityFiles = globSync(`${version}/**/entity/**/*.java`)
 const allEntityFileCodes = Object.fromEntries(allEntityFiles.map(file => [
@@ -61,7 +83,7 @@ const metadatas = {}
 
 for (const file in allEntityFileCodes) {
   const code = allEntityFileCodes[file]
-  const lines = code.split(';')
+  const lines = prepLines(code)
   let lastClass
   for (const line of lines) {
     let lineWithoutGenerics = line.replace(/<.*>/g, '')
@@ -117,16 +139,16 @@ for (const key in classNameToRegistryName) {
 }
 
 function updateMcDataEntitiesJSON () {
-  const presentMcDataPath = `../../data/pc/${version}/entities.json`
+  const presentMcDataPath = `../../data/pc/${mcdataVersion}/entities.json`
   const presentMcData = require(presentMcDataPath)
   for (const entry of presentMcData) {
-    entry.metadataKeys = flat[entry.name].map(e => e[0].replace('DATA_', '').replace('_ID', '').replace('ID_', '').toLowerCase())
+    entry.metadataKeys = flat[classNameToRegistryName[entityNameToClass[entry.name]]].map(e => e[0].replace('DATA_', '').replace('_ID', '').replace('ID_', '').toLowerCase())
   }
   fs.writeFileSync(presentMcDataPath, JSON.stringify(presentMcData, null, 2))
 }
 
 function updateMcDataProtocolJSON () {
-  const presentMcDataPath = `../../data/pc/${version}/protocol.json`
+  const presentMcDataPath = `../../data/pc/${mcdataVersion}/protocol.json`
   const mcdata = require(presentMcDataPath)
   const mapper = { type: 'varint', mappings: {} }
   for (let i = 0; i < serializers.length; i++) {

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

@@ -0,0 +1,23 @@
+const fs = require('fs')
+const cp = require('child_process')
+const version = process.argv[2]
+const extractTypes = process.argv[3] === '-types'
+
+if (!version) {
+  console.log('Usage: node extractEntityMetadata.js <codeVersion> [-types]')
+  process.exit(1)
+}
+
+if (!fs.existsSync(version)) {
+  cp.execSync(`git clone -b client${version} https://github.com/extremeheat/extracted_minecraft_data.git ${version} --depth 1`, { stdio: 'inherit' })
+}
+
+const componentsFile = fs.readFileSync(`./${version}/client/net/minecraft/core/component/DataComponents.java`, 'utf8')
+const nameRe = /register\("(.+)",/gm
+const typeRe = /\((.+?)\).*?;/gm
+const nameMatches = componentsFile.matchAll(nameRe)
+const typeMatches = componentsFile.matchAll(typeRe)
+typeMatches.next()
+for (const match of nameMatches) {
+  console.log(`- ${match[1]}${extractTypes ? ' : ' + typeMatches.next().value?.[1] : ''}`)
+}

package/package.json

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