Warn about this branch being deleted soon

Pass correct damage to EntityDamageItemEvent (#11744 )
Add missing UPDATE_HAT and UPDATE_LIST_ORDER to some paper-added functions in ClientboundPlayerInfoUpdatePacket (#11731 )
2024-12-22 23:49:54 +01:00 · 2024-12-15 10:36:10 +01:00 · 2024-12-11 22:17:33 +01:00 · 2024-12-11 19:29:51 +01:00 · 2024-12-11 12:13:51 +01:00 · 2024-12-08 17:37:39 -05:00
3021 changed files with 279685 additions and 212462 deletions
@@ -29,6 +29,8 @@ ij_java_names_count_to_use_import_on_demand = 999999
 ij_java_imports_layout = *,|,$*
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
+ij_java_method_parameters_new_line_after_left_paren = true
+ij_java_method_parameters_right_paren_on_new_line = true

 [test-plugin/**/*.java]
 ij_java_use_fq_class_names = false
@@ -1,77 +0,0 @@
-name: Behavior Bug or Plugin Incompatibility
-description: Report issues with plugin incompatbility or other behavior related issues.
-labels: [ "status: needs triage", "type: bug" ]
-body:
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: What you expected to see.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Observed/Actual behavior
-      description: What you actually saw.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Steps/models to reproduce
-      description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Plugin and Datapack List
-      description: |
-        All plugins and datapacks running on your server.
-        To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Paper version
-      description: |
-        Run `/version` on your server and **paste** the full, unmodified output here.
-        "latest" is *not* a version; we require the output of `/version` so we can adequately track down the issue.
-        Additionally, do NOT provide a screenshot, you MUST paste the entire output.
-        <details>
-        <summary>Example</summary>
-
-        ```
-        > version
-        [20:34:42 INFO]: This server is running Paper version git-Paper-540 (MC: 1.16.5) (Implementing API version 1.16.5-R0.1-SNAPSHOT)
-        [20:34:42 INFO]: Checking version, please wait...
-        [20:34:42 INFO]: Previous version: git-Paper-538 (MC: 1.16.5)
-        [20:34:42 INFO]: You are running the latest version
-        ```
-
-        </details>
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Other
-      description: |
-        Please include other helpful information below.
-        The more information we receive, the quicker and more effective we can be at finding the solution to the issue.
-    validations:
-      required: false
-
-  - type: markdown
-    attributes:
-      value: |
-        Before submitting this issue, please ensure the following:
-
-        1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads/paper).
-        2. You searched for and ensured there isn't already an open issue regarding this.
-        3. Your version of Minecraft is supported by Paper.
-
-        If you think you have a bug but are not sure, feel free to ask the `#paper-help` channel of our
-        [Discord](https://discord.gg/papermc).
-
@@ -0,0 +1,79 @@
+name: "🐛 Bug or Incompatibility"
+description: Report issues related to unexpected behavior or vanilla/plugin incompatibility.
+type: "Bug"
+labels:
+  - "status: needs triage"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this issue, please ensure the following:
+
+        1. You are using the latest version of Paper, available on our [our downloads page](https://papermc.io/downloads/paper).
+        2. You have searched to confirm there isn’t [an existing open issue](https://github.com/PaperMC/Paper/issues?q=is%3Aissue%20state%3Aopen%20type%3ABug) on this topic.
+        3. Your version of Minecraft is supported by Paper.
+
+        If you're unsure whether you've encountered a bug, feel free to ask in the `#paper-help` channel on our
+        [Discord](https://discord.gg/papermc).
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: What you expected to see.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Observed/Actual behavior
+      description: What you actually saw.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps/models to reproduce
+      description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Plugin and Datapack List
+      description: |
+        All plugins and datapacks running on your server.
+        To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Paper version
+      description: |
+        Run `/version` on your server and **paste** the full, unmodified output here.
+        "latest" is *not* a version; we require the output of `/version` so we can adequately track down the issue.
+        Additionally, do NOT provide a screenshot, you MUST paste the entire output.
+        <details>
+        <summary>Example</summary>
+
+        ```
+        > version
+        [20:34:42 INFO]: Checking version, please wait...
+        [20:34:42 INFO]: This server is running Paper version 1.21-105-master@7e91a2c (2024-07-20T21:04:31Z) (Implementing API version 1.21-R0.1-SNAPSHOT)
+        [20:34:42 INFO]: You are running the latest version
+        [20:34:42 INFO]: Previous version: 1.21-103-aa3b356 (MC: 1.21)
+        ```
+
+        </details>
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Other
+      description: |
+        Please include other helpful information below.
+        The more information we receive, the quicker and more effective we can be at finding the solution to the issue.
+    validations:
+      required: false
+
@@ -1,13 +1,10 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Feature Request
-    url: https://github.com/PaperMC/Paper/discussions/new?category=ideas
-    about: Suggest an idea for Paper
-  - name: PaperMC Discord
-    url: https://discord.gg/papermc
-    about: If you are having issues with timings or have other minor issues, come ask us on our Discord server!
-  - name: Exploit Report
+  - name: "❗Exploits"
    url: https://discord.gg/papermc
    about: |
-      Due to GitHub not currently allowing private issues, exploit reports are currently handled via our Discord.
-      To report an exploit, see the #paper-exploit-report channel.
+      Since GitHub doesn’t currently support private issues, exploit reports are managed through our Discord.
+      To report an exploit, please visit the #paper-exploit-report channel.
+  - name: "🗨 Questions"
+    url: https://discord.gg/papermc
+    about: If you have questions or need help with any minor issues, feel free to ask us on our Discord server!
@@ -0,0 +1,78 @@
+name: "💥 Crash or Stacktrace"
+description: Report any server crashes or alarming stack traces.
+type: "Bug"
+labels:
+  - "status: needs triage"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this issue, please ensure the following:
+
+        1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads/paper).
+        2. Your version of Minecraft is supported by Paper.
+
+        If your server crash log contains `DO NOT REPORT THIS TO PAPER`, please ask in our
+        [Discord](https://discord.gg/papermc) before opening this issue. These messages are informing you of server
+        lag and providing debug information.
+
+  - type: textarea
+    attributes:
+      label: Stack trace
+      description: |
+        We need all of the stack trace! Do not cut off parts of it. Please do not use attachments.
+        If you prefer, you can use a paste site like https://mclo.gs.
+      value: |
+        ```
+        paste your stack trace or a mclo.gs link here!
+        ```
+      placeholder: Please don't remove the backticks; it makes your issue a lot harder to read!
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Plugin and Datapack List
+      description: |
+        All plugins and datapacks running on your server.
+        To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Actions to reproduce (if known)
+      description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue. Anything helps!
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Paper version
+      description: |
+        Run `/version` on your server and **paste** the full, unmodified output here.
+        "latest" is *not* a version; we require the output of `/version` so we can adequately track down the issue.
+        Additionally, do NOT provide a screenshot, you MUST paste the entire output.
+        <details>
+        <summary>Example</summary>
+
+        ```
+        > version
+        [20:34:42 INFO]: Checking version, please wait...
+        [20:34:42 INFO]: This server is running Paper version 1.21-105-master@7e91a2c (2024-07-20T21:04:31Z) (Implementing API version 1.21-R0.1-SNAPSHOT)
+        [20:34:42 INFO]: You are running the latest version
+        [20:34:42 INFO]: Previous version: 1.21-103-aa3b356 (MC: 1.21)
+        ```
+
+        </details>
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Other
+      description: |
+        Please include other helpful information below, if any.
+        The more information we receive, the quicker and more effective we can be at finding the solution to the issue.
+    validations:
+      required: false
@@ -0,0 +1,53 @@
+name: "💡 New Feature"
+description: Propose a new idea for Paper.
+type: "Feature"
+labels:
+  - "status: needs triage"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for submitting a feature request for Paper! Please be as detailed as possible to help us review and consider your request effectively.
+        Before submitting, please ensure the following:
+
+        1. You are using a supported version of Paper.
+        2. The feature you’re requesting isn’t already included in the version you’re using.
+        3. You’ve searched for and confirmed there isn’t already [an open request](https://github.com/PaperMC/Paper/issues?q=is%3Aissue%20is%3Aopen%20type%3AFeature) for this feature.
+            - If a similar request exists, feel free to add any additional details you think are helpful.
+
+        If you have any questions, feel free to ask in the `#paper-help` or `#paper-dev` channels on our [Discord](https://discord.gg/papermc).
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem?
+      description: Please provide some context for this request. Why do you want it added?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like.
+      description: A clear and concise description of what you want.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered.
+      description: List any alternatives you might have tried to get the feature you want.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Other
+      description: Add any other context or screenshots about the feature request below.
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this feature request, please search our issue tracker to ensure your feature has not
+        already been requested.
+
@@ -1,7 +1,19 @@
-name: Performance Problem
-description: Report performance related problems or other areas of concern
-labels: [ "status: needs triage", "type: performance" ]
+name: "🐌 Performance Problem"
+description: Report any performance issues.
+type: "Bug"
+labels:
+  - "scope: performance"
+  - "status: needs triage"
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this issue, please ensure the following:
+
+        1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads/paper).
+        2. You searched for and ensured there isn't already [an open issue](https://github.com/PaperMC/Paper/issues?q=is%3Aissue%20state%3Aopen%20type%3ABug) regarding this.
+        3. Your version of Minecraft is supported by Paper.
+
  - type: markdown
    attributes:
      value: |
@@ -10,9 +22,12 @@ body:

  - type: input
    attributes:
-      label: Timings or Profile link
-      description: We ask that all timings/profiles are a link, not a screenshot. Screenshots inhibit our ability to figure out the real cause of the issue.
-      placeholder: "Example: https://timings.aikar.co/?id=6b48586fbbdd48e585ca0ebb07c59dd0"
+      label: Spark Profile
+      description: |
+        Please provide all profiles as links rather than screenshots. Screenshots limit our ability to investigate the root cause of the issue.
+
+        For more information, see our [profiling documentation](https://docs.papermc.io/paper/profiling).
+      placeholder: "Example: https://spark.lucko.me/XsN0hxGfsi"
    validations:
      required: true

@@ -35,10 +50,10 @@ body:
  - type: textarea
    attributes:
      label: Server config files
-      description: We need bukkit.yml, spigot.yml, paper-global.yml, paper-world-defaults.yml and server.properties. If you use per-world Paper configs, make sure to include them. You can paste it below or use a paste site like https://paste.gg.
+      description: We need bukkit.yml, spigot.yml, paper-global.yml, paper-world-defaults.yml and server.properties. If you use per-world Paper configs, make sure to include them. You can paste it below or use a paste site like https://mclo.gs.
      value: |
        ```
-        Paste configs or paste.gg link here!
+        Paste configs or mclo.gs link here!
        ```
      placeholder: Please don't remove the backticks; it makes your issue a lot harder to read!
    validations:
@@ -56,10 +71,10 @@ body:

        ```
        > version
-        [20:34:42 INFO]: This server is running Paper version git-Paper-540 (MC: 1.16.5) (Implementing API version 1.16.5-R0.1-SNAPSHOT)
        [20:34:42 INFO]: Checking version, please wait...
-        [20:34:42 INFO]: Previous version: git-Paper-538 (MC: 1.16.5)
+        [20:34:42 INFO]: This server is running Paper version 1.21-105-master@7e91a2c (2024-07-20T21:04:31Z) (Implementing API version 1.21-R0.1-SNAPSHOT)
        [20:34:42 INFO]: You are running the latest version
+        [20:34:42 INFO]: Previous version: 1.21-103-aa3b356 (MC: 1.21)
        ```

        </details>
@@ -74,11 +89,3 @@ body:
        The more information we receive, the quicker and more effective we can be at finding the solution to the issue.
    validations:
      required: false
-  - type: markdown
-    attributes:
-      value: |
-        Before submitting this issue, please ensure the following:
-
-        1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads/paper).
-        2. You searched for and ensured there isn't already an open issue regarding this.
-        3. Your version of Minecraft is supported by Paper.
@@ -1,76 +0,0 @@
-name: Server crash or Stacktrace
-description: Report server crashes or scary stacktraces
-labels: [ "status: needs triage" ]
-body:
-  - type: textarea
-    attributes:
-      label: Stack trace
-      description: |
-        We need all of the stack trace! Do not cut off parts of it. Please do not use attachments.
-        If you prefer, you can use a paste site like https://paste.gg.
-      value: |
-        ```
-        paste your stack trace or a paste.gg link here!
-        ```
-      placeholder: Please don't remove the backticks; it makes your issue a lot harder to read!
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Plugin and Datapack List
-      description: |
-        All plugins and datapacks running on your server.
-        To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Actions to reproduce (if known)
-      description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue. Anything helps!
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Paper version
-      description: |
-        Run `/version` on your server and **paste** the full, unmodified output here.
-        "latest" is *not* a version; we require the output of `/version` so we can adequately track down the issue.
-        Additionally, do NOT provide a screenshot, you MUST paste the entire output.
-        <details>
-        <summary>Example</summary>
-
-        ```
-        > version
-        [20:34:42 INFO]: This server is running Paper version git-Paper-540 (MC: 1.16.5) (Implementing API version 1.16.5-R0.1-SNAPSHOT)
-        [20:34:42 INFO]: Checking version, please wait...
-        [20:34:42 INFO]: Previous version: git-Paper-538 (MC: 1.16.5)
-        [20:34:42 INFO]: You are running the latest version
-        ```
-
-        </details>
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Other
-      description: |
-        Please include other helpful information below, if any.
-        The more information we receive, the quicker and more effective we can be at finding the solution to the issue.
-    validations:
-      required: false
-
-  - type: markdown
-    attributes:
-      value: |
-        Before submitting this issue, please ensure the following:
-
-        1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads/paper).
-        2. Your version of Minecraft is supported by Paper.
-
-        If your server crash log contains `DO NOT REPORT THIS TO PAPER`, please ask in our
-        [Discord](https://discord.gg/papermc) before opening this issue. These messages are informing you of server
-        lag and providing debug information.
@@ -24,28 +24,36 @@ jobs:
        java: [21]
      fail-fast: true
    steps:
-      - uses: actions/checkout@v4
+      - if: ${{ github.event_name == 'push' }}
+        uses: actions/checkout@v4
+      - if: ${{ github.event_name == 'pull_request' }}
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
      - name: JDK ${{ matrix.java }}
        uses: actions/setup-java@v4
        with:
          java-version: ${{ matrix.java }}
          distribution: 'zulu'

-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4

      - name: Configure Build
        uses: actions/github-script@v7
        id: determine
+        env:
+          REF_NAME: "${{ github.ref_name }}"
+          REF_TYPE: "${{ github.ref_type }}"
+          EVENT: "${{ toJSON(github.event) }}"
+          EVENT_TYPE: "${{ github.event_name }}"
        with:
          script: |
            const {owner, repo} = context.repo;
-            const event_name = "${{ github.event_name }}";
-            const event = ${{ toJSON(github.event) }};
-            const ref_type = "${{ github.ref_type }}";
-            const ref_name = "${{ github.ref_name }}";
+            const event_name = `${process.env.EVENT_TYPE}`;
+            const event = JSON.parse(`${process.env.EVENT}`);
+            const ref_type = `${process.env.REF_TYPE}`;
+            const ref_name = `${process.env.REF_NAME}`;
            const result = {
              action: "build"
            };
@@ -94,7 +102,7 @@ jobs:
        uses: actions/upload-artifact@v4
        with:
          name: paper-${{ fromJSON(steps.determine.outputs.result).pr }}
-          path: build/libs/paper-paperclip-*-reobf.jar
+          path: build/libs/paper-paperclip-*-mojmap.jar
  event_file:
    name: "Event File"
    # Only run on PRs if the source branch is on someone else's repo
@@ -18,6 +18,14 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/github-script@v7
+        env:
+          BRANCH_NAME: "${{ github.event.workflow_run.head_branch }}"
+          PR_OWNER: "${{ github.event.workflow_run.head_repository.owner.login }}"
+          PR_SHA: "${{ github.event.workflow_run.head_sha }}"
+          RUN_ID: "${{ github.event.workflow_run.id }}"
+          REPO_ID: "${{ github.event.repository.id }}"
+          EVENT_TYPE: "${{ github.event.workflow_run.event}}"
+          PULL_REQUESTS: "${{ toJSON(github.event.workflow_run.pull_requests) }}"
        with:
          # This snippet is public-domain, taken from
          # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
@@ -37,17 +45,17 @@ jobs:
            }

            const { owner, repo } = context.repo;
-            const run_id = ${{ github.event.workflow_run.id }};
-            const repo_id = ${{ github.event.repository.id }};
+            const run_id = `${process.env.RUN_ID}`;
+            const repo_id = `${process.env.REPO_ID}`;

            let pulls = [];
-            const event_type = "${{ github.event.workflow_run.event}}";
+            const event_type = `${process.env.EVENT_TYPE}`;
            if (event_type === "push") { // if push, it's from the same repo which means `pull_requests` is populated
-              pulls = ${{ toJSON(github.event.workflow_run.pull_requests) }};
+              pulls = JSON.parse(`${process.env.PULL_REQUESTS}`);
            } else {
-              const pr_branch = "${{ github.event.workflow_run.head_branch }}";
-              const pr_sha = "${{ github.event.workflow_run.head_sha }}";
-              const pr_owner = "${{ github.event.workflow_run.head_repository.owner.login }}";
+              const pr_branch = `${process.env.BRANCH_NAME}`;
+              const pr_sha = `${process.env.PR_SHA}`;
+              const pr_owner = `${process.env.PR_OWNER}`;
              const { data } = await github.rest.pulls.list({ owner, repo, head: `${pr_owner}:${pr_branch}`, state: "open" });
              core.debug(JSON.stringify(data, null, 2));
              pulls = data.filter((pr) => pr.head.sha === pr_sha && pr.labels.find((l) => l.name === "build-pr-jar"));
@@ -33,6 +33,7 @@ jobs:
          column-field: Status
          label-to-column-map: |
            {
+              "resolution: awaiting response": "⌛ Awaiting Response",
              "resolution: cannot reproduce": "Invalid",
              "resolution: duplicate": "Invalid",
              "resolution: incomplete": "Invalid",
@@ -42,7 +43,6 @@ jobs:
              "resolution: won't fix": "Invalid",
              "resolution: works as intended": "Invalid",
              "status: accepted": "✅ Accepted",
-              "status: awaiting response": "⌛ Waiting for Reporter",
              "status: blocked": "Needs Work",
              "status: defer upstream": "Needs Work",
              "status: in progress": "Needs Work",
@@ -72,5 +72,5 @@ jobs:
              "resolution: won't fix": "Invalid",
              "resolution: works as intended": "Invalid",
              "status: accepted": "Done",
-              "status: needs triage": "Invalid",
+              "status: needs triage": "Invalid"
            }
@@ -18,7 +18,7 @@ jobs:
      actions: read
    steps:
      - name: Download and Extract Artifacts
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v6
        with:
          run_id: ${{ github.event.workflow_run.id }}
          path: artifacts
@@ -27,12 +27,12 @@ which can be obtained in (most) package managers such as `apt` (Debian / Ubuntu;
 you will most likely use this for WSL), `homebrew` (macOS / Linux), and more:

 - `git` (package `git` everywhere);
- A Java 17 or later JDK (packages vary, use Google/DuckDuckGo/etc.).
+- A Java 21 or later JDK (packages vary, use Google/DuckDuckGo/etc.).
  - [Adoptium](https://adoptium.net/) has builds for most operating systems.
-  - Paper requires JDK 17 to build, however, makes use of Gradle's
+  - Paper requires JDK 21 to build, however, makes use of Gradle's
    [Toolchains](https://docs.gradle.org/current/userguide/toolchains.html)
    feature to allow building with only JRE 11 or later installed. (Gradle will
-    automatically provision JDK 17 for compilation if it cannot find an existing
+    automatically provision JDK 21 for compilation if it cannot find an existing
    install).

 If you're on Windows, check
@@ -42,11 +42,11 @@ If you're compiling with Docker, you can use Adoptium's
 [`eclipse-temurin`](https://hub.docker.com/_/eclipse-temurin/) images like so:

 ```console
-# docker run -it -v "$(pwd)":/data --rm eclipse-temurin:17.0.1_12-jdk bash
+# docker run -it -v "$(pwd)":/data --rm eclipse-temurin:21.0.3_9-jdk bash
 Pulling image...

 root@abcdefg1234:/# javac -version
-javac 17.0.1
+javac 21.0.3
 ```

 ## Understanding Patches
@@ -56,7 +56,6 @@ split into different directories which target certain parts of the code. These
 directories are:

 - `Paper-API` - Modifications to `Spigot-API`/`Bukkit`;
- `Paper-MojangAPI` - An API for [Mojang's Brigadier](https://github.com/Mojang/brigadier);
 - `Paper-Server` - Modifications to `Spigot`/`CraftBukkit`.

 Because the entire structure is based on patches and git, a basic understanding
@@ -97,7 +96,9 @@ Your commit will be converted into a patch that you can then PR into Paper.

 ## Modifying Patches

-Modifying previous patches is a bit more complex:
+Modifying previous patches is a bit more complex.
+Similar to adding patches, the methods to modify a patch are applied inside
+the `Paper-Server` and/or `Paper-API` folders.

 ### Method 1

@@ -184,6 +185,8 @@ These steps assume the `origin` remote is your fork of this repository and `upst
 1. Checkout feature/fix branch and rebase on master: `git checkout patch-branch && git rebase master`.
 1. Apply updated patches: `./gradlew applyPatches`.
 1. If there are conflicts, fix them.
+   * If there are conflicts within `Paper-API`, after fixing them run `./gradlew rebuildApiPatches` before re-running `./gradlew applyPatches`.
+   * The API patches are applied first, so if there are conflicts in the API patches, the server patches will not be applied.
 1. If your PR creates new patches instead of modifying existing ones, in both the `Paper-Server` and `Paper-API` directories, ensure your newly-created patch is the last commit by either:
    * Renaming the patch file with a large 4-digit number in front (e.g. 9999-Patch-to-add-some-new-stuff.patch), and re-applying patches.
    * Running `git rebase --interactive base` and moving the commits to the end.
@@ -237,6 +240,10 @@ into most IDEs and formatters by default. There are a few notes, however:
 There are exceptions, especially in Spigot-related files
 - When in doubt or the code around your change is in a clearly different style,
 use the same style as the surrounding code.
+- Usage of the `var` keyword is heavily discouraged, as it makes reading patch files
+a lot harder  and can lead to confusion during updates due to changed return types.
+The only exception to this is if a line would otherwise be way too long/filled with
+hard to parse generics in a case where the base type itself is already obvious

 ### Imports
 When adding new imports to a class in a file not created by the current patch, use the fully qualified class name
@@ -244,6 +251,17 @@ instead of adding a new import to the top of the file. If you are using a type a
 can add an import with a comment. However, if its only used a couple of times, the FQN is preferred to prevent future
 patch conflicts in the import section of the file.

+### Nullability annotations
+
+We are in the process of switching nullability annotation libraries, so you might need to use one or the other:
+
+**For classes we add**: Fields, method parameters and return types that are nullable should be marked via the
+`@Nullable` annotation from `org.jspecify.annotations`. Whenever you create a new class, add `@NullMarked`, meaning types
+are assumed to be non-null by default. For less obvious placing such as on generics or arrays, see the [JSpecify docs](https://jspecify.dev/docs/user-guide/).
+
+**For classes added by upstream**: Keep using both `@Nullable` and `@NotNull` from `org.jetbrains.annotations`. These
+will be replaced later.
+
 ```java
 import org.bukkit.event.Event;
 // don't add import here, use FQN like below
@@ -43,7 +43,7 @@ ysl3000 <yannicklamprecht@live.de>
 Machine_Maker <machine@machinemaker.me>
 Ivan Pekov <ivan@mrivanplays.com>
 Camotoy <20743703+Camotoy@users.noreply.github.com>
-Bjarne Koll <lynxplay101@gmail.com>
+Bjarne Koll <git@lynxplay.dev>
 MeFisto94 <MeFisto94@users.noreply.github.com>
 Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 LemonCaramel <admin@caramel.moe>
@@ -64,4 +64,5 @@ Oliwier Miodun <naczs@blueflow.pl>
 aerulion <aerulion@gmail.com>
 Lukas Planz <lukas.planz@web.de>
 granny <contact@granny.dev>
+mja00 <me@mja00.dev>
 ```
@@ -1,36 +0,0 @@
-plugins {
-    `java-library`
-    `maven-publish`
-}
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-dependencies {
-    implementation(project(":paper-api"))
-    api("com.mojang:brigadier:1.0.18")
-
-    compileOnly("it.unimi.dsi:fastutil:8.5.6")
-    compileOnly("org.jetbrains:annotations:23.0.0")
-
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.hamcrest:hamcrest-library:1.3")
-    testImplementation("org.ow2.asm:asm-tree:9.7")
-}
-
-configure<PublishingExtension> {
-    publications.create<MavenPublication>("maven") {
-        from(components["java"])
-    }
-}
-
-val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
-    badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
-    jarToScan.set(tasks.jar.flatMap { it.archiveFile })
-    classpath.from(configurations.compileClasspath)
-}
-tasks.check {
-    dependsOn(scanJar)
-}
@@ -1,14 +0,0 @@
-package com.destroystokyo.paper.brigadier;
-
-import com.mojang.brigadier.Command;
-import com.mojang.brigadier.suggestion.SuggestionProvider;
-
-import java.util.function.Predicate;
-
-/**
- * Brigadier {@link Command}, {@link SuggestionProvider}, and permission checker for Bukkit {@link Command}s.
- *
- * @param <S> command source type
- */
-public interface BukkitBrigadierCommand <S extends BukkitBrigadierCommandSource> extends Command<S>, Predicate<S>, SuggestionProvider<S> {
-}
@@ -1,21 +0,0 @@
-package com.destroystokyo.paper.brigadier;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Entity;
-import org.jetbrains.annotations.Nullable;
-
-public interface BukkitBrigadierCommandSource {
-
-    @Nullable
-    Entity getBukkitEntity();
-
-    @Nullable
-    World getBukkitWorld();
-
-    @Nullable
-    Location getBukkitLocation();
-
-    CommandSender getBukkitSender();
-}
@@ -1,72 +0,0 @@
-package com.destroystokyo.paper.event.brigadier;
-
-import com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource;
-import com.mojang.brigadier.tree.RootCommandNode;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Fired any time a Brigadier RootCommandNode is generated for a player to inform the client of commands.
- * You may manipulate this CommandNode to change what the client sees.
- *
- * <p>This event may fire on login, world change, and permission rebuilds, by plugin request, and potentially future means.</p>
- *
- * <p>This event will fire before {@link org.bukkit.event.player.PlayerCommandSendEvent}, so no filtering has been done by
- * other plugins yet.</p>
- *
- * <p>WARNING: This event will potentially (and most likely) fire twice! Once for Async, and once again for Sync.
- * It is important that you check event.isAsynchronous() and event.hasFiredAsync() to ensure you only act once.
- * If for some reason we are unable to send this asynchronously in the future, only the sync method will fire.</p>
- *
- * <p>Your logic should look like this:
- * {@code if (event.isAsynchronous() || !event.hasFiredAsync()) { // do stuff }}</p>
- *
- * <p>If your logic is not safe to run asynchronously, only react to the synchronous version.</p>
- *
- * <p>This is a draft/experimental API and is subject to change.</p>
- */
-@ApiStatus.Experimental
-public class AsyncPlayerSendCommandsEvent <S extends BukkitBrigadierCommandSource> extends PlayerEvent {
-
-    private static final HandlerList handlers = new HandlerList();
-    private final RootCommandNode<S> node;
-    private final boolean hasFiredAsync;
-
-    public AsyncPlayerSendCommandsEvent(Player player, RootCommandNode<S> node, boolean hasFiredAsync) {
-        super(player, !Bukkit.isPrimaryThread());
-        this.node = node;
-        this.hasFiredAsync = hasFiredAsync;
-    }
-
-    /**
-     * Gets the full Root Command Node being sent to the client, which is mutable.
-     *
-     * @return the root command node
-     */
-    public RootCommandNode<S> getCommandNode() {
-        return node;
-    }
-
-    /**
-     * Gets if this event has already fired asynchronously.
-     *
-     * @return whether this event has already fired asynchronously
-     */
-    public boolean hasFiredAsync() {
-        return hasFiredAsync;
-    }
-
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}
@@ -1,84 +0,0 @@
-package com.destroystokyo.paper.event.brigadier;
-
-import com.mojang.brigadier.suggestion.Suggestions;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Called when sending {@link Suggestions} to the client. Will be called asynchronously if a plugin
- * marks the {@link com.destroystokyo.paper.event.server.AsyncTabCompleteEvent} event handled asynchronously,
- * otherwise called synchronously.
- */
-public class AsyncPlayerSendSuggestionsEvent extends PlayerEvent implements Cancellable {
-
-    private static final HandlerList handlers = new HandlerList();
-    private boolean cancelled = false;
-
-    private Suggestions suggestions;
-    private final String buffer;
-
-    public AsyncPlayerSendSuggestionsEvent(Player player, Suggestions suggestions, String buffer) {
-        super(player, !Bukkit.isPrimaryThread());
-        this.suggestions = suggestions;
-        this.buffer = buffer;
-    }
-
-    /**
-     * Gets the input buffer sent to request these suggestions.
-     *
-     * @return the input buffer
-     */
-    public String getBuffer() {
-        return buffer;
-    }
-
-    /**
-     * Gets the suggestions to be sent to client.
-     *
-     * @return the suggestions
-     */
-    public Suggestions getSuggestions() {
-        return suggestions;
-    }
-
-    /**
-     * Sets the suggestions to be sent to client.
-     *
-     * @param suggestions suggestions
-     */
-    public void setSuggestions(Suggestions suggestions) {
-        this.suggestions = suggestions;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    /**
-     * Cancels sending suggestions to the client.
-     * {@inheritDoc}
-     */
-    @Override
-    public void setCancelled(boolean cancel) {
-        this.cancelled = cancel;
-    }
-
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}
@@ -1,168 +0,0 @@
-package com.destroystokyo.paper.event.brigadier;
-
-import com.destroystokyo.paper.brigadier.BukkitBrigadierCommand;
-import com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource;
-import com.mojang.brigadier.tree.ArgumentCommandNode;
-import com.mojang.brigadier.tree.LiteralCommandNode;
-import com.mojang.brigadier.tree.RootCommandNode;
-import org.bukkit.command.Command;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.server.ServerEvent;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Fired anytime the server synchronizes Bukkit commands to Brigadier.
- *
- * <p>Allows a plugin to control the command node structure for its commands.
- * This is done at Plugin Enable time after commands have been registered, but may also
- * run at a later point in the server lifetime due to plugins, a server reload, etc.</p>
- *
- * <p>This is a draft/experimental API and is subject to change.</p>
- */
-@ApiStatus.Experimental
-public class CommandRegisteredEvent<S extends BukkitBrigadierCommandSource> extends ServerEvent implements Cancellable {
-
-    private static final HandlerList handlers = new HandlerList();
-    private final String commandLabel;
-    private final Command command;
-    private final BukkitBrigadierCommand<S> brigadierCommand;
-    private final RootCommandNode<S> root;
-    private final ArgumentCommandNode<S, String> defaultArgs;
-    private LiteralCommandNode<S> literal;
-    private boolean rawCommand = false;
-    private boolean cancelled = false;
-
-    public CommandRegisteredEvent(String commandLabel, BukkitBrigadierCommand<S> brigadierCommand, Command command, RootCommandNode<S> root, LiteralCommandNode<S> literal, ArgumentCommandNode<S, String> defaultArgs) {
-        this.commandLabel = commandLabel;
-        this.brigadierCommand = brigadierCommand;
-        this.command = command;
-        this.root = root;
-        this.literal = literal;
-        this.defaultArgs = defaultArgs;
-    }
-
-    /**
-     * Gets the command label of the {@link Command} being registered.
-     *
-     * @return the command label
-     */
-    public String getCommandLabel() {
-        return this.commandLabel;
-    }
-
-    /**
-     * Gets the {@link BukkitBrigadierCommand} for the {@link Command} being registered. This can be used
-     * as the {@link com.mojang.brigadier.Command command executor} or
-     * {@link com.mojang.brigadier.suggestion.SuggestionProvider} of a {@link com.mojang.brigadier.tree.CommandNode}
-     * to delegate to the {@link Command} being registered.
-     *
-     * @return the {@link BukkitBrigadierCommand}
-     */
-    public BukkitBrigadierCommand<S> getBrigadierCommand() {
-        return this.brigadierCommand;
-    }
-
-    /**
-     * Gets the {@link Command} being registered.
-     *
-     * @return the {@link Command}
-     */
-    public Command getCommand() {
-        return this.command;
-    }
-
-    /**
-     * Gets the {@link RootCommandNode} which is being registered to.
-     *
-     * @return the {@link RootCommandNode}
-     */
-    public RootCommandNode<S> getRoot() {
-        return this.root;
-    }
-
-    /**
-     * Gets the Bukkit APIs default arguments node (greedy string), for if
-     * you wish to reuse it.
-     *
-     * @return default arguments node
-     */
-    public ArgumentCommandNode<S, String> getDefaultArgs() {
-        return this.defaultArgs;
-    }
-
-    /**
-     * Gets the {@link LiteralCommandNode} to be registered for the {@link Command}.
-     *
-     * @return the {@link LiteralCommandNode}
-     */
-    public LiteralCommandNode<S> getLiteral() {
-        return this.literal;
-    }
-
-    /**
-     * Sets the {@link LiteralCommandNode} used to register this command. The default literal is mutable, so
-     * this is primarily if you want to completely replace the object.
-     *
-     * @param literal new node
-     */
-    public void setLiteral(LiteralCommandNode<S> literal) {
-        this.literal = literal;
-    }
-
-    /**
-     * Gets whether this command should is treated as "raw".
-     *
-     * @see #setRawCommand(boolean)
-     * @return whether this command is treated as "raw"
-     */
-    public boolean isRawCommand() {
-        return this.rawCommand;
-    }
-
-    /**
-     * Sets whether this command should be treated as "raw".
-     *
-     * <p>A "raw" command will only use the node provided by this event for
-     * sending the command tree to the client. For execution purposes, the default
-     * greedy string execution of a standard Bukkit {@link Command} is used.</p>
-     *
-     * <p>On older versions of Paper, this was the default and only behavior of this
-     * event.</p>
-     *
-     * @param rawCommand whether this command should be treated as "raw"
-     */
-    public void setRawCommand(final boolean rawCommand) {
-        this.rawCommand = rawCommand;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    /**
-     * Cancels registering this command to Brigadier, but will remain in Bukkit Command Map. Can be used to hide a
-     * command from all players.
-     *
-     * {@inheritDoc}
-     */
-    @Override
-    public void setCancelled(boolean cancel) {
-        this.cancelled = cancel;
-    }
-
-    @NotNull
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}
@@ -1,42 +0,0 @@
-package io.papermc.paper.brigadier;
-
-import com.mojang.brigadier.Message;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentLike;
-import net.kyori.adventure.text.TextComponent;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * Helper methods to bridge the gaps between Brigadier and Paper-MojangAPI.
- */
-public final class PaperBrigadier {
-    private PaperBrigadier() {
-        throw new RuntimeException("PaperBrigadier is not to be instantiated!");
-    }
-
-    /**
-     * Create a new Brigadier {@link Message} from a {@link ComponentLike}.
-     *
-     * <p>Mostly useful for creating rich suggestion tooltips in combination with other Paper-MojangAPI APIs.</p>
-     *
-     * @param componentLike The {@link ComponentLike} to use for the {@link Message} contents
-     * @return A new Brigadier {@link Message}
-     */
-    public static @NonNull Message message(final @NonNull ComponentLike componentLike) {
-        return PaperBrigadierProvider.instance().message(componentLike);
-    }
-
-    /**
-     * Create a new {@link Component} from a Brigadier {@link Message}.
-     *
-     * <p>If the {@link Message} was created from a {@link Component}, it will simply be
-     * converted back, otherwise a new {@link TextComponent} will be created with the
-     * content of {@link Message#getString()}</p>
-     *
-     * @param message The {@link Message} to create a {@link Component} from
-     * @return The created {@link Component}
-     */
-    public static @NonNull Component componentFromMessage(final @NonNull Message message) {
-        return PaperBrigadierProvider.instance().componentFromMessage(message);
-    }
-}
@@ -1,30 +0,0 @@
-package io.papermc.paper.brigadier;
-
-import com.mojang.brigadier.Message;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentLike;
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-import static java.util.Objects.requireNonNull;
-
-interface PaperBrigadierProvider {
-    final class Holder {
-        private static @MonotonicNonNull PaperBrigadierProvider INSTANCE;
-    }
-
-    static @NonNull PaperBrigadierProvider instance() {
-        return requireNonNull(Holder.INSTANCE, "PaperBrigadierProvider has not yet been initialized!");
-    }
-
-    static void initialize(final @NonNull PaperBrigadierProvider instance) {
-        if (Holder.INSTANCE != null) {
-            throw new IllegalStateException("PaperBrigadierProvider has already been initialized!");
-        }
-        Holder.INSTANCE = instance;
-    }
-
-    @NonNull Message message(@NonNull ComponentLike componentLike);
-
-    @NonNull Component componentFromMessage(@NonNull Message message);
-}
@@ -1,3 +1,8 @@
+> [!CAUTION]
+> **This branch will be deleted soon, please replace usage of it with the new `main` branch**.
+>
+> If you need history from before 1.21.4, please use the archive repo: https://github.com/PaperMC/Paper-archive
+
 Paper [![Paper Build Status](https://img.shields.io/github/actions/workflow/status/PaperMC/Paper/build.yml?branch=master)](https://github.com/PaperMC/Paper/actions)
 [![Discord](https://img.shields.io/discord/289587909051416579.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/papermc)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/papermc?label=GitHub%20Sponsors)](https://github.com/sponsors/PaperMC)
@@ -40,7 +45,7 @@ How To (Plugin Developers)
 <dependency>
    <groupId>io.papermc.paper</groupId>
    <artifactId>paper-api</artifactId>
-    <version>1.20.5-R0.1-SNAPSHOT</version>
+    <version>1.21.4-R0.1-SNAPSHOT</version>
    <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +58,7 @@ repositories {
 }

 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.5-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 }

 java {
@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+We generally only fully support the latest version, the same applies to exploits such as server crashes and item
+duplication bugs. In the transition period during larger Minecraft updates, we may still backport important fixes to the
+last minor or major release.
+
+## Reporting a Vulnerability
+
+For any issues that are NOT duplication bugs, server/client crashes, or otherwise serious exploits, please open an issue
+through the [Issues tab](https://github.com/PaperMC/Paper/issues).
+For exploits, please [join our Discord](https://discord.gg/papermc) and see the [#paper-exploit-report channel](https://discord.com/channels/289587909051416579/1208749386348101682) for
+further instructions.
@@ -14,14 +14,14 @@ tiny	2	0	mojang+yarn	spigot

 # CraftBukkit changes type
 c	net/minecraft/server/level/ServerLevel	net/minecraft/server/level/WorldServer
-	f	Lnet/minecraft/world/level/storage/PrimaryLevelData;	serverLevelData	K
+	f	Lnet/minecraft/world/level/storage/PrimaryLevelData;	serverLevelData	L

 c	net/minecraft/world/level/chunk/LevelChunk	net/minecraft/world/level/chunk/Chunk
 	f	Lnet/minecraft/server/level/ServerLevel;	level	r

 # See mappings-patch.tiny
 c	net/minecraft/server/level/ChunkMap	net/minecraft/server/level/PlayerChunkMap
-	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	F
+	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	G

 # The method is made public by Spigot, which then causes accidental overrides
 c	net/minecraft/world/entity/Entity	net/minecraft/world/entity/Entity
@@ -11,7 +11,7 @@ import kotlin.io.path.*
 plugins {
    java
    `maven-publish`
-    id("io.papermc.paperweight.core") version "1.6.2"
+    id("io.papermc.paperweight.core") version "1.7.7"
 }

 allprojects {
@@ -31,6 +31,7 @@ subprojects {
    tasks.withType<JavaCompile> {
        options.encoding = Charsets.UTF_8.name()
        options.release = 21
+        options.isFork = true
    }
    tasks.withType<Javadoc> {
        options.encoding = Charsets.UTF_8.name()
@@ -49,7 +50,6 @@ subprojects {
    repositories {
        mavenCentral()
        maven(paperMavenPublicUrl)
-        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") // TODO - Adventure snapshot
    }
 }

@@ -68,8 +68,8 @@ repositories {
 }

 dependencies {
-    paramMappings("net.fabricmc:yarn:1.20.5+build.1:mergedv2")
-    remapper("net.fabricmc:tiny-remapper:0.10.2:fat")
+    paramMappings("net.fabricmc:yarn:1.21.4+build.1:mergedv2")
+    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
    decompiler("org.vineflower:vineflower:1.10.1")
    spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")
    paperclip("io.papermc:paperclip:3.0.3")
@@ -110,11 +110,9 @@ paperweight {

 tasks.generateDevelopmentBundle {
    apiCoordinates = "io.papermc.paper:paper-api"
-    mojangApiCoordinates = "io.papermc.paper:paper-mojangapi"
    libraryRepositories.addAll(
        "https://repo.maven.apache.org/maven2/",
        paperMavenPublicUrl,
-        "https://s01.oss.sonatype.org/content/repositories/snapshots/", // TODO - Adventure snapshot
    )
 }

@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.20.5-R0.1-SNAPSHOT
-mcVersion=1.20.5
+version=1.21.4-R0.1-SNAPSHOT
+mcVersion=1.21.4

 # Set to true while updating Minecraft version
 updatingMinecraft=false
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -1,5 +1,6 @@
 import io.papermc.paperweight.PaperweightSourceGeneratorHelper
 import io.papermc.paperweight.extension.PaperweightSourceGeneratorExt
+import io.papermc.paperweight.util.defaultJavaLauncher

 plugins {
    java
@@ -15,7 +16,7 @@ dependencies {
    implementation("com.squareup:javapoet:1.13.0")
    implementation(project(":paper-api"))
    implementation("io.github.classgraph:classgraph:4.8.47")
-    implementation("org.jetbrains:annotations:24.0.1")
+    implementation("org.jetbrains:annotations:24.1.0")
    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
@@ -25,6 +26,7 @@ tasks.register<JavaExec>("generate") {
    mainClass.set("io.papermc.generator.Main")
    classpath(sourceSets.main.map { it.runtimeClasspath })
    args(projectDir.toPath().resolve("generated").toString())
+    javaLauncher = javaToolchains.defaultJavaLauncher(project)
 }

 tasks.test {
@@ -31,12 +31,10 @@ import org.bukkit.entity.Ocelot;
 import org.bukkit.entity.Panda;
 import org.bukkit.entity.Parrot;
 import org.bukkit.entity.Phantom;
-import org.bukkit.entity.PigZombie;
 import org.bukkit.entity.PolarBear;
 import org.bukkit.entity.PufferFish;
 import org.bukkit.entity.Rabbit;
 import org.bukkit.entity.Raider;
-import org.bukkit.entity.Ravager;
 import org.bukkit.entity.Shulker;
 import org.bukkit.entity.Silverfish;
 import org.bukkit.entity.SkeletonHorse;
@@ -46,7 +44,6 @@ import org.bukkit.entity.Spider;
 import org.bukkit.entity.Squid;
 import org.bukkit.entity.Strider;
 import org.bukkit.entity.Tameable;
-import org.bukkit.entity.TraderLlama;
 import org.bukkit.entity.Turtle;
 import org.bukkit.entity.Vex;
 import org.bukkit.entity.Vindicator;
@@ -54,8 +51,7 @@ import org.bukkit.entity.WanderingTrader;
 import org.bukkit.entity.Wither;
 import org.bukkit.entity.Wolf;
 import org.bukkit.entity.Zombie;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;

 /**
 * Vanilla keys for Mob Goals.
@@ -70,7 +66,8 @@ import org.jetbrains.annotations.NotNull;
        "unused",
        "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.5")
+@GeneratedFrom("1.21.4")
+@NullMarked
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
    GoalKey<AbstractHorse> RANDOM_STAND = create("random_stand", AbstractHorse.class);

@@ -106,6 +103,10 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Bee> BEE_WANDER = create("bee_wander", Bee.class);

+    GoalKey<Bee> VALIDATE_FLOWER = create("validate_flower", Bee.class);
+
+    GoalKey<Bee> VALIDATE_HIVE = create("validate_hive", Bee.class);
+
    GoalKey<Blaze> BLAZE_ATTACK = create("blaze_attack", Blaze.class);

    GoalKey<Cat> CAT_AVOID_ENTITY = create("cat_avoid_entity", Cat.class);
@@ -238,6 +239,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Guardian> GUARDIAN_ATTACK = create("guardian_attack", Guardian.class);

+    GoalKey<Illager> HOLD_GROUND_ATTACK = create("hold_ground_attack", Illager.class);
+
    GoalKey<Illager> RAIDER_OPEN_DOOR = create("raider_open_door", Illager.class);

    GoalKey<Illusioner> ILLUSIONER_BLINDNESS_SPELL = create("illusioner_blindness_spell", Illusioner.class);
@@ -330,8 +333,6 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<PolarBear> POLAR_BEAR_MELEE_ATTACK = create("polar_bear_melee_attack", PolarBear.class);

-    GoalKey<PolarBear> POLAR_BEAR_PANIC = create("polar_bear_panic", PolarBear.class);
-
    GoalKey<PufferFish> PUFFERFISH_PUFF = create("pufferfish_puff", PufferFish.class);

    GoalKey<Rabbit> RABBIT_AVOID_ENTITY = create("rabbit_avoid_entity", Rabbit.class);
@@ -340,8 +341,6 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Rabbit> RAID_GARDEN = create("raid_garden", Rabbit.class);

-    GoalKey<Raider> HOLD_GROUND_ATTACK = create("hold_ground_attack", Raider.class);
-
    GoalKey<Raider> LONG_DISTANCE_PATROL = create("long_distance_patrol", Raider.class);

    GoalKey<Raider> NEAREST_ATTACKABLE_WITCH = create("nearest_attackable_witch", Raider.class);
@@ -406,6 +405,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Tameable> SIT_WHEN_ORDERED_TO = create("sit_when_ordered_to", Tameable.class);

+    GoalKey<Tameable> TAMABLE_ANIMAL_PANIC = create("tamable_animal_panic", Tameable.class);
+
    GoalKey<Turtle> TURTLE_BREED = create("turtle_breed", Turtle.class);

    GoalKey<Turtle> TURTLE_GO_HOME = create("turtle_go_home", Turtle.class);
@@ -436,694 +437,11 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

    GoalKey<Wolf> WOLF_AVOID_ENTITY = create("wolf_avoid_entity", Wolf.class);

-    GoalKey<Wolf> WOLF_PANIC = create("wolf_panic", Wolf.class);
-
    GoalKey<Zombie> ZOMBIE_ATTACK = create("zombie_attack", Zombie.class);

    GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);

-    /**
-     * Removed in 1.20.2
-     */
-    @Deprecated(
-            since = "1.20.2"
-    )
-    GoalKey<Vindicator> VINDICATOR_MELEE_ATTACK = create("vindicator_melee_attack", Vindicator.class);
-
-    /**
-     * Removed in 1.20.2
-     */
-    @Deprecated(
-            since = "1.20.2"
-    )
-    GoalKey<Ravager> RAVAGER_MELEE_ATTACK = create("ravager_melee_attack", Ravager.class);
-
-    /**
-     * Removed in 1.20.2
-     */
-    @Deprecated(
-            since = "1.20.2"
-    )
-    GoalKey<Rabbit> EVIL_RABBIT_ATTACK = create("evil_rabbit_attack", Rabbit.class);
-
-    /**
-     * Removed in 1.16
-     */
-    @Deprecated(
-            forRemoval = true,
-            since = "1.16"
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PigZombie> ANGER = create("anger", PigZombie.class);
-
-    /**
-     * Removed in 1.16
-     */
-    @Deprecated(
-            forRemoval = true,
-            since = "1.16"
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PigZombie> ANGER_OTHER = create("anger_other", PigZombie.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Blaze> BLAZE_FIREBALL = create("blaze_fireball", Blaze.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Cat> TEMPT_CHANCE = create("tempt_chance", Cat.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Dolphin> DOLPHIN_PLAY_WITH_ITEMS = create("dolphin_play_with_items", Dolphin.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Drowned> DROWNED_GOTO_BEACH = create("drowned_goto_beach", Drowned.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> DROWNED_GOTO_WATER = create("drowned_goto_water", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Enderman> ENDERMAN_PICKUP_BLOCK = create("enderman_pickup_block", Enderman.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Enderman> ENDERMAN_PLACE_BLOCK = create("enderman_place_block", Enderman.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Enderman> PLAYER_WHO_LOOKED_AT_TARGET = create("player_who_looked_at_target", Enderman.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Evoker> EVOKER_CAST_SPELL = create("evoker_cast_spell", Evoker.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_DEFEND_TRUSTED = create("fox_defend_trusted", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_FACEPLANT = create("fox_faceplant", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_PERCH_AND_SEARCH = create("fox_perch_and_search", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_SLEEP = create("fox_sleep", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_SEEK_SHELTER = create("fox_seek_shelter", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fox> FOX_STALK_PREY = create("fox_stalk_prey", Fox.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Ghast> GHAST_ATTACK_TARGET = create("ghast_attack_target", Ghast.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Ghast> GHAST_IDLE_MOVE = create("ghast_idle_move", Ghast.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Ghast> GHAST_MOVE_TOWARDS_TARGET = create("ghast_move_towards_target", Ghast.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Spellcaster> SPELLCASTER_CAST_SPELL = create("spellcaster_cast_spell", Spellcaster.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<TraderLlama> LLAMATRADER_DEFENDED_WANDERING_TRADER = create("llamatrader_defended_wandering_trader", TraderLlama.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Panda> PANDA_HURT_BY_TARGET = create("panda_hurt_by_target", Panda.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PolarBear> POLARBEAR_ATTACK_PLAYERS = create("polarbear_attack_players", PolarBear.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PolarBear> POLARBEAR_HURT_BY = create("polarbear_hurt_by", PolarBear.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PolarBear> POLARBEAR_MELEE = create("polarbear_melee", PolarBear.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<PolarBear> POLARBEAR_PANIC = create("polarbear_panic", PolarBear.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Rabbit> EAT_CARROTS = create("eat_carrots", Rabbit.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Rabbit> KILLER_RABBIT_MELEE_ATTACK = create("killer_rabbit_melee_attack", Rabbit.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Rabbit> RABBIT_AVOID_TARGET = create("rabbit_avoid_target", Rabbit.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Raider> RAIDER_HOLD_GROUND = create("raider_hold_ground", Raider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Raider> RAIDER_OBTAIN_BANNER = create("raider_obtain_banner", Raider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Shulker> SHULKER_DEFENSE = create("shulker_defense", Shulker.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Shulker> SHULKER_NEAREST = create("shulker_nearest", Shulker.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Silverfish> SILVERFISH_HIDE_IN_BLOCK = create("silverfish_hide_in_block", Silverfish.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Silverfish> SILVERFISH_WAKE_OTHERS = create("silverfish_wake_others", Silverfish.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Slime> SLIME_IDLE = create("slime_idle", Slime.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Slime> SLIME_NEAREST_PLAYER = create("slime_nearest_player", Slime.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Slime> SLIME_RANDOM_JUMP = create("slime_random_jump", Slime.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Spider> SPIDER_MELEE_ATTACK = create("spider_melee_attack", Spider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Spider> SPIDER_NEAREST_ATTACKABLE_TARGET = create("spider_nearest_attackable_target", Spider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Squid> SQUID = create("squid", Squid.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Turtle> TURTLE_GOTO_WATER = create("turtle_goto_water", Turtle.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Turtle> TURTLE_TEMPT = create("turtle_tempt", Turtle.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Vex> VEX_COPY_TARGET_OF_OWNER = create("vex_copy_target_of_owner", Vex.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<WanderingTrader> VILLAGERTRADER_WANDER_TO_POSITION = create("villagertrader_wander_to_position", WanderingTrader.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<RangedEntity> ARROW_ATTACK = create("arrow_attack", RangedEntity.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> AVOID_TARGET = create("avoid_target", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Monster> BOW_SHOOT = create("bow_shoot", Monster.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> BREATH = create("breath", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Cat> CAT_SIT_ON_BED = create("cat_sit_on_bed", Cat.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Monster> CROSSBOW_ATTACK = create("crossbow_attack", Monster.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> DOOR_OPEN = create("door_open", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> EAT_TILE = create("eat_tile", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Fish> FISH_SCHOOL = create("fish_school", Fish.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> FOLLOW_ENTITY = create("follow_entity", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<SkeletonHorse> HORSE_TRAP = create("horse_trap", SkeletonHorse.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> HURT_BY_TARGET = create("hurt_by_target", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Cat> JUMP_ON_BLOCK = create("jump_on_block", Cat.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> LEAP_AT_TARGET = create("leap_at_target", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Llama> LLAMA_FOLLOW = create("llama_follow", Llama.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> MOVE_TOWARDS_TARGET = create("move_towards_target", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> NEAREST_ATTACKABLE_TARGET = create("nearest_attackable_target", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Raider> NEAREST_ATTACKABLE_TARGET_WITCH = create("nearest_attackable_target_witch", Raider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> NEAREST_VILLAGE = create("nearest_village", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Tameable> OWNER_HURT_BY_TARGET = create("owner_hurt_by_target", Tameable.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Tameable> OWNER_HURT_TARGET = create("owner_hurt_target", Tameable.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Parrot> PERCH = create("perch", Parrot.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Raider> RAID = create("raid", Raider.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> RANDOM_FLY = create("random_fly", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> RANDOM_LOOKAROUND = create("random_lookaround", Mob.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> RANDOM_STROLL_LAND = create("random_stroll_land", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> RANDOM_SWIM = create("random_swim", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Tameable> RANDOM_TARGET_NON_TAMED = create("random_target_non_tamed", Tameable.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Tameable> SIT = create("sit", Tameable.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> STROLL_VILLAGE = create("stroll_village", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<AbstractHorse> TAME = create("tame", AbstractHorse.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> WATER = create("water", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Dolphin> WATER_JUMP = create("water_jump", Dolphin.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Creature> STROLL_VILLAGE_GOLEM = create("stroll_village_golem", Creature.class);
-
-    @Deprecated(
-            forRemoval = true
-    )
-    @ApiStatus.ScheduledForRemoval(
-            inVersion = "1.21"
-    )
-    GoalKey<Mob> UNIVERSAL_ANGER_RESET = create("universal_anger_reset", Mob.class);
-
-    private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
-            final @NotNull Class<T> type) {
+    private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {
        return GoalKey.of(type, NamespacedKey.minecraft(key));
    }
 }
@@ -0,0 +1,260 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.attribute.Attribute;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#ATTRIBUTE}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class AttributeKeys {
+    /**
+     * {@code minecraft:armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> ARMOR = create(key("armor"));
+
+    /**
+     * {@code minecraft:armor_toughness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> ARMOR_TOUGHNESS = create(key("armor_toughness"));
+
+    /**
+     * {@code minecraft:attack_damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> ATTACK_DAMAGE = create(key("attack_damage"));
+
+    /**
+     * {@code minecraft:attack_knockback}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> ATTACK_KNOCKBACK = create(key("attack_knockback"));
+
+    /**
+     * {@code minecraft:attack_speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> ATTACK_SPEED = create(key("attack_speed"));
+
+    /**
+     * {@code minecraft:block_break_speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> BLOCK_BREAK_SPEED = create(key("block_break_speed"));
+
+    /**
+     * {@code minecraft:block_interaction_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> BLOCK_INTERACTION_RANGE = create(key("block_interaction_range"));
+
+    /**
+     * {@code minecraft:burning_time}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> BURNING_TIME = create(key("burning_time"));
+
+    /**
+     * {@code minecraft:entity_interaction_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> ENTITY_INTERACTION_RANGE = create(key("entity_interaction_range"));
+
+    /**
+     * {@code minecraft:explosion_knockback_resistance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> EXPLOSION_KNOCKBACK_RESISTANCE = create(key("explosion_knockback_resistance"));
+
+    /**
+     * {@code minecraft:fall_damage_multiplier}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> FALL_DAMAGE_MULTIPLIER = create(key("fall_damage_multiplier"));
+
+    /**
+     * {@code minecraft:flying_speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> FLYING_SPEED = create(key("flying_speed"));
+
+    /**
+     * {@code minecraft:follow_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> FOLLOW_RANGE = create(key("follow_range"));
+
+    /**
+     * {@code minecraft:gravity}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> GRAVITY = create(key("gravity"));
+
+    /**
+     * {@code minecraft:jump_strength}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> JUMP_STRENGTH = create(key("jump_strength"));
+
+    /**
+     * {@code minecraft:knockback_resistance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> KNOCKBACK_RESISTANCE = create(key("knockback_resistance"));
+
+    /**
+     * {@code minecraft:luck}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> LUCK = create(key("luck"));
+
+    /**
+     * {@code minecraft:max_absorption}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> MAX_ABSORPTION = create(key("max_absorption"));
+
+    /**
+     * {@code minecraft:max_health}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> MAX_HEALTH = create(key("max_health"));
+
+    /**
+     * {@code minecraft:mining_efficiency}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> MINING_EFFICIENCY = create(key("mining_efficiency"));
+
+    /**
+     * {@code minecraft:movement_efficiency}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> MOVEMENT_EFFICIENCY = create(key("movement_efficiency"));
+
+    /**
+     * {@code minecraft:movement_speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> MOVEMENT_SPEED = create(key("movement_speed"));
+
+    /**
+     * {@code minecraft:oxygen_bonus}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> OXYGEN_BONUS = create(key("oxygen_bonus"));
+
+    /**
+     * {@code minecraft:safe_fall_distance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> SAFE_FALL_DISTANCE = create(key("safe_fall_distance"));
+
+    /**
+     * {@code minecraft:scale}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> SCALE = create(key("scale"));
+
+    /**
+     * {@code minecraft:sneaking_speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> SNEAKING_SPEED = create(key("sneaking_speed"));
+
+    /**
+     * {@code minecraft:spawn_reinforcements}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> SPAWN_REINFORCEMENTS = create(key("spawn_reinforcements"));
+
+    /**
+     * {@code minecraft:step_height}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> STEP_HEIGHT = create(key("step_height"));
+
+    /**
+     * {@code minecraft:submerged_mining_speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> SUBMERGED_MINING_SPEED = create(key("submerged_mining_speed"));
+
+    /**
+     * {@code minecraft:sweeping_damage_ratio}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> SWEEPING_DAMAGE_RATIO = create(key("sweeping_damage_ratio"));
+
+    /**
+     * {@code minecraft:tempt_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> TEMPT_RANGE = create(key("tempt_range"));
+
+    /**
+     * {@code minecraft:water_movement_efficiency}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> WATER_MOVEMENT_EFFICIENCY = create(key("water_movement_efficiency"));
+
+    private AttributeKeys() {
+    }
+
+    private static TypedKey<Attribute> create(final Key key) {
+        return TypedKey.create(RegistryKey.ATTRIBUTE, key);
+    }
+}
@@ -0,0 +1,344 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.block.banner.PatternType;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#BANNER_PATTERN}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class BannerPatternKeys {
+    /**
+     * {@code minecraft:base}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> BASE = create(key("base"));
+
+    /**
+     * {@code minecraft:border}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> BORDER = create(key("border"));
+
+    /**
+     * {@code minecraft:bricks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> BRICKS = create(key("bricks"));
+
+    /**
+     * {@code minecraft:circle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> CIRCLE = create(key("circle"));
+
+    /**
+     * {@code minecraft:creeper}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> CREEPER = create(key("creeper"));
+
+    /**
+     * {@code minecraft:cross}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> CROSS = create(key("cross"));
+
+    /**
+     * {@code minecraft:curly_border}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> CURLY_BORDER = create(key("curly_border"));
+
+    /**
+     * {@code minecraft:diagonal_left}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> DIAGONAL_LEFT = create(key("diagonal_left"));
+
+    /**
+     * {@code minecraft:diagonal_right}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> DIAGONAL_RIGHT = create(key("diagonal_right"));
+
+    /**
+     * {@code minecraft:diagonal_up_left}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> DIAGONAL_UP_LEFT = create(key("diagonal_up_left"));
+
+    /**
+     * {@code minecraft:diagonal_up_right}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> DIAGONAL_UP_RIGHT = create(key("diagonal_up_right"));
+
+    /**
+     * {@code minecraft:flow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> FLOW = create(key("flow"));
+
+    /**
+     * {@code minecraft:flower}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> FLOWER = create(key("flower"));
+
+    /**
+     * {@code minecraft:globe}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> GLOBE = create(key("globe"));
+
+    /**
+     * {@code minecraft:gradient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> GRADIENT = create(key("gradient"));
+
+    /**
+     * {@code minecraft:gradient_up}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> GRADIENT_UP = create(key("gradient_up"));
+
+    /**
+     * {@code minecraft:guster}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> GUSTER = create(key("guster"));
+
+    /**
+     * {@code minecraft:half_horizontal}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> HALF_HORIZONTAL = create(key("half_horizontal"));
+
+    /**
+     * {@code minecraft:half_horizontal_bottom}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> HALF_HORIZONTAL_BOTTOM = create(key("half_horizontal_bottom"));
+
+    /**
+     * {@code minecraft:half_vertical}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> HALF_VERTICAL = create(key("half_vertical"));
+
+    /**
+     * {@code minecraft:half_vertical_right}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> HALF_VERTICAL_RIGHT = create(key("half_vertical_right"));
+
+    /**
+     * {@code minecraft:mojang}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> MOJANG = create(key("mojang"));
+
+    /**
+     * {@code minecraft:piglin}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> PIGLIN = create(key("piglin"));
+
+    /**
+     * {@code minecraft:rhombus}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> RHOMBUS = create(key("rhombus"));
+
+    /**
+     * {@code minecraft:skull}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> SKULL = create(key("skull"));
+
+    /**
+     * {@code minecraft:small_stripes}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> SMALL_STRIPES = create(key("small_stripes"));
+
+    /**
+     * {@code minecraft:square_bottom_left}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> SQUARE_BOTTOM_LEFT = create(key("square_bottom_left"));
+
+    /**
+     * {@code minecraft:square_bottom_right}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> SQUARE_BOTTOM_RIGHT = create(key("square_bottom_right"));
+
+    /**
+     * {@code minecraft:square_top_left}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> SQUARE_TOP_LEFT = create(key("square_top_left"));
+
+    /**
+     * {@code minecraft:square_top_right}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> SQUARE_TOP_RIGHT = create(key("square_top_right"));
+
+    /**
+     * {@code minecraft:straight_cross}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> STRAIGHT_CROSS = create(key("straight_cross"));
+
+    /**
+     * {@code minecraft:stripe_bottom}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> STRIPE_BOTTOM = create(key("stripe_bottom"));
+
+    /**
+     * {@code minecraft:stripe_center}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> STRIPE_CENTER = create(key("stripe_center"));
+
+    /**
+     * {@code minecraft:stripe_downleft}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> STRIPE_DOWNLEFT = create(key("stripe_downleft"));
+
+    /**
+     * {@code minecraft:stripe_downright}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> STRIPE_DOWNRIGHT = create(key("stripe_downright"));
+
+    /**
+     * {@code minecraft:stripe_left}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> STRIPE_LEFT = create(key("stripe_left"));
+
+    /**
+     * {@code minecraft:stripe_middle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> STRIPE_MIDDLE = create(key("stripe_middle"));
+
+    /**
+     * {@code minecraft:stripe_right}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> STRIPE_RIGHT = create(key("stripe_right"));
+
+    /**
+     * {@code minecraft:stripe_top}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> STRIPE_TOP = create(key("stripe_top"));
+
+    /**
+     * {@code minecraft:triangle_bottom}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> TRIANGLE_BOTTOM = create(key("triangle_bottom"));
+
+    /**
+     * {@code minecraft:triangle_top}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> TRIANGLE_TOP = create(key("triangle_top"));
+
+    /**
+     * {@code minecraft:triangles_bottom}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> TRIANGLES_BOTTOM = create(key("triangles_bottom"));
+
+    /**
+     * {@code minecraft:triangles_top}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PatternType> TRIANGLES_TOP = create(key("triangles_top"));
+
+    private BannerPatternKeys() {
+    }
+
+    /**
+     * Creates a key for {@link PatternType} in the registry {@code minecraft:banner_pattern}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    @ApiStatus.Experimental
+    public static TypedKey<PatternType> create(final Key key) {
+        return TypedKey.create(RegistryKey.BANNER_PATTERN, key);
+    }
+}
@@ -8,7 +8,7 @@ import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.Biome;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;

 /**
 * Vanilla keys for {@link RegistryKey#BIOME}.
@@ -23,7 +23,8 @@ import org.jetbrains.annotations.NotNull;
        "unused",
        "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.5")
+@GeneratedFrom("1.21.4")
+@NullMarked
@ApiStatus.Experimental
 public final class BiomeKeys {
    /**
@@ -299,6 +300,13 @@ public final class BiomeKeys {
     */
    public static final TypedKey<Biome> OLD_GROWTH_SPRUCE_TAIGA = create(key("old_growth_spruce_taiga"));

+    /**
+     * {@code minecraft:pale_garden}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Biome> PALE_GARDEN = create(key("pale_garden"));
+
    /**
     * {@code minecraft:plains}
     *
@@ -478,13 +486,13 @@ public final class BiomeKeys {
    }

    /**
-     * Creates a key for {@link Biome} in a registry.
+     * Creates a key for {@link Biome} in the registry {@code minecraft:worldgen/biome}.
     *
     * @param key the value's key in the registry
     * @return a new typed key
     */
    @ApiStatus.Experimental
-    public static @NotNull TypedKey<Biome> create(final @NotNull Key key) {
+    public static TypedKey<Biome> create(final Key key) {
        return TypedKey.create(RegistryKey.BIOME, key);
    }
 }
@@ -0,0 +1,113 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Cat;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#CAT_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class CatVariantKeys {
+    /**
+     * {@code minecraft:all_black}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> ALL_BLACK = create(key("all_black"));
+
+    /**
+     * {@code minecraft:black}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> BLACK = create(key("black"));
+
+    /**
+     * {@code minecraft:british_shorthair}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> BRITISH_SHORTHAIR = create(key("british_shorthair"));
+
+    /**
+     * {@code minecraft:calico}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> CALICO = create(key("calico"));
+
+    /**
+     * {@code minecraft:jellie}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> JELLIE = create(key("jellie"));
+
+    /**
+     * {@code minecraft:persian}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> PERSIAN = create(key("persian"));
+
+    /**
+     * {@code minecraft:ragdoll}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> RAGDOLL = create(key("ragdoll"));
+
+    /**
+     * {@code minecraft:red}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> RED = create(key("red"));
+
+    /**
+     * {@code minecraft:siamese}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> SIAMESE = create(key("siamese"));
+
+    /**
+     * {@code minecraft:tabby}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> TABBY = create(key("tabby"));
+
+    /**
+     * {@code minecraft:white}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.Type> WHITE = create(key("white"));
+
+    private CatVariantKeys() {
+    }
+
+    private static TypedKey<Cat.Type> create(final Key key) {
+        return TypedKey.create(RegistryKey.CAT_VARIANT, key);
+    }
+}
@@ -0,0 +1,386 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.damage.DamageType;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#DAMAGE_TYPE}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class DamageTypeKeys {
+    /**
+     * {@code minecraft:arrow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> ARROW = create(key("arrow"));
+
+    /**
+     * {@code minecraft:bad_respawn_point}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> BAD_RESPAWN_POINT = create(key("bad_respawn_point"));
+
+    /**
+     * {@code minecraft:cactus}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> CACTUS = create(key("cactus"));
+
+    /**
+     * {@code minecraft:campfire}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> CAMPFIRE = create(key("campfire"));
+
+    /**
+     * {@code minecraft:cramming}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> CRAMMING = create(key("cramming"));
+
+    /**
+     * {@code minecraft:dragon_breath}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> DRAGON_BREATH = create(key("dragon_breath"));
+
+    /**
+     * {@code minecraft:drown}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> DROWN = create(key("drown"));
+
+    /**
+     * {@code minecraft:dry_out}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> DRY_OUT = create(key("dry_out"));
+
+    /**
+     * {@code minecraft:ender_pearl}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> ENDER_PEARL = create(key("ender_pearl"));
+
+    /**
+     * {@code minecraft:explosion}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> EXPLOSION = create(key("explosion"));
+
+    /**
+     * {@code minecraft:fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> FALL = create(key("fall"));
+
+    /**
+     * {@code minecraft:falling_anvil}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> FALLING_ANVIL = create(key("falling_anvil"));
+
+    /**
+     * {@code minecraft:falling_block}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> FALLING_BLOCK = create(key("falling_block"));
+
+    /**
+     * {@code minecraft:falling_stalactite}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> FALLING_STALACTITE = create(key("falling_stalactite"));
+
+    /**
+     * {@code minecraft:fireball}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> FIREBALL = create(key("fireball"));
+
+    /**
+     * {@code minecraft:fireworks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> FIREWORKS = create(key("fireworks"));
+
+    /**
+     * {@code minecraft:fly_into_wall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> FLY_INTO_WALL = create(key("fly_into_wall"));
+
+    /**
+     * {@code minecraft:freeze}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> FREEZE = create(key("freeze"));
+
+    /**
+     * {@code minecraft:generic}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> GENERIC = create(key("generic"));
+
+    /**
+     * {@code minecraft:generic_kill}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> GENERIC_KILL = create(key("generic_kill"));
+
+    /**
+     * {@code minecraft:hot_floor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> HOT_FLOOR = create(key("hot_floor"));
+
+    /**
+     * {@code minecraft:in_fire}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> IN_FIRE = create(key("in_fire"));
+
+    /**
+     * {@code minecraft:in_wall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> IN_WALL = create(key("in_wall"));
+
+    /**
+     * {@code minecraft:indirect_magic}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> INDIRECT_MAGIC = create(key("indirect_magic"));
+
+    /**
+     * {@code minecraft:lava}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> LAVA = create(key("lava"));
+
+    /**
+     * {@code minecraft:lightning_bolt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> LIGHTNING_BOLT = create(key("lightning_bolt"));
+
+    /**
+     * {@code minecraft:mace_smash}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> MACE_SMASH = create(key("mace_smash"));
+
+    /**
+     * {@code minecraft:magic}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> MAGIC = create(key("magic"));
+
+    /**
+     * {@code minecraft:mob_attack}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> MOB_ATTACK = create(key("mob_attack"));
+
+    /**
+     * {@code minecraft:mob_attack_no_aggro}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> MOB_ATTACK_NO_AGGRO = create(key("mob_attack_no_aggro"));
+
+    /**
+     * {@code minecraft:mob_projectile}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> MOB_PROJECTILE = create(key("mob_projectile"));
+
+    /**
+     * {@code minecraft:on_fire}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> ON_FIRE = create(key("on_fire"));
+
+    /**
+     * {@code minecraft:out_of_world}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> OUT_OF_WORLD = create(key("out_of_world"));
+
+    /**
+     * {@code minecraft:outside_border}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> OUTSIDE_BORDER = create(key("outside_border"));
+
+    /**
+     * {@code minecraft:player_attack}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> PLAYER_ATTACK = create(key("player_attack"));
+
+    /**
+     * {@code minecraft:player_explosion}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> PLAYER_EXPLOSION = create(key("player_explosion"));
+
+    /**
+     * {@code minecraft:sonic_boom}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> SONIC_BOOM = create(key("sonic_boom"));
+
+    /**
+     * {@code minecraft:spit}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> SPIT = create(key("spit"));
+
+    /**
+     * {@code minecraft:stalagmite}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> STALAGMITE = create(key("stalagmite"));
+
+    /**
+     * {@code minecraft:starve}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> STARVE = create(key("starve"));
+
+    /**
+     * {@code minecraft:sting}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> STING = create(key("sting"));
+
+    /**
+     * {@code minecraft:sweet_berry_bush}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> SWEET_BERRY_BUSH = create(key("sweet_berry_bush"));
+
+    /**
+     * {@code minecraft:thorns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> THORNS = create(key("thorns"));
+
+    /**
+     * {@code minecraft:thrown}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> THROWN = create(key("thrown"));
+
+    /**
+     * {@code minecraft:trident}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> TRIDENT = create(key("trident"));
+
+    /**
+     * {@code minecraft:unattributed_fireball}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> UNATTRIBUTED_FIREBALL = create(key("unattributed_fireball"));
+
+    /**
+     * {@code minecraft:wind_charge}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> WIND_CHARGE = create(key("wind_charge"));
+
+    /**
+     * {@code minecraft:wither}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> WITHER = create(key("wither"));
+
+    /**
+     * {@code minecraft:wither_skull}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> WITHER_SKULL = create(key("wither_skull"));
+
+    private DamageTypeKeys() {
+    }
+
+    /**
+     * Creates a key for {@link DamageType} in the registry {@code minecraft:damage_type}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    @ApiStatus.Experimental
+    public static TypedKey<DamageType> create(final Key key) {
+        return TypedKey.create(RegistryKey.DAMAGE_TYPE, key);
+    }
+}
@@ -0,0 +1,337 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.enchantments.Enchantment;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#ENCHANTMENT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class EnchantmentKeys {
+    /**
+     * {@code minecraft:aqua_affinity}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> AQUA_AFFINITY = create(key("aqua_affinity"));
+
+    /**
+     * {@code minecraft:bane_of_arthropods}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> BANE_OF_ARTHROPODS = create(key("bane_of_arthropods"));
+
+    /**
+     * {@code minecraft:binding_curse}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> BINDING_CURSE = create(key("binding_curse"));
+
+    /**
+     * {@code minecraft:blast_protection}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> BLAST_PROTECTION = create(key("blast_protection"));
+
+    /**
+     * {@code minecraft:breach}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> BREACH = create(key("breach"));
+
+    /**
+     * {@code minecraft:channeling}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> CHANNELING = create(key("channeling"));
+
+    /**
+     * {@code minecraft:density}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> DENSITY = create(key("density"));
+
+    /**
+     * {@code minecraft:depth_strider}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> DEPTH_STRIDER = create(key("depth_strider"));
+
+    /**
+     * {@code minecraft:efficiency}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> EFFICIENCY = create(key("efficiency"));
+
+    /**
+     * {@code minecraft:feather_falling}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> FEATHER_FALLING = create(key("feather_falling"));
+
+    /**
+     * {@code minecraft:fire_aspect}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> FIRE_ASPECT = create(key("fire_aspect"));
+
+    /**
+     * {@code minecraft:fire_protection}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> FIRE_PROTECTION = create(key("fire_protection"));
+
+    /**
+     * {@code minecraft:flame}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> FLAME = create(key("flame"));
+
+    /**
+     * {@code minecraft:fortune}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> FORTUNE = create(key("fortune"));
+
+    /**
+     * {@code minecraft:frost_walker}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> FROST_WALKER = create(key("frost_walker"));
+
+    /**
+     * {@code minecraft:impaling}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> IMPALING = create(key("impaling"));
+
+    /**
+     * {@code minecraft:infinity}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> INFINITY = create(key("infinity"));
+
+    /**
+     * {@code minecraft:knockback}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> KNOCKBACK = create(key("knockback"));
+
+    /**
+     * {@code minecraft:looting}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> LOOTING = create(key("looting"));
+
+    /**
+     * {@code minecraft:loyalty}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> LOYALTY = create(key("loyalty"));
+
+    /**
+     * {@code minecraft:luck_of_the_sea}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> LUCK_OF_THE_SEA = create(key("luck_of_the_sea"));
+
+    /**
+     * {@code minecraft:lure}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> LURE = create(key("lure"));
+
+    /**
+     * {@code minecraft:mending}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> MENDING = create(key("mending"));
+
+    /**
+     * {@code minecraft:multishot}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> MULTISHOT = create(key("multishot"));
+
+    /**
+     * {@code minecraft:piercing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> PIERCING = create(key("piercing"));
+
+    /**
+     * {@code minecraft:power}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> POWER = create(key("power"));
+
+    /**
+     * {@code minecraft:projectile_protection}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> PROJECTILE_PROTECTION = create(key("projectile_protection"));
+
+    /**
+     * {@code minecraft:protection}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> PROTECTION = create(key("protection"));
+
+    /**
+     * {@code minecraft:punch}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> PUNCH = create(key("punch"));
+
+    /**
+     * {@code minecraft:quick_charge}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> QUICK_CHARGE = create(key("quick_charge"));
+
+    /**
+     * {@code minecraft:respiration}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> RESPIRATION = create(key("respiration"));
+
+    /**
+     * {@code minecraft:riptide}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> RIPTIDE = create(key("riptide"));
+
+    /**
+     * {@code minecraft:sharpness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> SHARPNESS = create(key("sharpness"));
+
+    /**
+     * {@code minecraft:silk_touch}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> SILK_TOUCH = create(key("silk_touch"));
+
+    /**
+     * {@code minecraft:smite}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> SMITE = create(key("smite"));
+
+    /**
+     * {@code minecraft:soul_speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> SOUL_SPEED = create(key("soul_speed"));
+
+    /**
+     * {@code minecraft:sweeping_edge}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> SWEEPING_EDGE = create(key("sweeping_edge"));
+
+    /**
+     * {@code minecraft:swift_sneak}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> SWIFT_SNEAK = create(key("swift_sneak"));
+
+    /**
+     * {@code minecraft:thorns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> THORNS = create(key("thorns"));
+
+    /**
+     * {@code minecraft:unbreaking}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> UNBREAKING = create(key("unbreaking"));
+
+    /**
+     * {@code minecraft:vanishing_curse}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> VANISHING_CURSE = create(key("vanishing_curse"));
+
+    /**
+     * {@code minecraft:wind_burst}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> WIND_BURST = create(key("wind_burst"));
+
+    private EnchantmentKeys() {
+    }
+
+    /**
+     * Creates a key for {@link Enchantment} in the registry {@code minecraft:enchantment}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    @ApiStatus.Experimental
+    public static TypedKey<Enchantment> create(final Key key) {
+        return TypedKey.create(RegistryKey.ENCHANTMENT, key);
+    }
+}
@@ -0,0 +1,71 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.Fluid;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#FLUID}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class FluidKeys {
+    /**
+     * {@code minecraft:empty}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Fluid> EMPTY = create(key("empty"));
+
+    /**
+     * {@code minecraft:flowing_lava}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Fluid> FLOWING_LAVA = create(key("flowing_lava"));
+
+    /**
+     * {@code minecraft:flowing_water}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Fluid> FLOWING_WATER = create(key("flowing_water"));
+
+    /**
+     * {@code minecraft:lava}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Fluid> LAVA = create(key("lava"));
+
+    /**
+     * {@code minecraft:water}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Fluid> WATER = create(key("water"));
+
+    private FluidKeys() {
+    }
+
+    private static TypedKey<Fluid> create(final Key key) {
+        return TypedKey.create(RegistryKey.FLUID, key);
+    }
+}
@@ -0,0 +1,57 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Frog;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#FROG_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class FrogVariantKeys {
+    /**
+     * {@code minecraft:cold}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Frog.Variant> COLD = create(key("cold"));
+
+    /**
+     * {@code minecraft:temperate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Frog.Variant> TEMPERATE = create(key("temperate"));
+
+    /**
+     * {@code minecraft:warm}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Frog.Variant> WARM = create(key("warm"));
+
+    private FrogVariantKeys() {
+    }
+
+    private static TypedKey<Frog.Variant> create(final Key key) {
+        return TypedKey.create(RegistryKey.FROG_VARIANT, key);
+    }
+}
@@ -8,7 +8,7 @@ import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.GameEvent;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;

 /**
 * Vanilla keys for {@link RegistryKey#GAME_EVENT}.
@@ -23,7 +23,8 @@ import org.jetbrains.annotations.NotNull;
        "unused",
        "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.5")
+@GeneratedFrom("1.21.4")
+@NullMarked
@ApiStatus.Experimental
 public final class GameEventKeys {
    /**
@@ -450,13 +451,13 @@ public final class GameEventKeys {
    }

    /**
-     * Creates a key for {@link GameEvent} in a registry.
+     * Creates a key for {@link GameEvent} in the registry {@code minecraft:game_event}.
     *
     * @param key the value's key in the registry
     * @return a new typed key
     */
    @ApiStatus.Experimental
-    public static @NotNull TypedKey<GameEvent> create(final @NotNull Key key) {
+    public static TypedKey<GameEvent> create(final Key key) {
        return TypedKey.create(RegistryKey.GAME_EVENT, key);
    }
 }
@@ -0,0 +1,99 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.MusicInstrument;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#INSTRUMENT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class InstrumentKeys {
+    /**
+     * {@code minecraft:admire_goat_horn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MusicInstrument> ADMIRE_GOAT_HORN = create(key("admire_goat_horn"));
+
+    /**
+     * {@code minecraft:call_goat_horn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MusicInstrument> CALL_GOAT_HORN = create(key("call_goat_horn"));
+
+    /**
+     * {@code minecraft:dream_goat_horn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MusicInstrument> DREAM_GOAT_HORN = create(key("dream_goat_horn"));
+
+    /**
+     * {@code minecraft:feel_goat_horn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MusicInstrument> FEEL_GOAT_HORN = create(key("feel_goat_horn"));
+
+    /**
+     * {@code minecraft:ponder_goat_horn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MusicInstrument> PONDER_GOAT_HORN = create(key("ponder_goat_horn"));
+
+    /**
+     * {@code minecraft:seek_goat_horn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MusicInstrument> SEEK_GOAT_HORN = create(key("seek_goat_horn"));
+
+    /**
+     * {@code minecraft:sing_goat_horn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MusicInstrument> SING_GOAT_HORN = create(key("sing_goat_horn"));
+
+    /**
+     * {@code minecraft:yearn_goat_horn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MusicInstrument> YEARN_GOAT_HORN = create(key("yearn_goat_horn"));
+
+    private InstrumentKeys() {
+    }
+
+    /**
+     * Creates a key for {@link MusicInstrument} in the registry {@code minecraft:instrument}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    @ApiStatus.Experimental
+    public static TypedKey<MusicInstrument> create(final Key key) {
+        return TypedKey.create(RegistryKey.INSTRUMENT, key);
+    }
+}
@@ -0,0 +1,176 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.JukeboxSong;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#JUKEBOX_SONG}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class JukeboxSongKeys {
+    /**
+     * {@code minecraft:11}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> ELEVEN = create(key("11"));
+
+    /**
+     * {@code minecraft:13}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> THIRTEEN = create(key("13"));
+
+    /**
+     * {@code minecraft:5}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> FIVE = create(key("5"));
+
+    /**
+     * {@code minecraft:blocks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> BLOCKS = create(key("blocks"));
+
+    /**
+     * {@code minecraft:cat}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> CAT = create(key("cat"));
+
+    /**
+     * {@code minecraft:chirp}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> CHIRP = create(key("chirp"));
+
+    /**
+     * {@code minecraft:creator}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> CREATOR = create(key("creator"));
+
+    /**
+     * {@code minecraft:creator_music_box}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> CREATOR_MUSIC_BOX = create(key("creator_music_box"));
+
+    /**
+     * {@code minecraft:far}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> FAR = create(key("far"));
+
+    /**
+     * {@code minecraft:mall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> MALL = create(key("mall"));
+
+    /**
+     * {@code minecraft:mellohi}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> MELLOHI = create(key("mellohi"));
+
+    /**
+     * {@code minecraft:otherside}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> OTHERSIDE = create(key("otherside"));
+
+    /**
+     * {@code minecraft:pigstep}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> PIGSTEP = create(key("pigstep"));
+
+    /**
+     * {@code minecraft:precipice}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> PRECIPICE = create(key("precipice"));
+
+    /**
+     * {@code minecraft:relic}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> RELIC = create(key("relic"));
+
+    /**
+     * {@code minecraft:stal}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> STAL = create(key("stal"));
+
+    /**
+     * {@code minecraft:strad}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> STRAD = create(key("strad"));
+
+    /**
+     * {@code minecraft:wait}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> WAIT = create(key("wait"));
+
+    /**
+     * {@code minecraft:ward}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> WARD = create(key("ward"));
+
+    private JukeboxSongKeys() {
+    }
+
+    /**
+     * Creates a key for {@link JukeboxSong} in the registry {@code minecraft:jukebox_song}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    @ApiStatus.Experimental
+    public static TypedKey<JukeboxSong> create(final Key key) {
+        return TypedKey.create(RegistryKey.JUKEBOX_SONG, key);
+    }
+}
@@ -0,0 +1,281 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.map.MapCursor;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#MAP_DECORATION_TYPE}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class MapDecorationTypeKeys {
+    /**
+     * {@code minecraft:banner_black}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_BLACK = create(key("banner_black"));
+
+    /**
+     * {@code minecraft:banner_blue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_BLUE = create(key("banner_blue"));
+
+    /**
+     * {@code minecraft:banner_brown}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_BROWN = create(key("banner_brown"));
+
+    /**
+     * {@code minecraft:banner_cyan}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_CYAN = create(key("banner_cyan"));
+
+    /**
+     * {@code minecraft:banner_gray}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_GRAY = create(key("banner_gray"));
+
+    /**
+     * {@code minecraft:banner_green}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_GREEN = create(key("banner_green"));
+
+    /**
+     * {@code minecraft:banner_light_blue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_LIGHT_BLUE = create(key("banner_light_blue"));
+
+    /**
+     * {@code minecraft:banner_light_gray}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_LIGHT_GRAY = create(key("banner_light_gray"));
+
+    /**
+     * {@code minecraft:banner_lime}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_LIME = create(key("banner_lime"));
+
+    /**
+     * {@code minecraft:banner_magenta}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_MAGENTA = create(key("banner_magenta"));
+
+    /**
+     * {@code minecraft:banner_orange}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_ORANGE = create(key("banner_orange"));
+
+    /**
+     * {@code minecraft:banner_pink}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_PINK = create(key("banner_pink"));
+
+    /**
+     * {@code minecraft:banner_purple}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_PURPLE = create(key("banner_purple"));
+
+    /**
+     * {@code minecraft:banner_red}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_RED = create(key("banner_red"));
+
+    /**
+     * {@code minecraft:banner_white}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_WHITE = create(key("banner_white"));
+
+    /**
+     * {@code minecraft:banner_yellow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BANNER_YELLOW = create(key("banner_yellow"));
+
+    /**
+     * {@code minecraft:blue_marker}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> BLUE_MARKER = create(key("blue_marker"));
+
+    /**
+     * {@code minecraft:frame}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> FRAME = create(key("frame"));
+
+    /**
+     * {@code minecraft:jungle_temple}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> JUNGLE_TEMPLE = create(key("jungle_temple"));
+
+    /**
+     * {@code minecraft:mansion}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> MANSION = create(key("mansion"));
+
+    /**
+     * {@code minecraft:monument}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> MONUMENT = create(key("monument"));
+
+    /**
+     * {@code minecraft:player}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> PLAYER = create(key("player"));
+
+    /**
+     * {@code minecraft:player_off_limits}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> PLAYER_OFF_LIMITS = create(key("player_off_limits"));
+
+    /**
+     * {@code minecraft:player_off_map}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> PLAYER_OFF_MAP = create(key("player_off_map"));
+
+    /**
+     * {@code minecraft:red_marker}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> RED_MARKER = create(key("red_marker"));
+
+    /**
+     * {@code minecraft:red_x}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> RED_X = create(key("red_x"));
+
+    /**
+     * {@code minecraft:swamp_hut}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> SWAMP_HUT = create(key("swamp_hut"));
+
+    /**
+     * {@code minecraft:target_point}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> TARGET_POINT = create(key("target_point"));
+
+    /**
+     * {@code minecraft:target_x}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> TARGET_X = create(key("target_x"));
+
+    /**
+     * {@code minecraft:trial_chambers}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> TRIAL_CHAMBERS = create(key("trial_chambers"));
+
+    /**
+     * {@code minecraft:village_desert}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> VILLAGE_DESERT = create(key("village_desert"));
+
+    /**
+     * {@code minecraft:village_plains}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> VILLAGE_PLAINS = create(key("village_plains"));
+
+    /**
+     * {@code minecraft:village_savanna}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> VILLAGE_SAVANNA = create(key("village_savanna"));
+
+    /**
+     * {@code minecraft:village_snowy}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> VILLAGE_SNOWY = create(key("village_snowy"));
+
+    /**
+     * {@code minecraft:village_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> VILLAGE_TAIGA = create(key("village_taiga"));
+
+    private MapDecorationTypeKeys() {
+    }
+
+    private static TypedKey<MapCursor.Type> create(final Key key) {
+        return TypedKey.create(RegistryKey.MAP_DECORATION_TYPE, key);
+    }
+}
@@ -0,0 +1,211 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.inventory.MenuType;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#MENU}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class MenuTypeKeys {
+    /**
+     * {@code minecraft:anvil}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> ANVIL = create(key("anvil"));
+
+    /**
+     * {@code minecraft:beacon}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> BEACON = create(key("beacon"));
+
+    /**
+     * {@code minecraft:blast_furnace}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> BLAST_FURNACE = create(key("blast_furnace"));
+
+    /**
+     * {@code minecraft:brewing_stand}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> BREWING_STAND = create(key("brewing_stand"));
+
+    /**
+     * {@code minecraft:cartography_table}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> CARTOGRAPHY_TABLE = create(key("cartography_table"));
+
+    /**
+     * {@code minecraft:crafter_3x3}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> CRAFTER_3X3 = create(key("crafter_3x3"));
+
+    /**
+     * {@code minecraft:crafting}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> CRAFTING = create(key("crafting"));
+
+    /**
+     * {@code minecraft:enchantment}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> ENCHANTMENT = create(key("enchantment"));
+
+    /**
+     * {@code minecraft:furnace}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> FURNACE = create(key("furnace"));
+
+    /**
+     * {@code minecraft:generic_3x3}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> GENERIC_3X3 = create(key("generic_3x3"));
+
+    /**
+     * {@code minecraft:generic_9x1}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> GENERIC_9X1 = create(key("generic_9x1"));
+
+    /**
+     * {@code minecraft:generic_9x2}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> GENERIC_9X2 = create(key("generic_9x2"));
+
+    /**
+     * {@code minecraft:generic_9x3}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> GENERIC_9X3 = create(key("generic_9x3"));
+
+    /**
+     * {@code minecraft:generic_9x4}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> GENERIC_9X4 = create(key("generic_9x4"));
+
+    /**
+     * {@code minecraft:generic_9x5}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> GENERIC_9X5 = create(key("generic_9x5"));
+
+    /**
+     * {@code minecraft:generic_9x6}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> GENERIC_9X6 = create(key("generic_9x6"));
+
+    /**
+     * {@code minecraft:grindstone}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> GRINDSTONE = create(key("grindstone"));
+
+    /**
+     * {@code minecraft:hopper}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> HOPPER = create(key("hopper"));
+
+    /**
+     * {@code minecraft:lectern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> LECTERN = create(key("lectern"));
+
+    /**
+     * {@code minecraft:loom}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> LOOM = create(key("loom"));
+
+    /**
+     * {@code minecraft:merchant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> MERCHANT = create(key("merchant"));
+
+    /**
+     * {@code minecraft:shulker_box}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> SHULKER_BOX = create(key("shulker_box"));
+
+    /**
+     * {@code minecraft:smithing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> SMITHING = create(key("smithing"));
+
+    /**
+     * {@code minecraft:smoker}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> SMOKER = create(key("smoker"));
+
+    /**
+     * {@code minecraft:stonecutter}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MenuType> STONECUTTER = create(key("stonecutter"));
+
+    private MenuTypeKeys() {
+    }
+
+    private static TypedKey<MenuType> create(final Key key) {
+        return TypedKey.create(RegistryKey.MENU, key);
+    }
+}
@@ -0,0 +1,309 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#MOB_EFFECT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class MobEffectKeys {
+    /**
+     * {@code minecraft:absorption}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> ABSORPTION = create(key("absorption"));
+
+    /**
+     * {@code minecraft:bad_omen}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> BAD_OMEN = create(key("bad_omen"));
+
+    /**
+     * {@code minecraft:blindness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> BLINDNESS = create(key("blindness"));
+
+    /**
+     * {@code minecraft:conduit_power}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> CONDUIT_POWER = create(key("conduit_power"));
+
+    /**
+     * {@code minecraft:darkness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> DARKNESS = create(key("darkness"));
+
+    /**
+     * {@code minecraft:dolphins_grace}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> DOLPHINS_GRACE = create(key("dolphins_grace"));
+
+    /**
+     * {@code minecraft:fire_resistance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> FIRE_RESISTANCE = create(key("fire_resistance"));
+
+    /**
+     * {@code minecraft:glowing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> GLOWING = create(key("glowing"));
+
+    /**
+     * {@code minecraft:haste}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> HASTE = create(key("haste"));
+
+    /**
+     * {@code minecraft:health_boost}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> HEALTH_BOOST = create(key("health_boost"));
+
+    /**
+     * {@code minecraft:hero_of_the_village}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> HERO_OF_THE_VILLAGE = create(key("hero_of_the_village"));
+
+    /**
+     * {@code minecraft:hunger}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> HUNGER = create(key("hunger"));
+
+    /**
+     * {@code minecraft:infested}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> INFESTED = create(key("infested"));
+
+    /**
+     * {@code minecraft:instant_damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> INSTANT_DAMAGE = create(key("instant_damage"));
+
+    /**
+     * {@code minecraft:instant_health}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> INSTANT_HEALTH = create(key("instant_health"));
+
+    /**
+     * {@code minecraft:invisibility}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> INVISIBILITY = create(key("invisibility"));
+
+    /**
+     * {@code minecraft:jump_boost}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> JUMP_BOOST = create(key("jump_boost"));
+
+    /**
+     * {@code minecraft:levitation}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> LEVITATION = create(key("levitation"));
+
+    /**
+     * {@code minecraft:luck}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> LUCK = create(key("luck"));
+
+    /**
+     * {@code minecraft:mining_fatigue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> MINING_FATIGUE = create(key("mining_fatigue"));
+
+    /**
+     * {@code minecraft:nausea}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> NAUSEA = create(key("nausea"));
+
+    /**
+     * {@code minecraft:night_vision}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> NIGHT_VISION = create(key("night_vision"));
+
+    /**
+     * {@code minecraft:oozing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> OOZING = create(key("oozing"));
+
+    /**
+     * {@code minecraft:poison}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> POISON = create(key("poison"));
+
+    /**
+     * {@code minecraft:raid_omen}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> RAID_OMEN = create(key("raid_omen"));
+
+    /**
+     * {@code minecraft:regeneration}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> REGENERATION = create(key("regeneration"));
+
+    /**
+     * {@code minecraft:resistance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> RESISTANCE = create(key("resistance"));
+
+    /**
+     * {@code minecraft:saturation}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> SATURATION = create(key("saturation"));
+
+    /**
+     * {@code minecraft:slow_falling}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> SLOW_FALLING = create(key("slow_falling"));
+
+    /**
+     * {@code minecraft:slowness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> SLOWNESS = create(key("slowness"));
+
+    /**
+     * {@code minecraft:speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> SPEED = create(key("speed"));
+
+    /**
+     * {@code minecraft:strength}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> STRENGTH = create(key("strength"));
+
+    /**
+     * {@code minecraft:trial_omen}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> TRIAL_OMEN = create(key("trial_omen"));
+
+    /**
+     * {@code minecraft:unluck}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> UNLUCK = create(key("unluck"));
+
+    /**
+     * {@code minecraft:water_breathing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> WATER_BREATHING = create(key("water_breathing"));
+
+    /**
+     * {@code minecraft:weakness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> WEAKNESS = create(key("weakness"));
+
+    /**
+     * {@code minecraft:weaving}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> WEAVING = create(key("weaving"));
+
+    /**
+     * {@code minecraft:wind_charged}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> WIND_CHARGED = create(key("wind_charged"));
+
+    /**
+     * {@code minecraft:wither}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> WITHER = create(key("wither"));
+
+    private MobEffectKeys() {
+    }
+
+    private static TypedKey<PotionEffectType> create(final Key key) {
+        return TypedKey.create(RegistryKey.MOB_EFFECT, key);
+    }
+}
@@ -0,0 +1,393 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.Art;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#PAINTING_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class PaintingVariantKeys {
+    /**
+     * {@code minecraft:alban}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> ALBAN = create(key("alban"));
+
+    /**
+     * {@code minecraft:aztec}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> AZTEC = create(key("aztec"));
+
+    /**
+     * {@code minecraft:aztec2}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> AZTEC2 = create(key("aztec2"));
+
+    /**
+     * {@code minecraft:backyard}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> BACKYARD = create(key("backyard"));
+
+    /**
+     * {@code minecraft:baroque}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> BAROQUE = create(key("baroque"));
+
+    /**
+     * {@code minecraft:bomb}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> BOMB = create(key("bomb"));
+
+    /**
+     * {@code minecraft:bouquet}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> BOUQUET = create(key("bouquet"));
+
+    /**
+     * {@code minecraft:burning_skull}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> BURNING_SKULL = create(key("burning_skull"));
+
+    /**
+     * {@code minecraft:bust}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> BUST = create(key("bust"));
+
+    /**
+     * {@code minecraft:cavebird}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> CAVEBIRD = create(key("cavebird"));
+
+    /**
+     * {@code minecraft:changing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> CHANGING = create(key("changing"));
+
+    /**
+     * {@code minecraft:cotan}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> COTAN = create(key("cotan"));
+
+    /**
+     * {@code minecraft:courbet}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> COURBET = create(key("courbet"));
+
+    /**
+     * {@code minecraft:creebet}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> CREEBET = create(key("creebet"));
+
+    /**
+     * {@code minecraft:donkey_kong}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> DONKEY_KONG = create(key("donkey_kong"));
+
+    /**
+     * {@code minecraft:earth}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> EARTH = create(key("earth"));
+
+    /**
+     * {@code minecraft:endboss}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> ENDBOSS = create(key("endboss"));
+
+    /**
+     * {@code minecraft:fern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> FERN = create(key("fern"));
+
+    /**
+     * {@code minecraft:fighters}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> FIGHTERS = create(key("fighters"));
+
+    /**
+     * {@code minecraft:finding}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> FINDING = create(key("finding"));
+
+    /**
+     * {@code minecraft:fire}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> FIRE = create(key("fire"));
+
+    /**
+     * {@code minecraft:graham}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> GRAHAM = create(key("graham"));
+
+    /**
+     * {@code minecraft:humble}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> HUMBLE = create(key("humble"));
+
+    /**
+     * {@code minecraft:kebab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> KEBAB = create(key("kebab"));
+
+    /**
+     * {@code minecraft:lowmist}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> LOWMIST = create(key("lowmist"));
+
+    /**
+     * {@code minecraft:match}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> MATCH = create(key("match"));
+
+    /**
+     * {@code minecraft:meditative}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> MEDITATIVE = create(key("meditative"));
+
+    /**
+     * {@code minecraft:orb}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> ORB = create(key("orb"));
+
+    /**
+     * {@code minecraft:owlemons}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> OWLEMONS = create(key("owlemons"));
+
+    /**
+     * {@code minecraft:passage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> PASSAGE = create(key("passage"));
+
+    /**
+     * {@code minecraft:pigscene}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> PIGSCENE = create(key("pigscene"));
+
+    /**
+     * {@code minecraft:plant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> PLANT = create(key("plant"));
+
+    /**
+     * {@code minecraft:pointer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> POINTER = create(key("pointer"));
+
+    /**
+     * {@code minecraft:pond}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> POND = create(key("pond"));
+
+    /**
+     * {@code minecraft:pool}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> POOL = create(key("pool"));
+
+    /**
+     * {@code minecraft:prairie_ride}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> PRAIRIE_RIDE = create(key("prairie_ride"));
+
+    /**
+     * {@code minecraft:sea}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> SEA = create(key("sea"));
+
+    /**
+     * {@code minecraft:skeleton}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> SKELETON = create(key("skeleton"));
+
+    /**
+     * {@code minecraft:skull_and_roses}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> SKULL_AND_ROSES = create(key("skull_and_roses"));
+
+    /**
+     * {@code minecraft:stage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> STAGE = create(key("stage"));
+
+    /**
+     * {@code minecraft:sunflowers}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> SUNFLOWERS = create(key("sunflowers"));
+
+    /**
+     * {@code minecraft:sunset}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> SUNSET = create(key("sunset"));
+
+    /**
+     * {@code minecraft:tides}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> TIDES = create(key("tides"));
+
+    /**
+     * {@code minecraft:unpacked}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> UNPACKED = create(key("unpacked"));
+
+    /**
+     * {@code minecraft:void}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> VOID = create(key("void"));
+
+    /**
+     * {@code minecraft:wanderer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> WANDERER = create(key("wanderer"));
+
+    /**
+     * {@code minecraft:wasteland}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> WASTELAND = create(key("wasteland"));
+
+    /**
+     * {@code minecraft:water}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> WATER = create(key("water"));
+
+    /**
+     * {@code minecraft:wind}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> WIND = create(key("wind"));
+
+    /**
+     * {@code minecraft:wither}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> WITHER = create(key("wither"));
+
+    private PaintingVariantKeys() {
+    }
+
+    /**
+     * Creates a key for {@link Art} in the registry {@code minecraft:painting_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    @ApiStatus.Experimental
+    public static TypedKey<Art> create(final Key key) {
+        return TypedKey.create(RegistryKey.PAINTING_VARIANT, key);
+    }
+}
@@ -6,10 +6,9 @@ import io.papermc.paper.generated.GeneratedFrom;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
-import org.bukkit.MinecraftExperimental;
 import org.bukkit.generator.structure.Structure;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;

 /**
 * Vanilla keys for {@link RegistryKey#STRUCTURE}.
@@ -24,7 +23,8 @@ import org.jetbrains.annotations.NotNull;
        "unused",
        "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.5")
+@GeneratedFrom("1.21.4")
+@NullMarked
@ApiStatus.Experimental
 public final class StructureKeys {
    /**
@@ -228,8 +228,6 @@ public final class StructureKeys {
     *
     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
    public static final TypedKey<Structure> TRIAL_CHAMBERS = create(key("trial_chambers"));

    /**
@@ -271,13 +269,13 @@ public final class StructureKeys {
    }

    /**
-     * Creates a key for {@link Structure} in a registry.
+     * Creates a key for {@link Structure} in the registry {@code minecraft:worldgen/structure}.
     *
     * @param key the value's key in the registry
     * @return a new typed key
     */
    @ApiStatus.Experimental
-    public static @NotNull TypedKey<Structure> create(final @NotNull Key key) {
+    public static TypedKey<Structure> create(final Key key) {
        return TypedKey.create(RegistryKey.STRUCTURE, key);
    }
 }
@@ -8,7 +8,7 @@ import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.generator.structure.StructureType;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;

 /**
 * Vanilla keys for {@link RegistryKey#STRUCTURE_TYPE}.
@@ -23,7 +23,8 @@ import org.jetbrains.annotations.NotNull;
        "unused",
        "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.5")
+@GeneratedFrom("1.21.4")
+@NullMarked
@ApiStatus.Experimental
 public final class StructureTypeKeys {
    /**
@@ -141,7 +142,7 @@ public final class StructureTypeKeys {
    private StructureTypeKeys() {
    }

-    private static @NotNull TypedKey<StructureType> create(final @NotNull Key key) {
+    private static TypedKey<StructureType> create(final Key key) {
        return TypedKey.create(RegistryKey.STRUCTURE_TYPE, key);
    }
 }
@@ -8,7 +8,7 @@ import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.meta.trim.TrimMaterial;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;

 /**
 * Vanilla keys for {@link RegistryKey#TRIM_MATERIAL}.
@@ -23,7 +23,8 @@ import org.jetbrains.annotations.NotNull;
        "unused",
        "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.5")
+@GeneratedFrom("1.21.4")
+@NullMarked
@ApiStatus.Experimental
 public final class TrimMaterialKeys {
    /**
@@ -96,17 +97,24 @@ public final class TrimMaterialKeys {
     */
    public static final TypedKey<TrimMaterial> REDSTONE = create(key("redstone"));

+    /**
+     * {@code minecraft:resin}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<TrimMaterial> RESIN = create(key("resin"));
+
    private TrimMaterialKeys() {
    }

    /**
-     * Creates a key for {@link TrimMaterial} in a registry.
+     * Creates a key for {@link TrimMaterial} in the registry {@code minecraft:trim_material}.
     *
     * @param key the value's key in the registry
     * @return a new typed key
     */
    @ApiStatus.Experimental
-    public static @NotNull TypedKey<TrimMaterial> create(final @NotNull Key key) {
+    public static TypedKey<TrimMaterial> create(final Key key) {
        return TypedKey.create(RegistryKey.TRIM_MATERIAL, key);
    }
 }
@@ -6,10 +6,9 @@ import io.papermc.paper.generated.GeneratedFrom;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
-import org.bukkit.MinecraftExperimental;
 import org.bukkit.inventory.meta.trim.TrimPattern;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;

 /**
 * Vanilla keys for {@link RegistryKey#TRIM_PATTERN}.
@@ -24,7 +23,8 @@ import org.jetbrains.annotations.NotNull;
        "unused",
        "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.5")
+@GeneratedFrom("1.21.4")
+@NullMarked
@ApiStatus.Experimental
 public final class TrimPatternKeys {
    /**
@@ -32,8 +32,6 @@ public final class TrimPatternKeys {
     *
     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
    public static final TypedKey<TrimPattern> BOLT = create(key("bolt"));

    /**
@@ -62,8 +60,6 @@ public final class TrimPatternKeys {
     *
     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
    public static final TypedKey<TrimPattern> FLOW = create(key("flow"));

    /**
@@ -161,13 +157,13 @@ public final class TrimPatternKeys {
    }

    /**
-     * Creates a key for {@link TrimPattern} in a registry.
+     * Creates a key for {@link TrimPattern} in the registry {@code minecraft:trim_pattern}.
     *
     * @param key the value's key in the registry
     * @return a new typed key
     */
    @ApiStatus.Experimental
-    public static @NotNull TypedKey<TrimPattern> create(final @NotNull Key key) {
+    public static TypedKey<TrimPattern> create(final Key key) {
        return TypedKey.create(RegistryKey.TRIM_PATTERN, key);
    }
 }
@@ -0,0 +1,141 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Villager;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#VILLAGER_PROFESSION}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class VillagerProfessionKeys {
+    /**
+     * {@code minecraft:armorer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> ARMORER = create(key("armorer"));
+
+    /**
+     * {@code minecraft:butcher}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> BUTCHER = create(key("butcher"));
+
+    /**
+     * {@code minecraft:cartographer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> CARTOGRAPHER = create(key("cartographer"));
+
+    /**
+     * {@code minecraft:cleric}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> CLERIC = create(key("cleric"));
+
+    /**
+     * {@code minecraft:farmer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> FARMER = create(key("farmer"));
+
+    /**
+     * {@code minecraft:fisherman}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> FISHERMAN = create(key("fisherman"));
+
+    /**
+     * {@code minecraft:fletcher}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> FLETCHER = create(key("fletcher"));
+
+    /**
+     * {@code minecraft:leatherworker}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> LEATHERWORKER = create(key("leatherworker"));
+
+    /**
+     * {@code minecraft:librarian}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> LIBRARIAN = create(key("librarian"));
+
+    /**
+     * {@code minecraft:mason}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> MASON = create(key("mason"));
+
+    /**
+     * {@code minecraft:nitwit}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> NITWIT = create(key("nitwit"));
+
+    /**
+     * {@code minecraft:none}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> NONE = create(key("none"));
+
+    /**
+     * {@code minecraft:shepherd}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> SHEPHERD = create(key("shepherd"));
+
+    /**
+     * {@code minecraft:toolsmith}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> TOOLSMITH = create(key("toolsmith"));
+
+    /**
+     * {@code minecraft:weaponsmith}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Profession> WEAPONSMITH = create(key("weaponsmith"));
+
+    private VillagerProfessionKeys() {
+    }
+
+    private static TypedKey<Villager.Profession> create(final Key key) {
+        return TypedKey.create(RegistryKey.VILLAGER_PROFESSION, key);
+    }
+}
@@ -0,0 +1,85 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Villager;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#VILLAGER_TYPE}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class VillagerTypeKeys {
+    /**
+     * {@code minecraft:desert}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Type> DESERT = create(key("desert"));
+
+    /**
+     * {@code minecraft:jungle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Type> JUNGLE = create(key("jungle"));
+
+    /**
+     * {@code minecraft:plains}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Type> PLAINS = create(key("plains"));
+
+    /**
+     * {@code minecraft:savanna}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Type> SAVANNA = create(key("savanna"));
+
+    /**
+     * {@code minecraft:snow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Type> SNOW = create(key("snow"));
+
+    /**
+     * {@code minecraft:swamp}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Type> SWAMP = create(key("swamp"));
+
+    /**
+     * {@code minecraft:taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Villager.Type> TAIGA = create(key("taiga"));
+
+    private VillagerTypeKeys() {
+    }
+
+    private static TypedKey<Villager.Type> create(final Key key) {
+        return TypedKey.create(RegistryKey.VILLAGER_TYPE, key);
+    }
+}
@@ -0,0 +1,106 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Wolf;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#WOLF_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class WolfVariantKeys {
+    /**
+     * {@code minecraft:ashen}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.Variant> ASHEN = create(key("ashen"));
+
+    /**
+     * {@code minecraft:black}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.Variant> BLACK = create(key("black"));
+
+    /**
+     * {@code minecraft:chestnut}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.Variant> CHESTNUT = create(key("chestnut"));
+
+    /**
+     * {@code minecraft:pale}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.Variant> PALE = create(key("pale"));
+
+    /**
+     * {@code minecraft:rusty}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.Variant> RUSTY = create(key("rusty"));
+
+    /**
+     * {@code minecraft:snowy}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.Variant> SNOWY = create(key("snowy"));
+
+    /**
+     * {@code minecraft:spotted}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.Variant> SPOTTED = create(key("spotted"));
+
+    /**
+     * {@code minecraft:striped}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.Variant> STRIPED = create(key("striped"));
+
+    /**
+     * {@code minecraft:woods}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.Variant> WOODS = create(key("woods"));
+
+    private WolfVariantKeys() {
+    }
+
+    /**
+     * Creates a key for {@link Wolf.Variant} in the registry {@code minecraft:wolf_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    @ApiStatus.Experimental
+    public static TypedKey<Wolf.Variant> create(final Key key) {
+        return TypedKey.create(RegistryKey.WOLF_VARIANT, key);
+    }
+}
@@ -0,0 +1,120 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.block.banner.PatternType;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#BANNER_PATTERN}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class BannerPatternTagKeys {
+    /**
+     * {@code #minecraft:no_item_required}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> NO_ITEM_REQUIRED = create(key("no_item_required"));
+
+    /**
+     * {@code #minecraft:pattern_item/bordure_indented}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_BORDURE_INDENTED = create(key("pattern_item/bordure_indented"));
+
+    /**
+     * {@code #minecraft:pattern_item/creeper}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_CREEPER = create(key("pattern_item/creeper"));
+
+    /**
+     * {@code #minecraft:pattern_item/field_masoned}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_FIELD_MASONED = create(key("pattern_item/field_masoned"));
+
+    /**
+     * {@code #minecraft:pattern_item/flow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_FLOW = create(key("pattern_item/flow"));
+
+    /**
+     * {@code #minecraft:pattern_item/flower}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_FLOWER = create(key("pattern_item/flower"));
+
+    /**
+     * {@code #minecraft:pattern_item/globe}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_GLOBE = create(key("pattern_item/globe"));
+
+    /**
+     * {@code #minecraft:pattern_item/guster}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_GUSTER = create(key("pattern_item/guster"));
+
+    /**
+     * {@code #minecraft:pattern_item/mojang}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_MOJANG = create(key("pattern_item/mojang"));
+
+    /**
+     * {@code #minecraft:pattern_item/piglin}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_PIGLIN = create(key("pattern_item/piglin"));
+
+    /**
+     * {@code #minecraft:pattern_item/skull}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PatternType> PATTERN_ITEM_SKULL = create(key("pattern_item/skull"));
+
+    private BannerPatternTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link PatternType} in the registry {@code minecraft:banner_pattern}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<PatternType> create(final Key key) {
+        return TagKey.create(RegistryKey.BANNER_PATTERN, key);
+    }
+}
@@ -0,0 +1,533 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.block.Biome;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#BIOME}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class BiomeTagKeys {
+    /**
+     * {@code #minecraft:allows_surface_slime_spawns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> ALLOWS_SURFACE_SLIME_SPAWNS = create(key("allows_surface_slime_spawns"));
+
+    /**
+     * {@code #minecraft:allows_tropical_fish_spawns_at_any_height}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> ALLOWS_TROPICAL_FISH_SPAWNS_AT_ANY_HEIGHT = create(key("allows_tropical_fish_spawns_at_any_height"));
+
+    /**
+     * {@code #minecraft:has_closer_water_fog}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_CLOSER_WATER_FOG = create(key("has_closer_water_fog"));
+
+    /**
+     * {@code #minecraft:has_structure/ancient_city}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ANCIENT_CITY = create(key("has_structure/ancient_city"));
+
+    /**
+     * {@code #minecraft:has_structure/bastion_remnant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_BASTION_REMNANT = create(key("has_structure/bastion_remnant"));
+
+    /**
+     * {@code #minecraft:has_structure/buried_treasure}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_BURIED_TREASURE = create(key("has_structure/buried_treasure"));
+
+    /**
+     * {@code #minecraft:has_structure/desert_pyramid}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_DESERT_PYRAMID = create(key("has_structure/desert_pyramid"));
+
+    /**
+     * {@code #minecraft:has_structure/end_city}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_END_CITY = create(key("has_structure/end_city"));
+
+    /**
+     * {@code #minecraft:has_structure/igloo}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_IGLOO = create(key("has_structure/igloo"));
+
+    /**
+     * {@code #minecraft:has_structure/jungle_temple}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_JUNGLE_TEMPLE = create(key("has_structure/jungle_temple"));
+
+    /**
+     * {@code #minecraft:has_structure/mineshaft}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_MINESHAFT = create(key("has_structure/mineshaft"));
+
+    /**
+     * {@code #minecraft:has_structure/mineshaft_mesa}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_MINESHAFT_MESA = create(key("has_structure/mineshaft_mesa"));
+
+    /**
+     * {@code #minecraft:has_structure/nether_fortress}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_NETHER_FORTRESS = create(key("has_structure/nether_fortress"));
+
+    /**
+     * {@code #minecraft:has_structure/nether_fossil}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_NETHER_FOSSIL = create(key("has_structure/nether_fossil"));
+
+    /**
+     * {@code #minecraft:has_structure/ocean_monument}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_OCEAN_MONUMENT = create(key("has_structure/ocean_monument"));
+
+    /**
+     * {@code #minecraft:has_structure/ocean_ruin_cold}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_OCEAN_RUIN_COLD = create(key("has_structure/ocean_ruin_cold"));
+
+    /**
+     * {@code #minecraft:has_structure/ocean_ruin_warm}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_OCEAN_RUIN_WARM = create(key("has_structure/ocean_ruin_warm"));
+
+    /**
+     * {@code #minecraft:has_structure/pillager_outpost}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_PILLAGER_OUTPOST = create(key("has_structure/pillager_outpost"));
+
+    /**
+     * {@code #minecraft:has_structure/ruined_portal_desert}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_RUINED_PORTAL_DESERT = create(key("has_structure/ruined_portal_desert"));
+
+    /**
+     * {@code #minecraft:has_structure/ruined_portal_jungle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_RUINED_PORTAL_JUNGLE = create(key("has_structure/ruined_portal_jungle"));
+
+    /**
+     * {@code #minecraft:has_structure/ruined_portal_mountain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_RUINED_PORTAL_MOUNTAIN = create(key("has_structure/ruined_portal_mountain"));
+
+    /**
+     * {@code #minecraft:has_structure/ruined_portal_nether}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_RUINED_PORTAL_NETHER = create(key("has_structure/ruined_portal_nether"));
+
+    /**
+     * {@code #minecraft:has_structure/ruined_portal_ocean}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_RUINED_PORTAL_OCEAN = create(key("has_structure/ruined_portal_ocean"));
+
+    /**
+     * {@code #minecraft:has_structure/ruined_portal_standard}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_RUINED_PORTAL_STANDARD = create(key("has_structure/ruined_portal_standard"));
+
+    /**
+     * {@code #minecraft:has_structure/ruined_portal_swamp}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_RUINED_PORTAL_SWAMP = create(key("has_structure/ruined_portal_swamp"));
+
+    /**
+     * {@code #minecraft:has_structure/shipwreck}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_SHIPWRECK = create(key("has_structure/shipwreck"));
+
+    /**
+     * {@code #minecraft:has_structure/shipwreck_beached}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_SHIPWRECK_BEACHED = create(key("has_structure/shipwreck_beached"));
+
+    /**
+     * {@code #minecraft:has_structure/stronghold}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_STRONGHOLD = create(key("has_structure/stronghold"));
+
+    /**
+     * {@code #minecraft:has_structure/swamp_hut}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_SWAMP_HUT = create(key("has_structure/swamp_hut"));
+
+    /**
+     * {@code #minecraft:has_structure/trail_ruins}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_TRAIL_RUINS = create(key("has_structure/trail_ruins"));
+
+    /**
+     * {@code #minecraft:has_structure/trial_chambers}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_TRIAL_CHAMBERS = create(key("has_structure/trial_chambers"));
+
+    /**
+     * {@code #minecraft:has_structure/village_desert}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_VILLAGE_DESERT = create(key("has_structure/village_desert"));
+
+    /**
+     * {@code #minecraft:has_structure/village_plains}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_VILLAGE_PLAINS = create(key("has_structure/village_plains"));
+
+    /**
+     * {@code #minecraft:has_structure/village_savanna}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_VILLAGE_SAVANNA = create(key("has_structure/village_savanna"));
+
+    /**
+     * {@code #minecraft:has_structure/village_snowy}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_VILLAGE_SNOWY = create(key("has_structure/village_snowy"));
+
+    /**
+     * {@code #minecraft:has_structure/village_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_VILLAGE_TAIGA = create(key("has_structure/village_taiga"));
+
+    /**
+     * {@code #minecraft:has_structure/woodland_mansion}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_WOODLAND_MANSION = create(key("has_structure/woodland_mansion"));
+
+    /**
+     * {@code #minecraft:increased_fire_burnout}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> INCREASED_FIRE_BURNOUT = create(key("increased_fire_burnout"));
+
+    /**
+     * {@code #minecraft:is_badlands}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_BADLANDS = create(key("is_badlands"));
+
+    /**
+     * {@code #minecraft:is_beach}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_BEACH = create(key("is_beach"));
+
+    /**
+     * {@code #minecraft:is_deep_ocean}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_DEEP_OCEAN = create(key("is_deep_ocean"));
+
+    /**
+     * {@code #minecraft:is_end}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_END = create(key("is_end"));
+
+    /**
+     * {@code #minecraft:is_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_FOREST = create(key("is_forest"));
+
+    /**
+     * {@code #minecraft:is_hill}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_HILL = create(key("is_hill"));
+
+    /**
+     * {@code #minecraft:is_jungle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_JUNGLE = create(key("is_jungle"));
+
+    /**
+     * {@code #minecraft:is_mountain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_MOUNTAIN = create(key("is_mountain"));
+
+    /**
+     * {@code #minecraft:is_nether}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_NETHER = create(key("is_nether"));
+
+    /**
+     * {@code #minecraft:is_ocean}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_OCEAN = create(key("is_ocean"));
+
+    /**
+     * {@code #minecraft:is_overworld}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_OVERWORLD = create(key("is_overworld"));
+
+    /**
+     * {@code #minecraft:is_river}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_RIVER = create(key("is_river"));
+
+    /**
+     * {@code #minecraft:is_savanna}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_SAVANNA = create(key("is_savanna"));
+
+    /**
+     * {@code #minecraft:is_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> IS_TAIGA = create(key("is_taiga"));
+
+    /**
+     * {@code #minecraft:mineshaft_blocking}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> MINESHAFT_BLOCKING = create(key("mineshaft_blocking"));
+
+    /**
+     * {@code #minecraft:more_frequent_drowned_spawns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> MORE_FREQUENT_DROWNED_SPAWNS = create(key("more_frequent_drowned_spawns"));
+
+    /**
+     * {@code #minecraft:plays_underwater_music}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> PLAYS_UNDERWATER_MUSIC = create(key("plays_underwater_music"));
+
+    /**
+     * {@code #minecraft:polar_bears_spawn_on_alternate_blocks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> POLAR_BEARS_SPAWN_ON_ALTERNATE_BLOCKS = create(key("polar_bears_spawn_on_alternate_blocks"));
+
+    /**
+     * {@code #minecraft:produces_corals_from_bonemeal}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> PRODUCES_CORALS_FROM_BONEMEAL = create(key("produces_corals_from_bonemeal"));
+
+    /**
+     * {@code #minecraft:reduce_water_ambient_spawns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> REDUCE_WATER_AMBIENT_SPAWNS = create(key("reduce_water_ambient_spawns"));
+
+    /**
+     * {@code #minecraft:required_ocean_monument_surrounding}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> REQUIRED_OCEAN_MONUMENT_SURROUNDING = create(key("required_ocean_monument_surrounding"));
+
+    /**
+     * {@code #minecraft:snow_golem_melts}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> SNOW_GOLEM_MELTS = create(key("snow_golem_melts"));
+
+    /**
+     * {@code #minecraft:spawns_cold_variant_frogs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> SPAWNS_COLD_VARIANT_FROGS = create(key("spawns_cold_variant_frogs"));
+
+    /**
+     * {@code #minecraft:spawns_gold_rabbits}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> SPAWNS_GOLD_RABBITS = create(key("spawns_gold_rabbits"));
+
+    /**
+     * {@code #minecraft:spawns_snow_foxes}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> SPAWNS_SNOW_FOXES = create(key("spawns_snow_foxes"));
+
+    /**
+     * {@code #minecraft:spawns_warm_variant_frogs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> SPAWNS_WARM_VARIANT_FROGS = create(key("spawns_warm_variant_frogs"));
+
+    /**
+     * {@code #minecraft:spawns_white_rabbits}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> SPAWNS_WHITE_RABBITS = create(key("spawns_white_rabbits"));
+
+    /**
+     * {@code #minecraft:stronghold_biased_to}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> STRONGHOLD_BIASED_TO = create(key("stronghold_biased_to"));
+
+    /**
+     * {@code #minecraft:water_on_map_outlines}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> WATER_ON_MAP_OUTLINES = create(key("water_on_map_outlines"));
+
+    /**
+     * {@code #minecraft:without_patrol_spawns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> WITHOUT_PATROL_SPAWNS = create(key("without_patrol_spawns"));
+
+    /**
+     * {@code #minecraft:without_wandering_trader_spawns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> WITHOUT_WANDERING_TRADER_SPAWNS = create(key("without_wandering_trader_spawns"));
+
+    /**
+     * {@code #minecraft:without_zombie_sieges}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> WITHOUT_ZOMBIE_SIEGES = create(key("without_zombie_sieges"));
+
+    private BiomeTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link Biome} in the registry {@code minecraft:worldgen/biome}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<Biome> create(final Key key) {
+        return TagKey.create(RegistryKey.BIOME, key);
+    }
+}
@@ -0,0 +1,57 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Cat;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#CAT_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class CatVariantTagKeys {
+    /**
+     * {@code #minecraft:default_spawns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Cat.Type> DEFAULT_SPAWNS = create(key("default_spawns"));
+
+    /**
+     * {@code #minecraft:full_moon_spawns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Cat.Type> FULL_MOON_SPAWNS = create(key("full_moon_spawns"));
+
+    private CatVariantTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link Cat.Type} in the registry {@code minecraft:cat_variant}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<Cat.Type> create(final Key key) {
+        return TagKey.create(RegistryKey.CAT_VARIANT, key);
+    }
+}
@@ -0,0 +1,274 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.damage.DamageType;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#DAMAGE_TYPE}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class DamageTypeTagKeys {
+    /**
+     * {@code #minecraft:always_hurts_ender_dragons}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> ALWAYS_HURTS_ENDER_DRAGONS = create(key("always_hurts_ender_dragons"));
+
+    /**
+     * {@code #minecraft:always_kills_armor_stands}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> ALWAYS_KILLS_ARMOR_STANDS = create(key("always_kills_armor_stands"));
+
+    /**
+     * {@code #minecraft:always_most_significant_fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> ALWAYS_MOST_SIGNIFICANT_FALL = create(key("always_most_significant_fall"));
+
+    /**
+     * {@code #minecraft:always_triggers_silverfish}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> ALWAYS_TRIGGERS_SILVERFISH = create(key("always_triggers_silverfish"));
+
+    /**
+     * {@code #minecraft:avoids_guardian_thorns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> AVOIDS_GUARDIAN_THORNS = create(key("avoids_guardian_thorns"));
+
+    /**
+     * {@code #minecraft:burn_from_stepping}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BURN_FROM_STEPPING = create(key("burn_from_stepping"));
+
+    /**
+     * {@code #minecraft:burns_armor_stands}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BURNS_ARMOR_STANDS = create(key("burns_armor_stands"));
+
+    /**
+     * {@code #minecraft:bypasses_armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BYPASSES_ARMOR = create(key("bypasses_armor"));
+
+    /**
+     * {@code #minecraft:bypasses_effects}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BYPASSES_EFFECTS = create(key("bypasses_effects"));
+
+    /**
+     * {@code #minecraft:bypasses_enchantments}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BYPASSES_ENCHANTMENTS = create(key("bypasses_enchantments"));
+
+    /**
+     * {@code #minecraft:bypasses_invulnerability}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BYPASSES_INVULNERABILITY = create(key("bypasses_invulnerability"));
+
+    /**
+     * {@code #minecraft:bypasses_resistance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BYPASSES_RESISTANCE = create(key("bypasses_resistance"));
+
+    /**
+     * {@code #minecraft:bypasses_shield}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BYPASSES_SHIELD = create(key("bypasses_shield"));
+
+    /**
+     * {@code #minecraft:bypasses_wolf_armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BYPASSES_WOLF_ARMOR = create(key("bypasses_wolf_armor"));
+
+    /**
+     * {@code #minecraft:can_break_armor_stand}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> CAN_BREAK_ARMOR_STAND = create(key("can_break_armor_stand"));
+
+    /**
+     * {@code #minecraft:damages_helmet}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> DAMAGES_HELMET = create(key("damages_helmet"));
+
+    /**
+     * {@code #minecraft:ignites_armor_stands}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> IGNITES_ARMOR_STANDS = create(key("ignites_armor_stands"));
+
+    /**
+     * {@code #minecraft:is_drowning}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> IS_DROWNING = create(key("is_drowning"));
+
+    /**
+     * {@code #minecraft:is_explosion}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> IS_EXPLOSION = create(key("is_explosion"));
+
+    /**
+     * {@code #minecraft:is_fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> IS_FALL = create(key("is_fall"));
+
+    /**
+     * {@code #minecraft:is_fire}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> IS_FIRE = create(key("is_fire"));
+
+    /**
+     * {@code #minecraft:is_freezing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> IS_FREEZING = create(key("is_freezing"));
+
+    /**
+     * {@code #minecraft:is_lightning}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> IS_LIGHTNING = create(key("is_lightning"));
+
+    /**
+     * {@code #minecraft:is_player_attack}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> IS_PLAYER_ATTACK = create(key("is_player_attack"));
+
+    /**
+     * {@code #minecraft:is_projectile}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> IS_PROJECTILE = create(key("is_projectile"));
+
+    /**
+     * {@code #minecraft:mace_smash}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> MACE_SMASH = create(key("mace_smash"));
+
+    /**
+     * {@code #minecraft:no_anger}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> NO_ANGER = create(key("no_anger"));
+
+    /**
+     * {@code #minecraft:no_impact}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> NO_IMPACT = create(key("no_impact"));
+
+    /**
+     * {@code #minecraft:no_knockback}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> NO_KNOCKBACK = create(key("no_knockback"));
+
+    /**
+     * {@code #minecraft:panic_causes}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> PANIC_CAUSES = create(key("panic_causes"));
+
+    /**
+     * {@code #minecraft:panic_environmental_causes}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> PANIC_ENVIRONMENTAL_CAUSES = create(key("panic_environmental_causes"));
+
+    /**
+     * {@code #minecraft:witch_resistant_to}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> WITCH_RESISTANT_TO = create(key("witch_resistant_to"));
+
+    /**
+     * {@code #minecraft:wither_immune_to}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> WITHER_IMMUNE_TO = create(key("wither_immune_to"));
+
+    private DamageTypeTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link DamageType} in the registry {@code minecraft:damage_type}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<DamageType> create(final Key key) {
+        return TagKey.create(RegistryKey.DAMAGE_TYPE, key);
+    }
+}
@@ -0,0 +1,324 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.MinecraftExperimental;
+import org.bukkit.enchantments.Enchantment;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#ENCHANTMENT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class EnchantmentTagKeys {
+    /**
+     * {@code #minecraft:curse}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> CURSE = create(key("curse"));
+
+    /**
+     * {@code #minecraft:double_trade_price}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> DOUBLE_TRADE_PRICE = create(key("double_trade_price"));
+
+    /**
+     * {@code #minecraft:exclusive_set/armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_ARMOR = create(key("exclusive_set/armor"));
+
+    /**
+     * {@code #minecraft:exclusive_set/boots}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_BOOTS = create(key("exclusive_set/boots"));
+
+    /**
+     * {@code #minecraft:exclusive_set/bow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_BOW = create(key("exclusive_set/bow"));
+
+    /**
+     * {@code #minecraft:exclusive_set/crossbow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_CROSSBOW = create(key("exclusive_set/crossbow"));
+
+    /**
+     * {@code #minecraft:exclusive_set/damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_DAMAGE = create(key("exclusive_set/damage"));
+
+    /**
+     * {@code #minecraft:exclusive_set/mining}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_MINING = create(key("exclusive_set/mining"));
+
+    /**
+     * {@code #minecraft:exclusive_set/riptide}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> EXCLUSIVE_SET_RIPTIDE = create(key("exclusive_set/riptide"));
+
+    /**
+     * {@code #minecraft:in_enchanting_table}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> IN_ENCHANTING_TABLE = create(key("in_enchanting_table"));
+
+    /**
+     * {@code #minecraft:non_treasure}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> NON_TREASURE = create(key("non_treasure"));
+
+    /**
+     * {@code #minecraft:on_mob_spawn_equipment}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> ON_MOB_SPAWN_EQUIPMENT = create(key("on_mob_spawn_equipment"));
+
+    /**
+     * {@code #minecraft:on_random_loot}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> ON_RANDOM_LOOT = create(key("on_random_loot"));
+
+    /**
+     * {@code #minecraft:on_traded_equipment}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> ON_TRADED_EQUIPMENT = create(key("on_traded_equipment"));
+
+    /**
+     * {@code #minecraft:prevents_bee_spawns_when_mining}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> PREVENTS_BEE_SPAWNS_WHEN_MINING = create(key("prevents_bee_spawns_when_mining"));
+
+    /**
+     * {@code #minecraft:prevents_decorated_pot_shattering}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> PREVENTS_DECORATED_POT_SHATTERING = create(key("prevents_decorated_pot_shattering"));
+
+    /**
+     * {@code #minecraft:prevents_ice_melting}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> PREVENTS_ICE_MELTING = create(key("prevents_ice_melting"));
+
+    /**
+     * {@code #minecraft:prevents_infested_spawns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> PREVENTS_INFESTED_SPAWNS = create(key("prevents_infested_spawns"));
+
+    /**
+     * {@code #minecraft:smelts_loot}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> SMELTS_LOOT = create(key("smelts_loot"));
+
+    /**
+     * {@code #minecraft:tooltip_order}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> TOOLTIP_ORDER = create(key("tooltip_order"));
+
+    /**
+     * {@code #minecraft:tradeable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> TRADEABLE = create(key("tradeable"));
+
+    /**
+     * {@code #minecraft:trades/desert_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_DESERT_COMMON = create(key("trades/desert_common"));
+
+    /**
+     * {@code #minecraft:trades/desert_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_DESERT_SPECIAL = create(key("trades/desert_special"));
+
+    /**
+     * {@code #minecraft:trades/jungle_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_JUNGLE_COMMON = create(key("trades/jungle_common"));
+
+    /**
+     * {@code #minecraft:trades/jungle_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_JUNGLE_SPECIAL = create(key("trades/jungle_special"));
+
+    /**
+     * {@code #minecraft:trades/plains_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_PLAINS_COMMON = create(key("trades/plains_common"));
+
+    /**
+     * {@code #minecraft:trades/plains_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_PLAINS_SPECIAL = create(key("trades/plains_special"));
+
+    /**
+     * {@code #minecraft:trades/savanna_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SAVANNA_COMMON = create(key("trades/savanna_common"));
+
+    /**
+     * {@code #minecraft:trades/savanna_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SAVANNA_SPECIAL = create(key("trades/savanna_special"));
+
+    /**
+     * {@code #minecraft:trades/snow_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SNOW_COMMON = create(key("trades/snow_common"));
+
+    /**
+     * {@code #minecraft:trades/snow_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SNOW_SPECIAL = create(key("trades/snow_special"));
+
+    /**
+     * {@code #minecraft:trades/swamp_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SWAMP_COMMON = create(key("trades/swamp_common"));
+
+    /**
+     * {@code #minecraft:trades/swamp_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_SWAMP_SPECIAL = create(key("trades/swamp_special"));
+
+    /**
+     * {@code #minecraft:trades/taiga_common}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_TAIGA_COMMON = create(key("trades/taiga_common"));
+
+    /**
+     * {@code #minecraft:trades/taiga_special}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Enchantment> TRADES_TAIGA_SPECIAL = create(key("trades/taiga_special"));
+
+    /**
+     * {@code #minecraft:treasure}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Enchantment> TREASURE = create(key("treasure"));
+
+    private EnchantmentTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link Enchantment} in the registry {@code minecraft:enchantment}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<Enchantment> create(final Key key) {
+        return TagKey.create(RegistryKey.ENCHANTMENT, key);
+    }
+}
@@ -0,0 +1,57 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.Fluid;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#FLUID}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class FluidTagKeys {
+    /**
+     * {@code #minecraft:lava}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> LAVA = create(key("lava"));
+
+    /**
+     * {@code #minecraft:water}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> WATER = create(key("water"));
+
+    private FluidTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link Fluid} in the registry {@code minecraft:fluid}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<Fluid> create(final Key key) {
+        return TagKey.create(RegistryKey.FLUID, key);
+    }
+}
@@ -0,0 +1,78 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.GameEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#GAME_EVENT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class GameEventTagKeys {
+    /**
+     * {@code #minecraft:allay_can_listen}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<GameEvent> ALLAY_CAN_LISTEN = create(key("allay_can_listen"));
+
+    /**
+     * {@code #minecraft:ignore_vibrations_sneaking}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<GameEvent> IGNORE_VIBRATIONS_SNEAKING = create(key("ignore_vibrations_sneaking"));
+
+    /**
+     * {@code #minecraft:shrieker_can_listen}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<GameEvent> SHRIEKER_CAN_LISTEN = create(key("shrieker_can_listen"));
+
+    /**
+     * {@code #minecraft:vibrations}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<GameEvent> VIBRATIONS = create(key("vibrations"));
+
+    /**
+     * {@code #minecraft:warden_can_listen}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<GameEvent> WARDEN_CAN_LISTEN = create(key("warden_can_listen"));
+
+    private GameEventTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link GameEvent} in the registry {@code minecraft:game_event}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<GameEvent> create(final Key key) {
+        return TagKey.create(RegistryKey.GAME_EVENT, key);
+    }
+}
@@ -0,0 +1,64 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.MusicInstrument;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#INSTRUMENT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class InstrumentTagKeys {
+    /**
+     * {@code #minecraft:goat_horns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<MusicInstrument> GOAT_HORNS = create(key("goat_horns"));
+
+    /**
+     * {@code #minecraft:regular_goat_horns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<MusicInstrument> REGULAR_GOAT_HORNS = create(key("regular_goat_horns"));
+
+    /**
+     * {@code #minecraft:screaming_goat_horns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<MusicInstrument> SCREAMING_GOAT_HORNS = create(key("screaming_goat_horns"));
+
+    private InstrumentTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link MusicInstrument} in the registry {@code minecraft:instrument}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<MusicInstrument> create(final Key key) {
+        return TagKey.create(RegistryKey.INSTRUMENT, key);
+    }
+}
@@ -0,0 +1,50 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.Art;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#PAINTING_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class PaintingVariantTagKeys {
+    /**
+     * {@code #minecraft:placeable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Art> PLACEABLE = create(key("placeable"));
+
+    private PaintingVariantTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link Art} in the registry {@code minecraft:painting_variant}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<Art> create(final Key key) {
+        return TagKey.create(RegistryKey.PAINTING_VARIANT, key);
+    }
+}
@@ -0,0 +1,198 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.MinecraftExperimental;
+import org.bukkit.generator.structure.Structure;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#STRUCTURE}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@GeneratedFrom("1.21.4")
+@NullMarked
+@ApiStatus.Experimental
+public final class StructureTagKeys {
+    /**
+     * {@code #minecraft:cats_spawn_as_black}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> CATS_SPAWN_AS_BLACK = create(key("cats_spawn_as_black"));
+
+    /**
+     * {@code #minecraft:cats_spawn_in}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> CATS_SPAWN_IN = create(key("cats_spawn_in"));
+
+    /**
+     * {@code #minecraft:dolphin_located}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> DOLPHIN_LOCATED = create(key("dolphin_located"));
+
+    /**
+     * {@code #minecraft:eye_of_ender_located}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> EYE_OF_ENDER_LOCATED = create(key("eye_of_ender_located"));
+
+    /**
+     * {@code #minecraft:mineshaft}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> MINESHAFT = create(key("mineshaft"));
+
+    /**
+     * {@code #minecraft:ocean_ruin}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> OCEAN_RUIN = create(key("ocean_ruin"));
+
+    /**
+     * {@code #minecraft:on_desert_village_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Structure> ON_DESERT_VILLAGE_MAPS = create(key("on_desert_village_maps"));
+
+    /**
+     * {@code #minecraft:on_jungle_explorer_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Structure> ON_JUNGLE_EXPLORER_MAPS = create(key("on_jungle_explorer_maps"));
+
+    /**
+     * {@code #minecraft:on_ocean_explorer_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_OCEAN_EXPLORER_MAPS = create(key("on_ocean_explorer_maps"));
+
+    /**
+     * {@code #minecraft:on_plains_village_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Structure> ON_PLAINS_VILLAGE_MAPS = create(key("on_plains_village_maps"));
+
+    /**
+     * {@code #minecraft:on_savanna_village_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Structure> ON_SAVANNA_VILLAGE_MAPS = create(key("on_savanna_village_maps"));
+
+    /**
+     * {@code #minecraft:on_snowy_village_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Structure> ON_SNOWY_VILLAGE_MAPS = create(key("on_snowy_village_maps"));
+
+    /**
+     * {@code #minecraft:on_swamp_explorer_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Structure> ON_SWAMP_EXPLORER_MAPS = create(key("on_swamp_explorer_maps"));
+
+    /**
+     * {@code #minecraft:on_taiga_village_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
+    public static final TagKey<Structure> ON_TAIGA_VILLAGE_MAPS = create(key("on_taiga_village_maps"));
+
+    /**
+     * {@code #minecraft:on_treasure_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_TREASURE_MAPS = create(key("on_treasure_maps"));
+
+    /**
+     * {@code #minecraft:on_trial_chambers_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_TRIAL_CHAMBERS_MAPS = create(key("on_trial_chambers_maps"));
+
+    /**
+     * {@code #minecraft:on_woodland_explorer_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_WOODLAND_EXPLORER_MAPS = create(key("on_woodland_explorer_maps"));
+
+    /**
+     * {@code #minecraft:ruined_portal}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> RUINED_PORTAL = create(key("ruined_portal"));
+
+    /**
+     * {@code #minecraft:shipwreck}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> SHIPWRECK = create(key("shipwreck"));
+
+    /**
+     * {@code #minecraft:village}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> VILLAGE = create(key("village"));
+
+    private StructureTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link Structure} in the registry {@code minecraft:worldgen/structure}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    @ApiStatus.Experimental
+    public static TagKey<Structure> create(final Key key) {
+        return TagKey.create(RegistryKey.STRUCTURE, key);
+    }
+}
@@ -1,32 +1,92 @@
 package io.papermc.generator;

 import io.papermc.generator.types.GeneratedKeyType;
+import io.papermc.generator.types.GeneratedTagKeyType;
 import io.papermc.generator.types.SourceGenerator;
 import io.papermc.generator.types.goal.MobGoalGenerator;
 import io.papermc.paper.registry.RegistryKey;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
+import org.bukkit.Art;
+import org.bukkit.Fluid;
 import org.bukkit.GameEvent;
+import org.bukkit.JukeboxSong;
+import org.bukkit.MusicInstrument;
+import org.bukkit.Sound;
+import org.bukkit.attribute.Attribute;
 import org.bukkit.block.Biome;
+import org.bukkit.block.BlockType;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.damage.DamageType;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Cat;
+import org.bukkit.entity.Frog;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Wolf;
 import org.bukkit.generator.structure.Structure;
 import org.bukkit.generator.structure.StructureType;
+import org.bukkit.inventory.ItemType;
+import org.bukkit.inventory.MenuType;
 import org.bukkit.inventory.meta.trim.TrimMaterial;
 import org.bukkit.inventory.meta.trim.TrimPattern;
+import org.bukkit.map.MapCursor;
+import org.bukkit.potion.PotionEffectType;

 public interface Generators {

    SourceGenerator[] API = {
+        // built-ins
        simpleKey("GameEventKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT, true),
+        simpleKey("StructureTypeKeys", StructureType.class, Registries.STRUCTURE_TYPE, RegistryKey.STRUCTURE_TYPE, false),
+        simpleKey("MobEffectKeys", PotionEffectType.class, Registries.MOB_EFFECT, RegistryKey.MOB_EFFECT, false),
+        simpleKey("BlockTypeKeys", BlockType.class, Registries.BLOCK, RegistryKey.BLOCK, false),
+        simpleKey("ItemTypeKeys", ItemType.class, Registries.ITEM, RegistryKey.ITEM, false),
+        simpleKey("CatVariantKeys", Cat.Type.class, Registries.CAT_VARIANT, RegistryKey.CAT_VARIANT, false),
+        simpleKey("FrogVariantKeys", Frog.Variant.class, Registries.FROG_VARIANT, RegistryKey.FROG_VARIANT, false),
+        simpleKey("VillagerProfessionKeys", Villager.Profession.class, Registries.VILLAGER_PROFESSION, RegistryKey.VILLAGER_PROFESSION, false),
+        simpleKey("VillagerTypeKeys", Villager.Type.class, Registries.VILLAGER_TYPE, RegistryKey.VILLAGER_TYPE, false),
+        simpleKey("MapDecorationTypeKeys", MapCursor.Type.class, Registries.MAP_DECORATION_TYPE, RegistryKey.MAP_DECORATION_TYPE, false),
+        simpleKey("MenuTypeKeys", MenuType.class, Registries.MENU, RegistryKey.MENU, false),
+        simpleKey("AttributeKeys", Attribute.class, Registries.ATTRIBUTE, RegistryKey.ATTRIBUTE, false),
+        simpleKey("FluidKeys", Fluid.class, Registries.FLUID, RegistryKey.FLUID, false),
+        simpleKey("SoundEventKeys", Sound.class, Registries.SOUND_EVENT, RegistryKey.SOUND_EVENT, false),
+
+        // data-driven
        simpleKey("BiomeKeys", Biome.class, Registries.BIOME, RegistryKey.BIOME, true),
+        simpleKey("StructureKeys", Structure.class, Registries.STRUCTURE, RegistryKey.STRUCTURE, true),
        simpleKey("TrimMaterialKeys", TrimMaterial.class, Registries.TRIM_MATERIAL, RegistryKey.TRIM_MATERIAL, true),
        simpleKey("TrimPatternKeys", TrimPattern.class, Registries.TRIM_PATTERN, RegistryKey.TRIM_PATTERN, true),
-        simpleKey("StructureKeys", Structure.class, Registries.STRUCTURE, RegistryKey.STRUCTURE, true),
-        simpleKey("StructureTypeKeys", StructureType.class, Registries.STRUCTURE_TYPE, RegistryKey.STRUCTURE_TYPE, false),
+        simpleKey("DamageTypeKeys", DamageType.class, Registries.DAMAGE_TYPE, RegistryKey.DAMAGE_TYPE, true),
+        simpleKey("WolfVariantKeys", Wolf.Variant.class, Registries.WOLF_VARIANT, RegistryKey.WOLF_VARIANT, true),
+        simpleKey("EnchantmentKeys", Enchantment.class, Registries.ENCHANTMENT, RegistryKey.ENCHANTMENT, true),
+        simpleKey("JukeboxSongKeys", JukeboxSong.class, Registries.JUKEBOX_SONG, RegistryKey.JUKEBOX_SONG, true),
+        simpleKey("BannerPatternKeys", PatternType.class, Registries.BANNER_PATTERN, RegistryKey.BANNER_PATTERN, true),
+        simpleKey("PaintingVariantKeys", Art.class, Registries.PAINTING_VARIANT, RegistryKey.PAINTING_VARIANT, true),
+        simpleKey("InstrumentKeys", MusicInstrument.class, Registries.INSTRUMENT, RegistryKey.INSTRUMENT, true),
+
+        // tags
+        simpleTagKey("GameEventTagKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT),
+        simpleTagKey("BlockTypeTagKeys", BlockType.class, Registries.BLOCK, RegistryKey.BLOCK),
+        simpleTagKey("ItemTypeTagKeys", ItemType.class, Registries.ITEM, RegistryKey.ITEM),
+        simpleTagKey("CatVariantTagKeys", Cat.Type.class, Registries.CAT_VARIANT, RegistryKey.CAT_VARIANT),
+        simpleTagKey("FluidTagKeys", Fluid.class, Registries.FLUID, RegistryKey.FLUID),
+
+        simpleTagKey("BiomeTagKeys", Biome.class, Registries.BIOME, RegistryKey.BIOME),
+        simpleTagKey("StructureTagKeys", Structure.class, Registries.STRUCTURE, RegistryKey.STRUCTURE),
+        simpleTagKey("DamageTypeTagKeys", DamageType.class, Registries.DAMAGE_TYPE, RegistryKey.DAMAGE_TYPE),
+        simpleTagKey("EnchantmentTagKeys", Enchantment.class, Registries.ENCHANTMENT, RegistryKey.ENCHANTMENT),
+        simpleTagKey("BannerPatternTagKeys", PatternType.class, Registries.BANNER_PATTERN, RegistryKey.BANNER_PATTERN),
+        simpleTagKey("PaintingVariantTagKeys", Art.class, Registries.PAINTING_VARIANT, RegistryKey.PAINTING_VARIANT),
+        simpleTagKey("InstrumentTagKeys", MusicInstrument.class, Registries.INSTRUMENT, RegistryKey.INSTRUMENT),
        new MobGoalGenerator("VanillaGoal", "com.destroystokyo.paper.entity.ai")
    };

    private static <T, A> SourceGenerator simpleKey(final String className, final Class<A> apiType, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey, final boolean publicCreateKeyMethod) {
        return new GeneratedKeyType<>(className, apiType, "io.papermc.paper.registry.keys", registryKey, apiRegistryKey, publicCreateKeyMethod);
    }
+
+    private static <T, A> SourceGenerator simpleTagKey(final String className, final Class<A> apiType, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey) {
+        return new GeneratedTagKeyType<>(className, apiType, "io.papermc.paper.registry.keys.tags", registryKey, apiRegistryKey, true);
+    }
 }
@@ -1,22 +1,32 @@
 package io.papermc.generator;

+import com.google.common.util.concurrent.MoreExecutors;
 import com.mojang.logging.LogUtils;
 import io.papermc.generator.types.SourceGenerator;
+import io.papermc.generator.utils.TagCollector;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
 import net.minecraft.SharedConstants;
+import net.minecraft.commands.Commands;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.LayeredRegistryAccess;
+import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.RegistryDataLoader;
 import net.minecraft.server.Bootstrap;
 import net.minecraft.server.RegistryLayer;
-import net.minecraft.server.WorldLoader;
+import net.minecraft.server.ReloadableServerResources;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.server.packs.repository.ServerPacksSource;
 import net.minecraft.server.packs.resources.MultiPackResourceManager;
+import net.minecraft.tags.TagKey;
+import net.minecraft.tags.TagLoader;
+import net.minecraft.world.flag.FeatureFlags;
 import org.apache.commons.io.file.PathUtils;
 import org.slf4j.Logger;

@@ -24,6 +34,7 @@ public final class Main {

    private static final Logger LOGGER = LogUtils.getLogger();
    public static final RegistryAccess.Frozen REGISTRY_ACCESS;
+    public static final Map<TagKey<?>, String> EXPERIMENTAL_TAGS;

    static {
        SharedConstants.tryDetectVersion();
@@ -34,8 +45,23 @@ public final class Main {
        resourceRepository.reload();
        final MultiPackResourceManager resourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, resourceRepository.getAvailablePacks().stream().map(Pack::open).toList());
        LayeredRegistryAccess<RegistryLayer> layers = RegistryLayer.createRegistryAccess();
-        layers = WorldLoader.loadAndReplaceLayer(resourceManager, layers, RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES);
+        final List<Registry.PendingTags<?>> pendingTags = TagLoader.loadTagsForExistingRegistries(resourceManager, layers.getLayer(RegistryLayer.STATIC));
+        final List<HolderLookup.RegistryLookup<?>> worldGenLayer = TagLoader.buildUpdatedLookups(layers.getAccessForLoading(RegistryLayer.WORLDGEN), pendingTags);
+        final RegistryAccess.Frozen frozenWorldgenRegistries = RegistryDataLoader.load(resourceManager, worldGenLayer, RegistryDataLoader.WORLDGEN_REGISTRIES);
+        layers = layers.replaceFrom(RegistryLayer.WORLDGEN, frozenWorldgenRegistries);
        REGISTRY_ACCESS = layers.compositeAccess().freeze();
+        final ReloadableServerResources reloadableServerResources = ReloadableServerResources.loadResources(
+            resourceManager,
+            layers,
+            pendingTags,
+            FeatureFlags.VANILLA_SET,
+            Commands.CommandSelection.DEDICATED,
+            0,
+            MoreExecutors.directExecutor(),
+            MoreExecutors.directExecutor()
+        ).join();
+        reloadableServerResources.updateStaticRegistryTags();
+        EXPERIMENTAL_TAGS = TagCollector.grabExperimental(resourceManager);
    }

    private Main() {
@@ -23,13 +23,17 @@ import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import javax.lang.model.SourceVersion;
 import net.kyori.adventure.key.Key;
 import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistrySetBuilder;
-import net.minecraft.data.registries.UpdateOneTwentyOneRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.data.registries.VanillaRegistries;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.flag.FeatureElement;
+import net.minecraft.world.flag.FeatureFlags;
 import org.bukkit.MinecraftExperimental;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -37,7 +41,6 @@ import org.checkerframework.framework.qual.DefaultQualifier;

 import static com.squareup.javapoet.TypeSpec.classBuilder;
 import static io.papermc.generator.utils.Annotations.EXPERIMENTAL_API_ANNOTATION;
-import static io.papermc.generator.utils.Annotations.NOT_NULL;
 import static io.papermc.generator.utils.Annotations.experimentalAnnotations;
 import static java.util.Objects.requireNonNull;
 import static javax.lang.model.element.Modifier.FINAL;
@@ -51,9 +54,7 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
    private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> VANILLA_REGISTRY_ENTRIES = VanillaRegistries.BUILDER.entries.stream()
            .collect(Collectors.toMap(RegistrySetBuilder.RegistryStub::key, RegistrySetBuilder.RegistryStub::bootstrap));

-    private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> EXPERIMENTAL_REGISTRY_ENTRIES = UpdateOneTwentyOneRegistries.BUILDER.entries.stream()
-            .collect(Collectors.toMap(RegistrySetBuilder.RegistryStub::key, RegistrySetBuilder.RegistryStub::bootstrap));
-
+    private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> EXPERIMENTAL_REGISTRY_ENTRIES = Map.of(); // Update for Experimental API
    private static final Map<RegistryKey<?>, String> REGISTRY_KEY_FIELD_NAMES;
    static {
        final Map<RegistryKey<?>, String> map = new HashMap<>();
@@ -71,7 +72,7 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
    }

    private static final String CREATE_JAVADOC = """
-        Creates a key for {@link $T} in a registry.
+        Creates a key for {@link $T} in the registry {@code $L}.
        
        @param key the value's key in the registry
        @return a new typed key
@@ -91,17 +92,17 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
    }

    private MethodSpec.Builder createMethod(final TypeName returnType) {
-        final TypeName keyType = TypeName.get(Key.class).annotated(NOT_NULL);
+        final TypeName keyType = TypeName.get(Key.class);

        final ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
        final MethodSpec.Builder create = MethodSpec.methodBuilder("create")
            .addModifiers(this.publicCreateKeyMethod ? PUBLIC : PRIVATE, STATIC)
            .addParameter(keyParam)
            .addCode("return $T.create($T.$L, $N);", TypedKey.class, RegistryKey.class, requireNonNull(REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey), "Missing field for " + this.apiRegistryKey), keyParam)
-            .returns(returnType.annotated(NOT_NULL));
+            .returns(returnType);
        if (this.publicCreateKeyMethod) {
            create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental
-            create.addJavadoc(CREATE_JAVADOC, this.apiType);
+            create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.location().toString());
        }
        return create;
    }
@@ -117,6 +118,13 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
            );
    }

+    @Deprecated
+    private static final Map<String, String> JUKEBOX_SONG_NAMES = Map.of(
+        "5", "FIVE",
+        "11", "ELEVEN",
+        "13", "THIRTEEN"
+    );
+
    @Override
    protected TypeSpec getTypeSpec() {
        final TypeName typedKey = ParameterizedTypeName.get(TypedKey.class, this.apiType);
@@ -124,35 +132,55 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
        final TypeSpec.Builder typeBuilder = this.keyHolderType();
        final MethodSpec.Builder createMethod = this.createMethod(typedKey);

-        final Registry<T> registry = Main.REGISTRY_ACCESS.registryOrThrow(this.registryKey);
+        final Registry<T> registry = Main.REGISTRY_ACCESS.lookupOrThrow(this.registryKey);
        final Set<ResourceKey<T>> experimental = this.collectExperimentalKeys(registry);

        boolean allExperimental = true;
-        for (final Holder.Reference<T> reference : registry.holders().sorted(Formatting.alphabeticKeyOrder(reference -> reference.key().location().getPath())).toList()) {
+        for (final Holder.Reference<T> reference : registry.listElements().sorted(Formatting.alphabeticKeyOrder(reference -> reference.key().location().getPath())).toList()) {
            final ResourceKey<T> key = reference.key();
            final String keyPath = key.location().getPath();
-            final String fieldName = Formatting.formatKeyAsField(keyPath);
+            String fieldName = Formatting.formatKeyAsField(keyPath);
+            if (!SourceVersion.isIdentifier(fieldName) && this.registryKey.equals(Registries.JUKEBOX_SONG) && JUKEBOX_SONG_NAMES.containsKey(fieldName)) {
+                fieldName = JUKEBOX_SONG_NAMES.get(fieldName);
+            }
+
            final FieldSpec.Builder fieldBuilder = FieldSpec.builder(typedKey, fieldName, PUBLIC, STATIC, FINAL)
                .initializer("$N(key($S))", createMethod.build(), keyPath)
                .addJavadoc(Javadocs.getVersionDependentField("{@code $L}"), key.location().toString());
            if (experimental.contains(key)) {
-                fieldBuilder.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.UPDATE_1_21));
+                fieldBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
            } else {
                allExperimental = false;
            }
            typeBuilder.addField(fieldBuilder.build());
        }
        if (allExperimental) {
-            typeBuilder.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.UPDATE_1_21));
-            createMethod.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.UPDATE_1_21));
+            typeBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
+            createMethod.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
        } else {
            typeBuilder.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO experimental API
        }
        return typeBuilder.addMethod(createMethod.build()).build();
    }

-    @SuppressWarnings("unchecked")
+    // todo at some point this should be per feature data pack not all merged
    private Set<ResourceKey<T>> collectExperimentalKeys(final Registry<T> registry) {
+        if (FeatureElement.FILTERED_REGISTRIES.contains(registry.key())) {
+            return this.collectExperimentalKeysBuiltIn(registry);
+        } else {
+            return this.collectExperimentalKeysDataDriven(registry);
+        }
+    }
+
+    private Set<ResourceKey<T>> collectExperimentalKeysBuiltIn(final Registry<T> registry) {
+        final HolderLookup.RegistryLookup<T> filteredLookup = registry.filterElements(v -> {
+            return v instanceof final FeatureElement featureElement && FeatureFlags.isExperimental(featureElement.requiredFeatures()); // Update for Experimental API
+        });
+        return filteredLookup.listElementIds().collect(Collectors.toUnmodifiableSet());
+    }
+
+    @SuppressWarnings("unchecked")
+    private Set<ResourceKey<T>> collectExperimentalKeysDataDriven(final Registry<T> registry) {
        final RegistrySetBuilder.@Nullable RegistryBootstrap<T> experimentalBootstrap = (RegistrySetBuilder.RegistryBootstrap<T>) EXPERIMENTAL_REGISTRY_ENTRIES.get(this.registryKey);
        if (experimentalBootstrap == null) {
            return Collections.emptySet();
@@ -174,8 +202,6 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
    @Override
    protected JavaFile.Builder file(final JavaFile.Builder builder) {
        return builder
-            .skipJavaLangImports(true)
-            .addStaticImport(Key.class, "key")
-            .indent("    ");
+            .addStaticImport(Key.class, "key");
    }
 }
@@ -0,0 +1,138 @@
+package io.papermc.generator.types;
+
+import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+import io.papermc.generator.Main;
+import io.papermc.generator.utils.Annotations;
+import io.papermc.generator.utils.Formatting;
+import io.papermc.generator.utils.Javadocs;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import net.kyori.adventure.key.Key;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+import org.bukkit.MinecraftExperimental;
+
+import static com.squareup.javapoet.TypeSpec.classBuilder;
+import static io.papermc.generator.utils.Annotations.EXPERIMENTAL_API_ANNOTATION;
+import static io.papermc.generator.utils.Annotations.experimentalAnnotations;
+import static java.util.Objects.requireNonNull;
+import static javax.lang.model.element.Modifier.FINAL;
+import static javax.lang.model.element.Modifier.PRIVATE;
+import static javax.lang.model.element.Modifier.PUBLIC;
+import static javax.lang.model.element.Modifier.STATIC;
+
+public class GeneratedTagKeyType<T, A> extends SimpleGenerator {
+
+    private static final Map<RegistryKey<?>, String> REGISTRY_KEY_FIELD_NAMES;
+    static {
+        final Map<RegistryKey<?>, String> map = new HashMap<>();
+        try {
+            for (final Field field : RegistryKey.class.getFields()) {
+                if (!Modifier.isStatic(field.getModifiers()) || !Modifier.isFinal(field.getModifiers()) || field.getType() != RegistryKey.class) {
+                    continue;
+                }
+                map.put((RegistryKey<?>) field.get(null), field.getName());
+            }
+            REGISTRY_KEY_FIELD_NAMES = Map.copyOf(map);
+        } catch (final ReflectiveOperationException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private static final String CREATE_JAVADOC = """
+        Creates a tag key for {@link $T} in the registry {@code $L}.
+        
+        @param key the tag key's key
+        @return a new tag key
+        """;
+
+    private final Class<A> apiType;
+    private final ResourceKey<? extends Registry<T>> registryKey;
+    private final RegistryKey<A> apiRegistryKey;
+    private final boolean publicCreateKeyMethod;
+
+    public GeneratedTagKeyType(final String keysClassName, final Class<A> apiType, final String pkg, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey, final boolean publicCreateKeyMethod) {
+        super(keysClassName, pkg);
+        this.apiType = apiType;
+        this.registryKey = registryKey;
+        this.apiRegistryKey = apiRegistryKey;
+        this.publicCreateKeyMethod = publicCreateKeyMethod;
+    }
+
+    private MethodSpec.Builder createMethod(final TypeName returnType) {
+        final TypeName keyType = TypeName.get(Key.class);
+
+        final ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
+        final MethodSpec.Builder create = MethodSpec.methodBuilder("create")
+            .addModifiers(this.publicCreateKeyMethod ? PUBLIC : PRIVATE, STATIC)
+            .addParameter(keyParam)
+            .addCode("return $T.create($T.$L, $N);", TagKey.class, RegistryKey.class, requireNonNull(REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey), "Missing field for " + this.apiRegistryKey), keyParam)
+            .returns(returnType);
+        if (this.publicCreateKeyMethod) {
+            create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental
+            create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.location().toString());
+        }
+        return create;
+    }
+
+    private TypeSpec.Builder keyHolderType() {
+        return classBuilder(this.className)
+            .addModifiers(PUBLIC, FINAL)
+            .addJavadoc(Javadocs.getVersionDependentClassHeader("{@link $T#$L}"), RegistryKey.class, REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey))
+            .addAnnotations(Annotations.CLASS_HEADER)
+            .addMethod(MethodSpec.constructorBuilder()
+                .addModifiers(PRIVATE)
+                .build()
+            );
+    }
+
+    @Override
+    protected TypeSpec getTypeSpec() {
+        final TypeName tagKey = ParameterizedTypeName.get(TagKey.class, this.apiType);
+
+        final TypeSpec.Builder typeBuilder = this.keyHolderType();
+        final MethodSpec.Builder createMethod = this.createMethod(tagKey);
+
+        final Registry<T> registry = Main.REGISTRY_ACCESS.lookupOrThrow(this.registryKey);
+
+        final AtomicBoolean allExperimental = new AtomicBoolean(true);
+        registry.listTagIds().sorted(Formatting.alphabeticKeyOrder(nmsTagKey -> nmsTagKey.location().getPath())).forEach(nmsTagKey -> {
+            final String fieldName = Formatting.formatKeyAsField(nmsTagKey.location().getPath());
+            final FieldSpec.Builder fieldBuilder = FieldSpec.builder(tagKey, fieldName, PUBLIC, STATIC, FINAL)
+                .initializer("$N(key($S))", createMethod.build(), nmsTagKey.location().getPath())
+                .addJavadoc(Javadocs.getVersionDependentField("{@code $L}"), "#" + nmsTagKey.location());
+            final String featureFlagName = Main.EXPERIMENTAL_TAGS.get(nmsTagKey);
+            if (featureFlagName != null) {
+                fieldBuilder.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.valueOf(featureFlagName.toUpperCase(Locale.ENGLISH)))); // Update for Experimental API
+            } else {
+                allExperimental.set(false);
+            }
+            typeBuilder.addField(fieldBuilder.build());
+        });
+        if (allExperimental.get()) {
+            typeBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
+            createMethod.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
+        } else {
+            typeBuilder.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO experimental API
+        }
+        return typeBuilder.addMethod(createMethod.build()).build();
+    }
+
+    @Override
+    protected JavaFile.Builder file(final JavaFile.Builder builder) {
+        return builder
+            .addStaticImport(Key.class, "key");
+    }
+}
@@ -31,5 +31,4 @@ public abstract class SimpleGenerator implements SourceGenerator {

        builder.build().writeTo(parent, StandardCharsets.UTF_8);
    }
-
 }
@@ -1,6 +1,5 @@
 package io.papermc.generator.types.goal;

-import com.destroystokyo.paper.entity.RangedEntity;
 import com.destroystokyo.paper.entity.ai.GoalKey;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.FieldSpec;
@@ -19,44 +18,10 @@ import io.papermc.generator.utils.Formatting;
 import io.papermc.generator.utils.Javadocs;
 import java.util.Comparator;
 import java.util.List;
-import javax.lang.model.element.Modifier;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.ai.goal.WrappedGoal;
 import org.bukkit.NamespacedKey;
-import org.bukkit.entity.AbstractHorse;
-import org.bukkit.entity.Blaze;
-import org.bukkit.entity.Cat;
-import org.bukkit.entity.Creature;
-import org.bukkit.entity.Dolphin;
-import org.bukkit.entity.Drowned;
-import org.bukkit.entity.Enderman;
-import org.bukkit.entity.Evoker;
-import org.bukkit.entity.Fish;
-import org.bukkit.entity.Fox;
-import org.bukkit.entity.Ghast;
-import org.bukkit.entity.Llama;
 import org.bukkit.entity.Mob;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.Panda;
-import org.bukkit.entity.Parrot;
-import org.bukkit.entity.PigZombie;
-import org.bukkit.entity.PolarBear;
-import org.bukkit.entity.Rabbit;
-import org.bukkit.entity.Raider;
-import org.bukkit.entity.Ravager;
-import org.bukkit.entity.Shulker;
-import org.bukkit.entity.Silverfish;
-import org.bukkit.entity.SkeletonHorse;
-import org.bukkit.entity.Slime;
-import org.bukkit.entity.Spellcaster;
-import org.bukkit.entity.Spider;
-import org.bukkit.entity.Squid;
-import org.bukkit.entity.Tameable;
-import org.bukkit.entity.TraderLlama;
-import org.bukkit.entity.Turtle;
-import org.bukkit.entity.Vex;
-import org.bukkit.entity.Vindicator;
-import org.bukkit.entity.WanderingTrader;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;
 import org.jetbrains.annotations.Nullable;
@@ -71,95 +36,6 @@ public class MobGoalGenerator extends SimpleGenerator {

    private static final String CLASS_HEADER = Javadocs.getVersionDependentClassHeader("Mob Goals");

-    private static final DeprecatedEntry[] DEPRECATED_ENTRIES = {
-        //<editor-fold defaultstate="collapsed" desc="legacy entries">
-        new DeprecatedEntry(Vindicator.class, "vindicator_melee_attack", null, "1.20.2"),
-        new DeprecatedEntry(Ravager.class, "ravager_melee_attack", null, "1.20.2"),
-        new DeprecatedEntry(Rabbit.class, "evil_rabbit_attack", null, "1.20.2"),
-        new DeprecatedEntry(PigZombie.class, "anger", "1.21", "1.16"),
-        new DeprecatedEntry(PigZombie.class, "anger_other", "1.21", "1.16"),
-        new DeprecatedEntry(Blaze.class, "blaze_fireball", "1.21", null),
-        new DeprecatedEntry(Cat.class, "tempt_chance", "1.21", null),
-        new DeprecatedEntry(Dolphin.class, "dolphin_play_with_items", "1.21", null),
-        new DeprecatedEntry(Drowned.class, "drowned_goto_beach", "1.21", null),
-        new DeprecatedEntry(Creature.class, "drowned_goto_water", "1.21", null),
-        new DeprecatedEntry(Enderman.class, "enderman_pickup_block", "1.21", null),
-        new DeprecatedEntry(Enderman.class, "enderman_place_block", "1.21", null),
-        new DeprecatedEntry(Enderman.class, "player_who_looked_at_target", "1.21", null),
-        new DeprecatedEntry(Evoker.class, "evoker_cast_spell", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_defend_trusted", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_faceplant", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_perch_and_search", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_sleep", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_seek_shelter", "1.21", null),
-        new DeprecatedEntry(Fox.class, "fox_stalk_prey", "1.21", null),
-        new DeprecatedEntry(Ghast.class, "ghast_attack_target", "1.21", null),
-        new DeprecatedEntry(Ghast.class, "ghast_idle_move", "1.21", null),
-        new DeprecatedEntry(Ghast.class, "ghast_move_towards_target", "1.21", null),
-        new DeprecatedEntry(Spellcaster.class, "spellcaster_cast_spell", "1.21", null),
-        new DeprecatedEntry(TraderLlama.class, "llamatrader_defended_wandering_trader", "1.21", null),
-        new DeprecatedEntry(Panda.class, "panda_hurt_by_target", "1.21", null),
-        new DeprecatedEntry(PolarBear.class, "polarbear_attack_players", "1.21", null),
-        new DeprecatedEntry(PolarBear.class, "polarbear_hurt_by", "1.21", null),
-        new DeprecatedEntry(PolarBear.class, "polarbear_melee", "1.21", null),
-        new DeprecatedEntry(PolarBear.class, "polarbear_panic", "1.21", null),
-        new DeprecatedEntry(Rabbit.class, "eat_carrots", "1.21", null),
-        new DeprecatedEntry(Rabbit.class, "killer_rabbit_melee_attack", "1.21", null),
-        new DeprecatedEntry(Rabbit.class, "rabbit_avoid_target", "1.21", null),
-        new DeprecatedEntry(Raider.class, "raider_hold_ground", "1.21", null),
-        new DeprecatedEntry(Raider.class, "raider_obtain_banner", "1.21", null),
-        new DeprecatedEntry(Shulker.class, "shulker_defense", "1.21", null),
-        new DeprecatedEntry(Shulker.class, "shulker_nearest", "1.21", null),
-        new DeprecatedEntry(Silverfish.class, "silverfish_hide_in_block", "1.21", null),
-        new DeprecatedEntry(Silverfish.class, "silverfish_wake_others", "1.21", null),
-        new DeprecatedEntry(Slime.class, "slime_idle", "1.21", null),
-        new DeprecatedEntry(Slime.class, "slime_nearest_player", "1.21", null),
-        new DeprecatedEntry(Slime.class, "slime_random_jump", "1.21", null),
-        new DeprecatedEntry(Spider.class, "spider_melee_attack", "1.21", null),
-        new DeprecatedEntry(Spider.class, "spider_nearest_attackable_target", "1.21", null),
-        new DeprecatedEntry(Squid.class, "squid", "1.21", null),
-        new DeprecatedEntry(Turtle.class, "turtle_goto_water", "1.21", null),
-        new DeprecatedEntry(Turtle.class, "turtle_tempt", "1.21", null),
-        new DeprecatedEntry(Vex.class, "vex_copy_target_of_owner", "1.21", null),
-        new DeprecatedEntry(WanderingTrader.class, "villagertrader_wander_to_position", "1.21", null),
-        new DeprecatedEntry(RangedEntity.class, "arrow_attack", "1.21", null),
-        new DeprecatedEntry(Creature.class, "avoid_target", "1.21", null),
-        new DeprecatedEntry(Monster.class, "bow_shoot", "1.21", null),
-        new DeprecatedEntry(Creature.class, "breath", "1.21", null),
-        new DeprecatedEntry(Cat.class, "cat_sit_on_bed", "1.21", null),
-        new DeprecatedEntry(Monster.class, "crossbow_attack", "1.21", null),
-        new DeprecatedEntry(Mob.class, "door_open", "1.21", null),
-        new DeprecatedEntry(Mob.class, "eat_tile", "1.21", null),
-        new DeprecatedEntry(Fish.class, "fish_school", "1.21", null),
-        new DeprecatedEntry(Mob.class, "follow_entity", "1.21", null),
-        new DeprecatedEntry(SkeletonHorse.class, "horse_trap", "1.21", null),
-        new DeprecatedEntry(Creature.class, "hurt_by_target", "1.21", null),
-        new DeprecatedEntry(Cat.class, "jump_on_block", "1.21", null),
-        new DeprecatedEntry(Mob.class, "leap_at_target", "1.21", null),
-        new DeprecatedEntry(Llama.class, "llama_follow", "1.21", null),
-        new DeprecatedEntry(Creature.class, "move_towards_target", "1.21", null),
-        new DeprecatedEntry(Mob.class, "nearest_attackable_target", "1.21", null),
-        new DeprecatedEntry(Raider.class, "nearest_attackable_target_witch", "1.21", null),
-        new DeprecatedEntry(Creature.class, "nearest_village", "1.21", null),
-        new DeprecatedEntry(Tameable.class, "owner_hurt_by_target", "1.21", null),
-        new DeprecatedEntry(Tameable.class, "owner_hurt_target", "1.21", null),
-        new DeprecatedEntry(Parrot.class, "perch", "1.21", null),
-        new DeprecatedEntry(Raider.class, "raid", "1.21", null),
-        new DeprecatedEntry(Creature.class, "random_fly", "1.21", null),
-        new DeprecatedEntry(Mob.class, "random_lookaround", "1.21", null),
-        new DeprecatedEntry(Creature.class, "random_stroll_land", "1.21", null),
-        new DeprecatedEntry(Creature.class, "random_swim", "1.21", null),
-        new DeprecatedEntry(Tameable.class, "random_target_non_tamed", "1.21", null),
-        new DeprecatedEntry(Tameable.class, "sit", "1.21", null),
-        new DeprecatedEntry(Creature.class, "stroll_village", "1.21", null),
-        new DeprecatedEntry(AbstractHorse.class, "tame", "1.21", null),
-        new DeprecatedEntry(Creature.class, "water", "1.21", null),
-        new DeprecatedEntry(Dolphin.class, "water_jump", "1.21", null),
-        new DeprecatedEntry(Creature.class, "stroll_village_golem", "1.21", null),
-        new DeprecatedEntry(Mob.class, "universal_anger_reset", "1.21", null)
-        //</editor-fold>
-    };
-
    public MobGoalGenerator(final String keysClassName, final String pkg) {
        super(keysClassName, pkg);
    }
@@ -174,10 +50,8 @@ public class MobGoalGenerator extends SimpleGenerator {
            .addAnnotations(Annotations.CLASS_HEADER)
            .addJavadoc(CLASS_HEADER);

-        TypeName mobType = ParameterizedTypeName.get(ClassName.get(Class.class), type)
-            .annotated(Annotations.NOT_NULL);
-        TypeName keyType = TypeName.get(String.class)
-            .annotated(Annotations.NOT_NULL);
+        TypeName mobType = ParameterizedTypeName.get(ClassName.get(Class.class), type);
+        TypeName keyType = TypeName.get(String.class);

        ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
        ParameterSpec typeParam = ParameterSpec.builder(mobType, "type", FINAL).build();
@@ -187,7 +61,7 @@ public class MobGoalGenerator extends SimpleGenerator {
            .addParameter(typeParam)
            .addCode("return $T.of($N, $T.minecraft($N));", GoalKey.class, typeParam, NamespacedKey.class, keyParam)
            .addTypeVariable(type)
-            .returns(ParameterizedTypeName.get(ClassName.get(GoalKey.class), type).annotated(Annotations.NOT_NULL));
+            .returns(ParameterizedTypeName.get(ClassName.get(GoalKey.class), type));

        List<Class<Goal>> classes;
        try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages("net.minecraft").scan()) {
@@ -216,38 +90,11 @@ public class MobGoalGenerator extends SimpleGenerator {
            typeBuilder.addField(fieldBuilder.build());
        }

-        for (final DeprecatedEntry value : DEPRECATED_ENTRIES) {
-            TypeName typedKey = ParameterizedTypeName.get(GoalKey.class, value.entity);
-            NamespacedKey key = NamespacedKey.minecraft(value.entryName);
-
-            String keyPath = key.getKey();
-            String fieldName = Formatting.formatKeyAsField(keyPath);
-            FieldSpec.Builder fieldBuilder = FieldSpec.builder(typedKey, fieldName, PUBLIC, STATIC, FINAL)
-                .addAnnotation(Annotations.deprecatedVersioned(value.removedVersion, value.removalVersion != null))
-                .initializer("$N($S, $T.class)", createMethod.build(), keyPath, value.entity);
-
-            if (value.removedVersion != null) {
-                fieldBuilder.addJavadoc("Removed in $L", value.removedVersion);
-            }
-            if (value.removalVersion != null) {
-                fieldBuilder.addAnnotation(Annotations.scheduledRemoval(value.removalVersion));
-            }
-
-            typeBuilder.addField(fieldBuilder.build());
-        }
-
        return typeBuilder.addMethod(createMethod.build()).build();
    }

    @Override
    protected JavaFile.Builder file(JavaFile.Builder builder) {
-        return builder
-            .skipJavaLangImports(true);
+        return builder;
    }
-
-    record DeprecatedEntry(Class<?> entity, String entryName, @Nullable String removalVersion,
-                           @Nullable String removedVersion) {
-
-    }
-
 }
@@ -120,6 +120,7 @@ import org.bukkit.entity.ZombieVillager;
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;

@@ -235,6 +236,8 @@ public class MobGoalNames {
        bukkitMap.put(net.minecraft.world.entity.monster.breeze.Breeze.class, org.bukkit.entity.Breeze.class);
        bukkitMap.put(net.minecraft.world.entity.animal.armadillo.Armadillo.class, org.bukkit.entity.Armadillo.class);
        bukkitMap.put(net.minecraft.world.entity.monster.Bogged.class, org.bukkit.entity.Bogged.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.creaking.Creaking.class, org.bukkit.entity.Creaking.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.AgeableWaterCreature.class, org.bukkit.entity.Squid.class); // close enough
        //</editor-fold>
    }

@@ -267,6 +270,7 @@ public class MobGoalNames {
                name = cut;
            }
        }
+
        name = name.replace("PathfinderGoal", "");
        name = name.replace("TargetGoal", "");
        name = name.replace("Goal", "");
@@ -282,8 +286,8 @@ public class MobGoalNames {
        name = sb.toString();
        name = name.replaceFirst("_", "");

-        if (flag && !deobfuscationMap.containsKey(name.toLowerCase()) && !ignored.contains(name)) {
-            System.out.println("need to map " + original + " (" + name.toLowerCase() + ")");
+        if (flag && !deobfuscationMap.containsKey(name.toLowerCase(Locale.ROOT)) && !ignored.contains(name)) {
+            System.out.println("need to map " + original + " (" + name.toLowerCase(Locale.ROOT) + ")");
        }

        // did we rename this key?
@@ -1,30 +1,35 @@
 package io.papermc.generator.utils;

 import com.squareup.javapoet.AnnotationSpec;
+import java.util.ArrayList;
 import java.util.List;

 import io.papermc.paper.generated.GeneratedFrom;
 import net.minecraft.SharedConstants;
 import org.bukkit.MinecraftExperimental;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;

 public final class Annotations {

-    public static List<AnnotationSpec> experimentalAnnotations(final MinecraftExperimental.Requires requiredFeatureFlag) {
-        return List.of(
-            AnnotationSpec.builder(ApiStatus.Experimental.class).build(),
-            AnnotationSpec.builder(MinecraftExperimental.class)
+    public static List<AnnotationSpec> experimentalAnnotations(final MinecraftExperimental.@Nullable Requires requiredFeatureFlag) {
+        final List<AnnotationSpec> annotationSpecs = new ArrayList<>();
+        annotationSpecs.add(AnnotationSpec.builder(ApiStatus.Experimental.class).build());
+        if (requiredFeatureFlag != null) {
+            annotationSpecs.add(AnnotationSpec.builder(MinecraftExperimental.class)
                .addMember("value", "$T.$L", MinecraftExperimental.Requires.class, requiredFeatureFlag.name())
-                .build()
-        );
+                .build());
+        } else {
+            annotationSpecs.add(AnnotationSpec.builder(MinecraftExperimental.class).build());
+        }
+        return annotationSpecs;
    }

-    public static AnnotationSpec deprecatedVersioned(final @Nullable String version, boolean forRemoval) {
-        AnnotationSpec.Builder annotationSpec = AnnotationSpec.builder(Deprecated.class);
+    public static AnnotationSpec deprecatedVersioned(final @Nullable String version, final boolean forRemoval) {
+        final AnnotationSpec.Builder annotationSpec = AnnotationSpec.builder(Deprecated.class);
        if (forRemoval) {
-            annotationSpec.addMember("forRemoval", "$L", forRemoval);
+            annotationSpec.addMember("forRemoval", "$L", true);
        }
        if (version != null) {
            annotationSpec.addMember("since", "$S", version);
@@ -41,7 +46,7 @@ public final class Annotations {

    @ApiStatus.Experimental
    public static final AnnotationSpec EXPERIMENTAL_API_ANNOTATION = AnnotationSpec.builder(ApiStatus.Experimental.class).build();
-    public static final AnnotationSpec NOT_NULL = AnnotationSpec.builder(NotNull.class).build();
+    public static final AnnotationSpec NULL_MARKED = AnnotationSpec.builder(NullMarked.class).build();
    private static final AnnotationSpec SUPPRESS_WARNINGS = AnnotationSpec.builder(SuppressWarnings.class)
        .addMember("value", "$S", "unused")
        .addMember("value", "$S", "SpellCheckingInspection")
@@ -51,7 +56,8 @@ public final class Annotations {
        .build();
    public static final Iterable<AnnotationSpec> CLASS_HEADER = List.of(
        SUPPRESS_WARNINGS,
-        GENERATED_FROM
+        GENERATED_FROM,
+        NULL_MARKED
    );

    private Annotations() {
@@ -2,7 +2,6 @@ package io.papermc.generator.utils;

 import com.mojang.serialization.Lifecycle;
 import io.papermc.generator.Main;
-import java.util.List;
 import java.util.Set;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderGetter;
@@ -19,11 +18,11 @@ public record CollectingContext<T>(Set<ResourceKey<T>> registered,
    @Override
    public Holder.Reference<T> register(final ResourceKey<T> resourceKey, final @NonNull T t, final Lifecycle lifecycle) {
        this.registered.add(resourceKey);
-        return Holder.Reference.createStandAlone(this.registry.holderOwner(), resourceKey);
+        return Holder.Reference.createStandAlone(this.registry, resourceKey);
    }

    @Override
    public <S> HolderGetter<S> lookup(final ResourceKey<? extends Registry<? extends S>> resourceKey) {
-        return Main.REGISTRY_ACCESS.registryOrThrow(resourceKey).asLookup();
+        return Main.REGISTRY_ACCESS.lookupOrThrow(resourceKey);
    }
 }
@@ -1,5 +1,6 @@
 package io.papermc.generator.utils;

+import java.util.Optional;
 import org.apache.commons.lang3.math.NumberUtils;
 import java.util.Comparator;
 import java.util.Locale;
@@ -12,7 +13,16 @@ public final class Formatting {
    private static final Pattern ILLEGAL_FIELD_CHARACTERS = Pattern.compile("[.-/]");

    public static String formatKeyAsField(String path) {
-        return ILLEGAL_FIELD_CHARACTERS.matcher(path.toUpperCase(Locale.ENGLISH)).replaceAll("_");
+        return ILLEGAL_FIELD_CHARACTERS.matcher(path.toUpperCase(Locale.ROOT)).replaceAll("_");
+    }
+
+    public static Optional<String> formatTagKey(String tagDir, String resourcePath) {
+        int tagsIndex = resourcePath.indexOf(tagDir);
+        int dotIndex = resourcePath.lastIndexOf('.');
+        if (tagsIndex == -1 || dotIndex == -1) {
+            return Optional.empty();
+        }
+        return Optional.of(resourcePath.substring(tagsIndex + tagDir.length() + 1, dotIndex)); // namespace/tags/registry_key/[tag_key].json
    }

    public static Comparator<String> ALPHABETIC_KEY_ORDER = alphabeticKeyOrder(path -> path);
@@ -0,0 +1,79 @@
+package io.papermc.generator.utils;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.mojang.logging.LogUtils;
+import io.papermc.generator.Main;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.packs.PackResources;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.repository.BuiltInPackSource;
+import net.minecraft.server.packs.resources.MultiPackResourceManager;
+import net.minecraft.tags.TagKey;
+import org.slf4j.Logger;
+
+// collect all the tags by grabbing the json from the data-packs
+// another (probably) way is to hook into the data generator like the typed keys generator
+public final class TagCollector {
+
+    private static final Logger LOGGER = LogUtils.getLogger();
+
+    public static Map<TagKey<?>, String> grabExperimental(final MultiPackResourceManager resourceManager) {
+        Map<TagKey<?>, String> result = new IdentityHashMap<>();
+
+        // collect all vanilla tags
+        Multimap<ResourceKey<? extends Registry<?>>, String> vanillaTags = HashMultimap.create();
+        PackResources vanillaPack = resourceManager.listPacks()
+            .filter(packResources -> packResources.packId().equals(BuiltInPackSource.VANILLA_ID))
+            .findFirst()
+            .orElseThrow();
+        collectFromPack(vanillaPack, (entry, path) -> vanillaTags.put(entry.key(), path));
+
+        // then distinct with other data-pack tags to know for sure newly created tags and so experimental one
+        resourceManager.listPacks().forEach(pack -> {
+            String packId = pack.packId();
+            if (packId.equals(BuiltInPackSource.VANILLA_ID)) return;
+
+            collectFromPack(pack, (entry, path) -> {
+                if (vanillaTags.get(entry.key()).contains(path)) {
+                    return;
+                }
+
+                result.put(entry.value().listTagIds()
+                    .filter(tagKey -> tagKey.location().getPath().equals(path))
+                    .findFirst()
+                    .orElseThrow(), packId);
+            });
+        });
+        return Collections.unmodifiableMap(result);
+    }
+
+    private static void collectFromPack(PackResources pack, BiConsumer<RegistryAccess.RegistryEntry<?>, String> output) {
+        Set<String> namespaces = pack.getNamespaces(PackType.SERVER_DATA);
+
+        for (String namespace : namespaces) {
+            Main.REGISTRY_ACCESS.registries().forEach(entry -> {
+                // this is probably expensive but can't find another way around and data-pack loader has similar logic
+                // the issue is that registry key can have parent/key (and custom folder too) but tag key can also have parent/key so parsing become a mess
+                // without having at least one of the two values
+                String tagDir = Registries.tagsDirPath(entry.key());
+                pack.listResources(PackType.SERVER_DATA, namespace, tagDir, (id, supplier) -> {
+                    Formatting.formatTagKey(tagDir, id.getPath()).ifPresentOrElse(path -> output.accept(entry, path), () -> {
+                        LOGGER.warn("Unable to parse the path: {}/{}/{}.json in the data-pack {} into a tag key", namespace, tagDir, id.getPath(), pack.packId());
+                    });
+                });
+            });
+        }
+    }
+
+    private TagCollector() {
+    }
+}
@@ -1,7 +1,6 @@
-public net/minecraft/server/WorldLoader loadAndReplaceLayer(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/server/RegistryLayer;Ljava/util/List;)Lnet/minecraft/core/LayeredRegistryAccess;
-
 # for auto-marking experimental stuff
 public net/minecraft/core/RegistrySetBuilder entries
 public net/minecraft/core/RegistrySetBuilder$RegistryStub
-public net/minecraft/data/registries/UpdateOneTwentyOneRegistries BUILDER
 public net/minecraft/data/registries/VanillaRegistries BUILDER
+public net/minecraft/data/registries/WinterDropRegistries BUILDER
+public net/minecraft/data/registries/TradeRebalanceRegistries BUILDER
@@ -27,10 +27,10 @@ index 5dd700a956e915c00b25d91dea8d6f285ddab72b..97e78e27ee0eea2c8b24886eeb19164d
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c46b0b620e
+index 0000000000000000000000000000000000000000..dfb490fe94c1f543cc75e9f5ca76f8254bff9159
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,93 @@
 +plugins {
 +    `java-library`
 +    `maven-publish`
@@ -46,11 +46,13 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4
 +
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
-+    api("com.google.guava:guava:32.1.2-jre")
-+    api("com.google.code.gson:gson:2.10.1")
+    api("com.google.guava:guava:33.3.1-jre")
+    api("com.google.code.gson:gson:2.11.0")
 +    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 +    api("org.yaml:snakeyaml:2.2")
-+    api("org.joml:joml:1.10.5")
+    api("org.joml:joml:1.10.8") {
+        isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
+    }
 +
 +    compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 +    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
@@ -63,8 +65,8 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4
 +    testImplementation("org.apache.commons:commons-lang3:3.12.0")
 +    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 +    testImplementation("org.hamcrest:hamcrest:2.2")
-+    testImplementation("org.mockito:mockito-core:5.11.0")
-+    testImplementation("org.ow2.asm:asm-tree:9.7")
+    testImplementation("org.mockito:mockito-core:5.14.1")
+    testImplementation("org.ow2.asm:asm-tree:9.7.1")
 +}
 +
 +configure<PublishingExtension> {
@@ -100,7 +102,7 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4
 +    options.use()
 +    options.isDocFilesSubDirs = true
 +    options.links(
-+        "https://guava.dev/releases/32.1.2-jre/api/docs/",
+        "https://guava.dev/releases/33.3.1-jre/api/docs/",
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
@@ -124,7 +126,7 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 278ecb12ecdb5e1fdf394a1c990a4d849e53e05e..0000000000000000000000000000000000000000
+index 25a8f7daaf393f3306ca5c6c0c79d3de7bc983db..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
@@ -1,267 +0,0 @@
@@ -135,7 +137,7 @@ index 278ecb12ecdb5e1fdf394a1c990a4d849e53e05e..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
-    <version>1.20.5-R0.1-SNAPSHOT</version>
+-    <version>1.21.4-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -164,21 +166,21 @@ index 278ecb12ecdb5e1fdf394a1c990a4d849e53e05e..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.google.guava</groupId>
 -            <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version>
+-            <version>33.3.1-jre</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
 -        <dependency>
 -            <groupId>com.google.code.gson</groupId>
 -            <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+-            <version>2.11.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
 -        <dependency>
 -            <groupId>org.joml</groupId>
 -            <artifactId>joml</artifactId>
-            <version>1.10.5</version>
+-            <version>1.10.8</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -236,13 +238,13 @@ index 278ecb12ecdb5e1fdf394a1c990a4d849e53e05e..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.mockito</groupId>
 -            <artifactId>mockito-core</artifactId>
-            <version>5.11.0</version>
+-            <version>5.14.1</version>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.ow2.asm</groupId>
 -            <artifactId>asm-tree</artifactId>
-            <version>9.7</version>
+-            <version>9.7.1</version>
 -            <scope>test</scope>
 -        </dependency>
 -    </dependencies>
@@ -5,13 +5,13 @@ Subject: [PATCH] Build system changes


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6271e2bad0ed937c2c46a8c8fdf186c46b0b620e..a918fd14c95e714e935758d60bccd72755e00b11 100644
+index dfb490fe94c1f543cc75e9f5ca76f8254bff9159..3667f27baa87c82e071cc14ca20491d38feee255 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -18,15 +18,26 @@ dependencies {
-     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
-     api("org.yaml:snakeyaml:2.2")
-     api("org.joml:joml:1.10.5")
+@@ -20,15 +20,27 @@ dependencies {
+     api("org.joml:joml:1.10.8") {
+         isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
+     }
 +    // Paper start
 +    api("com.googlecode.json-simple:json-simple:1.1.1") {
 +        isTransitive = false // includes junit
@@ -32,25 +32,27 @@ index 6271e2bad0ed937c2c46a8c8fdf186c46b0b620e..a918fd14c95e714e935758d60bccd727
 +    compileOnlyApi(checkerQual)
 +    testCompileOnly(checkerQual)
 +    // Paper end
+    api("org.jspecify:jspecify:1.0.0") // Paper - add jspecify
 +
     testImplementation("org.apache.commons:commons-lang3:3.12.0")
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
     testImplementation("org.hamcrest:hamcrest:2.2")
-@@ -69,8 +80,12 @@ tasks.withType<Javadoc> {
+@@ -71,8 +83,13 @@ tasks.withType<Javadoc> {
     options.links(
-         "https://guava.dev/releases/32.1.2-jre/api/docs/",
+         "https://guava.dev/releases/33.3.1-jre/api/docs/",
         "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
         "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
 +        // Paper start - add missing javadoc links
-+        "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
-+        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
+        "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
+        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
+        "https://jspecify.dev/docs/api/",
 +        // Paper end
     )
     options.tags("apiNote:a:API Note:")
 
-@@ -89,3 +104,14 @@ tasks.withType<Javadoc> {
+@@ -91,3 +108,14 @@ tasks.withType<Javadoc> {
 tasks.test {
     useJUnitPlatform()
 }
@@ -7,16 +7,52 @@ Subject: [PATCH] Test changes
 - Ignore package-private methods for nullability annotations
 - Add excludes for classes which don't pass
 - Disable stupid BukkitMirrorTest
+- configure mockito agent to address changes in newer java versions see https://openjdk.org/jeps/451

 Co-authored-by: Riley Park <rileysebastianpark@gmail.com>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
+Co-authored-by: Yannick Lamprecht <yannicklamprecht@live.de>

 diff --git a/build.gradle.kts b/build.gradle.kts
-index a918fd14c95e714e935758d60bccd72755e00b11..768024b2b4584fd7dd86f068c0e79c89ffc5faa1 100644
+index 3667f27baa87c82e071cc14ca20491d38feee255..73aaa8a341565626556327cda6a73f98c318863a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -105,6 +105,12 @@ tasks.test {
+@@ -11,6 +11,18 @@ java {
+ val annotationsVersion = "24.1.0"
+ val bungeeCordChatVersion = "1.20-R0.2"
+ 
+// Paper start - configure mockito agent that is needed in newer java versions
+val mockitoAgent = configurations.register("mockitoAgent")
+abstract class MockitoAgentProvider : CommandLineArgumentProvider {
+    @get:CompileClasspath
+    abstract val fileCollection: ConfigurableFileCollection
+
+    override fun asArguments(): Iterable<String> {
+        return listOf("-javaagent:" + fileCollection.files.single().absolutePath)
+    }
+}
+// Paper end - configure mockito agent that is needed in newer java versions
+
+ dependencies {
+     // api dependencies are listed transitively to API consumers
+     api("com.google.guava:guava:33.3.1-jre")
+@@ -46,6 +58,7 @@ dependencies {
+     testImplementation("org.hamcrest:hamcrest:2.2")
+     testImplementation("org.mockito:mockito-core:5.14.1")
+     testImplementation("org.ow2.asm:asm-tree:9.7.1")
+    mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
+ }
+ 
+ configure<PublishingExtension> {
+@@ -107,8 +120,19 @@ tasks.withType<Javadoc> {
+ 
+ tasks.test {
     useJUnitPlatform()
+    // Paper start - configure mockito agent that is needed in newer java versions
+    val provider = objects.newInstance<MockitoAgentProvider>()
+    provider.fileCollection.from(mockitoAgent)
+    jvmArgumentProviders.add(provider)
+    // Paper end - configure mockito agent that is needed in newer java versions
 }
 
 +// Paper start - compile tests with -parameters for better junit parameterized test names
@@ -66,7 +102,7 @@ index 0000000000000000000000000000000000000000..77154095cfb8b259bdb318e8ff40cb6f
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 64e7aef6220097edefdff3b98a771b988365930d..abadff47166722fdc756afdbc6ac7242b6bd4fb0 100644
+index 64e7aef6220097edefdff3b98a771b988365930d..07f904a78f51b220a5891aca1afffac4f46d58b4 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -29,7 +29,13 @@ public class AnnotationTest {
@@ -103,7 +139,19 @@ index 64e7aef6220097edefdff3b98a771b988365930d..abadff47166722fdc756afdbc6ac7242
     };
 
     @Test
-@@ -67,14 +83,40 @@ public class AnnotationTest {
+@@ -61,20 +77,60 @@ public class AnnotationTest {
+                 continue;
+             }
+ 
+            // Paper start - skip class if it's @NullMarked
+            if (isClassNullMarked(clazz, foundClasses)) {
+                continue;
+            }
+            // Paper end - skip class if it's @NullMarked
+
+             for (MethodNode method : clazz.methods) {
+                 if (!isMethodIncluded(clazz, method, foundClasses)) {
+                     continue;
                 }
 
                 if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) {
@@ -140,11 +188,19 @@ index 64e7aef6220097edefdff3b98a771b988365930d..abadff47166722fdc756afdbc6ac7242
 +                                }
 +                            }
 +                        }
+                        if (method.visibleTypeAnnotations != null) {
+                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.visibleTypeAnnotations) {
+                                final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
+                                if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.asList(ACCEPTED_ANNOTATIONS).contains(invisibleTypeAnnotation.desc)) {
+                                    continue dancing;
+                                }
+                            }
+                        }
 +                        // Paper end - Allow use of TYPE_USE annotations
                         ParameterNode paramNode = parameters == null ? null : parameters.get(i);
                         String paramName = paramNode == null ? null : paramNode.name;
 
-@@ -91,13 +133,18 @@ public class AnnotationTest {
+@@ -91,17 +147,37 @@ public class AnnotationTest {
 
         Collections.sort(errors);
 
@@ -167,7 +223,50 @@ index 64e7aef6220097edefdff3b98a771b988365930d..abadff47166722fdc756afdbc6ac7242
     }
 
     private static void collectClasses(@NotNull File from, @NotNull Map<String, ClassNode> to) throws IOException {
-@@ -140,6 +187,11 @@ public class AnnotationTest {
+         if (from.isDirectory()) {
+            // Paper start - skip packages with @NullMarked
+            final File packageInfo = new File(from, "package-info.class");
+            if (packageInfo.exists()) {
+                try (final FileInputStream in = new FileInputStream(packageInfo)) {
+                    final ClassReader cr = new ClassReader(in);
+
+                    final ClassNode node = new ClassNode();
+                    cr.accept(node, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+
+                    if (isClassNullMarked0(node)) {
+                        return; // skip packages with @NullMarked
+                    }
+                }
+            }
+            // Paper end - skip packages with @NullMarked
+             final File[] files = from.listFiles();
+             assert files != null;
+ 
+@@ -125,6 +201,23 @@ public class AnnotationTest {
+         }
+     }
+ 
+    // Paper start - skip class if it's @NullMarked
+    private static boolean isClassNullMarked(@NotNull ClassNode clazz, @NotNull Map<String, ClassNode> allClasses) {
+        if (clazz.nestHostClass != null) {
+            final ClassNode nestHostNode = allClasses.get(clazz.nestHostClass);
+            if (nestHostNode != null) {
+                return isClassNullMarked0(nestHostNode);
+            }
+        }
+
+        return isClassNullMarked0(clazz);
+    }
+
+    private static boolean isClassNullMarked0(@NotNull ClassNode clazz) {
+        return clazz.visibleAnnotations != null && clazz.visibleAnnotations.stream().anyMatch(node -> "Lorg/jspecify/annotations/NullMarked;".equals(node.desc));
+    }
+    // Paper end - skip class if it's @NullMarked
+
+     private static boolean isClassIncluded(@NotNull ClassNode clazz, @NotNull Map<String, ClassNode> allClasses) {
+         // Exclude private, synthetic or deprecated classes and annotations, since their members can't be null
+         if ((clazz.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED | Opcodes.ACC_ANNOTATION)) != 0) {
+@@ -140,6 +233,11 @@ public class AnnotationTest {
             // Exceptions are excluded
             return false;
         }
@@ -179,7 +278,7 @@ index 64e7aef6220097edefdff3b98a771b988365930d..abadff47166722fdc756afdbc6ac7242
 
         for (String excludedClass : EXCLUDED_CLASSES) {
             if (excludedClass.equals(clazz.name)) {
-@@ -152,7 +204,7 @@ public class AnnotationTest {
+@@ -152,7 +250,7 @@ public class AnnotationTest {
 
     private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map<String, ClassNode> allClasses) {
         // Exclude private, synthetic and deprecated methods
@@ -188,7 +287,7 @@ index 64e7aef6220097edefdff3b98a771b988365930d..abadff47166722fdc756afdbc6ac7242
             return false;
         }
 
-@@ -170,11 +222,30 @@ public class AnnotationTest {
+@@ -170,11 +268,30 @@ public class AnnotationTest {
         if ("<init>".equals(method.name) && isAnonymous(clazz)) {
             return false;
         }
@@ -233,10 +332,10 @@ index 89ca06ebecdaadd5dfc7bc74473ca15ad36f6eff..5974ceea58940e1799f3589eac0e39b9
 
     public static Stream<Arguments> data() {
 diff --git a/src/test/java/org/bukkit/support/TestServer.java b/src/test/java/org/bukkit/support/TestServer.java
-index 79173d6ed844f1e640e3aa745a9b560ec5e6a2bc..73ec679ac0d1f398b417bd174b47f9af93351e27 100644
+index c67e0784c043ed194f6acde32411e156412a9b24..eb1fd4b911c4af76cdd3eac85d5365e7941a4a2e 100644
 --- a/src/test/java/org/bukkit/support/TestServer.java
 +++ b/src/test/java/org/bukkit/support/TestServer.java
-@@ -61,6 +61,11 @@ public final class TestServer {
+@@ -83,6 +83,11 @@ public final class TestServer {
         UnsafeValues unsafeValues = mock(withSettings().stubOnly());
         when(instance.getUnsafe()).thenReturn(unsafeValues);
 
@@ -7,7 +7,7 @@ Currently includes generated key holder classes for types
 used in the Registry Modification API

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 768024b2b4584fd7dd86f068c0e79c89ffc5faa1..f11a22ab01e97e51619c96f2d8a78a99297efc59 100644
+index 73aaa8a341565626556327cda6a73f98c318863a..a214483db535890a4b89e35a8c50cfd709df36d4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -1,6 +1,7 @@
@@ -18,8 +18,8 @@ index 768024b2b4584fd7dd86f068c0e79c89ffc5faa1..f11a22ab01e97e51619c96f2d8a78a99
 }
 
 java {
-@@ -45,6 +46,22 @@ dependencies {
-     testImplementation("org.ow2.asm:asm-tree:9.7")
+@@ -61,6 +62,22 @@ dependencies {
+     mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
 }
 
 +// Paper start
@@ -41,7 +41,7 @@ index 768024b2b4584fd7dd86f068c0e79c89ffc5faa1..f11a22ab01e97e51619c96f2d8a78a99
 configure<PublishingExtension> {
     publications.create<MavenPublication>("maven") {
         from(components["java"])
-@@ -121,3 +138,14 @@ tasks.check {
+@@ -143,3 +160,14 @@ tasks.check {
     dependsOn(scanJar)
 }
 // Paper end
@@ -85,20 +85,43 @@ index 0000000000000000000000000000000000000000..2512dba27edfdccbc4430815b6cba048
 +}
 diff --git a/src/main/java/io/papermc/paper/registry/RegistryKey.java b/src/main/java/io/papermc/paper/registry/RegistryKey.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c4b30b16ce4db754b958c493ad86d0863592c263
+index 0000000000000000000000000000000000000000..647f6a1ec1f9d3c203b41f90a99bfd415bf67366
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/RegistryKey.java
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,196 @@
 +package io.papermc.paper.registry;
 +
 +import net.kyori.adventure.key.Keyed;
+import org.bukkit.Art;
+import org.bukkit.Fluid;
 +import org.bukkit.GameEvent;
+import org.bukkit.JukeboxSong;
+import org.bukkit.MusicInstrument;
+import org.bukkit.Particle;
+import org.bukkit.Sound;
+import org.bukkit.attribute.Attribute;
 +import org.bukkit.block.Biome;
+import org.bukkit.block.BlockType;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.damage.DamageType;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Cat;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Frog;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Wolf;
+import org.bukkit.entity.memory.MemoryKey;
 +import org.bukkit.generator.structure.Structure;
 +import org.bukkit.generator.structure.StructureType;
+import org.bukkit.inventory.ItemType;
+import org.bukkit.inventory.MenuType;
 +import org.bukkit.inventory.meta.trim.TrimMaterial;
 +import org.bukkit.inventory.meta.trim.TrimPattern;
+import org.bukkit.map.MapCursor;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.potion.PotionType;
 +import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
 +
 +import static io.papermc.paper.registry.RegistryKeyImpl.create;
 +
@@ -115,7 +138,7 @@ index 0000000000000000000000000000000000000000..c4b30b16ce4db754b958c493ad86d086
 + * @param <T> the value type
 + */
 +@SuppressWarnings("unused")
-+@ApiStatus.Experimental
+@NullMarked
 +public sealed interface RegistryKey<T> extends Keyed permits RegistryKeyImpl {
 +
 +    /* ******************* *
@@ -131,6 +154,68 @@ index 0000000000000000000000000000000000000000..c4b30b16ce4db754b958c493ad86d086
 +     * @see io.papermc.paper.registry.keys.StructureTypeKeys
 +     */
 +    RegistryKey<StructureType> STRUCTURE_TYPE = create("worldgen/structure_type");
+    /**
+     * Built-in registry for potion effect types (mob effects).
+     * @see io.papermc.paper.registry.keys.MobEffectKeys
+     */
+    RegistryKey<PotionEffectType> MOB_EFFECT = create("mob_effect");
+    /**
+     * @apiNote DO NOT USE
+     */
+    @ApiStatus.Internal
+    RegistryKey<BlockType> BLOCK = create("block");
+    /**
+     * @apiNote DO NOT USE
+     */
+    @ApiStatus.Internal
+    RegistryKey<ItemType> ITEM = create("item");
+    /**
+     * Built-in registry for cat variants.
+     * @see io.papermc.paper.registry.keys.CatVariantKeys
+     */
+    RegistryKey<Cat.Type> CAT_VARIANT = create("cat_variant");
+    /**
+     * Built-in registry for frog variants.
+     * @see io.papermc.paper.registry.keys.FrogVariantKeys
+     */
+    RegistryKey<Frog.Variant> FROG_VARIANT = create("frog_variant");
+    /**
+     * Built-in registry for villager professions.
+     * @see io.papermc.paper.registry.keys.VillagerProfessionKeys
+     */
+    RegistryKey<Villager.Profession> VILLAGER_PROFESSION = create("villager_profession");
+    /**
+     * Built-in registry for villager types.
+     * @see io.papermc.paper.registry.keys.VillagerTypeKeys
+     */
+    RegistryKey<Villager.Type> VILLAGER_TYPE = create("villager_type");
+    /**
+     * Built-in registry for map decoration types.
+     * @see io.papermc.paper.registry.keys.MapDecorationTypeKeys
+     */
+    RegistryKey<MapCursor.Type> MAP_DECORATION_TYPE = create("map_decoration_type");
+    /**
+     * Built-in registry for menu types.
+     * @see io.papermc.paper.registry.keys.MenuTypeKeys
+     */
+    RegistryKey<MenuType> MENU = create("menu");
+    /**
+     * Built-in registry for attributes.
+     * @see io.papermc.paper.registry.keys.AttributeKeys
+     */
+    RegistryKey<Attribute> ATTRIBUTE = create("attribute");
+    /**
+     * Built-in registry for fluids.
+     * @see io.papermc.paper.registry.keys.FluidKeys
+     */
+    RegistryKey<Fluid> FLUID = create("fluid");
+    /**
+     * Built-in registry for sound events.
+     * @see io.papermc.paper.registry.keys.SoundEventKeys
+     */
+    RegistryKey<Sound> SOUND_EVENT = create("sound_event");
+
+
 +
 +    /* ********************** *
 +     * Data-driven Registries *
@@ -155,44 +240,95 @@ index 0000000000000000000000000000000000000000..c4b30b16ce4db754b958c493ad86d086
 +     * @see io.papermc.paper.registry.keys.TrimPatternKeys
 +     */
 +    RegistryKey<TrimPattern> TRIM_PATTERN = create("trim_pattern");
+    /**
+     * Data-driven registry for damage types.
+     * @see io.papermc.paper.registry.keys.DamageTypeKeys
+     */
+    RegistryKey<DamageType> DAMAGE_TYPE = create("damage_type");
+    /**
+     * Data-driven registry for wolf variants.
+     * @see io.papermc.paper.registry.keys.WolfVariantKeys
+     */
+    RegistryKey<Wolf.Variant> WOLF_VARIANT = create("wolf_variant");
+    /**
+     * Data-driven registry for enchantments.
+     * @see io.papermc.paper.registry.keys.EnchantmentKeys
+     */
+    RegistryKey<Enchantment> ENCHANTMENT = create("enchantment");
+    /**
+     * Data-driven registry for jukebox songs.
+     * @see io.papermc.paper.registry.keys.JukeboxSongKeys
+     */
+    RegistryKey<JukeboxSong> JUKEBOX_SONG = create("jukebox_song");
+    /**
+     * Data-driven registry for banner patterns.
+     * @see io.papermc.paper.registry.keys.BannerPatternKeys
+     */
+    RegistryKey<PatternType> BANNER_PATTERN = create("banner_pattern");
+    /**
+     * Data-driven registry for painting variants.
+     * @see io.papermc.paper.registry.keys.PaintingVariantKeys
+     */
+    RegistryKey<Art> PAINTING_VARIANT = create("painting_variant");
+    /**
+     * Data-driven registry for instruments.
+     * @see io.papermc.paper.registry.keys.InstrumentKeys
+     */
+    RegistryKey<MusicInstrument> INSTRUMENT = create("instrument");
+
+
+    /* ******************* *
+     * API-only Registries *
+     * ******************* */
+    RegistryKey<EntityType> ENTITY_TYPE = create("entity_type");
+    RegistryKey<Particle> PARTICLE_TYPE = create("particle_type");
+    RegistryKey<PotionType> POTION = create("potion");
+    RegistryKey<MemoryKey<?>> MEMORY_MODULE_TYPE = create("memory_module_type");
 +}
 diff --git a/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java b/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9ad300fa1668cb59bbd85ff8091591db69b8c9dc
+index 0000000000000000000000000000000000000000..80e3e64f47ac55a4978c9e5b430e2f2d1c871d1b
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,26 @@
 +package io.papermc.paper.registry;
 +
 +import com.google.common.collect.Sets;
 +import java.util.Set;
 +import net.kyori.adventure.key.Key;
 +import org.intellij.lang.annotations.Subst;
-+import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 +
-+record RegistryKeyImpl<T>(@NotNull Key key) implements RegistryKey<T> {
+@NullMarked
+record RegistryKeyImpl<T>(Key key) implements RegistryKey<T> {
 +
 +    static final Set<RegistryKey<?>> REGISTRY_KEYS = Sets.newIdentityHashSet();
 +
 +    static <T> RegistryKey<T> create(@Subst("some_key") final String key) {
-+        final RegistryKey<T> registryKey = new RegistryKeyImpl<>(Key.key(Key.MINECRAFT_NAMESPACE, key));
+        final RegistryKey<T> registryKey = createInternal(key);
 +        REGISTRY_KEYS.add(registryKey);
 +        return registryKey;
 +    }
 +
+    // creates the key without adding to the internal set of keys
+    static <T> RegistryKey<T> createInternal(@Subst("some_key") final String key) {
+        return new RegistryKeyImpl<>(Key.key(Key.MINECRAFT_NAMESPACE, key));
+    }
+
 +}
 diff --git a/src/main/java/io/papermc/paper/registry/TypedKey.java b/src/main/java/io/papermc/paper/registry/TypedKey.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..271454cd1b92ada4301025b57348ea77da9116a1
+index 0000000000000000000000000000000000000000..81bee5224196008662ddda528b5dcb8dd7cb9f21
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/TypedKey.java
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,45 @@
 +package io.papermc.paper.registry;
 +
 +import net.kyori.adventure.key.Key;
 +import net.kyori.adventure.key.Keyed;
 +import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 +
 +/**
 + * Represents a key for a value in a specific registry.
@@ -200,7 +336,8 @@ index 0000000000000000000000000000000000000000..271454cd1b92ada4301025b57348ea77
 + * @param <T> the value type for the registry
 + */
 +@ApiStatus.Experimental
-+public sealed interface TypedKey<T> extends Keyed permits TypedKeyImpl {
+@NullMarked
+public sealed interface TypedKey<T> extends Key permits TypedKeyImpl {
 +
 +    /**
 +     * Gets the key for the value in the registry.
@@ -208,7 +345,7 @@ index 0000000000000000000000000000000000000000..271454cd1b92ada4301025b57348ea77
 +     * @return the value's key
 +     */
 +    @Override
-+    @NotNull Key key();
+    Key key();
 +
 +    /**
 +     * Gets the registry key for the value this key
@@ -216,7 +353,7 @@ index 0000000000000000000000000000000000000000..271454cd1b92ada4301025b57348ea77
 +     *
 +     * @return the registry key
 +     */
-+    @NotNull RegistryKey<T> registryKey();
+    RegistryKey<T> registryKey();
 +
 +    /**
 +     * Create a typed key from a key and a registry key.
@@ -227,33 +364,51 @@ index 0000000000000000000000000000000000000000..271454cd1b92ada4301025b57348ea77
 +     * @return a new key for the value key and registry key
 +     */
 +    @ApiStatus.Experimental
-+    static <T extends Keyed> @NotNull TypedKey<T> create(final @NotNull RegistryKey<T> registryKey, final @NotNull Key key) {
+    static <T> TypedKey<T> create(final RegistryKey<T> registryKey, final Key key) {
 +        return new TypedKeyImpl<>(key, registryKey);
 +    }
 +}
 diff --git a/src/main/java/io/papermc/paper/registry/TypedKeyImpl.java b/src/main/java/io/papermc/paper/registry/TypedKeyImpl.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..3c3fd73f7742bb8602e2f9164dd4c1208a412255
+index 0000000000000000000000000000000000000000..3e29f7007500582cdc3f84b91f11ebeb58f68bbf
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/TypedKeyImpl.java
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,23 @@
 +package io.papermc.paper.registry;
 +
 +import net.kyori.adventure.key.Key;
-+import net.kyori.adventure.key.Keyed;
-+import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 +
-+record TypedKeyImpl<T extends Keyed>(@NotNull Key key, @NotNull RegistryKey<T> registryKey) implements TypedKey<T> {
+@NullMarked
+record TypedKeyImpl<T>(Key key, RegistryKey<T> registryKey) implements TypedKey<T> {
+    // Wrap key methods to make this easier to use
+    @Override
+    public String namespace() {
+        return this.key.namespace();
+    }
+
+    @Override
+    public String value() {
+        return this.key.value();
+    }
+
+    @Override
+    public String asString() {
+        return this.key.asString();
+    }
 +}
 diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java/org/bukkit/MinecraftExperimental.java
-index b6f4810e387c22c4a70609ea1d605130245689a5..03824ae54e1bdb8b14f79b3c5e0294ae725e43f8 100644
+index a86b87e4c3332202e40e484c3f9c6562b419c70f..e996a758fc1e4ecfec68641733d69665f30792e8 100644
 --- a/src/main/java/org/bukkit/MinecraftExperimental.java
 +++ b/src/main/java/org/bukkit/MinecraftExperimental.java
-@@ -47,6 +47,6 @@ public @interface MinecraftExperimental {
+@@ -47,5 +47,10 @@ public @interface MinecraftExperimental {
     @ApiStatus.Internal
     public enum Requires {
 
-        UPDATE_1_21
-+        UPDATE_1_21, BUNDLE, TRADE_REBALANCE // Paper
+        // Paper start
+        TRADE_REBALANCE,
+        REDSTONE_EXPERIMENTS,
+        MINECART_IMPROVEMENTS
+        // Paper end
     }
 }
@@ -6,14 +6,14 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization

 diff --git a/build.gradle.kts b/build.gradle.kts
-index f11a22ab01e97e51619c96f2d8a78a99297efc59..2f266350a787a4cfdfda1b0e760bfb7604cac43c 100644
+index a214483db535890a4b89e35a8c50cfd709df36d4..e1acfa9abed37e5332edf6b6cf66e3b9b926b366 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -23,6 +23,7 @@ dependencies {
+@@ -37,6 +37,7 @@ dependencies {
     api("com.googlecode.json-simple:json-simple:1.1.1") {
         isTransitive = false // includes junit
     }
-+    api("it.unimi.dsi:fastutil:8.5.6")
+    api("it.unimi.dsi:fastutil:8.5.15")
     // Paper end
 
     compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
@@ -6,22 +6,25 @@ Subject: [PATCH] Paper Utils

 diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9db0056ab94145819628b3ad8d8d26130d117fcf
+index 0000000000000000000000000000000000000000..fbcd82b513b4cb9839f9d2b38d9c6c73148e30a6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,19 @@
 +package com.destroystokyo.paper.util;
 +
-+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
 +
-+public class SneakyThrow {
+@ApiStatus.Internal
+@NullMarked
+public final class SneakyThrow {
 +
-+    public static void sneaky(@NotNull Throwable exception) {
-+        SneakyThrow.<RuntimeException>throwSneaky(exception);
+    public static void sneaky(final Throwable exception) {
+        SneakyThrow.throwSneaky(exception);
 +    }
 +
 +    @SuppressWarnings("unchecked")
-+    private static <T extends Throwable> void throwSneaky(@NotNull Throwable exception) throws T {
+    private static <T extends Throwable> void throwSneaky(final Throwable exception) throws T {
 +        throw (T) exception;
 +    }
 +
@@ -6,142 +6,153 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 106d4d5756dc579c446699106f52462085ea9a52..d6252c1ff21c92bf0d232d5bfdf828d1d2ce38c0 100644
+index ed5d58d7569300c917dd52b11953a63fae6878d4..43086f7d201c0988086ef06cfe5a0f866d130961 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -47,6 +47,9 @@ dependencies {
+@@ -61,6 +61,9 @@ dependencies {
     apiAndDocs("net.kyori:adventure-text-serializer-legacy")
     apiAndDocs("net.kyori:adventure-text-serializer-plain")
     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
 +
-+    implementation("org.ow2.asm:asm:9.7")
-+    implementation("org.ow2.asm:asm-commons:9.7")
+    implementation("org.ow2.asm:asm:9.7.1")
+    implementation("org.ow2.asm:asm-commons:9.7.1")
     // Paper end
 
     compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..5b28e9b1daba7834af67dbc193dd656bedd9a994
+index 0000000000000000000000000000000000000000..5a702481d28d90cb503faad0d9b9c3231bbff940
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,46 @@
 +package com.destroystokyo.paper.event.executor;
 +
+import com.destroystokyo.paper.util.SneakyThrow;
 +import java.lang.invoke.MethodHandle;
 +import java.lang.invoke.MethodHandles;
 +import java.lang.reflect.Method;
-+
-+import com.destroystokyo.paper.util.SneakyThrow;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.EventException;
 +import org.bukkit.event.Listener;
 +import org.bukkit.plugin.EventExecutor;
-+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 +
+@ApiStatus.Internal
+@NullMarked
 +public class MethodHandleEventExecutor implements EventExecutor {
+
 +    private final Class<? extends Event> eventClass;
 +    private final MethodHandle handle;
 +
-+    public MethodHandleEventExecutor(@NotNull Class<? extends Event> eventClass, @NotNull MethodHandle handle) {
+    public MethodHandleEventExecutor(final Class<? extends Event> eventClass, final MethodHandle handle) {
 +        this.eventClass = eventClass;
 +        this.handle = handle;
 +    }
 +
-+    public MethodHandleEventExecutor(@NotNull Class<? extends Event> eventClass, @NotNull Method m) {
+    public MethodHandleEventExecutor(final Class<? extends Event> eventClass, final Method m) {
 +        this.eventClass = eventClass;
 +        try {
 +            m.setAccessible(true);
 +            this.handle = MethodHandles.lookup().unreflect(m);
-+        } catch (IllegalAccessException e) {
+        } catch (final IllegalAccessException e) {
 +            throw new AssertionError("Unable to set accessible", e);
 +        }
 +    }
 +
 +    @Override
-+    public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
-+        if (!eventClass.isInstance(event)) return;
+    public void execute(final Listener listener, final Event event) throws EventException {
+        if (!this.eventClass.isInstance(event)) return;
 +        try {
-+            handle.invoke(listener, event);
-+        } catch (Throwable t) {
+            this.handle.invoke(listener, event);
+        } catch (final Throwable t) {
 +            SneakyThrow.sneaky(t);
 +        }
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..827f2b27f70a7ec0bc11d039305c3e58c02a4ef4
+index 0000000000000000000000000000000000000000..bbdb5b472df116b71c459bdc6cc4b74267ea0f5e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,44 @@
 +package com.destroystokyo.paper.event.executor;
 +
+import com.destroystokyo.paper.util.SneakyThrow;
+import com.google.common.base.Preconditions;
 +import java.lang.invoke.MethodHandle;
 +import java.lang.invoke.MethodHandles;
 +import java.lang.reflect.Method;
 +import java.lang.reflect.Modifier;
-+
-+import com.destroystokyo.paper.util.SneakyThrow;
-+import com.google.common.base.Preconditions;
-+
 +import org.bukkit.event.Event;
 +import org.bukkit.event.EventException;
 +import org.bukkit.event.Listener;
 +import org.bukkit.plugin.EventExecutor;
-+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
 +
+@ApiStatus.Internal
+@NullMarked
 +public class StaticMethodHandleEventExecutor implements EventExecutor {
+
 +    private final Class<? extends Event> eventClass;
 +    private final MethodHandle handle;
 +
-+    public StaticMethodHandleEventExecutor(@NotNull Class<? extends Event> eventClass, @NotNull Method m) {
+    public StaticMethodHandleEventExecutor(final Class<? extends Event> eventClass, final Method m) {
 +        Preconditions.checkArgument(Modifier.isStatic(m.getModifiers()), "Not a static method: %s", m);
 +        Preconditions.checkArgument(eventClass != null, "eventClass is null");
 +        this.eventClass = eventClass;
 +        try {
 +            m.setAccessible(true);
 +            this.handle = MethodHandles.lookup().unreflect(m);
-+        } catch (IllegalAccessException e) {
+        } catch (final IllegalAccessException e) {
 +            throw new AssertionError("Unable to set accessible", e);
 +        }
 +    }
 +
 +    @Override
-+    public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
-+        if (!eventClass.isInstance(event)) return;
+    public void execute(final Listener listener, final Event event) throws EventException {
+        if (!this.eventClass.isInstance(event)) return;
 +        try {
-+            handle.invoke(event);
-+        } catch (Throwable throwable) {
+            this.handle.invoke(event);
+        } catch (final Throwable throwable) {
 +            SneakyThrow.sneaky(throwable);
 +        }
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..084c31af1a7ba32bb4c3dc8f16f67fd09ce0b6a4
+index 0000000000000000000000000000000000000000..abfcb6e8383ff311940d82afe4ff990649a082dc
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,59 @@
 +package com.destroystokyo.paper.event.executor.asm;
 +
 +import java.lang.reflect.Method;
 +import java.util.concurrent.atomic.AtomicInteger;
-+
 +import org.bukkit.plugin.EventExecutor;
-+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
 +import org.objectweb.asm.ClassWriter;
 +import org.objectweb.asm.Type;
 +import org.objectweb.asm.commons.GeneratorAdapter;
 +
-+import static org.objectweb.asm.Opcodes.*;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+import static org.objectweb.asm.Opcodes.V1_8;
 +
-+public class ASMEventExecutorGenerator {
+@ApiStatus.Internal
+@NullMarked
+public final class ASMEventExecutorGenerator {
 +
 +    private static final String EXECUTE_DESCRIPTOR = "(Lorg/bukkit/event/Listener;Lorg/bukkit/event/Event;)V";
 +
-+    @NotNull
-+    public static byte[] generateEventExecutor(@NotNull Method m, @NotNull String name) {
-+        ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
-+        writer.visit(V1_8, ACC_PUBLIC, name.replace('.', '/'), null, Type.getInternalName(Object.class), new String[] {Type.getInternalName(EventExecutor.class)});
+    public static byte[] generateEventExecutor(final Method m, final String name) {
+        final ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+        writer.visit(V1_8, ACC_PUBLIC, name.replace('.', '/'), null, Type.getInternalName(Object.class), new String[]{Type.getInternalName(EventExecutor.class)});
 +        // Generate constructor
 +        GeneratorAdapter methodGenerator = new GeneratorAdapter(writer.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null), ACC_PUBLIC, "<init>", "()V");
 +        methodGenerator.loadThis();
@@ -169,22 +180,25 @@ index 0000000000000000000000000000000000000000..084c31af1a7ba32bb4c3dc8f16f67fd0
 +    }
 +
 +    public static AtomicInteger NEXT_ID = new AtomicInteger(1);
-+    @NotNull
+
 +    public static String generateName() {
-+        int id = NEXT_ID.getAndIncrement();
+        final int id = NEXT_ID.getAndIncrement();
 +        return "com.destroystokyo.paper.event.executor.asm.generated.GeneratedEventExecutor" + id;
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f79685b48bb581277a6891927988b6f7a4389dc4
+index 0000000000000000000000000000000000000000..581561fbd32c81ab1774ba8f0b7f3cec9392d99a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,35 @@
 +package com.destroystokyo.paper.event.executor.asm;
 +
-+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
 +
+@ApiStatus.Internal
+@NullMarked
 +public interface ClassDefiner {
 +
 +    /**
@@ -192,7 +206,7 @@ index 0000000000000000000000000000000000000000..f79685b48bb581277a6891927988b6f7
 +     *
 +     * @return if classes bypass access checks
 +     */
-+    public default boolean isBypassAccessChecks() {
+    default boolean isBypassAccessChecks() {
 +        return false;
 +    }
 +
@@ -206,79 +220,79 @@ index 0000000000000000000000000000000000000000..f79685b48bb581277a6891927988b6f7
 +     * @throws ClassFormatError     if the class data is invalid
 +     * @throws NullPointerException if any of the arguments are null
 +     */
-+    @NotNull
-+    public Class<?> defineClass(@NotNull ClassLoader parentLoader, @NotNull String name, @NotNull byte[] data);
+    Class<?> defineClass(ClassLoader parentLoader, String name, byte[] data);
 +
-+    @NotNull
-+    public static ClassDefiner getInstance() {
+    static ClassDefiner getInstance() {
 +        return SafeClassDefiner.INSTANCE;
 +    }
 +
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..abcc966d8ee01d73c1d1480237ab46fa0ab55fdc
+index 0000000000000000000000000000000000000000..48bcc72293c2a31b6e2dd2dcd6a79d618c72a137
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,66 @@
 +package com.destroystokyo.paper.event.executor.asm;
 +
-+import java.util.concurrent.ConcurrentMap;
-+
 +import com.google.common.base.Preconditions;
-+
 +import com.google.common.collect.MapMaker;
-+import org.jetbrains.annotations.NotNull;
+import java.util.concurrent.ConcurrentMap;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
 +
+@ApiStatus.Internal
+@NullMarked
 +public class SafeClassDefiner implements ClassDefiner {
+
 +    /* default */ static final SafeClassDefiner INSTANCE = new SafeClassDefiner();
 +
-+    private SafeClassDefiner() {}
+    private SafeClassDefiner() {
+    }
 +
 +    private final ConcurrentMap<ClassLoader, GeneratedClassLoader> loaders = new MapMaker().weakKeys().makeMap();
 +
-+    @NotNull
 +    @Override
-+    public Class<?> defineClass(@NotNull ClassLoader parentLoader, @NotNull String name, @NotNull byte[] data) {
-+        GeneratedClassLoader loader = loaders.computeIfAbsent(parentLoader, GeneratedClassLoader::new);
+    public Class<?> defineClass(final ClassLoader parentLoader, final String name, final byte[] data) {
+        final GeneratedClassLoader loader = this.loaders.computeIfAbsent(parentLoader, GeneratedClassLoader::new);
 +        synchronized (loader.getClassLoadingLock(name)) {
 +            Preconditions.checkState(!loader.hasClass(name), "%s already defined", name);
-+            Class<?> c = loader.define(name, data);
+            final Class<?> c = loader.define(name, data);
 +            assert c.getName().equals(name);
 +            return c;
 +        }
 +    }
 +
 +    private static class GeneratedClassLoader extends ClassLoader {
+
 +        static {
 +            ClassLoader.registerAsParallelCapable();
 +        }
 +
-+        protected GeneratedClassLoader(@NotNull ClassLoader parent) {
+        protected GeneratedClassLoader(final ClassLoader parent) {
 +            super(parent);
 +        }
 +
-+        private Class<?> define(@NotNull String name, byte[] data) {
-+            synchronized (getClassLoadingLock(name)) {
-+                assert !hasClass(name);
-+                Class<?> c = defineClass(name, data, 0, data.length);
-+                resolveClass(c);
+        private Class<?> define(final String name, final byte[] data) {
+            synchronized (this.getClassLoadingLock(name)) {
+                assert !this.hasClass(name);
+                final Class<?> c = this.defineClass(name, data, 0, data.length);
+                this.resolveClass(c);
 +                return c;
 +            }
 +        }
 +
 +        @Override
-+        @NotNull
-+        public Object getClassLoadingLock(@NotNull String name) {
+        public Object getClassLoadingLock(final String name) {
 +            return super.getClassLoadingLock(name);
 +        }
 +
-+        public boolean hasClass(@NotNull String name) {
-+            synchronized (getClassLoadingLock(name)) {
+        public boolean hasClass(final String name) {
+            synchronized (this.getClassLoadingLock(name)) {
 +                try {
 +                    Class.forName(name);
 +                    return true;
-+                } catch (ClassNotFoundException e) {
+                } catch (final ClassNotFoundException e) {
 +                    return false;
 +                }
 +            }
@@ -6,25 +6,27 @@ Subject: [PATCH] Add Position

 diff --git a/src/main/java/io/papermc/paper/math/BlockPosition.java b/src/main/java/io/papermc/paper/math/BlockPosition.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f0fdabce4af640da2a406412e67020761ded3ac1
+index 0000000000000000000000000000000000000000..c358bfdefc9bc7598dbd0d89a6b0b8a9408b5bb3
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/math/BlockPosition.java
-@@ -0,0 +1,98 @@
+@@ -0,0 +1,100 @@
 +package io.papermc.paper.math;
 +
 +import org.bukkit.Axis;
 +import org.bukkit.block.BlockFace;
 +import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.Contract;
-+import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 +
 +/**
 + * A position represented with integers.
 + * <p>
 + * <b>May see breaking changes until Experimental annotation is removed.</b>
+ *
 + * @see FinePosition
 + */
 +@ApiStatus.Experimental
+@NullMarked
 +public interface BlockPosition extends Position {
 +
 +    @Override
@@ -53,17 +55,17 @@ index 0000000000000000000000000000000000000000..f0fdabce4af640da2a406412e6702076
 +    }
 +
 +    @Override
-+    default @NotNull BlockPosition toBlock() {
+    default BlockPosition toBlock() {
 +        return this;
 +    }
 +
 +    @Override
-+    default @NotNull BlockPosition offset(int x, int y, int z) {
+    default BlockPosition offset(final int x, final int y, final int z) {
 +        return x == 0 && y == 0 && z == 0 ? this : new BlockPositionImpl(this.blockX() + x, this.blockY() + y, this.blockZ() + z);
 +    }
 +
 +    @Override
-+    default @NotNull FinePosition offset(double x, double y, double z) {
+    default FinePosition offset(final double x, final double y, final double z) {
 +        return new FinePositionImpl(this.blockX() + x, this.blockY() + y, this.blockZ() + z);
 +    }
 +
@@ -74,7 +76,7 @@ index 0000000000000000000000000000000000000000..f0fdabce4af640da2a406412e6702076
 +     * @return the offset block position
 +     */
 +    @Contract(value = "_ -> new", pure = true)
-+    default @NotNull BlockPosition offset(@NotNull BlockFace blockFace) {
+    default BlockPosition offset(final BlockFace blockFace) {
 +        return this.offset(blockFace, 1);
 +    }
 +
@@ -87,7 +89,7 @@ index 0000000000000000000000000000000000000000..f0fdabce4af640da2a406412e6702076
 +     * @return the offset block position
 +     */
 +    @Contract(pure = true)
-+    default @NotNull BlockPosition offset(@NotNull BlockFace blockFace, int amount) {
+    default BlockPosition offset(final BlockFace blockFace, final int amount) {
 +        return amount == 0 ? this : new BlockPositionImpl(this.blockX() + (blockFace.getModX() * amount), this.blockY() + (blockFace.getModY() * amount), this.blockZ() + (blockFace.getModZ() * amount));
 +    }
 +
@@ -100,7 +102,7 @@ index 0000000000000000000000000000000000000000..f0fdabce4af640da2a406412e6702076
 +     * @return the offset block position
 +     */
 +    @Contract(pure = true)
-+    default @NotNull BlockPosition offset(@NotNull Axis axis, int amount) {
+    default BlockPosition offset(final Axis axis, final int amount) {
 +        return amount == 0 ? this : switch (axis) {
 +            case X -> new BlockPositionImpl(this.blockX() + amount, this.blockY(), this.blockZ());
 +            case Y -> new BlockPositionImpl(this.blockX(), this.blockY() + amount, this.blockZ());
@@ -120,24 +122,25 @@ index 0000000000000000000000000000000000000000..eb5a3f26c7ba56c6715827f52c0013a8
 +}
 diff --git a/src/main/java/io/papermc/paper/math/FinePosition.java b/src/main/java/io/papermc/paper/math/FinePosition.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d8df70d731573cf2446044925f218876d62fd7cf
+index 0000000000000000000000000000000000000000..b9c0065d8a9dedc3bd1a2d8bfbedfbc7f952ff93
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/math/FinePosition.java
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,57 @@
 +package io.papermc.paper.math;
 +
 +import org.bukkit.util.NumberConversions;
-+import org.bukkit.util.Vector;
 +import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 +
 +/**
 + * A position represented with doubles.
 + * <p>
 + * <b>May see breaking changes until Experimental annotation is removed.</b>
+ *
 + * @see BlockPosition
 + */
 +@ApiStatus.Experimental
+@NullMarked
 +public interface FinePosition extends Position {
 +
 +    @Override
@@ -166,17 +169,17 @@ index 0000000000000000000000000000000000000000..d8df70d731573cf2446044925f218876
 +    }
 +
 +    @Override
-+    default @NotNull BlockPosition toBlock() {
+    default BlockPosition toBlock() {
 +        return new BlockPositionImpl(this.blockX(), this.blockY(), this.blockZ());
 +    }
 +
 +    @Override
-+    default @NotNull FinePosition offset(int x, int y, int z) {
+    default FinePosition offset(final int x, final int y, final int z) {
 +        return this.offset((double) x, y, z);
 +    }
 +
 +    @Override
-+    default @NotNull FinePosition offset(double x, double y, double z) {
+    default FinePosition offset(final double x, final double y, final double z) {
 +        return x == 0.0 && y == 0.0 && z == 0.0 ? this : new FinePositionImpl(this.x() + x, this.y() + y, this.z() + z);
 +    }
 +}
@@ -192,10 +195,10 @@ index 0000000000000000000000000000000000000000..93476aaf8d21efb5a30b6d2cc2eeda81
 +}
 diff --git a/src/main/java/io/papermc/paper/math/Position.java b/src/main/java/io/papermc/paper/math/Position.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d9f242740
+index 0000000000000000000000000000000000000000..0e6a6a6738353b118e0ed093994dda06750700c4
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/math/Position.java
-@@ -0,0 +1,191 @@
+@@ -0,0 +1,192 @@
 +package io.papermc.paper.math;
 +
 +import org.bukkit.Location;
@@ -203,7 +206,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +import org.bukkit.util.Vector;
 +import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.Contract;
-+import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 +
 +/**
 + * Common interface for {@link FinePosition} and {@link BlockPosition}.
@@ -211,6 +214,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 + * <b>May see breaking changes until Experimental annotation is removed.</b>
 + */
 +@ApiStatus.Experimental
+@NullMarked
 +public interface Position {
 +
 +    FinePosition FINE_ZERO = new FinePositionImpl(0, 0, 0);
@@ -287,7 +291,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @param z z value to offset
 +     * @return the offset position
 +     */
-+    @NotNull Position offset(int x, int y, int z);
+    Position offset(int x, int y, int z);
 +
 +    /**
 +     * Returns a position offset by the specified amounts.
@@ -297,7 +301,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @param z z value to offset
 +     * @return the offset position
 +     */
-+    @NotNull FinePosition offset(double x, double y, double z);
+    FinePosition offset(double x, double y, double z);
 +
 +    /**
 +     * Returns a new position at the center of the block position this represents
@@ -305,7 +309,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @return a new center position
 +     */
 +    @Contract(value = "-> new", pure = true)
-+    default @NotNull FinePosition toCenter() {
+    default FinePosition toCenter() {
 +        return new FinePositionImpl(this.blockX() + 0.5, this.blockY() + 0.5, this.blockZ() + 0.5);
 +    }
 +
@@ -316,7 +320,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @return the block position
 +     */
 +    @Contract(pure = true)
-+    @NotNull BlockPosition toBlock();
+    BlockPosition toBlock();
 +
 +    /**
 +     * Converts this position to a vector
@@ -324,7 +328,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @return a new vector
 +     */
 +    @Contract(value = "-> new", pure = true)
-+    default @NotNull Vector toVector() {
+    default Vector toVector() {
 +        return new Vector(this.x(), this.y(), this.z());
 +    }
 +
@@ -335,7 +339,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @return a new location
 +     */
 +    @Contract(value = "_ -> new", pure = true)
-+    default @NotNull Location toLocation(@NotNull World world) {
+    default Location toLocation(final World world) {
 +        return new Location(world, this.x(), this.y(), this.z());
 +    }
 +
@@ -348,7 +352,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @return a position with those coords
 +     */
 +    @Contract(value = "_, _, _ -> new", pure = true)
-+    static @NotNull BlockPosition block(int x, int y, int z) {
+    static BlockPosition block(final int x, final int y, final int z) {
 +        return new BlockPositionImpl(x, y, z);
 +    }
 +
@@ -359,7 +363,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @return a new position at that location
 +     */
 +    @Contract(value = "_ -> new", pure = true)
-+    static @NotNull BlockPosition block(@NotNull Location location) {
+    static BlockPosition block(final Location location) {
 +        return new BlockPositionImpl(location.getBlockX(), location.getBlockY(), location.getBlockZ());
 +    }
 +
@@ -372,7 +376,7 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @return a position with those coords
 +     */
 +    @Contract(value = "_, _, _ -> new", pure = true)
-+    static @NotNull FinePosition fine(double x, double y, double z) {
+    static FinePosition fine(final double x, final double y, final double z) {
 +        return new FinePositionImpl(x, y, z);
 +    }
 +
@@ -383,12 +387,12 @@ index 0000000000000000000000000000000000000000..26bc5a0fa67855af87c8fd4cd8229b4d
 +     * @return a new position at that location
 +     */
 +    @Contract(value = "_ -> new", pure = true)
-+    static @NotNull FinePosition fine(@NotNull Location location) {
+    static FinePosition fine(final Location location) {
 +        return new FinePositionImpl(location.getX(), location.getY(), location.getZ());
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 7c4db051472fb6a6c6d24092dc6f75487356690a..85c342fc50f2fe0ce9a1b3980df9e088c3dea92d 100644
+index 734054f1e8dad74c13d7ae0b1c1af2d9f45b2636..bc8a64d54e001eae6ef4520a49e261b96c5ae9f3 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable;
@@ -8,10 +8,10 @@ expose isRunning

 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..36b8fe86335df851f9c85d6bb2a91368b4d945d1
+index 0000000000000000000000000000000000000000..73b125979e2f2dfd13cbf689a90b29cc68a36e09
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,89 @@
 +package co.aikar.timings;
 +
 +import static co.aikar.timings.TimingsManager.*;
@@ -19,6 +19,9 @@ index 0000000000000000000000000000000000000000..36b8fe86335df851f9c85d6bb2a91368
 +import org.bukkit.Bukkit;
 +import org.jetbrains.annotations.NotNull;
 +
+/**
+ * @deprecated Timings will be removed in the future
+ */
 +@Deprecated(forRemoval = true)
 +public class FullServerTickHandler extends TimingHandler {
 +    private static final TimingIdentifier IDENTITY = new TimingIdentifier("Minecraft", "Full Server Tick", null);
@@ -91,7 +94,7 @@ index 0000000000000000000000000000000000000000..36b8fe86335df851f9c85d6bb2a91368
 +            TimingsManager.HISTORY.add(new TimingHistory());
 +            TimingsManager.resetTimings();
 +        }
-+        Bukkit.getUnsafe().reportTimings();
+        //Bukkit.getUnsafe().reportTimings();
 +    }
 +
 +    boolean isViolated() {
@@ -100,10 +103,10 @@ index 0000000000000000000000000000000000000000..36b8fe86335df851f9c85d6bb2a91368
 +}
 diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..81671cf40feeed2844ee8d92348d48062aaf2c46
+index 0000000000000000000000000000000000000000..42e7e712403676171d34d5f2be27e48e7a071ebd
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,72 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -132,6 +135,9 @@ index 0000000000000000000000000000000000000000..81671cf40feeed2844ee8d92348d4806
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
+/**
+ * @deprecated Timings will be removed in the future
+ */
 +@Deprecated(forRemoval = true)
 +public final class NullTimingHandler implements Timing {
 +    public static final Timing NULL = new NullTimingHandler();
@@ -175,10 +181,10 @@ index 0000000000000000000000000000000000000000..81671cf40feeed2844ee8d92348d4806
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..be275c25664e0c76123371c6c8fac601f87fa492
+index 0000000000000000000000000000000000000000..a3ad690691eb5537a565d7ba684354acfec5ee2d
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
-@@ -0,0 +1,84 @@
+@@ -0,0 +1,87 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -215,6 +221,9 @@ index 0000000000000000000000000000000000000000..be275c25664e0c76123371c6c8fac601
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
+/**
+ * @deprecated Timings will be removed in the future
+ */
 +@Deprecated(forRemoval = true)
 +public class TimedEventExecutor implements EventExecutor {
 +
@@ -265,7 +274,7 @@ index 0000000000000000000000000000000000000000..be275c25664e0c76123371c6c8fac601
 +}
 diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7514fad26f955329f8bf17ff17db75f0c8301ee5
+index 0000000000000000000000000000000000000000..4195efcfe044618052bb03dea34a4fb2ca7c44f0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timing.java
@@ -0,0 +1,86 @@
@@ -300,7 +309,7 @@ index 0000000000000000000000000000000000000000..7514fad26f955329f8bf17ff17db75f0
 +/**
 + * Provides an ability to time sections of code within the Minecraft Server
 + *
-+ * @deprecated Timings will likely be replaced with Spark in the future
+ * @deprecated Timings will be removed in the future
 + */
 +@Deprecated(forRemoval = true)
 +public interface Timing extends AutoCloseable {
@@ -717,10 +726,10 @@ index 0000000000000000000000000000000000000000..199789d56d22fcb1b77ebd56805cc28a
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..eb9d58f8852e732a1284beeaf542989301d21b1c
+index 0000000000000000000000000000000000000000..3d4390f263e52aafa24b306b1fd20d088a4ffcd7
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
-@@ -0,0 +1,355 @@
+@@ -0,0 +1,357 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -773,6 +782,11 @@ index 0000000000000000000000000000000000000000..eb9d58f8852e732a1284beeaf5429893
 +import static co.aikar.timings.TimingsManager.MINUTE_REPORTS;
 +import static co.aikar.util.JSONUtil.*;
 +
+/**
+ * Internal.
+ *
+ * @deprecated Timings will be removed in the future
+ */
 +@Deprecated(forRemoval = true)
 +@SuppressWarnings({"deprecation", "SuppressionAnnotation", "Convert2Lambda", "Anonymous2MethodRef"})
 +public class TimingHistory {
@@ -874,17 +888,14 @@ index 0000000000000000000000000000000000000000..eb9d58f8852e732a1284beeaf5429893
 +                                        }
 +                                    }
 +                                ),
-+                                toObjectMapper(input.tileEntityCounts.entrySet(),
-+                                    new Function<Map.Entry<Material, Counter>, JSONPair>() {
-+                                        @NotNull
-+                                        @Override
-+                                        public JSONPair apply(Map.Entry<Material, Counter> entry) {
-+                                            tileEntityTypeSet.add(entry.getKey());
-+                                            return pair(
-+                                                    String.valueOf(entry.getKey().ordinal()),
-+                                                    entry.getValue().count()
-+                                            );
-+                                        }
+                                toObjectMapper(
+                                    input.tileEntityCounts.entrySet(),
+                                    entry -> {
+                                        tileEntityTypeSet.add(entry.getKey());
+                                        return pair(
+                                            String.valueOf(entry.getKey().ordinal()),
+                                            entry.getValue().count()
+                                        );
 +                                    }
 +                                )
 +                            );
@@ -1264,10 +1275,10 @@ index 0000000000000000000000000000000000000000..df142a89b8c43acb81eb383eac0ef048
 +}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9812d668ad945aba486fbf6d5bf83c4292cb5d03
+index 0000000000000000000000000000000000000000..95b7cdf0677ef71e6885fa78aa5c75bb500f5f53
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
-@@ -0,0 +1,337 @@
+@@ -0,0 +1,325 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -1311,7 +1322,7 @@ index 0000000000000000000000000000000000000000..9812d668ad945aba486fbf6d5bf83c42
 +import org.jetbrains.annotations.Nullable;
 +
 +/**
-+ * @deprecated Timings will likely be replaced with Spark in the future
+ * @deprecated Timings will be removed in the future
 + */
 +@Deprecated(forRemoval = true)
 +@SuppressWarnings({"UnusedDeclaration", "WeakerAccess", "SameParameterValue"})
@@ -1415,37 +1426,25 @@ index 0000000000000000000000000000000000000000..9812d668ad945aba486fbf6d5bf83c42
 +     * @param enabled Should timings be reported
 +     */
 +    public static void setTimingsEnabled(boolean enabled) {
-+        timingsEnabled = enabled;
-+        warnAboutDeprecationOnEnable();
-+        reset();
-+    }
-+
-+    private static void warnAboutDeprecationOnEnable() {
-+        if (timingsEnabled && !warnedAboutDeprecationOnEnable) {
-+            Bukkit.getLogger().warning(PlainTextComponentSerializer.plainText().serialize(deprecationMessage()));
+        if (enabled && !warnedAboutDeprecationOnEnable) {
+            Bukkit.getLogger().severe(PlainTextComponentSerializer.plainText().serialize(deprecationMessage()));
 +            warnedAboutDeprecationOnEnable = true;
 +        }
 +    }
 +
 +    public static Component deprecationMessage() {
 +        return Component.text()
-+            .color(TextColor.color(0xf3ef91))
-+            .append(Component.text("[!] The timings profiler has been enabled but has been scheduled for removal from Paper in the future."))
+            .color(TextColor.color(0xffc93a))
+            .append(Component.text("[!] The timings profiler is in no-op mode and will be fully removed in a later update."))
 +            .append(Component.newline())
-+            .append(
-+                Component.text("    We recommend installing the spark profiler as a replacement: ")
-+                    .append(
-+                        Component.text()
-+                            .content("https://spark.lucko.me/")
-+                            .clickEvent(ClickEvent.openUrl("https://spark.lucko.me/")))
-+            )
+            .append(Component.text("    We recommend migrating to the spark profiler."))
 +            .append(Component.newline())
 +            .append(
 +                Component.text("    For more information please visit: ")
 +                    .append(
 +                        Component.text()
-+                            .content("https://github.com/PaperMC/Paper/issues/8948")
-+                            .clickEvent(ClickEvent.openUrl("https://github.com/PaperMC/Paper/issues/8948")))
+                            .content("https://github.com/PaperMC/Paper/discussions/10565")
+                            .clickEvent(ClickEvent.openUrl("https://github.com/PaperMC/Paper/discussions/10565")))
 +            )
 +            .build();
 +    }
@@ -1607,10 +1606,10 @@ index 0000000000000000000000000000000000000000..9812d668ad945aba486fbf6d5bf83c42
 +
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e801e79fa57c44b2e5d359647c920f88064826f1
+index 0000000000000000000000000000000000000000..b83e5ff7ada8771fdf27ba9807c77ba6a4ce12da
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,127 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -1649,7 +1648,9 @@ index 0000000000000000000000000000000000000000..e801e79fa57c44b2e5d359647c920f88
 +
 +import static net.kyori.adventure.text.Component.text;
 +
-+
+/**
+ * @deprecated Timings will be removed in the future
+ */
 +@Deprecated(forRemoval = true)
 +public class TimingsCommand extends BukkitCommand {
 +    private static final List<String> TIMINGS_SUBCOMMANDS = ImmutableList.of("report", "reset", "on", "off", "paste", "verbon", "verboff");
@@ -1667,8 +1668,9 @@ index 0000000000000000000000000000000000000000..e801e79fa57c44b2e5d359647c920f88
 +        if (!testPermission(sender)) {
 +            return true;
 +        }
-+        if (false) {
+        if (true) {
 +            sender.sendMessage(Timings.deprecationMessage());
+            return true;
 +        }
 +        if (args.length < 1) {
 +            sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
@@ -1737,7 +1739,7 @@ index 0000000000000000000000000000000000000000..e801e79fa57c44b2e5d359647c920f88
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..5e1558ca3ffeeaf2645fa003965474a442d650bf
+index 0000000000000000000000000000000000000000..e72ad05abada04426e32a73d02b21cb69079d268
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsManager.java
@@ -0,0 +1,192 @@
@@ -1783,7 +1785,7 @@ index 0000000000000000000000000000000000000000..5e1558ca3ffeeaf2645fa003965474a4
 +import org.jetbrains.annotations.Nullable;
 +
 +/**
-+ * @deprecated Timings will likely be replaced with Spark in the future
+ * @deprecated Timings will be removed in the future
 + */
 +@Deprecated(forRemoval = true)
 +public final class TimingsManager {
@@ -1935,10 +1937,10 @@ index 0000000000000000000000000000000000000000..5e1558ca3ffeeaf2645fa003965474a4
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..3af5b8ea795311582044c712de50d29412024b77
+index 0000000000000000000000000000000000000000..df066d6f8d55afbc0c1897c486d638657a5f8df9
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,90 @@
 +package co.aikar.timings;
 +
 +import com.google.common.base.Preconditions;
@@ -1953,6 +1955,9 @@ index 0000000000000000000000000000000000000000..3af5b8ea795311582044c712de50d294
 +
 +import java.util.List;
 +
+/**
+ * @deprecated Timings will be removed in the future
+ */
 +@Deprecated(forRemoval = true)
 +@SuppressWarnings("WeakerAccess")
 +public class TimingsReportListener implements net.kyori.adventure.audience.ForwardingAudience, MessageCommandSender {
@@ -2854,10 +2859,10 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6425151b7003a1376977717dca6172efa1864648..e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b 100644
+index 6391011464ac0c95d4da7fb9c698f35c58b40922..a327c71f110fc0330a3a43ab118565d35801eb32 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -866,7 +866,6 @@ public final class Bukkit {
+@@ -870,7 +870,6 @@ public final class Bukkit {
      */
     public static void reload() {
         server.reload();
@@ -2866,10 +2871,10 @@ index 6425151b7003a1376977717dca6172efa1864648..e23be80c0ee7d7979b7c62ebce97ed0b
 
     /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b..77f8b0889cd7039bf041fc052fba33b60aa77e17 100644
+index 01f8e0811f8b337acac31819a85bb44b189b3c21..a1bffe44764fc3e1bb96bf014c56025b0bde7507 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1947,6 +1947,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1978,6 +1978,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
             throw new UnsupportedOperationException("Not supported yet.");
         }
 
@@ -2896,41 +2901,20 @@ index 3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b..77f8b0889cd7039bf041fc052fba33b6
         /**
          * Sends the component to the player
          *
-diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 6e46302c272b468375f2de3f7f992f55f13805b8..01e796e487cc16710f51b457466a37ba70e1e665 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -40,6 +40,7 @@ public interface UnsafeValues {
-     net.kyori.adventure.text.Component resolveWithContext(net.kyori.adventure.text.Component component, org.bukkit.command.CommandSender context, org.bukkit.entity.Entity scoreboardSubject, boolean bypassPermissions) throws java.io.IOException;
-     // Paper end
- 
-+    void reportTimings(); // Paper
-     Material toLegacy(Material material);
- 
-     Material fromLegacy(Material material);
-@@ -138,4 +139,12 @@ public interface UnsafeValues {
-         return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
-     }
-     // Paper end
-+
-+    // Paper start
-+    /**
-+     * Server name to report to timings v2
-+     * @return name
-+     */
-+    String getTimingsServerName();
-+    // Paper end
- }
 diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f9a00aecca5ec41b460bf41dfe1c69694768cf98
+index 0000000000000000000000000000000000000000..45ed63797b13e114bf3795c80a6c3967d8eb2351
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,25 @@
 +package org.bukkit.command;
 +
 +import org.jetbrains.annotations.NotNull;
 +
+/**
+ * @deprecated Timings will be removed in the future
+ */
+@Deprecated(forRemoval = true)
 +public class BufferedCommandSender implements MessageCommandSender {
 +    private final StringBuffer buffer = new StringBuffer();
 +    @Override
@@ -2949,20 +2933,28 @@ index 0000000000000000000000000000000000000000..f9a00aecca5ec41b460bf41dfe1c6969
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index f3cdf13f22aa789ee8cc235b61fda4035b254219..33c0a60e71f4bd29966c10ea60b22f14e56c1de4 100644
+index 6686d025222dc50156347a1757c88da02f882eec..cee16db367907cfa4b432dc6969f403321a855ea 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
-@@ -33,7 +33,8 @@ public abstract class Command {
+@@ -33,7 +33,16 @@ public abstract class Command {
     protected String usageMessage;
     private String permission;
     private net.kyori.adventure.text.Component permissionMessage; // Paper
 -    public org.spigotmc.CustomTimingsHandler timings; // Spigot
+    /**
+     * @deprecated Timings will be removed in the future
+     */
+    @Deprecated(forRemoval = true)
 +    public co.aikar.timings.Timing timings; // Paper
+    /**
+     * @deprecated Timings will be removed in the future
+     */
+    @Deprecated(forRemoval = true)
 +    @NotNull public String getTimingName() {return getName();} // Paper
 
     protected Command(@NotNull String name) {
         this(name, "", "/" + name, new ArrayList<String>());
-@@ -47,7 +48,6 @@ public abstract class Command {
+@@ -47,7 +56,6 @@ public abstract class Command {
         this.usageMessage = (usageMessage == null) ? "/" + name : usageMessage;
         this.aliases = aliases;
         this.activeAliases = new ArrayList<String>(aliases);
@@ -2970,7 +2962,7 @@ index f3cdf13f22aa789ee8cc235b61fda4035b254219..33c0a60e71f4bd29966c10ea60b22f14
     }
 
     /**
-@@ -245,7 +245,6 @@ public abstract class Command {
+@@ -245,7 +253,6 @@ public abstract class Command {
         }
         this.nextLabel = name;
         if (!isRegistered()) {
@@ -3003,10 +2995,10 @@ index d6c8938b1e13b63116b7b0e074ea8ef5997f8dc3..a6ad94ef98a1df1d2842635d850bc990
     }
 diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9d263ab3afb938c215c0b64d9171345fca6ceb2c
+index 0000000000000000000000000000000000000000..946d2f0ef37c6cf895caf8d3c6963c7889e0567b
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,138 @@
 +package org.bukkit.command;
 +
 +import org.bukkit.Bukkit;
@@ -3024,7 +3016,10 @@ index 0000000000000000000000000000000000000000..9d263ab3afb938c215c0b64d9171345f
 +
 +/**
 + * For when all you care about is just messaging
+ *
+ * @deprecated Timings will be removed in the future
 + */
+@Deprecated(forRemoval = true)
 +public interface MessageCommandSender extends CommandSender {
 +
 +    @Override
@@ -3143,10 +3138,10 @@ index 0000000000000000000000000000000000000000..9d263ab3afb938c215c0b64d9171345f
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 53f28c9e6843991486a576d41b6641c170589807..4205649948a9e2a72f64c3f007112245abac6d50 100644
+index 9207ae900cb4cc8ce41dd4e63d7ad8b35b0ac048..36fc2c35395c72f8b81a2a2f3265fd205384ce26 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand;
+@@ -16,7 +16,6 @@ import org.bukkit.command.defaults.BukkitCommand;
 import org.bukkit.command.defaults.HelpCommand;
 import org.bukkit.command.defaults.PluginsCommand;
 import org.bukkit.command.defaults.ReloadCommand;
@@ -3154,7 +3149,7 @@ index 53f28c9e6843991486a576d41b6641c170589807..4205649948a9e2a72f64c3f007112245
 import org.bukkit.command.defaults.VersionCommand;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
-@@ -35,7 +34,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -36,7 +35,7 @@ public class SimpleCommandMap implements CommandMap {
         register("bukkit", new VersionCommand("version"));
         register("bukkit", new ReloadCommand("reload"));
         //register("bukkit", new PluginsCommand("plugins")); // Paper
@@ -3163,15 +3158,15 @@ index 53f28c9e6843991486a576d41b6641c170589807..4205649948a9e2a72f64c3f007112245
     }
 
     public void setFallbackCommands() {
-@@ -67,6 +66,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -68,6 +67,7 @@ public class SimpleCommandMap implements CommandMap {
      */
     @Override
     public boolean register(@NotNull String label, @NotNull String fallbackPrefix, @NotNull Command command) {
 +        command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Paper
-         label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
-         fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
+         label = label.toLowerCase(Locale.ROOT).trim();
+         fallbackPrefix = fallbackPrefix.toLowerCase(Locale.ROOT).trim();
         boolean registered = register(label, command, false, fallbackPrefix);
-@@ -143,16 +143,22 @@ public class SimpleCommandMap implements CommandMap {
+@@ -144,16 +144,22 @@ public class SimpleCommandMap implements CommandMap {
             return false;
         }
 
@@ -3455,10 +3450,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4e9ba039669c7059180f5776ee2f7188f2dd01b5..5b526d602057ab70b4a058142e01a0195694c28f 100644
+index 64d32c377d0303ed28011a5f002274de3c16b383..a06daeeee71a5ca58fbc1e13453d9116eadbcac2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2678,7 +2678,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2771,7 +2771,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
         @Deprecated // Paper
         public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -3479,10 +3474,10 @@ index 4e9ba039669c7059180f5776ee2f7188f2dd01b5..5b526d602057ab70b4a058142e01a019
 
     @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index fb4cb36391e69fd997300b952b64fbd73ae9d675..3465bd660999caa53582e9d56a4e93ec7701a1de 100644
+index d6f3c8da8bae1f70e0f9bee3e688a04801a3b546..b03f3e0ce9fdb0bb587cf1a1c10b8cfaa2eab09e 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -380,7 +380,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -381,7 +381,6 @@ public final class SimplePluginManager implements PluginManager {
             }
         }
 
@@ -3490,7 +3485,7 @@ index fb4cb36391e69fd997300b952b64fbd73ae9d675..3465bd660999caa53582e9d56a4e93ec
         return result.toArray(new Plugin[result.size()]);
     }
 
-@@ -428,9 +427,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -429,9 +428,9 @@ public final class SimplePluginManager implements PluginManager {
 
         if (result != null) {
             plugins.add(result);
@@ -3502,7 +3497,7 @@ index fb4cb36391e69fd997300b952b64fbd73ae9d675..3465bd660999caa53582e9d56a4e93ec
             }
         }
 
-@@ -460,7 +459,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -461,7 +460,7 @@ public final class SimplePluginManager implements PluginManager {
     @Nullable
     public synchronized Plugin getPlugin(@NotNull String name) {
         if (true) {return this.paperPluginManager.getPlugin(name);} // Paper
@@ -3511,7 +3506,7 @@ index fb4cb36391e69fd997300b952b64fbd73ae9d675..3465bd660999caa53582e9d56a4e93ec
     }
 
     @Override
-@@ -688,7 +687,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -689,7 +688,8 @@ public final class SimplePluginManager implements PluginManager {
             throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
         }
 
@@ -3521,7 +3516,7 @@ index fb4cb36391e69fd997300b952b64fbd73ae9d675..3465bd660999caa53582e9d56a4e93ec
             getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
         } else {
             getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-@@ -923,7 +923,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -924,7 +924,7 @@ public final class SimplePluginManager implements PluginManager {
     @Override
     public boolean useTimings() {
         if (true) {return this.paperPluginManager.useTimings();} // Paper
@@ -3530,9 +3525,11 @@ index fb4cb36391e69fd997300b952b64fbd73ae9d675..3465bd660999caa53582e9d56a4e93ec
     }
 
     /**
-@@ -932,7 +932,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -932,8 +932,9 @@ public final class SimplePluginManager implements PluginManager {
+      *
      * @param use True if per event timing code should be used
      */
+    @Deprecated(forRemoval = true)
     public void useTimings(boolean use) {
 -        useTimings = use;
 +        co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
@@ -3540,7 +3537,7 @@ index fb4cb36391e69fd997300b952b64fbd73ae9d675..3465bd660999caa53582e9d56a4e93ec
 
     // Paper start
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index ab04ffe4cd05315a2ee0f64c553b4c674740eb7f..de6b6188587fd254ab96cbc1f95fda2056d9cbe2 100644
+index 70ac93d420d0a8528428a3d038a2ef6a86d2fddd..2e4a0a66151b358cc89d8eea26002f9fda16ee48 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -55,7 +55,6 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -7,10 +7,10 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b..336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744 100644
+index a327c71f110fc0330a3a43ab118565d35801eb32..60ad479817c95aef809f73c6688cd6b2a0bb91df 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -82,6 +82,20 @@ public final class Bukkit {
+@@ -83,6 +83,20 @@ public final class Bukkit {
         return server;
     }
 
@@ -32,10 +32,10 @@ index e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b..336c0fb1fcde9efb7cb8d15a9fad8c4c
      * Attempts to set the {@link Server} singleton.
      * <p>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 77f8b0889cd7039bf041fc052fba33b60aa77e17..09012ce27344c60730b9c5fcde85712a8e7a69fb 100644
+index a1bffe44764fc3e1bb96bf014c56025b0bde7507..f5005063c33d5e7ac030c4d43cb042c18c799284 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -67,6 +67,18 @@ import org.jetbrains.annotations.Nullable;
+@@ -68,6 +68,18 @@ import org.jetbrains.annotations.Nullable;
  */
 public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
 
@@ -55,10 +55,10 @@ index 77f8b0889cd7039bf041fc052fba33b60aa77e17..09012ce27344c60730b9c5fcde85712a
      * Used for all administrative messages, such as an operator using a
      * command.
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 3465bd660999caa53582e9d56a4e93ec7701a1de..ca539930905531a4ce079529c4d456bcb6fc9e8c 100644
+index b03f3e0ce9fdb0bb587cf1a1c10b8cfaa2eab09e..48b66054913c8b53e6e7fd34615c2ab54727693f 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -116,9 +116,22 @@ public final class SimplePluginManager implements PluginManager {
+@@ -117,9 +117,22 @@ public final class SimplePluginManager implements PluginManager {
     @Override
     @NotNull
     public Plugin[] loadPlugins(@NotNull File directory) {
@@ -82,7 +82,7 @@ index 3465bd660999caa53582e9d56a4e93ec7701a1de..ca539930905531a4ce079529c4d456bc
         }
         Preconditions.checkArgument(directory != null, "Directory cannot be null");
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index de6b6188587fd254ab96cbc1f95fda2056d9cbe2..eaefbb00e9993d54906cc8cf35cf753c0d6c7707 100644
+index 2e4a0a66151b358cc89d8eea26002f9fda16ee48..b412aaf08901d169ac9fc89b36f9d6ccb95c53d3 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -93,7 +93,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5b526d602057ab70b4a058142e01a0195694c28f..f868eb1609f7c905fe6ebcf088a0a3030af55e92 100644
+index a06daeeee71a5ca58fbc1e13453d9116eadbcac2..bc64083c02bce93a22521173c9430eb5469ba8a6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2530,6 +2530,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2623,6 +2623,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     @Deprecated // Paper
     public String getLocale();
 
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744..ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7 100644
+index 60ad479817c95aef809f73c6688cd6b2a0bb91df..e4f7ff41d7205994fef87989a7955d7b8fe4d7f4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2093,6 +2093,17 @@ public final class Bukkit {
+@@ -2132,6 +2132,17 @@ public final class Bukkit {
         return server.getEntity(uuid);
     }
 
@@ -27,10 +27,10 @@ index 336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744..ea5f1b4085fd2ec355c4c8036f3bc729
      * Get the advancement specified by this key.
      *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 09012ce27344c60730b9c5fcde85712a8e7a69fb..e37649ce4b3981f2cff96b64ed3bd4093c015346 100644
+index f5005063c33d5e7ac030c4d43cb042c18c799284..4f15cc4bcc07d3061dd94b20fc77f549ddfcbb6b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1784,6 +1784,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1815,6 +1815,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
     @Nullable
     Entity getEntity(@NotNull UUID uuid);
 
@@ -0,0 +1,533 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach@zachbr.io>
+Date: Mon, 27 May 2019 01:10:06 -0500
+Subject: [PATCH] Expose server build information
+
+Co-authored-by: Professor Bloodstone <git@bloodstone.dev>
+Co-authored-by: Mark Vainomaa <mikroskeem@mikroskeem.eu>
+Co-authored-by: masmc05 <masmc05@gmail.com>
+Co-authored-by: Riley Park <rileysebastianpark@gmail.com>
+
+diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..023cc52a9e28e1238c7452c0f3f577f2850fd861
+--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
+@@ -0,0 +1,47 @@
+package com.destroystokyo.paper.util;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public interface VersionFetcher {
+
+    /**
+     * Amount of time to cache results for in milliseconds
+     * <p>
+     * Negative values will never cache.
+     *
+     * @return cache time
+     */
+    long getCacheTime();
+
+    /**
+     * Gets the version message to cache and show to command senders.
+     *
+     * <p>NOTE: This is run in a new thread separate from that of the command processing thread</p>
+     *
+     * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()})
+     * @return the message to show when requesting a version
+     */
+    Component getVersionMessage(String serverVersion);
+
+    @ApiStatus.Internal
+    class DummyVersionFetcher implements VersionFetcher {
+
+        @Override
+        public long getCacheTime() {
+            return -1;
+        }
+
+        @Override
+        public Component getVersionMessage(final String serverVersion) {
+            Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!");
+            Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()");
+            new Throwable().printStackTrace();
+            return Component.text("Unable to check for updates. No version provider set.", NamedTextColor.RED);
+        }
+    }
+}
+diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..652ff54e7c50412503725d628bfe72ed03059790
+--- /dev/null
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
+@@ -0,0 +1,122 @@
+package io.papermc.paper;
+
+import java.time.Instant;
+import java.util.Optional;
+import java.util.OptionalInt;
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.util.Services;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Information about the current server build.
+ */
+@NullMarked
+@ApiStatus.NonExtendable
+public interface ServerBuildInfo {
+    /**
+     * The brand id for Paper.
+     */
+    Key BRAND_PAPER_ID = Key.key("papermc", "paper");
+
+    /**
+     * Gets the {@code ServerBuildInfo}.
+     *
+     * @return the {@code ServerBuildInfo}
+     */
+    static ServerBuildInfo buildInfo() {
+        //<editor-fold defaultstate="collapsed" desc="Holder">
+        final class Holder {
+            static final Optional<ServerBuildInfo> INSTANCE = Services.service(ServerBuildInfo.class);
+        }
+        //</editor-fold>
+        return Holder.INSTANCE.orElseThrow();
+    }
+
+    /**
+     * Gets the brand id of the server.
+     *
+     * @return the brand id of the server (e.g. "papermc:paper")
+     */
+    Key brandId();
+
+    /**
+     * Checks if the current server supports the specified brand.
+     *
+     * @param brandId the brand to check (e.g. "papermc:folia")
+     * @return {@code true} if the server supports the specified brand
+     */
+    @ApiStatus.Experimental
+    boolean isBrandCompatible(final Key brandId);
+
+    /**
+     * Gets the brand name of the server.
+     *
+     * @return the brand name of the server (e.g. "Paper")
+     */
+    String brandName();
+
+    /**
+     * Gets the Minecraft version id.
+     *
+     * @return the Minecraft version id (e.g. "1.20.4", "1.20.2-pre2", "23w31a")
+     */
+    String minecraftVersionId();
+
+    /**
+     * Gets the Minecraft version name.
+     *
+     * @return the Minecraft version name (e.g. "1.20.4", "1.20.2 Pre-release 2", "23w31a")
+     */
+    String minecraftVersionName();
+
+    /**
+     * Gets the build number.
+     *
+     * @return the build number
+     */
+    OptionalInt buildNumber();
+
+    /**
+     * Gets the build time.
+     *
+     * @return the build time
+     */
+    Instant buildTime();
+
+    /**
+     * Gets the git commit branch.
+     *
+     * @return the git commit branch
+     */
+    Optional<String> gitBranch();
+
+    /**
+     * Gets the git commit hash.
+     *
+     * @return the git commit hash
+     */
+    Optional<String> gitCommit();
+
+    /**
+     * Creates a string representation of the server build information.
+     *
+     * @param representation the type of representation
+     * @return a string
+     */
+    String asString(final StringRepresentation representation);
+
+    /**
+     * String representation types.
+     */
+    enum StringRepresentation {
+        /**
+         * A simple version string, in format {@code <minecraftVersionId>-<buildNumber>-<gitCommit>}.
+         */
+        VERSION_SIMPLE,
+        /**
+         * A simple version string, in format {@code <minecraftVersionId>-<buildNumber>-<gitBranch>@<gitCommit> (<buildTime>)}.
+         */
+        VERSION_FULL,
+    }
+}
+diff --git a/src/main/java/io/papermc/paper/util/JarManifests.java b/src/main/java/io/papermc/paper/util/JarManifests.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..7915a70d676b1205dcae39259f670af258a1ab9b
+--- /dev/null
+++ b/src/main/java/io/papermc/paper/util/JarManifests.java
+@@ -0,0 +1,38 @@
+package io.papermc.paper.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.jar.Manifest;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
+@ApiStatus.Internal
+public final class JarManifests {
+    private JarManifests() {
+    }
+
+    private static final Map<ClassLoader, Manifest> MANIFESTS = Collections.synchronizedMap(new WeakHashMap<>());
+
+    public static @Nullable Manifest manifest(final Class<?> clazz) {
+        return MANIFESTS.computeIfAbsent(clazz.getClassLoader(), classLoader -> {
+            final String classLocation = "/" + clazz.getName().replace(".", "/") + ".class";
+            final URL resource = clazz.getResource(classLocation);
+            if (resource == null) {
+                return null;
+            }
+            final String classFilePath = resource.toString().replace("\\", "/");
+            final String archivePath = classFilePath.substring(0, classFilePath.length() - classLocation.length());
+            try (final InputStream stream = new URL(archivePath + "/META-INF/MANIFEST.MF").openStream()) {
+                return new Manifest(stream);
+            } catch (final IOException ex) {
+                return null;
+            }
+        });
+    }
+}
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index e4f7ff41d7205994fef87989a7955d7b8fe4d7f4..75e0c5b884363be03876103e0d66e67de03c4856 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -110,13 +110,26 @@ public final class Bukkit {
+         }
+ 
+         Bukkit.server = server;
+-        server.getLogger().info("This server is running " + getName() + " version " + getVersion() + " (Implementing API version " + getBukkitVersion() + ")");
+        // Paper start - add git information
+        server.getLogger().info(getVersionMessage());
+    }
+    /**
+      * Gets message describing the version server is running.
+      *
+      * @return message describing the version server is running
+      */
+    @NotNull
+    public static String getVersionMessage() {
+        final io.papermc.paper.ServerBuildInfo version = io.papermc.paper.ServerBuildInfo.buildInfo();
+        return "This server is running " + getName() + " version " + version.asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_FULL) + " (Implementing API version " + getBukkitVersion() + ")";
+        // Paper end
+     }
+ 
+     /**
+      * Gets the name of this server implementation.
+      *
+      * @return name of this server implementation
+     * @see io.papermc.paper.ServerBuildInfo#brandName()
+      */
+     @NotNull
+     public static String getName() {
+@@ -127,6 +140,7 @@ public final class Bukkit {
+      * Gets the version string of this server implementation.
+      *
+      * @return version of this server implementation
+     * @see io.papermc.paper.ServerBuildInfo
+      */
+     @NotNull
+     public static String getVersion() {
+@@ -143,6 +157,20 @@ public final class Bukkit {
+         return server.getBukkitVersion();
+     }
+ 
+    // Paper start - expose game version
+    /**
+     * Gets the version of game this server implements
+     *
+     * @return version of game
+     * @see io.papermc.paper.ServerBuildInfo#minecraftVersionId()
+     * @see io.papermc.paper.ServerBuildInfo#minecraftVersionName()
+     */
+    @NotNull
+    public static String getMinecraftVersion() {
+        return server.getMinecraftVersion();
+    }
+    // Paper end
+
+     /**
+      * Gets a view of all currently logged in players. This {@linkplain
+      * Collections#unmodifiableCollection(Collection) view} is a reused
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 4f15cc4bcc07d3061dd94b20fc77f549ddfcbb6b..2ed640d5a0027f7a94a5cf4555741c27c9b1b3a4 100644
+--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
+@@ -120,6 +120,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     @NotNull
+     public String getBukkitVersion();
+ 
+    // Paper start - expose game version
+    /**
+     * Gets the version of game this server implements
+     *
+     * @return version of game
+     */
+    @NotNull
+    String getMinecraftVersion();
+    // Paper end
+
+     /**
+      * Gets a view of all currently logged in players. This {@linkplain
+      * Collections#unmodifiableCollection(Collection) view} is a reused
+diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
+index aec092e019667d53faf3e7352799772804d5d260..012b46c82d9d06d1d2da8da626fc5cde6e9e2ca4 100644
+--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
+@@ -156,4 +156,13 @@ public interface UnsafeValues {
+         return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
+     }
+     // Paper end
+
+    // Paper start
+    /**
+     * Called once by the version command on first use, then cached.
+     */
+    default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
+        return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
+    }
+    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+index 263208d3cba36cb80c9ee4e3022ef702ea113df2..e64bb57f74e6d6f78927be228825b3e0bdf41f48 100644
+--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+@@ -25,8 +25,25 @@ import org.bukkit.plugin.Plugin;
+ import org.bukkit.plugin.PluginDescriptionFile;
+ import org.bukkit.util.StringUtil;
+ import org.jetbrains.annotations.NotNull;
+// Paper start - version command 2.0
+import com.destroystokyo.paper.util.VersionFetcher;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+// Paper end - version command 2.0
+ 
+ public class VersionCommand extends BukkitCommand {
+    private VersionFetcher versionFetcher; // Paper - version command 2.0
+    private VersionFetcher getVersionFetcher() { // lazy load because unsafe isn't available at command registration
+        if (versionFetcher == null) {
+            versionFetcher = Bukkit.getUnsafe().getVersionFetcher();
+        }
+
+        return versionFetcher;
+    }
+
+     public VersionCommand(@NotNull String name) {
+         super(name);
+ 
+@@ -41,7 +58,7 @@ public class VersionCommand extends BukkitCommand {
+         if (!testPermission(sender)) return true;
+ 
+         if (args.length == 0) {
+-            sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
+            //sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); // Paper - moved to setVersionMessage
+             sendVersion(sender);
+         } else {
+             StringBuilder name = new StringBuilder();
+@@ -80,8 +97,17 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private void describeToSender(@NotNull Plugin plugin, @NotNull CommandSender sender) {
+         PluginDescriptionFile desc = plugin.getDescription();
+-        sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
+-
+        // Paper start - version command 2.0
+        sender.sendMessage(
+            Component.text()
+                .append(Component.text(desc.getName(), NamedTextColor.GREEN))
+                .append(Component.text(" version "))
+                .append(Component.text(desc.getVersion(), NamedTextColor.GREEN)
+                    .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE))
+                    .clickEvent(ClickEvent.copyToClipboard(desc.getVersion()))
+                )
+        );
+        // Paper end - version command 2.0
+         if (desc.getDescription() != null) {
+             sender.sendMessage(desc.getDescription());
+         }
+@@ -147,14 +173,14 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private final ReentrantLock versionLock = new ReentrantLock();
+     private boolean hasVersion = false;
+-    private String versionMessage = null;
+    private Component versionMessage = null; // Paper
+     private final Set<CommandSender> versionWaiters = new HashSet<CommandSender>();
+     private boolean versionTaskStarted = false;
+     private long lastCheck = 0;
+ 
+     private void sendVersion(@NotNull CommandSender sender) {
+         if (hasVersion) {
+-            if (System.currentTimeMillis() - lastCheck > 21600000) {
+            if (System.currentTimeMillis() - lastCheck > getVersionFetcher().getCacheTime()) { // Paper - use version supplier
+                 lastCheck = System.currentTimeMillis();
+                 hasVersion = false;
+             } else {
+@@ -169,7 +195,7 @@ public class VersionCommand extends BukkitCommand {
+                 return;
+             }
+             versionWaiters.add(sender);
+-            sender.sendMessage("Checking version, please wait...");
+            sender.sendMessage(Component.text("Checking version, please wait...", NamedTextColor.WHITE, TextDecoration.ITALIC)); // Paper
+             if (!versionTaskStarted) {
+                 versionTaskStarted = true;
+                 new Thread(new Runnable() {
+@@ -187,6 +213,13 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private void obtainVersion() {
+         String version = Bukkit.getVersion();
+        // Paper start
+        if (version.startsWith("null")) { // running from ide?
+            setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
+            return;
+        }
+        setVersionMessage(getVersionFetcher().getVersionMessage(version));
+        /*
+         if (version == null) version = "Custom";
+         String[] parts = version.substring(0, version.indexOf(' ')).split("-");
+         if (parts.length == 4) {
+@@ -216,11 +249,24 @@ public class VersionCommand extends BukkitCommand {
+         } else {
+             setVersionMessage("Unknown version, custom build?");
+         }
+         */
+        // Paper end
+     }
+ 
+-    private void setVersionMessage(@NotNull String msg) {
+    // Paper start
+    private void setVersionMessage(final @NotNull Component msg) {
+         lastCheck = System.currentTimeMillis();
+-        versionMessage = msg;
+        final Component message = Component.textOfChildren(
+            Component.text(Bukkit.getVersionMessage(), NamedTextColor.WHITE),
+            Component.newline(),
+            msg
+        );
+        this.versionMessage = Component.text()
+            .append(message)
+            .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE))
+            .clickEvent(ClickEvent.copyToClipboard(PlainTextComponentSerializer.plainText().serialize(message)))
+            .build();
+        // Paper end
+         versionLock.lock();
+         try {
+             hasVersion = true;
+diff --git a/src/test/java/io/papermc/paper/TestServerBuildInfo.java b/src/test/java/io/papermc/paper/TestServerBuildInfo.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..17be27a869c1047a7a9440fb8f3717260d4abbd0
+--- /dev/null
+++ b/src/test/java/io/papermc/paper/TestServerBuildInfo.java
+@@ -0,0 +1,59 @@
+package io.papermc.paper;
+
+import java.time.Instant;
+import java.util.Optional;
+import java.util.OptionalInt;
+import net.kyori.adventure.key.Key;
+import org.jetbrains.annotations.NotNull;
+
+public class TestServerBuildInfo implements ServerBuildInfo {
+    @Override
+    public @NotNull Key brandId() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isBrandCompatible(final @NotNull Key brandId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull String brandName() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull String minecraftVersionId() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull String minecraftVersionName() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull OptionalInt buildNumber() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Instant buildTime() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Optional<String> gitBranch() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Optional<String> gitCommit() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull String asString(final @NotNull StringRepresentation representation) {
+        return "";
+    }
+}
+diff --git a/src/test/resources/META-INF/services/io.papermc.paper.ServerBuildInfo b/src/test/resources/META-INF/services/io.papermc.paper.ServerBuildInfo
+new file mode 100644
+index 0000000000000000000000000000000000000000..64e2f8559b9c5a52e0a3229d3d12f65e9af145b3
+--- /dev/null
+++ b/src/test/resources/META-INF/services/io.papermc.paper.ServerBuildInfo
+@@ -0,0 +1 @@
+io.papermc.paper.TestServerBuildInfo
@@ -1,200 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach@zachbr.io>
-Date: Mon, 27 May 2019 01:10:06 -0500
-Subject: [PATCH] Version Command 2.0
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c716339346
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
-@@ -0,0 +1,45 @@
-+package com.destroystokyo.paper.util;
-+
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import org.bukkit.Bukkit;
-+import org.jetbrains.annotations.NotNull;
-+
-+public interface VersionFetcher {
-+    /**
-+     * Amount of time to cache results for in milliseconds
-+     * <p>
-+     * Negative values will never cache.
-+     *
-+     * @return cache time
-+     */
-+    long getCacheTime();
-+
-+    /**
-+     * Gets the version message to cache and show to command senders.
-+     *
-+     * <p>NOTE: This is run in a new thread separate from that of the command processing thread</p>
-+     *
-+     * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()})
-+     * @return the message to show when requesting a version
-+     */
-+    @NotNull
-+    Component getVersionMessage(@NotNull String serverVersion);
-+
-+    class DummyVersionFetcher implements VersionFetcher {
-+
-+        @Override
-+        public long getCacheTime() {
-+            return -1;
-+        }
-+
-+        @NotNull
-+        @Override
-+        public Component getVersionMessage(@NotNull String serverVersion) {
-+            Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!");
-+            Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()");
-+            new Throwable().printStackTrace();
-+            return Component.text("Unable to check for updates. No version provider set.", NamedTextColor.RED);
-+        }
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 01e796e487cc16710f51b457466a37ba70e1e665..d69e5fa40702c283c370a2f712b51dc2ea3a1fa0 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -146,5 +146,12 @@ public interface UnsafeValues {
-      * @return name
-      */
-     String getTimingsServerName();
-+
-+    /**
-+     * Called once by the version command on first use, then cached.
-+     */
-+    default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
-+        return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b437cf212a63aa96a9492db8d01d5d37061aee23 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -24,8 +24,25 @@ import org.bukkit.plugin.Plugin;
- import org.bukkit.plugin.PluginDescriptionFile;
- import org.bukkit.util.StringUtil;
- import org.jetbrains.annotations.NotNull;
-+// Paper start - version command 2.0
-+import com.destroystokyo.paper.util.VersionFetcher;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.event.ClickEvent;
-+import net.kyori.adventure.text.format.TextDecoration;
-+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-+// Paper end - version command 2.0
- 
- public class VersionCommand extends BukkitCommand {
-+    private VersionFetcher versionFetcher; // Paper - version command 2.0
-+    private VersionFetcher getVersionFetcher() { // lazy load because unsafe isn't available at command registration
-+        if (versionFetcher == null) {
-+            versionFetcher = Bukkit.getUnsafe().getVersionFetcher();
-+        }
-+
-+        return versionFetcher;
-+    }
-+
-     public VersionCommand(@NotNull String name) {
-         super(name);
- 
-@@ -40,7 +57,7 @@ public class VersionCommand extends BukkitCommand {
-         if (!testPermission(sender)) return true;
- 
-         if (args.length == 0) {
-            sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
-+            //sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); // Paper - moved to setVersionMessage
-             sendVersion(sender);
-         } else {
-             StringBuilder name = new StringBuilder();
-@@ -79,8 +96,17 @@ public class VersionCommand extends BukkitCommand {
- 
-     private void describeToSender(@NotNull Plugin plugin, @NotNull CommandSender sender) {
-         PluginDescriptionFile desc = plugin.getDescription();
-        sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
-
-+        // Paper start - version command 2.0
-+        sender.sendMessage(
-+            Component.text()
-+                .append(Component.text(desc.getName(), NamedTextColor.GREEN))
-+                .append(Component.text(" version "))
-+                .append(Component.text(desc.getVersion(), NamedTextColor.GREEN)
-+                    .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE))
-+                    .clickEvent(ClickEvent.copyToClipboard(desc.getVersion()))
-+                )
-+        );
-+        // Paper end - version command 2.0
-         if (desc.getDescription() != null) {
-             sender.sendMessage(desc.getDescription());
-         }
-@@ -146,14 +172,14 @@ public class VersionCommand extends BukkitCommand {
- 
-     private final ReentrantLock versionLock = new ReentrantLock();
-     private boolean hasVersion = false;
-    private String versionMessage = null;
-+    private Component versionMessage = null; // Paper
-     private final Set<CommandSender> versionWaiters = new HashSet<CommandSender>();
-     private boolean versionTaskStarted = false;
-     private long lastCheck = 0;
- 
-     private void sendVersion(@NotNull CommandSender sender) {
-         if (hasVersion) {
-            if (System.currentTimeMillis() - lastCheck > 21600000) {
-+            if (System.currentTimeMillis() - lastCheck > getVersionFetcher().getCacheTime()) { // Paper - use version supplier
-                 lastCheck = System.currentTimeMillis();
-                 hasVersion = false;
-             } else {
-@@ -168,7 +194,7 @@ public class VersionCommand extends BukkitCommand {
-                 return;
-             }
-             versionWaiters.add(sender);
-            sender.sendMessage("Checking version, please wait...");
-+            sender.sendMessage(Component.text("Checking version, please wait...", NamedTextColor.WHITE, TextDecoration.ITALIC)); // Paper
-             if (!versionTaskStarted) {
-                 versionTaskStarted = true;
-                 new Thread(new Runnable() {
-@@ -186,6 +212,13 @@ public class VersionCommand extends BukkitCommand {
- 
-     private void obtainVersion() {
-         String version = Bukkit.getVersion();
-+        // Paper start
-+        if (version.startsWith("null")) { // running from ide?
-+            setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
-+            return;
-+        }
-+        setVersionMessage(getVersionFetcher().getVersionMessage(version));
-+        /*
-         if (version == null) version = "Custom";
-         String[] parts = version.substring(0, version.indexOf(' ')).split("-");
-         if (parts.length == 4) {
-@@ -215,11 +248,24 @@ public class VersionCommand extends BukkitCommand {
-         } else {
-             setVersionMessage("Unknown version, custom build?");
-         }
-+         */
-+        // Paper end
-     }
- 
-    private void setVersionMessage(@NotNull String msg) {
-+    // Paper start
-+    private void setVersionMessage(final @NotNull Component msg) {
-         lastCheck = System.currentTimeMillis();
-        versionMessage = msg;
-+        final Component message = Component.textOfChildren(
-+            Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", NamedTextColor.WHITE),
-+            Component.newline(),
-+            msg
-+        );
-+        this.versionMessage = Component.text()
-+            .append(message)
-+            .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE))
-+            .clickEvent(ClickEvent.copyToClipboard(PlainTextComponentSerializer.plainText().serialize(message)))
-+            .build();
-+        // Paper end
-         versionLock.lock();
-         try {
-             hasVersion = true;
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API


 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c78fb359bd28b8dc1ba242642ec612e856525993..4e1fb0974d061d5bb64899cac576318d2e6f8bf6 100644
+index d7f95863922bf332c674d538eb187015fadae9d8..411297f66520774a4072c9e15aa9bdf03a527208 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -791,5 +791,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -25,7 +25,7 @@ index c78fb359bd28b8dc1ba242642ec612e856525993..4e1fb0974d061d5bb64899cac576318d
     // Paper end
 }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index d96fd494b523491fcf1ac54d164351fd487f65d6..ae1ce2ee2deb82f3f4144ec54b3ba119b437c5e9 100644
+index 5d7d940cdad7915efa639b8940a17dc97b60ecd8..315dcf9da29e077a819f602ebf1c76286164b264 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
@@ -126,4 +126,15 @@ public interface FallingBlock extends Entity {
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Isaac Moore <rmsy@me.com>
-Date: Mon, 29 Feb 2016 18:02:25 -0600
-Subject: [PATCH] Add PlayerLocaleChangeEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..57f6c47e4e759abf0af9aa8962551225cc12246c
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
-@@ -0,0 +1,60 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Called when the locale of the player is changed.
-+ *
-+ * @deprecated Replaced by {@link org.bukkit.event.player.PlayerLocaleChangeEvent} upstream
-+ */
-+@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+public class PlayerLocaleChangeEvent extends PlayerEvent {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    private final String oldLocale;
-+    private final String newLocale;
-+
-+    @ApiStatus.Internal
-+    public PlayerLocaleChangeEvent(final @NotNull Player player, final @Nullable String oldLocale, final @NotNull String newLocale) {
-+        super(player);
-+        this.oldLocale = oldLocale;
-+        this.newLocale = newLocale;
-+    }
-+
-+    /**
-+     * Gets the locale the player switched from.
-+     *
-+     * @return player's old locale
-+     */
-+    @Nullable
-+    public String getOldLocale() {
-+        return this.oldLocale;
-+    }
-+
-+    /**
-+     * Gets the locale the player is changed to.
-+     *
-+     * @return player's new locale
-+     */
-+    @NotNull
-+    public String getNewLocale() {
-+        return this.newLocale;
-+    }
-+
-+    @Override
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
-+    }
-+}