minecraft-data 3.97.0 → 3.99.0

package/data.js

@@ -1611,6 +1611,33 @@ module.exports =
       get tints () { return require("./minecraft-data/data/pc/1.21.6/tints.json") },
       get version () { return require("./minecraft-data/data/pc/1.21.6/version.json") },
       get windows () { return require("./minecraft-data/data/pc/1.16.1/windows.json") },
+      proto: __dirname + '/minecraft-data/data/pc/1.21.6/proto.yml'
+    },
+    '1.21.8': {
+      get attributes () { return require("./minecraft-data/data/pc/1.21.8/attributes.json") },
+      get blockCollisionShapes () { return require("./minecraft-data/data/pc/1.21.8/blockCollisionShapes.json") },
+      get blocks () { return require("./minecraft-data/data/pc/1.21.8/blocks.json") },
+      get blockLoot () { return require("./minecraft-data/data/pc/1.20/blockLoot.json") },
+      get biomes () { return require("./minecraft-data/data/pc/1.21.8/biomes.json") },
+      get commands () { return require("./minecraft-data/data/pc/1.20.3/commands.json") },
+      get effects () { return require("./minecraft-data/data/pc/1.21.8/effects.json") },
+      get enchantments () { return require("./minecraft-data/data/pc/1.21.8/enchantments.json") },
+      get entities () { return require("./minecraft-data/data/pc/1.21.8/entities.json") },
+      get entityLoot () { return require("./minecraft-data/data/pc/1.20/entityLoot.json") },
+      get foods () { return require("./minecraft-data/data/pc/1.21.8/foods.json") },
+      get instruments () { return require("./minecraft-data/data/pc/1.21.8/instruments.json") },
+      get items () { return require("./minecraft-data/data/pc/1.21.8/items.json") },
+      get language () { return require("./minecraft-data/data/pc/1.21.8/language.json") },
+      get loginPacket () { return require("./minecraft-data/data/pc/1.21.3/loginPacket.json") },
+      get mapIcons () { return require("./minecraft-data/data/pc/1.20.2/mapIcons.json") },
+      get materials () { return require("./minecraft-data/data/pc/1.21.8/materials.json") },
+      get particles () { return require("./minecraft-data/data/pc/1.21.8/particles.json") },
+      get protocol () { return require("./minecraft-data/data/pc/1.21.8/protocol.json") },
+      get recipes () { return require("./minecraft-data/data/pc/1.21.8/recipes.json") },
+      get sounds () { return require("./minecraft-data/data/pc/1.21.8/sounds.json") },
+      get tints () { return require("./minecraft-data/data/pc/1.21.8/tints.json") },
+      get version () { return require("./minecraft-data/data/pc/1.21.8/version.json") },
+      get windows () { return require("./minecraft-data/data/pc/1.16.1/windows.json") },
       proto: __dirname + '/minecraft-data/data/pc/latest/proto.yml'
     }
   },
@@ -2494,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',
@@ -2516,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',
@@ -2538,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',
@@ -2560,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.0
+
+* update `minecraft-data`
+
+## 3.98.0
+
+* update `minecraft-data`
+
 ## 3.97.0
 
 * update `minecraft-data`

package/index.d.ts

@@ -208,27 +208,44 @@ declare namespace MinecraftData {
   }
   
   
