Version Catalogs initial POC

todo
- needs release build of multi-version-catalog
- need to go through the patches and migrate all the dependencies & versions

.github/DISCUSSION_TEMPLATE/ideas.yml

@@ -1,42 +0,0 @@
-labels: ["status: needs triage"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for filling out a feature request for Paper! Please be as detailed as possible so that we may consider and review the request easier.
-        We ask that you search all the issues to avoid a duplicate feature request. If one exists, please reply if you have anything to add.
-        Before requesting a new feature, please make sure you are using the latest version and that the feature you are requesting is not already in Paper.
-
-  - type: textarea
-    attributes:
-      label: Is your feature request related to a problem?
-      description: Please give 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.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 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!

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,44 @@
+name: Feature Request
+description: Suggest an idea for Paper
+labels: [ "status: needs triage", "type: feature" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for filling out a feature request for Paper! Please be as detailed as possible so that we may consider and review the request easier.
+        We ask that you search all the issues to avoid a duplicate feature request. If one exists, please reply if you have anything to add.
+        Before requesting a new feature, please make sure you are using the latest version and that the feature you are requesting is not already in Paper.
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem?
+      description: Please give 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.

.github/workflows/build.yml

@@ -21,36 +21,31 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [21]
+        java: [17]
       fail-fast: true
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'zulu'
+          distribution: 'temurin'
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/wrapper-validation-action@v1
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/gradle-build-action@v2
 
       - name: Configure Build
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         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 = `${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 event_name = "${{ github.event_name }}";
+            const event = ${{ toJSON(github.event) }};
+            const ref_type = "${{ github.ref_type }}";
+            const ref_name = "${{ github.ref_name }}";
             const result = {
               action: "build"
             };
@@ -76,38 +71,19 @@ jobs:
       - name: Apply Patches
         run: |
           git config --global user.email "no-reply@github.com"
-          git config --global user.name "GitHub Actions"
+          git config --global user.name "Github Actions"
           ./gradlew applyPatches --stacktrace
 
       - name: Build
         run: ./gradlew build --stacktrace
 
-      - name: Upload Test Results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Test Results (${{ matrix.java }})
-          path: |
-            **/build/test-results/test/TEST-*.xml
-
       - name: Create Paperclip Jar
         if: fromJSON(steps.determine.outputs.result).action == 'paperclip'
-        run: ./gradlew createMojmapPaperclipJar --stacktrace
+        run: ./gradlew createReobfPaperclipJar --stacktrace
 
       - name: Upload Paperclip Jar
         if: fromJSON(steps.determine.outputs.result).action == 'paperclip'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: paper-${{ fromJSON(steps.determine.outputs.result).pr }}
-          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
-    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: Event File
-          path: ${{ github.event_path }}
+          path: build/libs/paper-paperclip-*-reobf.jar

.github/workflows/close_invalid_prs.yml

@@ -6,22 +6,9 @@ on:
 
 jobs:
   run:
-    if: |
-      github.repository != github.event.pull_request.head.repo.full_name &&
-      (
-        github.head_ref == 'master' ||
-        github.event.pull_request.head.repo.owner.type != 'User'
-      )
+    if: ${{ github.repository != github.event.pull_request.head.repo.full_name && github.head_ref == 'master' }}
     runs-on: ubuntu-latest
     steps:
       - uses: superbrothers/close-pull-request@v3
-        id: "master_branch"
-        if: github.head_ref == 'master'
         with:
           comment: "Please do not open pull requests from the `master` branch, create a new branch instead."
-
-      - uses: superbrothers/close-pull-request@v3
-        id: "org_account"
-        if: github.event.pull_request.head.repo.owner.type != 'User' && steps.master_branch.outcome == 'skipped'
-        with:
-          comment: "Please do not open pull requests from non-user accounts like organizations. Create a fork on a user account instead."

.github/workflows/pr_comment.yml

@@ -17,15 +17,7 @@ jobs:
     if: github.event.workflow_run.conclusion == 'success'
     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) }}"
+      - uses: actions/github-script@v6
         with:
           # This snippet is public-domain, taken from
           # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
@@ -45,17 +37,17 @@ jobs:
             }
 
             const { owner, repo } = context.repo;
-            const run_id = `${process.env.RUN_ID}`;
-            const repo_id = `${process.env.REPO_ID}`;
+            const run_id = ${{ github.event.workflow_run.id }};
+            const repo_id = ${{ github.event.repository.id }};
 
             let pulls = [];
-            const event_type = `${process.env.EVENT_TYPE}`;
+            const event_type = "${{ github.event.workflow_run.event}}";
             if (event_type === "push") { // if push, it's from the same repo which means `pull_requests` is populated
-              pulls = JSON.parse(`${process.env.PULL_REQUESTS}`);
+              pulls = ${{ toJSON(github.event.workflow_run.pull_requests) }};
             } else {
-              const pr_branch = `${process.env.BRANCH_NAME}`;
-              const pr_sha = `${process.env.PR_SHA}`;
-              const pr_owner = `${process.env.PR_OWNER}`;
+              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 { 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"));

.github/workflows/projects.yml

@@ -33,23 +33,25 @@ jobs:
           column-field: Status
           label-to-column-map: |
             {
-              "resolution: awaiting response": "⌛ Awaiting Response",
-              "resolution: cannot reproduce": "Invalid",
-              "resolution: duplicate": "Invalid",
-              "resolution: incomplete": "Invalid",
-              "resolution: invalid": "Invalid",
-              "resolution: superseded": "Invalid",
-              "resolution: unsupported": "Invalid",
-              "resolution: won't fix": "Invalid",
-              "resolution: works as intended": "Invalid",
+              "status: needs triage": "🕑 Needs Triage",
               "status: accepted": "✅ Accepted",
+              "status: unlikely": "✅ Accepted",
+              "status: in progress": "Needs Work",
+              "status: rebase required": "Needs Work",
               "status: blocked": "Needs Work",
               "status: defer upstream": "Needs Work",
-              "status: in progress": "Needs Work",
               "status: input wanted": "Needs Work",
-              "status: needs triage": "🕑 Needs Triage",
-              "status: rebase required": "Needs Work",
-              "status: unlikely": "✅ Accepted"
+              "we must go deeper": "Needs Work",
+              "has rough edges": "Needs Work",
+              "status: waiting on reporter": "⌛ Waiting for Reporter",
+              "resolution: works-as-intended": "Invalid",
+              "resolution: invalid": "Invalid",
+              "resolution: wontfix": "Invalid",
+              "resolution: duplicate": "Invalid",
+              "resolution: cannot reproduce": "Invalid",
+              "resolution: unsupported": "Invalid",
+              "resolution: incomplete": "Invalid",
+              "resolution: superseded": "Invalid"
             }
 
       - uses: PaperMC/update-projects-action@v0.2.0
@@ -63,14 +65,14 @@ jobs:
           # include "status: needs triage" below to catch any closed issues without setting a resolution
           label-to-column-map: |
             {
-              "resolution: cannot reproduce": "Invalid",
-              "resolution: duplicate": "Invalid",
-              "resolution: incomplete": "Invalid",
-              "resolution: invalid": "Invalid",
-              "resolution: superseded": "Invalid",
-              "resolution: unsupported": "Invalid",
-              "resolution: won't fix": "Invalid",
-              "resolution: works as intended": "Invalid",
               "status: accepted": "Done",
-              "status: needs triage": "Invalid"
+              "status: needs triage": "Invalid",
+              "resolution: works-as-intended": "Invalid",
+              "resolution: invalid": "Invalid",
+              "resolution: wontfix": "Invalid",
+              "resolution: duplicate": "Invalid",
+              "resolution: cannot reproduce": "Invalid",
+              "resolution: unsupported": "Invalid",
+              "resolution: incomplete": "Invalid",
+              "resolution: superseded": "Invalid"
             }

.github/workflows/test_results.yml

@@ -1,32 +0,0 @@
-name: Test Results
-
-on:
-  workflow_run:
-    workflows: [ "Build Paper" ]
-    types:
-      - completed
-permissions: { }
-
-jobs:
-  test-results:
-    name: Test Results
-    runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion != 'skipped'
-    permissions:
-      checks: write
-      # for downloading test result artifacts
-      actions: read
-    steps:
-      - name: Download and Extract Artifacts
-        uses: dawidd6/action-download-artifact@v3
-        with:
-          run_id: ${{ github.event.workflow_run.id }}
-          path: artifacts
-      - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          commit: ${{ github.event.workflow_run.head_sha }}
-          event_file: artifacts/Event File/event.json
-          event_name: ${{ github.event.workflow_run.event }}
-          files: "artifacts/**/*.xml"
-          comment_mode: off

.gitignore

@@ -61,7 +61,6 @@ out/
 
 # other stuff
 run/
-logs/
 
 Paper-Server
 Paper-API

CONTRIBUTING.md

@@ -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 21 or later JDK (packages vary, use Google/DuckDuckGo/etc.).
+- A Java 17 or later JDK (packages vary, use Google/DuckDuckGo/etc.).
   - [Adoptium](https://adoptium.net/) has builds for most operating systems.
-  - Paper requires JDK 21 to build, however, makes use of Gradle's
+  - Paper requires JDK 17 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 21 for compilation if it cannot find an existing
+    automatically provision JDK 17 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:21.0.3_9-jdk bash
+# docker run -it -v "$(pwd)":/data --rm eclipse-temurin:17.0.1_12-jdk bash
 Pulling image...
 
 root@abcdefg1234:/# javac -version
-javac 21.0.3
+javac 17.0.1
 ```
 
 ## Understanding Patches
@@ -67,7 +67,7 @@ Assuming you have already forked the repository:
 
 1. Clone your fork to your local machine;
 2. Type `./gradlew applyPatches` in a terminal to apply the changes from upstream.
-On Windows, replace the `./` with `.\` at the beginning for all `gradlew` commands;
+On Windows, leave out the `./` at the beginning for all `gradlew` commands;
 3. cd into `Paper-Server` for server changes, and `Paper-API` for API changes.  
 <!--You can also run `./paper server` or `./paper api` for these same directories
 respectively.
@@ -204,31 +204,29 @@ when making and submitting changes.
 
 ## Formatting
 
-All modifications to non-Paper files should be marked. The one exception to this is
-when modifying javadoc comments, which should not have these markers.
+All modifications to non-Paper files should be marked.
 
-- You need to add a comment with a short and identifiable description of the patch:
-  `// Paper start - <COMMIT DESCRIPTION>`
-    - The comments should generally be about the reason the change was made, what
-      it was before, or what the change is.
-    - After the general commit description, you can add additional information either
-      after a `;` or in the next line.
-- Multi-line changes start with `// Paper start - <COMMIT DESCRIPTION>` and end
-  with `// Paper end - <COMMIT DESCRIPTION>`.
-- One-line changes should have `// Paper - <COMMIT DESCRIPTION>` at the end of the line.
+- Multi-line changes start with `// Paper start` and end with `// Paper end`;
+- You can put a comment with an explanation if it isn't obvious, like this:
+`// Paper start - reason`.
+   - The comments should generally be about the reason the change was made, what
+  it was before, or what the change is.
+   - Multi-line messages should start with `// Paper start` and use `/* Multi
+  line message here */` for the message itself.
+- One-line changes should have `// Paper` or `// Paper - reason`.
 
 Here's an example of how to mark changes by Paper:
 
 ```java
-entity.getWorld().dontBeStupid(); // Paper - Was beStupid(), which is bad
+entity.getWorld().dontbeStupid(); // Paper - was beStupid() which is bad
 entity.getFriends().forEach(Entity::explode);
-entity.updateFriends();
-
-// Paper start - Use plugin-set spawn
+entity.a();
+entity.b();
+// Paper start - use plugin-set spawn
 // entity.getWorld().explode(entity.getWorld().getSpawn());
 Location spawnLocation = ((CraftWorld)entity.getWorld()).getSpawnLocation();
 entity.getWorld().explode(new BlockPosition(spawnLocation.getX(), spawnLocation.getY(), spawnLocation.getZ()));
-// Paper end - Use plugin-set spawn
+// Paper end
 ```
 
 We generally follow the usual Java style (aka. Oracle style), or what is programmed
@@ -237,25 +235,6 @@ 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
-instead of adding a new import to the top of the file. If you are using a type a significant number of times, you
-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.
-
-```java
-import org.bukkit.event.Event;
-// don't add import here, use FQN like below
-
-public class SomeEvent extends Event {
-    public final org.bukkit.Location newLocation; // Paper - add location
-}
-```
 
 ## Access Transformers
 Sometimes, vanilla or CraftBukkit code already contains a field, method, or type you want to access
@@ -323,7 +302,7 @@ Subject: [PATCH] revert serverside behavior of keepalives
 This patch intends to bump up the time that a client has to reply to the
 server back to 30 seconds as per pre 1.12.2, which allowed clients
 more than enough time to reply potentially allowing them to be less
-temperamental due to lag spikes on the network thread, e.g. that caused
+tempermental due to lag spikes on the network thread, e.g. that caused
 by plugins that are interacting with netty.
 
 We also add a system property to allow people to tweak how long the server

LICENSE.md

@@ -63,5 +63,4 @@ Ollie <69084614+olijeffers0n@users.noreply.github.com>
 Oliwier Miodun <naczs@blueflow.pl>
 aerulion <aerulion@gmail.com>
 Lukas Planz <lukas.planz@web.de>
-granny <contact@granny.dev>
 ```

Paper-MojangAPI/build.gradle.kts

@@ -0,0 +1,36 @@
+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.2")
+}
+
+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)
+}

Paper-MojangAPI/src/main/java/com/destroystokyo/paper/brigadier/BukkitBrigadierCommand.java

@@ -0,0 +1,14 @@
+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> {
+}

Paper-MojangAPI/src/main/java/com/destroystokyo/paper/brigadier/BukkitBrigadierCommandSource.java

@@ -0,0 +1,21 @@
+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();
+}

Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendCommandsEvent.java

@@ -0,0 +1,72 @@
+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;
+    }
+}

Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendSuggestionsEvent.java

@@ -0,0 +1,84 @@
+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;
+    }
+}

Paper-MojangAPI/src/main/java/com/destroystokyo/paper/event/brigadier/CommandRegisteredEvent.java

@@ -0,0 +1,168 @@
+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;
+    }
+}

Paper-MojangAPI/src/main/java/io/papermc/paper/brigadier/PaperBrigadier.java

@@ -0,0 +1,42 @@
+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);
+    }
+}

Paper-MojangAPI/src/main/java/io/papermc/paper/brigadier/PaperBrigadierProvider.java

@@ -0,0 +1,30 @@
+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);
+}

README.md

@@ -8,7 +8,7 @@ The most widely used, high-performance Minecraft server that aims to fix gamepla
 
 
 **Support and Project Discussion:**
-- [Our forums](https://forums.papermc.io/) or [Discord](https://discord.gg/papermc)
+- [Our forums](https://forums.papermc.io/), [Discord](https://discord.gg/papermc), or [IRC](https://webchat.esper.net/?channels=paper)
 
 How To (Server Admins)
 ------
@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.20.6-R0.1-SNAPSHOT</version>
+    <version>1.20.2-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,19 +53,19 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 ```
 
 How To (Compiling Jar From Source)
 ------
-To compile Paper, you need JDK 21 and an internet connection.
+To compile Paper, you need JDK 17 and an internet connection.
 
-Clone this repo, run `./gradlew applyPatches`, then `./gradlew createMojmapBundlerJar` from your terminal. You can find the compiled jar in the project root's `build/libs` directory.
+Clone this repo, run `./gradlew applyPatches`, then `./gradlew createReobfBundlerJar` from your terminal. You can find the compiled jar in the project root's `build/libs` directory.
 
 To get a full list of tasks, run `./gradlew tasks`.
 

build-data/reobf-mappings-patch.tiny

@@ -23,6 +23,6 @@ c	net/minecraft/world/level/chunk/LevelChunk	net/minecraft/world/level/chunk/Chu
 c	net/minecraft/server/level/ChunkMap	net/minecraft/server/level/PlayerChunkMap
 	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	F
 
-# The method is made public by Spigot, which then causes accidental overrides
-c	net/minecraft/world/entity/Entity	net/minecraft/world/entity/Entity
-	m	()Z	isInRain	isInRain0
+# Paper changes type
+c	net/minecraft/core/MappedRegistry	net/minecraft/core/RegistryMaterials
+	f	Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;	toId	e

build.gradle.kts

@@ -1,17 +1,11 @@
-import io.papermc.paperweight.PaperweightException
-import io.papermc.paperweight.tasks.BaseTask
-import io.papermc.paperweight.util.*
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import java.io.ByteArrayOutputStream
-import java.nio.file.Path
-import java.util.regex.Pattern
-import kotlin.io.path.*
 
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.core") version "1.7.1"
+    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
+    id("io.papermc.paperweight.core") version "1.5.10"
 }
 
 allprojects {
@@ -20,7 +14,7 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
 }
@@ -30,7 +24,7 @@ val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 subprojects {
     tasks.withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        options.release = 21
+        options.release.set(17)
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()
@@ -67,31 +61,31 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.20.6+build.1:mergedv2")
-    remapper("net.fabricmc:tiny-remapper:0.10.2:fat")
-    decompiler("org.vineflower:vineflower:1.10.1")
-    spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")
+    paramMappings("net.fabricmc:yarn:1.20.2+build.1:mergedv2")
+    remapper("net.fabricmc:tiny-remapper:0.8.10:fat")
+    decompiler("net.minecraftforge:forgeflower:2.0.627.2")
+    spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
     paperclip("io.papermc:paperclip:3.0.3")
 }
 
 paperweight {
-    minecraftVersion = providers.gradleProperty("mcVersion")
-    serverProject = project(":paper-server")
+    minecraftVersion.set(providers.gradleProperty("mcVersion"))
+    serverProject.set(project(":paper-server"))
 
-    paramMappingsRepo = paperMavenPublicUrl
-    remapRepo = paperMavenPublicUrl
-    decompileRepo = paperMavenPublicUrl
+    paramMappingsRepo.set(paperMavenPublicUrl)
+    remapRepo.set(paperMavenPublicUrl)
+    decompileRepo.set(paperMavenPublicUrl)
 
     craftBukkit {
-        fernFlowerJar = layout.file(spigotDecompiler.elements.map { it.single().asFile })
+        fernFlowerJar.set(layout.file(spigotDecompiler.elements.map { it.single().asFile }))
     }
 
     paper {
-        spigotApiPatchDir = layout.projectDirectory.dir("patches/api")
-        spigotServerPatchDir = layout.projectDirectory.dir("patches/server")
+        spigotApiPatchDir.set(layout.projectDirectory.dir("patches/api"))
+        spigotServerPatchDir.set(layout.projectDirectory.dir("patches/server"))
 
-        mappingsPatch = layout.projectDirectory.file("build-data/mappings-patch.tiny")
-        reobfMappingsPatch = layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny")
+        mappingsPatch.set(layout.projectDirectory.file("build-data/mappings-patch.tiny"))
+        reobfMappingsPatch.set(layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny"))
 
         reobfPackagesToFix.addAll(
             "co.aikar.timings",
@@ -108,7 +102,8 @@ paperweight {
 }
 
 tasks.generateDevelopmentBundle {
-    apiCoordinates = "io.papermc.paper:paper-api"
+    apiCoordinates.set("io.papermc.paper:paper-api")
+    mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
     libraryRepositories.addAll(
         "https://repo.maven.apache.org/maven2/",
         paperMavenPublicUrl,
@@ -136,6 +131,16 @@ allprojects {
     }
 }
 
+// Uncomment while updating for a new Minecraft version
+/*
+tasks.collectAtsFromPatches {
+    extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
+}
+tasks.withType<io.papermc.paperweight.tasks.RebuildGitPatches> {
+    filterPatches.set(false)
+}
+ */
+
 tasks.register("printMinecraftVersion") {
     doLast {
         println(providers.gradleProperty("mcVersion").get().trim())
@@ -147,149 +152,3 @@ tasks.register("printPaperVersion") {
         println(project.version)
     }
 }
-
-// see gradle.properties
-if (providers.gradleProperty("updatingMinecraft").getOrElse("false").toBoolean()) {
-    tasks.collectAtsFromPatches {
-        val dir = layout.projectDirectory.dir("patches/unapplied/server")
-        if (dir.path.isDirectory()) {
-            extraPatchDir = dir
-        }
-    }
-    tasks.withType<io.papermc.paperweight.tasks.RebuildGitPatches>().configureEach {
-        filterPatches = false
-    }
-    tasks.register("continueServerUpdate", RebasePatches::class) {
-        description = "Moves the next X patches from unapplied to applied, and applies them. X being the number of patches that apply cleanly, plus the terminal failure if any."
-        projectDir = project.projectDir
-        appliedPatches = file("patches/server")
-        unappliedPatches = file("patches/unapplied/server")
-        applyTaskName = "applyServerPatches"
-        patchedDir = "Paper-Server"
-    }
-}
-
-@UntrackedTask(because = "Does not make sense to track state")
-abstract class RebasePatches : BaseTask() {
-    @get:Internal
-    abstract val projectDir: DirectoryProperty
-
-    @get:InputFiles
-    abstract val appliedPatches: DirectoryProperty
-
-    @get:InputFiles
-    abstract val unappliedPatches: DirectoryProperty
-
-    @get:Input
-    abstract val applyTaskName: Property<String>
-
-    @get:Input
-    abstract val patchedDir: Property<String>
-
-    private fun unapplied(): List<Path> =
-        unappliedPatches.path.listDirectoryEntries("*.patch").sortedBy { it.name }
-
-    private fun appliedLoc(patch: Path): Path = appliedPatches.path.resolve(unappliedPatches.path.relativize(patch))
-
-    companion object {
-        val regex = Pattern.compile("Patch failed at ([0-9]{4}) (.*)")
-        val continuationRegex = Pattern.compile("^\\s{1}.+\$")
-        const val subjectPrefix = "Subject: [PATCH] "
-    }
-
-    @TaskAction
-    fun run() {
-        val patchedDirPath = projectDir.path.resolve(patchedDir.get())
-        if (patchedDirPath.isDirectory()) {
-            val status = Git(patchedDirPath)("status").getText()
-            if (status.contains("You are in the middle of an am session.")) {
-                throw PaperweightException("Cannot continue update when $patchedDirPath is in the middle of an am session.")
-            }
-        }
-
-        val unapplied = unapplied()
-        for (patch in unapplied) {
-            patch.copyTo(appliedLoc(patch))
-        }
-
-        val out = ByteArrayOutputStream()
-        val proc = ProcessBuilder()
-            .directory(projectDir.path)
-            .command("./gradlew", applyTaskName.get())
-            .redirectErrorStream(true)
-            .start()
-
-        val f = redirect(proc.inputStream, out)
-
-        val exit = proc.waitFor()
-        f.get()
-
-        if (exit != 0) {
-            val outStr = String(out.toByteArray())
-            val matcher = regex.matcher(outStr)
-            if (!matcher.find()) error("Could not determine failure point")
-            val failedSubjectFragment = matcher.group(2)
-            val failed = unapplied.single { p ->
-                p.useLines { lines ->
-                    val collect = mutableListOf<String>()
-                    for (line in lines) {
-                        if (line.startsWith(subjectPrefix)) {
-                            collect += line
-                        } else if (collect.size == 1) {
-                            if (continuationRegex.matcher(line).matches()) {
-                                collect += line
-                            } else {
-                                break
-                            }
-                        }
-                    }
-                    val subjectLine = collect.joinToString("").substringAfter(subjectPrefix)
-                    subjectLine.startsWith(failedSubjectFragment)
-                }
-            }
-
-            // delete successful & failure point from unapplied patches dir
-            for (path in unapplied) {
-                path.deleteIfExists()
-                if (path == failed) {
-                    break
-                }
-            }
-
-            // delete failed from patches dir
-            var started = false
-            for (path in unapplied) {
-                if (path == failed) {
-                    started = true
-                    continue
-                }
-                if (started) {
-                    appliedLoc(path).deleteIfExists()
-                }
-            }
-
-            // Delete the build file before resetting the AM session in case it has compilation errors
-            patchedDirPath.resolve("build.gradle.kts").deleteIfExists()
-            // Apply again to reset the am session (so it ends on the failed patch, to allow us to rebuild after fixing it)
-            val apply2 = ProcessBuilder()
-                .directory(projectDir.path)
-                .command("./gradlew", applyTaskName.get())
-                .redirectErrorStream(true)
-                .start()
-
-            val f1 = redirect(apply2.inputStream, System.out)
-            apply2.waitFor()
-            f1.get()
-
-            logger.lifecycle(outStr)
-            logger.lifecycle("Patch failed at $failed; See Git output above.")
-        } else {
-            unapplied.forEach { it.deleteIfExists() }
-            logger.lifecycle("All patches applied!")
-        }
-
-        val git = Git(projectDir.path)
-        git("add", appliedPatches.path.toString() + "/*").runSilently()
-        git("add", unappliedPatches.path.toString() + "/*").runSilently()
-    }
-}

gradle.properties

@@ -1,9 +1,6 @@
 group=io.papermc.paper
-version=1.20.6-R0.1-SNAPSHOT
-mcVersion=1.20.6
-
-# Set to true while updating Minecraft version
-updatingMinecraft=false
+version=1.20.2-R0.1-SNAPSHOT
+mcVersion=1.20.2
 
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -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.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 

paper-api-generator/build.gradle.kts

@@ -1,35 +1,28 @@
-import io.papermc.paperweight.PaperweightSourceGeneratorHelper
-import io.papermc.paperweight.extension.PaperweightSourceGeneratorExt
+import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform
 
 plugins {
     java
+    id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT"
 }
 
-plugins.apply(PaperweightSourceGeneratorHelper::class)
+minecraft {
+    version(property("mcVersion").toString())
+    platform(MinecraftPlatform.SERVER)
 
-extensions.configure(PaperweightSourceGeneratorExt::class) {
-    atFile.set(projectDir.toPath().resolve("wideners.at").toFile())
+    runs {
+        server("generate") {
+            mainClass("io.papermc.generator.Main")
+            accessWideners(projectDir.toPath().resolve("wideners.at"))
+            args(projectDir.toPath().resolve("generated").toString())
+        }
+    }
 }
 
 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")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-}
-
-tasks.register<JavaExec>("generate") {
-    dependsOn(tasks.check)
-    mainClass.set("io.papermc.generator.Main")
-    classpath(sourceSets.main.map { it.runtimeClasspath })
-    args(projectDir.toPath().resolve("generated").toString())
-}
-
-tasks.test {
-    useJUnitPlatform()
 }
 
 group = "io.papermc.paper"
 version = "1.0-SNAPSHOT"
+

paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.20.2")
 @ApiStatus.Experimental
 public final class BiomeKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/DamageTypeKeys.java

@@ -1,367 +0,0 @@
-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.MinecraftExperimental;
-import org.bukkit.damage.DamageType;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * 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.20.6")
-@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: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: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: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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    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 a registry.
-     *
-     * @param key the value's key in the registry
-     * @return a new typed key
-     */
-    @ApiStatus.Experimental
-    public static @NotNull TypedKey<DamageType> create(final @NotNull Key key) {
-        return TypedKey.create(RegistryKey.DAMAGE_TYPE, key);
-    }
-}

paper-api-generator/generated/io/papermc/paper/registry/keys/EnchantmentKeys.java

@@ -1,336 +0,0 @@
-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.MinecraftExperimental;
-import org.bukkit.enchantments.Enchantment;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * 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.20.6")
-@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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    public static final TypedKey<Enchantment> WIND_BURST = create(key("wind_burst"));
-
-    private EnchantmentKeys() {
-    }
-
-    private static @NotNull TypedKey<Enchantment> create(final @NotNull Key key) {
-        return TypedKey.create(RegistryKey.ENCHANTMENT, key);
-    }
-}

paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.20.2")
 @ApiStatus.Experimental
 public final class GameEventKeys {
     /**
@@ -124,13 +124,6 @@ public final class GameEventKeys {
      */
     public static final TypedKey<GameEvent> ELYTRA_GLIDE = create(key("elytra_glide"));
 
-    /**
-     * {@code minecraft:entity_action}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> ENTITY_ACTION = create(key("entity_action"));
-
     /**
      * {@code minecraft:entity_damage}
      *
@@ -173,6 +166,13 @@ public final class GameEventKeys {
      */
     public static final TypedKey<GameEvent> ENTITY_PLACE = create(key("entity_place"));
 
+    /**
+     * {@code minecraft:entity_action}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> ENTITY_ACTION = create(key("entity_action"));
+
     /**
      * {@code minecraft:equip}
      *
@@ -285,6 +285,62 @@ public final class GameEventKeys {
      */
     public static final TypedKey<GameEvent> PROJECTILE_SHOOT = create(key("projectile_shoot"));
 
+    /**
+     * {@code minecraft:sculk_sensor_tendrils_clicking}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> SCULK_SENSOR_TENDRILS_CLICKING = create(key("sculk_sensor_tendrils_clicking"));
+
+    /**
+     * {@code minecraft:shear}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> SHEAR = create(key("shear"));
+
+    /**
+     * {@code minecraft:shriek}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> SHRIEK = create(key("shriek"));
+
+    /**
+     * {@code minecraft:splash}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> SPLASH = create(key("splash"));
+
+    /**
+     * {@code minecraft:step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> STEP = create(key("step"));
+
+    /**
+     * {@code minecraft:swim}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> SWIM = create(key("swim"));
+
+    /**
+     * {@code minecraft:teleport}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> TELEPORT = create(key("teleport"));
+
+    /**
+     * {@code minecraft:unequip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> UNEQUIP = create(key("unequip"));
+
     /**
      * {@code minecraft:resonate_1}
      *
@@ -390,66 +446,17 @@ public final class GameEventKeys {
      */
     public static final TypedKey<GameEvent> RESONATE_15 = create(key("resonate_15"));
 
-    /**
-     * {@code minecraft:sculk_sensor_tendrils_clicking}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> SCULK_SENSOR_TENDRILS_CLICKING = create(key("sculk_sensor_tendrils_clicking"));
-
-    /**
-     * {@code minecraft:shear}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> SHEAR = create(key("shear"));
-
-    /**
-     * {@code minecraft:shriek}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> SHRIEK = create(key("shriek"));
-
-    /**
-     * {@code minecraft:splash}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> SPLASH = create(key("splash"));
-
-    /**
-     * {@code minecraft:step}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> STEP = create(key("step"));
-
-    /**
-     * {@code minecraft:swim}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> SWIM = create(key("swim"));
-
-    /**
-     * {@code minecraft:teleport}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> TELEPORT = create(key("teleport"));
-
-    /**
-     * {@code minecraft:unequip}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> UNEQUIP = create(key("unequip"));
-
     private GameEventKeys() {
     }
 
-    private static @NotNull TypedKey<GameEvent> create(final @NotNull Key key) {
+    /**
+     * Creates a key for {@link GameEvent} in a registry.
+     *
+     * @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) {
         return TypedKey.create(RegistryKey.GAME_EVENT, key);
     }
 }

paper-api-generator/generated/io/papermc/paper/registry/keys/InstrumentKeys.java

@@ -1,91 +0,0 @@
-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.jetbrains.annotations.NotNull;
-
-/**
- * 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.20.6")
-@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() {
-    }
-
-    private static @NotNull TypedKey<MusicInstrument> create(final @NotNull Key key) {
-        return TypedKey.create(RegistryKey.INSTRUMENT, key);
-    }
-}

paper-api-generator/generated/io/papermc/paper/registry/keys/MobEffectKeys.java

@@ -1,321 +0,0 @@
-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.MinecraftExperimental;
-import org.bukkit.potion.PotionEffectType;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * 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.20.6")
-@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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    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
-     */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
-    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 @NotNull TypedKey<PotionEffectType> create(final @NotNull Key key) {
-        return TypedKey.create(RegistryKey.MOB_EFFECT, key);
-    }
-}

paper-api-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java

@@ -1,283 +0,0 @@
-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.MinecraftExperimental;
-import org.bukkit.generator.structure.Structure;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * 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.20.6")
-@ApiStatus.Experimental
-public final class StructureKeys {
-    /**
-     * {@code minecraft:ancient_city}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> ANCIENT_CITY = create(key("ancient_city"));
-
-    /**
-     * {@code minecraft:bastion_remnant}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> BASTION_REMNANT = create(key("bastion_remnant"));
-
-    /**
-     * {@code minecraft:buried_treasure}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> BURIED_TREASURE = create(key("buried_treasure"));
-
-    /**
-     * {@code minecraft:desert_pyramid}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> DESERT_PYRAMID = create(key("desert_pyramid"));
-
-    /**
-     * {@code minecraft:end_city}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> END_CITY = create(key("end_city"));
-
-    /**
-     * {@code minecraft:fortress}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> FORTRESS = create(key("fortress"));
-
-    /**
-     * {@code minecraft:igloo}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> IGLOO = create(key("igloo"));
-
-    /**
-     * {@code minecraft:jungle_pyramid}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> JUNGLE_PYRAMID = create(key("jungle_pyramid"));
-
-    /**
-     * {@code minecraft:mansion}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> MANSION = create(key("mansion"));
-
-    /**
-     * {@code minecraft:mineshaft}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> MINESHAFT = create(key("mineshaft"));
-
-    /**
-     * {@code minecraft:mineshaft_mesa}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> MINESHAFT_MESA = create(key("mineshaft_mesa"));
-
-    /**
-     * {@code minecraft:monument}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> MONUMENT = create(key("monument"));
-
-    /**
-     * {@code minecraft:nether_fossil}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> NETHER_FOSSIL = create(key("nether_fossil"));
-
-    /**
-     * {@code minecraft:ocean_ruin_cold}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> OCEAN_RUIN_COLD = create(key("ocean_ruin_cold"));
-
-    /**
-     * {@code minecraft:ocean_ruin_warm}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> OCEAN_RUIN_WARM = create(key("ocean_ruin_warm"));
-
-    /**
-     * {@code minecraft:pillager_outpost}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> PILLAGER_OUTPOST = create(key("pillager_outpost"));
-
-    /**
-     * {@code minecraft:ruined_portal}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> RUINED_PORTAL = create(key("ruined_portal"));
-
-    /**
-     * {@code minecraft:ruined_portal_desert}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> RUINED_PORTAL_DESERT = create(key("ruined_portal_desert"));
-
-    /**
-     * {@code minecraft:ruined_portal_jungle}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> RUINED_PORTAL_JUNGLE = create(key("ruined_portal_jungle"));
-
-    /**
-     * {@code minecraft:ruined_portal_mountain}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> RUINED_PORTAL_MOUNTAIN = create(key("ruined_portal_mountain"));
-
-    /**
-     * {@code minecraft:ruined_portal_nether}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> RUINED_PORTAL_NETHER = create(key("ruined_portal_nether"));
-
-    /**
-     * {@code minecraft:ruined_portal_ocean}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> RUINED_PORTAL_OCEAN = create(key("ruined_portal_ocean"));
-
-    /**
-     * {@code minecraft:ruined_portal_swamp}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> RUINED_PORTAL_SWAMP = create(key("ruined_portal_swamp"));
-
-    /**
-     * {@code minecraft:shipwreck}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> SHIPWRECK = create(key("shipwreck"));
-
-    /**
-     * {@code minecraft:shipwreck_beached}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> SHIPWRECK_BEACHED = create(key("shipwreck_beached"));
-
-    /**
-     * {@code minecraft:stronghold}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> STRONGHOLD = create(key("stronghold"));
-
-    /**
-     * {@code minecraft:swamp_hut}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> SWAMP_HUT = create(key("swamp_hut"));
-
-    /**
-     * {@code minecraft:trail_ruins}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> TRAIL_RUINS = create(key("trail_ruins"));
-
-    /**
-     * {@code minecraft:trial_chambers}
-     *
-     * @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"));
-
-    /**
-     * {@code minecraft:village_desert}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Structure> 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<Structure> 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<Structure> 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<Structure> 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<Structure> VILLAGE_TAIGA = create(key("village_taiga"));
-
-    private StructureKeys() {
-    }
-
-    /**
-     * Creates a key for {@link Structure} in a registry.
-     *
-     * @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) {
-        return TypedKey.create(RegistryKey.STRUCTURE, key);
-    }
-}

paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.20.2")
 @ApiStatus.Experimental
 public final class StructureTypeKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java

@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.20.2")
 @ApiStatus.Experimental
 public final class TrimMaterialKeys {
     /**

paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java

@@ -6,7 +6,6 @@ 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;
@@ -24,18 +23,9 @@ import org.jetbrains.annotations.NotNull;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.20.6")
+@GeneratedFrom("1.20.2")
 @ApiStatus.Experimental
 public final class TrimPatternKeys {
-    /**
-     * {@code minecraft:bolt}
-     *
-     * @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"));
-
     /**
      * {@code minecraft:coast}
      *
@@ -57,15 +47,6 @@ public final class TrimPatternKeys {
      */
     public static final TypedKey<TrimPattern> EYE = create(key("eye"));
 
-    /**
-     * {@code minecraft:flow}
-     *
-     * @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"));
-
     /**
      * {@code minecraft:host}
      *

paper-api-generator/generated/io/papermc/paper/registry/keys/WolfVariantKeys.java

@@ -1,105 +0,0 @@
-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.jetbrains.annotations.NotNull;
-
-/**
- * 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.20.6")
-@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 a registry.
-     *
-     * @param key the value's key in the registry
-     * @return a new typed key
-     */
-    @ApiStatus.Experimental
-    public static @NotNull TypedKey<Wolf.Variant> create(final @NotNull Key key) {
-        return TypedKey.create(RegistryKey.WOLF_VARIANT, key);
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/Generators.java

@@ -1,42 +0,0 @@
-package io.papermc.generator;
-
-import io.papermc.generator.types.GeneratedKeyType;
-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.GameEvent;
-import org.bukkit.MusicInstrument;
-import org.bukkit.block.Biome;
-import org.bukkit.damage.DamageType;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Wolf;
-import org.bukkit.generator.structure.Structure;
-import org.bukkit.generator.structure.StructureType;
-import org.bukkit.inventory.meta.trim.TrimMaterial;
-import org.bukkit.inventory.meta.trim.TrimPattern;
-import org.bukkit.potion.PotionEffectType;
-
-public interface Generators {
-
-    SourceGenerator[] API = {
-        simpleKey("GameEventKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT, false),
-        simpleKey("BiomeKeys", Biome.class, Registries.BIOME, RegistryKey.BIOME, 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("InstrumentKeys", MusicInstrument.class, Registries.INSTRUMENT, RegistryKey.INSTRUMENT, false),
-        simpleKey("EnchantmentKeys", Enchantment.class, Registries.ENCHANTMENT, RegistryKey.ENCHANTMENT, false),
-        simpleKey("MobEffectKeys", PotionEffectType.class, Registries.MOB_EFFECT, RegistryKey.MOB_EFFECT, false),
-        simpleKey("DamageTypeKeys", DamageType.class, Registries.DAMAGE_TYPE, RegistryKey.DAMAGE_TYPE, true),
-        simpleKey("WolfVariantKeys", Wolf.Variant.class, Registries.WOLF_VARIANT, RegistryKey.WOLF_VARIANT, true),
-        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);
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/Main.java

@@ -1,14 +1,21 @@
 package io.papermc.generator;
 
 import com.mojang.logging.LogUtils;
+import io.papermc.generator.types.GeneratedKeyType;
 import io.papermc.generator.types.SourceGenerator;
+import io.papermc.paper.registry.RegistryKey;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
+import net.kyori.adventure.key.Keyed;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.LayeredRegistryAccess;
+import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.RegistryDataLoader;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.Bootstrap;
 import net.minecraft.server.RegistryLayer;
 import net.minecraft.server.WorldLoader;
@@ -18,6 +25,11 @@ import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.server.packs.repository.ServerPacksSource;
 import net.minecraft.server.packs.resources.MultiPackResourceManager;
 import org.apache.commons.io.file.PathUtils;
+import org.bukkit.GameEvent;
+import org.bukkit.block.Biome;
+import org.bukkit.generator.structure.StructureType;
+import org.bukkit.inventory.meta.trim.TrimMaterial;
+import org.bukkit.inventory.meta.trim.TrimPattern;
 import org.slf4j.Logger;
 
 public final class Main {
@@ -28,8 +40,6 @@ public final class Main {
     static {
         SharedConstants.tryDetectVersion();
         Bootstrap.bootStrap();
-        Bootstrap.validate();
-
         final PackRepository resourceRepository = ServerPacksSource.createVanillaTrustedRepository();
         resourceRepository.reload();
         final MultiPackResourceManager resourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, resourceRepository.getAvailablePacks().stream().map(Pack::open).toList());
@@ -38,24 +48,30 @@ public final class Main {
         REGISTRY_ACCESS = layers.compositeAccess().freeze();
     }
 
+    private static final List<SourceGenerator> GENERATORS = List.of(
+        simpleKey("GameEventKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT, true),
+        simpleKey("BiomeKeys", Biome.class, Registries.BIOME, RegistryKey.BIOME, true),
+        simpleKey("TrimMaterialKeys", TrimMaterial.class, Registries.TRIM_MATERIAL, RegistryKey.TRIM_MATERIAL, true),
+        simpleKey("TrimPatternKeys", TrimPattern.class, Registries.TRIM_PATTERN, RegistryKey.TRIM_PATTERN, true),
+        simpleKey("StructureTypeKeys", StructureType.class, Registries.STRUCTURE_TYPE, RegistryKey.STRUCTURE_TYPE, false)
+    );
+
+    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 Main() {
     }
 
     public static void main(final String[] args) {
-        LOGGER.info("Running API generators...");
-        generate(Paths.get(args[0]), Generators.API);
-        // LOGGER.info("Running Server generators...");
-        // generate(Paths.get(args[1]), Generators.SERVER);
-    }
-
-    private static void generate(Path output, SourceGenerator[] generators) {
+        final Path output = Paths.get(args[0]);
         try {
             if (Files.exists(output)) {
                 PathUtils.deleteDirectory(output);
             }
             Files.createDirectories(output);
 
-            for (final SourceGenerator generator : generators) {
+            for (final SourceGenerator generator : GENERATORS) {
                 generator.writeToFile(output);
             }
 
@@ -64,4 +80,6 @@ public final class Main {
             throw new RuntimeException(ex);
         }
     }
+
+
 }

paper-api-generator/src/main/java/io/papermc/generator/types/Annotations.java

@@ -0,0 +1,24 @@
+package io.papermc.generator.types;
+
+import com.squareup.javapoet.AnnotationSpec;
+import java.util.List;
+import org.bukkit.MinecraftExperimental;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+public final class Annotations {
+
+    public static final List<AnnotationSpec> EXPERIMENTAL_ANNOTATIONS = List.of(
+        AnnotationSpec.builder(ApiStatus.Experimental.class).build(),
+        AnnotationSpec.builder(MinecraftExperimental.class)
+            .addMember("value", "$S", "update 1.20")
+            .build()
+    );
+
+    @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();
+
+    private Annotations() {
+    }
+}

paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java

@@ -1,6 +1,6 @@
 package io.papermc.generator.types;
 
-import com.google.common.collect.Sets;
+import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.FieldSpec;
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.MethodSpec;
@@ -9,39 +9,35 @@ 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.CollectingContext;
-import io.papermc.generator.utils.Formatting;
-import io.papermc.generator.utils.Javadocs;
+import io.papermc.paper.generated.GeneratedFrom;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 import net.kyori.adventure.key.Key;
-import net.minecraft.core.Holder;
-import net.minecraft.core.HolderLookup;
+import net.minecraft.SharedConstants;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistrySetBuilder;
-import net.minecraft.data.registries.UpdateOneTwentyOneRegistries;
-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;
 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 io.papermc.generator.types.Annotations.EXPERIMENTAL_ANNOTATIONS;
+import static io.papermc.generator.types.Annotations.EXPERIMENTAL_API_ANNOTATION;
+import static io.papermc.generator.types.Annotations.NOT_NULL;
 import static java.util.Objects.requireNonNull;
 import static javax.lang.model.element.Modifier.FINAL;
 import static javax.lang.model.element.Modifier.PRIVATE;
@@ -49,13 +45,12 @@ import static javax.lang.model.element.Modifier.PUBLIC;
 import static javax.lang.model.element.Modifier.STATIC;
 
 @DefaultQualifier(NonNull.class)
-public class GeneratedKeyType<T, A> extends SimpleGenerator {
+public class GeneratedKeyType<T, A> implements SourceGenerator {
 
-    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));
+    // don't exist anymore
+    // private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> EXPERIMENTAL_REGISTRY_ENTRIES = UpdateOneTwentyRegistries.BUILDER.entries.stream()
+    //         .collect(Collectors.toMap(RegistrySetBuilder.RegistryStub::key, RegistrySetBuilder.RegistryStub::bootstrap));
+    private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> EXPERIMENTAL_REGISTRY_ENTRIES = Collections.emptyMap();
 
     private static final Map<RegistryKey<?>, String> REGISTRY_KEY_FIELD_NAMES;
     static {
@@ -73,6 +68,27 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
         }
     }
 
+    private static final AnnotationSpec SUPPRESS_WARNINGS = AnnotationSpec.builder(SuppressWarnings.class)
+        .addMember("value", "$S", "unused")
+        .addMember("value", "$S", "SpellCheckingInspection")
+        .build();
+    private static final AnnotationSpec GENERATED_FROM = AnnotationSpec.builder(GeneratedFrom.class)
+        .addMember("value", "$S", SharedConstants.getCurrentVersion().getName())
+        .build();
+    private static final String TYPE_JAVADOC = """
+        Vanilla keys for {@link $T#$L}.
+        
+        @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.
+        """;
+    private static final String FIELD_JAVADOC = """
+        {@code $L}
+        
+        @apiNote This field is version-dependant and may be removed in future Minecraft versions
+        """;
     private static final String CREATE_JAVADOC = """
         Creates a key for {@link $T} in a registry.
         
@@ -80,14 +96,17 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
         @return a new typed key
         """;
 
+    private final String keysClassName;
     private final Class<A> apiType;
+    private final String pkg;
     private final ResourceKey<? extends Registry<T>> registryKey;
     private final RegistryKey<A> apiRegistryKey;
     private final boolean publicCreateKeyMethod;
 
     public GeneratedKeyType(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.keysClassName = keysClassName;
         this.apiType = apiType;
+        this.pkg = pkg;
         this.registryKey = registryKey;
         this.apiRegistryKey = apiRegistryKey;
         this.publicCreateKeyMethod = publicCreateKeyMethod;
@@ -110,90 +129,77 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
     }
 
     private TypeSpec.Builder keyHolderType() {
-        return classBuilder(this.className)
+        return classBuilder(this.keysClassName)
             .addModifiers(PUBLIC, FINAL)
-            .addJavadoc(Javadocs.getVersionDependentClassHeader("{@link $T#$L}"), RegistryKey.class, REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey))
-            .addAnnotations(Annotations.CLASS_HEADER)
+            .addJavadoc(TYPE_JAVADOC, RegistryKey.class, REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey))
+            .addAnnotation(SUPPRESS_WARNINGS).addAnnotation(GENERATED_FROM)
             .addMethod(MethodSpec.constructorBuilder()
                 .addModifiers(PRIVATE)
                 .build()
             );
     }
 
-    @Override
-    protected TypeSpec getTypeSpec() {
+    protected TypeSpec createTypeSpec() {
         final TypeName typedKey = ParameterizedTypeName.get(TypedKey.class, this.apiType);
 
         final TypeSpec.Builder typeBuilder = this.keyHolderType();
+        typeBuilder.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO experimental API
         final MethodSpec.Builder createMethod = this.createMethod(typedKey);
 
         final Registry<T> registry = Main.REGISTRY_ACCESS.registryOrThrow(this.registryKey);
-        final Set<ResourceKey<T>> experimental = this.collectExperimentalKeys(registry);
+        final List<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()) {
-            final ResourceKey<T> key = reference.key();
+        for (final T value : registry) {
+            final ResourceKey<T> key = registry.getResourceKey(value).orElseThrow();
             final String keyPath = key.location().getPath();
-            final String fieldName = Formatting.formatKeyAsField(keyPath);
+            final String fieldName = keyPath.toUpperCase(Locale.ENGLISH).replaceAll("[.-/]", "_"); // replace invalid field name chars
             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());
+                .addJavadoc(FIELD_JAVADOC, key.location().toString());
             if (experimental.contains(key)) {
-                fieldBuilder.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.UPDATE_1_21));
+                fieldBuilder.addAnnotations(EXPERIMENTAL_ANNOTATIONS);
             } 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));
-        } else {
-            typeBuilder.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO experimental API
+            typeBuilder.addAnnotations(EXPERIMENTAL_ANNOTATIONS);
+            createMethod.addAnnotations(EXPERIMENTAL_ANNOTATIONS);
         }
         return typeBuilder.addMethod(createMethod.build()).build();
     }
 
-    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.asLookup().filterElements(v -> {
-            return ((FeatureElement) v).requiredFeatures().contains(FeatureFlags.UPDATE_1_21);
-        });
-        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();
-        }
-        final Set<ResourceKey<T>> experimental = Collections.newSetFromMap(new IdentityHashMap<>());
-        final CollectingContext<T> experimentalCollector = new CollectingContext<>(experimental, registry);
-        experimentalBootstrap.run(experimentalCollector);
-
-        final RegistrySetBuilder.@Nullable RegistryBootstrap<T> vanillaBootstrap = (RegistrySetBuilder.RegistryBootstrap<T>) VANILLA_REGISTRY_ENTRIES.get(this.registryKey);
-        if (vanillaBootstrap != null) {
-            final Set<ResourceKey<T>> vanilla = Collections.newSetFromMap(new IdentityHashMap<>());
-            final CollectingContext<T> vanillaCollector = new CollectingContext<>(vanilla, registry);
-            vanillaBootstrap.run(vanillaCollector);
-            return Sets.difference(experimental, vanilla);
+    private List<ResourceKey<T>> collectExperimentalKeys(final Registry<T> registry) {
+        final RegistrySetBuilder.@Nullable RegistryBootstrap<T> registryBootstrap = (RegistrySetBuilder.RegistryBootstrap<T>) EXPERIMENTAL_REGISTRY_ENTRIES.get(this.registryKey);
+        if (registryBootstrap == null) {
+            return Collections.emptyList();
         }
+        final List<ResourceKey<T>> experimental = new ArrayList<>();
+        final CollectingContext<T> context = new CollectingContext<>(experimental, registry);
+        registryBootstrap.run(context);
         return experimental;
     }
 
-    @Override
-    protected JavaFile.Builder file(final JavaFile.Builder builder) {
-        return builder
+    protected JavaFile createFile() {
+        return JavaFile.builder(this.pkg, this.createTypeSpec())
             .skipJavaLangImports(true)
             .addStaticImport(Key.class, "key")
-            .indent("    ");
+            .indent("    ")
+            .build();
+    }
+
+    @Override
+    public final String outputString() {
+        return this.createFile().toString();
+    }
+
+    @Override
+    public void writeToFile(final Path parent) throws IOException {
+        final Path pkgDir = parent.resolve(this.pkg.replace('.', '/'));
+        Files.createDirectories(pkgDir);
+        Files.writeString(pkgDir.resolve(this.keysClassName + ".java"), this.outputString(), StandardCharsets.UTF_8);
     }
 }

paper-api-generator/src/main/java/io/papermc/generator/types/SimpleGenerator.java

@@ -1,35 +0,0 @@
-package io.papermc.generator.types;
-
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.TypeSpec;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-
-public abstract class SimpleGenerator implements SourceGenerator {
-
-    protected final String className;
-    protected final String packageName;
-
-    protected SimpleGenerator(String className, String packageName) {
-        this.className = className;
-        this.packageName = packageName;
-    }
-
-    protected abstract TypeSpec getTypeSpec();
-
-    protected abstract JavaFile.Builder file(JavaFile.Builder builder);
-
-    @Override
-    public void writeToFile(Path parent) throws IOException {
-
-        JavaFile.Builder builder = JavaFile.builder(this.packageName, this.getTypeSpec());
-        this.file(builder)
-            .indent("    ")
-            .skipJavaLangImports(true);
-
-        builder.build().writeTo(parent, StandardCharsets.UTF_8);
-    }
-
-}

paper-api-generator/src/main/java/io/papermc/generator/types/SourceGenerator.java

@@ -5,5 +5,7 @@ import java.nio.file.Path;
 
 public interface SourceGenerator {
 
+    String outputString();
+
     void writeToFile(Path parent) throws IOException;
 }

paper-api-generator/src/main/java/io/papermc/generator/types/goal/MobGoalGenerator.java

@@ -1,253 +0,0 @@
-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;
-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 com.squareup.javapoet.TypeVariableName;
-import io.github.classgraph.ClassGraph;
-import io.github.classgraph.ScanResult;
-import io.papermc.generator.types.SimpleGenerator;
-import io.papermc.generator.utils.Annotations;
-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;
-
-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;
-
-@DefaultQualifier(NonNull.class)
-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);
-    }
-
-    @Override
-    protected TypeSpec getTypeSpec() {
-        TypeVariableName type = TypeVariableName.get("T", Mob.class);
-        TypeSpec.Builder typeBuilder = TypeSpec.interfaceBuilder(this.className)
-            .addSuperinterface(ParameterizedTypeName.get(ClassName.get(com.destroystokyo.paper.entity.ai.Goal.class), type))
-            .addModifiers(PUBLIC)
-            .addTypeVariable(type)
-            .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);
-
-        ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
-        ParameterSpec typeParam = ParameterSpec.builder(mobType, "type", FINAL).build();
-        MethodSpec.Builder createMethod = MethodSpec.methodBuilder("create")
-            .addModifiers(PRIVATE, STATIC)
-            .addParameter(keyParam)
-            .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));
-
-        List<Class<Goal>> classes;
-        try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages("net.minecraft").scan()) {
-            classes = scanResult.getSubclasses(Goal.class.getName()).loadClasses(Goal.class);
-        }
-
-        List<GoalKey<Mob>> vanillaNames = classes.stream()
-            .filter(clazz -> !java.lang.reflect.Modifier.isAbstract(clazz.getModifiers()))
-            .filter(clazz -> !WrappedGoal.class.equals(clazz)) // TODO - properly fix
-            .map(goalClass -> MobGoalNames.getKey(goalClass.getName(), goalClass))
-            .filter((key) -> !MobGoalNames.isIgnored(key.getNamespacedKey().getKey()))
-            .sorted(Comparator.<GoalKey<?>, String>comparing(o -> o.getEntityClass().getSimpleName())
-                .thenComparing(vanillaGoalKey -> vanillaGoalKey.getNamespacedKey().getKey())
-            )
-            .toList();
-
-
-        for (final GoalKey<?> goalKey : vanillaNames) {
-            TypeName typedKey = ParameterizedTypeName.get(GoalKey.class, goalKey.getEntityClass());
-            NamespacedKey key = goalKey.getNamespacedKey();
-
-            String keyPath = key.getKey();
-            String fieldName = Formatting.formatKeyAsField(keyPath);
-            FieldSpec.Builder fieldBuilder = FieldSpec.builder(typedKey, fieldName, PUBLIC, STATIC, FINAL)
-                .initializer("$N($S, $T.class)", createMethod.build(), keyPath, goalKey.getEntityClass());
-            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);
-    }
-
-    record DeprecatedEntry(Class<?> entity, String entryName, @Nullable String removalVersion,
-                           @Nullable String removedVersion) {
-
-    }
-
-}

paper-api-generator/src/main/java/io/papermc/generator/types/goal/MobGoalNames.java

@@ -1,333 +0,0 @@
-package io.papermc.generator.types.goal;
-
-import com.destroystokyo.paper.entity.RangedEntity;
-import com.destroystokyo.paper.entity.ai.GoalKey;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import net.minecraft.world.entity.FlyingMob;
-import net.minecraft.world.entity.PathfinderMob;
-import net.minecraft.world.entity.TamableAnimal;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.entity.ambient.AmbientCreature;
-import net.minecraft.world.entity.animal.AbstractFish;
-import net.minecraft.world.entity.animal.AbstractGolem;
-import net.minecraft.world.entity.animal.AbstractSchoolingFish;
-import net.minecraft.world.entity.animal.Animal;
-import net.minecraft.world.entity.animal.Pufferfish;
-import net.minecraft.world.entity.animal.ShoulderRidingEntity;
-import net.minecraft.world.entity.animal.SnowGolem;
-import net.minecraft.world.entity.animal.WaterAnimal;
-import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
-import net.minecraft.world.entity.boss.wither.WitherBoss;
-import net.minecraft.world.entity.monster.AbstractIllager;
-import net.minecraft.world.entity.monster.EnderMan;
-import net.minecraft.world.entity.monster.PatrollingMonster;
-import net.minecraft.world.entity.monster.RangedAttackMob;
-import net.minecraft.world.entity.monster.SpellcasterIllager;
-import net.minecraft.world.entity.monster.ZombifiedPiglin;
-import net.minecraft.world.entity.monster.piglin.AbstractPiglin;
-import org.bukkit.NamespacedKey;
-import org.bukkit.entity.AbstractHorse;
-import org.bukkit.entity.AbstractSkeleton;
-import org.bukkit.entity.AbstractVillager;
-import org.bukkit.entity.Ageable;
-import org.bukkit.entity.Ambient;
-import org.bukkit.entity.Animals;
-import org.bukkit.entity.Bat;
-import org.bukkit.entity.Bee;
-import org.bukkit.entity.Blaze;
-import org.bukkit.entity.Cat;
-import org.bukkit.entity.CaveSpider;
-import org.bukkit.entity.ChestedHorse;
-import org.bukkit.entity.Chicken;
-import org.bukkit.entity.Cod;
-import org.bukkit.entity.Cow;
-import org.bukkit.entity.Creature;
-import org.bukkit.entity.Creeper;
-import org.bukkit.entity.Dolphin;
-import org.bukkit.entity.Donkey;
-import org.bukkit.entity.Drowned;
-import org.bukkit.entity.ElderGuardian;
-import org.bukkit.entity.EnderDragon;
-import org.bukkit.entity.Enderman;
-import org.bukkit.entity.Endermite;
-import org.bukkit.entity.Evoker;
-import org.bukkit.entity.Fish;
-import org.bukkit.entity.Flying;
-import org.bukkit.entity.Fox;
-import org.bukkit.entity.Ghast;
-import org.bukkit.entity.Giant;
-import org.bukkit.entity.Golem;
-import org.bukkit.entity.Guardian;
-import org.bukkit.entity.Hoglin;
-import org.bukkit.entity.Horse;
-import org.bukkit.entity.Husk;
-import org.bukkit.entity.Illager;
-import org.bukkit.entity.Illusioner;
-import org.bukkit.entity.IronGolem;
-import org.bukkit.entity.Llama;
-import org.bukkit.entity.MagmaCube;
-import org.bukkit.entity.Mob;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.Mule;
-import org.bukkit.entity.MushroomCow;
-import org.bukkit.entity.Ocelot;
-import org.bukkit.entity.Panda;
-import org.bukkit.entity.Parrot;
-import org.bukkit.entity.Phantom;
-import org.bukkit.entity.Pig;
-import org.bukkit.entity.PigZombie;
-import org.bukkit.entity.Piglin;
-import org.bukkit.entity.PiglinAbstract;
-import org.bukkit.entity.PiglinBrute;
-import org.bukkit.entity.Pillager;
-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.Salmon;
-import org.bukkit.entity.Sheep;
-import org.bukkit.entity.Shulker;
-import org.bukkit.entity.Silverfish;
-import org.bukkit.entity.Skeleton;
-import org.bukkit.entity.SkeletonHorse;
-import org.bukkit.entity.Slime;
-import org.bukkit.entity.Snowman;
-import org.bukkit.entity.Spellcaster;
-import org.bukkit.entity.Spider;
-import org.bukkit.entity.Squid;
-import org.bukkit.entity.Stray;
-import org.bukkit.entity.Strider;
-import org.bukkit.entity.Tameable;
-import org.bukkit.entity.TraderLlama;
-import org.bukkit.entity.TropicalFish;
-import org.bukkit.entity.Turtle;
-import org.bukkit.entity.Vex;
-import org.bukkit.entity.Villager;
-import org.bukkit.entity.Vindicator;
-import org.bukkit.entity.WanderingTrader;
-import org.bukkit.entity.WaterMob;
-import org.bukkit.entity.Witch;
-import org.bukkit.entity.Wither;
-import org.bukkit.entity.WitherSkeleton;
-import org.bukkit.entity.Wolf;
-import org.bukkit.entity.Zoglin;
-import org.bukkit.entity.Zombie;
-import org.bukkit.entity.ZombieHorse;
-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;
-
-public class MobGoalNames {
-
-    private static final Map<Class<? extends Goal>, Class<? extends Mob>> entityClassCache = new HashMap<>();
-    public static final Map<Class<? extends net.minecraft.world.entity.Mob>, Class<? extends Mob>> bukkitMap = new HashMap<>();
-
-
-    static {
-        //<editor-fold defaultstate="collapsed" desc="bukkitMap Entities">
-        bukkitMap.put(net.minecraft.world.entity.Mob.class, Mob.class);
-        bukkitMap.put(net.minecraft.world.entity.AgeableMob.class, Ageable.class);
-        bukkitMap.put(AmbientCreature.class, Ambient.class);
-        bukkitMap.put(Animal.class, Animals.class);
-        bukkitMap.put(net.minecraft.world.entity.ambient.Bat.class, Bat.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Bee.class, Bee.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Blaze.class, Blaze.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Cat.class, Cat.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.CaveSpider.class, CaveSpider.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Chicken.class, Chicken.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Cod.class, Cod.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Cow.class, Cow.class);
-        bukkitMap.put(PathfinderMob.class, Creature.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Creeper.class, Creeper.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Dolphin.class, Dolphin.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Drowned.class, Drowned.class);
-        bukkitMap.put(net.minecraft.world.entity.boss.enderdragon.EnderDragon.class, EnderDragon.class);
-        bukkitMap.put(EnderMan.class, Enderman.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Endermite.class, Endermite.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Evoker.class, Evoker.class);
-        bukkitMap.put(AbstractFish.class, Fish.class);
-        bukkitMap.put(AbstractSchoolingFish.class, io.papermc.paper.entity.SchoolableFish.class);
-        bukkitMap.put(FlyingMob.class, Flying.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Fox.class, Fox.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Ghast.class, Ghast.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Giant.class, Giant.class);
-        bukkitMap.put(AbstractGolem.class, Golem.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Guardian.class, Guardian.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.ElderGuardian.class, ElderGuardian.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.horse.Horse.class, Horse.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.horse.AbstractHorse.class, AbstractHorse.class);
-        bukkitMap.put(AbstractChestedHorse.class, ChestedHorse.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.horse.Donkey.class, Donkey.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.horse.Mule.class, Mule.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.horse.SkeletonHorse.class, SkeletonHorse.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.horse.ZombieHorse.class, ZombieHorse.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.camel.Camel.class, org.bukkit.entity.Camel.class);
-        bukkitMap.put(AbstractIllager.class, Illager.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Illusioner.class, Illusioner.class);
-        bukkitMap.put(SpellcasterIllager.class, Spellcaster.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.IronGolem.class, IronGolem.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.horse.Llama.class, Llama.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.horse.TraderLlama.class, TraderLlama.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.MagmaCube.class, MagmaCube.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Monster.class, Monster.class);
-        bukkitMap.put(PatrollingMonster.class, Raider.class); // close enough
-        bukkitMap.put(net.minecraft.world.entity.animal.MushroomCow.class, MushroomCow.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Ocelot.class, Ocelot.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Panda.class, Panda.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Parrot.class, Parrot.class);
-        bukkitMap.put(ShoulderRidingEntity.class, Parrot.class); // close enough
-        bukkitMap.put(net.minecraft.world.entity.monster.Phantom.class, Phantom.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Pig.class, Pig.class);
-        bukkitMap.put(ZombifiedPiglin.class, PigZombie.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Pillager.class, Pillager.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.PolarBear.class, PolarBear.class);
-        bukkitMap.put(Pufferfish.class, PufferFish.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Rabbit.class, Rabbit.class);
-        bukkitMap.put(net.minecraft.world.entity.raid.Raider.class, Raider.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Ravager.class, Ravager.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Salmon.class, Salmon.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Sheep.class, Sheep.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Shulker.class, Shulker.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Silverfish.class, Silverfish.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Skeleton.class, Skeleton.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.AbstractSkeleton.class, AbstractSkeleton.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Stray.class, Stray.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.WitherSkeleton.class, WitherSkeleton.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Slime.class, Slime.class);
-        bukkitMap.put(SnowGolem.class, Snowman.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Spider.class, Spider.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Squid.class, Squid.class);
-        bukkitMap.put(TamableAnimal.class, Tameable.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.TropicalFish.class, TropicalFish.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Turtle.class, Turtle.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Vex.class, Vex.class);
-        bukkitMap.put(net.minecraft.world.entity.npc.Villager.class, Villager.class);
-        bukkitMap.put(net.minecraft.world.entity.npc.AbstractVillager.class, AbstractVillager.class);
-        bukkitMap.put(net.minecraft.world.entity.npc.WanderingTrader.class, WanderingTrader.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Vindicator.class, Vindicator.class);
-        bukkitMap.put(WaterAnimal.class, WaterMob.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Witch.class, Witch.class);
-        bukkitMap.put(WitherBoss.class, Wither.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.Wolf.class, Wolf.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Zombie.class, Zombie.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Husk.class, Husk.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.ZombieVillager.class, ZombieVillager.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.hoglin.Hoglin.class, Hoglin.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.piglin.Piglin.class, Piglin.class);
-        bukkitMap.put(AbstractPiglin.class, PiglinAbstract.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.piglin.PiglinBrute.class, PiglinBrute.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Strider.class, Strider.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.Zoglin.class, Zoglin.class);
-        bukkitMap.put(net.minecraft.world.entity.GlowSquid.class, org.bukkit.entity.GlowSquid.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.axolotl.Axolotl.class, org.bukkit.entity.Axolotl.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.goat.Goat.class, org.bukkit.entity.Goat.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.frog.Frog.class, org.bukkit.entity.Frog.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.frog.Tadpole.class, org.bukkit.entity.Tadpole.class);
-        bukkitMap.put(net.minecraft.world.entity.monster.warden.Warden.class, org.bukkit.entity.Warden.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.allay.Allay.class, org.bukkit.entity.Allay.class);
-        bukkitMap.put(net.minecraft.world.entity.animal.sniffer.Sniffer.class, org.bukkit.entity.Sniffer.class);
-        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);
-        //</editor-fold>
-    }
-
-    private static final BiMap<String, String> deobfuscationMap = HashBiMap.create();
-    static final Set<String> ignored = new HashSet<>();
-
-    static {
-        deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee");
-
-        ignored.add("goal_selector_1");
-        ignored.add("goal_selector_2");
-        ignored.add("selector_1");
-        ignored.add("selector_2");
-        ignored.add("wrapped");
-    }
-
-    public static String getUsableName(String name) {
-        final String original = name;
-        name = name.substring(name.lastIndexOf(".") + 1);
-        boolean flag = false;
-        // inner classes
-        if (name.contains("$")) {
-            String cut = name.substring(name.indexOf("$") + 1);
-            if (cut.length() <= 2) {
-                name = name.replace("Entity", "");
-                name = name.replace("$", "_");
-                flag = true;
-            } else {
-                // mapped, wooo
-                name = cut;
-            }
-        }
-        name = name.replace("PathfinderGoal", "");
-        name = name.replace("TargetGoal", "");
-        name = name.replace("Goal", "");
-        StringBuilder sb = new StringBuilder();
-        for (char c : name.toCharArray()) {
-            if (c >= 'A' && c <= 'Z') {
-                sb.append("_");
-                sb.append(Character.toLowerCase(c));
-            } else {
-                sb.append(c);
-            }
-        }
-        name = sb.toString();
-        name = name.replaceFirst("_", "");
-
-        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?
-        return deobfuscationMap.getOrDefault(name, name);
-    }
-
-    public static boolean isIgnored(String name) {
-        return ignored.contains(name);
-    }
-
-
-    public static <T extends Mob> GoalKey<T> getKey(String clazzName, Class<? extends Goal> goalClass) {
-        String name = getUsableName(clazzName);
-        if (MobGoalNames.isIgnored(name)) {
-            //noinspection unchecked
-            return (GoalKey<T>) GoalKey.of(Mob.class, NamespacedKey.minecraft(name));
-        }
-        return GoalKey.of(getEntity(goalClass), NamespacedKey.minecraft(name));
-    }
-
-    public static <T extends Mob> Class<T> getEntity(Class<? extends Goal> goalClass) {
-        //noinspection unchecked
-        return (Class<T>) entityClassCache.computeIfAbsent(goalClass, key -> {
-            for (Constructor<?> ctor : key.getDeclaredConstructors()) {
-                for (int i = 0; i < ctor.getParameterCount(); i++) {
-                    Class<?> param = ctor.getParameterTypes()[i];
-                    if (net.minecraft.world.entity.Mob.class.isAssignableFrom(param)) {
-                        //noinspection unchecked
-                        return toBukkitClass((Class<? extends net.minecraft.world.entity.Mob>) param);
-                    } else if (RangedAttackMob.class.isAssignableFrom(param)) {
-                        return RangedEntity.class;
-                    }
-                }
-            }
-            throw new RuntimeException("Can't figure out applicable entity for mob goal " + goalClass); // maybe just return EntityInsentient?
-        });
-    }
-
-    public static Class<? extends Mob> toBukkitClass(Class<? extends net.minecraft.world.entity.Mob> nmsClass) {
-        Class<? extends Mob> bukkitClass = bukkitMap.get(nmsClass);
-        if (bukkitClass == null) {
-            throw new RuntimeException("Can't figure out applicable bukkit entity for nms entity " + nmsClass); // maybe just return Mob?
-        }
-        return bukkitClass;
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/utils/Annotations.java

@@ -1,59 +0,0 @@
-package io.papermc.generator.utils;
-
-import com.squareup.javapoet.AnnotationSpec;
-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;
-
-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)
-                .addMember("value", "$T.$L", MinecraftExperimental.Requires.class, requiredFeatureFlag.name())
-                .build()
-        );
-    }
-
-    public static AnnotationSpec deprecatedVersioned(final @Nullable String version, boolean forRemoval) {
-        AnnotationSpec.Builder annotationSpec = AnnotationSpec.builder(Deprecated.class);
-        if (forRemoval) {
-            annotationSpec.addMember("forRemoval", "$L", forRemoval);
-        }
-        if (version != null) {
-            annotationSpec.addMember("since", "$S", version);
-        }
-
-        return annotationSpec.build();
-    }
-
-    public static AnnotationSpec scheduledRemoval(final @Nullable String version) {
-        return AnnotationSpec.builder(ApiStatus.ScheduledForRemoval.class)
-            .addMember("inVersion", "$S", version)
-            .build();
-    }
-
-    @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();
-    private static final AnnotationSpec SUPPRESS_WARNINGS = AnnotationSpec.builder(SuppressWarnings.class)
-        .addMember("value", "$S", "unused")
-        .addMember("value", "$S", "SpellCheckingInspection")
-        .build();
-    private static final AnnotationSpec GENERATED_FROM = AnnotationSpec.builder(GeneratedFrom.class)
-        .addMember("value", "$S", SharedConstants.getCurrentVersion().getName())
-        .build();
-    public static final Iterable<AnnotationSpec> CLASS_HEADER = List.of(
-        SUPPRESS_WARNINGS,
-        GENERATED_FROM
-    );
-
-    private Annotations() {
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/utils/CollectingContext.java

@@ -3,18 +3,17 @@ 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;
 import net.minecraft.core.Registry;
-import net.minecraft.data.worldgen.BootstrapContext;
+import net.minecraft.data.worldgen.BootstapContext;
 import net.minecraft.resources.ResourceKey;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;
 
 @DefaultQualifier(NonNull.class)
-public record CollectingContext<T>(Set<ResourceKey<T>> registered,
-                                   Registry<T> registry) implements BootstrapContext<T> {
+public record CollectingContext<T>(List<ResourceKey<T>> registered,
+                                   Registry<T> registry) implements BootstapContext<T> {
 
     @Override
     public Holder.Reference<T> register(final ResourceKey<T> resourceKey, final @NonNull T t, final Lifecycle lifecycle) {

paper-api-generator/src/main/java/io/papermc/generator/utils/Formatting.java

@@ -1,49 +0,0 @@
-package io.papermc.generator.utils;
-
-import org.apache.commons.lang3.math.NumberUtils;
-import java.util.Comparator;
-import java.util.Locale;
-import java.util.OptionalInt;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-
-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.ROOT)).replaceAll("_");
-    }
-
-    public static Comparator<String> ALPHABETIC_KEY_ORDER = alphabeticKeyOrder(path -> path);
-
-    public static <T> Comparator<T> alphabeticKeyOrder(Function<T, String> mapper) {
-        return (o1, o2) -> {
-            String path1 = mapper.apply(o1);
-            String path2 = mapper.apply(o2);
-
-            OptionalInt trailingInt1 = tryParseTrailingInt(path1);
-            OptionalInt trailingInt2 = tryParseTrailingInt(path2);
-
-            if (trailingInt1.isPresent() && trailingInt2.isPresent()) {
-                return Integer.compare(trailingInt1.getAsInt(), trailingInt2.getAsInt());
-            }
-
-            return path1.compareTo(path2);
-        };
-    }
-
-    private static OptionalInt tryParseTrailingInt(String path) {
-        int delimiterIndex = path.lastIndexOf('_');
-        if (delimiterIndex != -1) {
-            String score = path.substring(delimiterIndex + 1);
-            if (NumberUtils.isDigits(score)) {
-                return OptionalInt.of(Integer.parseInt(score));
-            }
-        }
-        return OptionalInt.empty();
-    }
-
-    private Formatting() {
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/utils/Javadocs.java

@@ -1,27 +0,0 @@
-package io.papermc.generator.utils;
-
-public final class Javadocs {
-
-    public static String getVersionDependentClassHeader(String headerIdentifier) {
-        return """
-        Vanilla keys for %s.
-        
-        @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.
-        """.formatted(headerIdentifier);
-    }
-
-    public static String getVersionDependentField(String headerIdentifier) {
-        return """
-        %s
-        
-        @apiNote This field is version-dependant and may be removed in future Minecraft versions
-        """.formatted(headerIdentifier);
-    }
-
-    private Javadocs() {
-    }
-}

paper-api-generator/src/test/java/io/papermc/generator/MobGoalConverterTest.java

@@ -1,37 +0,0 @@
-package io.papermc.generator;
-
-import io.github.classgraph.ClassGraph;
-import io.github.classgraph.ScanResult;
-import io.papermc.generator.types.goal.MobGoalNames;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.Mob;
-import org.junit.jupiter.api.Test;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.fail;
-
-public class MobGoalConverterTest {
-
-    @Test
-    public void testBukkitMap() {
-        final List<Class<Mob>> classes;
-        try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages(Entity.class.getPackageName()).scan()) {
-            classes = scanResult.getSubclasses(Mob.class.getName()).loadClasses(Mob.class);
-        }
-
-        assertFalse(classes.isEmpty(), "There are supposed to be more than 0 mob classes!");
-
-        List<String> missingClasses = new ArrayList<>();
-        for (Class<Mob> nmsClass : classes) {
-            if (!MobGoalNames.bukkitMap.containsKey(nmsClass)) {
-                missingClasses.add(nmsClass.getCanonicalName());
-            }
-        }
-
-        if (!missingClasses.isEmpty()) {
-            fail("Missing some entity classes in the bukkit map: " + String.join(", ", missingClasses));
-        }
-    }
-}

paper-api-generator/wideners.at

@@ -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;
+accessWidener	v1	named
+accessible method 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
+accessible field net/minecraft/core/RegistrySetBuilder entries Ljava/util/List;
+accessible class net/minecraft/core/RegistrySetBuilder$RegistryStub

patches/api/0001-Convert-project-to-Gradle.patch

@@ -8,7 +8,7 @@ apply if there are changes made to it from upstream - thus notifying us
 that changes were made.
 
 diff --git a/.gitignore b/.gitignore
-index 5dd700a956e915c00b25d91dea8d6f285ddab72b..97e78e27ee0eea2c8b24886eeb19164d552323fe 100644
+index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff61819431e6a5e65 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -1,3 +1,5 @@
@@ -17,7 +17,7 @@ index 5dd700a956e915c00b25d91dea8d6f285ddab72b..97e78e27ee0eea2c8b24886eeb19164d
  # Eclipse stuff
  /.classpath
  /.project
-@@ -32,3 +34,7 @@
+@@ -31,3 +33,7 @@
  *.ipr
  *.iws
  .idea/
@@ -27,7 +27,7 @@ index 5dd700a956e915c00b25d91dea8d6f285ddab72b..97e78e27ee0eea2c8b24886eeb19164d
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c46b0b620e
+index 0000000000000000000000000000000000000000..41e77b687df6480adf8f5e21daad105dab208df2
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,91 @@
@@ -41,8 +41,8 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4
 +    withJavadocJar()
 +}
 +
-+val annotationsVersion = "24.1.0"
-+val bungeeCordChatVersion = "1.20-R0.2"
++val annotationsVersion = "24.0.1"
++val bungeeCordChatVersion = "1.20-R0.1"
 +
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
@@ -52,19 +52,19 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4
 +    api("org.yaml:snakeyaml:2.2")
 +    api("org.joml:joml:1.10.5")
 +
-+    compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
++    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
++    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
++    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 +
 +    val annotations = "org.jetbrains:annotations-java5:$annotationsVersion"
 +    compileOnly(annotations)
 +    testCompileOnly(annotations)
 +
 +    testImplementation("org.apache.commons:commons-lang3:3.12.0")
-+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
++    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
 +    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.5.0")
++    testImplementation("org.ow2.asm:asm-tree:9.5")
 +}
 +
 +configure<PublishingExtension> {
@@ -124,10 +124,10 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index bea9ac450de7ec05f9752d253743e95d79c1cd14..0000000000000000000000000000000000000000
+index a464312b63bb62d196d6ec2d55ffcdc85ae4da67..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,267 +0,0 @@
+@@ -1,278 +0,0 @@
 -
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -135,7 +135,7 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.20.6-R0.1-SNAPSHOT</version>
+-    <version>1.20.2-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -144,7 +144,8 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -
 -    <properties>
 -        <skipTests>true</skipTests>
--        <maven.compiler.release>17</maven.compiler.release>
+-        <maven.compiler.source>1.8</maven.compiler.source>
+-        <maven.compiler.target>1.8</maven.compiler.target>
 -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -    </properties>
 -
@@ -184,7 +185,7 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>net.md-5</groupId>
 -            <artifactId>bungeecord-chat</artifactId>
--            <version>1.20-R0.2</version>
+-            <version>1.20-R0.1</version>
 -            <type>jar</type>
 -            <scope>compile</scope>
 -        </dependency>
@@ -198,33 +199,33 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.maven</groupId>
 -            <artifactId>maven-resolver-provider</artifactId>
--            <version>3.9.6</version>
+-            <version>3.8.5</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.9.18</version>
+-            <version>1.7.3</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.9.18</version>
+-            <version>1.7.3</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- annotations -->
 -        <dependency>
 -            <groupId>org.jetbrains</groupId>
 -            <artifactId>annotations-java5</artifactId>
--            <version>24.1.0</version>
+-            <version>24.0.1</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- testing -->
 -        <dependency>
 -            <groupId>org.junit.jupiter</groupId>
 -            <artifactId>junit-jupiter</artifactId>
--            <version>5.10.2</version>
+-            <version>5.10.0</version>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
@@ -236,13 +237,13 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.mockito</groupId>
 -            <artifactId>mockito-core</artifactId>
--            <version>5.11.0</version>
+-            <version>5.5.0</version>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.ow2.asm</groupId>
 -            <artifactId>asm-tree</artifactId>
--            <version>9.7</version>
+-            <version>9.5</version>
 -            <scope>test</scope>
 -        </dependency>
 -    </dependencies>
@@ -265,16 +266,25 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-compiler-plugin</artifactId>
--                <version>3.13.0</version>
+-                <version>3.11.0</version>
 -                <configuration>
+-                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
+-                    <compilerId>eclipse</compilerId>
 -                    <!-- default changed with version 3.11.0 -->
 -                    <showWarnings>false</showWarnings>
 -                </configuration>
+-                <dependencies>
+-                    <dependency>
+-                        <groupId>org.codehaus.plexus</groupId>
+-                        <artifactId>plexus-compiler-eclipse</artifactId>
+-                        <version>2.13.0</version>
+-                    </dependency>
+-                </dependencies>
 -            </plugin>
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-jar-plugin</artifactId>
--                <version>3.4.1</version>
+-                <version>3.3.0</version>
 -                <configuration>
 -                    <archive>
 -                        <manifest>
@@ -289,7 +299,7 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-shade-plugin</artifactId>
--                <version>3.5.3</version>
+-                <version>3.5.0</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
@@ -316,10 +326,10 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-javadoc-plugin</artifactId>
--                <version>3.6.3</version>
+-                <version>3.5.0</version>
 -                <configuration>
 -                    <links>
--                        <link>https://guava.dev/releases/32.1.2-jre/api/docs/</link>
+-                        <link>https://guava.dev/releases/31.1-jre/api/docs/</link>
 -                    </links>
 -                    <tags>
 -                        <tag>
@@ -333,7 +343,7 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-surefire-plugin</artifactId>
--                <version>3.2.5</version>
+-                <version>3.1.0</version>
 -            </plugin>
 -        </plugins>
 -    </build>
@@ -349,7 +359,7 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -                    <plugin>
 -                        <groupId>org.apache.maven.plugins</groupId>
 -                        <artifactId>maven-checkstyle-plugin</artifactId>
--                        <version>3.3.1</version>
+-                        <version>3.3.0</version>
 -                        <executions>
 -                            <execution>
 -                                <phase>process-classes</phase>
@@ -360,6 +370,7 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000
 -                        </executions>
 -                        <configuration>
 -                            <configLocation>checkstyle.xml</configLocation>
+-                            <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
 -                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
 -                        </configuration>
 -                        <dependencies>

patches/api/0002-Build-system-changes.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6271e2bad0ed937c2c46a8c8fdf186c46b0b620e..a918fd14c95e714e935758d60bccd72755e00b11 100644
+index 41e77b687df6480adf8f5e21daad105dab208df2..d86ee6acb78d249424c5df98a851178c0f62eec1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -18,15 +18,26 @@ dependencies {
+@@ -18,15 +18,27 @@ dependencies {
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
      api("org.yaml:snakeyaml:2.2")
      api("org.joml:joml:1.10.5")
@@ -18,9 +18,10 @@ index 6271e2bad0ed937c2c46a8c8fdf186c46b0b620e..a918fd14c95e714e935758d60bccd727
 +    }
 +    // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
++    compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
  
 -    val annotations = "org.jetbrains:annotations-java5:$annotationsVersion"
 +    val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
@@ -28,15 +29,15 @@ index 6271e2bad0ed937c2c46a8c8fdf186c46b0b620e..a918fd14c95e714e935758d60bccd727
      testCompileOnly(annotations)
  
 +    // Paper start - add checker
-+    val checkerQual = "org.checkerframework:checker-qual:3.33.0"
++    val checkerQual = "org.checkerframework:checker-qual:3.21.0"
 +    compileOnlyApi(checkerQual)
 +    testCompileOnly(checkerQual)
 +    // Paper end
 +
      testImplementation("org.apache.commons:commons-lang3:3.12.0")
-     testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
+     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
      testImplementation("org.hamcrest:hamcrest:2.2")
-@@ -69,8 +80,12 @@ tasks.withType<Javadoc> {
+@@ -69,8 +81,12 @@ tasks.withType<Javadoc> {
      options.links(
          "https://guava.dev/releases/32.1.2-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
@@ -50,7 +51,7 @@ index 6271e2bad0ed937c2c46a8c8fdf186c46b0b620e..a918fd14c95e714e935758d60bccd727
      )
      options.tags("apiNote:a:API Note:")
  
-@@ -89,3 +104,14 @@ tasks.withType<Javadoc> {
+@@ -89,3 +105,14 @@ tasks.withType<Javadoc> {
  tasks.test {
      useJUnitPlatform()
  }

patches/api/0003-Test-changes.patch

@@ -12,10 +12,10 @@ Co-authored-by: Riley Park <rileysebastianpark@gmail.com>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a918fd14c95e714e935758d60bccd72755e00b11..768024b2b4584fd7dd86f068c0e79c89ffc5faa1 100644
+index d86ee6acb78d249424c5df98a851178c0f62eec1..75bfb0ab8049ebbb52240abf661d469de5526767 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -105,6 +105,12 @@ tasks.test {
+@@ -106,6 +106,12 @@ tasks.test {
      useJUnitPlatform()
  }
  
@@ -66,7 +66,7 @@ index 0000000000000000000000000000000000000000..77154095cfb8b259bdb318e8ff40cb6f
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 64e7aef6220097edefdff3b98a771b988365930d..a899f63eb2ce58b3cf708e91819cbbdeffda5d9f 100644
+index 64e7aef6220097edefdff3b98a771b988365930d..abadff47166722fdc756afdbc6ac7242b6bd4fb0 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -29,7 +29,13 @@ public class AnnotationTest {
@@ -132,8 +132,8 @@ index 64e7aef6220097edefdff3b98a771b988365930d..a899f63eb2ce58b3cf708e91819cbbde
                  for (int i = 0; i < paramTypes.length; i++) {
                      if (mustBeAnnotated(paramTypes[i]) ^ isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) {
 +                        // Paper start
-+                        if (method.invisibleTypeAnnotations != null || method.visibleTypeAnnotations != null) {
-+                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : java.util.Objects.requireNonNullElse(method.invisibleTypeAnnotations, method.visibleTypeAnnotations)) {
++                        if (method.invisibleTypeAnnotations != null) {
++                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
 +                                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;
@@ -233,10 +233,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 5709d52ed4ac4ce8dd8b0569281279f7305c5fb9..a47ee3ce660ec4467b5ed6a4b41fb2d19179a189 100644
+index 79173d6ed844f1e640e3aa745a9b560ec5e6a2bc..73ec679ac0d1f398b417bd174b47f9af93351e27 100644
 --- a/src/test/java/org/bukkit/support/TestServer.java
 +++ b/src/test/java/org/bukkit/support/TestServer.java
-@@ -72,6 +72,11 @@ public final class TestServer {
+@@ -61,6 +61,11 @@ public final class TestServer {
          UnsafeValues unsafeValues = mock(withSettings().stubOnly());
          when(instance.getUnsafe()).thenReturn(unsafeValues);
  

patches/api/0004-Code-Generation.patch

@@ -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 75bfb0ab8049ebbb52240abf661d469de5526767..87e4ee95a8da287b02c13fac5f24f66902bc84c9 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")
+@@ -46,6 +47,22 @@ dependencies {
+     testImplementation("org.ow2.asm:asm-tree:9.5")
  }
  
 +// Paper start
@@ -41,7 +41,7 @@ index 768024b2b4584fd7dd86f068c0e79c89ffc5faa1..f11a22ab01e97e51619c96f2d8a78a99
  configure<PublishingExtension> {
      publications.create<MavenPublication>("maven") {
          from(components["java"])
-@@ -121,3 +138,14 @@ tasks.check {
+@@ -122,3 +139,14 @@ tasks.check {
      dependsOn(scanJar)
  }
  // Paper end
@@ -85,39 +85,18 @@ 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..7b79bf33074355020e0b3b5ef40c7f2e6ba644b4
+index 0000000000000000000000000000000000000000..5251f922d2d14da35f61098c11694371f591cd2a
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/RegistryKey.java
-@@ -0,0 +1,141 @@
+@@ -0,0 +1,61 @@
 +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.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.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 static io.papermc.paper.registry.RegistryKeyImpl.create;
@@ -135,6 +114,7 @@ index 0000000000000000000000000000000000000000..7b79bf33074355020e0b3b5ef40c7f2e
 + * @param <T> the value type
 + */
 +@SuppressWarnings("unused")
++@ApiStatus.Experimental
 +public sealed interface RegistryKey<T> extends Keyed permits RegistryKeyImpl {
 +
 +    /* ******************* *
@@ -150,92 +130,32 @@ index 0000000000000000000000000000000000000000..7b79bf33074355020e0b3b5ef40c7f2e
 +     * @see io.papermc.paper.registry.keys.StructureTypeKeys
 +     */
 +    RegistryKey<StructureType> STRUCTURE_TYPE = create("worldgen/structure_type");
-+    /**
-+     * Built-in registry for instruments.
-+     * @see io.papermc.paper.registry.keys.InstrumentKeys
-+     */
-+    RegistryKey<MusicInstrument> INSTRUMENT = create("instrument");
-+    /**
-+     * Built-in registry for enchantments.
-+     * @see io.papermc.paper.registry.keys.EnchantmentKeys
-+     */
-+    RegistryKey<Enchantment> ENCHANTMENT = create("enchantment");
-+    /**
-+     * 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");
-+
 +
 +    /* ********************** *
 +     * Data-driven Registries *
 +     * ********************** */
 +    /**
-+     * Data-driven registry for biomes.
++     * Data-driven registry for structure types.
 +     * @see io.papermc.paper.registry.keys.BiomeKeys
 +     */
 +    RegistryKey<Biome> BIOME = create("worldgen/biome");
 +    /**
-+     * Data-driven registry for structures.
-+     * @see io.papermc.paper.registry.keys.StructureKeys
-+     */
-+    RegistryKey<Structure> STRUCTURE = create("worldgen/structure");
-+    /**
-+     * Data-driven registry for trim materials.
++     * Data-driven registry for structure types.
 +     * @see io.papermc.paper.registry.keys.TrimMaterialKeys
 +     */
 +    RegistryKey<TrimMaterial> TRIM_MATERIAL = create("trim_material");
 +    /**
-+     * Data-driven registry for trim patterns.
++     * Data-driven registry for structure types.
 +     * @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");
-+
-+
-+    /* ******************* *
-+     * API-only Registries *
-+     * ******************* */
-+    RegistryKey<Art> PAINTING_VARIANT = create("painting_variant");
-+    RegistryKey<Attribute> ATTRIBUTE = create("attribute");
-+    RegistryKey<PatternType> BANNER_PATTERN = create("banner_pattern");
-+    RegistryKey<Cat.Type> CAT_VARIANT = create("cat_variant");
-+    RegistryKey<EntityType> ENTITY_TYPE = create("entity_type");
-+    RegistryKey<Particle> PARTICLE_TYPE = create("particle_type");
-+    RegistryKey<PotionType> POTION = create("potion");
-+    RegistryKey<Sound> SOUND_EVENT = create("sound_event");
-+    RegistryKey<Villager.Profession> VILLAGER_PROFESSION = create("villager_profession");
-+    RegistryKey<Villager.Type> VILLAGER_TYPE = create("villager_type");
-+    RegistryKey<MemoryKey<?>> MEMORY_MODULE_TYPE = create("memory_module_type");
-+    RegistryKey<Fluid> FLUID = create("fluid");
-+    RegistryKey<Frog.Variant> FROG_VARIANT = create("frog_variant");
-+    RegistryKey<MapCursor.Type> MAP_DECORATION_TYPE = create("map_decoration_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..791813220b2504214b1adecc69093cd600fb0f8c
+index 0000000000000000000000000000000000000000..9ad300fa1668cb59bbd85ff8091591db69b8c9dc
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,19 @@
 +package io.papermc.paper.registry;
 +
 +import com.google.common.collect.Sets;
@@ -249,20 +169,15 @@ index 0000000000000000000000000000000000000000..791813220b2504214b1adecc69093cd6
 +    static final Set<RegistryKey<?>> REGISTRY_KEYS = Sets.newIdentityHashSet();
 +
 +    static <T> RegistryKey<T> create(@Subst("some_key") final String key) {
-+        final RegistryKey<T> registryKey = createInternal(key);
++        final RegistryKey<T> registryKey = new RegistryKeyImpl<>(Key.key(Key.MINECRAFT_NAMESPACE, 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..6f5a062ba7ee7173468ecea3c1855a233bf3855e
+index 0000000000000000000000000000000000000000..271454cd1b92ada4301025b57348ea77da9116a1
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/TypedKey.java
 @@ -0,0 +1,44 @@
@@ -306,13 +221,13 @@ index 0000000000000000000000000000000000000000..6f5a062ba7ee7173468ecea3c1855a23
 +     * @return a new key for the value key and registry key
 +     */
 +    @ApiStatus.Experimental
-+    static <T> @NotNull TypedKey<T> create(final @NotNull RegistryKey<T> registryKey, final @NotNull Key key) {
++    static <T extends Keyed> @NotNull TypedKey<T> create(final @NotNull RegistryKey<T> registryKey, final @NotNull 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..1a97b3359c4ece5c29131da7c3f208aaa8fab66e
+index 0000000000000000000000000000000000000000..3c3fd73f7742bb8602e2f9164dd4c1208a412255
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/TypedKeyImpl.java
 @@ -0,0 +1,8 @@
@@ -322,17 +237,15 @@ index 0000000000000000000000000000000000000000..1a97b3359c4ece5c29131da7c3f208aa
 +import net.kyori.adventure.key.Keyed;
 +import org.jetbrains.annotations.NotNull;
 +
-+record TypedKeyImpl<T>(@NotNull Key key, @NotNull RegistryKey<T> registryKey) implements TypedKey<T> {
++record TypedKeyImpl<T extends Keyed>(@NotNull Key key, @NotNull RegistryKey<T> registryKey) implements TypedKey<T> {
 +}
 diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java/org/bukkit/MinecraftExperimental.java
-index b6f4810e387c22c4a70609ea1d605130245689a5..03824ae54e1bdb8b14f79b3c5e0294ae725e43f8 100644
+index 2365a8c620be709b280fb08855752bb0995838fc..b63e24b3c4d2f1a08e39434caa527bb2e0edea22 100644
 --- a/src/main/java/org/bukkit/MinecraftExperimental.java
 +++ b/src/main/java/org/bukkit/MinecraftExperimental.java
-@@ -47,6 +47,6 @@ public @interface MinecraftExperimental {
-     @ApiStatus.Internal
-     public enum Requires {
- 
--        UPDATE_1_21
-+        UPDATE_1_21, BUNDLE, TRADE_REBALANCE // Paper
-     }
+@@ -24,4 +24,5 @@ import org.jetbrains.annotations.ApiStatus;
+ })
+ @ApiStatus.Internal
+ public @interface MinecraftExperimental {
++    String value() default ""; // Paper
  }

patches/api/0005-Add-FastUtil-to-Bukkit.patch

@@ -6,7 +6,7 @@ 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 75bfb0ab8049ebbb52240abf661d469de5526767..ecba866b84bc5f86a442bf220ab24ed8706aadf9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -23,6 +23,7 @@ dependencies {
@@ -16,4 +16,4 @@ index f11a22ab01e97e51619c96f2d8a78a99297efc59..2f266350a787a4cfdfda1b0e760bfb76
 +    api("it.unimi.dsi:fastutil:8.5.6")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")

patches/api/0008-Use-ASM-for-event-executors.patch

@@ -6,19 +6,19 @@ 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 2377d476aee8c88d26ca715fdb756dc97749aac8..0c6e0bb90fe5ea29c467323a179a47ec122ba0f6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -47,6 +47,9 @@ dependencies {
+@@ -43,6 +43,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.4")
++    implementation("org.ow2.asm:asm-commons:9.4")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 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
@@ -69,10 +69,10 @@ index 0000000000000000000000000000000000000000..5b28e9b1daba7834af67dbc193dd656b
 +}
 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..c83672427324bd068ed52916f700b68446a226f6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,43 @@
 +package com.destroystokyo.paper.event.executor;
 +
 +import java.lang.invoke.MethodHandle;
@@ -83,6 +83,7 @@ index 0000000000000000000000000000000000000000..827f2b27f70a7ec0bc11d039305c3e58
 +import com.destroystokyo.paper.util.SneakyThrow;
 +import com.google.common.base.Preconditions;
 +
++import org.bukkit.Bukkit;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.EventException;
 +import org.bukkit.event.Listener;
@@ -217,18 +218,20 @@ index 0000000000000000000000000000000000000000..f79685b48bb581277a6891927988b6f7
 +}
 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..ac99477e9f2c08041aeff31abc1d1edee58d0a67
 --- /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.ConcurrentHashMap;
 +import java.util.concurrent.ConcurrentMap;
 +
 +import com.google.common.base.Preconditions;
 +
 +import com.google.common.collect.MapMaker;
 +import org.jetbrains.annotations.NotNull;
++import org.objectweb.asm.Type;
 +
 +public class SafeClassDefiner implements ClassDefiner {
 +    /* default */ static final SafeClassDefiner INSTANCE = new SafeClassDefiner();

patches/api/0009-Paper-Plugins.patch

@@ -5,19 +5,19 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a0c6f2c36fa4c16787616a79b5d996523c274fe0..effad8017bff46e2651af01f1789cb8dd08a49d5 100644
+index 0c6e0bb90fe5ea29c467323a179a47ec122ba0f6..145f6209a984e74da2d2de03cf725c06c77ef8da 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -52,7 +52,7 @@ dependencies {
-     implementation("org.ow2.asm:asm-commons:9.7")
+@@ -48,7 +48,7 @@ dependencies {
+     implementation("org.ow2.asm:asm-commons:9.4")
      // Paper end
  
--    compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-+    api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
- 
-@@ -138,6 +138,7 @@ tasks.withType<Javadoc> {
+-    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
++    api("org.apache.maven:maven-resolver-provider:3.8.5")
+     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+     compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
+@@ -135,6 +135,7 @@ tasks.withType<Javadoc> {
          "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
          "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
          // Paper end
@@ -329,7 +329,7 @@ index 0000000000000000000000000000000000000000..2c14693155de3654d5ca011c63e13e4a
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bcf91d048d84144f6acf9bfd2095df9ada2e585f
+index 0000000000000000000000000000000000000000..ef393f1f93ca48264fc1b6e3a27787f6a9152e1b
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
 @@ -0,0 +1,203 @@
@@ -403,7 +403,7 @@ index 0000000000000000000000000000000000000000..bcf91d048d84144f6acf9bfd2095df9a
 +    /**
 +     * Provides the version of this plugin as defined by the plugin.
 +     * There is no inherit format defined/enforced for the version of a plugin, however a common approach
-+     * might be semantic versioning.
++     * might be schematic versioning.
 +     *
 +     * @return the string representation of the plugin's version
 +     */
@@ -762,10 +762,10 @@ index 0000000000000000000000000000000000000000..e3da0d67cab01e1233dccde1a12ff259
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..70f352630de71f575d1aea5a3126da19a94791ab
+index 0000000000000000000000000000000000000000..9af07d168beadaa77e4965819200eeb94fe3e092
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
-@@ -0,0 +1,133 @@
+@@ -0,0 +1,132 @@
 +package io.papermc.paper.plugin.loader.library.impl;
 +
 +import io.papermc.paper.plugin.loader.library.ClassPathLibrary;
@@ -841,7 +841,6 @@ index 0000000000000000000000000000000000000000..70f352630de71f575d1aea5a3126da19
 +        this.repository = locator.getService(RepositorySystem.class);
 +        this.session = MavenRepositorySystemUtils.newSession();
 +
-+        this.session.setSystemProperties(System.getProperties());
 +        this.session.setChecksumPolicy(RepositoryPolicy.CHECKSUM_POLICY_FAIL);
 +        this.session.setLocalRepositoryManager(this.repository.newLocalRepositoryManager(this.session, new LocalRepository("libraries")));
 +        this.session.setTransferListener(new AbstractTransferListener() {
@@ -1347,13 +1346,13 @@ index 0000000000000000000000000000000000000000..6bf3d212a6156ad9ab0e82d1ca0a04f8
 +
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index baf49da3dd46039da2f24a4af8b1b8617bb25501..7cf61228754527ddaa6b39b5f1426e0527cdaac9 100644
+index a3ee6f2f588bc9c87e49378359f450820b9af1b9..0743592273cc1c5f4ab6935349941bf25b438448 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -137,4 +137,14 @@ public interface UnsafeValues {
- 
-     @ApiStatus.Internal
-     <B extends Keyed> B get(Registry<B> registry, NamespacedKey key);
+@@ -109,4 +109,14 @@ public interface UnsafeValues {
+      * @return an internal potion data
+      */
+     PotionType.InternalPotionData getInternalPotionData(NamespacedKey key);
 +
 +    // Paper start
 +    @Deprecated(forRemoval = true)
@@ -1379,10 +1378,10 @@ index 1dbbc244309043b18c1d71707c4fb066c0d0e02d..551c5af6a7bfa2268cbc63be8e70d129
          this.executor = owner;
          this.owningPlugin = owner;
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index fd5a7a55484deb3fdcced7ebd1f4f6c14d5b4f4f..9207ae900cb4cc8ce41dd4e63d7ad8b35b0ac048 100644
+index e195e74c48c69047aa825b75fad95419c505b41f..53f28c9e6843991486a576d41b6641c170589807 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -35,7 +35,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -34,7 +34,7 @@ public class SimpleCommandMap implements CommandMap {
      private void setDefaultCommands() {
          register("bukkit", new VersionCommand("version"));
          register("bukkit", new ReloadCommand("reload"));
@@ -1450,10 +1449,10 @@ index 94f8ceb965cecb5669a84a0ec61c0f706c2a2673..e773db6da357ad210eb24d4c389af2dc
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
-index 8e44f7eaf960884b09ac8413c4383fe17e54b584..c5465431ce35d264d8510af45e73d058b333c60b 100644
+index f48bdeb628a82416d93f84a0a10141447482bf83..c0691a849831f99268fdcb7b0f471f80a1a2a70e 100644
 --- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
 +++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
-@@ -199,7 +199,7 @@ import org.yaml.snakeyaml.representer.Representer;
+@@ -198,7 +198,7 @@ import org.yaml.snakeyaml.representer.Representer;
   *      inferno.burningdeaths: true
   *</pre></blockquote>
   */
@@ -1462,7 +1461,7 @@ index 8e44f7eaf960884b09ac8413c4383fe17e54b584..c5465431ce35d264d8510af45e73d058
      private static final Pattern VALID_NAME = Pattern.compile("^[A-Za-z0-9 _.-]+$");
      private static final ThreadLocal<Yaml> YAML = new ThreadLocal<Yaml>() {
          @Override
-@@ -260,6 +260,70 @@ public final class PluginDescriptionFile {
+@@ -259,6 +259,70 @@ public final class PluginDescriptionFile {
      private Set<PluginAwareness> awareness = ImmutableSet.of();
      private String apiVersion = null;
      private List<String> libraries = ImmutableList.of();
@@ -1546,7 +1545,7 @@ index a88733f1cd1ddb5d85ab1b0e6af4fd5b80bbc1c6..cb530369e667c426c842da356c31304b
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java
-index ae3e68562c29992fab627428db3ff0006d8216f9..47153dee66782a00b980ecf15e8774ab6f3d887d 100644
+index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..03213fde8315384ec56c16031cfc606ade2e8091 100644
 --- a/src/main/java/org/bukkit/plugin/PluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/PluginManager.java
 @@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable;
@@ -1566,7 +1565,7 @@ index ae3e68562c29992fab627428db3ff0006d8216f9..47153dee66782a00b980ecf15e8774ab
      public void registerInterface(@NotNull Class<? extends PluginLoader> loader) throws IllegalArgumentException;
  
      /**
-@@ -312,4 +313,17 @@ public interface PluginManager {
+@@ -303,4 +304,17 @@ public interface PluginManager {
       * @return True if event timings are to be used
       */
      public boolean useTimings();
@@ -1585,10 +1584,10 @@ index ae3e68562c29992fab627428db3ff0006d8216f9..47153dee66782a00b980ecf15e8774ab
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea16f2409b 100644
+index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e7666711998eb4e 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -44,6 +44,8 @@ import org.jetbrains.annotations.Nullable;
+@@ -43,6 +43,8 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Handles all plugin management from the Server
   */
@@ -1597,7 +1596,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
  public final class SimplePluginManager implements PluginManager {
      private final Server server;
      private final Map<Pattern, PluginLoader> fileAssociations = new HashMap<Pattern, PluginLoader>();
-@@ -52,10 +54,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -51,10 +53,13 @@ public final class SimplePluginManager implements PluginManager {
      private MutableGraph<String> dependencyGraph = GraphBuilder.directed().build();
      private File updateDirectory;
      private final SimpleCommandMap commandMap;
@@ -1615,7 +1614,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
      private boolean useTimings = false;
  
      public SimplePluginManager(@NotNull Server instance, @NotNull SimpleCommandMap commandMap) {
-@@ -112,6 +117,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -111,6 +116,11 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Plugin[] loadPlugins(@NotNull File directory) {
@@ -1627,15 +1626,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          Preconditions.checkArgument(directory != null, "Directory cannot be null");
          Preconditions.checkArgument(directory.isDirectory(), "Directory must be a directory");
  
-@@ -130,6 +140,7 @@ public final class SimplePluginManager implements PluginManager {
-      */
-     @NotNull
-     public Plugin[] loadPlugins(@NotNull File[] files) {
-+        // TODO Replace with Paper plugin loader
-         Preconditions.checkArgument(files != null, "File list cannot be null");
- 
-         List<Plugin> result = new ArrayList<Plugin>();
-@@ -390,6 +401,15 @@ public final class SimplePluginManager implements PluginManager {
+@@ -378,6 +388,15 @@ public final class SimplePluginManager implements PluginManager {
      @Nullable
      public synchronized Plugin loadPlugin(@NotNull File file) throws InvalidPluginException, UnknownDependencyException {
          Preconditions.checkArgument(file != null, "File cannot be null");
@@ -1651,7 +1642,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
  
          checkUpdate(file);
  
-@@ -440,12 +460,14 @@ public final class SimplePluginManager implements PluginManager {
+@@ -428,12 +447,14 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @Nullable
      public synchronized Plugin getPlugin(@NotNull String name) {
@@ -1666,7 +1657,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          return plugins.toArray(new Plugin[plugins.size()]);
      }
  
-@@ -459,6 +481,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -447,6 +468,7 @@ public final class SimplePluginManager implements PluginManager {
       */
      @Override
      public boolean isPluginEnabled(@NotNull String name) {
@@ -1674,7 +1665,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          Plugin plugin = getPlugin(name);
  
          return isPluginEnabled(plugin);
-@@ -472,6 +495,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -460,6 +482,7 @@ public final class SimplePluginManager implements PluginManager {
       */
      @Override
      public boolean isPluginEnabled(@Nullable Plugin plugin) {
@@ -1682,7 +1673,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          if ((plugin != null) && (plugins.contains(plugin))) {
              return plugin.isEnabled();
          } else {
-@@ -481,6 +505,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -469,6 +492,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void enablePlugin(@NotNull final Plugin plugin) {
@@ -1690,7 +1681,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          if (!plugin.isEnabled()) {
              List<Command> pluginCommands = PluginCommandYamlParser.parse(plugin);
  
-@@ -500,6 +525,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -488,6 +512,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void disablePlugins() {
@@ -1698,7 +1689,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          Plugin[] plugins = getPlugins();
          for (int i = plugins.length - 1; i >= 0; i--) {
              disablePlugin(plugins[i]);
-@@ -508,6 +534,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -496,6 +521,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void disablePlugin(@NotNull final Plugin plugin) {
@@ -1706,7 +1697,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          if (plugin.isEnabled()) {
              try {
                  plugin.getPluginLoader().disablePlugin(plugin);
-@@ -552,6 +579,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -540,6 +566,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void clearPlugins() {
@@ -1714,7 +1705,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          synchronized (this) {
              disablePlugins();
              plugins.clear();
-@@ -572,6 +600,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -560,6 +587,7 @@ public final class SimplePluginManager implements PluginManager {
       */
      @Override
      public void callEvent(@NotNull Event event) {
@@ -1722,7 +1713,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          if (event.isAsynchronous()) {
              if (Thread.holdsLock(this)) {
                  throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.");
-@@ -620,6 +649,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -608,6 +636,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void registerEvents(@NotNull Listener listener, @NotNull Plugin plugin) {
@@ -1730,7 +1721,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          if (!plugin.isEnabled()) {
              throw new IllegalPluginAccessException("Plugin attempted to register " + listener + " while not enabled");
          }
-@@ -653,6 +683,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -641,6 +670,7 @@ public final class SimplePluginManager implements PluginManager {
          Preconditions.checkArgument(priority != null, "Priority cannot be null");
          Preconditions.checkArgument(executor != null, "Executor cannot be null");
          Preconditions.checkArgument(plugin != null, "Plugin cannot be null");
@@ -1738,12 +1729,12 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
  
          if (!plugin.isEnabled()) {
              throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
-@@ -700,16 +731,19 @@ public final class SimplePluginManager implements PluginManager {
+@@ -688,16 +718,19 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @Nullable
      public Permission getPermission(@NotNull String name) {
 +        if (true) {return this.paperPluginManager.getPermission(name);} // Paper
-         return permissions.get(name.toLowerCase(Locale.ROOT));
+         return permissions.get(name.toLowerCase(java.util.Locale.ENGLISH));
      }
  
      @Override
@@ -1755,10 +1746,10 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
      @Deprecated
      public void addPermission(@NotNull Permission perm, boolean dirty) {
 +        if (true) {this.paperPluginManager.addPermission(perm); return;} // Paper - This just has a performance implication, use the better api to avoid this.
-         String name = perm.getName().toLowerCase(Locale.ROOT);
+         String name = perm.getName().toLowerCase(java.util.Locale.ENGLISH);
  
          if (permissions.containsKey(name)) {
-@@ -723,21 +757,25 @@ public final class SimplePluginManager implements PluginManager {
+@@ -711,21 +744,25 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Set<Permission> getDefaultPermissions(boolean op) {
@@ -1775,40 +1766,40 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
      @Override
      public void removePermission(@NotNull String name) {
 +        if (true) {this.paperPluginManager.removePermission(name); return;} // Paper
-         permissions.remove(name.toLowerCase(Locale.ROOT));
+         permissions.remove(name.toLowerCase(java.util.Locale.ENGLISH));
      }
  
      @Override
      public void recalculatePermissionDefaults(@NotNull Permission perm) {
 +        if (true) {this.paperPluginManager.recalculatePermissionDefaults(perm); return;} // Paper
-         if (perm != null && permissions.containsKey(perm.getName().toLowerCase(Locale.ROOT))) {
+         if (perm != null && permissions.containsKey(perm.getName().toLowerCase(java.util.Locale.ENGLISH))) {
              defaultPerms.get(true).remove(perm);
              defaultPerms.get(false).remove(perm);
-@@ -777,6 +815,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -765,6 +802,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void subscribeToPermission(@NotNull String permission, @NotNull Permissible permissible) {
 +        if (true) {this.paperPluginManager.subscribeToPermission(permission, permissible); return;} // Paper
-         String name = permission.toLowerCase(Locale.ROOT);
+         String name = permission.toLowerCase(java.util.Locale.ENGLISH);
          Map<Permissible, Boolean> map = permSubs.get(name);
  
-@@ -790,6 +829,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -778,6 +816,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void unsubscribeFromPermission(@NotNull String permission, @NotNull Permissible permissible) {
 +        if (true) {this.paperPluginManager.unsubscribeFromPermission(permission, permissible); return;} // Paper
-         String name = permission.toLowerCase(Locale.ROOT);
+         String name = permission.toLowerCase(java.util.Locale.ENGLISH);
          Map<Permissible, Boolean> map = permSubs.get(name);
  
-@@ -805,6 +845,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -793,6 +832,7 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Set<Permissible> getPermissionSubscriptions(@NotNull String permission) {
 +        if (true) {return this.paperPluginManager.getPermissionSubscriptions(permission);} // Paper
-         String name = permission.toLowerCase(Locale.ROOT);
+         String name = permission.toLowerCase(java.util.Locale.ENGLISH);
          Map<Permissible, Boolean> map = permSubs.get(name);
  
-@@ -817,6 +858,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -805,6 +845,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void subscribeToDefaultPerms(boolean op, @NotNull Permissible permissible) {
@@ -1816,7 +1807,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          Map<Permissible, Boolean> map = defSubs.get(op);
  
          if (map == null) {
-@@ -829,6 +871,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -817,6 +858,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public void unsubscribeFromDefaultPerms(boolean op, @NotNull Permissible permissible) {
@@ -1824,7 +1815,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          Map<Permissible, Boolean> map = defSubs.get(op);
  
          if (map != null) {
-@@ -843,6 +886,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -831,6 +873,7 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Set<Permissible> getDefaultPermSubscriptions(boolean op) {
@@ -1832,7 +1823,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          Map<Permissible, Boolean> map = defSubs.get(op);
  
          if (map == null) {
-@@ -855,6 +899,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -843,6 +886,7 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Set<Permission> getPermissions() {
@@ -1840,7 +1831,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          return new HashSet<Permission>(permissions.values());
      }
  
-@@ -878,6 +923,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -866,6 +910,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public boolean useTimings() {
@@ -1848,7 +1839,7 @@ index 839130f713e9a1862e1026590a76ac027c00cab8..46c7be5fa69f13900860b9944523beea
          return useTimings;
      }
  
-@@ -889,4 +935,28 @@ public final class SimplePluginManager implements PluginManager {
+@@ -877,4 +922,28 @@ public final class SimplePluginManager implements PluginManager {
      public void useTimings(boolean use) {
          useTimings = use;
      }
@@ -1899,10 +1890,10 @@ index a80251eff75430863b37db1c131e22593f3fcd5e..310c4041963a3f1e0a26e39a6da12a9b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 7fca39df009308adad55a6e9dc10a4a0dead86f2..2a14522c484febcd880d00197df4359a0020dddd 100644
+index ee100b7ad89ce1eccef0c3bc55885cd78aadd1ec..f594913e6b94f77b26a4a758c447a42d8a25b6ff 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-@@ -41,6 +41,7 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -40,6 +40,7 @@ public abstract class JavaPlugin extends PluginBase {
      private Server server = null;
      private File file = null;
      private PluginDescriptionFile description = null;
@@ -1910,7 +1901,7 @@ index 7fca39df009308adad55a6e9dc10a4a0dead86f2..2a14522c484febcd880d00197df4359a
      private File dataFolder = null;
      private ClassLoader classLoader = null;
      private boolean naggable = true;
-@@ -49,13 +50,16 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -48,13 +49,16 @@ public abstract class JavaPlugin extends PluginBase {
      private PluginLogger logger = null;
  
      public JavaPlugin() {
@@ -1931,7 +1922,7 @@ index 7fca39df009308adad55a6e9dc10a4a0dead86f2..2a14522c484febcd880d00197df4359a
      protected JavaPlugin(@NotNull final JavaPluginLoader loader, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file) {
          final ClassLoader classLoader = this.getClass().getClassLoader();
          if (classLoader instanceof PluginClassLoader) {
-@@ -80,9 +84,12 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -79,9 +83,12 @@ public abstract class JavaPlugin extends PluginBase {
       * Gets the associated PluginLoader responsible for this plugin
       *
       * @return PluginLoader that controls this plugin
@@ -1944,7 +1935,7 @@ index 7fca39df009308adad55a6e9dc10a4a0dead86f2..2a14522c484febcd880d00197df4359a
      public final PluginLoader getPluginLoader() {
          return loader;
      }
-@@ -123,13 +130,20 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -122,13 +129,20 @@ public abstract class JavaPlugin extends PluginBase {
       * Returns the plugin.yaml file containing the details for this plugin
       *
       * @return Contents of the plugin.yaml file
@@ -1965,7 +1956,7 @@ index 7fca39df009308adad55a6e9dc10a4a0dead86f2..2a14522c484febcd880d00197df4359a
      @NotNull
      @Override
      public FileConfiguration getConfig() {
-@@ -259,7 +273,8 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -258,7 +272,8 @@ public abstract class JavaPlugin extends PluginBase {
       *
       * @param enabled true if enabled, otherwise false
       */
@@ -1975,7 +1966,7 @@ index 7fca39df009308adad55a6e9dc10a4a0dead86f2..2a14522c484febcd880d00197df4359a
          if (isEnabled != enabled) {
              isEnabled = enabled;
  
-@@ -271,9 +286,18 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -270,9 +285,18 @@ public abstract class JavaPlugin extends PluginBase {
          }
      }
  
@@ -1997,7 +1988,7 @@ index 7fca39df009308adad55a6e9dc10a4a0dead86f2..2a14522c484febcd880d00197df4359a
          this.server = server;
          this.file = file;
          this.description = description;
-@@ -281,6 +305,7 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -280,6 +304,7 @@ public abstract class JavaPlugin extends PluginBase {
          this.classLoader = classLoader;
          this.configFile = new File(dataFolder, "config.yml");
          this.logger = new PluginLogger(this);
@@ -2005,7 +1996,7 @@ index 7fca39df009308adad55a6e9dc10a4a0dead86f2..2a14522c484febcd880d00197df4359a
      }
  
      /**
-@@ -397,10 +422,10 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -396,10 +421,10 @@ public abstract class JavaPlugin extends PluginBase {
              throw new IllegalArgumentException(clazz + " does not extend " + JavaPlugin.class);
          }
          final ClassLoader cl = clazz.getClassLoader();
@@ -2019,7 +2010,7 @@ index 7fca39df009308adad55a6e9dc10a4a0dead86f2..2a14522c484febcd880d00197df4359a
          if (plugin == null) {
              throw new IllegalStateException("Cannot get plugin for " + clazz + " from a static initializer");
          }
-@@ -423,10 +448,10 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -422,10 +447,10 @@ public abstract class JavaPlugin extends PluginBase {
      public static JavaPlugin getProvidingPlugin(@NotNull Class<?> clazz) {
          Preconditions.checkArgument(clazz != null, "Null class cannot have a plugin");
          final ClassLoader cl = clazz.getClassLoader();
@@ -2063,7 +2054,7 @@ index 047c0304fd617cec990f80815b43916c6ef5a94c..ab04ffe4cd05315a2ee0f64c553b4c67
              throw ex;
          } catch (Throwable ex) {
 diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-index 160f8c348271154c672adf936b358ffeb3b63e69..f4d655a158410039305ac68cebe0d79000f73df8 100644
+index 6d634b0ea813ccb19f1562a7d0e5a59cea4eab21..e4b6f278a811acbb0070e311c5c3bdaff7b00474 100644
 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 @@ -36,7 +36,10 @@ import org.eclipse.aether.transport.http.HttpTransporterFactory;
@@ -2078,15 +2069,7 @@ index 160f8c348271154c672adf936b358ffeb3b63e69..f4d655a158410039305ac68cebe0d790
  {
  
      private final Logger logger;
-@@ -55,6 +58,7 @@ class LibraryLoader
-         this.repository = locator.getService( RepositorySystem.class );
-         this.session = MavenRepositorySystemUtils.newSession();
- 
-+        session.setSystemProperties(System.getProperties()); // Paper - paper plugins, backport system properties fix for transitive dependency parsing, see #10116
-         session.setChecksumPolicy( RepositoryPolicy.CHECKSUM_POLICY_FAIL );
-         session.setLocalRepositoryManager( repository.newLocalRepositoryManager( session, new LocalRepository( "libraries" ) ) );
-         session.setTransferListener( new AbstractTransferListener()
-@@ -84,7 +88,7 @@ class LibraryLoader
+@@ -79,7 +82,7 @@ class LibraryLoader
          }
          logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
          {
@@ -2095,7 +2078,7 @@ index 160f8c348271154c672adf936b358ffeb3b63e69..f4d655a158410039305ac68cebe0d790
          } );
  
          List<Dependency> dependencies = new ArrayList<>();
-@@ -122,7 +126,7 @@ class LibraryLoader
+@@ -117,7 +120,7 @@ class LibraryLoader
              jarFiles.add( url );
              logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[]
              {
@@ -2105,7 +2088,7 @@ index 160f8c348271154c672adf936b358ffeb3b63e69..f4d655a158410039305ac68cebe0d790
          }
  
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 64a294aeb6fb548794708b38c3707f9dd882b2ff..58d20eff7e0da2d7fcb1609d55e4284715355634 100644
+index 64a294aeb6fb548794708b38c3707f9dd882b2ff..74b6581a97a092c44a0876e7981ff8a8e6153100 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -31,7 +31,8 @@ import org.jetbrains.annotations.Nullable;
@@ -2132,7 +2115,7 @@ index 64a294aeb6fb548794708b38c3707f9dd882b2ff..58d20eff7e0da2d7fcb1609d55e42847
  
 -    PluginClassLoader(@NotNull final JavaPluginLoader loader, @Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader) throws IOException, InvalidPluginException, MalformedURLException {
 +    @org.jetbrains.annotations.ApiStatus.Internal // Paper
-+    public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper - use JarFile provided by SpigotPluginProvider
++    public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper // Paper - use JarFile provided by SpigotPluginProvider
          super(new URL[] {file.toURI().toURL()}, parent);
 -        Preconditions.checkArgument(loader != null, "Loader cannot be null");
 +        this.loader = null; // Paper - pass null into loader field
@@ -2557,10 +2540,10 @@ index a8be3e23e3e280ad301d9530de50028515612966..43b58e920e739bb949ac0673e9ef73ba
      @Override
      public FileConfiguration getConfig() {
 diff --git a/src/test/java/org/bukkit/support/TestServer.java b/src/test/java/org/bukkit/support/TestServer.java
-index a47ee3ce660ec4467b5ed6a4b41fb2d19179a189..c79faf4197f9c0a7256cefe2b001182102d2b796 100644
+index 73ec679ac0d1f398b417bd174b47f9af93351e27..b208150297a23c0b4acb79135416809718f5650e 100644
 --- a/src/test/java/org/bukkit/support/TestServer.java
 +++ b/src/test/java/org/bukkit/support/TestServer.java
-@@ -26,8 +26,7 @@ public final class TestServer {
+@@ -25,8 +25,7 @@ public final class TestServer {
          Thread creatingThread = Thread.currentThread();
          when(instance.isPrimaryThread()).then(mock -> Thread.currentThread().equals(creatingThread));
  

patches/api/0011-Timings-v2.patch

@@ -717,10 +717,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..065991e7a7f6119797ea315a56836ba17dd17d05
+index 0000000000000000000000000000000000000000..eb9d58f8852e732a1284beeaf542989301d21b1c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
-@@ -0,0 +1,352 @@
+@@ -0,0 +1,355 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -874,14 +874,17 @@ index 0000000000000000000000000000000000000000..065991e7a7f6119797ea315a56836ba1
 +                                        }
 +                                    }
 +                                ),
-+                                toObjectMapper(
-+                                    input.tileEntityCounts.entrySet(),
-+                                    entry -> {
-+                                        tileEntityTypeSet.add(entry.getKey());
-+                                        return pair(
-+                                            String.valueOf(entry.getKey().ordinal()),
-+                                            entry.getValue().count()
-+                                        );
++                                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()
++                                            );
++                                        }
 +                                    }
 +                                )
 +                            );
@@ -2851,10 +2854,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 55b61b5971ac0848174bd4d59952408c437f0e60..dd60025dd956dd360ded51e056163c31908b6d5e 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 {
+@@ -834,7 +834,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2863,10 +2866,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 19d61b2425794b2ca4dbc76bda9e23abe97fc30d..4cb488d68abc80aae733eb6b17e9cfa015c5a229 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
+@@ -1904,6 +1904,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2894,10 +2897,10 @@ 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 7cf61228754527ddaa6b39b5f1426e0527cdaac9..9082e67324f810857db26bb89ecea7e9f866f80d 100644
+index 0743592273cc1c5f4ab6935349941bf25b438448..659405d84b5a61618576e930805da5cd3a054b4c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -40,6 +40,7 @@ public interface UnsafeValues {
+@@ -36,6 +36,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
  
@@ -2905,7 +2908,7 @@ index 7cf61228754527ddaa6b39b5f1426e0527cdaac9..9082e67324f810857db26bb89ecea7e9
      Material toLegacy(Material material);
  
      Material fromLegacy(Material material);
-@@ -147,4 +148,12 @@ public interface UnsafeValues {
+@@ -119,4 +120,12 @@ public interface UnsafeValues {
          return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
      }
      // Paper end
@@ -2946,7 +2949,7 @@ 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 75759131bd94b672bec4cd8e271ebff1ad391cba..5cfd88eec9bf02e83d77b6fce1a5c14b7687f48b 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 {
@@ -3140,10 +3143,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 9207ae900cb4cc8ce41dd4e63d7ad8b35b0ac048..36fc2c35395c72f8b81a2a2f3265fd205384ce26 100644
+index 53f28c9e6843991486a576d41b6641c170589807..4205649948a9e2a72f64c3f007112245abac6d50 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -16,7 +16,6 @@ import org.bukkit.command.defaults.BukkitCommand;
+@@ -15,7 +15,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;
@@ -3151,7 +3154,7 @@ index 9207ae900cb4cc8ce41dd4e63d7ad8b35b0ac048..36fc2c35395c72f8b81a2a2f3265fd20
  import org.bukkit.command.defaults.VersionCommand;
  import org.bukkit.entity.Player;
  import org.bukkit.util.StringUtil;
-@@ -36,7 +35,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -35,7 +34,7 @@ public class SimpleCommandMap implements CommandMap {
          register("bukkit", new VersionCommand("version"));
          register("bukkit", new ReloadCommand("reload"));
          //register("bukkit", new PluginsCommand("plugins")); // Paper
@@ -3160,15 +3163,15 @@ index 9207ae900cb4cc8ce41dd4e63d7ad8b35b0ac048..36fc2c35395c72f8b81a2a2f3265fd20
      }
  
      public void setFallbackCommands() {
-@@ -68,6 +67,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -67,6 +66,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(Locale.ROOT).trim();
-         fallbackPrefix = fallbackPrefix.toLowerCase(Locale.ROOT).trim();
+         label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
+         fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
          boolean registered = register(label, command, false, fallbackPrefix);
-@@ -144,16 +144,22 @@ public class SimpleCommandMap implements CommandMap {
+@@ -143,16 +143,22 @@ public class SimpleCommandMap implements CommandMap {
              return false;
          }
  
@@ -3452,10 +3455,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 c7d3d938534ac11fe420418655dae689c58fbe12..776a3ce9a6c106fbe96cc6399b9ee2cd81b10c76 100644
+index e5a54a2f35d83f8c7a5f2b6512b86481aa7f9f51..c54d478035f7782074c00f870d41da8283fec538 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2726,7 +2726,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2346,7 +2346,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.");
@@ -3476,10 +3479,10 @@ index c7d3d938534ac11fe420418655dae689c58fbe12..776a3ce9a6c106fbe96cc6399b9ee2cd
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15dc2730cb 100644
+index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94904a3d17 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -381,7 +381,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -368,7 +368,6 @@ public final class SimplePluginManager implements PluginManager {
              }
          }
  
@@ -3487,7 +3490,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
          return result.toArray(new Plugin[result.size()]);
      }
  
-@@ -429,9 +428,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -416,9 +415,9 @@ public final class SimplePluginManager implements PluginManager {
  
          if (result != null) {
              plugins.add(result);
@@ -3499,7 +3502,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
              }
          }
  
-@@ -461,7 +460,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -448,7 +447,7 @@ public final class SimplePluginManager implements PluginManager {
      @Nullable
      public synchronized Plugin getPlugin(@NotNull String name) {
          if (true) {return this.paperPluginManager.getPlugin(name);} // Paper
@@ -3508,7 +3511,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
      }
  
      @Override
-@@ -689,7 +688,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -676,7 +675,8 @@ public final class SimplePluginManager implements PluginManager {
              throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
          }
  
@@ -3518,7 +3521,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
              getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
          } else {
              getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-@@ -924,7 +924,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -911,7 +911,7 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      public boolean useTimings() {
          if (true) {return this.paperPluginManager.useTimings();} // Paper
@@ -3527,7 +3530,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
      }
  
      /**
-@@ -933,7 +933,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -920,7 +920,7 @@ public final class SimplePluginManager implements PluginManager {
       * @param use True if per event timing code should be used
       */
      public void useTimings(boolean use) {

patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -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 dd60025dd956dd360ded51e056163c31908b6d5e..6a36a9bfa0574b8bd72fbf7edb9b49e01753406e 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 {
+@@ -79,6 +79,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 4cb488d68abc80aae733eb6b17e9cfa015c5a229..75c51378095104a0a58babad281ee946a6c9584e 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;
+@@ -64,6 +64,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 6018574cd15b802833613beefa88da15dc2730cb..e7b1895d3918487d711afcbe41d76863d85c0a62 100644
+index 63389474a2b3f0e283b42e7004aa6a94904a3d17..974ff7116b294473ec450757e8a9341540f43dcd 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -117,9 +117,22 @@ public final class SimplePluginManager implements PluginManager {
+@@ -116,9 +116,22 @@ public final class SimplePluginManager implements PluginManager {
      @Override
      @NotNull
      public Plugin[] loadPlugins(@NotNull File directory) {

patches/api/0013-Player-affects-spawning-API.patch

@@ -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 776a3ce9a6c106fbe96cc6399b9ee2cd81b10c76..966a5626eac9305c88b1fe35d12c5fc6e28348d4 100644
+index c54d478035f7782074c00f870d41da8283fec538..f21183cd5491b09e4543839252aed1ea10ddf849 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2578,6 +2578,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2198,6 +2198,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Deprecated // Paper
      public String getLocale();
  

patches/api/0014-Add-getTPS-method.patch

@@ -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 6a36a9bfa0574b8bd72fbf7edb9b49e01753406e..e4cdd6a68a52d0415d0281d03f50fe75c9924b7e 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 {
+@@ -2040,6 +2040,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 75c51378095104a0a58babad281ee946a6c9584e..17927955c481798b3bc40200168875bd319dd578 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
+@@ -1741,6 +1741,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  

patches/api/0015-Expose-server-build-information.patch

@@ -1,528 +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] 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..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/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..9df9d09aa477d4cd3c496ba0933c816df1ef0964
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -0,0 +1,121 @@
-+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.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Information about the current server build.
-+ */
-+@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 @NotNull 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")
-+     */
-+    @NotNull 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 @NotNull Key brandId);
-+
-+    /**
-+     * Gets the brand name of the server.
-+     *
-+     * @return the brand name of the server (e.g. "Paper")
-+     */
-+    @NotNull String brandName();
-+
-+    /**
-+     * Gets the Minecraft version id.
-+     *
-+     * @return the Minecraft version id (e.g. "1.20.4", "1.20.2-pre2", "23w31a")
-+     */
-+    @NotNull String minecraftVersionId();
-+
-+    /**
-+     * Gets the Minecraft version name.
-+     *
-+     * @return the Minecraft version name (e.g. "1.20.4", "1.20.2 Pre-release 2", "23w31a")
-+     */
-+    @NotNull String minecraftVersionName();
-+
-+    /**
-+     * Gets the build number.
-+     *
-+     * @return the build number
-+     */
-+    @NotNull OptionalInt buildNumber();
-+
-+    /**
-+     * Gets the build time.
-+     *
-+     * @return the build time
-+     */
-+    @NotNull Instant buildTime();
-+
-+    /**
-+     * Gets the git commit branch.
-+     *
-+     * @return the git commit branch
-+     */
-+    @NotNull Optional<String> gitBranch();
-+
-+    /**
-+     * Gets the git commit hash.
-+     *
-+     * @return the git commit hash
-+     */
-+    @NotNull Optional<String> gitCommit();
-+
-+    /**
-+     * Creates a string representation of the server build information.
-+     *
-+     * @param representation the type of representation
-+     * @return a string
-+     */
-+    @NotNull String asString(final @NotNull 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..909617079db61b675cc7b60b44ef96b306076343
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/JarManifests.java
-@@ -0,0 +1,37 @@
-+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.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+@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 @NotNull 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 ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d7569d644b25 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -109,13 +109,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() {
-@@ -126,6 +139,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() {
-@@ -142,6 +156,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 e37649ce4b3981f2cff96b64ed3bd4093c015346..7c646d1bb8b011c156b0688f9396bbcbba43d077 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -119,6 +119,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 9082e67324f810857db26bb89ecea7e9f866f80d..da997507b96908027c49dabc6daf7c787dcad95d 100644
---- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -155,5 +155,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 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

patches/api/0015-Version-Command-2.0.patch

@@ -0,0 +1,200 @@
+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 659405d84b5a61618576e930805da5cd3a054b4c..4604392831d19a789e4906cf1a5f0197105fd6f2 100644
+--- a/src/main/java/org/bukkit/UnsafeValues.java
++++ b/src/main/java/org/bukkit/UnsafeValues.java
+@@ -127,5 +127,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;

patches/api/0016-Entity-Origin-API.patch

@@ -5,10 +5,10 @@ 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 121cd27185269339babae1757a604fbb5aabc869..63137429779d06fafb162f1bfb823d5149b3c58a 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
+@@ -739,5 +739,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
          return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.customName())));
      }

patches/api/0017-Add-PlayerLocaleChangeEvent.patch

@@ -6,18 +6,16 @@ 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
+index 0000000000000000000000000000000000000000..bb7baa91fd4ba763fd8ce216bc9043c5e2c4b7b7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,51 @@
 +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.
@@ -26,14 +24,11 @@ index 0000000000000000000000000000000000000000..57f6c47e4e759abf0af9aa8962551225
 + */
 +@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
 +public class PlayerLocaleChangeEvent extends PlayerEvent {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
++    private static final HandlerList handlers = 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) {
++    public PlayerLocaleChangeEvent(final Player player, final String oldLocale, final String newLocale) {
 +        super(player);
 +        this.oldLocale = oldLocale;
 +        this.newLocale = newLocale;
@@ -44,9 +39,8 @@ index 0000000000000000000000000000000000000000..57f6c47e4e759abf0af9aa8962551225
 +     *
 +     * @return player's old locale
 +     */
-+    @Nullable
 +    public String getOldLocale() {
-+        return this.oldLocale;
++        return oldLocale;
 +    }
 +
 +    /**
@@ -54,19 +48,16 @@ index 0000000000000000000000000000000000000000..57f6c47e4e759abf0af9aa8962551225
 +     *
 +     * @return player's new locale
 +     */
-+    @NotNull
 +    public String getNewLocale() {
-+        return this.newLocale;
++        return newLocale;
 +    }
 +
 +    @Override
-+    @NotNull
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
-+    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +}

patches/api/0018-Add-view-distance-API.patch

@@ -8,12 +8,12 @@ Add per player no-tick, tick, and send view distances.
 Also add send/no-tick view distance to World.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff46469543688 100644
+index 1403d28bf9124e3c4cd741dfda06400318e8a0a0..3559115d09b57acf5c2853b811862e5131f2a625 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2968,6 +2968,66 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
-     @NotNull
-     public Set<FeatureFlag> getFeatureFlags();
+@@ -2663,6 +2663,62 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+     int getSimulationDistance();
+     // Spigot end
  
 +    // Paper start - view distance api
 +    /**
@@ -38,9 +38,7 @@ index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff464
 +     * @deprecated Use {@link #getViewDistance()}
 +     */
 +    @Deprecated
-+    default int getNoTickViewDistance() {
-+        return this.getViewDistance();
-+    }
++    int getNoTickViewDistance();
 +
 +    /**
 +     * Sets the no-tick view distance for this world.
@@ -52,9 +50,7 @@ index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff464
 +     * @deprecated Use {@link #setViewDistance(int)}
 +     */
 +    @Deprecated
-+    default void setNoTickViewDistance(int viewDistance) {
-+        this.setViewDistance(viewDistance);
-+    }
++    void setNoTickViewDistance(int viewDistance);
 +
 +    /**
 +     * Gets the sending view distance for this world.
@@ -75,14 +71,14 @@ index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff464
 +    void setSendViewDistance(int viewDistance);
 +    // Paper end - view distance api
 +
-     /**
-      * Gets all generated structures that intersect the chunk at the given
-      * coordinates. <br>
+     // Spigot start
+     public class Spigot {
+ 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 966a5626eac9305c88b1fe35d12c5fc6e28348d4..b5179b6f8f65d39198c0b80e4be9aca17ca866da 100644
+index f21183cd5491b09e4543839252aed1ea10ddf849..f9b9e0269b3a9402c5be1c1c2007956415ff708a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2592,6 +2592,82 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2212,6 +2212,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);
@@ -127,9 +123,7 @@ index 966a5626eac9305c88b1fe35d12c5fc6e28348d4..b5179b6f8f65d39198c0b80e4be9aca1
 +     * @deprecated Use {@link #getViewDistance()}
 +     */
 +    @Deprecated
-+    default int getNoTickViewDistance() {
-+        return this.getViewDistance();
-+    }
++    public int getNoTickViewDistance();
 +
 +    /**
 +     * Sets the no-ticking view distance for this player.
@@ -141,9 +135,7 @@ index 966a5626eac9305c88b1fe35d12c5fc6e28348d4..b5179b6f8f65d39198c0b80e4be9aca1
 +     * @deprecated Use {@link #setViewDistance(int)}
 +     */
 +    @Deprecated
-+    default void setNoTickViewDistance(int viewDistance) {
-+        this.setViewDistance(viewDistance);
-+    }
++    public void setNoTickViewDistance(int viewDistance);
 +
 +    /**
 +     * Gets the sending view distance for this player.

patches/api/0019-Add-BeaconEffectEvent.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add BeaconEffectEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7270c1feece2dc15a4a0503c4bca93a1288f8f13
+index 0000000000000000000000000000000000000000..978813b94a5eae0afccbd3b38b463091a46b56ac
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,86 @@
 +package com.destroystokyo.paper.event.block;
 +
 +import org.bukkit.block.Block;
@@ -18,23 +18,18 @@ index 0000000000000000000000000000000000000000..7270c1feece2dc15a4a0503c4bca93a1
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.block.BlockEvent;
 +import org.bukkit.potion.PotionEffect;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * Called when a beacon effect is being applied to a player.
 + */
 +public class BeaconEffectEvent extends BlockEvent implements Cancellable {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    private final Player player;
-+    private final boolean primary;
-+    private PotionEffect effect;
-+
++    private static final HandlerList handlers = new HandlerList();
 +    private boolean cancelled;
++    private PotionEffect effect;
++    private Player player;
++    private boolean primary;
 +
-+    @ApiStatus.Internal
 +    public BeaconEffectEvent(@NotNull Block block, @NotNull PotionEffect effect, @NotNull Player player, boolean primary) {
 +        super(block);
 +        this.effect = effect;
@@ -42,6 +37,16 @@ index 0000000000000000000000000000000000000000..7270c1feece2dc15a4a0503c4bca93a1
 +        this.primary = primary;
 +    }
 +
++    @Override
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancelled) {
++        this.cancelled = cancelled;
++    }
++
 +    /**
 +     * Gets the potion effect being applied.
 +     *
@@ -49,7 +54,7 @@ index 0000000000000000000000000000000000000000..7270c1feece2dc15a4a0503c4bca93a1
 +     */
 +    @NotNull
 +    public PotionEffect getEffect() {
-+        return this.effect;
++        return effect;
 +    }
 +
 +    /**
@@ -68,36 +73,26 @@ index 0000000000000000000000000000000000000000..7270c1feece2dc15a4a0503c4bca93a1
 +     */
 +    @NotNull
 +    public Player getPlayer() {
-+        return this.player;
++        return player;
 +    }
 +
 +    /**
 +     * Gets whether the effect is a primary beacon effect.
 +     *
-+     * @return {@code true} if this event represents a primary effect
++     * @return true if this event represents a primary effect
 +     */
 +    public boolean isPrimary() {
-+        return this.primary;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
++        return primary;
 +    }
 +
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +}

patches/api/0020-Add-PlayerInitialSpawnEvent.patch

@@ -7,10 +7,10 @@ For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..49e97ae79facceca5fc44c84c3d5f342d64cabc2
+index 0000000000000000000000000000000000000000..febd384b43560d7d55c96bda5b0701a27fc9e18e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,18 @@
 +package com.destroystokyo.paper.event.player;
 +
 +import org.bukkit.Location;
@@ -25,8 +25,7 @@ index 0000000000000000000000000000000000000000..49e97ae79facceca5fc44c84c3d5f342
 +@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
 +public class PlayerInitialSpawnEvent extends PlayerSpawnLocationEvent {
 +
-+    @ApiStatus.Internal
-+    public PlayerInitialSpawnEvent(@NotNull Player player, @NotNull Location spawnLocation) {
-+        super(player, spawnLocation);
++    public PlayerInitialSpawnEvent(@NotNull Player who, @NotNull Location spawnLocation) {
++        super(who, spawnLocation);
 +    }
 +}

patches/api/0021-Expose-server-CommandMap.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f4bf442b065e93b49a7e17658f73d7569d644b25..db217a9486e327b4340a54d65439055d86f363cc 100644
+index e4cdd6a68a52d0415d0281d03f50fe75c9924b7e..2a287fc77ef5cc6404dccdab01740e2b8b11ef43 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2322,6 +2322,19 @@ public final class Bukkit {
+@@ -2241,6 +2241,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index f4bf442b065e93b49a7e17658f73d7569d644b25..db217a9486e327b4340a54d65439055d
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7c646d1bb8b011c156b0688f9396bbcbba43d077..69153de6847bb8740803e5f731a0586d41a0eed3 100644
+index 17927955c481798b3bc40200168875bd319dd578..e0ca9516051bc566da2783f0574e791166d5922c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1804,6 +1804,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1751,6 +1751,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public double[] getTPS();
      // Paper end
  

patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index db217a9486e327b4340a54d65439055d86f363cc..25f506c344883d00a63ee2b5a998d3ff3ffd6cd5 100644
+index 2a287fc77ef5cc6404dccdab01740e2b8b11ef43..9d1f1b97a16524ba1d523dd9130f113f0cf3e779 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -471,6 +471,30 @@ public final class Bukkit {
+@@ -411,6 +411,30 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -41,10 +41,10 @@ index db217a9486e327b4340a54d65439055d86f363cc..25f506c344883d00a63ee2b5a998d3ff
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 69153de6847bb8740803e5f731a0586d41a0eed3..65d68716e1ff8277c534399621cf961ddf312509 100644
+index e0ca9516051bc566da2783f0574e791166d5922c..38e3bc502e66229a24833ab1eebba6816155fa19 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -382,6 +382,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -346,6 +346,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Deprecated // Paper
      public int broadcastMessage(@NotNull String message);
  
@@ -76,10 +76,10 @@ index 69153de6847bb8740803e5f731a0586d41a0eed3..65d68716e1ff8277c534399621cf961d
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5d5d37e2ebbbe4d2641177c7d174059ba29bb688..881c75e84ef31390a3519549985af2711e2828b5 100644
+index f9b9e0269b3a9402c5be1c1c2007956415ff708a..284bb156c4430a9a8afce0a7dffa96722b8c29cc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1216,6 +1216,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1041,6 +1041,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  

patches/api/0023-Add-exception-reporting-event.patch

@@ -6,32 +6,29 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9377ee1c2368ce058397037952d17bc010f66957
+index 0000000000000000000000000000000000000000..306dbd975e9380c22dae0dad526725cc47a36f16
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,42 @@
 +package com.destroystokyo.paper.event.server;
 +
++import com.google.common.base.Preconditions;
 +import org.bukkit.Bukkit;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
 +import com.destroystokyo.paper.exception.ServerException;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * Called whenever an exception is thrown in a recoverable section of the server.
 + */
 +public class ServerExceptionEvent extends Event {
++    private static final HandlerList handlers = new HandlerList();
++    @NotNull private ServerException exception;
 +
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    @NotNull private final ServerException exception;
-+
-+    @ApiStatus.Internal
 +    public ServerExceptionEvent(@NotNull ServerException exception) {
 +        super(!Bukkit.isPrimaryThread());
-+        this.exception = exception;
++        this.exception = Preconditions.checkNotNull(exception, "exception");
 +    }
 +
 +    /**
@@ -41,18 +38,18 @@ index 0000000000000000000000000000000000000000..9377ee1c2368ce058397037952d17bc0
 +     */
 +    @NotNull
 +    public ServerException getException() {
-+        return this.exception;
++        return exception;
 +    }
 +
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
@@ -465,10 +462,10 @@ index 0000000000000000000000000000000000000000..5582999fe94c7a3dac655044ccc6d078
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 36fc2c35395c72f8b81a2a2f3265fd205384ce26..c7fa1d235cea78bda4656ed66b8d42b119cc50fb 100644
+index 4205649948a9e2a72f64c3f007112245abac6d50..b3b32ce429edbf1ed040354dbe28ab86f0d24201 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -156,11 +156,14 @@ public class SimpleCommandMap implements CommandMap {
+@@ -155,11 +155,14 @@ public class SimpleCommandMap implements CommandMap {
              target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
              } // target.timings.stopTiming(); // Spigot // Paper
          } catch (CommandException ex) {
@@ -484,7 +481,7 @@ index 36fc2c35395c72f8b81a2a2f3265fd205384ce26..c7fa1d235cea78bda4656ed66b8d42b1
          }
  
          // return true as command was handled
-@@ -239,7 +242,9 @@ public class SimpleCommandMap implements CommandMap {
+@@ -238,7 +241,9 @@ public class SimpleCommandMap implements CommandMap {
          } catch (CommandException ex) {
              throw ex;
          } catch (Throwable ex) {
@@ -496,10 +493,10 @@ index 36fc2c35395c72f8b81a2a2f3265fd205384ce26..c7fa1d235cea78bda4656ed66b8d42b1
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index e7b1895d3918487d711afcbe41d76863d85c0a62..003bece642b682985625db93cad93026352bfc66 100644
+index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc70445f411 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -528,7 +528,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -515,7 +515,8 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().enablePlugin(plugin);
              } catch (Throwable ex) {
@@ -509,7 +506,7 @@ index e7b1895d3918487d711afcbe41d76863d85c0a62..003bece642b682985625db93cad93026
              }
  
              HandlerList.bakeAll();
-@@ -551,32 +552,37 @@ public final class SimplePluginManager implements PluginManager {
+@@ -538,32 +539,37 @@ public final class SimplePluginManager implements PluginManager {
              try {
                  plugin.getPluginLoader().disablePlugin(plugin);
              } catch (Throwable ex) {
@@ -552,7 +549,7 @@ index e7b1895d3918487d711afcbe41d76863d85c0a62..003bece642b682985625db93cad93026
              }
  
              try {
-@@ -589,6 +595,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -576,6 +582,13 @@ public final class SimplePluginManager implements PluginManager {
          }
      }
  
@@ -566,7 +563,7 @@ index e7b1895d3918487d711afcbe41d76863d85c0a62..003bece642b682985625db93cad93026
      @Override
      public void clearPlugins() {
          if (true) {this.paperPluginManager.clearPlugins(); return;} // Paper
-@@ -654,7 +667,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -641,7 +654,13 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {

patches/api/0026-Player-Tab-List-and-Title-APIs.patch

@@ -7,7 +7,7 @@ Co-authored-by: Fruxz <cedricspitzer@outlook.de>
 
 diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..20a028450667edf102b59b6b50ac6e890f2c34ab
+index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb902cb35d8c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/Title.java
 @@ -0,0 +1,420 @@
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..20a028450667edf102b59b6b50ac6e89
 + *
 + * @deprecated use {@link net.kyori.adventure.title.Title}
 + */
-+@Deprecated(since = "1.16.5")
++@Deprecated
 +public final class Title {
 +
 +    /**
@@ -432,10 +432,10 @@ index 0000000000000000000000000000000000000000..20a028450667edf102b59b6b50ac6e89
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 881c75e84ef31390a3519549985af2711e2828b5..fc8c807ae9793452bbf3fbab5e72d05676e6fa83 100644
+index 284bb156c4430a9a8afce0a7dffa96722b8c29cc..d5746291dd0cfc32591482945040e992ad1efb8e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1250,6 +1250,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1075,6 +1075,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }

patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -7,10 +7,10 @@ Upstream added methods for this so the original methods
 are now deprecated
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 67115810d5e837f154c3accd92dbb5e4192d264f..32e89741ffd895e31af0104a0126c2f72742a1bb 100644
+index 7c82644de3c438f45476ac02ce2c51c6fdbd543a..390bb294d09389877937ee2c6c3f346e65dfb178 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -243,12 +243,44 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -215,12 +215,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      public int getArrowsInBody();
  
@@ -35,28 +35,10 @@ index 67115810d5e837f154c3accd92dbb5e4192d264f..32e89741ffd895e31af0104a0126c2f7
       */
 -    public void setArrowsInBody(int count);
 +    void setArrowsInBody(int count, boolean fireEvent); // Paper
-+
-+    // Paper start - Add methods for working with arrows stuck in living entities
-+    /**
-+     * Sets the amount of ticks before the next arrow gets removed from the entities body.
-+     * <p>
-+     * A value of 0 will cause the server to re-calculate the amount of ticks on the next tick.
-+     *
-+     * @param ticks Amount of ticks
-+     */
-+    void setNextArrowRemoval(@org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int ticks);
-+
-+    /**
-+     * Gets the amount of ticks before the next arrow gets removed from the entities body.
-+     *
-+     * @return ticks Amount of ticks
-+     */
-+    int getNextArrowRemoval();
-+    // Paper end - Add methods for working with arrows stuck in living entities
  
      /**
       * Returns the living entity's current maximum no damage ticks.
-@@ -777,4 +809,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -722,4 +736,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @return Whether the entity is invisible
       */
      public boolean isInvisible();

patches/api/0028-Complete-resource-pack-API.patch

@@ -5,46 +5,23 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fc8c807ae9793452bbf3fbab5e72d05676e6fa83..93ff1e91c41273aa1b1cffe7c15b546f3a44d6b7 100644
+index d5746291dd0cfc32591482945040e992ad1efb8e..e12d28143a213abdc0552a15e82cacecc414ca26 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2207,6 +2207,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     void setResourcePack(@NotNull UUID uuid, @NotNull String url, byte @Nullable [] hash, net.kyori.adventure.text.@Nullable Component prompt, boolean force);
-     // Paper end
+@@ -1655,7 +1655,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @throws IllegalArgumentException Thrown if the URL is null.
+      * @throws IllegalArgumentException Thrown if the URL is too long. The
+      *     length restriction is an implementation specific arbitrary value.
++     * @deprecated use {@link #setResourcePack(String, String)}
+      */
++    @Deprecated // Paper
+     public void setResourcePack(@NotNull String url);
  
-+    // Paper start - more resource pack API
-+    /**
-+     * Request that the player's client download and switch resource packs.
-+     * <p>
-+     * The player's client will download the new resource pack asynchronously
-+     * in the background, and will automatically switch to it once the
-+     * download is complete. If the client has downloaded and cached the same
-+     * resource pack in the past, it will perform a quick timestamp check
-+     * over the network to determine if the resource pack has changed and
-+     * needs to be downloaded again. When this request is sent for the very
-+     * first time from a given server, the client will first display a
-+     * confirmation GUI to the player before proceeding with the download.
-+     * <p>
-+     * Notes:
-+     * <ul>
-+     * <li>Players can disable server resources on their client, in which
-+     *     case this method will have no affect on them.
-+     * <li>To remove a resource pack you can use
-+     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
-+     * </ul>
-+     *
-+     * @param url The URL from which the client will download the resource
-+     *     pack. The string must contain only US-ASCII characters and should
-+     *     be encoded as per RFC 1738.
-+     * @param hash A 40 character hexadecimal and lowercase SHA-1 digest of
-+     *     the resource pack file.
-+     * @throws IllegalArgumentException Thrown if the URL is null.
-+     * @throws IllegalArgumentException Thrown if the URL is too long. The
-+     *     length restriction is an implementation specific arbitrary value.
-+     */
-+    default void setResourcePack(final @NotNull String url, final @NotNull String hash) {
-+        this.setResourcePack(url, hash, false);
-+    }
+     /**
+@@ -2502,6 +2504,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
+         return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
+     }
 +
 +    /**
 +     * Request that the player's client download and switch resource packs.
@@ -62,8 +39,39 @@ index fc8c807ae9793452bbf3fbab5e72d05676e6fa83..93ff1e91c41273aa1b1cffe7c15b546f
 +     * <ul>
 +     * <li>Players can disable server resources on their client, in which
 +     *     case this method will have no affect on them.
-+     * <li>To remove a resource pack you can use
-+     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
++     * <li>There is no concept of resetting resource packs back to default
++     *     within Minecraft, so players will have to relog to do so.
++     * </ul>
++     *
++     * @param url The URL from which the client will download the resource
++     *     pack. The string must contain only US-ASCII characters and should
++     *     be encoded as per RFC 1738.
++     * @param hash A 40 character hexadecimal and lowercase SHA-1 digest of
++     *     the resource pack file.
++     * @throws IllegalArgumentException Thrown if the URL is null.
++     * @throws IllegalArgumentException Thrown if the URL is too long. The
++     *     length restriction is an implementation specific arbitrary value.
++     */
++    void setResourcePack(@NotNull String url, @NotNull String hash);
++
++    /**
++     * Request that the player's client download and switch resource packs.
++     * <p>
++     * The player's client will download the new resource pack asynchronously
++     * in the background, and will automatically switch to it once the
++     * download is complete. If the client has downloaded and cached the same
++     * resource pack in the past, it will perform a quick timestamp check
++     * over the network to determine if the resource pack has changed and
++     * needs to be downloaded again. When this request is sent for the very
++     * first time from a given server, the client will first display a
++     * confirmation GUI to the player before proceeding with the download.
++     * <p>
++     * Notes:
++     * <ul>
++     * <li>Players can disable server resources on their client, in which
++     *     case this method will have no affect on them.
++     * <li>There is no concept of resetting resource packs back to default
++     *     within Minecraft, so players will have to relog to do so.
 +     * </ul>
 +     *
 +     * @param url The URL from which the client will download the resource
@@ -76,9 +84,7 @@ index fc8c807ae9793452bbf3fbab5e72d05676e6fa83..93ff1e91c41273aa1b1cffe7c15b546f
 +     * @throws IllegalArgumentException Thrown if the URL is too long. The
 +     *     length restriction is an implementation specific arbitrary value.
 +     */
-+    default void setResourcePack(final @NotNull String url, final @NotNull String hash, final boolean required) {
-+        this.setResourcePack(url, hash, required, null);
-+    }
++    void setResourcePack(@NotNull String url, @NotNull String hash, boolean required);
 +
 +    /**
 +     * Request that the player's client download and switch resource packs.
@@ -96,8 +102,8 @@ index fc8c807ae9793452bbf3fbab5e72d05676e6fa83..93ff1e91c41273aa1b1cffe7c15b546f
 +     * <ul>
 +     * <li>Players can disable server resources on their client, in which
 +     *     case this method will have no affect on them.
-+     * <li>To remove a resource pack you can use
-+     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
++     * <li>There is no concept of resetting resource packs back to default
++     *     within Minecraft, so players will have to relog to do so.
 +     * </ul>
 +     *
 +     * @param url The URL from which the client will download the resource
@@ -111,102 +117,66 @@ index fc8c807ae9793452bbf3fbab5e72d05676e6fa83..93ff1e91c41273aa1b1cffe7c15b546f
 +     * @throws IllegalArgumentException Thrown if the URL is too long. The
 +     *     length restriction is an implementation specific arbitrary value.
 +     */
-+    default void setResourcePack(final @NotNull String url, final @NotNull String hash, final boolean required, final net.kyori.adventure.text.@Nullable Component resourcePackPrompt) {
-+        this.setResourcePack(UUID.nameUUIDFromBytes(url.getBytes(java.nio.charset.StandardCharsets.UTF_8)), url, hash, resourcePackPrompt, required);
-+    }
-+
++    void setResourcePack(@NotNull String url, @NotNull String hash, boolean required, @Nullable net.kyori.adventure.text.Component resourcePackPrompt);
 +    /**
-+     * Request that the player's client download and switch resource packs.
-+     * <p>
-+     * The player's client will download the new resource pack asynchronously
-+     * in the background, and will automatically switch to it once the
-+     * download is complete. If the client has downloaded and cached the same
-+     * resource pack in the past, it will perform a quick timestamp check
-+     * over the network to determine if the resource pack has changed and
-+     * needs to be downloaded again. When this request is sent for the very
-+     * first time from a given server, the client will first display a
-+     * confirmation GUI to the player before proceeding with the download.
-+     * <p>
-+     * Notes:
-+     * <ul>
-+     * <li>Players can disable server resources on their client, in which
-+     *     case this method will have no affect on them.
-+     * <li>To remove a resource pack you can use
-+     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
-+     * </ul>
-+     *
-+     * @param uuid Unique resource pack ID.
-+     * @param url The URL from which the client will download the resource
-+     *     pack. The string must contain only US-ASCII characters and should
-+     *     be encoded as per RFC 1738.
-+     * @param hash A 40 character hexadecimal and lowercase SHA-1 digest of
-+     *     the resource pack file.
-+     * @param resourcePackPrompt A Prompt to be displayed in the client request
-+     * @param required Marks if the resource pack should be required by the client
-+     * @throws IllegalArgumentException Thrown if the URL is null.
-+     * @throws IllegalArgumentException Thrown if the URL is too long. The
-+     *     length restriction is an implementation specific arbitrary value.
++     * @return the most recent resource pack status received from the player,
++     *         or null if no status has ever been received from this player.
 +     */
-+    default void setResourcePack(final @NotNull UUID uuid, final @NotNull String url, final @NotNull String hash, final net.kyori.adventure.text.@Nullable Component resourcePackPrompt, final boolean required) {
-+        this.sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest.resourcePackRequest()
-+            .required(required)
-+            .replace(true)
-+            .prompt(resourcePackPrompt)
-+            .packs(net.kyori.adventure.resource.ResourcePackInfo.resourcePackInfo(uuid, java.net.URI.create(url), hash))
-+        );
-+    }
++    @Nullable
++    org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus();
 +
 +    /**
-+     * Gets the most recent resource pack status from the player.
++     * @return the most recent resource pack hash received from the player,
++     *         or null if no hash has ever been received from this player.
 +     *
-+     * @return the most recent status or null
-+     */
-+    org.bukkit.event.player.PlayerResourcePackStatusEvent.@Nullable Status getResourcePackStatus();
-+
-+    /**
-+     * Gets the most recent pack hash from the player.
-+     *
-+     * @return the most recent hash or null
 +     * @deprecated This is no longer sent from the client and will always be null
 +     */
-+    @Deprecated(forRemoval = true, since = "1.13.2")
-+    @org.jetbrains.annotations.Contract("-> null")
-+    default @Nullable String getResourcePackHash() {
-+        return null;
-+    }
++    @Nullable
++    @Deprecated
++    String getResourcePackHash();
 +
 +    /**
-+     * Gets if the last resource pack status from the player
-+     * was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}.
-+     *
-+     * @return true if last status was successfully loaded
++     * @return true if the last resource pack status received from this player
++     *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
 +     */
-+    default boolean hasResourcePack() {
-+        return this.getResourcePackStatus() == org.bukkit.event.player.PlayerResourcePackStatusEvent.Status.SUCCESSFULLY_LOADED;
-+    }
-+    // Paper end - more resource pack API
-+
-     /**
-      * Request that the player's client download and include another resource pack.
-      * <p>
++    boolean hasResourcePack();
+     // Paper end
+ 
+     // Spigot start
 diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-index e2c4f9a0456cef345772d57b4d9c6e7d9598dd53..e4c32b21ab013703a6a1b07a1ad564d914ebe83f 100644
+index b98195650d49d78ec35970ca0376b6289b861e4b..4c2102a11c3d682d98f0db4ccafa35231e66bcdd 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-@@ -21,6 +21,16 @@ public class PlayerResourcePackStatusEvent extends PlayerEvent {
+@@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull;
+ public class PlayerResourcePackStatusEvent extends PlayerEvent {
+ 
+     private static final HandlerList handlers = new HandlerList();
++    @Deprecated
++    private final String hash; // Paper
+     private final Status status;
+ 
+     public PlayerResourcePackStatusEvent(@NotNull final Player who, @NotNull Status resourcePackStatus) {
+         super(who);
++        this.hash = null; // Paper
          this.status = resourcePackStatus;
      }
  
-+    // Paper start - add hash (not used anymore)
++    @Deprecated // Paper
++    public PlayerResourcePackStatusEvent(final Player who, Status resourcePackStatus, String hash) {
++        super(who);
++        this.hash = hash; // Paper
++        this.status = resourcePackStatus;
++    }
++
++    @Deprecated
 +    /**
 +     * @deprecated Hash does not seem to ever be set
 +     */
-+    @Deprecated(forRemoval = true)
 +    public String getHash() {
-+        return null;
++        return this.hash;
 +    }
 +    // Paper end
 +
      /**
-      * Gets the unique ID of this pack.
+      * Gets the status of this pack.
       *

patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 25f506c344883d00a63ee2b5a998d3ff3ffd6cd5..8dc5b43e937405070d9bdbd914fcdec243e59983 100644
+index 9d1f1b97a16524ba1d523dd9130f113f0cf3e779..cb1c05f5844724f8c937fac2d7f2a878631d1936 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2357,6 +2357,13 @@ public final class Bukkit {
+@@ -2276,6 +2276,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 25f506c344883d00a63ee2b5a998d3ff3ffd6cd5..8dc5b43e937405070d9bdbd914fcdec2
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 65d68716e1ff8277c534399621cf961ddf312509..47766c5312a402e3329a1d4bc5e5e0c05f2b007f 100644
+index 38e3bc502e66229a24833ab1eebba6816155fa19..09c8e8376da0eb0590f09d1ac43595c3825daf06 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2065,4 +2065,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2012,4 +2012,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      Spigot spigot();
      // Spigot end

patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -6,130 +6,74 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..1d8e3c93a139bba11affca74b742269f24300d2c
+index 0000000000000000000000000000000000000000..07660202e41ee86f1b66bad3335cf6fe126e7f9c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,32 @@
 +package com.destroystokyo.paper.event.entity;
 +
-+import org.bukkit.World;
 +import org.bukkit.entity.Entity;
++import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.CreatureSpawnEvent;
 +import org.bukkit.event.entity.EntityEvent;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
-+ * Fired any time an entity is being added to the world for any reason (including a chunk loading).
-+ * <p>
-+ * Not to be confused with {@link CreatureSpawnEvent}
++ * Fired any time an entity is being added to the world for any reason.
++ *
++ * Not to be confused with {@link org.bukkit.event.entity.CreatureSpawnEvent}
++ * This will fire anytime a chunk is reloaded too.
 + */
 +public class EntityAddToWorldEvent extends EntityEvent {
 +
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    @NotNull private final World world;
-+
-+    @ApiStatus.Internal
-+    public EntityAddToWorldEvent(@NotNull Entity entity, @NotNull World world) {
++    public EntityAddToWorldEvent(@NotNull Entity entity) {
 +        super(entity);
-+        this.world = world;
 +    }
 +
-+    /**
-+     * @return The world that the entity is being added to
-+     */
-+    @NotNull
-+    public World getWorld() {
-+        return this.world;
-+    }
++    private static final HandlerList handlers = new HandlerList();
 +
 +    @NotNull
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d75e6a8334c7408ea8c3f155414fc14dc427f190
+index 0000000000000000000000000000000000000000..e5dbbd660409bae0d3b96e83390511d3a423a52e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,29 @@
 +package com.destroystokyo.paper.event.entity;
 +
-+import org.bukkit.World;
 +import org.bukkit.entity.Entity;
++import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
-+ * Fired any time an entity is being removed from a world for any reason (including a chunk unloading).
-+ * Note: The entity is updated prior to this event being called, as such, the entity's world may not be equal to {@link #getWorld()}.
++ * Fired any time an entity is being removed from a world for any reason
 + */
 +public class EntityRemoveFromWorldEvent extends EntityEvent {
 +
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    @NotNull private final World world;
-+
-+    @ApiStatus.Internal
-+    public EntityRemoveFromWorldEvent(@NotNull Entity entity, @NotNull World world) {
++    public EntityRemoveFromWorldEvent(@NotNull Entity entity) {
 +        super(entity);
-+        this.world = world;
 +    }
 +
-+    /**
-+     * @return The world that the entity is being removed from
-+     */
-+    @NotNull
-+    public World getWorld() {
-+        return this.world;
-+    }
++    private static final HandlerList handlers = new HandlerList();
 +
 +    @NotNull
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +}
-diff --git a/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java b/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java
-index e32df91d911bae42c8137c6f952a6ac6a94d27e0..8ed5d1ccc44951089999db360219b556db89b4ba 100644
---- a/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java
-@@ -1,5 +1,6 @@
- package org.bukkit.event.entity;
- 
-+import com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent;
- import org.bukkit.entity.Entity;
- import org.bukkit.event.HandlerList;
- import org.jetbrains.annotations.ApiStatus;
-@@ -11,8 +12,9 @@ import org.jetbrains.annotations.NotNull;
-  * This event should only be used for monitoring. The result
-  * of modifying the entity during or after this event is unspecified.
-  * This event is not called for a {@link org.bukkit.entity.Player}.
-+ * @deprecated use {@link EntityRemoveFromWorldEvent} instead
-  */
--@ApiStatus.Experimental
-+@Deprecated(forRemoval = true)
- public class EntityRemoveEvent extends EntityEvent {
- 
-     private static final HandlerList handlers = new HandlerList();
-@@ -112,5 +114,6 @@ public class EntityRemoveEvent extends EntityEvent {
-          * When the chunk an entity is in gets unloaded.
-          */
-         UNLOAD,
-+        DISCARD
-     }
- }

patches/api/0034-EntityPathfindEvent.patch

@@ -7,10 +7,10 @@ Fires when an Entity decides to start moving to a location.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..8267e8f1f0ade29a284831069e1268ee4b29e109
+index 0000000000000000000000000000000000000000..63e46b2fb1b12b36fcb1e98b178cf29dd2e3d1b5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,82 @@
 +package com.destroystokyo.paper.event.entity;
 +
 +import org.bukkit.Location;
@@ -18,83 +18,78 @@ index 0000000000000000000000000000000000000000..8267e8f1f0ade29a284831069e1268ee
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
 +/**
 + * Fired when an Entity decides to start moving towards a location.
-+ * <p>
++ *
 + * This event does not fire for the entities actual movement. Only when it
 + * is choosing to start moving to a location.
 + */
 +public class EntityPathfindEvent extends EntityEvent implements Cancellable {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
 +    @Nullable private final Entity targetEntity;
-+    @NotNull private final Location location;
-+    private boolean cancelled;
++    @NotNull private final Location loc;
 +
-+    @ApiStatus.Internal
-+    public EntityPathfindEvent(@NotNull Entity entity, @NotNull Location location, @Nullable Entity targetEntity) {
++    public EntityPathfindEvent(@NotNull Entity entity, @NotNull Location loc, @Nullable Entity targetEntity) {
 +        super(entity);
 +        this.targetEntity = targetEntity;
-+        this.location = location;
++        this.loc = loc;
 +    }
 +
 +    /**
 +     * The Entity that is pathfinding.
-+     *
 +     * @return The Entity that is pathfinding.
 +     */
 +    @NotNull
 +    public Entity getEntity() {
-+        return this.entity;
++        return entity;
 +    }
 +
 +    /**
 +     * If the Entity is trying to pathfind to an entity, this is the entity in relation.
-+     * <br>
-+     * Otherwise this will return {@code null}.
 +     *
-+     * @return The entity target or {@code null}
++     * Otherwise this will return null.
++     *
++     * @return The entity target or null
 +     */
 +    @Nullable
 +    public Entity getTargetEntity() {
-+        return this.targetEntity;
++        return targetEntity;
 +    }
 +
 +    /**
 +     * The Location of where the entity is about to move to.
-+     * <br>
-+     * Note that if the target happened to of been an entity
 +     *
++     * Note that if the target happened to of been an entity
 +     * @return Location of where the entity is trying to pathfind to.
 +     */
 +    @NotNull
 +    public Location getLoc() {
-+        return this.location.clone();
++        return loc;
 +    }
 +
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
++    private static final HandlerList handlers = new HandlerList();
 +
 +    @NotNull
-+    @Override
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
++    }
++
++    private boolean cancelled = false;
++
++    @Override
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        cancelled = cancel;
 +    }
 +}

patches/api/0037-Add-PlayerUseUnknownEntityEvent.patch

@@ -10,41 +10,37 @@ Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..dbb635686e9108b9d3df5d373e6972cca07c0621
+index 0000000000000000000000000000000000000000..a7228e248e3d8eb2e9f011dfe2c7dd9f3f48000f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,82 @@
 +package com.destroystokyo.paper.event.player;
 +
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.player.PlayerEvent;
-+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 +import org.bukkit.inventory.EquipmentSlot;
 +import org.bukkit.util.Vector;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
 +/**
 + * Represents an event that is called when a player right-clicks an unknown entity.
-+ * Useful for plugins dealing with virtual entities (entities that aren't actually spawned on the server).
++ * Useful for plugins dealing with virtual entities (entities that don't actually spawned on the server).
 + * <br>
 + * This event may be called multiple times per interaction with different interaction hands
 + * and with or without the clicked position.
 + */
 +public class PlayerUseUnknownEntityEvent extends PlayerEvent {
 +
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
++    private static final HandlerList HANDLERS = new HandlerList();
 +    private final int entityId;
 +    private final boolean attack;
 +    private final @NotNull EquipmentSlot hand;
 +    private final @Nullable Vector clickedPosition;
 +
-+    @ApiStatus.Internal
-+    public PlayerUseUnknownEntityEvent(@NotNull Player player, int entityId, boolean attack, @NotNull EquipmentSlot hand, @Nullable Vector clickedPosition) {
-+        super(player);
++    public PlayerUseUnknownEntityEvent(@NotNull Player who, int entityId, boolean attack, @NotNull EquipmentSlot hand, @Nullable Vector clickedPosition) {
++        super(who);
 +        this.entityId = entityId;
 +        this.attack = attack;
 +        this.hand = hand;
@@ -63,7 +59,7 @@ index 0000000000000000000000000000000000000000..dbb635686e9108b9d3df5d373e6972cc
 +    /**
 +     * Returns whether the interaction was an attack.
 +     *
-+     * @return {@code true} if the player is attacking the entity, {@code false} if the player is interacting with the entity
++     * @return true if the player is attacking the entity, false if the player is interacting with the entity
 +     */
 +    public boolean isAttack() {
 +        return this.attack;
@@ -79,11 +75,11 @@ index 0000000000000000000000000000000000000000..dbb635686e9108b9d3df5d373e6972cc
 +    }
 +
 +    /**
-+     * Returns the position relative to the entity that was clicked, or {@code null} if not available.
-+     * See {@link PlayerInteractAtEntityEvent} for more details.
++     * Returns the position relative to the entity that was clicked, or null if not available.
++     * See {@link org.bukkit.event.player.PlayerInteractAtEntityEvent} for more details.
 +     *
-+     * @return the position relative to the entity that was clicked, or {@code null} if not available
-+     * @see PlayerInteractAtEntityEvent
++     * @return the position relative to the entity that was clicked, or null if not available
++     * @see org.bukkit.event.player.PlayerInteractAtEntityEvent
 +     */
 +    public @Nullable Vector getClickedRelativePosition() {
 +        return this.clickedPosition != null ? this.clickedPosition.clone() : null;
@@ -92,11 +88,11 @@ index 0000000000000000000000000000000000000000..dbb635686e9108b9d3df5d373e6972cc
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return HANDLERS;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return HANDLERS;
 +    }
 +}

patches/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -7,10 +7,10 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7c049bad187b94331f42f96833d1cf4ce03ef477
+index 0000000000000000000000000000000000000000..59ae7bc3a0a2079fe4b3a92d777aca682a58e4e3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,277 @@
 +package com.destroystokyo.paper.event.player;
 +
 +import com.google.common.base.Preconditions;
@@ -20,7 +20,6 @@ index 0000000000000000000000000000000000000000..7c049bad187b94331f42f96833d1cf4c
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
@@ -28,18 +27,18 @@ index 0000000000000000000000000000000000000000..7c049bad187b94331f42f96833d1cf4c
 +
 +/**
 + * This event is fired during a player handshake.
-+ * <p>
-+ * If there are no listeners listening to this event, the logic default
-+ * to your server platform will be run.
++ *
++ * <p>If there are no listeners listening to this event, the logic default
++ * to your server platform will be ran.</p>
 + *
 + * <p>WARNING: TAMPERING WITH THIS EVENT CAN BE DANGEROUS</p>
 + */
 +public class PlayerHandshakeEvent extends Event implements Cancellable {
 +
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
++    private static final HandlerList HANDLERS = new HandlerList();
 +    @NotNull private final String originalHandshake;
 +    @NotNull private final String originalSocketAddressHostname;
++    private boolean cancelled;
 +    @Nullable private String serverHostname;
 +    @Nullable private String socketAddressHostname;
 +    @Nullable private UUID uniqueId;
@@ -47,15 +46,26 @@ index 0000000000000000000000000000000000000000..7c049bad187b94331f42f96833d1cf4c
 +    private boolean failed;
 +    private Component failMessage = Component.text("If you wish to use IP forwarding, please enable it in your BungeeCord config as well!", NamedTextColor.YELLOW);
 +
-+    private boolean cancelled;
-+
++    /**
++     * Creates a new {@link PlayerHandshakeEvent}.
++     *
++     * @param originalHandshake the original handshake string
++     * @param cancelled if this event is enabled
++     *
++     * @deprecated in favour of {@link PlayerHandshakeEvent(String, String, boolean)}
++     */
 +    @Deprecated
-+    @ApiStatus.Internal
 +    public PlayerHandshakeEvent(@NotNull String originalHandshake, boolean cancelled) {
 +        this(originalHandshake, "127.0.0.1", cancelled);
 +    }
 +
-+    @ApiStatus.Internal
++    /**
++     * Creates a new {@link PlayerHandshakeEvent}.
++     *
++     * @param originalHandshake the original handshake string
++     * @param originalSocketAddressHostname the original socket address hostname
++     * @param cancelled if this event is enabled
++     */
 +    public PlayerHandshakeEvent(@NotNull String originalHandshake, @NotNull String originalSocketAddressHostname, boolean cancelled) {
 +        super(true);
 +        this.originalHandshake = originalHandshake;
@@ -65,9 +75,9 @@ index 0000000000000000000000000000000000000000..7c049bad187b94331f42f96833d1cf4c
 +
 +    /**
 +     * Determines if this event is cancelled.
-+     * <p>
-+     * When this event is cancelled, custom handshake logic will not
-+     * be processed.
++     *
++     * <p>When this event is cancelled, custom handshake logic will not
++     * be processed.</p>
 +     *
 +     * @return {@code true} if this event is cancelled, {@code false} otherwise
 +     */
@@ -78,15 +88,15 @@ index 0000000000000000000000000000000000000000..7c049bad187b94331f42f96833d1cf4c
 +
 +    /**
 +     * Sets if this event is cancelled.
-+     * <p>
-+     * When this event is cancelled, custom handshake logic will not
-+     * be processed.
 +     *
-+     * @param cancel {@code true} if this event is cancelled, {@code false} otherwise
++     * <p>When this event is cancelled, custom handshake logic will not
++     * be processed.</p>
++     *
++     * @param cancelled {@code true} if this event is cancelled, {@code false} otherwise
 +     */
 +    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
++    public void setCancelled(boolean cancelled) {
++        this.cancelled = cancelled;
 +    }
 +
 +    /**
@@ -191,9 +201,9 @@ index 0000000000000000000000000000000000000000..7c049bad187b94331f42f96833d1cf4c
 +
 +    /**
 +     * Determines if authentication failed.
-+     * <p>
-+     * When {@code true}, the client connecting will be disconnected
-+     * with the {@link #getFailMessage() fail message}.
++     *
++     * <p>When {@code true}, the client connecting will be disconnected
++     * with the {@link #getFailMessage() fail message}.</p>
 +     *
 +     * @return {@code true} if authentication failed, {@code false} otherwise
 +     */
@@ -203,9 +213,9 @@ index 0000000000000000000000000000000000000000..7c049bad187b94331f42f96833d1cf4c
 +
 +    /**
 +     * Sets if authentication failed and the client should be disconnected.
-+     * <p>
-+     * When {@code true}, the client connecting will be disconnected
-+     * with the {@link #getFailMessage() fail message}.
++     *
++     * <p>When {@code true}, the client connecting will be disconnected
++     * with the {@link #getFailMessage() fail message}.</p>
 +     *
 +     * @param failed {@code true} if authentication failed, {@code false} otherwise
 +     */
@@ -270,11 +280,11 @@ index 0000000000000000000000000000000000000000..7c049bad187b94331f42f96833d1cf4c
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return HANDLERS;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return HANDLERS;
 +    }
 +}

patches/api/0039-Arrow-pickup-rule-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index 9a0a1fa4b7a7e1e1174a75a388081b332d4bedbd..839e5b7df49f42b5fec7729997bef3370ba36d80 100644
+index 5b50a4e10e8ace8cc53ad3c8d7c3185f88d5c8db..e8e56e89e32d84af0639fe2e9b0eeabd747b6007 100644
 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java
 +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
-@@ -160,4 +160,38 @@ public interface AbstractArrow extends Projectile {
+@@ -141,4 +141,38 @@ public interface AbstractArrow extends Projectile {
           */
          CREATIVE_ONLY
      }

patches/api/0041-LootTable-API.patch

@@ -58,10 +58,10 @@ index 0000000000000000000000000000000000000000..b387894fe8001edb41ad2ad2b70ebabe
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b18a0b50c12fe8d8c954e5c070f2ecd1854a2583
+index 0000000000000000000000000000000000000000..2b01a50b6e18856f4c9e28340a7a111cae646a0a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,125 @@
 +package com.destroystokyo.paper.loottable;
 +
 +import org.bukkit.entity.Player;
@@ -101,8 +101,8 @@ index 0000000000000000000000000000000000000000..b18a0b50c12fe8d8c954e5c070f2ecd1
 +     * @param player The player to check
 +     * @return Whether or not this player has looted this block
 +     */
-+    default boolean hasPlayerLooted(final @NotNull Player player) {
-+        return this.hasPlayerLooted(player.getUniqueId());
++    default boolean hasPlayerLooted(@NotNull Player player) {
++        return hasPlayerLooted(player.getUniqueId());
 +    }
 +
 +    /**
@@ -127,8 +127,9 @@ index 0000000000000000000000000000000000000000..b18a0b50c12fe8d8c954e5c070f2ecd1
 +     * @param player The player to check
 +     * @return Timestamp last looted, or null if player has not looted this object
 +     */
-+    default @Nullable Long getLastLooted(final @NotNull Player player) {
-+        return this.getLastLooted(player.getUniqueId());
++    @Nullable
++    default Long getLastLooted(@NotNull Player player) {
++        return getLastLooted(player.getUniqueId());
 +    }
 +
 +    /**
@@ -146,8 +147,8 @@ index 0000000000000000000000000000000000000000..b18a0b50c12fe8d8c954e5c070f2ecd1
 +     * @param looted true to add player to looted list, false to remove
 +     * @return The previous state of whether the player had looted this or not
 +     */
-+    default boolean setHasPlayerLooted(final @NotNull Player player, final boolean looted) {
-+        return this.setHasPlayerLooted(player.getUniqueId(), looted);
++    default boolean setHasPlayerLooted(@NotNull Player player, boolean looted) {
++        return setHasPlayerLooted(player.getUniqueId(), looted);
 +    }
 +
 +    /**
@@ -188,27 +189,21 @@ index 0000000000000000000000000000000000000000..b18a0b50c12fe8d8c954e5c070f2ecd1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..5ee1a04aaaa4ef09559f2cf757811e463e2a1be6
+index 0000000000000000000000000000000000000000..fd184f13f5e8ee5cf829fff4f44696e1f760430b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,45 @@
 +package com.destroystokyo.paper.loottable;
 +
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.player.PlayerEvent;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +public class LootableInventoryReplenishEvent extends PlayerEvent implements Cancellable {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
 +    @NotNull private final LootableInventory inventory;
-+    private boolean cancelled;
 +
-+    @ApiStatus.Internal
 +    public LootableInventoryReplenishEvent(@NotNull Player player, @NotNull LootableInventory inventory) {
 +        super(player);
 +        this.inventory = inventory;
@@ -216,27 +211,31 @@ index 0000000000000000000000000000000000000000..5ee1a04aaaa4ef09559f2cf757811e46
 +
 +    @NotNull
 +    public LootableInventory getInventory() {
-+        return this.inventory;
++        return inventory;
 +    }
 +
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
++    private static final HandlerList handlers = new HandlerList();
 +
 +    @NotNull
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
++    }
++
++    private boolean cancelled = false;
++
++    @Override
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        cancelled = cancel;
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/block/Barrel.java b/src/main/java/org/bukkit/block/Barrel.java
@@ -270,19 +269,6 @@ index b451191312e4fb19f2131c2d0a0c0337953f6c7c..db6affbc78106b2d93b41953b624a0bc
  
      /**
       * Gets the inventory of the chest block represented by this block state.
-diff --git a/src/main/java/org/bukkit/block/Crafter.java b/src/main/java/org/bukkit/block/Crafter.java
-index 05d6af1681351844a6673a6d0dfca2038dafa7b6..8b2a315ed5dd1c57ce60fc41fd5e83a6495028e6 100644
---- a/src/main/java/org/bukkit/block/Crafter.java
-+++ b/src/main/java/org/bukkit/block/Crafter.java
-@@ -10,7 +10,7 @@ import org.jetbrains.annotations.ApiStatus;
-  */
- @ApiStatus.Experimental
- @MinecraftExperimental(Requires.UPDATE_1_21)
--public interface Crafter extends Container, Lootable {
-+public interface Crafter extends Container, com.destroystokyo.paper.loottable.LootableBlockInventory { // Paper - LootTable API
- 
-     /**
-      * Gets the number of ticks which this block will remain in the crafting
 diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
 index 74cd194c9a98245dc52e7e352d7d6c046e1e5cf3..07af1a3f011d4b96275f919d302ac367198e923e 100644
 --- a/src/main/java/org/bukkit/block/Dispenser.java
@@ -367,23 +353,6 @@ index 5b5c3be107fdaa6c55ceb1bca2c223ebc6ab7f43..4ebe1033c55dbd58d0794809435c9352
 -public interface ChestBoat extends Boat, InventoryHolder, Lootable {
 +public interface ChestBoat extends Boat, InventoryHolder, com.destroystokyo.paper.loottable.LootableEntityInventory { // Paper
  }
-diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index 2926fa6071bc7640cc10280b5c3962b0ce7686f1..f3f62e13cc1b6172808c52f2d5f520f1f584e6db 100644
---- a/src/main/java/org/bukkit/entity/Mob.java
-+++ b/src/main/java/org/bukkit/entity/Mob.java
-@@ -61,4 +61,12 @@ public interface Mob extends LivingEntity, Lootable {
-      */
-     @Nullable
-     public Sound getAmbientSound();
-+
-+    // Paper start - LootTable API
-+    @Override
-+    default void setLootTable(final @Nullable org.bukkit.loot.LootTable table, final long seed) {
-+        this.setLootTable(table);
-+        this.setSeed(seed);
-+    }
-+    // Paper end - LootTable API
- }
 diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 index 937b99f8734d71b2ad33af142afbc251b81d9745..db69687a7ad4b18d17ab1677cae5d8dd4dcd3678 100644
 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
@@ -423,10 +392,10 @@ index 9ea403e6fd8e960d017660e0aec118abeda2c42b..238d118f7788b13cd86b7e9ea3a0fc38
 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper
  }
 diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java
-index 24a3d989db3bc67e7afe8459a3d4bb132f448ea7..ad4b0fb7f55ed44dc74fb5a4bd36be6004231116 100644
+index 24a3d989db3bc67e7afe8459a3d4bb132f448ea7..901db852498e0658c79a57582508dab29bf0a798 100644
 --- a/src/main/java/org/bukkit/loot/Lootable.java
 +++ b/src/main/java/org/bukkit/loot/Lootable.java
-@@ -36,6 +36,31 @@ public interface Lootable {
+@@ -36,6 +36,34 @@ public interface Lootable {
      @Nullable
      LootTable getLootTable();
  
@@ -437,21 +406,24 @@ index 24a3d989db3bc67e7afe8459a3d4bb132f448ea7..ad4b0fb7f55ed44dc74fb5a4bd36be60
 +     * @param table the Loot Table this {@link org.bukkit.block.Container} or {@link org.bukkit.entity.Mob} will have.
 +     * @param seed the seed to used to generate loot. Default is 0.
 +     */
-+    void setLootTable(final @Nullable LootTable table, final long seed);
++    default void setLootTable(@Nullable LootTable table, long seed) {
++        setLootTable(table);
++        setSeed(seed);
++    }
 +
 +    /**
 +     * Returns whether or not this object has a Loot Table
 +     * @return Has a loot table
 +     */
 +    default boolean hasLootTable() {
-+        return this.getLootTable() != null;
++        return getLootTable() != null;
 +    }
 +
 +    /**
 +     * Clears the associated Loot Table to this object
 +     */
 +    default void clearLootTable() {
-+        this.setLootTable(null);
++        setLootTable(null);
 +    }
 +    // Paper end
 +

patches/api/0042-Add-EntityZapEvent.patch

@@ -6,12 +6,13 @@ Subject: [PATCH] Add EntityZapEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..dc6d15975a47e68c5bd939e68ddd2773028a6ac8
+index 0000000000000000000000000000000000000000..1c5fa066c9e5e1b1a06df30842a4c7acc4742df8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,64 @@
 +package com.destroystokyo.paper.event.entity;
 +
++import com.google.common.base.Preconditions;
 +import org.bukkit.entity.Entity;
 +import org.bukkit.entity.LightningStrike;
 +import org.bukkit.event.Cancellable;
@@ -19,89 +20,91 @@ index 0000000000000000000000000000000000000000..dc6d15975a47e68c5bd939e68ddd2773
 +import org.bukkit.event.entity.EntityTransformEvent;
 +
 +import java.util.Collections;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
-+ * Fired when lightning strikes an entity
++ *  Fired when lightning strikes an entity
 + */
 +public class EntityZapEvent extends EntityTransformEvent implements Cancellable {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    @NotNull private final LightningStrike bolt;
++    private static final HandlerList handlers = new HandlerList();
 +    private boolean cancelled;
++    @NotNull private final LightningStrike bolt;
 +
-+    @ApiStatus.Internal
 +    public EntityZapEvent(@NotNull final Entity entity, @NotNull final LightningStrike bolt, @NotNull final Entity replacementEntity) {
 +        super(entity, Collections.singletonList(replacementEntity), TransformReason.LIGHTNING);
++        Preconditions.checkNotNull(bolt);
++        Preconditions.checkNotNull(replacementEntity);
 +        this.bolt = bolt;
 +    }
 +
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    public void setCancelled(boolean cancel) {
++        this.cancelled = cancel;
++    }
++
 +    /**
 +     * Gets the lightning bolt that is striking the entity.
-+     *
 +     * @return The lightning bolt responsible for this event
 +     */
 +    @NotNull
 +    public LightningStrike getBolt() {
-+        return this.bolt;
++        return bolt;
 +    }
 +
 +    /**
 +     * Gets the entity that will replace the struck entity.
-+     *
 +     * @return The entity that will replace the struck entity
 +     */
 +    @NotNull
 +    public Entity getReplacementEntity() {
-+        return super.getTransformedEntity();
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
++        return getTransformedEntity();
 +    }
 +
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0e0ed93b568fd2c0d8f6e359c31dc29cb0fa71c2..085337f3d3d6adef5fd4ecda133c607e4b77bd93 100644
+index 0e0ed93b568fd2c0d8f6e359c31dc29cb0fa71c2..d3949edfc736b3d67a627ef378748b374769e183 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-@@ -12,14 +12,14 @@ import org.jetbrains.annotations.NotNull;
+@@ -2,6 +2,7 @@ package org.bukkit.event.entity;
+ 
+ import java.util.Collections;
+ import org.bukkit.entity.Entity;
++import com.destroystokyo.paper.event.entity.EntityZapEvent;
+ import org.bukkit.entity.LightningStrike;
+ import org.bukkit.entity.Pig;
+ import org.bukkit.entity.PigZombie;
+@@ -12,14 +13,14 @@ import org.jetbrains.annotations.NotNull;
  /**
   * Stores data for pigs being zapped
   */
 -public class PigZapEvent extends EntityTransformEvent implements Cancellable {
 -    private static final HandlerList handlers = new HandlerList();
-+public class PigZapEvent extends com.destroystokyo.paper.event.entity.EntityZapEvent implements Cancellable { // Paper
-+    // private static final HandlerList handlers = new HandlerList(); // Paper - moved in the super class
++public class PigZapEvent extends EntityZapEvent implements Cancellable {
++    //private static final HandlerList handlers = new HandlerList();
      private boolean canceled;
      private final PigZombie pigzombie;
      private final LightningStrike bolt;
  
      public PigZapEvent(@NotNull final Pig pig, @NotNull final LightningStrike bolt, @NotNull final PigZombie pigzombie) {
 -        super(pig, Collections.singletonList((Entity) pigzombie), TransformReason.LIGHTNING);
-+        super(pig, bolt, pigzombie); // Paper
++        super(pig, bolt, pigzombie);
          this.bolt = bolt;
          this.pigzombie = pigzombie;
      }
-@@ -63,6 +63,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
+@@ -63,6 +64,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
          return pigzombie;
      }
  
@@ -110,7 +113,7 @@ index 0e0ed93b568fd2c0d8f6e359c31dc29cb0fa71c2..085337f3d3d6adef5fd4ecda133c607e
      @NotNull
      @Override
      public HandlerList getHandlers() {
-@@ -73,4 +75,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
+@@ -73,4 +76,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
      public static HandlerList getHandlerList() {
          return handlers;
      }

patches/api/0044-Allow-Reloading-of-Command-Aliases.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8dc5b43e937405070d9bdbd914fcdec243e59983..fdf5b8c69e98e000f897aca73ef97fa03371bb7c 100644
+index cb1c05f5844724f8c937fac2d7f2a878631d1936..c58a61b15838b17c40c11edae0a3677ec7bddedb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2364,6 +2364,15 @@ public final class Bukkit {
+@@ -2283,6 +2283,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 8dc5b43e937405070d9bdbd914fcdec243e59983..fdf5b8c69e98e000f897aca73ef97fa0
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 47766c5312a402e3329a1d4bc5e5e0c05f2b007f..08141d729809132ed36d6088f37543e792395768 100644
+index 09c8e8376da0eb0590f09d1ac43595c3825daf06..62adb5e4c51bd52e7589071f1316ab93b2fede31 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2067,4 +2067,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2014,4 +2014,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Spigot end
  
      void reloadPermissions(); // Paper
@@ -56,10 +56,10 @@ index bd2c7a6964722412148fae39e1b4951fc0002b9b..864c263bbd4dd6dd7c37a74b39b1a40a
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index c7fa1d235cea78bda4656ed66b8d42b119cc50fb..27243a1214bc4d7dbb46f0b9b254c8e3f8128419 100644
+index b3b32ce429edbf1ed040354dbe28ab86f0d24201..1424060c0a162020d4a680e0a592224561067b16 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -294,4 +294,11 @@ public class SimpleCommandMap implements CommandMap {
+@@ -293,4 +293,11 @@ public class SimpleCommandMap implements CommandMap {
              }
          }
      }

patches/api/0046-Add-ProjectileCollideEvent.patch

@@ -7,40 +7,41 @@ Now deprecated and replaced with ProjectileHitEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b7df0e6ca024448784aaf4784930e565b8e5bdb3
+index 0000000000000000000000000000000000000000..6ae2bc3d952d34f298220738856024e0b6594199
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,69 @@
 +package com.destroystokyo.paper.event.entity;
 +
 +import org.bukkit.entity.Entity;
 +import org.bukkit.entity.Projectile;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 +import org.bukkit.event.entity.EntityEvent;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * Called when a projectile collides with an entity
 + * <p>
-+ * This event is called <b>before</b> {@link EntityDamageByEntityEvent}, and cancelling it will allow the projectile to continue flying
-+ *
++ * This event is called <b>before</b> {@link org.bukkit.event.entity.EntityDamageByEntityEvent}, and cancelling it will allow the projectile to continue flying
 + * @deprecated Deprecated, use {@link org.bukkit.event.entity.ProjectileHitEvent} and check if there is a hit entity
 + */
-+@Deprecated(since = "1.19.3")
++@Deprecated
 +public class ProjectileCollideEvent extends EntityEvent implements Cancellable {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
 +    @NotNull private final Entity collidedWith;
 +
-+    private boolean cancelled;
++    /**
++     * Get the entity the projectile collided with
++     *
++     * @return the entity collided with
++     */
++    @NotNull
++    public Entity getCollidedWith() {
++        return collidedWith;
++    }
 +
-+    @ApiStatus.Internal
-+    public ProjectileCollideEvent(@NotNull Projectile projectile, @NotNull Entity collidedWith) {
-+        super(projectile);
++    public ProjectileCollideEvent(@NotNull Projectile what, @NotNull Entity collidedWith) {
++        super(what);
 +        this.collidedWith = collidedWith;
 +    }
 +
@@ -54,34 +55,28 @@ index 0000000000000000000000000000000000000000..b7df0e6ca024448784aaf4784930e565
 +        return (Projectile) super.getEntity();
 +    }
 +
-+    /**
-+     * Get the entity the projectile collided with
-+     *
-+     * @return the entity collided with
-+     */
++    private static final HandlerList handlerList = new HandlerList();
++
 +    @NotNull
-+    public Entity getCollidedWith() {
-+        return this.collidedWith;
++    public static HandlerList getHandlerList() {
++        return handlerList;
 +    }
 +
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return handlerList;
++    }
++
++    private boolean cancelled = false;
++
 +    @Override
 +    public boolean isCancelled() {
-+        return this.cancelled;
++        return cancelled;
 +    }
 +
 +    @Override
 +    public void setCancelled(boolean cancel) {
 +        this.cancelled = cancel;
 +    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
-+    }
 +}

patches/api/0047-Add-String-based-Action-Bar-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6a7d63691fa3be09da0ade66cf07a41ae08d4190..252390260f62ee945c21267cd8717b7725158a21 100644
+index e12d28143a213abdc0552a15e82cacecc414ca26..3954f40b23536fec495585a8b14e82d092d62e39 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1217,6 +1217,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1042,6 +1042,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -48,7 +48,7 @@ index 6a7d63691fa3be09da0ade66cf07a41ae08d4190..252390260f62ee945c21267cd8717b77
      /**
       * Sends the component to the player
       *
-@@ -1244,9 +1277,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1069,9 +1102,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *

patches/api/0049-IllegalPacketEvent.patch

@@ -9,42 +9,38 @@ Lets plugins change the kick message and if it should kick or not.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..44637928268c3efa951c340855f7caa63519a115
+index 0000000000000000000000000000000000000000..8d8e9b16f2a6707d2af7567c7682dfc5db51a737
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,74 @@
 +package com.destroystokyo.paper.event.player;
 +
++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;
 +import org.jetbrains.annotations.Nullable;
 +
 +/**
 + * @deprecated Not used
 + */
-+@Deprecated(since = "1.16.4")
++@Deprecated
 +public class IllegalPacketEvent extends PlayerEvent {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
 +    @Nullable private final String type;
-+    @Nullable private final String exceptionMessage;
++    @Nullable private final String ex;
 +    @Nullable private String kickMessage;
 +    private boolean shouldKick = true;
 +
-+    @ApiStatus.Internal
 +    public IllegalPacketEvent(@NotNull Player player, @Nullable String type, @Nullable String kickMessage, @NotNull Exception e) {
 +        super(player);
 +        this.type = type;
 +        this.kickMessage = kickMessage;
-+        this.exceptionMessage = e.getMessage();
++        this.ex = e.getMessage();
 +    }
 +
 +    public boolean isShouldKick() {
-+        return this.shouldKick;
++        return shouldKick;
 +    }
 +
 +    public void setShouldKick(boolean shouldKick) {
@@ -53,7 +49,7 @@ index 0000000000000000000000000000000000000000..44637928268c3efa951c340855f7caa6
 +
 +    @Nullable
 +    public String getKickMessage() {
-+        return this.kickMessage;
++        return kickMessage;
 +    }
 +
 +    public void setKickMessage(@Nullable String kickMessage) {
@@ -62,21 +58,32 @@ index 0000000000000000000000000000000000000000..44637928268c3efa951c340855f7caa6
 +
 +    @Nullable
 +    public String getType() {
-+        return this.type;
++        return type;
 +    }
 +
 +    @Nullable
 +    public String getExceptionMessage() {
-+        return this.exceptionMessage;
++        return ex;
 +    }
 +
++    private static final HandlerList handlers = new HandlerList();
++
 +    @NotNull
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
++    }
++
++    public static void process(@NotNull Player player, @Nullable String type, @Nullable String kickMessage, @NotNull Exception exception) {
++        IllegalPacketEvent event = new IllegalPacketEvent(player, type, kickMessage, exception);
++        event.callEvent();
++        if (event.shouldKick) {
++            player.kickPlayer(kickMessage);
++        }
++        Bukkit.getLogger().severe(player.getName() + "/" + type + ": " + exception.getMessage());
 +    }
 +}

patches/api/0051-PlayerTeleportEndGatewayEvent.patch

@@ -7,27 +7,24 @@ Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..40bd79fbe30f19bc93e34da52d2b2bf0768be974
+index 0000000000000000000000000000000000000000..b64ab6eecd8bc4ca9c109b9d83c82861d6260793
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,29 @@
 +package com.destroystokyo.paper.event.player;
 +
 +import org.bukkit.Location;
 +import org.bukkit.block.EndGateway;
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.player.PlayerTeleportEvent;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * Fired when a teleport is triggered for an End Gateway
 + */
 +public class PlayerTeleportEndGatewayEvent extends PlayerTeleportEvent {
-+
 +    @NotNull private final EndGateway gateway;
 +
-+    @ApiStatus.Internal
 +    public PlayerTeleportEndGatewayEvent(@NotNull Player player, @NotNull Location from, @NotNull Location to, @NotNull EndGateway gateway) {
 +        super(player, from, to, PlayerTeleportEvent.TeleportCause.END_GATEWAY);
 +        this.gateway = gateway;
@@ -40,6 +37,6 @@ index 0000000000000000000000000000000000000000..40bd79fbe30f19bc93e34da52d2b2bf0
 +     */
 +    @NotNull
 +    public EndGateway getGateway() {
-+        return this.gateway;
++        return gateway;
 +    }
 +}

patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 890ae536fdaff11055b72b1be0fbf3766a41812c..4dc687f16a8181876fb7b3e56b39a55ea5507408 100644
+index 3559115d09b57acf5c2853b811862e5131f2a625..dbb799aed5bbb80edd2428b63d3fce15cf2e2f05 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -49,6 +49,33 @@ import org.jetbrains.annotations.Nullable;
+@@ -47,6 +47,33 @@ import org.jetbrains.annotations.Nullable;
   */
  public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, Keyed, net.kyori.adventure.audience.ForwardingAudience { // Paper
  

patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fdf5b8c69e98e000f897aca73ef97fa03371bb7c..fbddd654b4ba7b2613884fdd22f3e62ddfc078c8 100644
+index c58a61b15838b17c40c11edae0a3677ec7bddedb..8f9a19b1795ccddb7be268b72038cc236267821a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2373,6 +2373,16 @@ public final class Bukkit {
+@@ -2292,6 +2292,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index fdf5b8c69e98e000f897aca73ef97fa03371bb7c..fbddd654b4ba7b2613884fdd22f3e62d
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 08141d729809132ed36d6088f37543e792395768..1f039a3609a5a1208af408b0565f07664558a23f 100644
+index 62adb5e4c51bd52e7589071f1316ab93b2fede31..86910935fa823f1e23cf1d89604d042c1c87fbc6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2069,4 +2069,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2016,4 +2016,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
@@ -46,7 +46,7 @@ index 08141d729809132ed36d6088f37543e792395768..1f039a3609a5a1208af408b0565f0766
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 33c0a60e71f4bd29966c10ea60b22f14e56c1de4..f7b78198d9983610fc2185124c3080e6b1c0fa35 100644
+index 5cfd88eec9bf02e83d77b6fce1a5c14b7687f48b..1c6205cc667bbec8f6aca479f13b3e9cfcd63ab2 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -99,7 +99,7 @@ public abstract class Command {

patches/api/0056-Fix-upstream-javadocs.patch

@@ -49,10 +49,10 @@ index a04cde615f8c4bc593f8d9f8f6f1438008aaa707..548f6d28c28d74bed8b58ee828759093
       * @param target the target to remove from this list
       */
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fbddd654b4ba7b2613884fdd22f3e62ddfc078c8..53f56d95bdf484caed9effbedfe507f6745bb8c0 100644
+index 8f9a19b1795ccddb7be268b72038cc236267821a..365c2cd4f5a3a382d3b52b50377fbf56731a30ae 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1534,6 +1534,8 @@ public final class Bukkit {
+@@ -1464,6 +1464,8 @@ public final class Bukkit {
  
      /**
       * Gets every player that has ever played on this server.
@@ -74,21 +74,8 @@ index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f814
       * @param z Z-coordinate (0-15)
       * @return temperature at given coordinate
       */
-diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 3d636cb7f275df053d202356c5e9fad5b1112867..4a06ed9c769acb2eb4c6f4b76c84dc2e63176010 100644
---- a/src/main/java/org/bukkit/Particle.java
-+++ b/src/main/java/org/bukkit/Particle.java
-@@ -209,7 +209,7 @@ public enum Particle implements Keyed {
-     }
- 
-     /**
--     * Options which can be applied to redstone dust particles - a particle
-+     * Options which can be applied to dust particles - a particle
-      * color and size.
-      */
-     public static class DustOptions {
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc698715440 100644
+index 02de62c083ceaa466c80cb732e8304b8cc3f07f8..7c2b1eff41dd43fda84d84e76c05bbbf37c186b8 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
 @@ -158,7 +158,7 @@ public interface RegionAccessor {
@@ -127,10 +114,10 @@ index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc6
       * @param statePredicate The predicate which should get used to test if a block should be set or not.
       * @return true if the tree was created successfully, otherwise false
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1f039a3609a5a1208af408b0565f07664558a23f..b0734f8253ed540916db7bc75cd7dd24e86031c7 100644
+index 86910935fa823f1e23cf1d89604d042c1c87fbc6..36d07fda939a5e1b4acf77d9092bfc42bbd27d78 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -580,13 +580,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -544,13 +544,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * </ul>
       * <p>
       * <b>Note:</b> If set to 0, {@link SpawnCategory} mobs spawning will be disabled.
@@ -145,7 +132,7 @@ index 1f039a3609a5a1208af408b0565f07664558a23f..b0734f8253ed540916db7bc75cd7dd24
       */
      public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
  
-@@ -1294,6 +1291,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1250,6 +1247,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
      /**
       * Gets every player that has ever played on this server.
@@ -155,10 +142,10 @@ index 1f039a3609a5a1208af408b0565f07664558a23f..b0734f8253ed540916db7bc75cd7dd24
       * @return an array containing all previous players
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9885fd1adc1f93a80d650e6d42dfa3a0b084db9f..c4f2f03ec31998d486dad1d45ef83df3f77b5e28 100644
+index dbb799aed5bbb80edd2428b63d3fce15cf2e2f05..609e4908ed21f69b9e813500e702bbe784bff00c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2766,7 +2766,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2577,7 +2577,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      /**
       * Find the closest nearby structure of a given {@link StructureType}.
       * Finding unexplored structures can, and will, block if the world is
@@ -167,7 +154,7 @@ index 9885fd1adc1f93a80d650e6d42dfa3a0b084db9f..c4f2f03ec31998d486dad1d45ef83df3
       * temporarily freezing while locating an unexplored structure.
       * <p>
       * The {@code radius} is not a rigid square radius. Each structure may alter
-@@ -2800,7 +2800,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2611,7 +2611,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      /**
       * Find the closest nearby structure of a given {@link StructureType}.
       * Finding unexplored structures can, and will, block if the world is
@@ -176,7 +163,7 @@ index 9885fd1adc1f93a80d650e6d42dfa3a0b084db9f..c4f2f03ec31998d486dad1d45ef83df3
       * temporarily freezing while locating an unexplored structure.
       * <p>
       * The {@code radius} is not a rigid square radius. Each structure may alter
-@@ -2833,7 +2833,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2644,7 +2644,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      /**
       * Find the closest nearby structure of a given {@link Structure}. Finding
       * unexplored structures can, and will, block if the world is looking in
@@ -216,7 +203,7 @@ index f9bd74f9ce6bd6650726e5a993f9b6e292cdc74d..f4c37ce1fe7aac3dde8485ee51fc8888
 +// Paper end
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index f8e12868f2e629cdf4784f0157fdb2f8e7b01f99..bda4ab21b3ac2acbe328c0c6887c33283399971e 100644
+index f8e12868f2e629cdf4784f0157fdb2f8e7b01f99..870ad6cd930653e6248abcc0fce94ffafbe9ebde 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -357,7 +357,7 @@ public interface Block extends Metadatable, Translatable {
@@ -228,51 +215,11 @@ index f8e12868f2e629cdf4784f0157fdb2f8e7b01f99..bda4ab21b3ac2acbe328c0c6887c3328
       *
       * @return Temperature of this block
       */
-@@ -405,7 +405,10 @@ public interface Block extends Metadatable, Translatable {
-     boolean applyBoneMeal(@NotNull BlockFace face);
- 
-     /**
--     * Returns a list of items which would drop by destroying this block
-+     * Returns a list of items which could drop by destroying this block.
-+     * <p>
-+     * The items are not guaranteed to be consistent across multiple calls to this
-+     * method as this just uses the block type's loot table.
-      *
-      * @return a list of dropped items for this type of block
-      */
-@@ -413,8 +416,11 @@ public interface Block extends Metadatable, Translatable {
-     Collection<ItemStack> getDrops();
- 
-     /**
--     * Returns a list of items which would drop by destroying this block with
--     * a specific tool
-+     * Returns a list of items which could drop by destroying this block with
-+     * a specific tool.
-+     * <p>
-+     * The items are not guaranteed to be consistent across multiple calls to this
-+     * method as this just uses the block type's loot table.
-      *
-      * @param tool The tool or item in hand used for digging
-      * @return a list of dropped items for this type of block
-@@ -423,8 +429,11 @@ public interface Block extends Metadatable, Translatable {
-     Collection<ItemStack> getDrops(@Nullable ItemStack tool);
- 
-     /**
--     * Returns a list of items which would drop by the entity destroying this
--     * block with a specific tool
-+     * Returns a list of items which could drop by the entity destroying this
-+     * block with a specific tool.
-+     * <p>
-+     * The items are not guaranteed to be consistent across multiple calls to this
-+     * method as this just uses the block type's loot table.
-      *
-      * @param tool The tool or item in hand used for digging
-      * @param entity the entity destroying the block
 diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
-index 29fd06cb800f9b7cc91a120ccbe2980422ed9653..cd3b3e05cc825cfedec07f9a2a1e0b7b2a8866d6 100644
+index 2e2232956f626669005cfdfd6550aa8ee29fc1ab..869fa47a13fbcb128228963bf53cc72da4499a01 100644
 --- a/src/main/java/org/bukkit/block/data/BlockData.java
 +++ b/src/main/java/org/bukkit/block/data/BlockData.java
-@@ -224,7 +224,7 @@ public interface BlockData extends Cloneable {
+@@ -215,7 +215,7 @@ public interface BlockData extends Cloneable {
       * {@link Material#REDSTONE_WIRE} -> {@link Material#REDSTONE}
       * {@link Material#CARROTS} -> {@link Material#CARROT}
       * </pre>
@@ -356,7 +303,7 @@ index 91fc11dda99de506be83d40df8929bf7cd8e8d85..7dc631ebd009f5f5c3ac1699c3f3515c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index a1615334cae50c7d64ca6d86cb7070405a26b332..e396f351a46e4220fa4df11eaa93d813dced664c 100644
+index 8eb0cf31b1ce6d714a14cf65bbb117ff163ae2f3..8e57082e8b19a2fd9625816c2ea4a90d41f78ca5 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
 @@ -93,7 +93,7 @@ public interface Arrow extends AbstractArrow {
@@ -381,28 +328,8 @@ index 1e56aef9188487d3e9c737e85025f601ab359a72..92cd35c87bad578c2b714761c93a5b72
           * the portal, it will fly to it before mounting.
           */
          LAND_ON_PORTAL,
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 4e1fb0974d061d5bb64899cac576318d2e6f8bf6..539b3527d0c66611e21712f29b90fba939e661e3 100644
---- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -180,9 +180,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-     public List<org.bukkit.entity.Entity> getNearbyEntities(double x, double y, double z);
- 
-     /**
--     * Returns a unique id for this entity
-+     * Returns the network protocol ID for this entity. This is
-+     * not to be used as an identifier for the entity except in
-+     * network-related operations. Use {@link #getUniqueId()} as
-+     * an entity identifier instead.
-      *
--     * @return Entity id
-+     * @return the network protocol ID
-+     * @see #getUniqueId()
-      */
-     public int getEntityId();
- 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index fffc478312566bc5c36dbacbdd86341d84d50054..8d97cf229ce1d14232d0342121b5db2230795a1d 100644
+index 09936f3a2376a46721bbc8365c989581c2a789ef..3845a726adbd0e75d7bf2aeeb6da8cb571d51a8f 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -22,6 +22,11 @@ import org.jetbrains.annotations.Nullable;
@@ -431,7 +358,7 @@ index b688b3856cb3068a539fcecfbfa113f8ab4160a9..c275b881cbd11307a6dcc7190d7a7d40
       * @return whether the item frame is visible or not
       */
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index f3f62e13cc1b6172808c52f2d5f520f1f584e6db..ad5dbf310fe7b34c997bb339f09697222f862005 100644
+index 2926fa6071bc7640cc10280b5c3962b0ce7686f1..4f63988848443aff55619bc12ef12c925642a3f9 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
 @@ -9,6 +9,10 @@ import org.jetbrains.annotations.Nullable;
@@ -459,10 +386,10 @@ index ae9eaaa8e38e1d9dfc459926c7fc51ddb89de84a..b2ec535bb1b0ce0c114ddd7638b90218
      @Override
      public int getConversionTime();
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddcec951ba31 100644
+index 3954f40b23536fec495585a8b14e82d092d62e39..264c6bdeb2f1f0d937e4356d761a3264a1c4d58a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -478,15 +478,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -431,15 +431,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Saves the players current location, health, inventory, motion, and
@@ -482,7 +409,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * <p>
       * Note: This will overwrite the players current inventory, health,
       * motion, etc, with the state from the saved dat file.
-@@ -823,7 +823,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -674,7 +674,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Plays an effect to just this player.
       *
@@ -491,7 +418,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * @param loc the location to play the effect at
       * @param effect the {@link Effect}
       * @param data a data bit needed for some effects
-@@ -1234,7 +1234,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1059,7 +1059,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -500,7 +427,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * @param message The message to send
       * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
       */
-@@ -1700,7 +1700,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1525,7 +1525,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see a player that was previously hidden. If
@@ -509,7 +436,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * remain hidden until the other plugin calls this method too.
       *
       * @param plugin Plugin that wants to show the player
-@@ -1727,7 +1727,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1554,7 +1554,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      /**
       * Allows this player to see an entity that was previously hidden. If
@@ -518,36 +445,6 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce
       * remain hidden until the other plugin calls this method too.
       *
       * @param plugin Plugin that wants to show the entity
-@@ -1810,9 +1810,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *     case this method will have no affect on them. Use the
-      *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
-      *     the player loaded the pack!
--     * <li>There is no concept of resetting texture packs back to default
--     *     within Minecraft, so players will have to relog to do so or you
--     *     have to send an empty pack.
-      * <li>The request is send with "null" as the hash. This might result
-      *     in newer versions not loading the pack correctly.
-      * </ul>
-@@ -1846,9 +1843,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *     case this method will have no affect on them. Use the
-      *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
-      *     the player loaded the pack!
--     * <li>There is no concept of resetting resource packs back to default
--     *     within Minecraft, so players will have to relog to do so or you
--     *     have to send an empty pack.
-      * <li>The request is send with empty string as the hash. This might result
-      *     in newer versions not loading the pack correctly.
-      * </ul>
-@@ -1885,9 +1879,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *     case this method will have no affect on them. Use the
-      *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
-      *     the player loaded the pack!
--     * <li>There is no concept of resetting resource packs back to default
--     *     within Minecraft, so players will have to relog to do so or you
--     *     have to send an empty pack.
-      * <li>The request is sent with empty string as the hash when the hash is
-      *     not provided. This might result in newer versions not loading the
-      *     pack correctly.
 diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
 index a5ad3250cebfeb302c58e0bfd6db1295913c927e..bfac874840cf1f36afba16ae4d176c5821a68cfb 100644
 --- a/src/main/java/org/bukkit/entity/Slime.java
@@ -605,68 +502,21 @@ index 6bf3af3ed81b66f61e53105d3591165ea74dba0e..a91400cd8bb4c72d1f3200a17f6de025
           * wool items, and shears.
           */
          SHEPHERD,
-diff --git a/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java b/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
-index a0f6f1af304190b4c5db4b284d460f625eeb7801..7e21548cac8515c281ec86853e9272ab7695b24f 100644
---- a/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
-+++ b/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
-@@ -10,15 +10,19 @@ import org.bukkit.event.HandlerList;
+diff --git a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
+index 44f7f6939a27b9a0a796d91eac4b7c97ec90a643..641c71ab66bd2499b35cf3c1d533fd105d096e10 100644
+--- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
++++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
+@@ -7,7 +7,9 @@ import org.bukkit.event.HandlerList;
  import org.jetbrains.annotations.NotNull;
  
  /**
-- * Called if a block broken by a player drops an item.
-+ * Called after a block is broken by a player and potential drops are computed, even if said blocks loot table
-+ * does not define any drops at the point the event is constructed.
-  *
-  * If the block break is cancelled, this event won't be called.
-  *
-- * If isDropItems in BlockBreakEvent is set to false, this event won't be
-+ * If isDropItems in {@link org.bukkit.event.block.BlockBreakEvent} is set to false, this event won't be
-  * called.
-  *
-+ * If a block is broken and isDropItems is set to true, this event will be called even if the block does
-+ * not drop any items, for example glass broken by hand. In this case, #getItems() will be empty.
-+ *
-  * This event will also be called if the player breaks a multi block structure,
-- * for example a torch on top of a stone. Both items will have an event call.
-+ * for example a torch on top of a stone. Both items will be included in the #getItems() list.
-  *
-  * The Block is already broken as this event is called, so #getBlock() will be
-  * AIR in most cases. Use #getBlockState() for more Information about the broken
-diff --git a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-index e534954457a9961a26dbec7ac035bec07e1d6694..a7c297364805c58ae16895055d8eae0484384b7d 100644
---- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-+++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-@@ -13,6 +13,9 @@ import org.jetbrains.annotations.NotNull;
-  * Note that due to the nature of explosions, {@link #getBlock()} will always be
-  * an air block. {@link #getExplodedBlockState()} should be used to get
-  * information about the block state that exploded.
-+ * <p>
-+ * The event isn't called if the {@link org.bukkit.GameRule#MOB_GRIEFING}
+- * Called when a block explodes
++ * Called when a block explodes interacting with blocks. The
++ * event isn't called if the {@link org.bukkit.GameRule#MOB_GRIEFING}
 + * is disabled as no block interaction will occur.
   */
  public class BlockExplodeEvent extends BlockEvent implements Cancellable {
      private static final HandlerList handlers = new HandlerList();
-@@ -29,6 +32,7 @@ public class BlockExplodeEvent extends BlockEvent implements Cancellable {
-         this.cancel = false;
-     }
- 
-+    @io.papermc.paper.annotation.DoNotUse // Paper
-     @Deprecated(forRemoval = true)
-     public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield) {
-         this(what, what.getState(), blocks, yield);
-diff --git a/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java b/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
-index 340fa397e68c024df380a28db21545a0c83d9fa6..79ac8a5db689cf9f8e2ff4cb7c06df6989128d10 100644
---- a/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
-+++ b/src/main/java/org/bukkit/event/block/BlockPistonRetractEvent.java
-@@ -34,7 +34,7 @@ public class BlockPistonRetractEvent extends BlockPistonEvent {
- 
-     /**
-      * Get an immutable list of the blocks which will be moved by the
--     * extending.
-+     * retracting.
-      *
-      * @return Immutable list of the moved blocks.
-      */
 diff --git a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
 index be0a2d1f234d8265d98e54e518a994957b1f3ab7..4e3c406ba883aae553e8d69b6b719b872cd6096c 100644
 --- a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
@@ -681,10 +531,10 @@ index be0a2d1f234d8265d98e54e518a994957b1f3ab7..4e3c406ba883aae553e8d69b6b719b87
       * than BLOCK_CANBUILD, as this refers to a player, not universe-physics
       * rule like cactus on dirt.
 diff --git a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
-index fc2120e03737f5882d6ae916db93fdcf4939b2ba..f2edd4a9357832e9dec3fb0aafa006335d7b289b 100644
+index 2ff1b1308571d8f8056d3359e8a8ba4a589c3726..e9a6e5be5f33a342f7e5c496f0f1c64b2f302ace 100644
 --- a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
 +++ b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
-@@ -81,7 +81,7 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab
+@@ -80,7 +80,7 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab
      /**
       * Get a list of available {@link EnchantmentOffer} for the player. You can
       * modify the values to change the available offers for the player. An offer
@@ -725,31 +575,6 @@ index e9de00e9e434d36117a672fa9fbfc7c52f284b67..4065432c884324b107d04f4ccd486085
           */
          EXPLOSION,
          /**
-diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
-index 573165ddf3368a96e1ffc6476eb27c9e29a6f86e..148c4aad384ae8e3b8b22d264a84bddfbcafdf1e 100644
---- a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
-@@ -12,6 +12,10 @@ import org.jetbrains.annotations.Nullable;
- 
- /**
-  * Called when an entity is damaged by a block
-+ * <p>
-+ * For explosions, the Block returned by {@link #getDamager()} has
-+ * already been cleared. See {@link #getDamagerBlockState()} for a snapshot
-+ * of the block if it has already been changed.
-  */
- public class EntityDamageByBlockEvent extends EntityDamageEvent {
-     private final Block damager;
-@@ -51,6 +55,9 @@ public class EntityDamageByBlockEvent extends EntityDamageEvent {
- 
-     /**
-      * Returns the captured BlockState of the block that damaged the player.
-+     * <p>
-+     * This block state is not placed so {@link org.bukkit.block.BlockState#isPlaced}
-+     * will be false.
-      *
-      * @return the block state
-      */
 diff --git a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
 index 10d0e18dfd423b108fe381e8142867eb10399359..099efafa14c10910e4ed04abb1823f0c1a96b6a6 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
@@ -869,10 +694,10 @@ index bc71bc2d3ace0d19d730c09f05f9e0655bcee8f5..24077da8e6a7937f66eafc6779206055
  public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
      private static final HandlerList handlers = new HandlerList();
 diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java
-index 65db4991bd4789991868c0d75fea4034fed487a8..5ffd28fd24b4477a07fc9f6a3f669a6f4da9fa26 100644
+index 020739697a0b535cad0b15b574f77cdabbdfa3eb..a965b6a78073c5da86ad671752eff4a270029420 100644
 --- a/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java
-@@ -9,7 +9,9 @@ import org.bukkit.material.MaterialData;
+@@ -7,7 +7,9 @@ import org.bukkit.event.block.BlockExpEvent;
  import org.jetbrains.annotations.NotNull;
  
  /**
@@ -915,16 +740,10 @@ index 1440c6115520d692faf75455df35b92aa8734491..0808e7aeffb69160913344de5b5e21d5
  public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent {
      private static final HandlerList handlers = new HandlerList();
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-index 79797a2be7fb139d528116d34d13e51d39b96e56..f2a2a2ad9930499c5bf624e73571a3294a90db14 100644
+index 79797a2be7fb139d528116d34d13e51d39b96e56..fe58058f9b5d29388d48115cc81dc48ab08c58c1 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-@@ -16,12 +16,16 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * This event is called when a player clicks in an inventory.
-  * <p>
-+ * In case of a drag action within an inventory, InventoryClickEvent is never called.
-+ * Instead, {@link InventoryDragEvent} is called at the end of the drag.
-+ * <p>
+@@ -19,9 +19,10 @@ import org.jetbrains.annotations.Nullable;
   * Because InventoryClickEvent occurs within a modification of the Inventory,
   * not all Inventory related methods are safe to use.
   * <p>
@@ -938,7 +757,7 @@ index 79797a2be7fb139d528116d34d13e51d39b96e56..f2a2a2ad9930499c5bf624e73571a329
   * <ul>
   * <li>{@link HumanEntity#closeInventory()}
   * <li>{@link HumanEntity#openInventory(Inventory)}
-@@ -92,7 +96,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
+@@ -92,7 +93,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
      /**
       * Gets the ItemStack currently in the clicked slot.
       *
@@ -1018,10 +837,10 @@ index 6782024735a885ba0b1b4dba4a576740c1410366..8977f7609431c3c46324a82de84d4a32
      @Override
      public HandlerList getHandlers() {
 diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-index e4c32b21ab013703a6a1b07a1ad564d914ebe83f..e58fecf0fe54db06e0e944027923a352fd8005d8 100644
+index 4c2102a11c3d682d98f0db4ccafa35231e66bcdd..ca238af544764273b9cd4cf3587e8632031c9ede 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-@@ -6,8 +6,9 @@ import org.bukkit.event.HandlerList;
+@@ -5,8 +5,9 @@ import org.bukkit.event.HandlerList;
  import org.jetbrains.annotations.NotNull;
  
  /**
@@ -1047,7 +866,7 @@ index 0cc6e29a5af28e95f87f415d6b2424d4622a6f34..c0b749a5bbf4980d01fed74768bb6190
           * @param z the z location in the chunk from 0-15 inclusive
           * @return Biome value
 diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-index 9adc827bc52eaa767a39c82e9cb0ff5a48e02b14..2dde946443fee1f6e79b882cbcb448549dc0c99c 100644
+index d5b50a4a954fed35d37f03f1a277cc173ca106df..c69904f3ee7f3a41d6cebcd401abf8385dfbf868 100644
 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
 +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
 @@ -37,9 +37,23 @@ public interface EntityEquipment {
@@ -1231,10 +1050,13 @@ index 9adc827bc52eaa767a39c82e9cb0ff5a48e02b14..2dde946443fee1f6e79b882cbcb44854
      ItemStack getBoots();
  
      /**
-@@ -204,12 +298,25 @@ public interface EntityEquipment {
+@@ -202,12 +296,25 @@ public interface EntityEquipment {
+     void setBoots(@Nullable ItemStack boots, boolean silent);
+ 
      /**
-      * Gets all ItemStacks from the armor slots.
-      *
+-     * Gets a copy of all worn armor
++     * Gets all worn armor
++     *
 +     * <p>
 +     * This returns a copy if this equipment instance is from a non-player,
 +     * or it's an empty stack (has AIR as its type).
@@ -1248,10 +1070,8 @@ index 9adc827bc52eaa767a39c82e9cb0ff5a48e02b14..2dde946443fee1f6e79b882cbcb44854
 +     *     equipment.getArmorContents(); // will return an array of copies
 +     * }
 +     * }</pre>
-+     *
-      * @return all the ItemStacks from the armor slots. Individual items can be
-      * null and are returned in a fixed order starting from the boots and going
-      * up to the helmet
+      *
+      * @return The array of worn armor. Individual items may be null.
       */
 -    @NotNull
 -    ItemStack[] getArmorContents();
@@ -1259,128 +1079,8 @@ index 9adc827bc52eaa767a39c82e9cb0ff5a48e02b14..2dde946443fee1f6e79b882cbcb44854
  
      /**
       * Sets the entities armor to the provided array of ItemStacks
-@@ -249,7 +356,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop killed by anything
-      * </ul>
-      *
-      * @return chance of the currently held item being dropped (1 for non-{@link Mob})
-@@ -262,7 +370,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @param chance the chance of the main hand item being dropped
-@@ -276,7 +385,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @return chance of the off hand item being dropped (1 for non-{@link Mob})
-@@ -289,7 +399,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @param chance the chance of off hand item being dropped
-@@ -302,7 +413,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @return the chance of the helmet being dropped (1 for non-{@link Mob})
-@@ -314,7 +426,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @param chance of the helmet being dropped
-@@ -328,7 +441,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @return the chance of the chest plate being dropped (1 for non-{@link Mob})
-@@ -341,7 +455,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @param chance of the chest plate being dropped
-@@ -355,7 +470,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @return the chance of the leggings being dropped (1 for non-{@link Mob})
-@@ -368,7 +484,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @param chance chance of the leggings being dropped
-@@ -381,7 +498,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @return the chance of the boots being dropped (1 for non-{@link Mob})
-@@ -393,7 +511,8 @@ public interface EntityEquipment {
-      *
-      * <ul>
-      * <li>A drop chance of 0.0F will never drop
--     * <li>A drop chance of 1.0F will always drop
-+     * <li>A drop chance of exactly 1.0F will always drop if killed by a player
-+     * <li>A drop chance of greater than 1.0F will always drop if killed by anything
-      * </ul>
-      *
-      * @param chance of the boots being dropped
 diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
-index 8453bd058d426c1088b04c55d2448d205f0a104b..1b3580d1861af402396121805715e4087b3bc587 100644
+index 42fcc31147934fd4ed6484b0729e938e7ae2f8e2..4e637420b9a39b822be19367a16da93f236549b3 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFlag.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
 @@ -35,7 +35,7 @@ public enum ItemFlag {
@@ -1393,10 +1093,10 @@ index 8453bd058d426c1088b04c55d2448d205f0a104b..1b3580d1861af402396121805715e408
      HIDE_ARMOR_TRIM;
  }
 diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-index f1918027c3a8735b31566856218611656b56db20..476fe14faa39f02444cab8ad95d4401033dc6938 100644
+index 62fbd7f6d8195bebcab7f704a0a485a1bbeca26c..5461f7fa75f5a065bb333b4a113640b5fe1e3825 100644
 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
 +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-@@ -160,7 +160,7 @@ public interface PlayerInventory extends Inventory {
+@@ -158,7 +158,7 @@ public interface PlayerInventory extends Inventory {
      public void setBoots(@Nullable ItemStack boots);
  
      /**
@@ -1405,7 +1105,7 @@ index f1918027c3a8735b31566856218611656b56db20..476fe14faa39f02444cab8ad95d44010
       * in their main hand.
       *
       * @return the currently held item
-@@ -176,7 +176,7 @@ public interface PlayerInventory extends Inventory {
+@@ -174,7 +174,7 @@ public interface PlayerInventory extends Inventory {
      void setItemInMainHand(@Nullable ItemStack item);
  
      /**
@@ -1414,7 +1114,7 @@ index f1918027c3a8735b31566856218611656b56db20..476fe14faa39f02444cab8ad95d44010
       * in their off hand.
       *
       * @return the currently held item
-@@ -192,7 +192,7 @@ public interface PlayerInventory extends Inventory {
+@@ -190,7 +190,7 @@ public interface PlayerInventory extends Inventory {
      void setItemInOffHand(@Nullable ItemStack item);
  
      /**
@@ -1502,66 +1202,11 @@ index 07c3dff4d6190ef388d9c1e1c36f67f00a3e8e66..597a18a767b68b47e81454b7d44613c7
       *
       * @param input The input choice.
       * @return The changed recipe, so you can chain calls.
-diff --git a/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java b/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java
-index e7d905b1146b2bdd2da5bdeb6bf3541fb181d59e..c7d3041221742f6655155f19ef2addcaf2401015 100644
---- a/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java
-@@ -32,6 +32,11 @@ public interface BlockStateMeta extends ItemMeta {
-      * @param blockState the block state to attach to the block.
-      * @throws IllegalArgumentException if the blockState is null
-      *         or invalid for this item.
-+     *
-+     * @apiNote As of 1.20.5 the block state carries a copy of the item's data deviations.
-+     * As such, setting the block state via this method will reset secondary deviations of the item meta.
-+     * This can manifest in the addition to an existing lore failing or a change of a previously added display name.
-+     * It is hence recommended to first mutate the block state, set it back, and then mutate the item meta.
-      */
-     void setBlockState(@NotNull BlockState blockState);
- }
-diff --git a/src/main/java/org/bukkit/inventory/meta/CrossbowMeta.java b/src/main/java/org/bukkit/inventory/meta/CrossbowMeta.java
-index 35c6594fd1040a1af1029e7260e5e3a9307b107d..d58719ee75bef8bc265bfc81bc5d88a426e01dd9 100644
---- a/src/main/java/org/bukkit/inventory/meta/CrossbowMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/CrossbowMeta.java
-@@ -28,8 +28,7 @@ public interface CrossbowMeta extends ItemMeta {
-      * Removes all projectiles when given null.
-      *
-      * @param projectiles the projectiles to set
--     * @throws IllegalArgumentException if one of the projectiles is not an
--     * arrow or firework rocket
-+     * @throws IllegalArgumentException if one of the projectiles is empty
-      */
-     void setChargedProjectiles(@Nullable List<ItemStack> projectiles);
- 
-@@ -37,8 +36,7 @@ public interface CrossbowMeta extends ItemMeta {
-      * Adds a charged projectile to this item.
-      *
-      * @param item projectile
--     * @throws IllegalArgumentException if the projectile is not an arrow or
--     * firework rocket
-+     * @throws IllegalArgumentException if the projectile is empty
-      */
-     void addChargedProjectile(@NotNull ItemStack item);
- }
-diff --git a/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java b/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java
-index cdbcc8dbab2456cc2bc1f3084cbb1ced1698b7f5..d528b066c2aaa3fb097931914ff2181f8f64e520 100644
---- a/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java
-@@ -86,8 +86,8 @@ public interface FireworkMeta extends ItemMeta {
-      * Sets the approximate power of the firework. Each level of power is half
-      * a second of flight time.
-      *
--     * @param power the power of the firework, from 0-127
--     * @throws IllegalArgumentException if {@literal height<0 or height>127}
-+     * @param power the power of the firework, from 0-255
-+     * @throws IllegalArgumentException if {@literal power < 0 or power > 255}
-      */
-     void setPower(int power) throws IllegalArgumentException;
- 
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index bc065cc78b69d26ac07941b8485fabe256d6286c..fe0f8459a381c35e1e7a312a2f63d6e6eda088d6 100644
+index d7fab2b856f6dfec4f9225c1bdb4254b238d98a4..9d40e6a5ce7adc377934cfc5ce663b5d9cb2e4dc 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -547,7 +547,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -306,7 +306,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Return an immutable copy of all {@link Attribute}s and their
       * {@link AttributeModifier}s for a given {@link EquipmentSlot}.<br>
@@ -1570,69 +1215,6 @@ index bc065cc78b69d26ac07941b8485fabe256d6286c..fe0f8459a381c35e1e7a312a2f63d6e6
       * {@link EquipmentSlot} will be returned. This is because
       * AttributeModifiers without a slot are active in any slot.<br>
       * If there are no attributes set for the given slot, an empty map
-diff --git a/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java b/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
-index c1676991c3cc5f8d6e3f97d8cb356d6e2aa52809..c701d5fbc5fef503f18a3a46fa54c983bf96e895 100644
---- a/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java
-@@ -8,8 +8,9 @@ import org.jetbrains.annotations.Nullable;
- 
- /**
-  * Represents leather armor ({@link Material#LEATHER_BOOTS}, {@link
-- * Material#LEATHER_CHESTPLATE}, {@link Material#LEATHER_HELMET}, or {@link
-- * Material#LEATHER_LEGGINGS}) that can be colored.
-+ * Material#LEATHER_LEGGINGS}, {@link Material#LEATHER_CHESTPLATE}, {@link
-+ * Material#LEATHER_HELMET}, {@link Material#LEATHER_HORSE_ARMOR} or {@link
-+ * Material#WOLF_ARMOR}) that can be colored.
-  */
- public interface LeatherArmorMeta extends ItemMeta {
- 
-@@ -18,6 +19,9 @@ public interface LeatherArmorMeta extends ItemMeta {
-      * be {@link ItemFactory#getDefaultLeatherColor()}.
-      *
-      * @return the color of the armor, never null
-+     * @apiNote The method yielding {@link ItemFactory#getDefaultLeatherColor()} is incorrect
-+     * for {@link Material#WOLF_ARMOR} as its default color differs. Generally, it is recommended to check
-+     * {@link #isDyed()} to determine if this leather armor is dyed than to compare this color to the default.
-      */
-     @NotNull
-     Color getColor();
-@@ -25,8 +29,7 @@ public interface LeatherArmorMeta extends ItemMeta {
-     /**
-      * Sets the color of the armor.
-      *
--     * @param color the color to set. Setting it to null is equivalent to
--     *     setting it to {@link ItemFactory#getDefaultLeatherColor()}.
-+     * @param color the color to set.
-      */
-     void setColor(@Nullable Color color);
- 
-diff --git a/src/main/java/org/bukkit/inventory/meta/OminousBottleMeta.java b/src/main/java/org/bukkit/inventory/meta/OminousBottleMeta.java
-index 43f0df04f3cdff7d7db73321a2886f3a737e3c9f..5c741228b2338a7c4de2fe736eb789511abf4880 100644
---- a/src/main/java/org/bukkit/inventory/meta/OminousBottleMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/OminousBottleMeta.java
-@@ -3,7 +3,7 @@ package org.bukkit.inventory.meta;
- import org.jetbrains.annotations.NotNull;
- 
- /**
-- * Represents a map that can be scalable.
-+ * Represents an ominous bottle with an amplifier of the bad omen effect.
-  */
- public interface OminousBottleMeta extends ItemMeta {
- 
-diff --git a/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java b/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java
-index b84b37fe27d84574dc5897285f1d9a1437bd322c..281ae60a6be7e39aab4f27b4c7de3d49ada9a557 100644
---- a/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java
-+++ b/src/main/java/org/bukkit/plugin/messaging/PluginMessageRecipient.java
-@@ -31,7 +31,8 @@ public interface PluginMessageRecipient {
- 
-     /**
-      * Gets a set containing all the Plugin Channels that this client is
--     * listening on.
-+     * listening on. Does not contain the BungeeCord channel due to its
-+     * special status.
-      *
-      * @return Set containing all the channels that this client may accept.
-      */
 diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
 index 22b1dc5fd4d453161a5ee520072f8e8f955b3a80..a625bcab8e77b05b3341a52c708fae1542b7e3d5 100644
 --- a/src/main/java/org/bukkit/scoreboard/Objective.java

patches/api/0057-Item-canEntityPickup.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 65dd4554c6cc0801fcbc0ef6809b794dcebd1124..bfecd0633458586c0352eeb1a95bb57b12f9101e 100644
+index 65dd4554c6cc0801fcbc0ef6809b794dcebd1124..ab06c640cef1309ab44b0fae8d95df48cdc869a7 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -89,4 +89,20 @@ public interface Item extends Entity {
@@ -13,7 +13,7 @@ index 65dd4554c6cc0801fcbc0ef6809b794dcebd1124..bfecd0633458586c0352eeb1a95bb57b
      @Nullable
      public UUID getThrower();
 +
-+    // Paper start
++    // Paper Start
 +    /**
 +     * Gets if non-player entities can pick this Item up
 +     *

patches/api/0058-PlayerAttemptPickupItemEvent.patch

@@ -6,39 +6,33 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..13e4b1309ea9965a07fc8b276d5a7e606e205824
+index 0000000000000000000000000000000000000000..0788153a9641e75da565d2e6eee37eeee1cbc61e
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,90 @@
 +package org.bukkit.event.player;
 +
 +import org.bukkit.entity.Item;
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * Thrown when a player attempts to pick an item up from the ground
 + */
 +public class PlayerAttemptPickupItemEvent extends PlayerEvent implements Cancellable {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
++    private static final HandlerList handlers = new HandlerList();
 +    @NotNull private final Item item;
 +    private final int remaining;
 +    private boolean flyAtPlayer = true;
-+
-+    private boolean cancelled;
++    private boolean isCancelled = false;
 +
 +    @Deprecated // Remove in 1.13 // Remove in 1.14?
-+    @ApiStatus.Internal
 +    public PlayerAttemptPickupItemEvent(@NotNull final Player player, @NotNull final Item item) {
 +        this(player, item, 0);
 +    }
 +
-+    @ApiStatus.Internal
 +    public PlayerAttemptPickupItemEvent(@NotNull final Player player, @NotNull final Item item, final int remaining) {
 +        super(player);
 +        this.item = item;
@@ -52,7 +46,7 @@ index 0000000000000000000000000000000000000000..13e4b1309ea9965a07fc8b276d5a7e60
 +     */
 +    @NotNull
 +    public Item getItem() {
-+        return this.item;
++        return item;
 +    }
 +
 +    /**
@@ -61,14 +55,14 @@ index 0000000000000000000000000000000000000000..13e4b1309ea9965a07fc8b276d5a7e60
 +     * @return amount that will remain on the ground
 +     */
 +    public int getRemaining() {
-+        return this.remaining;
++        return remaining;
 +    }
 +
 +    /**
 +     * Set if the item will fly at the player
 +     * <p>Cancelling the event will set this value to false.</p>
 +     *
-+     * @param flyAtPlayer {@code true} for item to fly at player
++     * @param flyAtPlayer True for item to fly at player
 +     */
 +    public void setFlyAtPlayer(boolean flyAtPlayer) {
 +        this.flyAtPlayer = flyAtPlayer;
@@ -77,7 +71,7 @@ index 0000000000000000000000000000000000000000..13e4b1309ea9965a07fc8b276d5a7e60
 +    /**
 +     * Gets if the item will fly at the player
 +     *
-+     * @return {@code true} if the item will fly at the player
++     * @return True if the item will fly at the player
 +     */
 +    public boolean getFlyAtPlayer() {
 +        return this.flyAtPlayer;
@@ -86,23 +80,23 @@ index 0000000000000000000000000000000000000000..13e4b1309ea9965a07fc8b276d5a7e60
 +
 +    @Override
 +    public boolean isCancelled() {
-+        return this.cancelled;
++        return this.isCancelled;
 +    }
 +
 +    @Override
 +    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
++        this.isCancelled = cancel;
 +        this.flyAtPlayer = !cancel;
 +    }
 +
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +}

patches/api/0059-Add-UnknownCommandEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9bdeeecdb6021d61fd9141270011e56b06a58a76
+index 0000000000000000000000000000000000000000..e4f8a0d14ae66468bbb0a5d6bf9c1ee417dc866c
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
 @@ -0,0 +1,110 @@
@@ -17,7 +17,6 @@ index 0000000000000000000000000000000000000000..9bdeeecdb6021d61fd9141270011e56b
 +import org.bukkit.command.CommandSender;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.Contract;
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
@@ -26,14 +25,11 @@ index 0000000000000000000000000000000000000000..9bdeeecdb6021d61fd9141270011e56b
 + * Thrown when a player executes a command that is not defined
 + */
 +public class UnknownCommandEvent extends Event {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    @NotNull private final CommandSender sender;
-+    @NotNull private final String commandLine;
++    private static final HandlerList handlers = new HandlerList();
++    @NotNull private CommandSender sender;
++    @NotNull private String commandLine;
 +    @Nullable private Component message;
 +
-+    @ApiStatus.Internal
 +    public UnknownCommandEvent(@NotNull final CommandSender sender, @NotNull final String commandLine, @Nullable final Component message) {
 +        super(false);
 +        this.sender = sender;
@@ -43,26 +39,29 @@ index 0000000000000000000000000000000000000000..9bdeeecdb6021d61fd9141270011e56b
 +
 +    /**
 +     * Gets the CommandSender or ConsoleCommandSender
++     * <p>
 +     *
 +     * @return Sender of the command
 +     */
 +    @NotNull
 +    public CommandSender getSender() {
-+        return this.sender;
++        return sender;
 +    }
 +
 +    /**
-+     * Gets the command that was sent
++     * Gets the command that was send
++     * <p>
 +     *
 +     * @return Command sent
 +     */
 +    @NotNull
 +    public String getCommandLine() {
-+        return this.commandLine;
++        return commandLine;
 +    }
 +
 +    /**
 +     * Gets message that will be returned
++     * <p>
 +     *
 +     * @return Unknown command message
 +     * @deprecated use {@link #message()}
@@ -76,9 +75,9 @@ index 0000000000000000000000000000000000000000..9bdeeecdb6021d61fd9141270011e56b
 +    /**
 +     * Sets message that will be returned
 +     * <p>
-+     * Set to {@code null} to avoid any message being sent
++     * Set to null to avoid any message being sent
 +     *
-+     * @param message the message to be returned, or {@code null}
++     * @param message the message to be returned, or null
 +     * @deprecated use {@link #message(Component)}
 +     */
 +    @Deprecated
@@ -88,6 +87,7 @@ index 0000000000000000000000000000000000000000..9bdeeecdb6021d61fd9141270011e56b
 +
 +    /**
 +     * Gets message that will be returned
++     * <p>
 +     *
 +     * @return Unknown command message
 +     */
@@ -100,9 +100,9 @@ index 0000000000000000000000000000000000000000..9bdeeecdb6021d61fd9141270011e56b
 +    /**
 +     * Sets message that will be returned
 +     * <p>
-+     * Set to {@code null} to avoid any message being sent
++     * Set to null to avoid any message being sent
 +     *
-+     * @param message the message to be returned, or {@code null}
++     * @param message the message to be returned, or null
 +     */
 +    public void message(@Nullable Component message) {
 +        this.message = message;
@@ -111,12 +111,12 @@ index 0000000000000000000000000000000000000000..9bdeeecdb6021d61fd9141270011e56b
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
++        return handlers;
 +    }
 +}
 +

patches/api/0060-Basic-PlayerProfile-API.patch

@@ -7,10 +7,10 @@ Provides basic elements of a PlayerProfile to be used by future API/events
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b4f9ffbebab8eef99dbd81c816c16c274a1ec4cd
+index 0000000000000000000000000000000000000000..b76f13a0266806544bde13952476d4867caaf25b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
-@@ -0,0 +1,234 @@
+@@ -0,0 +1,231 @@
 +package com.destroystokyo.paper.profile;
 +
 +import java.util.Collection;
@@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..b4f9ffbebab8eef99dbd81c816c16c27
 +     * @return The previous Name
 +     */
 +    @NotNull
-+    @Deprecated(forRemoval = true, since = "1.18.1")
++    @Deprecated(forRemoval = true)
 +    String setName(@Nullable String name);
 +
 +    /**
@@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..b4f9ffbebab8eef99dbd81c816c16c27
 +     * @return The previous UUID
 +     */
 +    @Nullable
-+    @Deprecated(forRemoval = true, since = "1.18.1")
++    @Deprecated(forRemoval = true)
 +    UUID setId(@Nullable UUID uuid);
 +
 +    /**
@@ -91,16 +91,13 @@ index 0000000000000000000000000000000000000000..b4f9ffbebab8eef99dbd81c816c16c27
 +
 +    /**
 +     * Sets a property. If the property already exists, the previous one will be replaced
-+     *
 +     * @param property Property to set.
-+     * @throws IllegalArgumentException if setting the property results in more than 16 properties
 +     */
 +    void setProperty(@NotNull ProfileProperty property);
 +
 +    /**
 +     * Sets multiple properties. If any of the set properties already exist, it will be replaced
 +     * @param properties The properties to set
-+     * @throws IllegalArgumentException if the number of properties exceeds 16
 +     */
 +    void setProperties(@NotNull Collection<ProfileProperty> properties);
 +
@@ -247,10 +244,10 @@ index 0000000000000000000000000000000000000000..b4f9ffbebab8eef99dbd81c816c16c27
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..8f913a078dd692a9feafb98a6e6c9583f3253bd4
+index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6b0e0faee
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,72 @@
 +package com.destroystokyo.paper.profile;
 +
 +import com.google.common.base.Preconditions;
@@ -275,9 +272,6 @@ index 0000000000000000000000000000000000000000..8f913a078dd692a9feafb98a6e6c9583
 +        this.name = Preconditions.checkNotNull(name, "ProfileProperty name can not be null");
 +        this.value = Preconditions.checkNotNull(value, "ProfileProperty value can not be null");
 +        this.signature = signature;
-+        Preconditions.checkArgument(name.length() <= 64, "ProfileProperty name can not be longer than 64 characters");
-+        Preconditions.checkArgument(value.length() <= Short.MAX_VALUE, "ProfileProperty value can not be longer than 32767 characters");
-+        Preconditions.checkArgument(signature == null || signature.length() <= 1024, "ProfileProperty signature can not be longer than 1024 characters");
 +    }
 +
 +    /**
@@ -327,10 +321,10 @@ index 0000000000000000000000000000000000000000..8f913a078dd692a9feafb98a6e6c9583
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 53f56d95bdf484caed9effbedfe507f6745bb8c0..44e833a2be716d378688fe35822bdf0904fbb22f 100644
+index 365c2cd4f5a3a382d3b52b50377fbf56731a30ae..87ce6947a1e974c18e84f56ba622bee9fff3570b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2385,6 +2385,89 @@ public final class Bukkit {
+@@ -2304,6 +2304,83 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -362,8 +356,6 @@ index 53f56d95bdf484caed9effbedfe507f6745bb8c0..44e833a2be716d378688fe35822bdf09
 +     *
 +     * @param name Name to create profile for
 +     * @return A PlayerProfile object
-+     * @throws IllegalArgumentException if the name is longer than 16 characters
-+     * @throws IllegalArgumentException if the name contains invalid characters
 +     */
 +    @NotNull
 +    public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull String name) {
@@ -388,8 +380,6 @@ index 53f56d95bdf484caed9effbedfe507f6745bb8c0..44e833a2be716d378688fe35822bdf09
 +     * @param uuid UUID to create profile for
 +     * @param name Name to create profile for
 +     * @return A PlayerProfile object
-+     * @throws IllegalArgumentException if the name is longer than 16 characters
-+     * @throws IllegalArgumentException if the name contains invalid characters
 +     */
 +    @NotNull
 +    public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
@@ -410,8 +400,6 @@ index 53f56d95bdf484caed9effbedfe507f6745bb8c0..44e833a2be716d378688fe35822bdf09
 +     * @param uuid UUID to create profile for
 +     * @param name Name to create profile for
 +     * @return A PlayerProfile object
-+     * @throws IllegalArgumentException if the name is longer than 16 characters
-+     * @throws IllegalArgumentException if the name contains invalid characters
 +     */
 +    @NotNull
 +    public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
@@ -421,10 +409,10 @@ index 53f56d95bdf484caed9effbedfe507f6745bb8c0..44e833a2be716d378688fe35822bdf09
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b0734f8253ed540916db7bc75cd7dd24e86031c7..aeb5399b1c5e90079b199a591f7986acdf111cba 100644
+index 36d07fda939a5e1b4acf77d9092bfc42bbd27d78..bc68d8af8b38232392a12ef5f338e85ca80bccd0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2077,5 +2077,80 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2024,5 +2024,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
@@ -454,8 +442,6 @@ index b0734f8253ed540916db7bc75cd7dd24e86031c7..aeb5399b1c5e90079b199a591f7986ac
 +     *
 +     * @param name Name to create profile for
 +     * @return A PlayerProfile object
-+     * @throws IllegalArgumentException if the name is longer than 16 characters
-+     * @throws IllegalArgumentException if the name contains invalid characters
 +     */
 +    @NotNull
 +    com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull String name);
@@ -478,8 +464,6 @@ index b0734f8253ed540916db7bc75cd7dd24e86031c7..aeb5399b1c5e90079b199a591f7986ac
 +     * @param uuid UUID to create profile for
 +     * @param name Name to create profile for
 +     * @return A PlayerProfile object
-+     * @throws IllegalArgumentException if the name is longer than 16 characters
-+     * @throws IllegalArgumentException if the name contains invalid characters
 +     */
 +    @NotNull
 +    com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);
@@ -498,8 +482,6 @@ index b0734f8253ed540916db7bc75cd7dd24e86031c7..aeb5399b1c5e90079b199a591f7986ac
 +     * @param uuid UUID to create profile for
 +     * @param name Name to create profile for
 +     * @return A PlayerProfile object
-+     * @throws IllegalArgumentException if the name is longer than 16 characters
-+     * @throws IllegalArgumentException if the name contains invalid characters
 +     */
 +    @NotNull
 +    com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name);

patches/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
-index 951ea2cc763973655beedcba3c75332d3f297313..e528d811f651696069dbd2fd21c5ffad294b26af 100644
+index 951ea2cc763973655beedcba3c75332d3f297313..18d82c111f30e0279c10a174a51bac018185cd38 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull;
@@ -16,17 +16,16 @@ index 951ea2cc763973655beedcba3c75332d3f297313..e528d811f651696069dbd2fd21c5ffad
      private boolean cancel = false;
      private final int remaining;
  
-@@ -45,6 +46,28 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
+@@ -45,6 +46,27 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
          return remaining;
      }
  
-+    // Paper start
++    // Paper Start
 +    /**
 +     * Set if the item will fly at the player
-+     * <p>
-+     * Cancelling the event will set this value to false.
++     * <p>Cancelling the event will set this value to false.</p>
 +     *
-+     * @param flyAtPlayer true for item to fly at player
++     * @param flyAtPlayer True for item to fly at player
 +     */
 +    public void setFlyAtPlayer(boolean flyAtPlayer) {
 +        this.flyAtPlayer = flyAtPlayer;
@@ -35,17 +34,17 @@ index 951ea2cc763973655beedcba3c75332d3f297313..e528d811f651696069dbd2fd21c5ffad
 +    /**
 +     * Gets if the item will fly at the player
 +     *
-+     * @return true if the item will fly at the player
++     * @return True if the item will fly at the player
 +     */
 +    public boolean getFlyAtPlayer() {
 +        return flyAtPlayer;
 +    }
-+    // Paper end
++    // Paper End
 +
      @Override
      public boolean isCancelled() {
          return cancel;
-@@ -53,6 +76,7 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
+@@ -53,6 +75,7 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
      @Override
      public void setCancelled(boolean cancel) {
          this.cancel = cancel;

patches/api/0062-Shoulder-Entities-Release-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 8d97cf229ce1d14232d0342121b5db2230795a1d..c426bdea5ef71a095cf2af9a8a83a162db3c05b7 100644
+index 3845a726adbd0e75d7bf2aeeb6da8cb571d51a8f..abdca9fe5acc90f167219eb769ece66c35682bb1 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -329,6 +329,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -339,6 +339,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public int getExpToLevel();