minecraft-data 3.98.0 → 3.99.1

package/data.js

@@ -2521,7 +2521,7 @@ module.exports =
       get effects () { return require("./minecraft-data/data/pc/1.17/effects.json") },
       get protocol () { return require("./minecraft-data/data/bedrock/1.21.80/protocol.json") },
       get windows () { return require("./minecraft-data/data/bedrock/1.16.201/windows.json") },
-      get steve () { return require("./minecraft-data/data/bedrock/1.21.50/steve.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.21.70/steve.json") },
       get blocksB2J () { return require("./minecraft-data/data/bedrock/1.21.80/blocksB2J.json") },
       get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.21.80/blocksJ2B.json") },
       proto: __dirname + '/minecraft-data/data/bedrock/1.21.80/proto.yml',
@@ -2543,7 +2543,7 @@ module.exports =
       get effects () { return require("./minecraft-data/data/pc/1.17/effects.json") },
       get protocol () { return require("./minecraft-data/data/bedrock/1.21.90/protocol.json") },
       get windows () { return require("./minecraft-data/data/bedrock/1.16.201/windows.json") },
-      get steve () { return require("./minecraft-data/data/bedrock/1.21.50/steve.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.21.70/steve.json") },
       get blocksB2J () { return require("./minecraft-data/data/bedrock/1.21.80/blocksB2J.json") },
       get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.21.80/blocksJ2B.json") },
       proto: __dirname + '/minecraft-data/data/bedrock/1.21.90/proto.yml',
@@ -2565,7 +2565,7 @@ module.exports =
       get effects () { return require("./minecraft-data/data/pc/1.17/effects.json") },
       get protocol () { return require("./minecraft-data/data/bedrock/1.21.93/protocol.json") },
       get windows () { return require("./minecraft-data/data/bedrock/1.16.201/windows.json") },
-      get steve () { return require("./minecraft-data/data/bedrock/1.21.50/steve.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.21.70/steve.json") },
       get blocksB2J () { return require("./minecraft-data/data/bedrock/1.21.80/blocksB2J.json") },
       get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.21.80/blocksJ2B.json") },
       proto: __dirname + '/minecraft-data/data/bedrock/1.21.93/proto.yml',
@@ -2587,13 +2587,35 @@ module.exports =
       get effects () { return require("./minecraft-data/data/pc/1.17/effects.json") },
       get protocol () { return require("./minecraft-data/data/bedrock/1.21.100/protocol.json") },
       get windows () { return require("./minecraft-data/data/bedrock/1.16.201/windows.json") },
-      get steve () { return require("./minecraft-data/data/bedrock/1.21.50/steve.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.21.70/steve.json") },
       get blocksB2J () { return require("./minecraft-data/data/bedrock/1.21.80/blocksB2J.json") },
       get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.21.80/blocksJ2B.json") },
-      proto: __dirname + '/minecraft-data/data/bedrock/latest/proto.yml',
+      proto: __dirname + '/minecraft-data/data/bedrock/1.21.100/proto.yml',
       types: __dirname + '/minecraft-data/data/bedrock/latest/types.yml',
       get version () { return require("./minecraft-data/data/bedrock/1.21.100/version.json") },
       get language () { return require("./minecraft-data/data/bedrock/1.21.70/language.json") }
+    },
+    '1.21.111': {
+      get blocks () { return require("./minecraft-data/data/bedrock/1.21.90/blocks.json") },
+      get blockStates () { return require("./minecraft-data/data/bedrock/1.21.80/blockStates.json") },
+      get blockCollisionShapes () { return require("./minecraft-data/data/bedrock/1.21.90/blockCollisionShapes.json") },
+      get biomes () { return require("./minecraft-data/data/bedrock/1.21.60/biomes.json") },
+      get entities () { return require("./minecraft-data/data/bedrock/1.21.80/entities.json") },
+      get items () { return require("./minecraft-data/data/bedrock/1.21.90/items.json") },
+      get recipes () { return require("./minecraft-data/data/bedrock/1.19.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/bedrock/1.19.1/enchantments.json") },
+      get effects () { return require("./minecraft-data/data/pc/1.17/effects.json") },
+      get protocol () { return require("./minecraft-data/data/bedrock/1.21.111/protocol.json") },
+      get windows () { return require("./minecraft-data/data/bedrock/1.16.201/windows.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.21.70/steve.json") },
+      get blocksB2J () { return require("./minecraft-data/data/bedrock/1.21.80/blocksB2J.json") },
+      get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.21.80/blocksJ2B.json") },
+      proto: __dirname + '/minecraft-data/data/bedrock/latest/proto.yml',
+      types: __dirname + '/minecraft-data/data/bedrock/latest/types.yml',
+      get version () { return require("./minecraft-data/data/bedrock/1.21.111/version.json") },
+      get language () { return require("./minecraft-data/data/bedrock/1.21.70/language.json") }
     }
   }
 }