-  type BlockMappingsSchema =
-    | []
-    | [
-        {
-          pc: {
-            name: string;
-            states: {
-              [k: string]: unknown;
-            };
-            [k: string]: unknown;
-          };
-          pe: {
-            name: string;
-            states: {
-              [k: string]: unknown;
-            };
-            [k: string]: unknown;
-          };
-          [k: string]: unknown;
-        }
-      ];
+  /**
+   * Maps block names and states between PC and PE (Bedrock) versions.
+   */
+  type BlockMappings = {
+    pc: BlockRef;
+    pe: BlockRef1;
+  }[];
+  
+  /**
+   * PC (Java Edition) block reference.
+   */
+  interface BlockRef {
+    /**
+     * The block's unique name identifier.
+     */
+    name: string;
+    /**
+     * The block's state properties as key-value pairs.
+     */
+    states: {
+      [k: string]: unknown;
+    };
+  }
+  /**
+   * PE (Bedrock Edition) block reference.
+   */
+  interface BlockRef1 {
+    /**
+     * The block's unique name identifier.
+     */
+    name: string;
+    /**
+     * The block's state properties as key-value pairs.
+     */
+    states: {
+      [k: string]: unknown;
+    };
+  }
   
   
   type Blocks = Block[];
@@ -350,9 +367,8 @@ declare namespace MinecraftData {
   
   
   interface HttpsExampleComPersonSchemaJson {
-    graph?: RootNode;
+    root: RootNode;
     parsers: ParserInfo[];
-    [k: string]: unknown;
   }
   interface RootNode {
     type: "root";
@@ -360,7 +376,6 @@ declare namespace MinecraftData {
     executable: boolean;
     redirects: string[];
     children: (LiteralNode | ArgumentNode)[];
-    [k: string]: unknown;
   }
   interface LiteralNode {
     type: "literal";
@@ -368,7 +383,6 @@ declare namespace MinecraftData {
     executable: boolean;
     redirects: string[];
     children: (LiteralNode | ArgumentNode)[];
-    [k: string]: unknown;
   }
   interface ArgumentNode {
     type: "argument";
@@ -381,9 +395,7 @@ declare namespace MinecraftData {
       modifier?: {
         [k: string]: unknown;
       } | null;
-      [k: string]: unknown;
     };
-    [k: string]: unknown;
   }
   interface ParserInfo {
     parser: string;
@@ -391,7 +403,6 @@ declare namespace MinecraftData {
       [k: string]: unknown;
     } | null;
     examples: string[];
-    [k: string]: unknown;
   }
   
   
@@ -903,41 +914,39 @@ declare namespace MinecraftData {
   
   
   interface Tints {
-    grass?: {
-      data?: {
-        keys?: string[];
-        color?: number;
-      }[];
-      default?: number;
-    };
-    foliage?: {
-      data?: {
-        keys?: string[];
-        color?: number;
-      }[];
-      default?: number;
-    };
-    water?: {
-      data?: {
-        keys?: string[];
-        color?: number;
-      }[];
-      default?: number;
-    };
-    redstone?: {
-      data?: {
-        keys?: number[];
-        color?: number;
-      }[];
-      default?: number;
-    };
-    constant?: {
-      data?: {
-        keys?: string[];
-        color?: number;
-      }[];
-      default?: number;
-    };
+    grass: StringKeyTintGroup;
+    foliage: StringKeyTintGroup;
+    water: StringKeyTintGroup;
+    redstone: IntegerKeyTintGroup;
+    constant: StringKeyTintGroup;
+  }
+  interface StringKeyTintGroup {
+    /**
+     * @minItems 1
+     */
+    data: [StringKeyTintEntry, ...StringKeyTintEntry[]];
+    default?: number;
+  }
+  interface StringKeyTintEntry {
+    /**
+     * @minItems 1
+     */
+    keys: [string, ...string[]];
+    color: number;
+  }
+  interface IntegerKeyTintGroup {
+    /**
+     * @minItems 1
+     */
+    data: [IntegerKeyTintEntry, ...IntegerKeyTintEntry[]];
+    default?: number;
+  }
+  interface IntegerKeyTintEntry {
+    /**
+     * @minItems 1
+     */
+    keys: [number, ...number[]];
+    color: number;
   }
   
   

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

@@ -0,0 +1,113 @@
+const fs = require('fs')
+const github = require('gh-helpers')()
+const { join } = require('path')
+const { extractPcEntityMetadata } = require('../../tools/js/extractPcEntityMetadata')
+const { exec, createInitialPR } = require('./utils')
+
+const artifactsDir = join(__dirname, './artifacts')
+const root = join(__dirname, '..', '..')
+
+async function handle (ourPR, genPullNo, version, artifactURL, shouldPull) {
+  const branchNameVersion = version.replace(/[^a-zA-Z0-9]/g, '_').toLowerCase()
+  const branch = ourPR.headBranch || `pc-${branchNameVersion}`
+  if (shouldPull) exec('git', ['pull', 'origin'])
+
+  // if external PR:
+  // const branch = ourPR.headBranch
+  // exec('git', ['remote', 'add', 'fo', ourPR.headCloneURL])
+  // exec('git', ['fetch', 'fo', branch])
+  // exec('git', ['checkout', '-b', branch, `fo/` + branch])
+
+  try {
+    exec('git', ['checkout', branch])
+  } catch (err) {
+    console.error('Error checking out branch:', err)
+    process.exit(1)
+  }
+
+  const dataPaths = require('../../data/dataPaths.json')
+  const dataPath = dataPaths.pc[version]
+
+  const destDir = join(root, `./data/pc/${version}`)
+  if (!fs.existsSync(destDir) || !dataPath) {
+    console.warn(`⚠️ Version ${version} not found (checked ${destDir}) ; cannot continue.`, fs.existsSync(destDir), dataPath)
+    process.exit(1)
+  }
+
+  if (ourPR.body) {
+    await github.updateIssue(ourPR.number, {
+      body: ourPR.body.replace('<!--minecraft-data-generator-placeholder-->', `- https://github.com/PrismarineJS/minecraft-data-generator/pull/${genPullNo}`)
+    })
+  }
+
+  console.log('Handling PR:', ourPR)
+
+  fs.mkdirSync(artifactsDir, { recursive: true })
+
+  // 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('/') // eslint-disable-line
+  console.log('Downloading artifacts', { ownerName, repoName, artifactId, artifactsDir })
+  await github.artifacts.downloadIdFrom(ownerName, repoName, artifactId, artifactsDir)
+
+  console.log(fs.readdirSync(artifactsDir))
+
+  // Now copy artifacts/${version}/*.json to data/pc/$version/*.json
+  const versionArtifactsDir = join(artifactsDir, version)
+  for (const file of fs.readdirSync(versionArtifactsDir)) {
+    if (file.endsWith('.json')) {
+      const src = join(versionArtifactsDir, file)
+      const dest = join(destDir, file)
+      fs.mkdirSync(destDir, { recursive: true })
+      console.log(`copy ${src} => ${dest}`)
+      fs.copyFileSync(src, dest)
+      dataPath[file.replace('.json', '')] = 'pc/' + version
+    }
+  }
+
+  // Commit the new dataPath
+  fs.writeFileSync(join(root, 'data', 'dataPaths.json'), JSON.stringify(dataPaths, null, 2))
+
+  try {
+    process.chdir(join(__dirname, '../../tools/js'))
+    extractPcEntityMetadata(version, version, { write: true, cloneIfMissing: true })
+  } catch (e) {
+    console.log('Failed to extract PC entity metadata', e)
+  }
+
+  // Now, we need to commit the changes
+  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', `[Auto] Apply generated data from PrismarineJS/minecraft-data-generator#${genPullNo}`])
+  exec('git', ['push', 'origin', branch])
+}
+
+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, 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)
+  }
+}
+
+main(
+  JSON.parse(process.env.TRIGGER_MC_VERSIONS),
+  process.env.TRIGGER_PR_NO,
+  process.env.TRIGGER_ARTIFACT_URL,
+  process.env.CREATE_PR_IF_NONE
+)

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

@@ -1,11 +1,11 @@
+/* eslint-disable no-return-assign, no-sequences */
 const fs = require('fs')
-const cp = require('child_process')
 const github = require('gh-helpers')()
-const exec = (cmd) => github.mock ? console.log('> ', cmd) : (console.log('> ', cmd), cp.execSync(cmd, { stdio: 'inherit' }))
 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')
 
-const download = (url, dest) => exec(`curl -L ${url} -o ${dest}`)
+const download = (url, dest) => exec('curl', ['-L', url, '-o', dest])
 
 function buildFirstIssue (title, result, jarData) {
   const protocolVersion = jarData?.protocol_version || 'Failed to obtain from JAR'
@@ -28,27 +28,13 @@ A new Minecraft Java Edition version is available (as of ${date}), version **${r
   <tr><td><b>Data Version</b></td><td>${jarData?.world_version}</td>
   <tr><td><b>Java Version</b></td><td>${jarData?.java_version}</td>
 </table>
+
 <hr/>
 🤖 I am a bot, I check for updates every 2 hours without a trigger. You can close this issue to prevent any further updates.
     `
   }
 }
 
-async function createInitialPull (edition, issueUrl, { version, protocolVersion }) {
-  exec('cd tools/js && npm install')
-  exec(`cd tools/js && npm run version ${edition} ${version} ${protocolVersion}`)
-  const branchNameVersion = version.replace(/[^a-zA-Z0-9]/g, '.').toLowerCase()
-  const branchName = `${edition}-${branchNameVersion}`
-  const title = `Initial data for ${edition} ${version}`
-  exec(`git checkout -b ${branchName}`)
-  exec(`git add --all`)
-  exec(`git commit -m "${title}"`)
-  exec(`git push origin ${branchName}`)
-  //     createPullRequest(title: string, body: string, fromBranch: string, intoBranch?: string): Promise<{ number: number, url: string }>;
-  const pr = await github.createPullRequest(title, `${title}.\n\nRef: ${issueUrl}`, branchName, 'master')
-  return pr
-}
-
 const protocolVersions = {
   pc: require('../../data/pc/common/protocolVersions.json'),
   bedrock: require('../../data/bedrock/common/protocolVersions.json')
@@ -63,11 +49,21 @@ async function updateManifestPC () {
   // fs.writeFileSync('./manifest.json', JSON.stringify(manifest, null, 2))
   const knownVersions = protocolVersions.pc.reduce((acc, cur) => (acc[cur.minecraftVersion] = cur, acc), {})
   const latestVersion = manifest.latest.snapshot
+  const latestReleaseVersion = manifest.latest.release
   const latestVersionData = manifest.versions.find(v => v.id === latestVersion)
   const latestVersionIsSnapshot = latestVersionData.type !== 'release'
 
-  const title = `Support Minecraft PC ${latestVersion}`
-  const issueStatus = await github.findIssue({ titleIncludes: title }) || {}
+  const title = `Support Minecraft PC ${latestReleaseVersion}`
+  const issueStatus = await github.findIssue({ titleIncludes: title, author: null }) || {}
+  console.log('issueStatus', issueStatus)
+
+  if (issueStatus?.isOpen) {
+    if (supportedVersions.pc.includes(latestReleaseVersion)) {
+      // If the issue is open and the latest release version is supported, we can close the issue
+      github.close(issueStatus.id, `Closing as PC ${latestReleaseVersion} is now supported`)
+      return
+    }
+  }
 
   if (latestVersionIsSnapshot) {
     // don't make issues for snapshots
@@ -75,19 +71,11 @@ async function updateManifestPC () {
       console.log('Latest version is a known snapshot, no work to do')
       return
     }
+  } else if (knownVersions[latestVersion]) {
+    console.log(`Latest PC version ${latestVersion} is known in protocolVersions.json, but not in versions.json (protocol version ${knownVersions[latestVersion].version})`)
+    return // We expect to have already handled this version.
   } else {
-    if (supportedVersions.pc.includes(latestVersion)) {
-      if (issueStatus.isOpen) {
-        github.close(issueStatus.id, `Closing as PC ${latestVersion} is now supported`)
-      }
-      console.log('Latest PC version is supported.')
-      return
-    } else if (knownVersions[latestVersion]) {
-      console.log(`Latest PC version ${latestVersion} is known in protocolVersions.json, but not in versions.json (protocol version ${knownVersions[latestVersion].version})`)
-      return
-    } else {
-      console.log(`Latest PC version ${latestVersion} is not known in protocolVersions.json, adding and making issue`)
-    }
+    console.log(`Latest PC version ${latestVersion} is not known in protocolVersions.json, adding and making issue`)
   }
 
   let versionJson
@@ -118,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
@@ -131,11 +119,28 @@ async function updateManifestPC () {
       workflow: 'handle-mcdata-update.yml',
       branch: 'main',
       inputs: {
-        version: latestVersion
+        version: latestVersion,
+        issue_number: issue?.number,
+        pr_number: pr?.number
       }
     }
     console.log('Sending workflow dispatch', dispatchPayload)
     await github.sendWorkflowDispatch(dispatchPayload)
+    // Ask node-minecraft-protocol to handle new update
+    const nodeDispatchPayload = {
+      owner: 'PrismarineJS',
+      repo: 'node-minecraft-protocol',
+      workflow: 'update-from-minecraft-data.yml',
+      branch: 'master',
+      inputs: {
+        new_mc_version: latestVersion,
+        mcdata_branch: pr.branchName,
+        mcdata_pr_url: pr.url
+      }
+    }
+    console.log('Sending workflow dispatch', nodeDispatchPayload)
+    await github.sendWorkflowDispatch(nodeDispatchPayload)
+    // node-minecraft-protocol would then dispatch to mineflayer
   }
 
   async function addEntryFor (releaseVersion, releaseData) {
@@ -152,8 +157,8 @@ async function updateManifestPC () {
     console.log(`Downloaded client jar ${releaseVersion}.jar (${clientJarSize} bytes), extracting its version.json...`)
 
     // unzip with tar / unzip, Actions image uses 7z
-    if (process.platform === 'win32') cp.execSync(`tar -xf ./${releaseVersion}.jar version.json`)
-    else cp.execSync(`7z -y e ./${releaseVersion}.jar version.json`, { stdio: 'inherit' })
+    if (process.platform === 'win32') exec('tar', ['-xf', `./${releaseVersion}.jar`, 'version.json'])
+    else exec('7z', ['-y', 'e', `./${releaseVersion}.jar`, 'version.json'])
     const versionJson = require('./version.json')
 
     let majorVersion
@@ -179,11 +184,11 @@ async function updateManifestPC () {
     if (process.env.CI) {
       console.log('Committing changes to protocolVersions.json')
       // https://github.com/actions/checkout/pull/1184
-      cp.execSync('git config user.name "github-actions[bot]"')
-      cp.execSync('git config user.email "41898282+github-actions[bot]@users.noreply.github.com"')
-      cp.execSync('git add ../../data/pc/common/protocolVersions.json')
-      cp.execSync(`git commit -m "Add ${versionJson.id} to pc protocolVersions.json"`)
-      cp.execSync('git push')
+      exec('git', ['config', 'user.name', 'github-actions[bot]'])
+      exec('git', ['config', 'user.email', '41898282+github-actions[bot]@users.noreply.github.com'])
+      exec('git', ['add', '../../data/pc/common/protocolVersions.json'])
+      exec('git', ['commit', '-m', `Add ${versionJson.id} to pc protocolVersions.json`])
+      exec('git', ['push'])
     }
 
     return versionJson

package/minecraft-data/.github/helper-bot/package.json

@@ -0,0 +1,11 @@
+{
+  "scripts": {
+    "fix": "standard --fix"
+  },
+  "dependencies": {
+    "gh-helpers": "^1.0.0"
+  },
+  "devDependencies": {
+    "standard": "^17.1.2"
+  }
+}