Merge branch 'master' into pc-1_21_10

Author: SuperGamerTron

.github/copilot-instructions.md

@@ -31,6 +31,15 @@ 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.
 
+## Testing
+Always run tests after data changes to ensure local tests are passing:
+
+```sh
+cd tools/js
+npm install
+npm test -- --bail 2>&1 | tail -100
+```
+
 ## Data
 
 Most data is generated with data generators. For mcpc, data is generated with [minecraft-data-generator](https://github.com/PrismarineJS/minecraft-data-generator).
@@ -57,7 +66,28 @@ Not all data is generated. Some data (like protocol schemas) is manually curated
 
 ### 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).
+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 (and an imported types.yml support file on bedrock) 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).
+
+👉 Run `npm run build` in tools/js to regenerate protocol.json files after making changes to the protocol yaml files.
+
+❌ 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.
+
+If you need to edit many files at once, consider writing a simple Node.js script to replace. E.g., from `cd tools/js && npm i && node __replace_something.js`):
+```js
+const cp = require('child_process')
+const fs = require('fs')
+const glob = require('glob')
+const pcVersionsOrdered = require('../../data/pc/common/versions.json')
+const after1_20_5 = pcVersionsOrdered.slice(pcVersionsOrdered.indexOf('1.20.5')) // everything after 1.20.5...
+for (const version of pcVersionsOrdered) {
+  // globSync, fs.readFileSync...fs.writeFileSync ; avoid async
+}
+```
+
+When updating, apply minimum required changes when possible.
 
- 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.
+1. Do not rename fields or packets unless their value has changed, even if they may have 'officially' changed. If their values *have* significantly changed (varint -> i32 maybe insignificant from primitive standpoint, string to number is), it maybe a good idea to rename the field or packet.
+2. Do not rename existing enums or other data, even if they were renamed in the game. You may add or remove data as is needed as this does not unnecessarily affect existing code relying on old names.
+3. Always read the information in doc/protocol.md to understand our YAML format.
+4. Try to inline types as much as possible--this includes mappers and switch statements. Don't create extra types unless they are actually re-used in multiple places, or very large to warrant seperation.

.github/helper-bot/utils.js

@@ -18,7 +18,7 @@ async function createInitialPR (edition, issueUrl, { version, protocolVersion })
   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 branchName = `${edition}_${branchNameVersion}`
   const title = `🎈 Add Minecraft ${edition} ${version} data`
   // First, delete any existing branch
   try {

.github/workflows/bedrock-version-bump.yml

@@ -0,0 +1,92 @@
+name: Bedrock Version Bump
+
+on:
+  workflow_dispatch:
+    inputs:
+      minecraftVersion:
+        description: 'Bedrock Minecraft version (e.g., 1.21.124)'
+        required: true
+        type: string
+      protocolVersion:
+        description: 'Protocol version number (e.g., 860)'
+        required: true
+        type: string
+      createPr:
+        description: 'Create a pull request with the changes'
+        required: false
+        type: boolean
+        default: true
+
+jobs:
+  bump-bedrock-version:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.PAT_PASSWORD || secrets.GITHUB_TOKEN }}
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install dependencies
+        run: |
+          cd tools/js
+          npm install
+
+      - name: Run version bump script
+        run: |
+          cd tools/js
+          npm run version bedrock ${{ github.event.inputs.minecraftVersion }} ${{ github.event.inputs.protocolVersion }}
+
+      - name: Build protocol files
+        run: |
+          cd tools/js
+          npm run build
+
+      - name: Run tests
+        run: |
+          cd tools/js
+          npm test
+
+      - name: Create Pull Request
+        if: ${{ github.event.inputs.createPr == 'true' }}
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.PAT_PASSWORD || secrets.GITHUB_TOKEN }}
+          commit-message: |
+            Add bedrock ${{ github.event.inputs.minecraftVersion }} protocol data
+
+            Updates:
+            - Protocol version → ${{ github.event.inputs.protocolVersion }}
+            - Minecraft version → ${{ github.event.inputs.minecraftVersion }}
+            - Moved previous proto.yml to versioned folder
+            - Updated protocolVersions.json, versions.json, and dataPaths.json
+            - Regenerated protocol.json files
+          branch: bedrock-bump-${{ github.event.inputs.minecraftVersion }}
+          delete-branch: true
+          title: Add bedrock ${{ github.event.inputs.minecraftVersion }} data
+          body: |
+            ## Bedrock Version Bump
+
+            This PR adds support for Minecraft Bedrock Edition version **${{ github.event.inputs.minecraftVersion }}** with protocol version **${{ github.event.inputs.protocolVersion }}**.
+
+            ### Changes
+            - ✅ Protocol version bumped to ${{ github.event.inputs.protocolVersion }}
+            - ✅ Minecraft version updated to ${{ github.event.inputs.minecraftVersion }}
+            - ✅ Previous proto.yml files moved to versioned folder
+            - ✅ Updated protocolVersions.json and versions.json
+            - ✅ Regenerated all protocol.json files
+            - ✅ All tests passing
+
+            ### How this was generated
+            This PR was automatically generated using the bedrock version bump workflow.
+
+            ---
+            🤖 Generated by GitHub Actions workflow
+          labels: |
+            bedrock
+            version-bump
+            automated

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, 1.21.111
+* 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, 1.21.120, 1.21.124, 1.21.130
 <!--NEXT BEDROCK-->
 
 ## Wrappers

