Optimize Brain a little

We can avoid multiple ticket additions for the same ChunkTasks
instance. This will help in situations where significant number of
block updates occur for the same chunk in the same tick, such as
water draining.

.editorconfig

@@ -4,6 +4,10 @@ end_of_line=lf
 insert_final_newline=true
 indent_style=space
 indent_size=4
+ij_any_block_comment_add_space = false
+ij_any_block_comment_at_first_column = false
+ij_any_line_comment_at_first_column = false
+ij_any_line_comment_add_space = true
 
 [*.tiny]
 indent_style=tab
@@ -16,3 +20,15 @@ indent_size=2
 
 [*.patch]
 trim_trailing_whitespace=false
+
+[*.java]
+ij_continuation_indent_size = 4
+ij_java_class_count_to_use_import_on_demand = 999999
+ij_java_insert_inner_class_imports = false
+ij_java_names_count_to_use_import_on_demand = 999999
+ij_java_imports_layout = *,|,$*
+ij_java_generate_final_locals = true
+ij_java_generate_final_parameters = true
+
+[test-plugin/**/*.java]
+ij_java_use_fq_class_names = false

.gitattributes

@@ -1,4 +1,4 @@
-* text=auto
+* text=auto eol=lf
 
 *.sh text eol=lf
 gradlew text eol=lf

.github/workflows/build.yml

@@ -26,10 +26,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3.6.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 

.github/workflows/projects.yml

@@ -65,6 +65,7 @@ jobs:
           # include "status: needs triage" below to catch any closed issues without setting a resolution
           label-to-column-map: |
             {
+              "status: accepted": "Done",
               "status: needs triage": "Invalid",
               "resolution: works-as-intended": "Invalid",
               "resolution: invalid": "Invalid",

LICENSE.md

@@ -60,5 +60,7 @@ Luke Chambers <consolelogluke@gmail.com>
 Emily <emilia.lopezf.1999@gmail.com>
 dawon <dawon@dawon.eu>
 Ollie <69084614+olijeffers0n@users.noreply.github.com>
-BlockyTheDev <86119630+BlockyTheDev@users.noreply.github.com>
+Oliwier Miodun <naczs@blueflow.pl>
+aerulion <aerulion@gmail.com>
+Lukas Planz <lukas.planz@web.de>
 ```

README.md

@@ -4,11 +4,11 @@ Paper [![Paper Build Status](https://img.shields.io/github/actions/workflow/stat
 [![Open Collective](https://img.shields.io/opencollective/all/papermc?label=OpenCollective%20Sponsors)](https://opencollective.com/papermc)
 ===========
 
-High-performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.
+The most widely used, high-performance Minecraft server that aims to fix gameplay and mechanics inconsistencies.
 
 
 **Support and Project Discussion:**
- - [Our forums](https://forums.papermc.io/), [Discord](https://discord.gg/papermc), or [IRC](https://webchat.esper.net/?channels=paper)
+- [Our forums](https://forums.papermc.io/), [Discord](https://discord.gg/papermc), or [IRC](https://webchat.esper.net/?channels=paper)
 
 How To (Server Admins)
 ------
@@ -18,22 +18,24 @@ Download Paper from our [downloads page](https://papermc.io/downloads/paper).
 
 Run the Paperclip jar directly from your server. Just like old times
 
-  * Documentation on using Paper: [docs.papermc.io](https://docs.papermc.io)
-  * For a sneak peek at upcoming features, [see here](https://github.com/PaperMC/Paper/projects)
+* Documentation on using Paper: [docs.papermc.io](https://docs.papermc.io)
+* For a sneak peek at upcoming features, [see here](https://github.com/PaperMC/Paper/projects)
 
 How To (Plugin Developers)
 ------
- * See our API patches [here](patches/api)
- * See upcoming, pending, and recently added API [here](https://github.com/PaperMC/Paper/projects/6)
- * Paper API javadocs here: [papermc.io/javadocs](https://papermc.io/javadocs/)
- * Maven Repo (for paper-api):
+* See our API patches [here](patches/api)
+* See upcoming, pending, and recently added API [here](https://github.com/orgs/PaperMC/projects/2/views/4)
+* Paper API javadocs here: [papermc.io/javadocs](https://papermc.io/javadocs/)
+#### Repository (for paper-api)
+##### Maven
+
 ```xml
 <repository>
     <id>papermc</id>
     <url>https://repo.papermc.io/repository/maven-public/</url>
 </repository>
 ```
- * Artifact Information:
+
 ```xml
 <dependency>
     <groupId>io.papermc.paper</groupId>
@@ -41,11 +43,8 @@ How To (Plugin Developers)
     <version>1.20.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
- ```
-
-**Or alternatively, with Gradle:**
-
- * Repository:
+```
+##### Gradle
 ```kotlin
 repositories {
     maven {
@@ -76,9 +75,9 @@ See [Contributing](CONTRIBUTING.md)
 
 Support Us
 ------
-First of all, thank you for considering helping out, we really appreciate that!  
+First of all, thank you for considering helping out, we really appreciate that!
 
-PaperMC has various recurring expenses, mostly related to infrastructure. Paper uses [Open Collective](https://opencollective.com/) via the [Open Source Collective fiscal host](https://opencollective.com/opensource) to manage expenses. Open Collective allows us to be extremely transparent, so you can always see how your donations are used. You can read more about financially supporting PaperMC [on our website](https://papermc.io/sponsors).  
+PaperMC has various recurring expenses, mostly related to infrastructure. Paper uses [Open Collective](https://opencollective.com/) via the [Open Source Collective fiscal host](https://opencollective.com/opensource) to manage expenses. Open Collective allows us to be extremely transparent, so you can always see how your donations are used. You can read more about financially supporting PaperMC [on our website](https://papermc.io/sponsors).
 
 You can find our collective [here](https://opencollective.com/papermc), or you can donate via GitHub Sponsors [here](https://github.com/sponsors/PaperMC), which will also go towards the collective.
 

build-data/reobf-mappings-patch.tiny

@@ -26,10 +26,3 @@ c	net/minecraft/server/level/ChunkMap	net/minecraft/server/level/PlayerChunkMap
 # Paper changes type
 c	net/minecraft/core/MappedRegistry	net/minecraft/core/RegistryMaterials
 	f	Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;	toId	e
-
-# upstream makes a bunch of methods public that cause accidental overrides now
-c	net/minecraft/world/entity/Display	net/minecraft/world/entity/Display
-	m	()I	getInterpolationDelay	getInterpolationDelay_
-	m	(I)V	setInterpolationDelay	setInterpolationDelay_
-	m	(I)V	setInterpolationDuration	setInterpolationDuration_
-

gradle.properties

@@ -1,5 +1,5 @@
 group=io.papermc.paper
-version=1.20.1-experimental-SNAPSHOT
+version=1.20.1-R0.1-SNAPSHOT
 mcVersion=1.20.1
 
 org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

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

@@ -27,7 +27,7 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..b1634fe921f5cd4e0b76823e33db5bc3ca50a8b5
+index 0000000000000000000000000000000000000000..c2e5d8006420aab5a60e5aaa188223aeb0396483
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,86 @@
@@ -42,18 +42,19 @@ index 0000000000000000000000000000000000000000..b1634fe921f5cd4e0b76823e33db5bc3
 +}
 +
 +val annotationsVersion = "24.0.1"
++val bungeeCordChatVersion = "1.20-R0.1"
 +
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
 +    api("com.google.guava:guava:31.1-jre")
 +    api("com.google.code.gson:gson:2.10")
-+    api("net.md-5:bungeecord-chat:1.16-R0.4")
++    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 +    api("org.yaml:snakeyaml:2.0")
 +    api("org.joml:joml:1.10.5")
 +
-+    compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
++    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)
@@ -63,7 +64,6 @@ index 0000000000000000000000000000000000000000..b1634fe921f5cd4e0b76823e33db5bc3
 +    testImplementation("junit:junit:4.13.2")
 +    testImplementation("org.hamcrest:hamcrest-library:1.3")
 +    testImplementation("org.ow2.asm:asm-tree:9.5")
-+    testImplementation("org.mockito:mockito-core:5.3.1")
 +}
 +
 +configure<PublishingExtension> {
@@ -102,7 +102,7 @@ index 0000000000000000000000000000000000000000..b1634fe921f5cd4e0b76823e33db5bc3
 +        "https://guava.dev/releases/31.1-jre/api/docs/",
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
-+        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
++        "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
 +    )
 +    options.tags("apiNote:a:API Note:")
 +
@@ -119,10 +119,10 @@ index 0000000000000000000000000000000000000000..b1634fe921f5cd4e0b76823e33db5bc3
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index f9baf5cd570de24773b5ac2e5126475b5124d863..0000000000000000000000000000000000000000
+index 068987ca1171857fc9996d645e775448a09f0feb..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,276 +0,0 @@
+@@ -1,270 +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">
@@ -130,7 +130,7 @@ index f9baf5cd570de24773b5ac2e5126475b5124d863..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.20.1-experimental-SNAPSHOT</version>
+-    <version>1.20.1-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -139,8 +139,8 @@ index f9baf5cd570de24773b5ac2e5126475b5124d863..00000000000000000000000000000000
 -
 -    <properties>
 -        <skipTests>true</skipTests>
--        <maven.compiler.source>9</maven.compiler.source>
--        <maven.compiler.target>9</maven.compiler.target>
+-        <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>
 -
@@ -180,7 +180,7 @@ index f9baf5cd570de24773b5ac2e5126475b5124d863..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>net.md-5</groupId>
 -            <artifactId>bungeecord-chat</artifactId>
--            <version>1.16-R0.4</version>
+-            <version>1.20-R0.1</version>
 -            <type>jar</type>
 -            <scope>compile</scope>
 -        </dependency>
@@ -194,19 +194,19 @@ index f9baf5cd570de24773b5ac2e5126475b5124d863..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.maven</groupId>
 -            <artifactId>maven-resolver-provider</artifactId>
--            <version>3.9.2</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.10</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.10</version>
+-            <version>1.7.3</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- annotations -->
@@ -235,12 +235,6 @@ index f9baf5cd570de24773b5ac2e5126475b5124d863..00000000000000000000000000000000
 -            <version>9.5</version>
 -            <scope>test</scope>
 -        </dependency>
--        <dependency>
--            <groupId>org.mockito</groupId>
--            <artifactId>mockito-core</artifactId>
--            <version>5.3.1</version>
--            <scope>test</scope>
--        </dependency>
 -    </dependencies>
 -
 -    <build>
@@ -248,7 +242,7 @@ index f9baf5cd570de24773b5ac2e5126475b5124d863..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>net.md-5</groupId>
 -                <artifactId>scriptus</artifactId>
--                <version>0.4.1</version>
+-                <version>0.5.0</version>
 -                <executions>
 -                    <execution>
 -                        <phase>initialize</phase>
@@ -294,7 +288,7 @@ index f9baf5cd570de24773b5ac2e5126475b5124d863..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-shade-plugin</artifactId>
--                <version>3.4.1</version>
+-                <version>3.5.0</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
@@ -327,7 +321,7 @@ index f9baf5cd570de24773b5ac2e5126475b5124d863..00000000000000000000000000000000
 -                        <link>https://guava.dev/releases/31.1-jre/api/docs/</link>
 -                        <link>https://javadoc.io/doc/org.yaml/snakeyaml/2.0/</link>
 -                        <link>https://javadoc.io/doc/org.jetbrains/annotations-java5/24.0.1/</link>
--                        <link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
+-                        <link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.20-R0.1/</link>
 -                    </links>
 -                    <tags>
 -                        <tag>

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

@@ -5,11 +5,11 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b1634fe921f5cd4e0b76823e33db5bc3ca50a8b5..61e15811e94effd303d55f8fa14c9fbf0ca6438e 100644
+index c2e5d8006420aab5a60e5aaa188223aeb0396483..ffd1c792b0e0fe1ed3da85cf933202c5193734ce 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -17,15 +17,27 @@ dependencies {
-     api("net.md-5:bungeecord-chat:1.16-R0.4")
+@@ -18,15 +18,27 @@ dependencies {
+     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
      api("org.yaml:snakeyaml:2.0")
      api("org.joml:joml:1.10.5")
 +    // Paper start
@@ -18,9 +18,9 @@ index b1634fe921f5cd4e0b76823e33db5bc3ca50a8b5..61e15811e94effd303d55f8fa14c9fbf
 +    }
 +    // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
+     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"
@@ -43,7 +43,7 @@ index b1634fe921f5cd4e0b76823e33db5bc3ca50a8b5..61e15811e94effd303d55f8fa14c9fbf
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
-         "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
+         "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
      )
      options.tags("apiNote:a:API Note:")
 @@ -84,3 +96,14 @@ tasks.withType<Javadoc> {

patches/api/0003-Test-changes.patch

@@ -12,6 +12,47 @@ Subject: [PATCH] Test changes
 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 ffd1c792b0e0fe1ed3da85cf933202c5193734ce..b38a9f4d628fa639e5d2b7dcd5a63f0bf6b8330b 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -38,6 +38,7 @@ dependencies {
+     compileOnlyApi(checkerQual)
+     testCompileOnly(checkerQual)
+     // Paper end
++    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito
+ 
+     testImplementation("org.apache.commons:commons-lang3:3.12.0")
+     testImplementation("junit:junit:4.13.2")
+diff --git a/src/test/java/io/papermc/paper/testing/EmptyRegistry.java b/src/test/java/io/papermc/paper/testing/EmptyRegistry.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..ba9ddce87a9f385e729a5c2cf7c5eec120e388a7
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/testing/EmptyRegistry.java
+@@ -0,0 +1,23 @@
++package io.papermc.paper.testing;
++
++import java.util.Collections;
++import java.util.Iterator;
++import org.bukkit.Keyed;
++import org.bukkit.NamespacedKey;
++import org.bukkit.Registry;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++public record EmptyRegistry() implements Registry<Keyed> {
++
++    @NotNull
++    @Override
++    public Iterator<Keyed> iterator() {
++        return Collections.emptyIterator();
++    }
++
++    @Override
++    public @Nullable Keyed get(@NotNull final NamespacedKey key) {
++        return null;
++    }
++}
 diff --git a/src/test/java/io/papermc/paper/testing/EmptyTag.java b/src/test/java/io/papermc/paper/testing/EmptyTag.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..77154095cfb8b259bdb318e8ff40cb6f559ebc18
@@ -49,6 +90,60 @@ index 0000000000000000000000000000000000000000..77154095cfb8b259bdb318e8ff40cb6f
 +        return Collections.emptySet();
 +    }
 +}
+diff --git a/src/test/java/io/papermc/paper/testing/TestServer.java b/src/test/java/io/papermc/paper/testing/TestServer.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..756acf231b1b076b08046d86992ba7ce7f62a94f
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/testing/TestServer.java
+@@ -0,0 +1,48 @@
++package io.papermc.paper.testing;
++
++import java.util.logging.Logger;
++import org.bukkit.Bukkit;
++import org.bukkit.NamespacedKey;
++import org.bukkit.Server;
++import org.bukkit.command.SimpleCommandMap;
++import org.bukkit.plugin.PluginManager;
++import org.bukkit.plugin.SimplePluginManager;
++
++import static org.mockito.ArgumentMatchers.anyString;
++import static org.mockito.Mockito.any;
++import static org.mockito.Mockito.mock;
++import static org.mockito.Mockito.when;
++
++public final class TestServer {
++
++    @SuppressWarnings("removal")
++    public static void setup() {
++        //noinspection ConstantValue
++        if (Bukkit.getServer() != null) {
++            return;
++        }
++
++        final Server dummyServer = mock(Server.class);
++
++        final Logger logger = Logger.getLogger(TestServer.class.getCanonicalName());
++        when(dummyServer.getLogger()).thenReturn(logger);
++        when(dummyServer.getName()).thenReturn(TestServer.class.getSimpleName());
++        when(dummyServer.getVersion()).thenReturn("Version_" + TestServer.class.getPackage().getImplementationVersion());
++        when(dummyServer.getBukkitVersion()).thenReturn("BukkitVersion_" + TestServer.class.getPackage().getImplementationVersion());
++
++
++        final Thread currentThread = Thread.currentThread();
++        when(dummyServer.isPrimaryThread()).thenAnswer(ignored -> Thread.currentThread().equals(currentThread));
++
++        when(dummyServer.getTag(anyString(), any(NamespacedKey.class), any())).thenAnswer(ignored -> new EmptyTag());
++
++        final PluginManager pluginManager = new SimplePluginManager(dummyServer, new SimpleCommandMap(dummyServer));
++        when(dummyServer.getPluginManager()).thenReturn(pluginManager);
++
++        when(dummyServer.getRegistry(any())).thenAnswer(ignored -> new EmptyRegistry());
++        when(dummyServer.getScoreboardCriteria(anyString())).thenReturn(null);
++
++        Bukkit.setServer(dummyServer);
++    }
++
++}
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
 index 4ac3dd977e75cd8464163351d306e037ee32cb48..c26ea217927ba77611e6ae93f8df50a83bceb3dd 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
@@ -217,17 +312,231 @@ index 2dfada66067d79b84cd490eadbe0178e8cd8c260..06d66512c91c680130132b79e34fbf32
              @Override
              public Object[] apply(Method input) {
 diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-index 1e407c612c7dc26a2bea4b6ed70e1f0723dc3762..e3480404af8187588787383b18e3002032653d71 100644
+deleted file mode 100644
+index 701a17c10f31cd345238a3c568264178ce372faa..0000000000000000000000000000000000000000
 --- a/src/test/java/org/bukkit/TestServer.java
-+++ b/src/test/java/org/bukkit/TestServer.java
-@@ -59,6 +59,10 @@ public final class TestServer {
++++ /dev/null
+@@ -1,139 +0,0 @@
+-package org.bukkit;
+-
+-import com.google.common.collect.ImmutableMap;
+-import java.lang.reflect.InvocationHandler;
+-import java.lang.reflect.Method;
+-import java.lang.reflect.Proxy;
+-import java.util.Iterator;
+-import java.util.Map;
+-import java.util.logging.Logger;
+-import org.bukkit.command.SimpleCommandMap;
+-import org.bukkit.plugin.PluginManager;
+-import org.bukkit.plugin.SimplePluginManager;
+-import org.jetbrains.annotations.NotNull;
+-import org.jetbrains.annotations.Nullable;
+-
+-public final class TestServer implements InvocationHandler {
+-    private static interface MethodHandler {
+-        Object handle(TestServer server, Object[] args);
+-    }
+-
+-    private static final Map<Method, MethodHandler> methods;
+-
+-    static {
+-        try {
+-            ImmutableMap.Builder<Method, MethodHandler> methodMap = ImmutableMap.builder();
+-            methodMap.put(
+-                    Server.class.getMethod("isPrimaryThread"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return Thread.currentThread().equals(server.creatingThread);
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getPluginManager"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return server.pluginManager;
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getLogger"),
+-                    new MethodHandler() {
+-                        final Logger logger = Logger.getLogger(TestServer.class.getCanonicalName());
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return logger;
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getName"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return TestServer.class.getSimpleName();
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getVersion"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return "Version_" + TestServer.class.getPackage().getImplementationVersion();
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getBukkitVersion"),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return "BukkitVersion_" + TestServer.class.getPackage().getImplementationVersion();
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getRegistry", Class.class),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            return new Registry() {
+-                                @NotNull
+-                                @Override
+-                                public Iterator iterator() {
+-                                    return null;
+-                                }
+-
+-                                @Nullable
+-                                @Override
+-                                public Keyed get(@NotNull NamespacedKey key) {
+-                                    return null;
+-                                }
+-                            };
+-                        }
+-                    }
+-                );
+-            methodMap.put(
+-                    Server.class.getMethod("getScoreboardCriteria", String.class),
+-                    new MethodHandler() {
+-                        @Override
+-                        public Object handle(TestServer server, Object[] args) {
+-                            // Does not need to return anything. Exists solely to test CriteriaTest which has static init fields
+-                            return null;
+-                        }
+-                    }
+-                );
+-            methods = methodMap.build();
+-
+-            TestServer server = new TestServer();
+-            Server instance = Proxy.getProxyClass(Server.class.getClassLoader(), Server.class).asSubclass(Server.class).getConstructor(InvocationHandler.class).newInstance(server);
+-            Bukkit.setServer(instance);
+-            server.pluginManager = new SimplePluginManager(instance, new SimpleCommandMap(instance));
+-        } catch (Throwable t) {
+-            throw new Error(t);
+-        }
+-    }
+-
+-    private Thread creatingThread = Thread.currentThread();
+-    private PluginManager pluginManager;
+-    private TestServer() {};
+-
+-    public static Server getInstance() {
+-        return Bukkit.getServer();
+-    }
+-
+-    @Override
+-    public Object invoke(Object proxy, Method method, Object[] args) {
+-        MethodHandler handler = methods.get(method);
+-        if (handler != null) {
+-            return handler.handle(this, args);
+-        }
+-        throw new UnsupportedOperationException(String.valueOf(method));
+-    }
+-}
+diff --git a/src/test/java/org/bukkit/TestWorld.java b/src/test/java/org/bukkit/TestWorld.java
+index ab34f1199921d415fa2ca6e281a8125c9e6d7173..f64d024f5bbf9482aaddb56597b23b04c66f21bf 100644
+--- a/src/test/java/org/bukkit/TestWorld.java
++++ b/src/test/java/org/bukkit/TestWorld.java
+@@ -18,7 +18,7 @@ public final class TestWorld implements InvocationHandler {
  
-             Mockito.when(instance.getUnsafe()).then(mock -> unsafeValues);
+     static {
+         try {
+-            TestServer.getInstance();
++            io.papermc.paper.testing.TestServer.setup(); // Paper
  
-+            // Paper start - test changes
-+            Mockito.when(instance.getTag(Mockito.anyString(), Mockito.any(NamespacedKey.class), Mockito.any())).thenAnswer(ignored -> new io.papermc.paper.testing.EmptyTag());
-+            // Paper end
-+
-             Bukkit.setServer(instance);
-             server.pluginManager = new SimplePluginManager(instance, new SimpleCommandMap(instance));
-         } catch (Throwable t) {
+             ImmutableMap.Builder<Method, MethodHandler> methodMap = ImmutableMap.builder();
+             methodMap.put(
+diff --git a/src/test/java/org/bukkit/event/SyntheticEventTest.java b/src/test/java/org/bukkit/event/SyntheticEventTest.java
+index d402cb59f508205ebe9ee450594826b04cecb90b..09886568ae6167141b463b6262565fa212af3385 100644
+--- a/src/test/java/org/bukkit/event/SyntheticEventTest.java
++++ b/src/test/java/org/bukkit/event/SyntheticEventTest.java
+@@ -1,6 +1,5 @@
+ package org.bukkit.event;
+ 
+-import org.bukkit.TestServer;
+ import org.bukkit.plugin.PluginLoader;
+ import org.bukkit.plugin.SimplePluginManager;
+ import org.bukkit.plugin.TestPlugin;
+@@ -12,14 +11,15 @@ public class SyntheticEventTest {
+     @SuppressWarnings("deprecation")
+     @Test
+     public void test() {
+-        final JavaPluginLoader loader = new JavaPluginLoader(TestServer.getInstance());
++        io.papermc.paper.testing.TestServer.setup(); // Paper
++        final JavaPluginLoader loader = new JavaPluginLoader(org.bukkit.Bukkit.getServer()); // Paper
+         TestPlugin plugin = new TestPlugin(getClass().getName()) {
+             @Override
+             public PluginLoader getPluginLoader() {
+                 return loader;
+             }
+         };
+-        SimplePluginManager pluginManager = new SimplePluginManager(TestServer.getInstance(), null);
++        SimplePluginManager pluginManager = new SimplePluginManager(org.bukkit.Bukkit.getServer(), null); // Paper
+ 
+         TestEvent event = new TestEvent(false);
+         Impl impl = new Impl();
+diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
+index f188cd4f3b07027c30d41f1162db77a506b7b6bb..c46ed2acb82db814d660459b705dd49e6d44240f 100644
+--- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
++++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
+@@ -2,7 +2,6 @@ package org.bukkit.plugin;
+ 
+ import static org.hamcrest.Matchers.*;
+ import static org.junit.Assert.*;
+-import org.bukkit.TestServer;
+ import org.bukkit.event.Event;
+ import org.bukkit.event.TestEvent;
+ import org.bukkit.permissions.Permission;
+@@ -14,7 +13,7 @@ public class PluginManagerTest {
+         volatile Object value = null;
+     }
+ 
+-    private static final PluginManager pm = TestServer.getInstance().getPluginManager();
++    private static final PluginManager pm = org.bukkit.Bukkit.getServer().getPluginManager(); // Paper
+ 
+     private final MutableObject store = new MutableObject();
+ 
+diff --git a/src/test/java/org/bukkit/scoreboard/CriteriaTest.java b/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
+index eb94b6f4d58cd9f66b07791c57af7e359992e28c..a93f28e2f987a36e2c7e4f7d31506b750bdb222b 100644
+--- a/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
++++ b/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
+@@ -2,7 +2,6 @@ package org.bukkit.scoreboard;
+ 
+ import org.bukkit.Material;
+ import org.bukkit.Statistic;
+-import org.bukkit.TestServer;
+ import org.bukkit.entity.EntityType;
+ import org.junit.Assert;
+ import org.junit.Test;
+@@ -11,7 +10,7 @@ public class CriteriaTest {
+ 
+     @Test
+     public void testStatistic() {
+-        TestServer.getInstance();
++        io.papermc.paper.testing.TestServer.setup(); // Paper
+ 
+         Assert.assertThrows(IllegalArgumentException.class, () -> Criteria.statistic(Statistic.AVIATE_ONE_CM, Material.STONE)); // Generic statistic with block
+         Assert.assertThrows(IllegalArgumentException.class, () -> Criteria.statistic(Statistic.AVIATE_ONE_CM, EntityType.CREEPER)); // Generic statistic with entity type

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

@@ -6,14 +6,14 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c174d9d6534382ae9d002b883bde929d46e32789..3e571743e76b26167e329dbd0a4c04ffd6427572 100644
+index b38a9f4d628fa639e5d2b7dcd5a63f0bf6b8330b..19720f73cb8454d6ddd8d75e7d08556d61436505 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -21,6 +21,7 @@ dependencies {
+@@ -22,6 +22,7 @@ dependencies {
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
      }
 +    api("it.unimi.dsi:fastutil:8.5.6")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")

patches/api/0006-Paper-Utils.patch

@@ -26,23 +26,3 @@ index 0000000000000000000000000000000000000000..9db0056ab94145819628b3ad8d8d2613
 +    }
 +
 +}
-diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 2d334dbdd9e2c9a020899097e0620152758dc078..639d275b8318d19afd18996e1daa4e800927a84d 100644
---- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -5,6 +5,7 @@ import org.bukkit.advancement.Advancement;
- import org.bukkit.attribute.Attribute;
- import org.bukkit.attribute.AttributeModifier;
- import org.bukkit.block.Biome;
-+import org.bukkit.block.BlockType;
- import org.bukkit.block.data.BlockData;
- import org.bukkit.entity.Entity;
- import org.bukkit.entity.EntityType;
-@@ -47,6 +48,7 @@ public interface UnsafeValues {
-     Material fromLegacy(MaterialData material, boolean itemPriority);
- 
-     Material toMaterial(ItemType itemType);
-+    Material blockTypeToMaterial(BlockType<?> blockType); // Paper
- 
-     BlockData fromLegacy(Material material, byte data);
- 

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

@@ -6,7 +6,7 @@ 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 a6001fec6b8ff6a0d41336802d202e005ad2db81..a626bbad85f8d1b348d4e67f328f4b0141b267c1 100644
+index cbab63d2f3b045f6193f5a3422ae4b5509d3003b..ba6f0a70ba2442dbe60ed6cc92e4fb91a48d9f3b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -42,6 +42,9 @@ dependencies {
@@ -18,7 +18,7 @@ index a6001fec6b8ff6a0d41336802d202e005ad2db81..a626bbad85f8d1b348d4e67f328f4b01
 +    implementation("org.ow2.asm:asm-commons:9.4")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
+     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

patches/api/0008-Paper-Plugins.patch

@@ -5,17 +5,17 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 04433b1f41c5abf04743ed6dd96bf83267a39828..8b4f7f0166a1323266c603ca4c860980617f5eda 100644
+index ba6f0a70ba2442dbe60ed6cc92e4fb91a48d9f3b..22b65c3ad4ed6e19b88a51a2e001f0e5846d9ae6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -47,7 +47,7 @@ dependencies {
      implementation("org.ow2.asm:asm-commons:9.4")
      // Paper end
  
--    compileOnly("org.apache.maven:maven-resolver-provider:3.9.2")
-+    api("org.apache.maven:maven-resolver-provider:3.9.2")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
+-    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
 diff --git a/src/main/java/io/papermc/paper/plugin/PermissionManager.java b/src/main/java/io/papermc/paper/plugin/PermissionManager.java
 new file mode 100644
@@ -703,7 +703,7 @@ index 0000000000000000000000000000000000000000..0546fa1e9dcd7155086a8650806a8c08
 +}
 diff --git a/src/main/java/io/papermc/paper/plugin/loader/library/impl/JarLibrary.java b/src/main/java/io/papermc/paper/plugin/loader/library/impl/JarLibrary.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..3327595d154700890c862a2ced5eff93da4bd634
+index 0000000000000000000000000000000000000000..e3da0d67cab01e1233dccde1a12ff25961ee79fb
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/loader/library/impl/JarLibrary.java
 @@ -0,0 +1,45 @@
@@ -728,7 +728,7 @@ index 0000000000000000000000000000000000000000..3327595d154700890c862a2ced5eff93
 + * resulting in a jar library that provides the jar at {@code libs/custom-library-1.24.jar} to the plugins classloader
 + * at runtime.
 + * <p>
-+ * The jar library implementation will error if file exists at the specified path.
++ * The jar library implementation will error if the file does not exist at the specified path.
 + */
 +public class JarLibrary implements ClassPathLibrary {
 +
@@ -754,7 +754,7 @@ index 0000000000000000000000000000000000000000..3327595d154700890c862a2ced5eff93
 +}
 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..e3e902a708a760be167cb1bba8e845c5fa5b9141
+index 0000000000000000000000000000000000000000..9af07d168beadaa77e4965819200eeb94fe3e092
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
 @@ -0,0 +1,132 @@
@@ -784,12 +784,12 @@ index 0000000000000000000000000000000000000000..e3e902a708a760be167cb1bba8e845c5
 +import org.eclipse.aether.transfer.TransferEvent;
 +import org.eclipse.aether.transport.http.HttpTransporterFactory;
 +import org.jetbrains.annotations.NotNull;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
 +
 +import java.io.File;
 +import java.util.ArrayList;
 +import java.util.List;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
 +
 +/**
 + * The maven library resolver acts as a resolver for yet to be resolved jar libraries that may be pulled from a
@@ -810,7 +810,7 @@ index 0000000000000000000000000000000000000000..e3e902a708a760be167cb1bba8e845c5
 + */
 +public class MavenLibraryResolver implements ClassPathLibrary {
 +
-+    private static final Logger logger = Logger.getLogger("MavenLibraryResolver");
++    private static final Logger logger = LoggerFactory.getLogger("MavenLibraryResolver");
 +
 +    private final RepositorySystem repository;
 +    private final DefaultRepositorySystemSession session;
@@ -838,7 +838,7 @@ index 0000000000000000000000000000000000000000..e3e902a708a760be167cb1bba8e845c5
 +        this.session.setTransferListener(new AbstractTransferListener() {
 +            @Override
 +            public void transferInitiated(@NotNull TransferEvent event) throws TransferCancelledException {
-+                logger.log(Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName());
++                logger.info("Downloading {}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName());
 +            }
 +        });
 +        this.session.setReadOnly();
@@ -1338,13 +1338,13 @@ index 0000000000000000000000000000000000000000..6bf3d212a6156ad9ab0e82d1ca0a04f8
 +
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index cd00a831cd4c6030082aa8107d25c78d8ee67d8f..628fae98b17cd7dd1a5358562225cefefeb5051b 100644
+index fd0ae07b8a19f6b628601a487329a929f3a26c91..2042e3fb0ea347148814d9838cd7bb475bd23984 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -110,4 +110,13 @@ public interface UnsafeValues {
-     EntityType<Entity> getUnkownEntityType();
+@@ -101,4 +101,14 @@ public interface UnsafeValues {
  
-     Biome getCustomBiome();
+     @Nullable
+     FeatureFlag getFeatureFlag(@NotNull NamespacedKey key);
 +
 +    // Paper start
 +    @Deprecated(forRemoval = true)
@@ -1354,6 +1354,7 @@ index cd00a831cd4c6030082aa8107d25c78d8ee67d8f..628fae98b17cd7dd1a5358562225cefe
 +    static boolean isLegacyPlugin(org.bukkit.plugin.Plugin plugin) {
 +        return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
 +    }
++    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
 index 1dbbc244309043b18c1d71707c4fb066c0d0e02d..551c5af6a7bfa2268cbc63be8e70d129bccaa912 100644
@@ -1440,10 +1441,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 77a380537b338fdd0aa2f6777ff775056cc6b221..028805bcdb1d2bb0d11387db165b7376579e5f60 100644
+index 0eae1c027cab0444a125ae4efed7f9fcb1b9934f..07e8908d25fcd4e5eabadc9f019b54acff3b5e3c 100644
 --- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
 +++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
-@@ -195,7 +195,7 @@ import org.yaml.snakeyaml.nodes.Tag;
+@@ -197,7 +197,7 @@ import org.yaml.snakeyaml.representer.Representer;
   *      inferno.burningdeaths: true
   *</pre></blockquote>
   */
@@ -1452,7 +1453,7 @@ index 77a380537b338fdd0aa2f6777ff775056cc6b221..028805bcdb1d2bb0d11387db165b7376
      private static final Pattern VALID_NAME = Pattern.compile("^[A-Za-z0-9 _.-]+$");
      private static final ThreadLocal<Yaml> YAML = new ThreadLocal<Yaml>() {
          @Override
-@@ -255,6 +255,70 @@ public final class PluginDescriptionFile {
+@@ -258,6 +258,70 @@ public final class PluginDescriptionFile {
      private Set<PluginAwareness> awareness = ImmutableSet.of();
      private String apiVersion = null;
      private List<String> libraries = ImmutableList.of();
@@ -2267,56 +2268,28 @@ index 2f74ec96ece706de23156ebabfe493211bc05391..302319acbc257a075adfb78d9f5c49fd
 +
 +    // Paper end
  }
-diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-index e3480404af8187588787383b18e3002032653d71..ec00f2ac0fe2be6c3b4c25b027bc4ff36008e5e1 100644
---- a/src/test/java/org/bukkit/TestServer.java
-+++ b/src/test/java/org/bukkit/TestServer.java
-@@ -4,9 +4,7 @@ import java.util.HashMap;
- import java.util.Iterator;
- import java.util.Map;
- import java.util.logging.Logger;
--import org.bukkit.command.SimpleCommandMap;
--import org.bukkit.plugin.PluginManager;
--import org.bukkit.plugin.SimplePluginManager;
-+// Paper - Paper Plugins
- import org.mockito.Mockito;
- import org.mockito.invocation.InvocationOnMock;
- import org.mockito.stubbing.Answer;
-@@ -20,7 +18,7 @@ public final class TestServer {
+diff --git a/src/test/java/io/papermc/paper/testing/TestServer.java b/src/test/java/io/papermc/paper/testing/TestServer.java
+index 756acf231b1b076b08046d86992ba7ce7f62a94f..52d27d977b9df0bdf02b33ed0aaa3b4db0a04cb4 100644
+--- a/src/test/java/io/papermc/paper/testing/TestServer.java
++++ b/src/test/java/io/papermc/paper/testing/TestServer.java
+@@ -36,9 +36,6 @@ public final class TestServer {
  
-             Mockito.when(instance.isPrimaryThread()).then(mock -> Thread.currentThread().equals(server.creatingThread));
+         when(dummyServer.getTag(anyString(), any(NamespacedKey.class), any())).thenAnswer(ignored -> new EmptyTag());
  
--            Mockito.when(instance.getPluginManager()).then(mock -> server.pluginManager);
-+            // Paper - Paper Plugins
+-        final PluginManager pluginManager = new SimplePluginManager(dummyServer, new SimpleCommandMap(dummyServer));
+-        when(dummyServer.getPluginManager()).thenReturn(pluginManager);
+-
+         when(dummyServer.getRegistry(any())).thenAnswer(ignored -> new EmptyRegistry());
+         when(dummyServer.getScoreboardCriteria(anyString())).thenReturn(null);
  
-             Mockito.when(instance.getLogger()).then(new Answer<Logger>() {
-                 final Logger logger = Logger.getLogger(TestServer.class.getCanonicalName());
-@@ -64,14 +62,14 @@ public final class TestServer {
-             // Paper end
- 
-             Bukkit.setServer(instance);
--            server.pluginManager = new SimplePluginManager(instance, new SimpleCommandMap(instance));
-+            // Paper - Paper Plugins
-         } catch (Throwable t) {
-             throw new Error(t);
-         }
-     }
- 
-     private Thread creatingThread = Thread.currentThread();
--    private PluginManager pluginManager;
-+    // Paper - Paper Plugins
-     private TestServer() {}
- 
-     public static void setup() {}
 diff --git a/src/test/java/org/bukkit/event/SyntheticEventTest.java b/src/test/java/org/bukkit/event/SyntheticEventTest.java
 deleted file mode 100644
-index d402cb59f508205ebe9ee450594826b04cecb90b..0000000000000000000000000000000000000000
+index 09886568ae6167141b463b6262565fa212af3385..0000000000000000000000000000000000000000
 --- a/src/test/java/org/bukkit/event/SyntheticEventTest.java
 +++ /dev/null
 @@ -1,48 +0,0 @@
 -package org.bukkit.event;
 -
--import org.bukkit.TestServer;
 -import org.bukkit.plugin.PluginLoader;
 -import org.bukkit.plugin.SimplePluginManager;
 -import org.bukkit.plugin.TestPlugin;
@@ -2328,14 +2301,15 @@ index d402cb59f508205ebe9ee450594826b04cecb90b..00000000000000000000000000000000
 -    @SuppressWarnings("deprecation")
 -    @Test
 -    public void test() {
--        final JavaPluginLoader loader = new JavaPluginLoader(TestServer.getInstance());
+-        io.papermc.paper.testing.TestServer.setup(); // Paper
+-        final JavaPluginLoader loader = new JavaPluginLoader(org.bukkit.Bukkit.getServer()); // Paper
 -        TestPlugin plugin = new TestPlugin(getClass().getName()) {
 -            @Override
 -            public PluginLoader getPluginLoader() {
 -                return loader;
 -            }
 -        };
--        SimplePluginManager pluginManager = new SimplePluginManager(TestServer.getInstance(), null);
+-        SimplePluginManager pluginManager = new SimplePluginManager(org.bukkit.Bukkit.getServer(), null); // Paper
 -
 -        TestEvent event = new TestEvent(false);
 -        Impl impl = new Impl();
@@ -2364,28 +2338,26 @@ index d402cb59f508205ebe9ee450594826b04cecb90b..00000000000000000000000000000000
 -}
 diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
 deleted file mode 100644
-index 7c7cdfb509997de9f58d1b2c758e308a10ec0f92..0000000000000000000000000000000000000000
+index c46ed2acb82db814d660459b705dd49e6d44240f..0000000000000000000000000000000000000000
 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
 +++ /dev/null
-@@ -1,185 +0,0 @@
+@@ -1,183 +0,0 @@
 -package org.bukkit.plugin;
 -
 -import static org.hamcrest.Matchers.*;
 -import static org.junit.Assert.*;
--import org.bukkit.TestServer;
 -import org.bukkit.event.Event;
 -import org.bukkit.event.TestEvent;
 -import org.bukkit.permissions.Permission;
--import org.bukkit.support.AbstractTestingBase;
 -import org.junit.After;
 -import org.junit.Test;
 -
--public class PluginManagerTest extends AbstractTestingBase {
+-public class PluginManagerTest {
 -    private class MutableObject {
 -        volatile Object value = null;
 -    }
 -
--    private static final PluginManager pm = TestServer.getInstance().getPluginManager();
+-    private static final PluginManager pm = org.bukkit.Bukkit.getServer().getPluginManager(); // Paper
 -
 -    private final MutableObject store = new MutableObject();
 -

patches/api/0010-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..7213bd2ccf6fa03933a9dff878baee8e92bf50b9
+index 0000000000000000000000000000000000000000..eb9d58f8852e732a1284beeaf542989301d21b1c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
-@@ -0,0 +1,356 @@
+@@ -0,0 +1,355 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -751,9 +751,9 @@ index 0000000000000000000000000000000000000000..7213bd2ccf6fa03933a9dff878baee8e
 +import com.google.common.collect.Sets;
 +import org.bukkit.Bukkit;
 +import org.bukkit.Chunk;
++import org.bukkit.Material;
 +import org.bukkit.World;
 +import org.bukkit.block.BlockState;
-+import org.bukkit.block.BlockType;
 +import org.bukkit.entity.Entity;
 +import org.bukkit.entity.EntityType;
 +import org.bukkit.entity.Player;
@@ -762,9 +762,8 @@ index 0000000000000000000000000000000000000000..7213bd2ccf6fa03933a9dff878baee8e
 +
 +import java.lang.management.ManagementFactory;
 +import java.util.Collection;
-+import java.util.HashMap;
++import java.util.EnumMap;
 +import java.util.List;
-+import java.util.Locale;
 +import java.util.Map;
 +import java.util.Set;
 +import org.jetbrains.annotations.NotNull;
@@ -798,7 +797,7 @@ index 0000000000000000000000000000000000000000..7213bd2ccf6fa03933a9dff878baee8e
 +    private final MinuteReport[] minuteReports;
 +
 +    private final TimingHistoryEntry[] entries;
-+    final Set<BlockType> tileEntityTypeSet = Sets.newHashSet();
++    final Set<Material> tileEntityTypeSet = Sets.newHashSet();
 +    final Set<EntityType> entityTypeSet = Sets.newHashSet();
 +    private final Map<Object, Object> worlds;
 +
@@ -869,20 +868,20 @@ index 0000000000000000000000000000000000000000..7213bd2ccf6fa03933a9dff878baee8e
 +                                        public JSONPair apply(Map.Entry<EntityType, Counter> entry) {
 +                                            entityTypeSet.add(entry.getKey());
 +                                            return pair(
-+                                                    entry.getKey().getKey().getKey().toUpperCase(Locale.ENGLISH),
++                                                    String.valueOf(entry.getKey().ordinal()),
 +                                                    entry.getValue().count()
 +                                            );
 +                                        }
 +                                    }
 +                                ),
 +                                toObjectMapper(input.tileEntityCounts.entrySet(),
-+                                    new Function<Map.Entry<BlockType, Counter>, JSONPair>() {
++                                    new Function<Map.Entry<Material, Counter>, JSONPair>() {
 +                                        @NotNull
 +                                        @Override
-+                                        public JSONPair apply(Map.Entry<BlockType, Counter> entry) {
++                                        public JSONPair apply(Map.Entry<Material, Counter> entry) {
 +                                            tileEntityTypeSet.add(entry.getKey());
 +                                            return pair(
-+                                                    entry.getKey().getKey().getKey().toUpperCase(Locale.ENGLISH),
++                                                    String.valueOf(entry.getKey().ordinal()),
 +                                                    entry.getValue().count()
 +                                            );
 +                                        }
@@ -931,11 +930,11 @@ index 0000000000000000000000000000000000000000..7213bd2ccf6fa03933a9dff878baee8e
 +
 +        @SuppressWarnings("unchecked")
 +        final Map<EntityType, Counter> entityCounts = MRUMapCache.of(LoadingMap.of(
-+                new HashMap<>(), k -> new Counter()
++                new EnumMap<EntityType, Counter>(EntityType.class), k -> new Counter()
 +        ));
 +        @SuppressWarnings("unchecked")
-+        final Map<BlockType, Counter> tileEntityCounts = MRUMapCache.of(LoadingMap.of(
-+                new HashMap<>(), k -> new Counter()
++        final Map<Material, Counter> tileEntityCounts = MRUMapCache.of(LoadingMap.of(
++                new EnumMap<Material, Counter>(Material.class), k -> new Counter()
 +        ));
 +
 +        static class RegionId {
@@ -2855,7 +2854,7 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 208825df2752c10caf2cf8fb860d5b25bdd429b2..e2f7f9ebed56f5d4ca23dafe313263b386121391 100644
+index b7bc68c5d0dbb41c089f59b7db51342d45d1fc74..8d101352f72fc7fa21e0ba68039c79ce2fb92eb9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -833,7 +833,6 @@ public final class Bukkit {
@@ -2867,10 +2866,10 @@ index 208825df2752c10caf2cf8fb860d5b25bdd429b2..e2f7f9ebed56f5d4ca23dafe313263b3
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7aacf5c174dc66df0f605236ace5bcd2c5689a3b..520cbdb2cc7da4550e9346ebdfea0e80f32a49b6 100644
+index e3602c6703b29ffec17ef7806c9deb3eead8a112..3e642d8a0294f7290c3d4310813e6e8a467810e7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1819,6 +1819,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1835,6 +1835,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2898,10 +2897,10 @@ index 7aacf5c174dc66df0f605236ace5bcd2c5689a3b..520cbdb2cc7da4550e9346ebdfea0e80
           * 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 e800b6abb43fcb95937f1a8719761b4e2da84318..1a4212141fae926950a95e7bb584b28b21e20ba1 100644
+index 2042e3fb0ea347148814d9838cd7bb475bd23984..f68ef89f37057cf677a767026ab395f7a839a2f9 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -39,6 +39,7 @@ public interface UnsafeValues {
+@@ -35,6 +35,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
  
@@ -2909,13 +2908,12 @@ index e800b6abb43fcb95937f1a8719761b4e2da84318..1a4212141fae926950a95e7bb584b28b
      Material toLegacy(Material material);
  
      Material fromLegacy(Material material);
-@@ -119,4 +120,13 @@ public interface UnsafeValues {
-     static boolean isLegacyPlugin(org.bukkit.plugin.Plugin plugin) {
+@@ -111,4 +112,12 @@ public interface UnsafeValues {
          return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
      }
-+    // Paper end
+     // Paper end
 +
-+    // Paper start - Timings
++    // Paper start
 +    /**
 +     * Server name to report to timings v2
 +     * @return name
@@ -3457,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 5b5802be082f70a015b4a20c0ccdec1ee6f479f6..e7d6559f7a1e4cf88042a31e16d5b3370c2a0eb7 100644
+index a5010cb46aa5ef69c559ef9fc717f90365c05807..1a54682f584479a5a548f6f1f2ffd5da5dc11c88 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2187,7 +2187,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2344,7 +2344,14 @@ 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.");

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

@@ -7,7 +7,7 @@ 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 51b5ac9d535d1ecac7719deed2e422db442a1171..6cae51327c3acf6aa0284be3c94d7fdf3cab3486 100644
+index 45f9ac35874c67c24718f6891b95df1ff4f0b93f..7717f5346aa784df4a0f6e43a5a74a66f279bc8a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -78,6 +78,20 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index 51b5ac9d535d1ecac7719deed2e422db442a1171..6cae51327c3acf6aa0284be3c94d7fdf
       * 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 c8a8305e41a55e98c99ed9df07f5763071a4485f..3d54c3c09203558e2c5348a9100af6809651f3e8 100644
+index 087da3cd2cafd8255ed70e5e632b270a33e37eaf..0f990d33ab07249e4cf2d2269920b4cbeed27d39 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -63,6 +63,18 @@ import org.jetbrains.annotations.Nullable;

patches/api/0012-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 6de23a9dbaf012dd8a95bab55835bb406b59a012..592aae628d0b87b4277f1697b5aabde622d03710 100644
+index 1a54682f584479a5a548f6f1f2ffd5da5dc11c88..6b1a198f930a5a995e0cb6c279b455e1639a5039 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2039,6 +2039,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2196,6 +2196,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Deprecated // Paper
      public String getLocale();
  

patches/api/0013-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 6cae51327c3acf6aa0284be3c94d7fdf3cab3486..3ea91c82670ae329a11b3d035378be047d91e3e8 100644
+index 7717f5346aa784df4a0f6e43a5a74a66f279bc8a..fba3e617a8847a3e9282e6a1a389132b2ad5511c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1941,6 +1941,17 @@ public final class Bukkit {
+@@ -1964,6 +1964,17 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -27,10 +27,10 @@ index 6cae51327c3acf6aa0284be3c94d7fdf3cab3486..3ea91c82670ae329a11b3d035378be04
       * 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 3d54c3c09203558e2c5348a9100af6809651f3e8..0eeefd5eb693af9e16182d6e39e7b4a1d8568bfa 100644
+index 0f990d33ab07249e4cf2d2269920b4cbeed27d39..c8cf66e64a3163c2bdf781f3ce52059546969b9b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1653,6 +1653,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1672,6 +1672,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  

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

@@ -56,10 +56,10 @@ index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c7
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index c84dc62c7383deeb00106c2e672af2018c4acadc..4c2ae9cb674260deba91d734bf7bf24fd7038485 100644
+index f68ef89f37057cf677a767026ab395f7a839a2f9..a6aa33b9574d0278e10927007a62290e1d102e73 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -128,5 +128,12 @@ public interface UnsafeValues {
+@@ -119,5 +119,12 @@ public interface UnsafeValues {
       * @return name
       */
      String getTimingsServerName();
@@ -73,21 +73,24 @@ index c84dc62c7383deeb00106c2e672af2018c4acadc..4c2ae9cb674260deba91d734bf7bf24f
      // 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..b50f614806f4634960d383e8a33f094c2f46935f 100644
+index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b437cf212a63aa96a9492db8d01d5d37061aee23 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -1,5 +1,6 @@
- package org.bukkit.command.defaults;
- 
-+import com.destroystokyo.paper.util.VersionFetcher; // Paper - version supplier
- import com.google.common.base.Charsets;
- import com.google.common.base.Preconditions;
- import com.google.common.collect.ImmutableList;
-@@ -26,6 +27,15 @@ import org.bukkit.util.StringUtil;
+@@ -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;
++    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();
@@ -99,7 +102,7 @@ index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b50f614806f4634960d383e8a33f094c
      public VersionCommand(@NotNull String name) {
          super(name);
  
-@@ -40,7 +50,7 @@ public class VersionCommand extends BukkitCommand {
+@@ -40,7 +57,7 @@ public class VersionCommand extends BukkitCommand {
          if (!testPermission(sender)) return true;
  
          if (args.length == 0) {
@@ -108,12 +111,32 @@ index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b50f614806f4634960d383e8a33f094c
              sendVersion(sender);
          } else {
              StringBuilder name = new StringBuilder();
-@@ -146,14 +156,14 @@ public class VersionCommand extends BukkitCommand {
+@@ -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 net.kyori.adventure.text.Component versionMessage = null; // Paper
++    private Component versionMessage = null; // Paper
      private final Set<CommandSender> versionWaiters = new HashSet<CommandSender>();
      private boolean versionTaskStarted = false;
      private long lastCheck = 0;
@@ -125,22 +148,22 @@ index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b50f614806f4634960d383e8a33f094c
                  lastCheck = System.currentTimeMillis();
                  hasVersion = false;
              } else {
-@@ -168,7 +178,7 @@ public class VersionCommand extends BukkitCommand {
+@@ -168,7 +194,7 @@ public class VersionCommand extends BukkitCommand {
                  return;
              }
              versionWaiters.add(sender);
 -            sender.sendMessage("Checking version, please wait...");
-+            sender.sendMessage(net.kyori.adventure.text.Component.text("Checking version, please wait...", net.kyori.adventure.text.format.NamedTextColor.WHITE, net.kyori.adventure.text.format.TextDecoration.ITALIC)); // Paper
++            sender.sendMessage(Component.text("Checking version, please wait...", NamedTextColor.WHITE, TextDecoration.ITALIC)); // Paper
              if (!versionTaskStarted) {
                  versionTaskStarted = true;
                  new Thread(new Runnable() {
-@@ -186,6 +196,13 @@ public class VersionCommand extends BukkitCommand {
+@@ -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(net.kyori.adventure.text.Component.text("Unknown version, custom build?", net.kyori.adventure.text.format.NamedTextColor.YELLOW));
++            setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
 +            return;
 +        }
 +        setVersionMessage(getVersionFetcher().getVersionMessage(version));
@@ -148,7 +171,7 @@ index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b50f614806f4634960d383e8a33f094c
          if (version == null) version = "Custom";
          String[] parts = version.substring(0, version.indexOf(' ')).split("-");
          if (parts.length == 4) {
-@@ -215,11 +232,24 @@ public class VersionCommand extends BukkitCommand {
+@@ -215,11 +248,24 @@ public class VersionCommand extends BukkitCommand {
          } else {
              setVersionMessage("Unknown version, custom build?");
          }
@@ -158,18 +181,18 @@ index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b50f614806f4634960d383e8a33f094c
  
 -    private void setVersionMessage(@NotNull String msg) {
 +    // Paper start
-+    private void setVersionMessage(final @NotNull net.kyori.adventure.text.Component msg) {
++    private void setVersionMessage(final @NotNull Component msg) {
          lastCheck = System.currentTimeMillis();
 -        versionMessage = msg;
-+        final net.kyori.adventure.text.Component message = net.kyori.adventure.text.TextComponent.ofChildren(
-+            net.kyori.adventure.text.Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", net.kyori.adventure.text.format.NamedTextColor.WHITE),
-+            net.kyori.adventure.text.Component.newline(),
++        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 = net.kyori.adventure.text.Component.text()
++        this.versionMessage = Component.text()
 +            .append(message)
-+            .hoverEvent(net.kyori.adventure.text.Component.text("Click to copy to clipboard", net.kyori.adventure.text.format.NamedTextColor.WHITE))
-+            .clickEvent(net.kyori.adventure.text.event.ClickEvent.copyToClipboard(net.kyori.adventure.text.serializer.plain.PlainComponentSerializer.plain().serialize(message)))
++            .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE))
++            .clickEvent(ClickEvent.copyToClipboard(PlainTextComponentSerializer.plainText().serialize(message)))
 +            .build();
 +        // Paper end
          versionLock.lock();

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 9cebad10eb06f42cd0428d80940fa8e223f0deab..083201330c781a0cb36051eef4ab95d4f1937a9d 100644
+index 598abaa82c634178043a29f6caa6ac5221659d06..70a32f89c16439c575d8928332cfed64d1d6ab7e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -725,5 +725,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -25,10 +25,10 @@ index 9cebad10eb06f42cd0428d80940fa8e223f0deab..083201330c781a0cb36051eef4ab95d4
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 60763c9b5b6528f5c8c83f53bb6cb8b1097a67b0..320a0e1f6b93ca9e85eac7d9a3f5821fa242c257 100644
+index d96fd494b523491fcf1ac54d164351fd487f65d6..ae1ce2ee2deb82f3f4144ec54b3ba119b437c5e9 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
-@@ -81,4 +81,15 @@ public interface FallingBlock extends Entity {
+@@ -126,4 +126,15 @@ public interface FallingBlock extends Entity {
       * @param damage the max damage to set. Must be >= 0
       */
      void setMaxDamage(int damage);

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

@@ -8,10 +8,10 @@ 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 d2e95c6ecc11b19ebb52c291884376c39d28467e..efe7ddee0c1321d3ab5c99d8e606ab04886c5d2c 100644
+index 5357291ff0f2f20bd87ab9f6e57f6a4f6ff65226..887aa6217583d224d66f6d238ac269c23725d459 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2642,6 +2642,62 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2662,6 +2662,62 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      int getSimulationDistance();
      // Spigot end
  
@@ -75,10 +75,10 @@ index d2e95c6ecc11b19ebb52c291884376c39d28467e..efe7ddee0c1321d3ab5c99d8e606ab04
      public class Spigot {
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 592aae628d0b87b4277f1697b5aabde622d03710..eee3f8fb587b54d90e892b8c5d0b2eb290059bd4 100644
+index 6b1a198f930a5a995e0cb6c279b455e1639a5039..f8e45f70fe23cf73c8677b5d24cefcd3aae5e24e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2053,6 +2053,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2210,6 +2210,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);

patches/api/0020-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 3ea91c82670ae329a11b3d035378be047d91e3e8..6255c0b355dc978b50578629dc612011644a2501 100644
+index fba3e617a8847a3e9282e6a1a389132b2ad5511c..acb34296923fb27cfc28c130cf0b5405cfe340f6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2145,6 +2145,19 @@ public final class Bukkit {
+@@ -2165,6 +2165,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index 3ea91c82670ae329a11b3d035378be047d91e3e8..6255c0b355dc978b50578629dc612011
      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 0eeefd5eb693af9e16182d6e39e7b4a1d8568bfa..b711cc420d4ab150275b06162e3e9540252b5b06 100644
+index c8cf66e64a3163c2bdf781f3ce52059546969b9b..5b3c34b01038849b1463870ccf657b11db82cd09 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1663,6 +1663,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1682,6 +1682,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public double[] getTPS();
      // Paper end
  

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

@@ -6,7 +6,7 @@ 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 6255c0b355dc978b50578629dc612011644a2501..ba65e37ce5b8b6c5e449c6bbe8fa7d6a83082f15 100644
+index b53e94d79862d66165bbcd2a79b82770398a7f3e..9417030074fccdd9113bf75eb8f17f74b9a9118b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -410,6 +410,30 @@ public final class Bukkit {
@@ -41,7 +41,7 @@ index 6255c0b355dc978b50578629dc612011644a2501..ba65e37ce5b8b6c5e449c6bbe8fa7d6a
       * 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 b711cc420d4ab150275b06162e3e9540252b5b06..eac6eb66b00403ed0541201e54347a0286b4387b 100644
+index 124e88e512d24b6ff7ace3cf7d5a6adf4c2bb40d..ccc825a2ea43bb84a5a08dff00c4d8ec27e4e95a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -345,6 +345,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -76,10 +76,10 @@ index b711cc420d4ab150275b06162e3e9540252b5b06..eac6eb66b00403ed0541201e54347a02
       * 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 eee3f8fb587b54d90e892b8c5d0b2eb290059bd4..fe49a1871e1143bfd6579a5df02d6974e0eb7382 100644
+index f8e45f70fe23cf73c8677b5d24cefcd3aae5e24e..f52e7d4e5b8399d04d77384f8fe5315086acd776 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -903,6 +903,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-BaseComponent-sendMessage-methods-to-CommandSend.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
 
 
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index 4e440880bd82f3cd8b267f00b2fcd725b49ce981..c97970a6a44d61462c9d8d69f6aa12d9a8bb4e05 100644
+index 0f2b85e4979c478fbcc20bd67446e6ac8c8696d7..5c8ae3e0a927f2f2924d719b03499d936cf4d951 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
 @@ -1,6 +1,9 @@
@@ -18,7 +18,7 @@ index 4e440880bd82f3cd8b267f00b2fcd725b49ce981..c97970a6a44d61462c9d8d69f6aa12d9
  import org.bukkit.Server;
  import org.bukkit.permissions.Permissible;
  import org.jetbrains.annotations.NotNull;
-@@ -155,5 +158,33 @@ public interface CommandSender extends net.kyori.adventure.audience.Audience, Pe
+@@ -168,5 +171,33 @@ public interface CommandSender extends net.kyori.adventure.audience.Audience, Pe
      default void sendPlainMessage(final @NotNull String message) {
          this.sendMessage(net.kyori.adventure.text.Component.text(message));
      }

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

@@ -432,10 +432,10 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fe49a1871e1143bfd6579a5df02d6974e0eb7382..14f101acef4063c15d9c8c1e24eee33a4f4debb6 100644
+index f52e7d4e5b8399d04d77384f8fe5315086acd776..3650fb2b79368ad39278062f215d25cc99637cac 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -937,6 +937,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/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -7,7 +7,7 @@ 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 2b816f0e6bdb912ceeff82c0043272b3970fe243..9977bb3cb5a66c84db816f8e4597db1c053f77c8 100644
+index 7c82644de3c438f45476ac02ce2c51c6fdbd543a..390bb294d09389877937ee2c6c3f346e65dfb178 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -215,12 +215,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -38,7 +38,7 @@ index 2b816f0e6bdb912ceeff82c0043272b3970fe243..9977bb3cb5a66c84db816f8e4597db1c
  
      /**
       * Returns the living entity's current maximum no damage ticks.
-@@ -689,4 +703,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/0027-Complete-resource-pack-API.patch

@@ -5,10 +5,10 @@ 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 14f101acef4063c15d9c8c1e24eee33a4f4debb6..3a1e584d584041f36b861e4507f7a58933f9b32d 100644
+index 3650fb2b79368ad39278062f215d25cc99637cac..967ea421aed7f9d4c8edd366c00cf3ceca723b2f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1517,7 +1517,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -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.
@@ -18,7 +18,7 @@ index 14f101acef4063c15d9c8c1e24eee33a4f4debb6..3a1e584d584041f36b861e4507f7a589
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -2343,6 +2345,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2500,6 +2502,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())));
      }

patches/api/0030-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 ba65e37ce5b8b6c5e449c6bbe8fa7d6a83082f15..5c7a7d1cb0fc760f4209061aa653fdedb729dd36 100644
+index 88cbb61a855d77fe6840be48140261032c5a38b8..540c57e82247eaad2cae1ab0199caf2a6cabcab1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2180,6 +2180,13 @@ public final class Bukkit {
+@@ -2200,6 +2200,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index ba65e37ce5b8b6c5e449c6bbe8fa7d6a83082f15..5c7a7d1cb0fc760f4209061aa653fded
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index eac6eb66b00403ed0541201e54347a0286b4387b..27ff3b0b594bca7c5ae45937e1044e1b2f30c60b 100644
+index 7edaadd0a99fd8bbe3c683a126efd29993ed596c..f3452f65e6b69e8a2f0942c7a6afb9837a6d88fd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1927,4 +1927,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1943,4 +1943,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      Spigot spigot();
      // Spigot end

patches/api/0036-Add-PlayerUseUnknownEntityEvent.patch

@@ -3,56 +3,96 @@ From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:08:36 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
+Adds the PlayerUseUnknownEntityEvent to be used by plugins dealing with
+virtual entities/entities that are not actually known to the server.
+
+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..09cfdf48ead8f03f3497646537292174241b0868
+index 0000000000000000000000000000000000000000..a7228e248e3d8eb2e9f011dfe2c7dd9f3f48000f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
-@@ -0,0 +1,46 @@
+@@ -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.inventory.EquipmentSlot;
++import org.bukkit.util.Vector;
 +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 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 handlers = new HandlerList();
++    private static final HandlerList HANDLERS = new HandlerList();
 +    private final int entityId;
 +    private final boolean attack;
-+    @NotNull private final EquipmentSlot hand;
++    private final @NotNull EquipmentSlot hand;
++    private final @Nullable Vector clickedPosition;
 +
-+    public PlayerUseUnknownEntityEvent(@NotNull Player who, int entityId, boolean attack, @NotNull EquipmentSlot hand) {
++    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;
++        this.clickedPosition = clickedPosition;
 +    }
 +
++    /**
++     * Returns the entity id of the unknown entity that was interacted with.
++     *
++     * @return the entity id of the entity that was interacted with
++     */
 +    public int getEntityId() {
 +        return this.entityId;
 +    }
 +
++    /**
++     * Returns whether the interaction was an attack.
++     *
++     * @return true if the player is attacking the entity, false if the player is interacting with the entity
++     */
 +    public boolean isAttack() {
 +        return this.attack;
 +    }
 +
-+    @NotNull
-+    public EquipmentSlot getHand() {
++    /**
++     * Returns the hand used to perform this interaction.
++     *
++     * @return the hand used to interact
++     */
++    public @NotNull EquipmentSlot getHand() {
 +        return this.hand;
 +    }
 +
++    /**
++     * 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 null if not available
++     * @see org.bukkit.event.player.PlayerInteractAtEntityEvent
++     */
++    public @Nullable Vector getClickedRelativePosition() {
++        return this.clickedPosition != null ? this.clickedPosition.clone() : null;
++    }
++
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return handlers;
++        return HANDLERS;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return handlers;
++        return HANDLERS;
 +    }
 +}

patches/api/0040-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..97815eeb231cf0706b34fa47a4f7d1bb786305b4
+index 0000000000000000000000000000000000000000..2b01a50b6e18856f4c9e28340a7a111cae646a0a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,125 @@
 +package com.destroystokyo.paper.loottable;
 +
 +import org.bukkit.entity.Player;
@@ -106,6 +106,15 @@ index 0000000000000000000000000000000000000000..97815eeb231cf0706b34fa47a4f7d1bb
 +    }
 +
 +    /**
++     * Checks if this player can loot this block. Takes into account the "restrict player reloot" settings
++     *
++     * @param player the player to check
++     *
++     * @return Whether this player can loot this block
++     */
++    boolean canPlayerLoot(@NotNull UUID player);
++
++    /**
 +     * Has this player ever looted this block
 +     * @param player The player to check
 +     * @return Whether or not this player has looted this block

patches/api/0043-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 5c7a7d1cb0fc760f4209061aa653fdedb729dd36..763ba521c4b2cdfd0fda062281207dc790db76e1 100644
+index 540c57e82247eaad2cae1ab0199caf2a6cabcab1..abbafce790d30bab81b40c6c973d21f09d3d24ef 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2187,6 +2187,15 @@ public final class Bukkit {
+@@ -2207,6 +2207,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 5c7a7d1cb0fc760f4209061aa653fdedb729dd36..763ba521c4b2cdfd0fda062281207dc7
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 27ff3b0b594bca7c5ae45937e1044e1b2f30c60b..459ca6d2a797c4007fda3129badd44f35335615d 100644
+index f3452f65e6b69e8a2f0942c7a6afb9837a6d88fd..925e3e32bf971efc08fd39d1e10d83bb0c6e8634 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1929,4 +1929,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1945,4 +1945,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Spigot end
  
      void reloadPermissions(); // Paper

patches/api/0046-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 3a1e584d584041f36b861e4507f7a58933f9b32d..5d47d3089f244b146aab63d54f5aefba51e481a9 100644
+index 967ea421aed7f9d4c8edd366c00cf3ceca723b2f..87b67723cb9dcead110eb88dd741d3348eb9ec1b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -904,6 +904,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 3a1e584d584041f36b861e4507f7a58933f9b32d..5d47d3089f244b146aab63d54f5aefba
      /**
       * Sends the component to the player
       *
-@@ -931,9 +964,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/0054-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 763ba521c4b2cdfd0fda062281207dc790db76e1..0e83259a03292daf5c069d570a324ae0323351ef 100644
+index abbafce790d30bab81b40c6c973d21f09d3d24ef..4665d42f167d587ec3edaf6432eef0a5a883401f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2196,6 +2196,16 @@ public final class Bukkit {
+@@ -2216,6 +2216,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index 763ba521c4b2cdfd0fda062281207dc790db76e1..0e83259a03292daf5c069d570a324ae0
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 459ca6d2a797c4007fda3129badd44f35335615d..f8592dbe75680133e5db1e166fac48957c57cac9 100644
+index 925e3e32bf971efc08fd39d1e10d83bb0c6e8634..7b95c1049ec365b8a1c20e5e18f6a79d4042fa38 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1931,4 +1931,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1947,4 +1947,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper

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

@@ -3,13 +3,12 @@ From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadocs
 
-Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/BanList.java b/src/main/java/org/bukkit/BanList.java
-index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f33589583 100644
+index a04cde615f8c4bc593f8d9f8f6f1438008aaa707..548f6d28c28d74bed8b58ee82875909354afe132 100644
 --- a/src/main/java/org/bukkit/BanList.java
 +++ b/src/main/java/org/bukkit/BanList.java
-@@ -27,6 +27,9 @@ public interface BanList {
+@@ -38,6 +38,9 @@ public interface BanList<T> {
  
      /**
       * Gets a {@link BanEntry} by target.
@@ -19,12 +18,9 @@ index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f
       *
       * @param target entry parameter to search for
       * @return the corresponding entry, or null if none found
-@@ -35,8 +38,11 @@ public interface BanList {
-     public BanEntry getBanEntry(@NotNull String target);
- 
+@@ -59,6 +62,9 @@ public interface BanList<T> {
      /**
--     * Adds a ban to the this list. If a previous ban exists, this will
-+     * Adds a ban to this list. If a previous ban exists, this will
+      * Adds a ban to this list. If a previous ban exists, this will
       * update the previous entry.
 +     * <p>
 +     * Bans by name for ban type {@link Type#NAME NAME} are no longer supported and this method will return
@@ -32,7 +28,7 @@ index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f
       *
       * @param target the target of the ban
       * @param reason reason for the ban, null indicates implementation default
-@@ -60,6 +66,9 @@ public interface BanList {
+@@ -139,6 +145,9 @@ public interface BanList<T> {
      /**
       * Gets if a {@link BanEntry} exists for the target, indicating an active
       * ban status.
@@ -41,8 +37,8 @@ index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f
 +     * The replacement is bans by UUID.
       *
       * @param target the target to find
-      * @return true if a {@link BanEntry} exists for the name, indicating an
-@@ -70,6 +79,9 @@ public interface BanList {
+      * @return true if a {@link BanEntry} exists for the target, indicating an
+@@ -161,6 +170,9 @@ public interface BanList<T> {
      /**
       * Removes the specified target from this list, therefore indicating a
       * "not banned" status.
@@ -53,22 +49,10 @@ index 96ef22fe879c7be4f67bbb4d60c45ad11764dd5b..5dc9f9ede98d93925c99ee382e93f15f
       * @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 0e83259a03292daf5c069d570a324ae0323351ef..1704d04097c9d364e5f9049a6a0f60945db482dd 100644
+index add298a1a0b6f6dbd72fe9e8f87794d193760fb7..b21f90f291a087b6282cd7b55e0075a01729f0ba 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1300,10 +1300,7 @@ public final class Bukkit {
-     }
- 
-     /**
--     * Gets a ban list for the supplied type.
--     * <p>
--     * Bans by name are no longer supported and this method will return
--     * null when trying to request them. The replacement is bans by UUID.
-+     * Gets a ban list for the supplied type. <!-- Paper Remove notice: wrong place -->
-      *
-      * @param type the type of list to fetch, cannot be null
-      * @return a ban list of the specified type
-@@ -1365,6 +1362,8 @@ public final class Bukkit {
+@@ -1388,6 +1388,8 @@ public final class Bukkit {
  
      /**
       * Gets every player that has ever played on this server.
@@ -78,10 +62,10 @@ index 0e83259a03292daf5c069d570a324ae0323351ef..1704d04097c9d364e5f9049a6a0f6094
       * @return an array containing all previous players
       */
 diff --git a/src/main/java/org/bukkit/ChunkSnapshot.java b/src/main/java/org/bukkit/ChunkSnapshot.java
-index 803d4de580acc616424922fee4715a689b778886..94ab204a0739163613a5c651329606924c75d85b 100644
+index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f81413ed0dd1 100644
 --- a/src/main/java/org/bukkit/ChunkSnapshot.java
 +++ b/src/main/java/org/bukkit/ChunkSnapshot.java
-@@ -137,7 +137,7 @@ public interface ChunkSnapshot {
+@@ -136,7 +136,7 @@ public interface ChunkSnapshot {
       * Get raw biome temperature at given coordinates
       *
       * @param x X-coordinate (0-15)
@@ -91,10 +75,10 @@ index 803d4de580acc616424922fee4715a689b778886..94ab204a0739163613a5c65132960692
       * @return temperature at given coordinate
       */
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index a73c954aad2957c630b64e7b750f33f73809f9b1..8264599a873ed23ec6552d1550a414ec3712487b 100644
+index 43f5aab2fe70af5f570de1f21eca83905f1e2f57..05c29cbd2ae1ca0434a90f8389479bd608ca2ac1 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
-@@ -159,7 +159,7 @@ public interface RegionAccessor {
+@@ -158,7 +158,7 @@ public interface RegionAccessor {
       * Creates a tree at the given {@link Location}
       *
       * @param location Location to spawn the tree
@@ -103,7 +87,7 @@ index a73c954aad2957c630b64e7b750f33f73809f9b1..8264599a873ed23ec6552d1550a414ec
       * @param type Type of the tree to create
       * @return true if the tree was created successfully, otherwise false
       */
-@@ -171,14 +171,14 @@ public interface RegionAccessor {
+@@ -170,14 +170,14 @@ public interface RegionAccessor {
       * The provided consumer gets called for every block which gets changed
       * as a result of the tree generation. When the consumer gets called no
       * modifications to the world are done yet. Which means, that calling
@@ -120,7 +104,7 @@ index a73c954aad2957c630b64e7b750f33f73809f9b1..8264599a873ed23ec6552d1550a414ec
       * @param type Type of the tree to create
       * @param stateConsumer The consumer which should get called for every block which gets changed
       * @return true if the tree was created successfully, otherwise false
-@@ -198,7 +198,7 @@ public interface RegionAccessor {
+@@ -197,7 +197,7 @@ public interface RegionAccessor {
       * If it returns {@code false} the block won't get set in the world.
       *
       * @param location Location to spawn the tree
@@ -130,7 +114,7 @@ index a73c954aad2957c630b64e7b750f33f73809f9b1..8264599a873ed23ec6552d1550a414ec
       * @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 f8592dbe75680133e5db1e166fac48957c57cac9..dca2cbe8c93469c8c1c404bc34748a9dcf6d3368 100644
+index 22d508a6c80d7e19352bceb57009fdbcb16bc723..3c1862b9a9293155f756615b5bd23cc810a6df5e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -543,13 +543,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -148,19 +132,7 @@ index f8592dbe75680133e5db1e166fac48957c57cac9..dca2cbe8c93469c8c1c404bc34748a9d
       */
      public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
  
-@@ -1109,10 +1106,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     public Set<OfflinePlayer> getBannedPlayers();
- 
-     /**
--     * Gets a ban list for the supplied type.
--     * <p>
--     * Bans by name are no longer supported and this method will return
--     * null when trying to request them. The replacement is bans by UUID.
-+     * Gets a ban list for the supplied type. <!-- Paper Remove notice: wrong place -->
-      *
-      * @param type the type of list to fetch, cannot be null
-      * @return a ban list of the specified type
-@@ -1162,6 +1156,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1181,6 +1178,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
      /**
       * Gets every player that has ever played on this server.
@@ -170,10 +142,10 @@ index f8592dbe75680133e5db1e166fac48957c57cac9..dca2cbe8c93469c8c1c404bc34748a9d
       * @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 80189c7c70d7043016a24c0ac87655636408856e..a53a990477fd84f7f7dcb50058819eead8e8b5b5 100644
+index 4ef6bbfa753da439ac57bd8d70dd114d73665c8d..7f23527168a33b92d823f76765edfe00abe0e4f6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2556,7 +2556,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2576,7 +2576,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
@@ -182,7 +154,7 @@ index 80189c7c70d7043016a24c0ac87655636408856e..a53a990477fd84f7f7dcb50058819eea
       * temporarily freezing while locating an unexplored structure.
       * <p>
       * The {@code radius} is not a rigid square radius. Each structure may alter
-@@ -2590,7 +2590,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2610,7 +2610,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
@@ -191,7 +163,7 @@ index 80189c7c70d7043016a24c0ac87655636408856e..a53a990477fd84f7f7dcb50058819eea
       * temporarily freezing while locating an unexplored structure.
       * <p>
       * The {@code radius} is not a rigid square radius. Each structure may alter
-@@ -2623,7 +2623,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2643,7 +2643,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
@@ -201,14 +173,14 @@ index 80189c7c70d7043016a24c0ac87655636408856e..a53a990477fd84f7f7dcb50058819eea
       * <p>
       * The {@code radius} is not a rigid square radius. Each structure may alter
 diff --git a/src/main/java/org/bukkit/block/Bed.java b/src/main/java/org/bukkit/block/Bed.java
-index 92532e335f07b14d1dad0de90c10f764d5fd9d8b..f4c37ce1fe7aac3dde8485ee51fc8888ed56e79e 100644
+index f9bd74f9ce6bd6650726e5a993f9b6e292cdc74d..f4c37ce1fe7aac3dde8485ee51fc8888ed56e79e 100644
 --- a/src/main/java/org/bukkit/block/Bed.java
 +++ b/src/main/java/org/bukkit/block/Bed.java
 @@ -4,7 +4,22 @@ import org.bukkit.material.Colorable;
  
  /**
   * Represents a captured state of a bed.
-- * @deprecated does not provide useful information beyond the block type itself
+- * @deprecated does not provide useful information beyond the material itself
   */
 -@Deprecated
 -public interface Bed extends TileState, Colorable { }
@@ -231,10 +203,10 @@ index 92532e335f07b14d1dad0de90c10f764d5fd9d8b..f4c37ce1fe7aac3dde8485ee51fc8888
 +// Paper end
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 1197cb8a6be92296c494010d87e046dfe912a161..d834e8d8d532ce5b46201ff5c02d54a6c047f615 100644
+index f8e12868f2e629cdf4784f0157fdb2f8e7b01f99..870ad6cd930653e6248abcc0fce94ffafbe9ebde 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -356,7 +356,7 @@ public interface Block extends Metadatable, Translatable {
+@@ -357,7 +357,7 @@ public interface Block extends Metadatable, Translatable {
       * Gets the temperature of this block.
       * <p>
       * If the raw biome temperature without adjusting for height effects is
@@ -244,27 +216,18 @@ index 1197cb8a6be92296c494010d87e046dfe912a161..d834e8d8d532ce5b46201ff5c02d54a6
       * @return Temperature of this block
       */
 diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
-index dd286dd68682658af096790c048b88ee0c401214..7f4a858ab98f8d0c3c2f890ca88bc13b6ba967fa 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
-@@ -208,15 +208,13 @@ public interface BlockData extends Cloneable {
-     /**
-      * Gets the ItemType that a player would use to place this block.
-      * <p>
--     * For most blocks this is the same as {@link BlockType#asItemType()} but some blocks
--     * have different item types used to place them.
--     *
-+     * This is identical to {@link BlockType#getItemType()}.
-      * For example:
-      * <pre>
-      * {@link ItemType#REDSTONE_WIRE} -> {@link BlockType#REDSTONE}
-      * {@link ItemType#CARROTS} -> {@link BlockType#CARROT}
+@@ -215,7 +215,7 @@ public interface BlockData extends Cloneable {
+      * {@link Material#REDSTONE_WIRE} -> {@link Material#REDSTONE}
+      * {@link Material#CARROTS} -> {@link Material#CARROT}
       * </pre>
--     * @return placement item type
-+     * @return placement item type or {@link ItemType#AIR} if it doesn't have one
+-     * @return placement material
++     * @return placement material or {@link Material#AIR} if it doesn't have one
       */
      @NotNull
-     ItemType getPlacementType();
+     Material getPlacementMaterial();
 diff --git a/src/main/java/org/bukkit/block/data/FaceAttachable.java b/src/main/java/org/bukkit/block/data/FaceAttachable.java
 index 9599e1237b9717ddbf84c3738bf6c1293e8b3c54..950266b4bb0a2fabeb9539c5676ed58f0b0fe620 100644
 --- a/src/main/java/org/bukkit/block/data/FaceAttachable.java
@@ -340,10 +303,10 @@ 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 8eb0cf31b1ce6d714a14cf65bbb117ff163ae2f3..8e57082e8b19a2fd9625816c2ea4a90d41f78ca5 100644
+index 8814519df13c5e9475774f4bce4c8c6a462c2978..be9a35790fc664721ac94f3708613eb77631a0c5 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 {
+@@ -73,7 +73,7 @@ public interface Arrow extends AbstractArrow {
       * Removes a custom potion effect from this arrow.
       *
       * @param type the potion effect type to remove
@@ -353,7 +316,7 @@ index 8eb0cf31b1ce6d714a14cf65bbb117ff163ae2f3..8e57082e8b19a2fd9625816c2ea4a90d
       * in a state with no Custom Effects and PotionType.UNCRAFTABLE
       */
 diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
-index 0449664d7cd0c52ac34d2101110f1ab42070257c..57f8e7bf4c7b4c4a4e793cfd5d7db74384d8b1b5 100644
+index 1e56aef9188487d3e9c737e85025f601ab359a72..92cd35c87bad578c2b714761c93a5b72ebf4bc9e 100644
 --- a/src/main/java/org/bukkit/entity/EnderDragon.java
 +++ b/src/main/java/org/bukkit/entity/EnderDragon.java
 @@ -30,7 +30,7 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob, Enemy {
@@ -365,32 +328,8 @@ index 0449664d7cd0c52ac34d2101110f1ab42070257c..57f8e7bf4c7b4c4a4e793cfd5d7db743
           * the portal, it will fly to it before mounting.
           */
          LAND_ON_PORTAL,
-diff --git a/src/main/java/org/bukkit/entity/EntityCategory.java b/src/main/java/org/bukkit/entity/EntityCategory.java
-index fd960f20c79f721575c9bd4074a5ca9ab6b796b1..3e2ae87c806ce439d6c8848deecda48a28dbed96 100644
---- a/src/main/java/org/bukkit/entity/EntityCategory.java
-+++ b/src/main/java/org/bukkit/entity/EntityCategory.java
-@@ -23,7 +23,7 @@ public enum EntityCategory {
-      *   <li>Are subject to burning in daylight (though not all).
-      *   <li>Sink in water (except {@link Drowned}, {@link Phantom Phantoms}
-      *   and {@link Wither Withers}).
--     *   <li>Take additional damage from {@link Enchantment#DAMAGE_UNDEAD}.
-+     *   <li>Take additional damage from {@link Enchantment#SMITE}.
-      *   <li>Are ignored by {@link Wither Withers}.
-      * </ul>
-      */
-@@ -31,8 +31,8 @@ public enum EntityCategory {
-     /**
-      * Entities of the arthropod family. These creatures:
-      * <ul>
--     *   <li>Take additional damage and receive {@link PotionEffectType#SLOW}
--     *   from {@link Enchantment#DAMAGE_ARTHROPODS}.
-+     *   <li>Take additional damage and receive {@link PotionEffectType#SLOWNESS}
-+     *   from {@link Enchantment#BANE_OF_ARTHROPODS}.
-      *   <li>Are immune to {@link PotionEffectType#POISON} if they are spiders.
-      * </ul>
-      */
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index f2faa8b9a7da1c9af26f494ae82ae5372dcc4805..411dbbd8046a3157747713fea9ae19eca113e9b7 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;
@@ -447,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 5d47d3089f244b146aab63d54f5aefba51e481a9..383d12b1ffc76bc8f9100a71027ac9e25e4a3742 100644
+index 87b67723cb9dcead110eb88dd741d3348eb9ec1b..266e89b48d4991f6099290cf9d44fa06b43ffa2c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -327,15 +327,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
@@ -470,7 +409,7 @@ index 5d47d3089f244b146aab63d54f5aefba51e481a9..383d12b1ffc76bc8f9100a71027ac9e2
       * <p>
       * Note: This will overwrite the players current inventory, health,
       * motion, etc, with the state from the saved dat file.
-@@ -570,7 +570,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.
       *
@@ -479,7 +418,7 @@ index 5d47d3089f244b146aab63d54f5aefba51e481a9..383d12b1ffc76bc8f9100a71027ac9e2
       * @param loc the location to play the effect at
       * @param effect the {@link Effect}
       * @param data a data bit needed for some effects
-@@ -921,7 +921,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.
       *
@@ -488,7 +427,7 @@ index 5d47d3089f244b146aab63d54f5aefba51e481a9..383d12b1ffc76bc8f9100a71027ac9e2
       * @param message The message to send
       * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
       */
-@@ -1387,7 +1387,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
@@ -497,7 +436,7 @@ index 5d47d3089f244b146aab63d54f5aefba51e481a9..383d12b1ffc76bc8f9100a71027ac9e2
       * remain hidden until the other plugin calls this method too.
       *
       * @param plugin Plugin that wants to show the player
-@@ -1416,7 +1416,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
@@ -551,18 +490,18 @@ index af5110b4160979c39cc1e5de6fa3bd7957b21403..15a0a733b0e5804655b5957cbf208312
       * @param location the location to remove
       * @see #getExploredLocations()
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index fb4c6f92c7c16ff8cdc0a054a270b41d78dfcdde..a6e57f8ad3f09d05ca61c824d128221528f7a96d 100644
+index 6bf3af3ed81b66f61e53105d3591165ea74dba0e..a91400cd8bb4c72d1f3200a17f6de025540fe09d 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -225,7 +225,7 @@ public interface Villager extends AbstractVillager {
+@@ -202,7 +202,7 @@ public interface Villager extends AbstractVillager {
           */
-         public static final Profession NITWIT = getProfession("nitwit");
+         NITWIT,
          /**
 -         * Sheperd profession. Wears a brown robe. Shepherds primarily trade for
 +         * Shepherd profession. Wears a brown robe. Shepherds primarily trade for
           * wool items, and shears.
           */
-         public static final Profession SHEPHERD = getProfession("shepherd");
+         SHEPHERD,
 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
@@ -579,7 +518,7 @@ index 44f7f6939a27b9a0a796d91eac4b7c97ec90a643..641c71ab66bd2499b35cf3c1d533fd10
  public class BlockExplodeEvent extends BlockEvent implements Cancellable {
      private static final HandlerList handlers = new HandlerList();
 diff --git a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
-index ff20d0768aed1732dcef8989c62e19c01e8ec70a..a4525c1ac5e6aa0130358739db35fbb732476e33 100644
+index be0a2d1f234d8265d98e54e518a994957b1f3ab7..4e3c406ba883aae553e8d69b6b719b872cd6096c 100644
 --- a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java
 @@ -114,7 +114,7 @@ public class BlockPlaceEvent extends BlockEvent implements Cancellable {
@@ -740,10 +679,24 @@ index c17ff41a688b2cbd877cda25d4ec033ac8ef5524..bd67b7cba78b9bbdd82a5a40048e658a
  public class PiglinBarterEvent extends EntityEvent implements Cancellable {
  
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-index 79797a2be7fb139d528116d34d13e51d39b96e56..0921484e921dbd200725b9298f655720618b5362 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
-@@ -92,7 +92,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
+@@ -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>
+- * The following should never be invoked by an EventHandler for
+- * InventoryClickEvent using the HumanEntity or InventoryView associated with
+- * this event:
++ * Methods that change the view a player is looking at should never be invoked
++ * by an EventHandler for InventoryClickEvent using the HumanEntity or
++ * InventoryView associated with this event.
++ * Examples of these include:
+  * <ul>
+  * <li>{@link HumanEntity#closeInventory()}
+  * <li>{@link HumanEntity#openInventory(Inventory)}
+@@ -92,7 +93,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
      /**
       * Gets the ItemStack currently in the clicked slot.
       *
@@ -752,6 +705,38 @@ index 79797a2be7fb139d528116d34d13e51d39b96e56..0921484e921dbd200725b9298f655720
       */
      @Nullable
      public ItemStack getCurrentItem() {
+diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
+index 5861247c1b8ee4fe2736fd5098e05a2ca9ab78ea..c0cc82d98348e8aae3cb56bafb2fcb590b03094f 100644
+--- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
++++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
+@@ -7,7 +7,26 @@ import org.bukkit.inventory.InventoryView;
+ import org.jetbrains.annotations.NotNull;
+ 
+ /**
+- * Represents a player related inventory event
++ * This event is called when a player closes an inventory.
++ * <p>
++ * Because InventoryCloseEvent occurs within a modification of the Inventory,
++ * not all Inventory related methods are safe to use.
++ * <p>
++ * Methods that change the view a player is looking at should never be invoked
++ * by an EventHandler for InventoryCloseEvent using the HumanEntity or
++ * InventoryView associated with this event.
++ * Examples of these include:
++ * <ul>
++ * <li>{@link HumanEntity#closeInventory()}
++ * <li>{@link HumanEntity#openInventory(org.bukkit.inventory.Inventory)}
++ * <li>{@link HumanEntity#openWorkbench(org.bukkit.Location, boolean)}
++ * <li>{@link HumanEntity#openEnchanting(org.bukkit.Location, boolean)}
++ * <li>{@link InventoryView#close()}
++ * </ul>
++ * To invoke one of these methods, schedule a task using
++ * {@link org.bukkit.scheduler.BukkitScheduler#runTask(org.bukkit.plugin.Plugin, Runnable)}, which will run the task
++ * on the next tick. Also be aware that this is not an exhaustive list, and
++ * other methods could potentially create issues as well.
+  */
+ public class InventoryCloseEvent extends InventoryEvent {
+     private static final HandlerList handlers = new HandlerList();
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java
 index 9013d043503d175004ad276799e5935b7fa59dc4..ceae092eb782698803c6c3df41267dde20ba62b2 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java
@@ -807,7 +792,7 @@ index 4c2102a11c3d682d98f0db4ccafa35231e66bcdd..ca238af544764273b9cd4cf3587e8632
  public class PlayerResourcePackStatusEvent extends PlayerEvent {
  
 diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-index 08d656ee57b080e07b7b7d97c9551fb0a0e3e94b..82d8fe3be9ff6914b44872462c3827123459735d 100644
+index 0cc6e29a5af28e95f87f415d6b2424d4622a6f34..c0b749a5bbf4980d01fed74768bb61909b579cb9 100644
 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
 +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
 @@ -627,7 +627,7 @@ public abstract class ChunkGenerator {
@@ -1078,41 +1063,45 @@ index 62fbd7f6d8195bebcab7f704a0a485a1bbeca26c..5461f7fa75f5a065bb333b4a113640b5
       * @return the currently held item
       * @see #getItemInMainHand()
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index a9dbb11148e5bdf3e6c251bc98b6a8295aceba2f..e92de5ca8bd48723a493495db3ca2e2f5b55fab5 100644
+index 05f1acaac3a49c42f6cf544adb3ffec267c72700..9f9c67e935940833bbfe58e6bfa398e6c86980d5 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -29,7 +29,6 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -24,8 +24,6 @@ public class ShapedRecipe extends CraftingRecipe {
       * @param result The item you want the recipe to create.
       * @see ShapedRecipe#shape(String...)
-      * @see ShapedRecipe#setIngredient(char, ItemType)
+      * @see ShapedRecipe#setIngredient(char, Material)
+-     * @see ShapedRecipe#setIngredient(char, Material, int)
 -     * @see ShapedRecipe#setIngredient(char, MaterialData)
       * @see ShapedRecipe#setIngredient(char, RecipeChoice)
       * @deprecated Recipes must have keys. Use {@link #ShapedRecipe(NamespacedKey, ItemStack)}
       * instead.
-@@ -50,7 +49,6 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -44,8 +42,6 @@ public class ShapedRecipe extends CraftingRecipe {
       * @param result The item you want the recipe to create.
       * @see ShapedRecipe#shape(String...)
-      * @see ShapedRecipe#setIngredient(char, ItemType)
+      * @see ShapedRecipe#setIngredient(char, Material)
+-     * @see ShapedRecipe#setIngredient(char, Material, int)
 -     * @see ShapedRecipe#setIngredient(char, MaterialData)
       * @see ShapedRecipe#setIngredient(char, RecipeChoice)
       */
      public ShapedRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result) {
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 94393a1f0d19a58a1029f9c31193b3d9279c5ef0..69a25d05efcc96f8b3d3b5455e571259e5af2dab 100644
+index 3d50775da447175b2a94ed9056ef36aa1e69c2eb..03839302c94adc3175d0a88065cd230257ffd20d 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -37,9 +37,8 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -30,11 +30,8 @@ public class ShapelessRecipe extends CraftingRecipe {
       * @param key the unique recipe key
       * @param result The item you want the recipe to create.
-      * @see ShapelessRecipe#addIngredient(ItemType)
+      * @see ShapelessRecipe#addIngredient(Material)
 -     * @see ShapelessRecipe#addIngredient(MaterialData)
-      * @see ShapelessRecipe#addIngredient(int,ItemType)
+-     * @see ShapelessRecipe#addIngredient(Material,int)
+      * @see ShapelessRecipe#addIngredient(int,Material)
 -     * @see ShapelessRecipe#addIngredient(int,MaterialData)
+-     * @see ShapelessRecipe#addIngredient(int,Material,int)
 +     * @see ShapelessRecipe#addIngredient(RecipeChoice)
       */
      public ShapelessRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result) {
-         Preconditions.checkArgument(result.getType() != ItemType.AIR, "Recipe must have non-AIR result.");
-@@ -147,7 +146,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
+         super(key, result);
+@@ -174,7 +171,7 @@ public class ShapelessRecipe extends CraftingRecipe {
  
      /**
       * Removes multiple instances of an ingredient from the list. If there are
@@ -1121,25 +1110,11 @@ index 94393a1f0d19a58a1029f9c31193b3d9279c5ef0..69a25d05efcc96f8b3d3b5455e571259
       * matches, with a data value of 0.
       *
       * @param count The number of copies to remove.
-diff --git a/src/main/java/org/bukkit/inventory/SmithingRecipe.java b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
-index af04071d37e70b8cc9837d57477c8493be8afb9f..582671a0a94d47302c0fdc572d486282c32f786f 100644
---- a/src/main/java/org/bukkit/inventory/SmithingRecipe.java
-+++ b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
-@@ -21,7 +21,9 @@ public class SmithingRecipe implements Recipe, Keyed {
-      * @param result The item you want the recipe to create.
-      * @param base The base ingredient
-      * @param addition The addition ingredient
-+     * @deprecated use {@link SmithingTrimRecipe} or {@link SmithingTransformRecipe}
-      */
-+    @Deprecated(forRemoval = true) // Paper
-     public SmithingRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @NotNull RecipeChoice base, @NotNull RecipeChoice addition) {
-         this.key = key;
-         this.result = result;
 diff --git a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
-index 8df05b404eb1bcbe1bf358b8cb34c46f25ceeba1..0de3c34c67b8c37a3c7ba8bcec4404ed4ef5019e 100644
+index 07c3dff4d6190ef388d9c1e1c36f67f00a3e8e66..597a18a767b68b47e81454b7d44613c7178c1366 100644
 --- a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
-@@ -33,7 +33,7 @@ public class StonecuttingRecipe implements Recipe, Keyed {
+@@ -28,7 +28,7 @@ public class StonecuttingRecipe implements Recipe, Keyed {
      }
  
      /**
@@ -1148,16 +1123,16 @@ index 8df05b404eb1bcbe1bf358b8cb34c46f25ceeba1..0de3c34c67b8c37a3c7ba8bcec4404ed
       *
       * @param key The unique recipe key
       * @param result The item you want the recipe to create.
-@@ -47,7 +47,7 @@ public class StonecuttingRecipe implements Recipe, Keyed {
+@@ -42,7 +42,7 @@ public class StonecuttingRecipe implements Recipe, Keyed {
      }
  
      /**
 -     * Sets the input of this cooking recipe.
 +     * Sets the input of this Stonecutting recipe.
       *
-      * @param input The input item type.
+      * @param input The input material.
       * @return The changed recipe, so you can chain calls.
-@@ -69,7 +69,7 @@ public class StonecuttingRecipe implements Recipe, Keyed {
+@@ -64,7 +64,7 @@ public class StonecuttingRecipe implements Recipe, Keyed {
      }
  
      /**
@@ -1179,54 +1154,32 @@ index 049c70c935fd7a781280d223f74bbbf87223f505..f78714c2a6d9da162c9802552984cbfa
       * {@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/loot/LootContext.java b/src/main/java/org/bukkit/loot/LootContext.java
-index 71b7aa9d675e1714e286e6fd4015ead036d912e0..b35dba42069f771db8727bf98f9d17aff9d6094e 100644
---- a/src/main/java/org/bukkit/loot/LootContext.java
-+++ b/src/main/java/org/bukkit/loot/LootContext.java
-@@ -54,7 +54,7 @@ public final class LootContext {
- 
-     /**
-      * Represents the
--     * {@link org.bukkit.enchantments.Enchantment#LOOT_BONUS_MOBS} the
-+     * {@link org.bukkit.enchantments.Enchantment#LOOTING} the
-      * {@link #getKiller()} entity has on their equipped item.
-      *
-      * This value is only set via
-@@ -124,7 +124,7 @@ public final class LootContext {
-         }
- 
-         /**
--         * Set the {@link org.bukkit.enchantments.Enchantment#LOOT_BONUS_MOBS}
-+         * Set the {@link org.bukkit.enchantments.Enchantment#LOOTING}
-          * level equivalent to use when generating loot. Values less than or
-          * equal to 0 will force the {@link LootTable} to only return a single
-          * {@link org.bukkit.inventory.ItemStack} per pool.
 diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
-index 86a0a6f9e8487d6dfaf60876ace3dcc9b4722826..571b43c2809d2b248feebc7decba6017a67c8aee 100644
+index 0ff409bcf093e6058c957cdcc5bb17bdc32c87be..be3b2e5d9364abde50716c35cabd5938fe2c5e4d 100644
 --- a/src/main/java/org/bukkit/scoreboard/Objective.java
 +++ b/src/main/java/org/bukkit/scoreboard/Objective.java
-@@ -88,7 +88,7 @@ public interface Objective {
+@@ -86,7 +86,7 @@ public interface Objective {
       *
       * @return true if scores are modifiable
       * @throws IllegalStateException if this objective has been unregistered
 -     * @see Criterias#HEALTH
 +     * @see Criteria#HEALTH
       */
-     boolean isModifiable() throws IllegalStateException;
+     boolean isModifiable();
  
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 4d625f79ba2e3fe074feade98f7c1bc2798cb82e..937a28638c251509ebeb254178a4583fe03c52d0 100644
+index 36260de3424012ac020d6c6e381010b3d4a32c6f..5416386c89a4019a2c123374dd5cb6d4f12744f0 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -277,7 +277,7 @@ public interface Team {
+@@ -265,7 +265,7 @@ public interface Team {
       * Gets the Set of entries on the team
       *
       * @return entries on the team
--     * @throws IllegalStateException if this entries has been unregistered\
+-     * @throws IllegalStateException if this entries has been unregistered
 +     * @throws IllegalStateException if this team has been unregistered
       */
      @NotNull
-     Set<String> getEntries() throws IllegalStateException;
+     Set<String> getEntries();
 diff --git a/src/main/java/org/bukkit/util/BoundingBox.java b/src/main/java/org/bukkit/util/BoundingBox.java
 index 9883983c33fcff0f4c1e23867adafa436e2ed96f..5017b73bcec0d4d5256d89db14201c03829dc981 100644
 --- a/src/main/java/org/bukkit/util/BoundingBox.java

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

@@ -321,10 +321,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 1704d04097c9d364e5f9049a6a0f60945db482dd..9935ca77536c8fa30881376e20cd3193f22879fb 100644
+index ae017e210a54e78ecd14117ac939e1bb3da4497a..047676a7ea94bf26c8dd0552c72760bcc264218f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2205,6 +2205,83 @@ public final class Bukkit {
+@@ -2228,6 +2228,83 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -409,10 +409,10 @@ index 1704d04097c9d364e5f9049a6a0f60945db482dd..9935ca77536c8fa30881376e20cd3193
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index dca2cbe8c93469c8c1c404bc34748a9dcf6d3368..136ae88a23ac02f79960d4ee99041486b41806f5 100644
+index e1211bb9c3186ffb1c5c7b858b8bab50bf87df9f..94192cfe9bb15c0083cf28761bc3f0f6bb19aa8d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1936,5 +1936,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1955,5 +1955,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();

patches/api/0061-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 411dbbd8046a3157747713fea9ae19eca113e9b7..7f12a18a77838266c0394da078a958c6bfb0e776 100644
+index 3845a726adbd0e75d7bf2aeeb6da8cb571d51a8f..abdca9fe5acc90f167219eb769ece66c35682bb1 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -336,6 +336,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -339,6 +339,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public int getExpToLevel();
  

patches/api/0065-Add-getI18NDisplayName-API.patch

@@ -8,17 +8,18 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index d0530328536840ce126b39942fac35a476ea2ac4..193e36ca6ea3b6528e53ebd07bbd8775b12993af 100644
+index 9578d6b0fa54feac75fa9a0727d878bd13b9e19e..a6795b102c9678b122dfd3b36d02783b9e108b48 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -177,5 +177,19 @@ public interface ItemFactory {
-      */
+@@ -191,4 +191,20 @@ public interface ItemFactory {
      @NotNull
      net.kyori.adventure.text.Component displayName(@NotNull ItemStack itemStack);
+     // Paper end - Adventure
 +
++    // Paper start - add getI18NDisplayName
 +    /**
 +     * Gets the Display name as seen in the Client.
-+     * Currently the server only supports the English language. To override this,
++     * Currently, the server only supports the English language. To override this,
 +     * You must replace the language file embedded in the server jar.
 +     *
 +     * @param item Item to return Display name of
@@ -29,13 +30,13 @@ index d0530328536840ce126b39942fac35a476ea2ac4..193e36ca6ea3b6528e53ebd07bbd8775
 +    @Nullable
 +    @Deprecated
 +    String getI18NDisplayName(@Nullable ItemStack item);
-     // Paper end
++    // Paper end - add getI18NDisplayName
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 7e6c2bcf42d271184a75c91ecded5824535b3455..b8dfe0d1cebb944dfffc97ac74fdecda2f4884a2 100644
+index 9d327f0832c40d4a8d212346284274f6cf78834f..09a36df6edce2a283df80c67d5ef62da7ff73555 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -668,5 +668,20 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -618,5 +618,20 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public net.kyori.adventure.text.@NotNull Component displayName() {
          return Bukkit.getServer().getItemFactory().displayName(this);
      }

patches/api/0066-ensureServerConversions-API.patch

@@ -7,32 +7,33 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 193e36ca6ea3b6528e53ebd07bbd8775b12993af..c8e1377f804c50d41ad29c6c67dea58526d28125 100644
+index a6795b102c9678b122dfd3b36d02783b9e108b48..74cd662d0594f2fbc5aa30ba64d9e4928145dbb9 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -191,5 +191,17 @@ public interface ItemFactory {
-     @Nullable
+@@ -207,4 +207,18 @@ public interface ItemFactory {
      @Deprecated
      String getI18NDisplayName(@Nullable ItemStack item);
+     // Paper end - add getI18NDisplayName
 +
++    // Paper start - ensure server conversions API
 +    /**
-+     * Minecraft updates are converting simple item stacks into more complex NBT oriented Item Stacks.
++     * Minecraft's updates are converting simple item stacks into more complex NBT oriented Item Stacks.
 +     *
 +     * Use this method to ensure any desired data conversions are processed.
 +     * The input itemstack will not be the same as the returned itemstack.
 +     *
 +     * @param item The item to process conversions on
-+     * @return A potentially Data Converted ItemStack
++     * @return A potentially Data-Converted-ItemStack
 +     */
 +    @NotNull
 +    ItemStack ensureServerConversions(@NotNull ItemStack item);
-     // Paper end
++    // Paper end - ensure server conversions API
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index b8dfe0d1cebb944dfffc97ac74fdecda2f4884a2..923f160407a2d4be71ef42a387cb803712404c43 100644
+index 09a36df6edce2a283df80c67d5ef62da7ff73555..a8faa4c1881bae4d47d901388a78b991d138b518 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -587,7 +587,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -537,7 +537,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
              }
          }
  
@@ -41,7 +42,7 @@ index b8dfe0d1cebb944dfffc97ac74fdecda2f4884a2..923f160407a2d4be71ef42a387cb8037
      }
  
      /**
-@@ -669,6 +669,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -619,6 +619,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return Bukkit.getServer().getItemFactory().displayName(this);
      }
  

patches/api/0067-LivingEntity-setKiller.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9977bb3cb5a66c84db816f8e4597db1c053f77c8..ccd8f36c8450bab9f609bb220b5270394960580e 100644
+index c094070f8399586af7e02fe4ed489c82080f3678..ae201851aa00d47da37cca087ec9f8c03738a94a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -295,6 +295,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -319,6 +319,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      @Nullable
      public Player getKiller();
  

patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -14,12 +14,12 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 98a7dfdcbcbb44e8f1d376cb213183592d03ea65..fb47a794893d5fef026a35a7c573becf74420aa0 100644
+index 8c93ff28273ef9ddce2fb7a62ac50701fa3cd9a2..8045f92ffdfb4164bcbef99c41359590c45f9006 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -9,6 +9,8 @@ java {
- }
- 
+@@ -11,6 +11,8 @@ java {
+ val annotationsVersion = "24.0.1"
+ val bungeeCordChatVersion = "1.20-R0.1"
  val adventureVersion = "4.14.0"
 +val slf4jVersion = "1.8.0-beta4"
 +val log4jVersion = "2.17.1"
@@ -35,14 +35,12 @@ index 98a7dfdcbcbb44e8f1d376cb213183592d03ea65..fb47a794893d5fef026a35a7c573becf
  
      implementation("org.ow2.asm:asm:9.4")
      implementation("org.ow2.asm:asm-commons:9.4")
-@@ -112,7 +116,9 @@ tasks.withType<Javadoc> {
-         "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
+@@ -113,6 +117,8 @@ tasks.withType<Javadoc> {
          "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
          "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
--        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/"
-+        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
+         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
 +        "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
-+        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/"
++        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
          // Paper end
      )
      options.tags("apiNote:a:API Note:")

patches/api/0073-Add-PlayerArmorChangeEvent.patch

@@ -6,13 +6,12 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b1985f57d0e52df49304964797dfbbe9a7578ddd
+index 0000000000000000000000000000000000000000..faea096dac02d339667c02a0011b6f8313fd8c12
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
-@@ -0,0 +1,189 @@
+@@ -0,0 +1,137 @@
 +package com.destroystokyo.paper.event.player;
 +
-+import org.bukkit.Bukkit;
 +import org.bukkit.Material;
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.HandlerList;
@@ -23,12 +22,10 @@ index 0000000000000000000000000000000000000000..b1985f57d0e52df49304964797dfbbe9
 +import java.util.Collections;
 +import java.util.HashSet;
 +import java.util.Set;
-+import org.bukkit.inventory.ItemType;
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
-+import org.jetbrains.annotations.Unmodifiable;
 +
-+import static org.bukkit.inventory.ItemType.*;
++import static org.bukkit.Material.*;
 +
 +/**
 + * Called when the player themselves change their armor items
@@ -96,17 +93,15 @@ index 0000000000000000000000000000000000000000..b1985f57d0e52df49304964797dfbbe9
 +    }
 +
 +    public enum SlotType {
-+        HEAD(NETHERITE_HELMET, DIAMOND_HELMET, GOLDEN_HELMET, IRON_HELMET, CHAINMAIL_HELMET, LEATHER_HELMET, CARVED_PUMPKIN, PLAYER_HEAD, SKELETON_SKULL, ZOMBIE_HEAD, CREEPER_HEAD, WITHER_SKELETON_SKULL, TURTLE_HELMET),
++        HEAD(NETHERITE_HELMET, DIAMOND_HELMET, GOLDEN_HELMET, IRON_HELMET, CHAINMAIL_HELMET, LEATHER_HELMET, CARVED_PUMPKIN, PLAYER_HEAD, SKELETON_SKULL, ZOMBIE_HEAD, CREEPER_HEAD, WITHER_SKELETON_SKULL, TURTLE_HELMET, DRAGON_HEAD, PIGLIN_HEAD),
 +        CHEST(NETHERITE_CHESTPLATE, DIAMOND_CHESTPLATE, GOLDEN_CHESTPLATE, IRON_CHESTPLATE, CHAINMAIL_CHESTPLATE, LEATHER_CHESTPLATE, ELYTRA),
 +        LEGS(NETHERITE_LEGGINGS, DIAMOND_LEGGINGS, GOLDEN_LEGGINGS, IRON_LEGGINGS, CHAINMAIL_LEGGINGS, LEATHER_LEGGINGS),
 +        FEET(NETHERITE_BOOTS, DIAMOND_BOOTS, GOLDEN_BOOTS, IRON_BOOTS, CHAINMAIL_BOOTS, LEATHER_BOOTS);
 +
-+        private final Set<ItemType> mutableTypes = new HashSet<>();
-+        private Set<ItemType> immutableTypes;
-+        @Deprecated
-+        private Set<Material> legacyTypes;
++        private final Set<Material> mutableTypes = new HashSet<>();
++        private Set<Material> immutableTypes;
 +
-+        SlotType(ItemType... types) {
++        SlotType(Material... types) {
 +            this.mutableTypes.addAll(Arrays.asList(types));
 +        }
 +
@@ -115,32 +110,14 @@ index 0000000000000000000000000000000000000000..b1985f57d0e52df49304964797dfbbe9
 +         * armor slot.
 +         *
 +         * @return immutable set of material types
-+         * @deprecated use {@link #getItemTypes()}
-+         */
-+        @Deprecated
-+        public @NotNull @Unmodifiable Set<Material> getTypes() {
-+            if (this.legacyTypes == null) {
-+                this.legacyTypes = new HashSet<>();
-+                for (final ItemType itemType : this.getItemTypes()) {
-+                    this.legacyTypes.add(Bukkit.getUnsafe().toMaterial(itemType));
-+                }
-+            }
-+            return Collections.unmodifiableSet(this.legacyTypes);
-+        }
-+
-+        /**
-+         * Gets an immutable set of all allowed item types that can be placed in an
-+         * armor slot.
-+         *
-+         * @return immutable set of item types
 +         */
 +        @NotNull
-+        public @Unmodifiable Set<ItemType> getItemTypes() {
-+            if (this.immutableTypes == null) {
-+                this.immutableTypes = Collections.unmodifiableSet(this.mutableTypes);
++        public Set<Material> getTypes() {
++            if (immutableTypes == null) {
++                immutableTypes = Collections.unmodifiableSet(mutableTypes);
 +            }
 +
-+            return this.immutableTypes;
++            return immutableTypes;
 +        }
 +
 +        /**
@@ -148,10 +125,8 @@ index 0000000000000000000000000000000000000000..b1985f57d0e52df49304964797dfbbe9
 +         *
 +         * @param material material to get slot by
 +         * @return slot type the material will go in, or null if it won't
-+         * @deprecated use {@link #getByItemType(ItemType)}
 +         */
 +        @Nullable
-+        @Deprecated
 +        public static SlotType getByMaterial(@NotNull Material material) {
 +            for (SlotType slotType : values()) {
 +                if (slotType.getTypes().contains(material)) {
@@ -162,40 +137,13 @@ index 0000000000000000000000000000000000000000..b1985f57d0e52df49304964797dfbbe9
 +        }
 +
 +        /**
-+         * Gets the type of slot via the specified item type
-+         *
-+         * @param itemType item type to get slot by
-+         * @return slot type the item type will go in, or null if it won't
-+         */
-+        @Nullable
-+        public static SlotType getByItemType(@NotNull ItemType itemType) {
-+            for (SlotType slotType : values()) {
-+                if (slotType.getItemTypes().contains(itemType)) {
-+                    return slotType;
-+                }
-+            }
-+            return null;
-+        }
-+
-+        /**
-+         * Gets whether this material can be equipped to a slot
++         * Gets whether or not this material can be equipped to a slot
 +         *
 +         * @param material material to check
-+         * @return whether this material can be equipped
++         * @return whether or not this material can be equipped
 +         */
-+        @Deprecated
 +        public static boolean isEquipable(@NotNull Material material) {
 +            return getByMaterial(material) != null;
 +        }
-+
-+        /**
-+         * Gets whether this item type can be equipped to a slot
-+         *
-+         * @param itemType item type to check
-+         * @return whether this item type can be equipped
-+         */
-+        public static boolean isEquipable(@NotNull ItemType itemType) {
-+            return getByItemType(itemType) != null;
-+        }
 +    }
 +}

patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch

@@ -9,10 +9,10 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index d834e8d8d532ce5b46201ff5c02d54a6c047f615..b33c1a227669d01950ceb4162a2910ae05a85a0e 100644
+index 870ad6cd930653e6248abcc0fce94ffafbe9ebde..9f4d383ea3d6b26d16b8b77ca4c29d2d839ad6dd 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -271,6 +271,16 @@ public interface Block extends Metadatable, Translatable {
+@@ -272,6 +272,16 @@ public interface Block extends Metadatable, Translatable {
      @NotNull
      BlockState getState();
  

patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch

@@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 26236250f4418def6f65c811800063588b43fa84..bd6881d18d18d03f7e9b7821fa6cc433a79dc17e 100644
+index bb9f28d1a0290c5951412de1d2de8c2e6e354369..c1c2e8d9d6ff39ca6cdabb0744076cc540f86681 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -51,7 +51,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */

patches/api/0077-Display-warning-on-deprecated-recipe-API.patch

@@ -10,26 +10,26 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index e92de5ca8bd48723a493495db3ca2e2f5b55fab5..06b7f273ae66b2c936523c95fd4f802bd39ae324 100644
+index 9f9c67e935940833bbfe58e6bfa398e6c86980d5..71e494177473c62449aafda1699b26a0c4c81a68 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -37,6 +37,7 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -31,6 +31,7 @@ public class ShapedRecipe extends CraftingRecipe {
+     @Deprecated
      public ShapedRecipe(@NotNull ItemStack result) {
-         Preconditions.checkArgument(result.getType() != ItemType.AIR, "Recipe must have non-AIR result.");
-         this.key = NamespacedKey.randomKey();
-+        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace();
-         this.output = new ItemStack(result);
+         super(NamespacedKey.randomKey(), result);
++        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace(); // Paper
      }
  
+     /**
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 69a25d05efcc96f8b3d3b5455e571259e5af2dab..ebc2c713d8a4ceec86b7dd270c5ca18c78103bcc 100644
+index 03839302c94adc3175d0a88065cd230257ffd20d..d6e38c7ccfe3b6e85eafb611da20b1a29fb74d97 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -20,6 +20,7 @@ public class ShapelessRecipe extends CraftingRecipe {
+     @Deprecated
      public ShapelessRecipe(@NotNull ItemStack result) {
-         Preconditions.checkArgument(result.getType() != ItemType.AIR, "Recipe must have non-AIR result.");
-         this.key = NamespacedKey.randomKey();
-+        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace();
-         this.output = new ItemStack(result);
+         super(NamespacedKey.randomKey(), result);
++        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace(); // Paper
      }
  
+     /**

patches/api/0080-Ability-to-apply-mending-to-XP-API.patch

@@ -10,10 +10,10 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0700a76cdccab9a6dbbcbfd50aa6a5f192f15e75..2400d82ea71f22ddb6c671bf74c6480c35910598 100644
+index 6586262b6dfcb0b022d78096b7d4ec339c0b396c..2257a1808d19775607e60c155d9e5508e7825811 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1230,6 +1230,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1368,6 +1368,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
@@ -29,7 +29,7 @@ index 0700a76cdccab9a6dbbcbfd50aa6a5f192f15e75..2400d82ea71f22ddb6c671bf74c6480c
      /**
       * Gets the player's cooldown between picking up experience orbs.
       *
-@@ -1255,8 +1264,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1393,8 +1402,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Gives the player the amount of experience specified.
       *
       * @param amount Exp amount to give

patches/api/0081-PreCreatureSpawnEvent.patch

@@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..24b325625c76d0bc4cdb2f4063d6666aa3deac17
+index 0000000000000000000000000000000000000000..8b48759bf6f4fcef0847d9a2461993e3f2fdc9aa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
 @@ -0,0 +1,105 @@
@@ -43,11 +43,11 @@ index 0000000000000000000000000000000000000000..24b325625c76d0bc4cdb2f4063d6666a
 + */
 +public class PreCreatureSpawnEvent extends Event implements Cancellable {
 +    @NotNull private final Location location;
-+    @NotNull private final EntityType<?> type;
++    @NotNull private final EntityType type;
 +    @NotNull private final CreatureSpawnEvent.SpawnReason reason;
 +    private boolean shouldAbortSpawn;
 +
-+    public PreCreatureSpawnEvent(@NotNull Location location, @NotNull EntityType<?> type, @NotNull CreatureSpawnEvent.SpawnReason reason) {
++    public PreCreatureSpawnEvent(@NotNull Location location, @NotNull EntityType type, @NotNull CreatureSpawnEvent.SpawnReason reason) {
 +        this.location = Preconditions.checkNotNull(location, "Location may not be null");
 +        this.type = Preconditions.checkNotNull(type, "Type may not be null");
 +        this.reason = Preconditions.checkNotNull(reason, "Reason may not be null");
@@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..24b325625c76d0bc4cdb2f4063d6666a
 +     * @return The type of creature being spawned
 +     */
 +    @NotNull
-+    public EntityType<?> getType() {
++    public EntityType getType() {
 +        return type;
 +    }
 +

patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch

@@ -7,10 +7,10 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
-index c7580fa8e62c6ee35abb0cec2586a39bbae4e8a7..0070b8e4a86f85ee31e071513808c36dbad04845 100644
+index b39128bb0ca2d4fe7a254193236c60fb5bfaa7da..5135b8e6028e6926e2711e2dd6ce68b76f468fd7 100644
 --- a/src/main/java/org/bukkit/block/Skull.java
 +++ b/src/main/java/org/bukkit/block/Skull.java
-@@ -62,6 +62,20 @@ public interface Skull extends TileState {
+@@ -63,6 +63,20 @@ public interface Skull extends TileState {
       */
      public void setOwningPlayer(@NotNull OfflinePlayer player);
  
@@ -31,7 +31,7 @@ index c7580fa8e62c6ee35abb0cec2586a39bbae4e8a7..0070b8e4a86f85ee31e071513808c36d
      /**
       * Gets the profile of the player who owns the skull. This player profile
       * may appear as the texture depending on skull type.
-@@ -69,6 +83,7 @@ public interface Skull extends TileState {
+@@ -70,6 +84,7 @@ public interface Skull extends TileState {
       * @return the profile of the owning player
       */
      @Nullable
@@ -39,7 +39,7 @@ index c7580fa8e62c6ee35abb0cec2586a39bbae4e8a7..0070b8e4a86f85ee31e071513808c36d
      PlayerProfile getOwnerProfile();
  
      /**
-@@ -83,6 +98,7 @@ public interface Skull extends TileState {
+@@ -84,6 +99,7 @@ public interface Skull extends TileState {
       * @throws IllegalArgumentException if the profile does not contain the
       * necessary information
       */

patches/api/0091-Player.setPlayerProfile-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9935ca77536c8fa30881376e20cd3193f22879fb..c1cf9328f32d6b4ecbba667a8dda3a60b37aca82 100644
+index dcd539220e5a2bda41f27101ea4c0ece146e1d0d..f5358612884aae8d0686f3ff98ccee567a746f16 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1230,8 +1230,10 @@ public final class Bukkit {
@@ -43,10 +43,10 @@ index 9935ca77536c8fa30881376e20cd3193f22879fb..c1cf9328f32d6b4ecbba667a8dda3a60
          return server.createPlayerProfile(name);
      }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 6aa01b6f25e88ea7908edd1db836e62adb1b8da6..ab0c6c479d41e00e31d850d5e35d78484423d5c9 100644
+index bec480aff819e09220b52175cab0cb6d68ae68c6..12349910297a75c00e64f6ccc7981aeeeb43ecd3 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -57,7 +57,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -59,7 +59,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * @return the player's profile
       */
      @NotNull
@@ -54,9 +54,9 @@ index 6aa01b6f25e88ea7908edd1db836e62adb1b8da6..ab0c6c479d41e00e31d850d5e35d7848
 +    com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile(); // Paper
  
      /**
-      * Checks if this player is banned or not
+      * Checks if this player has had their profile banned.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 136ae88a23ac02f79960d4ee99041486b41806f5..572a5aa724f58dc9795bf83b4151412e26f2a14d 100644
+index 016cee903c7179baf711984503d1d0793d40c5c5..064edd612885b2ea4b35001a864503b568c53987 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1050,8 +1050,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -93,10 +93,10 @@ index 136ae88a23ac02f79960d4ee99041486b41806f5..572a5aa724f58dc9795bf83b4151412e
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2400d82ea71f22ddb6c671bf74c6480c35910598..3c2b4ecce2c4ae3ab5a394857988d24776b9ca90 100644
+index 2257a1808d19775607e60c155d9e5508e7825811..21952b30559cafb00ddcef54557caea5e4dbb36e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2519,6 +2519,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2676,6 +2676,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
@@ -110,7 +110,11 @@ index 2400d82ea71f22ddb6c671bf74c6480c35910598..3c2b4ecce2c4ae3ab5a394857988d247
 +
 +    /**
 +     * Changes the PlayerProfile for this player. This will cause this player
-+     * to be reregistered to all clients that can currently see this player
++     * to be reregistered to all clients that can currently see this player.
++     *
++     * After executing this method, the player {@link java.util.UUID} won't
++     * be swapped, only their name and gameprofile properties.
++     *
 +     * @param profile The new profile to use
 +     */
 +    void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);

patches/api/0092-getPlayerUniqueId-API.patch

@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c1cf9328f32d6b4ecbba667a8dda3a60b37aca82..48f3a48268f714eeba3cfcd8e665265fc144f39e 100644
+index 5b9d04de045a83e786df4bf9bfe2fc50835247bb..67c92e10b38af2ac45c1d9b6374695247bf1e7c3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -688,6 +688,20 @@ public final class Bukkit {
@@ -34,7 +34,7 @@ index c1cf9328f32d6b4ecbba667a8dda3a60b37aca82..48f3a48268f714eeba3cfcd8e665265f
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 572a5aa724f58dc9795bf83b4151412e26f2a14d..cb3415c9b103f60ce0d7942fb1ad4c8cd39d02d4 100644
+index 9865238afb71f19b5c1cc7c414ea3a637f9fc00c..88b93ac279f2bd23ca853788c409549fe2afe041 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -592,6 +592,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0094-Add-openSign-method-to-HumanEntity.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add openSign method to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 7f12a18a77838266c0394da078a958c6bfb0e776..553cd804126a556f7fdf9f4bcb8640eb33e829d6 100644
+index abdca9fe5acc90f167219eb769ece66c35682bb1..b3aa3dc6aa5afbc36cc86741b4cba56f463c2234 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -497,6 +497,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -500,6 +500,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      @Deprecated
      public void setShoulderEntityRight(@Nullable Entity entity);
@@ -36,10 +36,10 @@ index 7f12a18a77838266c0394da078a958c6bfb0e776..553cd804126a556f7fdf9f4bcb8640eb
      /**
       * Make the entity drop the item in their hand.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3c2b4ecce2c4ae3ab5a394857988d24776b9ca90..a2aa3c1e98a4909d3abfa9704da8c3b77918e05a 100644
+index af7af85887e9463c561ddb0c47862b27b5de5d43..8e7482df076c41ae12813e64153206851e020764 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2364,10 +2364,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2521,10 +2521,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Open a Sign for editing by the Player.
       *

patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch

@@ -8,10 +8,10 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index ab0c6c479d41e00e31d850d5e35d78484423d5c9..af2973b1f6d4ac73b2ddee33c6a0869b5ec06b54 100644
+index 12349910297a75c00e64f6ccc7981aeeeb43ecd3..8f2f3e0ac5266f571b62a754921422bb07d61984 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -65,6 +65,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -67,6 +67,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * @return true if banned, otherwise false
       */
      public boolean isBanned();
@@ -72,12 +72,12 @@ index ab0c6c479d41e00e31d850d5e35d78484423d5c9..af2973b1f6d4ac73b2ddee33c6a0869b
 +    // Paper end
  
      /**
-      * Checks if this player is whitelisted or not
+      * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a2aa3c1e98a4909d3abfa9704da8c3b77918e05a..de5ac3b6f9cf001e3c3500f23930a6f9876210de 100644
+index 8e7482df076c41ae12813e64153206851e020764..6cbb64d4555a3741d0f4938c1850f64d055a3ac4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -904,6 +904,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1042,6 +1042,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start

patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f710167633a8ef1abc4aac2a1912514a959d414c
+index 0000000000000000000000000000000000000000..f45b8cfd1611345e8d81ecb8297a586f05eb5dc6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 @@ -0,0 +1,485 @@
@@ -470,20 +470,20 @@ index 0000000000000000000000000000000000000000..f710167633a8ef1abc4aac2a1912514a
 +     */
 +    @NotNull
 +    public ParticleBuilder color(@Nullable Color color, float size) {
-+        if (this.particle != Particle.DUST && color != null) {
++        if (particle != Particle.REDSTONE && color != null) {
 +            throw new IllegalStateException("Color may only be set on REDSTONE");
 +        }
 +
 +        // We don't officially support reusing these objects, but here we go
 +        if (color == null) {
-+            if (this.data instanceof Particle.DustOptions) {
++            if (data instanceof Particle.DustOptions) {
 +                return data(null);
 +            } else {
 +                return this;
 +            }
 +        }
 +
-+        return this.data(new Particle.DustOptions(color, size));
++        return data(new Particle.DustOptions(color, size));
 +    }
 +
 +    /**
@@ -500,12 +500,12 @@ index 0000000000000000000000000000000000000000..f710167633a8ef1abc4aac2a1912514a
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 0f97cf9fd3aebbcda1531f2cfbb9e2e17ba14acf..31c2706e0f038c180821e7c4e543f1177789ce3d 100644
+index 73b782c3975ad13159b6236976783fcfabd20493..819506712e9874c0142fc9e7d959bd7be97fc649 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -140,6 +140,17 @@ public abstract class Particle<D> extends OldEnum<Particle<D>> implements Keyed
-     @NotNull
-     public abstract Class<D> getDataType();
+@@ -162,6 +162,17 @@ public enum Particle {
+         return dataType;
+     }
  
 +    // Paper start - Particle API expansion
 +    /**
@@ -522,19 +522,15 @@ index 0f97cf9fd3aebbcda1531f2cfbb9e2e17ba14acf..31c2706e0f038c180821e7c4e543f117
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 48e3e92820f59753df30e5d61f57fb71e2894aa6..61f5fd47381d21b268f58af2106fc8be5e2f1c73 100644
+index 0f76496471c50d5f18cedc735e667265e6c27422..0ed7a7db90856ff50ed1354f9914c0cc321d2d09 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2756,7 +2756,62 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2776,7 +2776,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
       */
--    public <T> void spawnParticle(@NotNull Particle<T> particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
-+    // Paper start - Expand Particle API
-+    default <T> void spawnParticle(@NotNull Particle<T> particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data) {
-+        this.spawnParticle(particle, null, null, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, true);
-+    }
-+
+-    public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
++    public default <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data) { spawnParticle(particle, null, null, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, true); }// Paper start - Expand Particle API
 +    /**
 +     * Spawns the particle (the number of times specified by count)
 +     * at the target location. The position of each particle will be
@@ -557,9 +553,7 @@ index 48e3e92820f59753df30e5d61f57fb71e2894aa6..61f5fd47381d21b268f58af2106fc8be
 +     *             the type of this depends on {@link Particle#getDataType()}
 +     * @param <T> Type
 +     */
-+    default <T> void spawnParticle(@NotNull Particle<T> particle, @Nullable List<Player> receivers, @NotNull Player source, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data) {
-+        this.spawnParticle(particle, receivers, source, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, true);
-+    }
++    public default <T> void spawnParticle(@NotNull Particle particle, @Nullable List<Player> receivers, @NotNull Player source, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data) { spawnParticle(particle, receivers, source, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, true); }
 +    /**
 +     * Spawns the particle (the number of times specified by count)
 +     * at the target location. The position of each particle will be
@@ -584,8 +578,9 @@ index 48e3e92820f59753df30e5d61f57fb71e2894aa6..61f5fd47381d21b268f58af2106fc8be
 +     * @param force allows the particle to be seen further away from the player
 +     *              and shows to players using any vanilla client particle settings
 +     */
-+    <T> void spawnParticle(@NotNull Particle<T> particle, @Nullable List<Player> receivers, @Nullable Player source, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
++    public <T> void spawnParticle(@NotNull Particle particle, @Nullable List<Player> receivers, @Nullable Player source, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
 +    // Paper end
++
  
      /**
       * Spawns the particle (the number of times specified by count)

patches/api/0106-WitchReadyPotionEvent.patch

@@ -7,18 +7,18 @@ Control what potion the witch readies to use
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..af74dcd5dccd26661787219eb8873c5be2f981a7
+index 0000000000000000000000000000000000000000..57f93af14acc6346c5a343e05fe8f5d44d6adbc6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
 @@ -0,0 +1,80 @@
 +package com.destroystokyo.paper.event.entity;
 +
++import org.bukkit.Material;
 +import org.bukkit.entity.Witch;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
 +import org.bukkit.inventory.ItemStack;
-+import org.bukkit.inventory.ItemType;
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
@@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..af74dcd5dccd26661787219eb8873c5b
 +    public static ItemStack process(@NotNull Witch witch, @Nullable ItemStack potion) {
 +        WitchReadyPotionEvent event = new WitchReadyPotionEvent(witch, potion);
 +        if (!event.callEvent() || event.getPotion() == null) {
-+            return ItemStack.of(ItemType.AIR);
++            return new ItemStack(Material.AIR);
 +        }
 +        return event.getPotion();
 +    }

patches/api/0107-ItemStack-getMaxItemUseDuration.patch

@@ -6,20 +6,20 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 923f160407a2d4be71ef42a387cb803712404c43..250e39c76dbedbd1d0d118eecf1253738e369c35 100644
+index a8faa4c1881bae4d47d901388a78b991d138b518..b85eb71ff5d198d6270cbe07da0de3ed27fa72d5 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -696,5 +696,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -646,5 +646,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public String getI18NDisplayName() {
          return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
      }
 +
 +    public int getMaxItemUseDuration() {
-+        if (this.type == null || this.type == ItemType.AIR) {
++        if (type == null || type == Material.AIR || !type.isItem()) {
 +            return 0;
 +        }
 +        // Requires access to NMS
-+        return this.ensureServerConversions().getMaxItemUseDuration();
++        return ensureServerConversions().getMaxItemUseDuration();
 +    }
      // Paper end
  }

patches/api/0109-Make-shield-blocking-delay-configurable.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ccd8f36c8450bab9f609bb220b5270394960580e..2bfeebe26f32d2e931dc483714d30430deeb9b04 100644
+index 6a9df4ec0eee205bcd37de9c4d04a6c67eb21644..b470d86c00be238a430e64d349a247e2740cfeec 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -731,5 +731,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -764,5 +764,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      @Deprecated
      void setArrowsStuck(int arrows);

patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-index d4d7ad9c3c953680342c121f39ddaef476549047..6c27a3149b17162cc38206147c759df066186af0 100644
+index d4d7ad9c3c953680342c121f39ddaef476549047..719d0d878320c1903b44076053989ba99fa0e92a 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 @@ -22,7 +22,32 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
@@ -31,7 +31,7 @@ index d4d7ad9c3c953680342c121f39ddaef476549047..6c27a3149b17162cc38206147c759df0
 +
 +    @Deprecated
 +    public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull final Entity projectile, final float force) {
-+        this(shooter, bow, ItemStack.of(org.bukkit.inventory.ItemType.AIR), projectile, force);
++        this(shooter, bow, new ItemStack(org.bukkit.Material.AIR), projectile, force);
 +    }
  
 +    @Deprecated

patches/api/0114-Expand-Explosions-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 6693e3d8dc2519facb12db981a6b6325faa095bf..5a6b33c6d9a68affdbd02c13fdb0854e011e327d 100644
+index 6693e3d8dc2519facb12db981a6b6325faa095bf..b7ff09ffdd3aecc1843d175bc76fe5fae1f48dde 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -7,6 +7,7 @@ import java.util.HashMap;
@@ -17,10 +17,11 @@ index 6693e3d8dc2519facb12db981a6b6325faa095bf..5a6b33c6d9a68affdbd02c13fdb0854e
  import org.bukkit.util.NumberConversions;
  import org.bukkit.util.Vector;
  import org.jetbrains.annotations.NotNull;
-@@ -568,6 +569,87 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
+@@ -568,6 +569,89 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
          return centerLoc;
      }
  
++    // Paper start - Expand Explosions API
 +    /**
 +     * Creates explosion at this location with given power
 +     *
@@ -98,9 +99,10 @@ index 6693e3d8dc2519facb12db981a6b6325faa095bf..5a6b33c6d9a68affdbd02c13fdb0854e
 +     * @param breakBlocks Whether or not to have blocks be destroyed
 +     * @return false if explosion was canceled, otherwise true
 +     */
-+    public boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
++    public boolean createExplosion(@Nullable Entity source, float power, boolean setFire, boolean breakBlocks) {
 +        return this.getWorld().createExplosion(source, this, power, setFire, breakBlocks);
 +    }
++    // Paper end - Expand Explosions API
 +
      /**
       * Returns a list of entities within a bounding box centered around a Location.

patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack API additions for quantity/flags/lore
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 250e39c76dbedbd1d0d118eecf1253738e369c35..8187b1b801c7a6fd71696bfe21de177705b0e3a2 100644
+index b85eb71ff5d198d6270cbe07da0de3ed27fa72d5..83a0631a80db156ace1d977df71d5fc653b70bb6 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -3,6 +3,7 @@ package org.bukkit.inventory;
@@ -16,9 +16,9 @@ index 250e39c76dbedbd1d0d118eecf1253738e369c35..8187b1b801c7a6fd71696bfe21de1777
  import java.util.Map;
  import org.bukkit.Bukkit;
  import org.bukkit.Material;
-@@ -704,5 +705,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -654,5 +655,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          // Requires access to NMS
-         return this.ensureServerConversions().getMaxItemUseDuration();
+         return ensureServerConversions().getMaxItemUseDuration();
      }
 +
 +    /**

patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 553cd804126a556f7fdf9f4bcb8640eb33e829d6..7c27f459cf84e87bb294d1a1c8081bc8eba9d852 100644
+index b3aa3dc6aa5afbc36cc86741b4cba56f463c2234..9e012c3c0671e5d0e55c243fdb4e14057038c153 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -325,7 +325,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -328,7 +328,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       *
       * @return the item being used by the player, or null if they are not using
       * an item
@@ -20,10 +20,10 @@ index 553cd804126a556f7fdf9f4bcb8640eb33e829d6..7c27f459cf84e87bb294d1a1c8081bc8
      public ItemStack getItemInUse();
  
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a48be2a0401a57b6165a849cf29f37a63b54f630..4cb92615ccd45617a282df59574f9c4fc45f119b 100644
+index b470d86c00be238a430e64d349a247e2740cfeec..97d0f82041a229e85217a7e575bf003eddc31b70 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -745,5 +745,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -778,5 +778,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);

patches/api/0119-InventoryCloseEvent-Reason-API.patch

@@ -27,10 +27,10 @@ index 9e012c3c0671e5d0e55c243fdb4e14057038c153..d44c5a3fda0b159dc541246cb2fca842
       * Returns the ItemStack currently in your hand, can be empty.
       *
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
-index 5861247c1b8ee4fe2736fd5098e05a2ca9ab78ea..21ad8888c0e403bfc63518502577d651c02dda05 100644
+index 3cf2e2e87b8021f4c5e046b22ed89798b4172ae7..d527e3d7ba8d5b8c044e5a04ebdb9a2c117f22c7 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
-@@ -11,9 +11,60 @@ import org.jetbrains.annotations.NotNull;
+@@ -30,9 +30,60 @@ import org.jetbrains.annotations.NotNull;
   */
  public class InventoryCloseEvent extends InventoryEvent {
      private static final HandlerList handlers = new HandlerList();

patches/api/0130-AnvilDamageEvent.patch

@@ -6,15 +6,13 @@ Subject: [PATCH] AnvilDamageEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..8174787e87433084035bb3cbc88e041937c56430
+index 0000000000000000000000000000000000000000..a83c286c1c11af25fc4d16af7a42b95ce90b9dee
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
-@@ -0,0 +1,171 @@
+@@ -0,0 +1,148 @@
 +package com.destroystokyo.paper.event.block;
 +
-+import org.bukkit.Bukkit;
 +import org.bukkit.Material;
-+import org.bukkit.block.BlockType;
 +import org.bukkit.block.data.BlockData;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
@@ -106,15 +104,15 @@ index 0000000000000000000000000000000000000000..8174787e87433084035bb3cbc88e0419
 +     * Represents the amount of damage on an anvil block
 +     */
 +    public enum DamageState {
-+        FULL(BlockType.ANVIL),
-+        CHIPPED(BlockType.CHIPPED_ANVIL),
-+        DAMAGED(BlockType.DAMAGED_ANVIL),
-+        BROKEN(BlockType.AIR);
++        FULL(Material.ANVIL),
++        CHIPPED(Material.CHIPPED_ANVIL),
++        DAMAGED(Material.DAMAGED_ANVIL),
++        BROKEN(Material.AIR);
 +
-+        private BlockType<?> blockType;
++        private Material material;
 +
-+        DamageState(@NotNull BlockType<?> blockType) {
-+            this.blockType = blockType;
++        DamageState(@NotNull Material material) {
++            this.material = material;
 +        }
 +
 +        /**
@@ -122,18 +120,9 @@ index 0000000000000000000000000000000000000000..8174787e87433084035bb3cbc88e0419
 +         *
 +         * @return Material
 +         */
-+        @Deprecated
-+        public @NotNull Material getMaterial() {
-+            return Bukkit.getUnsafe().blockTypeToMaterial(this.blockType);
-+        }
-+
-+        /**
-+         * Get the block type for this damage state.
-+         *
-+         * @return the block type
-+         */
-+        public @NotNull BlockType<?> getBlockType() {
-+            return this.blockType;
++        @NotNull
++        public Material getMaterial() {
++            return material;
 +        }
 +
 +        /**
@@ -145,7 +134,7 @@ index 0000000000000000000000000000000000000000..8174787e87433084035bb3cbc88e0419
 +         */
 +        @NotNull
 +        public static DamageState getState(@Nullable BlockData blockData) {
-+            return blockData == null ? BROKEN : getState(blockData.getBlockType());
++            return blockData == null ? BROKEN : getState(blockData.getMaterial());
 +        }
 +
 +        /**
@@ -154,26 +143,14 @@ index 0000000000000000000000000000000000000000..8174787e87433084035bb3cbc88e0419
 +         * @param material Block material
 +         * @return DamageState
 +         * @throws IllegalArgumentException If non anvil material is given
-+         * @deprecated use {@link #getState(BlockType)}
 +         */
-+        @Deprecated
-+        public static @NotNull DamageState getState(@Nullable Material material) {
-+            return material == null ? BROKEN : getState(material.asBlockType());
-+        }
-+
-+        /**
-+         * Get damaged state by block type
-+         *
-+         * @param blockType Block type
-+         * @return DamageState
-+         * @throws IllegalArgumentException If non anvil block type is given
-+         */
-+        public static @NotNull DamageState getState(@Nullable BlockType<?> blockType) {
-+            if (blockType == null) {
++        @NotNull
++        public static DamageState getState(@Nullable Material material) {
++            if (material == null) {
 +                return BROKEN;
 +            }
 +            for (DamageState state : values()) {
-+                if (state.blockType == blockType) {
++                if (state.material == material) {
 +                    return state;
 +                }
 +            }

patches/api/0131-Add-TNTPrimeEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ac1d40a697fe98cc9151b53f5d63e283d44fbbf9
+index 0000000000000000000000000000000000000000..9d7221583454dc922b20af6c233897c0b2ec47da
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
 @@ -0,0 +1,116 @@
@@ -116,7 +116,7 @@ index 0000000000000000000000000000000000000000..ac1d40a697fe98cc9151b53f5d63e283
 +
 +        /**
 +         * When TNT prime was caused by an {@link Entity} shooting TNT
-+         * using a bow with {@link org.bukkit.enchantments.Enchantment#FLAME} enchantment
++         * using a bow with {@link org.bukkit.enchantments.Enchantment#ARROW_FIRE} enchantment
 +         */
 +        PROJECTILE,
 +

patches/api/0134-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
-index 7213bd2ccf6fa03933a9dff878baee8e92bf50b9..efcba8d9105e65f8770e95a20c9718ad93c6af79 100644
+index eb9d58f8852e732a1284beeaf542989301d21b1c..02e88db63be2d5e31da6b65157ba7b971b1f10f3 100644
 --- a/src/main/java/co/aikar/timings/TimingHistory.java
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
-@@ -121,7 +121,7 @@ public class TimingHistory {
+@@ -120,7 +120,7 @@ public class TimingHistory {
                          data.entityCounts.get(entity.getType()).increment();
                      }
  

patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch

@@ -50,7 +50,7 @@ index 943c3364f6b931fe11f9a6099504590b2da34657..16a604b6315daff228c827fe02b1234c
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 273d111ccacc31daf7c2f5ea33728d9f04ba06e7..df543e106f22d1e151cd2e056f5741cc83a607cf 100644
+index 159307600747c49948c5242d6cf39eed08c902e7..e83de41cbaf0e5a68ce0d5ad2b5ec10877ec4055 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -96,6 +96,41 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -96,10 +96,10 @@ index 273d111ccacc31daf7c2f5ea33728d9f04ba06e7..df543e106f22d1e151cd2e056f5741cc
       * Gets the highest non-empty (impassable) block at the given coordinates.
       *
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index b33c1a227669d01950ceb4162a2910ae05a85a0e..cad80c8aeb55fe9846189c62ff9cfdb5525c7236 100644
+index 9f4d383ea3d6b26d16b8b77ca4c29d2d839ad6dd..78f6cc1a8a8de05aec6f551f8a5f425944f0ffa3 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -155,6 +155,82 @@ public interface Block extends Metadatable, Translatable {
+@@ -156,6 +156,82 @@ public interface Block extends Metadatable, Translatable {
       */
      int getZ();
  

patches/api/0139-Inventory-removeItemAnySlot.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
-index b0098a34cb07958ae815ed6b6957eb8be76e7a85..889615d40eb90ba62d44d7310fad16bdfb13da36 100644
+index 5576a6a8df8c95164bf2dde45d756ce8b7ec957a..f1a48eab1a357ae64545e1f1dc941c383cff8707 100644
 --- a/src/main/java/org/bukkit/inventory/Inventory.java
 +++ b/src/main/java/org/bukkit/inventory/Inventory.java
-@@ -103,7 +103,9 @@ public interface Inventory extends Iterable<ItemStack> {
+@@ -104,7 +104,9 @@ public interface Inventory extends Iterable<ItemStack> {
      public HashMap<Integer, ItemStack> addItem(@NotNull ItemStack... items) throws IllegalArgumentException;
  
      /**
@@ -19,7 +19,7 @@ index b0098a34cb07958ae815ed6b6957eb8be76e7a85..889615d40eb90ba62d44d7310fad16bd
       * <p>
       * It will try to remove 'as much as possible' from the types and amounts
       * you give as arguments.
-@@ -120,10 +122,39 @@ public interface Inventory extends Iterable<ItemStack> {
+@@ -121,10 +123,39 @@ public interface Inventory extends Iterable<ItemStack> {
       * @param items The ItemStacks to remove
       * @return A HashMap containing items that couldn't be removed.
       * @throws IllegalArgumentException if items is null

patches/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add source block constructor and getChangedBlockData() to
 
 
 diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
-index 55cdfd35a91f82b2c5bf51fff3671e45b49b7d0c..0ae137a46fc505d99c827b099d36c35d9fa891b0 100644
+index e3a5f5824ed882058f5bac5003f66ce79733a868..1d496e5a3d1541bf0a257a4358b3943fd6415204 100644
 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
 @@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
@@ -34,7 +34,7 @@ index 55cdfd35a91f82b2c5bf51fff3671e45b49b7d0c..0ae137a46fc505d99c827b099d36c35d
       * @return Changed block's type
       */
 @@ -64,6 +72,19 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
-         return changed.getBlockType();
+         return changed.getMaterial();
      }
  
 +    // Paper start - Getter for the BlockData

patches/api/0143-Add-ray-tracing-methods-to-LivingEntity.patch

@@ -78,12 +78,12 @@ index 0000000000000000000000000000000000000000..c896d172519a8552a132031cb956378d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4cb92615ccd45617a282df59574f9c4fc45f119b..a4e5225e433e83d56ff96055106593a352639034 100644
+index 17e5d2e2acdae23d8ea3b3b1a89f62e8be7b81a8..8cccec99cdb028e86b71b3984f4f94201fd9a390 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -83,6 +83,98 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      @NotNull
-     public Block getTargetBlock(@Nullable Set<BlockType<?>> transparent, int maxDistance);
+     public Block getTargetBlock(@Nullable Set<Material> transparent, int maxDistance);
  
 +    // Paper start
 +    /**

patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index de5ac3b6f9cf001e3c3500f23930a6f9876210de..9649e65d2b0af4f72d648eb33c0de124ba4b5e34 100644
+index 87bc9d5e966d91b2786c89290a5609f94c59dd70..5cabbe3aec83f76cefe34fd3e34be467fe5e59c8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2691,6 +2691,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2852,6 +2852,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);

patches/api/0146-Add-Git-information-to-version-command-on-startup.patch

@@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 48f3a48268f714eeba3cfcd8e665265fc144f39e..5a7e8b3d073c2ea44909477c38bc2ab454c6a502 100644
+index 67c92e10b38af2ac45c1d9b6374695247bf1e7c3..627c04f5e71ad032760296092a65596b08807a55 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -56,6 +56,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -87,15 +87,15 @@ index 48f3a48268f714eeba3cfcd8e665265fc144f39e..5a7e8b3d073c2ea44909477c38bc2ab4
  
      /**
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index b50f614806f4634960d383e8a33f094c2f46935f..e40f017f87d6b6b4770501b106c76dc69ec69abb 100644
+index b437cf212a63aa96a9492db8d01d5d37061aee23..fd5d9881abfd930bb883120f018f76dc78b62b14 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -240,7 +240,7 @@ public class VersionCommand extends BukkitCommand {
-     private void setVersionMessage(final @NotNull net.kyori.adventure.text.Component msg) {
+@@ -256,7 +256,7 @@ public class VersionCommand extends BukkitCommand {
+     private void setVersionMessage(final @NotNull Component msg) {
          lastCheck = System.currentTimeMillis();
-         final net.kyori.adventure.text.Component message = net.kyori.adventure.text.TextComponent.ofChildren(
--            net.kyori.adventure.text.Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", net.kyori.adventure.text.format.NamedTextColor.WHITE),
-+            net.kyori.adventure.text.Component.text(Bukkit.getVersionMessage(), net.kyori.adventure.text.format.NamedTextColor.WHITE),
-             net.kyori.adventure.text.Component.newline(),
+         final Component message = Component.textOfChildren(
+-            Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", NamedTextColor.WHITE),
++            Component.text(Bukkit.getVersionMessage(), NamedTextColor.WHITE),
+             Component.newline(),
              msg
          );

patches/api/0152-Material-API-additions.patch

@@ -5,19 +5,26 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 9941023b98f3822c7b12697ae7326708abf19ead..09669d5757f4fa58835e339deb8d38afa5662997 100644
+index f52c0e25e75e890046339d605c0abf79d82864f2..64d01ce77966e895ec494719a4398577be1097a1 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4439,6 +4439,23 @@ public enum Material implements Keyed, Translatable {
+@@ -118,6 +118,7 @@ import org.jetbrains.annotations.Nullable;
+ /**
+  * An enum of all material IDs accepted by the official server and client
+  */
++@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
+ public enum Material implements Keyed, Translatable {
+     //<editor-fold desc="Materials" defaultstate="collapsed">
+     AIR(9648, 0),
+@@ -4435,6 +4436,22 @@ public enum Material implements Keyed, Translatable {
          }
      }
  
 +    // Paper start
++
 +    /**
 +     * @return If the type is either AIR, CAVE_AIR or VOID_AIR
-+     * @deprecated Check if the {@link ItemType} is {@link ItemType#AIR} or {@link BlockType#isAir()}
 +     */
-+    @Deprecated
 +    public boolean isEmpty() {
 +        switch (this) {
 +            case AIR:

patches/api/0153-Add-Material-Tags.patch

@@ -11,10 +11,10 @@ Co-authored by: Lena Kolb <lenakolb2204@gmail.com>
 
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..8f5530188e340336dfffb3054c1743b068bc9342
+index 0000000000000000000000000000000000000000..a02a02aa0c87e0f0ed9e509e4dcab01565b3d92a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,97 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + */
@@ -23,13 +23,10 @@ index 0000000000000000000000000000000000000000..8f5530188e340336dfffb3054c1743b0
 +
 +import com.google.common.collect.Lists;
 +import io.papermc.paper.tag.BaseTag;
-+import org.bukkit.Bukkit;
 +import org.bukkit.Material;
 +import org.bukkit.NamespacedKey;
-+import org.bukkit.Tag;
 +import org.bukkit.block.Block;
 +import org.bukkit.block.BlockState;
-+import org.bukkit.block.BlockType;
 +import org.bukkit.block.data.BlockData;
 +import org.bukkit.inventory.ItemStack;
 +
@@ -38,11 +35,9 @@ index 0000000000000000000000000000000000000000..8f5530188e340336dfffb3054c1743b0
 +import java.util.function.Predicate;
 +import java.util.stream.Collectors;
 +import java.util.stream.Stream;
-+import org.bukkit.inventory.ItemType;
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
-+@Deprecated
 +public class MaterialSetTag extends BaseTag<Material, MaterialSetTag> {
 +
 +    /**
@@ -97,17 +92,8 @@ index 0000000000000000000000000000000000000000..8f5530188e340336dfffb3054c1743b0
 +        return value.name();
 +    }
 +
-+    public MaterialSetTag addTags(@NotNull Tag<BlockType>...tags) {
-+        for (Tag<BlockType> tag : tags) {
-+            for (final BlockType<?> value : tag.getValues()) {
-+                this.add(Bukkit.getUnsafe().blockTypeToMaterial(value));
-+            }
-+        }
-+        return this;
-+    }
-+
 +    public boolean isTagged(@NotNull BlockData block) {
-+        return isTagged(block.getBlockType());
++        return isTagged(block.getMaterial());
 +    }
 +
 +    public boolean isTagged(@NotNull BlockState block) {
@@ -122,24 +108,16 @@ index 0000000000000000000000000000000000000000..8f5530188e340336dfffb3054c1743b0
 +        return isTagged(item.getType());
 +    }
 +
-+    public boolean isTagged(@NotNull ItemType itemType) {
-+        return this.isTagged(Bukkit.getUnsafe().toMaterial(itemType));
-+    }
-+
-+    public boolean isTagged(@NotNull BlockType<?> itemType) {
-+        return this.isTagged(Bukkit.getUnsafe().blockTypeToMaterial(itemType));
-+    }
-+
 +    public boolean isTagged(@NotNull Material material) {
 +        return this.tagged.contains(material);
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..296fbcb6768d7b21720431e32e39b2702da08324
+index 0000000000000000000000000000000000000000..0b92f3279fe5dcbea77b22803447b7ad21ef999f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-@@ -0,0 +1,705 @@
+@@ -0,0 +1,704 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + *
@@ -177,7 +155,6 @@ index 0000000000000000000000000000000000000000..296fbcb6768d7b21720431e32e39b270
 + * {@link UnsupportedOperationException}.
 + */
 +@SuppressWarnings({"NonFinalUtilityClass", "unused", "WeakerAccess"})
-+@Deprecated
 +public class MaterialTags {
 +
 +    private static NamespacedKey keyFor(String key) {
@@ -675,7 +652,7 @@ index 0000000000000000000000000000000000000000..296fbcb6768d7b21720431e32e39b270
 +     */
 +    @SuppressWarnings("unchecked")
 +    public static final MaterialSetTag COLORABLE = new MaterialSetTag(keyFor("colorable"))
-+        .addTags(Tag.WOOL, Tag.CARPETS).add(SHULKER_BOXES, STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES, BEDS).lock();
++        .add(Tag.WOOL, Tag.CARPETS).add(SHULKER_BOXES, STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES, BEDS).lock();
 +    //.ensureSize("COLORABLE", 81).lock(); unit test don't have the vanilla item tags, so counts don't line up for real
 +
 +    /**
@@ -1034,10 +1011,10 @@ index 0000000000000000000000000000000000000000..794787912325ae32b3cfc8217bc3fc21
 +}
 diff --git a/src/main/java/io/papermc/paper/tag/EntitySetTag.java b/src/main/java/io/papermc/paper/tag/EntitySetTag.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d120fb50bf1f36c3f991d7170b5423af1db4021c
+index 0000000000000000000000000000000000000000..c89c4619aaf388197834d98eb95af2f1e93db871
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/tag/EntitySetTag.java
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,42 @@
 +package io.papermc.paper.tag;
 +
 +import org.bukkit.NamespacedKey;
@@ -1050,7 +1027,6 @@ index 0000000000000000000000000000000000000000..d120fb50bf1f36c3f991d7170b5423af
 +import java.util.stream.Collectors;
 +import java.util.stream.Stream;
 +
-+@Deprecated
 +public class EntitySetTag extends BaseTag<EntityType, EntitySetTag> {
 +
 +    public EntitySetTag(@NotNull NamespacedKey key, @NotNull Predicate<EntityType> filter) {
@@ -1083,10 +1059,10 @@ index 0000000000000000000000000000000000000000..d120fb50bf1f36c3f991d7170b5423af
 +}
 diff --git a/src/main/java/io/papermc/paper/tag/EntityTags.java b/src/main/java/io/papermc/paper/tag/EntityTags.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..eafae2a211c58719ef008a5d4018541249dcf4b7
+index 0000000000000000000000000000000000000000..d7eb49a05c3f0cacf285f8995433c5d5e988de0f
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/tag/EntityTags.java
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,54 @@
 +package io.papermc.paper.tag;
 +
 +import org.bukkit.NamespacedKey;
@@ -1097,7 +1073,6 @@ index 0000000000000000000000000000000000000000..eafae2a211c58719ef008a5d40185412
 + * All tags in this class are unmodifiable, attempting to modify them will throw an
 + * {@link UnsupportedOperationException}.
 + */
-+@Deprecated
 +public class EntityTags {
 +
 +    private static NamespacedKey keyFor(String key) {
@@ -1143,10 +1118,10 @@ index 0000000000000000000000000000000000000000..eafae2a211c58719ef008a5d40185412
 +        .ensureSize("WATER_BASED", 11).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index b7871206d4d8c3cd869d9f2f15b7a1184722c2f9..bbf7dd8ca90ba1c3626e87ca221201568163101f 100644
+index 1504dca4ec3e8d21189b7534bb009521799ffdf7..82d34e9aae42dfafd900dc0e610bf1dc82a5a6f3 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -13,6 +13,10 @@ import org.jetbrains.annotations.NotNull;
+@@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
   * Note that whilst all tags defined within this interface must be present in
   * implementations, their existence is not guaranteed across future versions.
   *
@@ -1159,10 +1134,10 @@ index b7871206d4d8c3cd869d9f2f15b7a1184722c2f9..bbf7dd8ca90ba1c3626e87ca22120156
  public interface Tag<T extends Keyed> extends Keyed {
 diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..556e347fd10fd8f8358d8aaee1bcd374b9d19823
+index 0000000000000000000000000000000000000000..e541f29e983d8dcaca91de9ee1459d587226b4c3
 --- /dev/null
 +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,65 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + */
@@ -1171,9 +1146,9 @@ index 0000000000000000000000000000000000000000..556e347fd10fd8f8358d8aaee1bcd374
 +
 +import io.papermc.paper.tag.BaseTag;
 +import io.papermc.paper.tag.EntityTags;
++import io.papermc.paper.testing.TestServer;
 +import org.bukkit.Bukkit;
-+import org.bukkit.support.AbstractTestingBase;
-+import org.junit.Ignore;
++import org.junit.Before;
 +import org.junit.Test;
 +
 +import java.lang.reflect.Field;
@@ -1184,10 +1159,14 @@ index 0000000000000000000000000000000000000000..556e347fd10fd8f8358d8aaee1bcd374
 +
 +import static org.junit.Assert.assertTrue;
 +
-+public class MaterialTagsTest extends AbstractTestingBase {
++public class MaterialTagsTest {
++
++    @Before
++    public void before() {
++        TestServer.setup();
++    }
 +
 +    @Test
-+    @Ignore
 +    public void testInitialize() {
 +        try {
 +            MaterialTags.SHULKER_BOXES.getValues();
@@ -1199,7 +1178,6 @@ index 0000000000000000000000000000000000000000..556e347fd10fd8f8358d8aaee1bcd374
 +    }
 +
 +    @Test
-+    @Ignore
 +    public void testLocked() {
 +        testLocked(MaterialTags.class);
 +        testLocked(EntityTags.class);
@@ -1227,25 +1205,24 @@ index 0000000000000000000000000000000000000000..556e347fd10fd8f8358d8aaee1bcd374
 +}
 diff --git a/src/test/java/io/papermc/paper/EntityTagsTest.java b/src/test/java/io/papermc/paper/EntityTagsTest.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d92e2bf0d8c2d3c861dbf14d31b9bf13c53beec2
+index 0000000000000000000000000000000000000000..3caf03d8e50cd2180e9aac2dddeaa3afd0bf7438
 --- /dev/null
 +++ b/src/test/java/io/papermc/paper/EntityTagsTest.java
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,22 @@
 +package io.papermc.paper;
 +
 +import io.papermc.paper.tag.EntityTags;
++import io.papermc.paper.testing.TestServer;
 +import java.util.logging.Level;
 +import org.bukkit.Bukkit;
-+import org.bukkit.support.AbstractTestingBase;
-+import org.junit.Ignore;
 +import org.junit.Test;
 +
-+public class EntityTagsTest extends AbstractTestingBase {
++public class EntityTagsTest {
 +
 +    @Test
-+    @Ignore
 +    public void testInitialize() {
 +        try {
++            TestServer.setup();
 +            EntityTags.HORSES.getValues();
 +            assert true;
 +        } catch (Throwable e) {

patches/api/0154-PreSpawnerSpawnEvent.patch

@@ -12,7 +12,7 @@ Dropped as it does not apply due to the earlier PreCreatureSpawnEvent patch not
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..765440cedcddc4a7b7312a930fef857efd7ad661
+index 0000000000000000000000000000000000000000..48cff063594840a07aeaf35513780e28ea019a76
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
 @@ -0,0 +1,29 @@
@@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..765440cedcddc4a7b7312a930fef857e
 +public class PreSpawnerSpawnEvent extends PreCreatureSpawnEvent {
 +    @NotNull private final Location spawnerLocation;
 +
-+    public PreSpawnerSpawnEvent(@NotNull Location location, @NotNull EntityType<?> type, @NotNull Location spawnerLocation) {
++    public PreSpawnerSpawnEvent(@NotNull Location location, @NotNull EntityType type, @NotNull Location spawnerLocation) {
 +        super(location, type, CreatureSpawnEvent.SpawnReason.SPAWNER);
 +        this.spawnerLocation = Preconditions.checkNotNull(spawnerLocation, "Spawner location may not be null");
 +    }

patches/api/0160-Make-the-default-permission-message-configurable.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5a7e8b3d073c2ea44909477c38bc2ab454c6a502..89f29c76f891d95100b6253b0b66b235ef6a6aea 100644
+index 627c04f5e71ad032760296092a65596b08807a55..213b76f4ba50e882b6c7349d980701e0b6323e7c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2245,6 +2245,28 @@ public final class Bukkit {
+@@ -2268,6 +2268,28 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -38,10 +38,10 @@ index 5a7e8b3d073c2ea44909477c38bc2ab454c6a502..89f29c76f891d95100b6253b0b66b235
       * Creates a PlayerProfile for the specified uuid, with name as null.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index cb3415c9b103f60ce0d7942fb1ad4c8cd39d02d4..e81abc039bf036f71def4dc78f8eb97c0c92ed9d 100644
+index 88b93ac279f2bd23ca853788c409549fe2afe041..281c1e511e46a31a1c3ee9380d60888628af87c3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1955,6 +1955,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1974,6 +1974,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  

patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch

@@ -18,10 +18,10 @@ index 1d061412cdafa28c6940c7433747ab1dabe23de1..6fda7f3aa68e76af64362e9afed70fc6
  
      @Override
 diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
-index f89315e9de3aed4209be0df7e4de6daadc5fbe2a..aaa2ed5aef8c0d5596fc76aafa2d5383973caeb0 100644
+index dce3d619a6f1791197e44277c2dee9eaf19ff56f..7e2335ed8acc692af1e70eddcf97ee7a56e30f68 100644
 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
 +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
-@@ -26,8 +26,8 @@ public class StandardMessengerTest extends AbstractTestingBase {
+@@ -25,8 +25,8 @@ public class StandardMessengerTest {
          assertTrue(messenger.isReservedChannel("minecraft:register"));
          assertFalse(messenger.isReservedChannel("test:register"));
          assertTrue(messenger.isReservedChannel("minecraft:unregister"));

patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -16,10 +16,10 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index af2973b1f6d4ac73b2ddee33c6a0869b5ec06b54..6a3479599050d268f7a4b8dc5aea813bf4ba02d6 100644
+index 8f2f3e0ac5266f571b62a754921422bb07d61984..774f9ec6a57d5d16a74ebe998e9ad800b1828029 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -167,7 +167,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -211,7 +211,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * UTC.
       *
       * @return Date of last log-in for this player, or 0
@@ -29,7 +29,7 @@ index af2973b1f6d4ac73b2ddee33c6a0869b5ec06b54..6a3479599050d268f7a4b8dc5aea813b
      public long getLastPlayed();
  
      /**
-@@ -185,6 +187,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -229,6 +231,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       */
      @Nullable
      public Location getBedSpawnLocation();

patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch

@@ -9,7 +9,7 @@ Redirects some of upstream's APIs to these new methods to avoid
 usage of magic values and the deprecated RecipeChoice#getItemStack
 
 diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-index 22dd838deda4761e24af017f6e9a417ef60094e8..37648928292be6a75a14ef3a0d3af2cd41e61c6c 100644
+index 90208bc96085f05a3b657b9467b1670d00b03104..523818cbb0d6c90481ec97123e7fe0e2ff4eea14 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
 @@ -146,8 +146,6 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
@@ -22,17 +22,17 @@ index 22dd838deda4761e24af017f6e9a417ef60094e8..37648928292be6a75a14ef3a0d3af2cd
      public static class ExactChoice implements RecipeChoice {
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 06b7f273ae66b2c936523c95fd4f802bd39ae324..4869adf9b89f1458af5517ae5813d44630846de8 100644
+index 71e494177473c62449aafda1699b26a0c4c81a68..97d5d9c6347bc401e3f4ab7c0ba1391ad5b0449a 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -155,6 +155,13 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -168,6 +168,13 @@ public class ShapedRecipe extends CraftingRecipe {
          return this;
      }
  
 +    // Paper start
 +    @NotNull
 +    public ShapedRecipe setIngredient(char key, @NotNull ItemStack item) {
-+        return this.setIngredient(key, new RecipeChoice.ExactChoice(item));
++        return setIngredient(key, new RecipeChoice.ExactChoice(item));
 +    }
 +    // Paper end
 +
@@ -40,36 +40,36 @@ index 06b7f273ae66b2c936523c95fd4f802bd39ae324..4869adf9b89f1458af5517ae5813d446
       * Get a copy of the ingredients map.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index ebc2c713d8a4ceec86b7dd270c5ca18c78103bcc..1ff7f7327c3462f54b8b2d1100c608f30ecabe31 100644
+index d6e38c7ccfe3b6e85eafb611da20b1a29fb74d97..b8ac602cd2718d615ec243ce648951a1a46c26ec 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -106,6 +106,40 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -131,6 +131,40 @@ public class ShapelessRecipe extends CraftingRecipe {
          return this;
      }
  
 +    // Paper start
 +    @NotNull
 +    public ShapelessRecipe addIngredient(@NotNull ItemStack item) {
-+        return this.addIngredient(item.getAmount(), item);
++        return addIngredient(item.getAmount(), item);
 +    }
 +
 +    @NotNull
 +    public ShapelessRecipe addIngredient(int count, @NotNull ItemStack item) {
-+        Preconditions.checkArgument(this.ingredients.size() + count <= 9, "Shapeless recipes cannot have more than 9 ingredients");
++        Preconditions.checkArgument(ingredients.size() + count <= 9, "Shapeless recipes cannot have more than 9 ingredients");
 +        while (count-- > 0) {
-+            this.ingredients.add(new RecipeChoice.ExactChoice(item));
++            ingredients.add(new RecipeChoice.ExactChoice(item));
 +        }
 +        return this;
 +    }
 +
 +    @NotNull
 +    public ShapelessRecipe removeIngredient(@NotNull ItemStack item) {
-+        return this.removeIngredient(1, item);
++        return removeIngredient(1, item);
 +    }
 +
 +    @NotNull
 +    public ShapelessRecipe removeIngredient(int count, @NotNull ItemStack item) {
-+        Iterator<RecipeChoice> iterator = this.ingredients.iterator();
++        Iterator<RecipeChoice> iterator = ingredients.iterator();
 +        while (count > 0 && iterator.hasNext()) {
 +            RecipeChoice choice = iterator.next();
 +            if (choice.test(item)) {
@@ -84,3 +84,21 @@ index ebc2c713d8a4ceec86b7dd270c5ca18c78103bcc..1ff7f7327c3462f54b8b2d1100c608f3
      /**
       * Removes an ingredient from the list.
       *
+@@ -154,7 +188,7 @@ public class ShapelessRecipe extends CraftingRecipe {
+      */
+     @NotNull
+     public ShapelessRecipe removeIngredient(@NotNull Material ingredient) {
+-        return removeIngredient(ingredient, 0);
++        return removeIngredient(new ItemStack(ingredient)); // Paper - avoid using deprecated methods (magic values; RecipeChoice#getItemStack)
+     }
+ 
+     /**
+@@ -181,7 +215,7 @@ public class ShapelessRecipe extends CraftingRecipe {
+      */
+     @NotNull
+     public ShapelessRecipe removeIngredient(int count, @NotNull Material ingredient) {
+-        return removeIngredient(count, ingredient, 0);
++        return removeIngredient(count, new ItemStack(ingredient)); // Paper - avoid using deprecated methods (magic values; RecipeChoice#getItemStack)
+     }
+ 
+     /**

patches/api/0172-Fix-Spigot-annotation-mistakes.patch

@@ -9,7 +9,7 @@ a ton of noise to plugin developers.
 These do not help plugin developers if they bring moise noise than value.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 89f29c76f891d95100b6253b0b66b235ef6a6aea..d22fde8aa7d9dc2d3e717716b4604ad8604daa61 100644
+index 3ad64a11c1e67cce5e49c34d389888060bf2a962..cb0ad65e4e30c3604d655bb75c7b26a7bf4227d7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -837,9 +837,8 @@ public final class Bukkit {
@@ -35,7 +35,7 @@ index 89f29c76f891d95100b6253b0b66b235ef6a6aea..d22fde8aa7d9dc2d3e717716b4604ad8
      @NotNull
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
-@@ -1799,7 +1796,7 @@ public final class Bukkit {
+@@ -1825,7 +1822,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -59,7 +59,7 @@ index f9c9ae463aacd593e3aa9caf037ea1e23d56c780..f8ae143acbf586d5279b44f7311ca97f
  
      /**
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 20978b269a7757a561d6b872cc77898b44bbd272..2b9a117804a8ca54b47e51e23359bd6e01087641 100644
+index 8508aa2c6fb7c9f41f3d185f5228c86dd3b8b627..f7564581c18425c903e54f949728dd3742ca7bf2 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
@@ -90,10 +90,10 @@ index 20978b269a7757a561d6b872cc77898b44bbd272..2b9a117804a8ca54b47e51e23359bd6e
          if (this.world == null) {
              return null;
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 09669d5757f4fa58835e339deb8d38afa5662997..e022c70ba53d623053f1c826d57e47fb102dfce0 100644
+index 64d01ce77966e895ec494719a4398577be1097a1..7705fece7f58bd66f7d68da85f8f34e43b4bae12 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4469,11 +4469,11 @@ public enum Material implements Keyed, Translatable {
+@@ -4465,11 +4465,11 @@ public enum Material implements Keyed, Translatable {
      }
  
      /**
@@ -107,7 +107,7 @@ index 09669d5757f4fa58835e339deb8d38afa5662997..e022c70ba53d623053f1c826d57e47fb
      public boolean isLegacy() {
          return legacy;
      }
-@@ -4544,8 +4544,10 @@ public enum Material implements Keyed, Translatable {
+@@ -4540,8 +4540,10 @@ public enum Material implements Keyed, Translatable {
       * Gets the MaterialData class associated with this Material
       *
       * @return MaterialData associated with this Material
@@ -156,27 +156,27 @@ index f43209cf7b752c26718c303ca8c3e1c7d9912ad3..f0094e6fb05e526736629ad3181c8d2c
  
      /**
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index d98145f9b13ef5fc6650ce5f39ae648ab0a3c637..e84b3e488003bff973b77cec08f7429fce6364fa 100644
+index 6e5e5fecdd7b76dde2e1524fe7b5faa837f491fb..09e3c2872462da546b891cbc396aaffb77f6aadf 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -194,14 +194,14 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -157,14 +157,14 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
       *
       * @see TrimMaterial
       */
 -    @ApiStatus.Experimental
-+    // @ApiStatus.Experimental // Paper
-     Registry<TrimMaterial> TRIM_MATERIAL = Objects.requireNonNull(Bukkit.getRegistry(TrimMaterial.class), "No registry present for TrimMaterial. This is a bug.");
++    //@ApiStatus.Experimental // Paper
+     Registry<TrimMaterial> TRIM_MATERIAL = Bukkit.getRegistry(TrimMaterial.class);
      /**
       * Trim patterns.
       *
       * @see TrimPattern
       */
 -    @ApiStatus.Experimental
-+    // @ApiStatus.Experimental // Paper
-     Registry<TrimPattern> TRIM_PATTERN = Objects.requireNonNull(Bukkit.getRegistry(TrimPattern.class), "No registry present for TrimPattern. This is a bug.");
++    //@ApiStatus.Experimental // Paper
+     Registry<TrimPattern> TRIM_PATTERN = Bukkit.getRegistry(TrimPattern.class);
      /**
       * Villager profession.
-@@ -276,8 +276,11 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -246,8 +246,11 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
       *
       * @param input non-null input
       * @return registered object or null if does not exist
@@ -203,7 +203,7 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..10f5cfb1885833a1d2c1027c03974da4
      CRACKED(0x0),
      GLYPHED(0x1),
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e81abc039bf036f71def4dc78f8eb97c0c92ed9d..883d2320914d0687dcee08f078cb20fd857cf971 100644
+index 3c09a5e08c2641502b7171f27d28d92d02ed39d0..49877944a385b22e5de66b4e33056ee3f592fcd7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -703,9 +703,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -229,7 +229,7 @@ index e81abc039bf036f71def4dc78f8eb97c0c92ed9d..883d2320914d0687dcee08f078cb20fd
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
-@@ -1515,7 +1512,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1537,7 +1534,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -282,7 +282,7 @@ index e455eb21abf121dc6ff10ff8a13dd06f67096a8f..bbc01e7c192ae6689c301670047ff114
          return origin;
      }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index af7aed8dd06be375c1f5b1fdb852d7a56bfdf5c6..c1de320da510cd580a1e398fff0f764a844c3ec6 100644
+index c6019065869130608ac97af951c7036031eec242..31fc272b0e82e4eef6d9bf01dd25d39513d354b3 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -415,9 +415,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -308,10 +308,10 @@ index af7aed8dd06be375c1f5b1fdb852d7a56bfdf5c6..c1de320da510cd580a1e398fff0f764a
  
      /**
 diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index 0c0b3616961813b54b0eb1cb29b615f8d4cd931b..635a97fb50c485f7ef2e3bdcbb6f185a4ad551bc 100644
+index 631cbf2be51040eee00aa39a39c5ec4003f91843..3147e278eac674ed21d714bbe318b135c0a6b408 100644
 --- a/src/main/java/org/bukkit/block/BlockState.java
 +++ b/src/main/java/org/bukkit/block/BlockState.java
-@@ -34,8 +34,10 @@ public interface BlockState extends Metadatable {
+@@ -35,8 +35,10 @@ public interface BlockState extends Metadatable {
       * Gets the metadata for this block state.
       *
       * @return block specific metadata
@@ -322,7 +322,7 @@ index 0c0b3616961813b54b0eb1cb29b615f8d4cd931b..635a97fb50c485f7ef2e3bdcbb6f185a
      MaterialData getData();
  
      /**
-@@ -130,7 +132,9 @@ public interface BlockState extends Metadatable {
+@@ -131,7 +133,9 @@ public interface BlockState extends Metadatable {
       * Sets the metadata for this block state.
       *
       * @param data New block specific metadata
@@ -344,19 +344,6 @@ index 4bd127b3646307398e0c937c3e36ab671235b72b..f2557a87f468ee20c2d276dbfc0e9a97
 +    @org.jetbrains.annotations.NotNull // Paper
      public ItemStack getItem();
  
-     /**
-diff --git a/src/main/java/org/bukkit/block/DecoratedPot.java b/src/main/java/org/bukkit/block/DecoratedPot.java
-index df2596a7d33010e35f5898089e94e7afc1bd0553..dff7cc6a5450d806e65d45c34413542be4b22d66 100644
---- a/src/main/java/org/bukkit/block/DecoratedPot.java
-+++ b/src/main/java/org/bukkit/block/DecoratedPot.java
-@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
- /**
-  * Represents a captured state of a decorated pot.
-  */
--@ApiStatus.Experimental
-+//@ApiStatus.Experimental // Paper
- public interface DecoratedPot extends TileState {
- 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
 index 605af1a9fc48602643aec57dd14e8c4ab657a0bc..b3085c7ff8b3e96083d209f6612c006578773c24 100644
@@ -397,10 +384,10 @@ index f124b35ec76e6cb6a1a0dc464005087043c3efd0..f50aaddf8582be55fd4860ad374d8f22
 +@Deprecated(forRemoval = true) // Paper
  public interface LingeringPotion extends ThrownPotion { }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 65850ba1f60be988b1cdd19cc993ab9bf05717b4..2cc1d9e830dec1e0de8018e8dcadcdf0f0f0a658 100644
+index 79fdb183887cb8153254f6ac84a981a7ffcb561c..373b3ad6b3f94655289155914aec8294cd4f2fb2 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -640,7 +640,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -664,7 +664,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * This may have unexpected results if the entity is not in water.
       *
       * @param swimming True if the entity is swimming.
@@ -411,7 +398,7 @@ index 65850ba1f60be988b1cdd19cc993ab9bf05717b4..2cc1d9e830dec1e0de8018e8dcadcdf0
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java
-index b7eb96a64a91175cf21e5e6bc53fbe6f045a16fe..177e12108f6108e4858910cef95f72110762b041 100644
+index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621bacf864075 100644
 --- a/src/main/java/org/bukkit/entity/Minecart.java
 +++ b/src/main/java/org/bukkit/entity/Minecart.java
 @@ -101,7 +101,9 @@ public interface Minecart extends Vehicle {
@@ -564,7 +551,7 @@ index 6bafc62e2235a6b783cbf96f4dabeeaf02bd5178..50c762d777ac90a05772501a28cacff8
          cancelledCollision = cancel;
      }
 diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-index 82d8fe3be9ff6914b44872462c3827123459735d..633e79e076044f2bc463bd0b7029e310b7629163 100644
+index c0b749a5bbf4980d01fed74768bb61909b579cb9..7e7a53b41013f1bf8956c0e278820f18d77b2f0d 100644
 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
 +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
 @@ -656,7 +656,9 @@ public abstract class ChunkGenerator {
@@ -599,13 +586,13 @@ index 82d8fe3be9ff6914b44872462c3827123459735d..633e79e076044f2bc463bd0b7029e310
  
          /**
 diff --git a/src/main/java/org/bukkit/inventory/CookingRecipe.java b/src/main/java/org/bukkit/inventory/CookingRecipe.java
-index 6023e324784c200afa112415e117b63f86540e56..e17a5a0c56e76cba42b73d3143521b18539abd8c 100644
+index 571652ba8843a9493f1843523e24145baa958637..f7fa79393aef40027446b78bac8e9490cfafd8bc 100644
 --- a/src/main/java/org/bukkit/inventory/CookingRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/CookingRecipe.java
-@@ -73,7 +73,9 @@ public abstract class CookingRecipe<T extends CookingRecipe> implements Recipe,
-      * Get the input item type.
+@@ -68,7 +68,9 @@ public abstract class CookingRecipe<T extends CookingRecipe> implements Recipe,
+      * Get the input material.
       *
-      * @return The input item type.
+      * @return The input material.
 +     * @deprecated Use {@link #getInputChoice()} instead for more complete data.
       */
 +    @Deprecated // Paper
@@ -648,7 +635,7 @@ index c69904f3ee7f3a41d6cebcd401abf8385dfbf868..62c1c3f01fd58db39f635eee415fcbc1
      Entity getHolder();
  }
 diff --git a/src/main/java/org/bukkit/inventory/FurnaceRecipe.java b/src/main/java/org/bukkit/inventory/FurnaceRecipe.java
-index b95b86611eea2fa9ed918d2a5a9c43103d061705..7f50c4bf3a289805e802824be3fdd1fb7f2fac8a 100644
+index 1d442dc16cbb0fed21714d47007f3f11e30c57d4..af8f7b88edf0fa790edcf16356a030c4834f531e 100644
 --- a/src/main/java/org/bukkit/inventory/FurnaceRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/FurnaceRecipe.java
 @@ -67,8 +67,10 @@ public class FurnaceRecipe extends CookingRecipe<FurnaceRecipe> {
@@ -660,13 +647,13 @@ index b95b86611eea2fa9ed918d2a5a9c43103d061705..7f50c4bf3a289805e802824be3fdd1fb
      @NotNull
 +    @Deprecated
      public FurnaceRecipe setInput(@NotNull MaterialData input) {
-         return setInput(input.getItemType().asItemType());
+         return setInput(input.getItemType(), input.getData());
      }
 diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
-index 889615d40eb90ba62d44d7310fad16bdfb13da36..3bec3e920178bf2f3d2158f98d026f69339ee71c 100644
+index f1a48eab1a357ae64545e1f1dc941c383cff8707..466d1bd7089b76f48f953e1a51c611ecd93dcd54 100644
 --- a/src/main/java/org/bukkit/inventory/Inventory.java
 +++ b/src/main/java/org/bukkit/inventory/Inventory.java
-@@ -160,8 +160,7 @@ public interface Inventory extends Iterable<ItemStack> {
+@@ -161,8 +161,7 @@ public interface Inventory extends Iterable<ItemStack> {
       *
       * @return An array of ItemStacks from the inventory. Individual items may be null.
       */
@@ -676,7 +663,7 @@ index 889615d40eb90ba62d44d7310fad16bdfb13da36..3bec3e920178bf2f3d2158f98d026f69
  
      /**
       * Completely replaces the inventory's contents. Removes all existing
-@@ -172,7 +171,7 @@ public interface Inventory extends Iterable<ItemStack> {
+@@ -173,7 +172,7 @@ public interface Inventory extends Iterable<ItemStack> {
       * @throws IllegalArgumentException If the array has more items than the
       *     inventory.
       */
@@ -685,7 +672,7 @@ index 889615d40eb90ba62d44d7310fad16bdfb13da36..3bec3e920178bf2f3d2158f98d026f69
  
      /**
       * Return the contents from the section of the inventory where items can
-@@ -185,8 +184,7 @@ public interface Inventory extends Iterable<ItemStack> {
+@@ -186,8 +185,7 @@ public interface Inventory extends Iterable<ItemStack> {
       *
       * @return inventory storage contents. Individual items may be null.
       */
@@ -695,7 +682,7 @@ index 889615d40eb90ba62d44d7310fad16bdfb13da36..3bec3e920178bf2f3d2158f98d026f69
  
      /**
       * Put the given ItemStacks into the storage slots
-@@ -195,7 +193,7 @@ public interface Inventory extends Iterable<ItemStack> {
+@@ -196,7 +194,7 @@ public interface Inventory extends Iterable<ItemStack> {
       * @throws IllegalArgumentException If the array has more items than the
       * inventory.
       */
@@ -705,20 +692,20 @@ index 889615d40eb90ba62d44d7310fad16bdfb13da36..3bec3e920178bf2f3d2158f98d026f69
      /**
       * Checks if the inventory contains any ItemStacks with the given
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index c8e1377f804c50d41ad29c6c67dea58526d28125..bda53b9db7112e82f581af09262d59da8d7769fa 100644
+index 74cd662d0594f2fbc5aa30ba64d9e4928145dbb9..856751439b6599943d85203a59efd691ddbd89e9 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -25,7 +25,7 @@ public interface ItemFactory {
+@@ -27,7 +27,7 @@ public interface ItemFactory {
       * @return a new ItemMeta that could be applied to an item stack of the
-      *     specified item type
+      *     specified material
       */
 -    @Nullable
-+    @org.bukkit.UndefinedNullability("null for air") // Paper
-     ItemMeta getItemMeta(@NotNull final ItemType itemType);
++    @org.bukkit.UndefinedNullability // Paper
+     ItemMeta getItemMeta(@NotNull final Material material);
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 8187b1b801c7a6fd71696bfe21de177705b0e3a2..f71f939ba5f02827999124c5e8dc589247f2c433 100644
+index 83a0631a80db156ace1d977df71d5fc653b70bb6..60a25898fb17c467ffae05039fcd4d3b154a99ff 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -8,6 +8,7 @@ import java.util.Map;
@@ -729,18 +716,26 @@ index 8187b1b801c7a6fd71696bfe21de177705b0e3a2..f71f939ba5f02827999124c5e8dc5892
  import org.bukkit.Utility;
  import org.bukkit.configuration.serialization.ConfigurationSerializable;
  import org.bukkit.enchantments.Enchantment;
-@@ -214,8 +215,10 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -68,6 +69,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+      * @param damage durability / damage
+      * @deprecated see {@link #setDurability(short)}
+      */
++    @Deprecated // Paper
+     public ItemStack(@NotNull final Material type, final int amount, final short damage) {
+         this(type, amount, damage, null);
+     }
+@@ -169,8 +171,10 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       * Gets the MaterialData for this stack of items
       *
       * @return MaterialData for this item
-+     * @deprecated cast to {@link org.bukkit.inventory.meta.BlockDataMeta} and use {@link org.bukkit.inventory.meta.BlockDataMeta#getBlockData(org.bukkit.block.BlockType)}
++     * @deprecated cast to {@link org.bukkit.inventory.meta.BlockDataMeta} and use {@link org.bukkit.inventory.meta.BlockDataMeta#getBlockData(Material)}
       */
      @Nullable
 +    @Deprecated // Paper
      public MaterialData getData() {
-         Material mat = Bukkit.getUnsafe().toLegacy(Bukkit.getUnsafe().toMaterial(getType()));
+         Material mat = Bukkit.getUnsafe().toLegacy(getType());
          if (data == null && mat != null && mat.getData() != null) {
-@@ -229,7 +232,9 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -184,7 +188,9 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       * Sets the MaterialData for this stack of items
       *
       * @param data New MaterialData for this item
@@ -750,12 +745,12 @@ index 8187b1b801c7a6fd71696bfe21de177705b0e3a2..f71f939ba5f02827999124c5e8dc5892
      public void setData(@Nullable MaterialData data) {
          if (data == null) {
              this.data = data;
-@@ -596,7 +601,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -546,7 +552,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       *
       * @return a copy of the current ItemStack's ItemData
       */
 -    @Nullable
-+    @UndefinedNullability("null for air") // Paper
++    @UndefinedNullability // Paper
      public ItemMeta getItemMeta() {
          return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone();
      }
@@ -796,10 +791,10 @@ index 5461f7fa75f5a065bb333b4a113640b5fe1e3825..c4d657727e508cb941320730a9d3aa54
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 4869adf9b89f1458af5517ae5813d44630846de8..9d86f3de1bfd5beeda1f19ae9d0db9849c72b0cb 100644
+index 97d5d9c6347bc401e3f4ab7c0ba1391ad5b0449a..da878c6d4928ddbc16b50ace86d992685a2b7873 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -111,8 +111,10 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -100,8 +100,10 @@ public class ShapedRecipe extends CraftingRecipe {
       * @param ingredient The ingredient.
       * @return The changed recipe, so you can chain calls.
       * @throws IllegalArgumentException if the {@code key} does not appear in the shape.
@@ -808,9 +803,9 @@ index 4869adf9b89f1458af5517ae5813d44630846de8..9d86f3de1bfd5beeda1f19ae9d0db984
      @NotNull
 +    @Deprecated // Paper
      public ShapedRecipe setIngredient(char key, @NotNull MaterialData ingredient) {
-         return setIngredient(key, ingredient.getItemType().asItemType());
+         return setIngredient(key, ingredient.getItemType(), ingredient.getData());
      }
-@@ -166,7 +168,9 @@ public class ShapedRecipe implements Recipe, Keyed {
+@@ -179,7 +181,9 @@ public class ShapedRecipe extends CraftingRecipe {
       * Get a copy of the ingredients map.
       *
       * @return The mapping of character to ingredients.
@@ -821,10 +816,10 @@ index 4869adf9b89f1458af5517ae5813d44630846de8..9d86f3de1bfd5beeda1f19ae9d0db984
      public Map<Character, ItemStack> getIngredientMap() {
          HashMap<Character, ItemStack> result = new HashMap<Character, ItemStack>();
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 1ff7f7327c3462f54b8b2d1100c608f30ecabe31..90d54c39181e602af08dc43e37e66a8572fe1996 100644
+index b8ac602cd2718d615ec243ce648951a1a46c26ec..beb798482479c58a8628c314b510ab6349576ce8 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -52,8 +52,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -43,8 +43,10 @@ public class ShapelessRecipe extends CraftingRecipe {
       *
       * @param ingredient The ingredient to add.
       * @return The changed recipe, so you can chain calls.
@@ -835,7 +830,7 @@ index 1ff7f7327c3462f54b8b2d1100c608f30ecabe31..90d54c39181e602af08dc43e37e66a85
      public ShapelessRecipe addIngredient(@NotNull MaterialData ingredient) {
          return addIngredient(1, ingredient);
      }
-@@ -75,8 +77,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -80,8 +82,10 @@ public class ShapelessRecipe extends CraftingRecipe {
       * @param count How many to add (can't be more than 9!)
       * @param ingredient The ingredient to add.
       * @return The changed recipe, so you can chain calls.
@@ -844,9 +839,9 @@ index 1ff7f7327c3462f54b8b2d1100c608f30ecabe31..90d54c39181e602af08dc43e37e66a85
      @NotNull
 +    @Deprecated // Paper
      public ShapelessRecipe addIngredient(int count, @NotNull MaterialData ingredient) {
-         return addIngredient(count, ingredient.getItemType().asItemType());
+         return addIngredient(count, ingredient.getItemType(), ingredient.getData());
      }
-@@ -173,8 +177,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -198,8 +202,10 @@ public class ShapelessRecipe extends CraftingRecipe {
       *
       * @param ingredient The ingredient to remove
       * @return The changed recipe.
@@ -855,9 +850,9 @@ index 1ff7f7327c3462f54b8b2d1100c608f30ecabe31..90d54c39181e602af08dc43e37e66a85
      @NotNull
 +    @Deprecated // Paper
      public ShapelessRecipe removeIngredient(@NotNull MaterialData ingredient) {
-         return removeIngredient(ingredient.getItemType().asItemType());
+         return removeIngredient(ingredient.getItemType(), ingredient.getData());
      }
-@@ -209,8 +215,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -226,8 +232,10 @@ public class ShapelessRecipe extends CraftingRecipe {
       * @param count The number of copies to remove.
       * @param ingredient The ingredient to remove.
       * @return The changed recipe.
@@ -866,9 +861,9 @@ index 1ff7f7327c3462f54b8b2d1100c608f30ecabe31..90d54c39181e602af08dc43e37e66a85
      @NotNull
 +    @Deprecated // Paper
      public ShapelessRecipe removeIngredient(int count, @NotNull MaterialData ingredient) {
-         return removeIngredient(count, ingredient.getItemType().asItemType());
+         return removeIngredient(count, ingredient.getItemType(), ingredient.getData());
      }
-@@ -230,7 +238,9 @@ public class ShapelessRecipe implements Recipe, Keyed {
+@@ -277,7 +285,9 @@ public class ShapelessRecipe extends CraftingRecipe {
       * Get the list of ingredients used for this recipe.
       *
       * @return The input list
@@ -879,13 +874,13 @@ index 1ff7f7327c3462f54b8b2d1100c608f30ecabe31..90d54c39181e602af08dc43e37e66a85
      public List<ItemStack> getIngredientList() {
          ArrayList<ItemStack> result = new ArrayList<ItemStack>(ingredients.size());
 diff --git a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
-index 0de3c34c67b8c37a3c7ba8bcec4404ed4ef5019e..d99c5f00905f3eaf2be20e3b68184c948c417b9e 100644
+index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb61385f65e 100644
 --- a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
-@@ -62,7 +62,9 @@ public class StonecuttingRecipe implements Recipe, Keyed {
-      * Get the input item stack.
+@@ -57,7 +57,9 @@ public class StonecuttingRecipe implements Recipe, Keyed {
+      * Get the input material.
       *
-      * @return The input item stack.
+      * @return The input material.
 +     * @deprecated Use {@link #getInputChoice()} instead for more complete data.
       */
 +    @Deprecated // Paper
@@ -1025,14 +1020,14 @@ index 0ea9c6b2420a0f990bd1fdf50fc015e37a7060d8..e99644eae1c662b117aa19060d2484ac
  
      /**
 diff --git a/src/test/java/org/bukkit/materials/MaterialDataTest.java b/src/test/java/org/bukkit/materials/MaterialDataTest.java
-index c5ce01d7a84d06ab4a797207377a09706882e9af..13d351af0f9dd4d27b93cf48c521dff1bdab3a38 100644
+index a935ae4a25b7955416652bf8c4690a804f12e903..e83321263bb0e2b67af981dbb2e8fec4e973ae56 100644
 --- a/src/test/java/org/bukkit/materials/MaterialDataTest.java
 +++ b/src/test/java/org/bukkit/materials/MaterialDataTest.java
-@@ -23,6 +23,7 @@ import org.bukkit.material.types.MushroomBlockTexture;
- import org.bukkit.support.AbstractTestingBase;
+@@ -22,6 +22,7 @@ import org.bukkit.material.WoodenStep;
+ import org.bukkit.material.types.MushroomBlockTexture;
  import org.junit.Test;
  
 +@Deprecated // Paper
- public class MaterialDataTest extends AbstractTestingBase {
+ public class MaterialDataTest {
  
      @Test

patches/api/0175-Add-Heightmap-API.patch

@@ -51,15 +51,14 @@ index 0000000000000000000000000000000000000000..1c832d69bb3717dcfccf21e45f6f060a
 +    SOLID_OR_LIQUID_NO_LEAVES;
 +}
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 2b9a117804a8ca54b47e51e23359bd6e01087641..1a60a18e15780128a1914826daa952ffacb92e9e 100644
+index f7564581c18425c903e54f949728dd3742ca7bf2..1bfe465b9aaeea7d3c871140145b7de1b8f1d93d 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -640,6 +640,47 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
+@@ -640,6 +640,46 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
          return centerLoc;
      }
  
 +    // Paper start - Add heightmap api
-+
 +    /**
 +     * Returns a copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
 +     * @return A copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
@@ -97,11 +96,11 @@ index 2b9a117804a8ca54b47e51e23359bd6e01087641..1a60a18e15780128a1914826daa952ff
 +        ret.setY(this.getWorld().getHighestBlockYAt(this, heightMap));
 +        return ret;
 +    }
-+    // Paper end
++    // Paper end - Add heightmap api
 +
+     // Paper start - Expand Explosions API
      /**
       * Creates explosion at this location with given power
-      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
 index 31fc272b0e82e4eef6d9bf01dd25d39513d354b3..0c5ce79c04e8193db248a221f519d80a944ef6ba 100644
 --- a/src/main/java/org/bukkit/World.java

patches/api/0176-Mob-Spawner-API-Enhancements.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/org/bukkit/block/CreatureSpawner.java b/src/main/java/org/bukkit/block/CreatureSpawner.java
-index 6586c8a81e8d9b4fc5afcb89878f2594ed4306b6..98a9d2b012f6d084ae8d1886021c3dccfbb4ca74 100644
+index 8dae9611e702d93b202563597c50752c5f5b77d4..3dcab76632c4f8646d7ae62bb8de287eb6ef55b5 100644
 --- a/src/main/java/org/bukkit/block/CreatureSpawner.java
 +++ b/src/main/java/org/bukkit/block/CreatureSpawner.java
 @@ -199,4 +199,30 @@ public interface CreatureSpawner extends TileState {
@@ -27,7 +27,7 @@ index 6586c8a81e8d9b4fc5afcb89878f2594ed4306b6..98a9d2b012f6d084ae8d1886021c3dcc
 +    public void resetTimer();
 +
 +    /**
-+     * Sets the {@link EntityType} to {@link EntityType#ITEM} and sets the data to the given
++     * Sets the {@link EntityType} to {@link EntityType#DROPPED_ITEM} and sets the data to the given
 +     * {@link org.bukkit.inventory.ItemStack ItemStack}.
 +     * <p>
 +     * {@link #setSpawnCount(int)} does not dictate the amount of items in the stack spawned, but rather how many

patches/api/0177-Add-BlockSoundGroup-interface.patch

@@ -76,10 +76,10 @@ index 0000000000000000000000000000000000000000..ec36942128cbacae171584c89480b4aa
 +    Sound getFallSound();
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index cad80c8aeb55fe9846189c62ff9cfdb5525c7236..22926629a86b24e26a6949550178d5ead0a4ba25 100644
+index 78f6cc1a8a8de05aec6f551f8a5f425944f0ffa3..b0b148918eeaf10d60734def6ac84b678c0d74c7 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -606,4 +606,25 @@ public interface Block extends Metadatable, Translatable {
+@@ -607,4 +607,25 @@ public interface Block extends Metadatable, Translatable {
       * @return <code>true</code> if the block data can be placed here
       */
      boolean canPlace(@NotNull BlockData data);

patches/api/0180-Expose-the-internal-current-tick.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d22fde8aa7d9dc2d3e717716b4604ad8604daa61..26acb25d6cce69c3da8c345c30b48817e2be47d4 100644
+index f377b0d6bfdc88be2af2a8b059aac04421c4f378..93c83d1513745ada3c1ea9b5cc88905f1957d3c4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2340,6 +2340,10 @@ public final class Bukkit {
+@@ -2363,6 +2363,10 @@ public final class Bukkit {
      public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
          return server.createProfileExact(uuid, name);
      }
@@ -20,10 +20,10 @@ index d22fde8aa7d9dc2d3e717716b4604ad8604daa61..26acb25d6cce69c3da8c345c30b48817
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 883d2320914d0687dcee08f078cb20fd857cf971..b8bbdc6a7ab5562eae0977f694dc1ad25652ab99 100644
+index bb90413c0170d3d37bc67565a6bd6f8795b2f6bd..3b3cd9994b84770dc9b3c7a0531461bdc3d4b16a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2037,5 +2037,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2056,5 +2056,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name);

patches/api/0181-Improve-Block-breakNaturally-API.patch

@@ -10,10 +10,10 @@ Adds bool param to trigger exp drops for blocks
 Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com>
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 22926629a86b24e26a6949550178d5ead0a4ba25..da77f02f164998b0b8905fcf85730deda947d742 100644
+index b0b148918eeaf10d60734def6ac84b678c0d74c7..232662f3130ca49156ed8b71acf4495aea33c212 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -480,6 +480,52 @@ public interface Block extends Metadatable, Translatable {
+@@ -481,6 +481,52 @@ public interface Block extends Metadatable, Translatable {
       */
      boolean breakNaturally(@Nullable ItemStack tool);
  

patches/api/0183-Add-ThrownEggHatchEvent.patch

@@ -8,7 +8,7 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..395f8da2d344cd036ceaee5dd39662e719df4e98
+index 0000000000000000000000000000000000000000..085d77dde83d6ed13eb83f23cf3e51d380187c9c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java
 @@ -0,0 +1,115 @@
@@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..395f8da2d344cd036ceaee5dd39662e7
 +    private static final HandlerList handlers = new HandlerList();
 +    private final Egg egg;
 +    private boolean hatching;
-+    private EntityType<?> hatchType;
++    private EntityType hatchType;
 +    private byte numHatches;
 +
-+    public ThrownEggHatchEvent(@NotNull final Egg egg, final boolean hatching, final byte numHatches, @NotNull final EntityType<?> hatchingType) {
++    public ThrownEggHatchEvent(@NotNull final Egg egg, final boolean hatching, final byte numHatches, @NotNull final EntityType hatchingType) {
 +        this.egg = egg;
 +        this.hatching = hatching;
 +        this.numHatches = numHatches;
@@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..395f8da2d344cd036ceaee5dd39662e7
 +     * @return The type of the mob being hatched by the egg
 +     */
 +    @NotNull
-+    public EntityType<?> getHatchingType() {
++    public EntityType getHatchingType() {
 +        return hatchType;
 +    }
 +
@@ -84,7 +84,7 @@ index 0000000000000000000000000000000000000000..395f8da2d344cd036ceaee5dd39662e7
 +     *
 +     * @param hatchType The type of the mob being hatched by the egg
 +     */
-+    public void setHatchingType(@NotNull EntityType<?> hatchType) {
++    public void setHatchingType(@NotNull EntityType hatchType) {
 +        if (!hatchType.isSpawnable()) throw new IllegalArgumentException("Can't spawn that entity type from an egg!");
 +        this.hatchType = hatchType;
 +    }

patches/api/0184-Entity-Jump-API.patch

@@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..f0067c2e953d18e1a33536980071ba3f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index b4c41ab64ef35ac0d172c041d97e8fe9b3eb8aa6..9e6ad506611ec05f75da29bef074edebd9d54715 100644
+index 373b3ad6b3f94655289155914aec8294cd4f2fb2..c18899e276eff043128794f27ca57cadaf41f439 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -947,5 +947,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -980,5 +980,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      @NotNull
      org.bukkit.inventory.EquipmentSlot getHandRaised();

patches/api/0186-Add-tick-times-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 26acb25d6cce69c3da8c345c30b48817e2be47d4..ad3de5789b2490f5f2c42cc173caa1ef18a95e53 100644
+index 93c83d1513745ada3c1ea9b5cc88905f1957d3c4..d715a069a8cfc8704471f254f421bb7baeb498f4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2009,6 +2009,25 @@ public final class Bukkit {
+@@ -2035,6 +2035,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
@@ -35,10 +35,10 @@ index 26acb25d6cce69c3da8c345c30b48817e2be47d4..ad3de5789b2490f5f2c42cc173caa1ef
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b8bbdc6a7ab5562eae0977f694dc1ad25652ab99..73fc1082b3c867ec73aff12378bf0cabef97054c 100644
+index 3b3cd9994b84770dc9b3c7a0531461bdc3d4b16a..e00d4860ba9ac19014995e85fccea659793f67e7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1696,6 +1696,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1718,6 +1718,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      public double[] getTPS();

patches/api/0187-Expose-MinecraftServer-isRunning.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ad3de5789b2490f5f2c42cc173caa1ef18a95e53..32847b69be4c73529b54d3f717d9cf15a16e9669 100644
+index d715a069a8cfc8704471f254f421bb7baeb498f4..e54ba870293676f16fabac5b91ffd7202d3a17e0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2363,6 +2363,15 @@ public final class Bukkit {
+@@ -2386,6 +2386,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
@@ -26,10 +26,10 @@ index ad3de5789b2490f5f2c42cc173caa1ef18a95e53..32847b69be4c73529b54d3f717d9cf15
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 73fc1082b3c867ec73aff12378bf0cabef97054c..e4370e5c0e529c221e0e0a7b0b0c89f8528dae0f 100644
+index e00d4860ba9ac19014995e85fccea659793f67e7..e4d7c0a3c36a34ef5bdb728d52cf0c4f2aa3ef77 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2059,5 +2059,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2078,5 +2078,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return Current tick
       */
      int getCurrentTick();

patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 4c2ae9cb674260deba91d734bf7bf24fd7038485..f2909100f7abe0a650cc8b2631dddcb26380344a 100644
+index a6aa33b9574d0278e10927007a62290e1d102e73..beddcb13a598d799c8ae1cec9c01c900e38b1458 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -135,5 +135,9 @@ public interface UnsafeValues {
+@@ -126,5 +126,9 @@ public interface UnsafeValues {
      default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
          return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
      }
@@ -20,10 +20,10 @@ index 4c2ae9cb674260deba91d734bf7bf24fd7038485..f2909100f7abe0a650cc8b2631dddcb2
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index f71f939ba5f02827999124c5e8dc589247f2c433..971df4980db6289bd11f661956d8f1d3c52b7822 100644
+index 60a25898fb17c467ffae05039fcd4d3b154a99ff..3da071798b89e1dd1453f4339af87933cdf0105e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -688,6 +688,30 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -639,6 +639,30 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
      }
  

patches/api/0189-Add-Player-Client-Options-API.patch

@@ -229,10 +229,10 @@ index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f52
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9649e65d2b0af4f72d648eb33c0de124ba4b5e34..c3387633e7192887d61b871a9af85f1e35a2eecb 100644
+index 5cabbe3aec83f76cefe34fd3e34be467fe5e59c8..45cd9cf3bfa7a64fca463f76a9e29d5f9abdfd58 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2711,6 +2711,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2872,6 +2872,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the cooldown counter to 0, effectively starting the cooldown period.
       */
      void resetCooldown();

patches/api/0191-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch

@@ -7,12 +7,12 @@ Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded
 While the Potion class is deprecated, it is still used in some plugins for cross-version potion handling. This issue has existed for a long time, and has caused many heaches along the way.
 
 diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
-index 9a670f91a4799933780fc6812e78c8df535d2ed8..c4e551e2c78e959b25c749c32c22c7f0e2f492a9 100644
+index 266547c6da0e3270af5c9ca81268934294a7c48d..69e7ce61090e3e3a7a337a96b380c8ffe78ffb8d 100644
 --- a/src/main/java/org/bukkit/potion/Potion.java
 +++ b/src/main/java/org/bukkit/potion/Potion.java
 @@ -267,7 +267,7 @@ public class Potion {
          }
-         ItemStack itemStack = ItemStack.of(itemType, amount);
+         ItemStack itemStack = new ItemStack(material, amount);
          PotionMeta meta = (PotionMeta) itemStack.getItemMeta();
 -        meta.setBasePotionData(new PotionData(type, level == 2, extended));
 +        meta.setBasePotionData(new PotionData(type, extended, level == 2)); // Paper - fix swapped values

patches/api/0193-Villager-Restocks-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Villager Restocks API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index a6e57f8ad3f09d05ca61c824d128221528f7a96d..5ba0ac5f8675c8db1955318355d5a16f23f55e3f 100644
+index a91400cd8bb4c72d1f3200a17f6de025540fe09d..4128b848ec739308694d54d9e859c28185f42a63 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -81,6 +81,20 @@ public interface Villager extends AbstractVillager {
+@@ -78,6 +78,20 @@ public interface Villager extends AbstractVillager {
       */
      public void setVillagerExperience(int experience);
  

patches/api/0194-Expose-game-version.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 32847b69be4c73529b54d3f717d9cf15a16e9669..834b5fb69de90ed1b5f012887f74608fdec56f6d 100644
+index e54ba870293676f16fabac5b91ffd7202d3a17e0..eb1e5e87d003e5cd7fbf4a01265ef30bb87abd47 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -157,6 +157,18 @@ public final class Bukkit {
@@ -28,7 +28,7 @@ index 32847b69be4c73529b54d3f717d9cf15a16e9669..834b5fb69de90ed1b5f012887f74608f
       * 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 e4370e5c0e529c221e0e0a7b0b0c89f8528dae0f..23d07141696d17c41a37dbda094d62b38386a45b 100644
+index e4d7c0a3c36a34ef5bdb728d52cf0c4f2aa3ef77..4ec70d58f4341e9fe9467f2b3a65b9808a3d81a4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -115,6 +115,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0195-Add-Mob-Goal-API.patch

@@ -525,10 +525,10 @@ index 0000000000000000000000000000000000000000..c9837c7c47314b5bdf6c7973e6bc962d
 +    @Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21") GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 834b5fb69de90ed1b5f012887f74608fdec56f6d..690d8584e3f74aae87038b2b8225f28f1b912362 100644
+index eb1e5e87d003e5cd7fbf4a01265ef30bb87abd47..520cfd6b8568fb05b3a732ffa641b0231ec936eb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2384,6 +2384,16 @@ public final class Bukkit {
+@@ -2407,6 +2407,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
@@ -546,10 +546,10 @@ index 834b5fb69de90ed1b5f012887f74608fdec56f6d..690d8584e3f74aae87038b2b8225f28f
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 23d07141696d17c41a37dbda094d62b38386a45b..e8a735a3035fe214889738bd0220dae8b51a9535 100644
+index 4ec70d58f4341e9fe9467f2b3a65b9808a3d81a4..83c9d688666095ff50bf8fdf4e7510a622128ab4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2076,5 +2076,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2095,5 +2095,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if server is in the process of being shutdown
       */
      boolean isStopping();

patches/api/0196-Add-villager-reputation-API.patch

@@ -110,20 +110,20 @@ index 0000000000000000000000000000000000000000..5600fcdc9795a9f49091db48d73bbd49
 +    TRADING,
 +}
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index 5ba0ac5f8675c8db1955318355d5a16f23f55e3f..74cc876788674f64ca0451f5fb7c0da23b168d0c 100644
+index 4128b848ec739308694d54d9e859c28185f42a63..d841d94d46462e0ceb7c6b04cc8fc36792bd9201 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -2,6 +2,8 @@ package org.bukkit.entity;
+@@ -1,6 +1,8 @@
+ package org.bukkit.entity;
  
- import com.google.common.base.Preconditions;
- import com.google.common.collect.Lists;
+ import java.util.Locale;
 +import java.util.Map; // Paper
 +import java.util.UUID; // Paper
  import org.bukkit.Keyed;
  import org.bukkit.Location;
  import org.bukkit.NamespacedKey;
-@@ -285,4 +287,50 @@ public interface Villager extends AbstractVillager {
-             return Lists.newArrayList(Registry.VILLAGER_PROFESSION).toArray(new Profession[0]);
+@@ -242,4 +244,50 @@ public interface Villager extends AbstractVillager {
+             return key;
          }
      }
 +

patches/api/0197-Spawn-Reason-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Spawn Reason API
 
 
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index 8264599a873ed23ec6552d1550a414ec3712487b..3806e420af559ddb26c567523b656c79a635b229 100644
+index 05c29cbd2ae1ca0434a90f8389479bd608ca2ac1..66bc6da2a482bb207ec50beb22fd62aeda90cc34 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
-@@ -11,6 +11,7 @@ import org.bukkit.block.data.BlockData;
+@@ -10,6 +10,7 @@ import org.bukkit.block.data.BlockData;
  import org.bukkit.entity.Entity;
  import org.bukkit.entity.EntityType;
  import org.bukkit.entity.LivingEntity;
@@ -16,7 +16,7 @@ index 8264599a873ed23ec6552d1550a414ec3712487b..3806e420af559ddb26c567523b656c79
  import org.bukkit.util.Consumer;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
-@@ -312,7 +313,36 @@ public interface RegionAccessor {
+@@ -309,7 +310,34 @@ public interface RegionAccessor {
       *     {@link Entity} requested cannot be spawned
       */
      @NotNull
@@ -37,15 +37,13 @@ index 8264599a873ed23ec6552d1550a414ec3712487b..3806e420af559ddb26c567523b656c79
 +    }
 +
 +    @NotNull
-+    public default <T extends Entity> Entity spawnEntity(@NotNull Location loc, @NotNull EntityType<T> type, @NotNull CreatureSpawnEvent.SpawnReason reason) {
-+        com.google.common.base.Preconditions.checkArgument(type.getEntityClass() != null);
-+        return spawn(loc, type.getEntityClass(), reason, null);
++    public default Entity spawnEntity(@NotNull Location loc, @NotNull org.bukkit.entity.EntityType type, @NotNull CreatureSpawnEvent.SpawnReason reason) {
++        return spawn(loc, (Class<Entity>) type.getEntityClass(), reason, null);
 +    }
 +
 +    @NotNull
-+    public default <T extends Entity> Entity spawnEntity(@NotNull Location loc, @NotNull EntityType<T> type, @NotNull CreatureSpawnEvent.SpawnReason reason, @Nullable Consumer<T> function) {
-+        com.google.common.base.Preconditions.checkArgument(type.getEntityClass() != null);
-+        return spawn(loc, type.getEntityClass(), reason, function);
++    public default Entity spawnEntity(@NotNull Location loc, @NotNull org.bukkit.entity.EntityType type, @NotNull CreatureSpawnEvent.SpawnReason reason, @Nullable Consumer<Entity> function) {
++        return spawn(loc, (Class<Entity>) type.getEntityClass(), reason, function);
 +    }
 +
 +    @NotNull

patches/api/0198-Potential-bed-API.patch

@@ -8,10 +8,10 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 384e310c725e53276886fe5ab3239d911aabc350..7bfc78cff563bc104a29b9d58befcd29a78653f3 100644
+index d44c5a3fda0b159dc541246cb2fca8427cb38243..7e9e1e0b21314e6542f5f40503cd6926c75cc369 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -266,6 +266,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -269,6 +269,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public int getSleepTicks();