package/doc/history.md

@@ -1,5 +1,13 @@
 # History
 
+## 3.99.1
+
+* update `minecraft-data`
+
+## 3.99.0
+
+* update `minecraft-data`
+
 ## 3.98.0
 
 * update `minecraft-data`

package/minecraft-data/.github/copilot-instructions.md

@@ -0,0 +1,63 @@
+PrismarineJS/minecraft-data holds Minecraft data including game versions, protocol schemas, block/item/entity states, and more. It provides a comprehensive cross-language set of data files combined with schemas that can be consumed in any language.
+
+## Directory Structure
+- `.github/`
+  - `workflows/`
+    - `ci.yml` -- Runs CI here (cd tools/js && npm install && npm test)
+    - `bedrock-ci.yml` -- Runs CI for Bedrock Edition via workflow dispatch to PrismarineJS/bedrock-protocol. This allows for testing and validation of Bedrock-specific changes.
+    - `commands.yml` -- Slash commands
+    - `handleMcpcGeneratedArtifacts.js`
+  - `helper-bot/` -- Files for the GitHub Actions cron helper.
+- `data/`
+  - `dataPaths.json` -- map of { ['pc' | 'bedrock']: { '$version': { 'dataType': 'folderPath' } } }
+  - `[pc | bedrock]/` -- Minecraft Java Edition data
+    - `1.20/` -- Versioned data for Minecraft Java Edition 1.20
+    - `$version/` -- Versioned data for Minecraft Java Edition $version
+    - `common/` -- Common data for all Minecraft Java Edition versions
+      - `protocolVersions.json` -- List of protocol versions for Minecraft Java Edition
+    - `latest/` -- This holds the latest protocol yaml files. They are used to generate the protocol.json files in each versioned folder (more on this below).
+- `schemas/` -- JSON schemas for validating data files
+- `tools/js` -- JavaScript utilities for working with repo (holds tests, some data generators and helper scripts)
+
+## Setup
+No setup is needed as we just hold data. To set up the development environment that runs tests, run the following commands:
+
+```bash
+cd tools/js
+npm install
+```
+
+This will ensure all data matches schema among other checks.
+
+There are no 'releases' in this repo beyond updating the data itself. Instead, we have a workflow that will automatically create tagged releases if the user runs the /makerelease slash command, so you can inform the user about that if a release is needed.
+
+## Data
+
+Most data is generated with data generators. For mcpc, data is generated with [minecraft-data-generator](https://github.com/PrismarineJS/minecraft-data-generator).
+
+Avoid updating data manually unless necessary, like when specific data is not automated yet (for tips on what is and not, see doc/add-data-new-version.md). Instead, update the data generators or add new ones as needed. Since you don't have capability to make changes outside this repo, please inform the user what changes need to be made and be as detailed as possible.
+
+Note we do not currently have any automation setup to generate bedrock edition data.
+
+## Github Workflows
+
+### Automation
+
+Our GH Actions workflow (.github/helper-bot) auto updates the pc protocolVersions.json with new detected versions and also auto opens a scaffolding PR.
+
+cron workflow .github/workflows/update-helper.yml -> .github/helper-bot/.
+
+helper-bot dispatches to minecraft-data-generator so that it can run data generators for new versions. minecraft-data-generator then sends a workflow dispatch back to us so we can then take its generated artifacts and commit them here.
+
+.github/workflows/handle-mcpc-generator.yml ->
+.github/helper-bot/handleMcpcGeneratedArtifacts.js
+
+## Notes
+Not all data is generated. Some data (like protocol schemas) is manually curated on both pc and bedrock.
+
+### Protocol data
+
+We use a special yaml-like DSL to generate protocol.json files. Refer to doc/protocol.md for info.
+These files are stored inside proto.yml files in the latest/ folder (like bedrock/latest/proto.yml) for the latest version, otherwise in the versioned folder (like pc/1.20/proto.yml).
+
+ Notably, run `npm run build` in tools/js to regenerate protocol.json files after making changes to the protocol yaml files. So, don't make changes to protocol.json files directly. Instead, update the relevant proto.yml file in latest/ and regenerate protocol.json by running `npm run build` in tools/js.

package/minecraft-data/.github/helper-bot/handleMcpcGeneratedArtifacts.js

@@ -1,22 +1,16 @@
 const fs = require('fs')
-const cp = require('child_process')
 const github = require('gh-helpers')()
 const { join } = require('path')
 const { extractPcEntityMetadata } = require('../../tools/js/extractPcEntityMetadata')
-
-function exec (file, args = [], options = {}) {
-  const opts = { stdio: 'inherit', ...options }
-  console.log('> ', file, args.join(' '), options.cwd ? `(cwd: ${options.cwd})` : '')
-  return github.mock ? undefined : cp.execFileSync(file, args, opts)
-}
+const { exec, createInitialPR } = require('./utils')
 
 const artifactsDir = join(__dirname, './artifacts')
 const root = join(__dirname, '..', '..')
 
-async function handle (ourPR, genPullNo, version, artifactURL) {
+async function handle (ourPR, genPullNo, version, artifactURL, shouldPull) {
   const branchNameVersion = version.replace(/[^a-zA-Z0-9]/g, '_').toLowerCase()
   const branch = ourPR.headBranch || `pc-${branchNameVersion}`
-  exec('git', ['pull', 'origin'])
+  if (shouldPull) exec('git', ['pull', 'origin'])
 
   // if external PR:
   // const branch = ourPR.headBranch
@@ -52,7 +46,7 @@ async function handle (ourPR, genPullNo, version, artifactURL) {
 
   // https://github.com/PrismarineJS/minecraft-data-generator/actions/runs/17261281146/artifacts/3861320839
   const s = artifactURL.split('github.com/')[1]
-  const [ownerName, repoName, _actions, _runs, _runId, _artifacts, artifactId] = s.split('/')
+  const [ownerName, repoName, _actions, _runs, _runId, _artifacts, artifactId] = s.split('/') // eslint-disable-line
   console.log('Downloading artifacts', { ownerName, repoName, artifactId, artifactsDir })
   await github.artifacts.downloadIdFrom(ownerName, repoName, artifactId, artifactsDir)
 
@@ -89,14 +83,23 @@ async function handle (ourPR, genPullNo, version, artifactURL) {
   exec('git', ['push', 'origin', branch])
 }
 
-async function main (versions, genPullNo, artifactUrl) {
+async function main (versions, genPullNo, artifactUrl, createPR) {
   const version = versions.at(-1)
   const pr = await github.findPullRequest({ titleIncludes: '🎈', author: null })
   console.log('Found PR', pr)
   if (pr && pr.isOpen) {
     const details = await github.getPullRequest(pr.id)
     console.log('PR', details)
-    await handle(details, genPullNo, version, artifactUrl)
+    await handle(details, genPullNo, version, artifactUrl, true)
+  } else if (createPR) {
+    const pr = await createInitialPR('pc', '(This issue was created for a minecraft-data-generator PR)', {
+      version,
+      protocolVersion: null
+    })
+    console.log('Created PR', pr)
+    const details = await github.getPullRequest(pr.number)
+    console.log('PR', details)
+    await handle(details, genPullNo, version, artifactUrl, false)
   } else {
     process.exit(1)
   }
@@ -105,5 +108,6 @@ async function main (versions, genPullNo, artifactUrl) {
 main(
   JSON.parse(process.env.TRIGGER_MC_VERSIONS),
   process.env.TRIGGER_PR_NO,
-  process.env.TRIGGER_ARTIFACT_URL
-)
+  process.env.TRIGGER_ARTIFACT_URL,
+  process.env.CREATE_PR_IF_NONE
+)

package/minecraft-data/.github/helper-bot/index.js

@@ -1,14 +1,10 @@
+/* eslint-disable no-return-assign, no-sequences */
 const fs = require('fs')
-const cp = require('child_process')
 const github = require('gh-helpers')()
 const pcManifestURL = 'https://launchermeta.mojang.com/mc/game/version_manifest.json'
 const changelogURL = 'https://feedback.minecraft.net/hc/en-us/sections/360001186971-Release-Changelogs'
+const { exec, createInitialPR } = require('./utils')
 
-function exec (file, args, options = {}) {
-  const opts = { stdio: 'inherit', ...options }
-  console.log('> ', file, args.join(' '), options.cwd ? `(cwd: ${options.cwd})` : '')
-  return github.mock ? undefined : cp.execFileSync(file, args, opts)
-}
 const download = (url, dest) => exec('curl', ['-L', url, '-o', dest])
 
 function buildFirstIssue (title, result, jarData) {
@@ -39,40 +35,6 @@ A new Minecraft Java Edition version is available (as of ${date}), version **${r
   }
 }
 
-async function createInitialPull (edition, issueUrl, { version, protocolVersion }) {
-  exec('npm', ['install'], { cwd: 'tools/js' })
-  exec('npm', ['run', 'version', edition, version, protocolVersion], { cwd: 'tools/js' })
-  exec('npm', ['run', 'build'], { cwd: 'tools/js' })
-  const branchNameVersion = version.replace(/[^a-zA-Z0-9]/g, '_').toLowerCase()
-  const branchName = `${edition}-${branchNameVersion}`
-  const title = `🎈 Add Minecraft ${edition} ${version} data`
-  // First, delete any existing branch
-  try {
-    exec('git', ['branch', '-D', branchName])
-  } catch (e) {
-    // Branch doesn't exist, ignore error
-  }
-  exec('git', ['checkout', '-b', branchName])
-  exec('git', ['config', 'user.name', 'github-actions[bot]'])
-  exec('git', ['config', 'user.email', '41898282+github-actions[bot]@users.noreply.github.com'])
-  exec('git', ['add', '--all'])
-  exec('git', ['commit', '-m', title])
-  exec('git', ['push', 'origin', branchName, '--force'])
-  const body = `
-This automated PR sets up the relevant boilerplate for Minecraft ${edition} version ${version}. Fixes ${issueUrl}.
-
-Related:
-- Issue: ${issueUrl}
-- Protocol Version: ${protocolVersion}
-<!--minecraft-data-generator-placeholder-->
-
-* You can help contribute to this PR by opening a PR against this <code branch>${branchName}</code> branch instead of <code>master</code>.
-`
-  const pr = await github.createPullRequest(title, body, branchName, 'master')
-  pr.branchName = branchName
-  return pr
-}
-
 const protocolVersions = {
   pc: require('../../data/pc/common/protocolVersions.json'),
   bedrock: require('../../data/bedrock/common/protocolVersions.json')
@@ -144,7 +106,7 @@ async function updateManifestPC () {
     console.log('Created issue', issue)
 
     // Now create an initial PR with the new version data
-    const pr = await createInitialPull('pc', issue.url, {
+    const pr = await createInitialPR('pc', issue.url, {
       minecraftVersion: versionJson.id,
       version: latestVersion,
       protocolVersion: versionJson.protocol_version

package/minecraft-data/.github/helper-bot/utils.js

@@ -0,0 +1,50 @@
+const cp = require('child_process')
+const github = require('gh-helpers')()
+const path = require('path')
+
+const pm = process.versions.bun ? process.execPath : 'npm'
+
+function exec (file, args = [], options = {}) {
+  const opts = { stdio: ['inherit', 'inherit', 'inherit'], ...options }
+  console.log('> ', file, args.join(' '), options.cwd ? `(cwd: ${options.cwd})` : '')
+  return github.mock ? undefined : cp.execFileSync(file, args, opts)
+}
+
+const toolsJs = path.join(__dirname, '..', '..', 'tools', 'js')
+const sanitizeBranch = (branchName) => branchName.replace(/[^a-zA-Z0-9]/g, '_').toLowerCase()
+
+async function createInitialPR (edition, issueUrl, { version, protocolVersion }) {
+  exec(pm, ['install'], { cwd: toolsJs })
+  if (protocolVersion) exec(pm, ['run', 'version', edition, version, protocolVersion], { cwd: toolsJs })
+  exec(pm, ['run', 'build'], { cwd: toolsJs })
+  const branchNameVersion = sanitizeBranch(version)
+  const branchName = `${edition}-${branchNameVersion}`
+  const title = `🎈 Add Minecraft ${edition} ${version} data`
+  // First, delete any existing branch
+  try {
+    exec('git', ['branch', '-D', branchName])
+  } catch (e) {
+    // Branch doesn't exist, ignore error
+  }
+  exec('git', ['checkout', '-b', branchName])
+  exec('git', ['config', 'user.name', 'github-actions[bot]'])
+  exec('git', ['config', 'user.email', '41898282+github-actions[bot]@users.noreply.github.com'])
+  exec('git', ['add', '--all'])
+  exec('git', ['commit', '--allow-empty', '-m', title])
+  exec('git', ['push', 'origin', branchName, '--force'])
+  const body = `
+This automated PR sets up the relevant boilerplate for Minecraft ${edition} version ${version}. Fixes ${issueUrl}.
+
+Related:
+- Issue: ${issueUrl}
+- Protocol Version: ${protocolVersion}
+<!--minecraft-data-generator-placeholder-->
+
+* You can help contribute to this PR by opening a PR against this <code branch>${branchName}</code> branch instead of <code>master</code>.
+`
+  const pr = await github.createPullRequest(title, body, branchName, 'master')
+  pr.branchName = branchName
+  return pr
+}
+
+module.exports = { createInitialPR, exec }

package/minecraft-data/.github/workflows/bedrock-ci.yml

@@ -45,7 +45,6 @@ jobs:
       with:
         repository: PrismarineJS/bedrock-protocol
         path: bedrock-protocol
-    - run: ls -R .
     # I forget the correct install order, do both
     - name: Install bedrock-protocol
       run: |
@@ -54,5 +53,7 @@ jobs:
         npm i
         npm install ../node-mcdata
     - name: Running bedrock-protocol tests
-      run: npm test
+      run: |
+        curl -o node_modules/protodef/src/serializer.js https://raw.githubusercontent.com/extremeheat/node-protodef/refs/heads/dlog/src/serializer.js && curl -o node_modules/protodef/src/compiler.js https://raw.githubusercontent.com/extremeheat/node-protodef/refs/heads/dlog/src/compiler.js
+        npm test
       working-directory: bedrock-protocol

package/minecraft-data/.github/workflows/handle-mcpc-generator.yml

@@ -12,6 +12,10 @@ on:
       prNumber:
         description: 'Relevant minecraft-data-generator PR #'
         required: false
+      createPr:
+        description: 'Whether to create a new PR if none exists'
+        required: false
+        default: 'false'
 
 jobs:
   update-mcdata:
@@ -20,17 +24,16 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Use Node.js 22.x
-        uses: actions/setup-node@v1
+      - uses: oven-sh/setup-bun@v2
         with:
-          node-version: 22.x
-      - name: Expose GitHub Runtime
-        uses: crazy-max/ghaction-github-runtime@v3
-      - run: cd .github/helper-bot && npm install
-      - run: cd tools/js && npm install
-      - run: cd .github/helper-bot && node handleMcpcGeneratedArtifacts.js
+          bun-version: latest
+      - run: cd .github/helper-bot && bun install
+      - run: cd tools/js && bun install
+      - run: bun handleMcpcGeneratedArtifacts.js
+        working-directory: .github/helper-bot
         env:
           TRIGGER_MC_VERSIONS: ${{ github.event.inputs.versions }}
           TRIGGER_PR_NO: ${{ github.event.inputs.prNumber }}
           TRIGGER_ARTIFACT_URL: ${{ github.event.inputs.mergedArtifactURL }}
           GITHUB_TOKEN: ${{ secrets.PAT_PASSWORD }}
+          CREATE_PR_IF_NONE: ${{ github.event.inputs.createPr }}

package/minecraft-data/.github/workflows/update-helper.yml

@@ -23,4 +23,4 @@ jobs:
       run: node index.js
       working-directory: .github/helper-bot
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.PAT_PASSWORD }}

package/minecraft-data/README.md

@@ -11,7 +11,7 @@ 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), 1.17, 1.17.1, 1.18 (1.18, 1.18.1, 1.18.2), 1.19 (1.19, 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), 1.21.8
 <!--NEXT PC-->
-* 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, 1.18.0, 1.18.11, 1.18.30, 1.19.1, 1.19.10, 1.19.20, 1.19.21, 1.19.30, 1.19.40, 1.19.50, 1.19.60, 1.19.62, 1.19.63, 1.19.70, 1.19.80, 1.20.0, 1.20.10, 1.20.30, 1.20.40, 1.20.50, 1.20.61, 1.20.71, 1.20.80, 1.21.0, 1.21.2, 1.21.20, 1.21.30, 1.21.42, 1.21.50, 1.21.60, 1.21.70, 1.21.80, 1.21.90, 1.21.93, 1.21.100
+* 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, 1.18.0, 1.18.11, 1.18.30, 1.19.1, 1.19.10, 1.19.20, 1.19.21, 1.19.30, 1.19.40, 1.19.50, 1.19.60, 1.19.62, 1.19.63, 1.19.70, 1.19.80, 1.20.0, 1.20.10, 1.20.30, 1.20.40, 1.20.50, 1.20.61, 1.20.71, 1.20.80, 1.21.0, 1.21.2, 1.21.20, 1.21.30, 1.21.42, 1.21.50, 1.21.60, 1.21.70, 1.21.80, 1.21.90, 1.21.93, 1.21.100, 1.21.111
 <!--NEXT BEDROCK-->
 
 ## Wrappers