data/bedrock/1.16.201/proto.yml

@@ -1315,7 +1315,7 @@ packet_available_commands:
    # If the values_len < 0xff => byte
    # If the values_len < 0xffff => short
    # If the values_len < 0xffffff => int
-   _enum_type: '["enum_size_based_on_values_len"]'
+   _enum_type: ["enum_size_based_on_values_len"]
    # Here all the enum values for all of the possible commands are stored to one array palette
    enum_values: string[]$values_len
    # Integer parameters may sometimes have a prefix, such as the XP command:

data/bedrock/1.16.210/proto.yml

@@ -1354,7 +1354,7 @@ packet_available_commands:
    # If the values_len < 0xff => byte
    # If the values_len < 0xffff => short
    # If the values_len < 0xffffff => int
-   _enum_type: '["enum_size_based_on_values_len"]'
+   _enum_type: ["enum_size_based_on_values_len"]
    # Here all the enum values for all of the possible commands are stored to one array palette
    enum_values: string[]$values_len
    # Integer parameters may sometimes have a prefix, such as the XP command:

data/bedrock/1.16.220/proto.yml

@@ -1487,7 +1487,7 @@ packet_available_commands:
    # If the values_len < 0xff => byte,
    # If the values_len < 0xffff => short,
    # If the values_len < 0xffffff => int
-   _enum_type: '["enum_size_based_on_values_len"]'
+   _enum_type: ["enum_size_based_on_values_len"]
    # Here all the enum values for all of the possible commands are stored to one array palette
    enum_values: string[]$values_len
    # Integer parameters may sometimes have a prefix, such as the XP command:

data/bedrock/1.17.0/proto.yml

@@ -1489,7 +1489,7 @@ packet_available_commands:
    # If the values_len < 0xff => byte,
    # If the values_len < 0xffff => short,
    # If the values_len < 0xffffff => int
-   _enum_type: '["enum_size_based_on_values_len"]'
+   _enum_type: ["enum_size_based_on_values_len"]
    # Here all the enum values for all of the possible commands are stored to one array palette
    enum_values: string[]$values_len
    # Integer parameters may sometimes have a prefix, such as the XP command:

data/bedrock/1.17.10/proto.yml

@@ -1572,7 +1572,7 @@ packet_available_commands:
    # If the values_len < 0xff => byte,
    # If the values_len < 0xffff => short,
    # If the values_len < 0xffffff => int
-   _enum_type: '["enum_size_based_on_values_len"]'
+   _enum_type: ["enum_size_based_on_values_len"]
    # Here all the enum values for all of the possible commands are stored to one array palette
    enum_values: string[]$values_len
    # Integer parameters may sometimes have a prefix, such as the XP command:

data/bedrock/1.17.30/proto.yml

@@ -1584,7 +1584,7 @@ packet_available_commands:
    # If the values_len < 0xff => byte,
    # If the values_len < 0xffff => short,
    # If the values_len < 0xffffff => int
-   _enum_type: '["enum_size_based_on_values_len"]'
+   _enum_type: ["enum_size_based_on_values_len"]
    # Here all the enum values for all of the possible commands are stored to one array palette
    enum_values: string[]$values_len
    # Integer parameters may sometimes have a prefix, such as the XP command: