Start update, apply API patches

build.gradle.kts

@@ -67,7 +67,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.21.3+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.21.4+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")

gradle.properties

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

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

@@ -27,7 +27,7 @@ index 5dd700a956e915c00b25d91dea8d6f285ddab72b..97e78e27ee0eea2c8b24886eeb19164d
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..7ac6af074d76b782ef14fe4690bb5b630ededa32
+index 0000000000000000000000000000000000000000..8ec976de73d8fe6e4d46007649f2c9089e8bdd9c
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,91 @@
@@ -46,11 +46,11 @@ index 0000000000000000000000000000000000000000..7ac6af074d76b782ef14fe4690bb5b63
 +
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
-+    api("com.google.guava:guava:32.1.2-jre")
++    api("com.google.guava:guava:33.3.1-jre")
-+    api("com.google.code.gson:gson:2.10.1")
++    api("com.google.code.gson:gson:2.11.0")
 +    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 +    api("org.yaml:snakeyaml:2.2")
-+    api("org.joml:joml:1.10.5")
++    api("org.joml:joml:1.10.8")
 +
 +    compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 +    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
@@ -100,7 +100,7 @@ index 0000000000000000000000000000000000000000..7ac6af074d76b782ef14fe4690bb5b63
 +    options.use()
 +    options.isDocFilesSubDirs = true
 +    options.links(
-+        "https://guava.dev/releases/32.1.2-jre/api/docs/",
++        "https://guava.dev/releases/33.3.1-jre/api/docs/",
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
@@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..7ac6af074d76b782ef14fe4690bb5b63
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index bdde86ea96da233c802e98dc203cb4cb7f8616b0..0000000000000000000000000000000000000000
+index 25a8f7daaf393f3306ca5c6c0c79d3de7bc983db..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,267 +0,0 @@
@@ -135,7 +135,7 @@ index bdde86ea96da233c802e98dc203cb4cb7f8616b0..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.21.3-R0.1-SNAPSHOT</version>
+-    <version>1.21.4-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -164,21 +164,21 @@ index bdde86ea96da233c802e98dc203cb4cb7f8616b0..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.google.guava</groupId>
 -            <artifactId>guava</artifactId>
--            <version>32.1.2-jre</version>
+-            <version>33.3.1-jre</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
 -        <dependency>
 -            <groupId>com.google.code.gson</groupId>
 -            <artifactId>gson</artifactId>
--            <version>2.10.1</version>
+-            <version>2.11.0</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
 -        <dependency>
 -            <groupId>org.joml</groupId>
 -            <artifactId>joml</artifactId>
--            <version>1.10.5</version>
+-            <version>1.10.8</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>

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

@@ -5,13 +5,13 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7ac6af074d76b782ef14fe4690bb5b630ededa32..0b837b485bec96fa37ed65c18df97e55cecd0e9d 100644
+index 8ec976de73d8fe6e4d46007649f2c9089e8bdd9c..75768ac6674accfce35ab8f31994d538f4bca5a6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,15 +18,27 @@ dependencies {
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
      api("org.yaml:snakeyaml:2.2")
-     api("org.joml:joml:1.10.5")
+     api("org.joml:joml:1.10.8")
 +    // Paper start
 +    api("com.googlecode.json-simple:json-simple:1.1.1") {
 +        isTransitive = false // includes junit
@@ -39,14 +39,14 @@ index 7ac6af074d76b782ef14fe4690bb5b630ededa32..0b837b485bec96fa37ed65c18df97e55
      testImplementation("org.hamcrest:hamcrest:2.2")
 @@ -69,8 +81,13 @@ tasks.withType<Javadoc> {
      options.links(
-         "https://guava.dev/releases/32.1.2-jre/api/docs/",
+         "https://guava.dev/releases/33.3.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
          "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
 +        // Paper start - add missing javadoc links
-+        "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
++        "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
-+        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
++        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.1",
 +        "https://jspecify.dev/docs/api/",
 +        // Paper end
      )

patches/api/0003-Test-changes.patch

@@ -14,7 +14,7 @@ Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 Co-authored-by: Yannick Lamprecht <yannicklamprecht@live.de>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0b837b485bec96fa37ed65c18df97e55cecd0e9d..c7f660d52e1b5f085919a8aebf8476918705a391 100644
+index 75768ac6674accfce35ab8f31994d538f4bca5a6..5b6577b5cc6f383dda6b06dd6469e7339aa2c587 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,6 +11,18 @@ java {
@@ -35,7 +35,7 @@ index 0b837b485bec96fa37ed65c18df97e55cecd0e9d..c7f660d52e1b5f085919a8aebf847691
 +
  dependencies {
      // api dependencies are listed transitively to API consumers
-     api("com.google.guava:guava:32.1.2-jre")
+     api("com.google.guava:guava:33.3.1-jre")
 @@ -44,6 +56,7 @@ dependencies {
      testImplementation("org.hamcrest:hamcrest:2.2")
      testImplementation("org.mockito:mockito-core:5.14.1")

patches/api/0004-Code-Generation.patch

@@ -7,7 +7,7 @@ Currently includes generated key holder classes for types
 used in the Registry Modification API
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c7f660d52e1b5f085919a8aebf8476918705a391..89208fed89181f890bb7a2bb237ed744ec2aea96 100644
+index 5b6577b5cc6f383dda6b06dd6469e7339aa2c587..2a4b8a6b06ed3df1a5e4d90bc4e36c227347d027 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,6 +1,7 @@
@@ -398,13 +398,13 @@ index 0000000000000000000000000000000000000000..3e29f7007500582cdc3f84b91f11ebeb
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java/org/bukkit/MinecraftExperimental.java
-index b7845523e8587e13b86516c0012fe097d904846c..d92a75f610cb2a95203b3f22dc67bdbfb5c3405a 100644
+index a86b87e4c3332202e40e484c3f9c6562b419c70f..e996a758fc1e4ecfec68641733d69665f30792e8 100644
 --- a/src/main/java/org/bukkit/MinecraftExperimental.java
 +++ b/src/main/java/org/bukkit/MinecraftExperimental.java
-@@ -48,5 +48,10 @@ public @interface MinecraftExperimental {
+@@ -47,5 +47,10 @@ public @interface MinecraftExperimental {
+     @ApiStatus.Internal
      public enum Requires {
  
-         WINTER_DROP,
 +        // Paper start
 +        TRADE_REBALANCE,
 +        REDSTONE_EXPERIMENTS,

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 89208fed89181f890bb7a2bb237ed744ec2aea96..1a80f7c7e7f4ae9857b732897dc2ee7cfc187626 100644
+index 2a4b8a6b06ed3df1a5e4d90bc4e36c227347d027..6180e0ee8e83d2a4799741348908b59c43a2efe1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -35,6 +35,7 @@ dependencies {

patches/api/0006-Adventure.patch

@@ -8,7 +8,7 @@ Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 Co-authored-by: Yannick Lamprecht <yannicklamprecht@live.de>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1a80f7c7e7f4ae9857b732897dc2ee7cfc187626..f57827e724bff2bf586b468cc4e5ba6a1901bd57 100644
+index 6180e0ee8e83d2a4799741348908b59c43a2efe1..a301926cd514bbc205af47fcbcb0c266c06468f6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,6 +11,18 @@ java {
@@ -32,16 +32,16 @@ index 1a80f7c7e7f4ae9857b732897dc2ee7cfc187626..f57827e724bff2bf586b468cc4e5ba6a
  val mockitoAgent = configurations.register("mockitoAgent")
 @@ -28,7 +40,11 @@ dependencies {
      // api dependencies are listed transitively to API consumers
-     api("com.google.guava:guava:32.1.2-jre")
+     api("com.google.guava:guava:33.3.1-jre")
-     api("com.google.code.gson:gson:2.10.1")
+     api("com.google.code.gson:gson:2.11.0")
 -    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 +    // Paper start - adventure
-+    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
++    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") {
 +        exclude("com.google.guava", "guava")
 +    }
 +    // Paper - adventure
      api("org.yaml:snakeyaml:2.2")
-     api("org.joml:joml:1.10.5")
+     api("org.joml:joml:1.10.8")
      // Paper start
 @@ -36,6 +52,13 @@ dependencies {
          isTransitive = false // includes junit
@@ -58,14 +58,14 @@ index 1a80f7c7e7f4ae9857b732897dc2ee7cfc187626..f57827e724bff2bf586b468cc4e5ba6a
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 @@ -113,15 +136,32 @@ tasks.withType<Javadoc> {
-         "https://guava.dev/releases/32.1.2-jre/api/docs/",
+         "https://guava.dev/releases/33.3.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
          "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
 -        "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
 +        // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
          // Paper start - add missing javadoc links
-         "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
+         "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
-         "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
+         "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.1",
          "https://jspecify.dev/docs/api/",
          // Paper end
 +        // Paper start
@@ -1496,7 +1496,7 @@ index 18a53194483410c4d5ad35f901c90d44efaeef60..aff43d77f31d81b82e5fc5fea6272dda
          String getDisplayName();
  
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 4204a7dac18c60f177a5f70693388cd4ddc3bc0c..04e890be72b18259f1af2833879b4d9af51b1f02 100644
+index fab510afe4fa67d3171e23d739765095916197cb..779fd6dd572dea41e7e22464c9c6068a0fb71b9d 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
 @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
@@ -1508,7 +1508,7 @@ index 4204a7dac18c60f177a5f70693388cd4ddc3bc0c..04e890be72b18259f1af2833879b4d9a
  
      Sound AMBIENT_BASALT_DELTAS_ADDITIONS = getSound("ambient.basalt_deltas.additions");
      Sound AMBIENT_BASALT_DELTAS_LOOP = getSound("ambient.basalt_deltas.loop");
-@@ -1698,4 +1698,11 @@ public interface Sound extends OldEnum<Sound>, Keyed {
+@@ -1713,4 +1713,11 @@ public interface Sound extends OldEnum<Sound>, Keyed {
      static Sound[] values() {
          return Lists.newArrayList(Registry.SOUNDS).toArray(new Sound[0]);
      }
@@ -4713,10 +4713,10 @@ index 9bab73c3c2ca759b8e1c7d07d98cc593c961666a..f0c6943da3f783101ca647b75b3230fa
              throw new UnsupportedOperationException("Not supported yet.");
          }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b9c310322 100644
+index 69d6de6e9618dd27f5ba73b931f8455912caf060..77f0e0a9e991f65b89909d0307fd93c3ecd9d8ac 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -44,6 +44,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -45,6 +45,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       */
      boolean hasDisplayName();
  
@@ -4741,7 +4741,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      /**
       * Gets the display name that is set.
       * <p>
-@@ -51,7 +69,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -52,7 +70,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * before calling this method.
       *
       * @return the display name that is set
@@ -4751,7 +4751,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      @NotNull
      String getDisplayName();
  
-@@ -59,7 +79,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -60,7 +80,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Sets the display name.
       *
       * @param name the name to set
@@ -4761,7 +4761,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      void setDisplayName(@Nullable String name);
  
      /**
-@@ -72,6 +94,32 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -73,6 +95,32 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       */
      boolean hasItemName();
  
@@ -4794,7 +4794,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      /**
       * Gets the item name that is set.
       * <br>
-@@ -82,7 +130,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -83,7 +131,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * calling this method.
       *
       * @return the item name that is set
@@ -4804,7 +4804,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      @NotNull
      String getItemName();
  
-@@ -93,7 +143,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -94,7 +144,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * anvil, is not styled with italics, and does not show labels.
       *
       * @param name the name to set
@@ -4814,7 +4814,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      void setItemName(@Nullable String name);
  
      /**
-@@ -134,6 +186,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -135,6 +187,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       */
      boolean hasLore();
  
@@ -4839,7 +4839,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      /**
       * Gets the lore that is set.
       * <p>
-@@ -141,7 +211,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -142,7 +212,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * calling this method.
       *
       * @return a list of lore that is set
@@ -4849,7 +4849,7 @@ index a3515201dcca4f4d8e8683a4f1558814280d46ea..f83ec1c5ddce1a35b1c164b988f7fc6b
      @Nullable
      List<String> getLore();
  
-@@ -150,7 +222,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -151,7 +223,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Removes lore when given null.
       *
       * @param lore the lore that will be set
@@ -4881,10 +4881,10 @@ index 12595536080ffe09df2b6ecdb83d846f50100d38..9fc47c879ee6b8edf2503f20e4736c29
  public interface WritableBookMeta extends ItemMeta {
  
 diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
-index 5fc9aaac8baaf185d8e0d4fa7012dc4e13e485b3..804cb7162b34225d5dd84aada283de568d7d6592 100644
+index ebfd6f5523205cfc932e3d6b351ff26da855fb15..cc38bee3c412bef4767f08407c0f5559a113fce5 100644
 --- a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
 +++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
-@@ -57,4 +57,21 @@ public interface TrimMaterial extends Keyed, Translatable {
+@@ -61,4 +61,21 @@ public interface TrimMaterial extends Keyed, Translatable {
      private static TrimMaterial getTrimMaterial(@NotNull String key) {
          return Registry.TRIM_MATERIAL.getOrThrow(NamespacedKey.minecraft(key));
      }

patches/api/0008-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 f57827e724bff2bf586b468cc4e5ba6a1901bd57..783513d3c7ea143997f2eb1a1b53826e51a51079 100644
+index a301926cd514bbc205af47fcbcb0c266c06468f6..36660956b058b3a79fed6932c3c267e157f2951b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -59,6 +59,9 @@ dependencies {

patches/api/0009-Paper-Plugins.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 783513d3c7ea143997f2eb1a1b53826e51a51079..5ee8db3fcf3d3ac1c8b998b227aff0965960896a 100644
+index 36660956b058b3a79fed6932c3c267e157f2951b..feb047d20178f957fb48388250303d7d3348a116 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -64,7 +64,7 @@ dependencies {

patches/api/0011-Timings-v2.patch

@@ -2859,7 +2859,7 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fed32ada5a5ba6906c0f8e854ad71fd691fe5811..ad4e37b2ce25c5a1d23d663511fff137ce2f29cb 100644
+index 6391011464ac0c95d4da7fb9c698f35c58b40922..a327c71f110fc0330a3a43ab118565d35801eb32 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -870,7 +870,6 @@ public final class Bukkit {
@@ -2871,7 +2871,7 @@ index fed32ada5a5ba6906c0f8e854ad71fd691fe5811..ad4e37b2ce25c5a1d23d663511fff137
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 862f18d72deb1cb56de3f3f31275297a03d9ba0a..c11d3686ff770b25b7fd165426f0bfaa224a5916 100644
+index 01f8e0811f8b337acac31819a85bb44b189b3c21..a1bffe44764fc3e1bb96bf014c56025b0bde7507 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1978,6 +1978,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2933,7 +2933,7 @@ index 0000000000000000000000000000000000000000..45ed63797b13e114bf3795c80a6c3967
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index f3cdf13f22aa789ee8cc235b61fda4035b254219..17d3da22e8fcdf73a587b17a0cdac3b23ded3567 100644
+index 6686d025222dc50156347a1757c88da02f882eec..cee16db367907cfa4b432dc6969f403321a855ea 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -33,7 +33,16 @@ public abstract class Command {
@@ -3450,7 +3450,7 @@ 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 cab45a41e54599588007c9b02a23d1b148dd89f1..205455c3a4ff9664e978814c839f8f2190a180e2 100644
+index 64d32c377d0303ed28011a5f002274de3c16b383..a06daeeee71a5ca58fbc1e13453d9116eadbcac2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2771,7 +2771,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3474,7 +3474,7 @@ index cab45a41e54599588007c9b02a23d1b148dd89f1..205455c3a4ff9664e978814c839f8f21
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 46c7be5fa69f13900860b9944523beea16f2409b..f97669c8b58bc287fc289eeb098836ae314b053a 100644
+index d6f3c8da8bae1f70e0f9bee3e688a04801a3b546..b03f3e0ce9fdb0bb587cf1a1c10b8cfaa2eab09e 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -381,7 +381,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3537,7 +3537,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..f97669c8b58bc287fc289eeb098836ae
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index ab04ffe4cd05315a2ee0f64c553b4c674740eb7f..de6b6188587fd254ab96cbc1f95fda2056d9cbe2 100644
+index 70ac93d420d0a8528428a3d038a2ef6a86d2fddd..2e4a0a66151b358cc89d8eea26002f9fda16ee48 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -55,7 +55,6 @@ public final class JavaPluginLoader implements PluginLoader {

patches/api/0012-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 8d729fb196d83e01e4652fb1f77f5cab7b57cc31..d978c72cdbc10792f852a4ba372518073893d02b 100644
+index a327c71f110fc0330a3a43ab118565d35801eb32..60ad479817c95aef809f73c6688cd6b2a0bb91df 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -83,6 +83,20 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index 8d729fb196d83e01e4652fb1f77f5cab7b57cc31..d978c72cdbc10792f852a4ba37251807
       * 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 57c9b560c77a56588870598acb543469040ceec1..8949b8e29ae7f412481291630a5cb7b5b8809842 100644
+index a1bffe44764fc3e1bb96bf014c56025b0bde7507..f5005063c33d5e7ac030c4d43cb042c18c799284 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -68,6 +68,18 @@ import org.jetbrains.annotations.Nullable;
@@ -55,7 +55,7 @@ index 57c9b560c77a56588870598acb543469040ceec1..8949b8e29ae7f412481291630a5cb7b5
       * Used for all administrative messages, such as an operator using a
       * command.
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index f97669c8b58bc287fc289eeb098836ae314b053a..2c77b6ab388bd689acb8d84ec62bd5df1eb9373e 100644
+index b03f3e0ce9fdb0bb587cf1a1c10b8cfaa2eab09e..48b66054913c8b53e6e7fd34615c2ab54727693f 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -117,9 +117,22 @@ public final class SimplePluginManager implements PluginManager {
@@ -82,7 +82,7 @@ index f97669c8b58bc287fc289eeb098836ae314b053a..2c77b6ab388bd689acb8d84ec62bd5df
          }
          Preconditions.checkArgument(directory != null, "Directory cannot be null");
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index de6b6188587fd254ab96cbc1f95fda2056d9cbe2..eaefbb00e9993d54906cc8cf35cf753c0d6c7707 100644
+index 2e4a0a66151b358cc89d8eea26002f9fda16ee48..b412aaf08901d169ac9fc89b36f9d6ccb95c53d3 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -93,7 +93,7 @@ public final class JavaPluginLoader implements PluginLoader {

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

@@ -5,7 +5,7 @@ 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 22de066aef71ad2cf135d5b6f5d6f224de5fcd2d..1c25725a2abb36a81b1821102daee447c7170197 100644
+index a06daeeee71a5ca58fbc1e13453d9116eadbcac2..bc64083c02bce93a22521173c9430eb5469ba8a6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2623,6 +2623,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 027e96c0e42d701417e16acaa5470d836146ffa6..d0f618136bf5e1f2dcafc9f7c01cebf0f285f20c 100644
+index 60ad479817c95aef809f73c6688cd6b2a0bb91df..e4f7ff41d7205994fef87989a7955d7b8fe4d7f4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2132,6 +2132,17 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index 027e96c0e42d701417e16acaa5470d836146ffa6..d0f618136bf5e1f2dcafc9f7c01cebf0
       * 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 f2cab649bc0771254c7aa9ef0e3f47b4d86b329d..aecba92a6842fba3642bb2596239489230629439 100644
+index f5005063c33d5e7ac030c4d43cb042c18c799284..4f15cc4bcc07d3061dd94b20fc77f549ddfcbb6b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1815,6 +1815,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

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

@@ -234,7 +234,7 @@ index 0000000000000000000000000000000000000000..7915a70d676b1205dcae39259f670af2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5780003631beae773231afe3afc6b834bfe1f84d..a005d5f8879262c763d8c4fbd09b9a99810d5e8c 100644
+index e4f7ff41d7205994fef87989a7955d7b8fe4d7f4..75e0c5b884363be03876103e0d66e67de03c4856 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -110,13 +110,26 @@ public final class Bukkit {
@@ -295,7 +295,7 @@ index 5780003631beae773231afe3afc6b834bfe1f84d..a005d5f8879262c763d8c4fbd09b9a99
       * 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 ba28d9f3213ca4b5f15178dc637bff37a8896edc..8a07f21eeb04fb54032ce377a1478f60303e1824 100644
+index 4f15cc4bcc07d3061dd94b20fc77f549ddfcbb6b..2ed640d5a0027f7a94a5cf4555741c27c9b1b3a4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -120,6 +120,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -316,7 +316,7 @@ index ba28d9f3213ca4b5f15178dc637bff37a8896edc..8a07f21eeb04fb54032ce377a1478f60
       * Gets a view of all currently logged in players. This {@linkplain
       * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index e320729782245b5511cd744c417141508020fd26..8b5e4756d1c80e55be166dbe1faf57799f9cc03b 100644
+index aec092e019667d53faf3e7352799772804d5d260..012b46c82d9d06d1d2da8da626fc5cde6e9e2ca4 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -156,4 +156,13 @@ public interface UnsafeValues {

patches/api/0016-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 c78fb359bd28b8dc1ba242642ec612e856525993..4e1fb0974d061d5bb64899cac576318d2e6f8bf6 100644
+index d7f95863922bf332c674d538eb187015fadae9d8..411297f66520774a4072c9e15aa9bdf03a527208 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -791,5 +791,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -25,7 +25,7 @@ index c78fb359bd28b8dc1ba242642ec612e856525993..4e1fb0974d061d5bb64899cac576318d
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index d96fd494b523491fcf1ac54d164351fd487f65d6..ae1ce2ee2deb82f3f4144ec54b3ba119b437c5e9 100644
+index 5d7d940cdad7915efa639b8940a17dc97b60ecd8..315dcf9da29e077a819f602ebf1c76286164b264 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -126,4 +126,15 @@ public interface FallingBlock extends Entity {

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

@@ -8,7 +8,7 @@ Add per player no-tick, tick, and send view distances.
 Also add send/no-tick view distance to World.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff46469543688 100644
+index ed87e82eb0e30bdea6f7760bb80addcb3bbe59cc..683357f685b1d5f52151a5e78fc5265ebf9d32c2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2968,6 +2968,66 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -79,7 +79,7 @@ index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff464
       * Gets all generated structures that intersect the chunk at the given
       * coordinates. <br>
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1c25725a2abb36a81b1821102daee447c7170197..28e821ca1ec8ec3eba160ef2ed06ab1bb7387cae 100644
+index bc64083c02bce93a22521173c9430eb5469ba8a6..2073aca572a1b751e895373f32fffba0edf026a5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2637,6 +2637,82 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f5a014c23766f1373c0e6abd0c68c2aca097f73b..603adc3be2444c0a575c4027b963a7642a34d0ca 100644
+index 75e0c5b884363be03876103e0d66e67de03c4856..81b3800e86bcd20b47df13e9c9ef3a83abfcb7c6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2361,6 +2361,19 @@ public final class Bukkit {
@@ -29,7 +29,7 @@ index f5a014c23766f1373c0e6abd0c68c2aca097f73b..603adc3be2444c0a575c4027b963a764
      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 8c248efe16829c4715a9382c3e79d4a4594d193c..65ad3ee200d3899ac17abf55043857c9331add8b 100644
+index 2ed640d5a0027f7a94a5cf4555741c27c9b1b3a4..1b18d3916f3972675d9371ec5c6e020d70a723f6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1835,6 +1835,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0020-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 26f3ac9c15ff554becfe8ea53a48f67b2de60ed6..bd3fa2bcee24ab7e8f740722f55ed6294fdb294a 100644
+index 81b3800e86bcd20b47df13e9c9ef3a83abfcb7c6..1ada54827acfaacab0a32ae5d55def952547c352 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -472,6 +472,30 @@ public final class Bukkit {
@@ -41,7 +41,7 @@ index 26f3ac9c15ff554becfe8ea53a48f67b2de60ed6..bd3fa2bcee24ab7e8f740722f55ed629
       * 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 d78481bf17818415524f14417caf86d5684b2235..067eb3a5f5676f3b1b3f49a65df9c4054c48a1e7 100644
+index 1b18d3916f3972675d9371ec5c6e020d70a723f6..93d924c586803161820707af823c352f7c5d40e1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -383,6 +383,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -76,7 +76,7 @@ index d78481bf17818415524f14417caf86d5684b2235..067eb3a5f5676f3b1b3f49a65df9c405
       * 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 28e821ca1ec8ec3eba160ef2ed06ab1bb7387cae..fefd6b8a4171c9ec3d2a09d1accb9f37d66aa5b9 100644
+index 2073aca572a1b751e895373f32fffba0edf026a5..17f55697d02d7b9c9b42c4b89a33db9207622a36 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1254,6 +1254,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -494,7 +494,7 @@ index 36fc2c35395c72f8b81a2a2f3265fd205384ce26..c7fa1d235cea78bda4656ed66b8d42b1
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 2c77b6ab388bd689acb8d84ec62bd5df1eb9373e..b878e7167cfcdea0e224c182b40abeadd339d3b3 100644
+index 48b66054913c8b53e6e7fd34615c2ab54727693f..001465eedafa51ac027a4db51cba6223edfe1171 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -528,7 +528,8 @@ public final class SimplePluginManager implements PluginManager {

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

@@ -432,7 +432,7 @@ index 0000000000000000000000000000000000000000..20a028450667edf102b59b6b50ac6e89
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fefd6b8a4171c9ec3d2a09d1accb9f37d66aa5b9..2685a6fcda7afa23d3f5067af1d5d2fc89bdb0e6 100644
+index 17f55697d02d7b9c9b42c4b89a33db9207622a36..01fcff92daec5d4bf4b2b9213925cd2604cdec98 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1288,6 +1288,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -5,7 +5,7 @@ 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 2685a6fcda7afa23d3f5067af1d5d2fc89bdb0e6..47a0d09b433024cd464737eced8a31f995b1ffaf 100644
+index 01fcff92daec5d4bf4b2b9213925cd2604cdec98..cb758b5907aa0c214123550fe14ccfdacbc6b208 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2252,6 +2252,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -6,7 +6,7 @@ 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 7d49ffba8e507762a61563b536dfbf93bffa644d..0360e070d9fbb45c84e0b95d4f4d2253202191a8 100644
+index 1ada54827acfaacab0a32ae5d55def952547c352..13fa39ed3d5ffa8a459d68d1e240e869ba42ac32 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2396,6 +2396,13 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 7d49ffba8e507762a61563b536dfbf93bffa644d..0360e070d9fbb45c84e0b95d4f4d2253
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 42ea960fe29a1638b9ef69bdd5c58caf963fe30a..b36b9bd8aa71ea5b9ea20d2752e6e59d33c9f978 100644
+index 93d924c586803161820707af823c352f7c5d40e1..6567d1746f5cf16c9f3518203dd9916ff916ca68 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2096,4 +2096,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0030-Custom-replacement-for-eaten-items.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-index 5c054eb531e3caf17c179aff6a712fb8c33d8f77..6110d0417340710333b44312d82c7bd5165a8954 100644
+index 36b16b6076321310b6ed60e515064e506b706b58..3208dedfb6769e3e8c2ebeb17c0e02d80adf233a 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 @@ -24,6 +24,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index 4d9938249684b7db01b78baf4eeeaa2e0638a963..493f81ba879d1eb29a32722da27e4ff7ce4c68a8 100644
+index 9cebf79b6217063fbce395b655261ee4ab0f4e45..c901990454ec930169b0dc561987bea101f9b6ae 100644
 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java
 +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
 @@ -186,4 +186,38 @@ public interface AbstractArrow extends Projectile {

patches/api/0040-Add-EntityZapEvent.patch

@@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..af2b1629f845ffe1559e7d580b482636
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0e0ed93b568fd2c0d8f6e359c31dc29cb0fa71c2..085337f3d3d6adef5fd4ecda133c607e4b77bd93 100644
+index c5aa91c68ec24e3d07d7cb18ac8a75c4a8f743ca..7119dc013f087be7e01fc3fedc4361f76b4edae7 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 @@ -12,14 +12,14 @@ import org.jetbrains.annotations.NotNull;

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

@@ -6,7 +6,7 @@ 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 0360e070d9fbb45c84e0b95d4f4d2253202191a8..41a645a040561d3dca83a3c1f2ca7cdfb4f7550b 100644
+index 13fa39ed3d5ffa8a459d68d1e240e869ba42ac32..5660aa59d33ef2387839b9a67637672e6412088e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2403,6 +2403,15 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 0360e070d9fbb45c84e0b95d4f4d2253202191a8..41a645a040561d3dca83a3c1f2ca7cdf
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b36b9bd8aa71ea5b9ea20d2752e6e59d33c9f978..72a472f048107181bc84599836fc2fc64c89ea8a 100644
+index 6567d1746f5cf16c9f3518203dd9916ff916ca68..2c0e3ce1e6bb9602e1af11711b573f0080aa6f4c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2098,4 +2098,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

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

@@ -5,7 +5,7 @@ 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 47a0d09b433024cd464737eced8a31f995b1ffaf..9513ce004101bd1bef90ca4a558f6b7c28d97adb 100644
+index cb758b5907aa0c214123550fe14ccfdacbc6b208..e014582d73fc821c0b6dcf19ae1f5dfdf510343c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1255,6 +1255,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index dc604d6ab9dcf67fa0791539d18c2f890a814ed8..91fc11dda99de506be83d40df8929bf7cd8e8d85 100644
+index d08c5eb82eab8ad0ca7c8602b4d3d92fb0df02b3..6a1d563d1b7ea7e1060dfacfba98e4e1d4295790 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -344,4 +344,21 @@ public interface ArmorStand extends LivingEntity {

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

@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0a3a66e04f8785874f10a76603bff46469543688..9885fd1adc1f93a80d650e6d42dfa3a0b084db9f 100644
+index 683357f685b1d5f52151a5e78fc5265ebf9d32c2..e5d3ccf6e1bc87db1f5602214371c0e8ed4d5431 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -49,6 +49,33 @@ import org.jetbrains.annotations.Nullable;

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

@@ -6,7 +6,7 @@ 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 41a645a040561d3dca83a3c1f2ca7cdfb4f7550b..0bd1480af001c86bc526875229f4ffa4e9945491 100644
+index 5660aa59d33ef2387839b9a67637672e6412088e..29e13fd7c94c5c50e81b804e6dffc8721164f1d1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2412,6 +2412,16 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index 41a645a040561d3dca83a3c1f2ca7cdfb4f7550b..0bd1480af001c86bc526875229f4ffa4
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 72a472f048107181bc84599836fc2fc64c89ea8a..376712ee54e06fbc9e5f11016ca7ba6d9ae42b32 100644
+index 2c0e3ce1e6bb9602e1af11711b573f0080aa6f4c..4225105fef7aee264b34d1687762b5fc8dccbc47 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2100,4 +2100,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -46,7 +46,7 @@ index 72a472f048107181bc84599836fc2fc64c89ea8a..376712ee54e06fbc9e5f11016ca7ba6d
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 17d3da22e8fcdf73a587b17a0cdac3b23ded3567..8a298b655f4eaf5116994f98572a20e83a23838c 100644
+index cee16db367907cfa4b432dc6969f403321a855ea..0ee08b6cd80e72ae67e1316ddbb58b7c1d47e5ce 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -107,7 +107,7 @@ public abstract class Command {

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

@@ -98,10 +98,10 @@ index db6fcd635e295e561642d49941fd8e611247d38e..344b2b5d9207d2645bc5417d1ec00dd0
      MOTION_BLOCKING_NO_LEAVES,
      /**
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 13557f78a6853fdf0619f0479cab7591ddadf666..a1896780f312a91ab2330d2c850641d66143f23e 100644
+index bc23886a62312fc9e222ff2c6e7a7f325397d36a..ecf9f941e618608b98feaac46df3f10ec951c186 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -206,7 +206,7 @@ public enum Particle implements Keyed {
+@@ -207,7 +207,7 @@ public enum Particle implements Keyed {
      }
  
      /**
@@ -1622,10 +1622,10 @@ index 35c6594fd1040a1af1029e7260e5e3a9307b107d..d58719ee75bef8bc265bfc81bc5d88a4
      void addChargedProjectile(@NotNull ItemStack item);
  }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f83ec1c5ddce1a35b1c164b988f7fc6b9c310322..c81465e35808135329495fc4669d5616421451b7 100644
+index 77f0e0a9e991f65b89909d0307fd93c3ecd9d8ac..5cc1d77a09d2877992433b020ad2c591bb94d3fd 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -744,7 +744,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -767,7 +767,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * The returned component is a snapshot of its current state and does not
       * reflect a live view of what is on an item. After changing any value on
       * this component, it must be set with
@@ -1634,7 +1634,7 @@ index f83ec1c5ddce1a35b1c164b988f7fc6b9c310322..c81465e35808135329495fc4669d5616
       * to apply the changes.
       *
       * @return component
-@@ -753,7 +753,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -776,7 +776,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      JukeboxPlayableComponent getJukeboxPlayable();
  
      /**
@@ -1643,7 +1643,7 @@ index f83ec1c5ddce1a35b1c164b988f7fc6b9c310322..c81465e35808135329495fc4669d5616
       *
       * @param jukeboxPlayable new component
       */
-@@ -780,7 +780,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -803,7 +803,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Return an immutable copy of all {@link Attribute}s and their
       * {@link AttributeModifier}s for a given {@link EquipmentSlot}.<br>

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

@@ -337,7 +337,7 @@ index 0000000000000000000000000000000000000000..35341d8f1ac2d80f339084ef80d099a5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c900bde81d8f20ed4775228fbe767d7db62508fa..6c44f58551dda4129d37cce100a9c5b9c9810cca 100644
+index bacdb1742ecb98bb10651b0582500449bf904910..c351fb49a8d044312ca77f5cd85d939a95bdae20 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2424,6 +2424,89 @@ public final class Bukkit {
@@ -431,7 +431,7 @@ index c900bde81d8f20ed4775228fbe767d7db62508fa..6c44f58551dda4129d37cce100a9c5b9
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0588c6c8b30bfe6e1e8ab7e1523a8a9be6b11b6f..55d8602bb651f85b9d0a80ec015cec5e48948d44 100644
+index a506e618448c3bf4b56f54f8fe00d7158df29dd7..51bed70fdc7221f41035e13af1fba69b492507ac 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2108,5 +2108,80 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
-index 951ea2cc763973655beedcba3c75332d3f297313..e528d811f651696069dbd2fd21c5ffad294b26af 100644
+index a73d1b9717bb6d745f909317474cf3b4380d5cb3..f5166bbf94d5fc24c10888a384003a5f8181ac69 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull;

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

@@ -5,7 +5,7 @@ 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 46a076bd8dc2f5d1094899638ab255a5a31c2568..08cef0d9fc27d0c09472cfe7091330d95956d9eb 100644
+index c90a0a00be78200adf217e2b3a8302b59af3cf7c..b4452d18a530c4c4a9bc10f368aeced9430b42a2 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -377,6 +377,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

patches/api/0060-Entity-fromMobSpawner.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 539b3527d0c66611e21712f29b90fba939e661e3..6dad1a01264f7776ca6f31e621ea4fbb295efb5d 100644
+index 45d408f519767785b222c409170bbfecbd8d1931..ca81360956276047602958949148b6a70cc3e954 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -805,5 +805,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

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

@@ -33,7 +33,7 @@ index d5342258086066d3b9ef404916bad8440f0cf0cd..333884bc8fe45c66d37a1bbcebc10ea6
 +    // 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 730c42eddd38acec1cdbb19dfc8c675795d1e68d..da706fd72367b26b919ce08a5e118582020d4fbc 100644
+index a71a37e3833b6a339c4df8939768c2bd46a816a5..e2cc1ea49f5b7fa06ef388c922184835a84f9440 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -642,5 +642,20 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

patches/api/0064-ensureServerConversions-API.patch

@@ -30,7 +30,7 @@ index 333884bc8fe45c66d37a1bbcebc10ea655d2055f..c1ec8efffd5ff2a4dcb1d761be9a431a
 +    // 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 da706fd72367b26b919ce08a5e118582020d4fbc..29bc12cb3095282a31f01f08ac66c15b24f42524 100644
+index e2cc1ea49f5b7fa06ef388c922184835a84f9440..e66a958bc36ac774081d5e71966f312ebb8228d9 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -566,7 +566,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

patches/api/0065-LivingEntity-setKiller.patch

@@ -5,7 +5,7 @@ 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 b0fbad5de65c33710ec46734ad6c69ec9b2769d5..e6bdfd14bffa394cd717de7118de951a997f50b3 100644
+index 4b75a5e1ce788bc375d6147422e5bee6ef0c03be..055ba78f61dfa2d791361ae3b74611131e95dda7 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -365,6 +365,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

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

@@ -14,7 +14,7 @@ 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 5ee8db3fcf3d3ac1c8b998b227aff0965960896a..a65956b1fc2f4f1b1edf355682b5b54541ec9bce 100644
+index feb047d20178f957fb48388250303d7d3348a116..09e35d410f86fc6ed894c072b77a49f9bb4ce78d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,8 @@ java {

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

@@ -9,7 +9,7 @@ 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 bda4ab21b3ac2acbe328c0c6887c33283399971e..f3b3606dc5881e931853fc2631aad9ca9083474d 100644
+index f440da5941e11c30145175cf24162e1ba2b4e3cf..69d97a14715040263afec77d0ba623c2ac84062a 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -272,6 +272,16 @@ public interface Block extends Metadatable, Translatable {

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

@@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..c84ce3fc874eea3d8f0b1cf5273996d9
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c8ba70f787a3460c1f9faaeaab086e9e43ecaf6f..1a6ddc4228ed4c26235cfe56b1e0a102c7aa320f 100644
+index 5b12fa8c41a18ddfe08d82c138c0f71106c89d4d..2c9a1378ec8da80e95f2e9e1f3a464ea7b17da93 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -58,7 +58,7 @@ import org.jetbrains.annotations.Nullable;

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

@@ -10,7 +10,7 @@ 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 1a6ddc4228ed4c26235cfe56b1e0a102c7aa320f..0d92eac00ba883d696d45340feb808988be05c16 100644
+index 2c9a1378ec8da80e95f2e9e1f3a464ea7b17da93..fcb83800bc4cbaa96e5f190e0cf618542d8bb637 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1588,6 +1588,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0084-Add-ArmorStand-Item-Meta.patch

@@ -95,10 +95,10 @@ index 0000000000000000000000000000000000000000..7e4acfff16db80a75e1ff2fee1972b16
 +    void setMarker(boolean marker);
 +}
 diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index 9a28c9dfe8dd5dd73f08ab4907db7f257719dc7e..88e1883dffb64974f5ec60acbf2828cfb9de9439 100644
+index 4f3579253e56bd868a084767854192863961d7c9..71c4f2cbf8310941b316357d0c799b1e31418d0f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemType.java
 +++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -1942,7 +1942,7 @@ public interface ItemType extends Keyed, Translatable {
+@@ -1903,7 +1903,7 @@ public interface ItemType extends Keyed, Translatable {
      ItemType.Typed<ItemMeta> RABBIT_STEW = getItemType("rabbit_stew");
      ItemType.Typed<ItemMeta> RABBIT_FOOT = getItemType("rabbit_foot");
      ItemType.Typed<ItemMeta> RABBIT_HIDE = getItemType("rabbit_hide");

patches/api/0088-Add-extended-PaperServerListPingEvent.patch

@@ -534,7 +534,7 @@ index 0000000000000000000000000000000000000000..517d15238ed117f38bbd39f570874014
 +
 +}
 diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-index 72ebc29db42d08d1d0361dba462fc8a573fbf918..d351f62971f8f1317b3fc92f8b1d446e48149c3a 100644
+index 1cc5a0abce39c939398ce945dd916dc086888b13..e11b81e711093b1851449c0532bc5103abb1b81c 100644
 --- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
 +++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
 @@ -248,9 +248,11 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>

patches/api/0089-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 dcf6b2d04f9e1bc7466feda22069423d638fb4b3..da18fbc38976c601da7781b488449da7d724160f 100644
+index c351fb49a8d044312ca77f5cd85d939a95bdae20..c50b69ace8c7e92d0bb141b301c541ec1e382324 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1380,8 +1380,10 @@ public final class Bukkit {
@@ -43,7 +43,7 @@ index dcf6b2d04f9e1bc7466feda22069423d638fb4b3..da18fbc38976c601da7781b488449da7
          return server.createPlayerProfile(name);
      }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46221036bd 100644
+index 9f599e44c9519d8eaaedf2a11cce1637b0f23aec..2f404c6cefbbd842932620aa62750b343e90e41c 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -59,7 +59,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -56,7 +56,7 @@ index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46
      /**
       * 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 7a1b80e8d02f23c5d246c3032e5ced909f10bd41..01c052d90bbdad3fc374eb9c8e0a5133b8b624e8 100644
+index 51bed70fdc7221f41035e13af1fba69b492507ac..4c10cc9524c3001777c520a32c498108449980fb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1167,8 +1167,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -93,7 +93,7 @@ index 7a1b80e8d02f23c5d246c3032e5ced909f10bd41..01c052d90bbdad3fc374eb9c8e0a5133
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0d92eac00ba883d696d45340feb808988be05c16..357e12c91a710751dc5bf3138362c10e5a26db1e 100644
+index fcb83800bc4cbaa96e5f190e0cf618542d8bb637..3611ef03abe9c81cfb956c9957c57e7df05faf32 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3154,6 +3154,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0090-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 da18fbc38976c601da7781b488449da7d724160f..28b86658aea14b33470508944d8626b23c65bba2 100644
+index c50b69ace8c7e92d0bb141b301c541ec1e382324..4cdbcb96b358bc678255ae3852cef047a2df2457 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -753,6 +753,20 @@ public final class Bukkit {
@@ -34,7 +34,7 @@ index da18fbc38976c601da7781b488449da7d724160f..28b86658aea14b33470508944d8626b2
       * 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 01c052d90bbdad3fc374eb9c8e0a5133b8b624e8..5c6c9f714097dfaead0093d752f1b373b70a75eb 100644
+index 4c10cc9524c3001777c520a32c498108449980fb..957bc4c3e4c1eb6a4d89b5e559f95b604ecf59c4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -633,6 +633,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

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

@@ -8,7 +8,7 @@ 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 abbf3d6f11350ab2dd47a277771d9f46221036bd..a9d63b1630b05b86a0396355fcfee261bab96293 100644
+index 2f404c6cefbbd842932620aa62750b343e90e41c..11b470b07a8b5d9e7f87df5abe9bd4f5bf9f86ef 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -67,6 +67,73 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -86,7 +86,7 @@ index abbf3d6f11350ab2dd47a277771d9f46221036bd..a9d63b1630b05b86a0396355fcfee261
      /**
       * 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 ecc0bbf986b065620910f3592115c0f45e863b98..354beb974012fa83fdac0c9d28166016ace93070 100644
+index 949b34e9c9f8b4be48c09f80d78d9453f0ff0ee3..c65a1204c948df81664357524d9d1e6abafb7776 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1255,6 +1255,186 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0096-Additional-world.getNearbyEntities-API-s.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c4f2f03ec31998d486dad1d45ef83df3f77b5e28..9cf4823ddf1b8291e8c11c39c02c1fed58c18936 100644
+index 369e92f2b5e4b8fc7f5bf8a97058e827c91e4c59..79e5b429fe5660695e9fa603f8bc1fc1352b8950 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@

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

@@ -597,10 +597,10 @@ index 0000000000000000000000000000000000000000..6c405755f4507d6fbc6c3877c611a719
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index a1896780f312a91ab2330d2c850641d66143f23e..37e7862be843da4f48ac061fb1625854fd671b2a 100644
+index ecf9f941e618608b98feaac46df3f10ec951c186..605588eb0613dedec9cba696503a85abf1a8b280 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
-@@ -205,6 +205,18 @@ public enum Particle implements Keyed {
+@@ -206,6 +206,18 @@ public enum Particle implements Keyed {
          return key;
      }
  
@@ -620,7 +620,7 @@ index a1896780f312a91ab2330d2c850641d66143f23e..37e7862be843da4f48ac061fb1625854
       * Options which can be applied to 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 9cf4823ddf1b8291e8c11c39c02c1fed58c18936..44a74f15bea60ecd8380520e8faaea41a6c261c5 100644
+index 79e5b429fe5660695e9fa603f8bc1fc1352b8950..f1d59d22d805cfe5ac2707c88a917bf17ae38b96 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2948,7 +2948,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient

patches/api/0103-PotionEffect-clone-methods.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PotionEffect clone methods
 
 
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index 89d49ce1e9475bf2d3748e483360451359e8cef8..575156c089e45a3d6a43ca6b7adfbc7b473a60ab 100644
+index 6478faee913d9a3bee0beb83a2cc4ecfa4f8df90..0d60a1b740199783d3fcb775f190ee85bd84696b 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
 @@ -109,6 +109,33 @@ public class PotionEffect implements ConfigurationSerializable {

patches/api/0105-ItemStack-getMaxItemUseDuration.patch

@@ -6,7 +6,7 @@ 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 29bc12cb3095282a31f01f08ac66c15b24f42524..f908c11ece7b3d1a52e21540999f36796237d590 100644
+index e66a958bc36ac774081d5e71966f312ebb8228d9..a3de566c8f0ea4dcdb158f9ef0876a3b14429140 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -670,5 +670,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

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

@@ -5,7 +5,7 @@ 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 e6bdfd14bffa394cd717de7118de951a997f50b3..2d4d93a4fc3f712a21bd61e203407f3a84e16310 100644
+index 055ba78f61dfa2d791361ae3b74611131e95dda7..d71fa7359619bca9fab4ecfb05af04b292416217 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -847,5 +847,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

patches/api/0108-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 1a8366f6757431baaba4f3d48abea3cf0ec1f1ad..e4efcd757ca51a4edd396f55c812dbe89ffb68c7 100644
+index 8200ac4e2990d8751f9c5fb02bc5e173d59d7d94..85e2277efa62d8610979003b6d37bda4352e732e 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 {

patches/api/0111-Add-entity-knockback-events.patch

@@ -280,7 +280,7 @@ index 3f17290c0863cc1d452bb50c524c18b6ab255d70..bd44bc5ed9e20148f9b2ab3d20491872
  
      private final Entity source;
 diff --git a/src/main/java/org/bukkit/event/entity/EntityKnockbackEvent.java b/src/main/java/org/bukkit/event/entity/EntityKnockbackEvent.java
-index 9355efbbd4625e34d6c9d26bcbd02272202dec79..753e6f30da4f3dc9d5ed7d1b40d30b602b8c8c9e 100644
+index 692c6010198b06dc56c31e0392a60dcc6cfe5800..0d465629ecd86ba796e99d35c0492597535cb258 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityKnockbackEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityKnockbackEvent.java
 @@ -11,7 +11,10 @@ import org.jetbrains.annotations.NotNull;

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

@@ -111,7 +111,7 @@ index df88bc77a3fa2506adf17eddc6300ac65774df6f..fe2e0939df61b1f59d12adf3f760f1d6
      /**
       * Returns a list of entities within a bounding box centered around a Location.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 44a74f15bea60ecd8380520e8faaea41a6c261c5..c2b5fdaace13c8bd46c073ac6d427fe411d96367 100644
+index f1d59d22d805cfe5ac2707c88a917bf17ae38b96..62a0e6efcc33f56b26fa917276ac09737d4bf362 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1424,6 +1424,104 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient

patches/api/0113-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 f908c11ece7b3d1a52e21540999f36796237d590..d125d29759167996a90b7b69d92d944e80af22ab 100644
+index a3de566c8f0ea4dcdb158f9ef0876a3b14429140..080d9a9e26131eb43649104c3d59691308f79fe7 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -686,5 +686,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

patches/api/0114-LivingEntity-Active-Item-API.patch

@@ -9,7 +9,7 @@ such as a bow or eating food.
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 00b803cee96fef8830e5db8722c98ff14630fd2a..5acc8740d14b53aadef1aa4d63d3355149acd0e2 100644
+index 35d72d8ab78ca4095545fab54d6b440c040223eb..4d72da8b04c72f296bc3f8e00e54f4d79e531d44 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -367,7 +367,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -23,7 +23,7 @@ index 00b803cee96fef8830e5db8722c98ff14630fd2a..5acc8740d14b53aadef1aa4d63d33551
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 2d4d93a4fc3f712a21bd61e203407f3a84e16310..434ad8b07b6ee0b0919de8044d14fe3c789e203f 100644
+index d71fa7359619bca9fab4ecfb05af04b292416217..f8eb5527b4e0520712f4d8c329ba9d5dc4a4d206 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -202,15 +202,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

patches/api/0115-RangedEntity-API.patch

@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..09c82908f63233febfe1e07fe756f1c3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/AbstractSkeleton.java b/src/main/java/org/bukkit/entity/AbstractSkeleton.java
-index e2fce218c6623b3c932c2782a66dea73dccd33f1..4f4f1e48cdaee0d845f60666569e48731be3fbb9 100644
+index 6ffacd3af2b03a403d80fa9a141a819cbde34fc6..2d81d077015fff47c5a5b64e2e1c74f962b4ceee 100644
 --- a/src/main/java/org/bukkit/entity/AbstractSkeleton.java
 +++ b/src/main/java/org/bukkit/entity/AbstractSkeleton.java
 @@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;

patches/api/0116-Add-World.getEntity-UUID-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c2b5fdaace13c8bd46c073ac6d427fe411d96367..2053c92bc7e81b420ebf96cbd5f1275c514dd5f3 100644
+index 62a0e6efcc33f56b26fa917276ac09737d4bf362..002bfadfd4efa3d376a0a7bc5c752e8a02494eec 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -932,6 +932,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient

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

@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 5acc8740d14b53aadef1aa4d63d3355149acd0e2..6c2f01bf452d991faf40b995225bf7b7e49281df 100644
+index 4d72da8b04c72f296bc3f8e00e54f4d79e531d44..a7824c9f133f433cb9f98326348b4b6ae725a39d 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -187,6 +187,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

patches/api/0119-Entity-getChunk-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6dad1a01264f7776ca6f31e621ea4fbb295efb5d..48177547ec93fb5a807897a6fb472582a78f3978 100644
+index ca81360956276047602958949148b6a70cc3e954..45f06224d476551267e9b083985051ae9954d756 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;

patches/api/0123-Allow-disabling-armour-stand-ticking.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 7dc631ebd009f5f5c3ac1699c3f3515c47609c05..2ee3814a52945f541e049b621b9552f8ae9e261d 100644
+index c727b2d40efae8f08bdd159991afb8992568a58f..38538ad590f33c67cf63ed3bfb177e172f4dc43c 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -363,5 +363,21 @@ public interface ArmorStand extends LivingEntity {

patches/api/0129-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -44,7 +44,7 @@ index 20ed1c40437cbf8449dd4d7876086ccb6407b470..8764441ec1bae67a029b13c4c9824657
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2053c92bc7e81b420ebf96cbd5f1275c514dd5f3..11362777d834cad2265984c7aa493358105cbf68 100644
+index 002bfadfd4efa3d376a0a7bc5c752e8a02494eec..3dc2e420d8a6cf02fc4215d4d8056c44e829157f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -182,6 +182,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient

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

@@ -50,7 +50,7 @@ index 56fd66a3fb5f6e33812d2981cd192d317453a0f5..12e1733d06471d0c2253ae846ee93a09
       * @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 11362777d834cad2265984c7aa493358105cbf68..c474f6f0f1d758507f53c6f1ffbe3e26883e1425 100644
+index 3dc2e420d8a6cf02fc4215d4d8056c44e829157f..eaa51337616746a7ee1407c1fdcb7246f9483a8b 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -99,6 +99,41 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -96,7 +96,7 @@ index 11362777d834cad2265984c7aa493358105cbf68..c474f6f0f1d758507f53c6f1ffbe3e26
       * 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 f3b3606dc5881e931853fc2631aad9ca9083474d..bb3cf2c5e2acbcd7cf53ad8551a5b11fa6104ada 100644
+index 69d97a14715040263afec77d0ba623c2ac84062a..a5b03162e5c0484db57d0ce0e57e945840fe1357 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -156,6 +156,82 @@ public interface Block extends Metadatable, Translatable {

patches/api/0133-Slime-Pathfinder-Events.patch

@@ -205,7 +205,7 @@ index 0000000000000000000000000000000000000000..0ea085c4a1cf663e2333444cebda876d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
-index bfac874840cf1f36afba16ae4d176c5821a68cfb..335b92e7be49ae13b2a1140183650642063a4219 100644
+index 0a2d603bf6a3f60d3fa7d85df6ef2373fc93d848..26d09d2029d470343b2b70112cb1460945c026e7 100644
 --- a/src/main/java/org/bukkit/entity/Slime.java
 +++ b/src/main/java/org/bukkit/entity/Slime.java
 @@ -24,4 +24,20 @@ public interface Slime extends Mob, Enemy {

patches/api/0137-isChunkGenerated-API.patch

@@ -37,7 +37,7 @@ index 12e1733d06471d0c2253ae846ee93a09140843cc..b02efba048be00e42502111fcdd22975
  
      /**
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c474f6f0f1d758507f53c6f1ffbe3e26883e1425..ba9ab1d46effe1e6c08cebddb8b856e2b294d7cb 100644
+index eaa51337616746a7ee1407c1fdcb7246f9483a8b..2986793d6e3e71ae900bbd3293af288d4ad0b503 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -248,6 +248,19 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient

patches/api/0139-Async-Chunks-API.patch

@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ba9ab1d46effe1e6c08cebddb8b856e2b294d7cb..1161c286aaaaad761c80ca97c25fd166365bb044 100644
+index 2986793d6e3e71ae900bbd3293af288d4ad0b503..9517091f601f362f80ff6062f53eff760f040e6c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -977,6 +977,509 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -522,7 +522,7 @@ index ba9ab1d46effe1e6c08cebddb8b856e2b294d7cb..1161c286aaaaad761c80ca97c25fd166
       * Get a list of all players in this World
       *
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 48177547ec93fb5a807897a6fb472582a78f3978..99e1f17fddf9cebe7057998d1635804c55f18312 100644
+index 45f06224d476551267e9b083985051ae9954d756..b808044403e6b38d1801aefde2176d630c747a64 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -168,6 +168,39 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

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

@@ -78,7 +78,7 @@ index 0000000000000000000000000000000000000000..bb12061985cdffbacfa2d113beaa35b2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 434ad8b07b6ee0b0919de8044d14fe3c789e203f..09b0dd1b14e2848253c1d3bfecb98951764737ee 100644
+index f8eb5527b4e0520712f4d8c329ba9d5dc4a4d206..9ffa42e3d241dd209813cea993c8fcda72f1a935 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -85,6 +85,98 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

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

@@ -5,7 +5,7 @@ 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 354beb974012fa83fdac0c9d28166016ace93070..76ffe308ae2e3bc36c0e7e1a98adc4b307f4211f 100644
+index c65a1204c948df81664357524d9d1e6abafb7776..f84c55b9a93aae762ed28cc536eccbd7a503177a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3356,6 +3356,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index a53b79552a8a810ec0b1f1943e30c470217b26a9..6ebf024d5c2d5fc7253319b68ceed212de1cd73d 100644
+index b8d3b0c4738c5a2886d9728f396df1746ea4f859..9d1f82be4f23af37ccc6db65756f6dd3028c6837 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -134,6 +134,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -135,6 +135,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * An enum of all material IDs accepted by the official server and client
   */
@@ -16,7 +16,7 @@ index a53b79552a8a810ec0b1f1943e30c470217b26a9..6ebf024d5c2d5fc7253319b68ceed212
  public enum Material implements Keyed, Translatable {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -4846,6 +4847,22 @@ public enum Material implements Keyed, Translatable {
+@@ -4817,6 +4818,22 @@ public enum Material implements Keyed, Translatable {
          });
      }
  

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

@@ -1140,7 +1140,7 @@ index 0000000000000000000000000000000000000000..bc07aaa5a001f8b58d0603d5db88f9c5
 +        .ensureSize("WATER_BASED", 12).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 2877eba0017ab8f3d94ca40a5e575e80adf0952e..0eca6dc6bcd9bbcad0a98a5956091bec362f2db6 100644
+index fb7d8bb34561ef686c2b53175ba55b4b72a82674..8420fb1c6059ea9f782a47d18c465ba515765085 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
 @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;

patches/api/0149-Add-LivingEntity-getTargetEntity.patch

@@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..caa56541c435a3d9103cb0220ab88563
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 09b0dd1b14e2848253c1d3bfecb98951764737ee..9e0137ea412ec8c65b2903a76499ba8222446ea3 100644
+index 9ffa42e3d241dd209813cea993c8fcda72f1a935..775f18abe007edc73ed60eb45f84bd79912f9331 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -175,6 +175,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

patches/api/0150-Add-sun-related-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index f314f8bc5c437c5703c1e093278d9046903ff2c8..a8fe8c2f4327f0bee60eeac565620117f3fde2ee 100644
+index 9517091f601f362f80ff6062f53eff760f040e6c..10e9981c9068c39dfdda5c9f82558d481288a8c6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1835,6 +1835,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient

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

@@ -5,7 +5,7 @@ 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 720f1cc07824fe6e46cdd8bbe8f5a9b15b9c816d..f9067281bd5f1ac11dcb9cc2e19f3c5f17face21 100644
+index 4cdbcb96b358bc678255ae3852cef047a2df2457..e0b22dd1124f02a78e5adfcf2179eadebff1dba6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2445,6 +2445,28 @@ public final class Bukkit {
@@ -38,7 +38,7 @@ index 720f1cc07824fe6e46cdd8bbe8f5a9b15b9c816d..f9067281bd5f1ac11dcb9cc2e19f3c5f
       * 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 f1d2776eab476aae60b5dd5cb7eeb41a2235825c..2719461e49a74f979d49dea9c664dfe3da8d2c8e 100644
+index 957bc4c3e4c1eb6a4d89b5e559f95b604ecf59c4..7b5f6091c8e930526a2a5346a02b52912c38e2af 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2127,6 +2127,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -66,7 +66,7 @@ index f1d2776eab476aae60b5dd5cb7eeb41a2235825c..2719461e49a74f979d49dea9c664dfe3
       * Creates a PlayerProfile for the specified uuid, with name as null.
       *
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 8a298b655f4eaf5116994f98572a20e83a23838c..03d2643d166824458c88a49f20270e93b14f3988 100644
+index 0ee08b6cd80e72ae67e1316ddbb58b7c1d47e5ce..92b905e5da3cb8f477bb17d848c3523781545ae3 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -192,10 +192,9 @@ public abstract class Command {

patches/api/0156-Add-more-Zombie-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index 336b3efaf0a8ed5a238e8b941193d690e8b72d71..c1a5b625ea602d751a8026d989882c60e80756c9 100644
+index c69eaf2ff582a6ec8a3b83daba2ab1e3a7bec7d3..ec6d6052bfd0deb431e9a71329169c97fa498bcd 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
 @@ -107,4 +107,60 @@ public interface Zombie extends Monster, Ageable {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Change the reserved channel check to be sensible
 
 
 diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
-index 1d061412cdafa28c6940c7433747ab1dabe23de1..6fda7f3aa68e76af64362e9afed70fc6a5e92986 100644
+index ed39f5116bdfba63f14aadfe81173fe2b68af4d7..8e96be6033e94d4f0bebb346ad222abe18d1f274 100644
 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 @@ -172,7 +172,7 @@ public class StandardMessenger implements Messenger {

patches/api/0160-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 a98fc2ffdae1a2f8f3a312bed95268e105f7f791..91bfeffcdbe47208c7d0ddbe013cd0f11fddfa32 100644
+index 9ef4221742eea7e091f240e2721d5260d153c7c1..653837b5f3a5fb9e5aa806f8ef8ae56fb53cce02 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
 @@ -157,8 +157,6 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
@@ -22,7 +22,7 @@ index a98fc2ffdae1a2f8f3a312bed95268e105f7f791..91bfeffcdbe47208c7d0ddbe013cd0f1
      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 e9bac744c5b173e6767e2de8480a6697969fdbb0..fa03cf187db29896f5af046b311f67881aee0ff4 100644
+index 55f4a6efa7dfb64f131f735f92356d01e7cc775a..90b58219ca99dfd4368119183bb414e51c0f0dd1 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -180,6 +180,13 @@ public class ShapedRecipe extends CraftingRecipe {
@@ -40,7 +40,7 @@ index e9bac744c5b173e6767e2de8480a6697969fdbb0..fa03cf187db29896f5af046b311f6788
       * 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 a7513c1aa09b88e3f99e7db40661fd83e682de96..63a233cc819d8d6995d14b9dbfabc14d89af54cc 100644
+index a9d1f9fc129f757353b879fc5946c4b9299833ea..d4a9572a0fedee8993d32ca006a28a242d148e36 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -132,6 +132,40 @@ public class ShapelessRecipe extends CraftingRecipe {

patches/api/0164-Add-PlayerPostRespawnEvent.patch

@@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..e82446ec3d706c47ac9a544f70d0c19b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
-index c3d9d95be50eacb212108a01b612756f772956aa..03225d2b4c91caa58c2995d9cf0e7fb4663749ab 100644
+index d6b4c81ef51662ee6bbfa0579c07d97ebd0e22ae..7e765886179b08d6b2edb5319aeacc9e7db5b8c2 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
 @@ -8,6 +8,9 @@ import org.jetbrains.annotations.NotNull;

patches/api/0165-Fixes-and-additions-to-the-spawn-reason-API.patch

@@ -14,7 +14,7 @@ Co-authored-by: Aurora <aurora@relanet.eu>
 Co-authored-by: Jakub Zacek <dawon@dawon.eu>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 99e1f17fddf9cebe7057998d1635804c55f18312..c3387a88a16cfd9157ade5d8a06eae2540a97288 100644
+index b808044403e6b38d1801aefde2176d630c747a64..cc1a619e54c2ce0ee49f81534c56d5b55aa5bfc2 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -857,5 +857,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -30,7 +30,7 @@ index 99e1f17fddf9cebe7057998d1635804c55f18312..c3387a88a16cfd9157ade5d8a06eae25
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-index 1e2bb345d19ebe03589d85bdab13021b6fa2ed98..6ff1988092de06f9d751cd40da521c2ed6e2e4bd 100644
+index 5d2597378d36ccace672db0768267d3499100cf1..361db256296d776c27e601c923b2cdc61967122b 100644
 --- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 @@ -206,6 +206,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {

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

@@ -272,10 +272,10 @@ index b02efba048be00e42502111fcdd2297529926666..fb4b6f0e908ffa50c3b2f8d04d9f3810
          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 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb341c8eb3b 100644
+index 9d1f82be4f23af37ccc6db65756f6dd3028c6837..fe63fef02ee208a5fc52d30a27519a0506c58f8c 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4867,20 +4867,20 @@ public enum Material implements Keyed, Translatable {
+@@ -4838,20 +4838,20 @@ public enum Material implements Keyed, Translatable {
       * Do not use for any reason.
       *
       * @return ID of this material
@@ -300,7 +300,7 @@ index 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb3
      public boolean isLegacy() {
          return legacy;
      }
-@@ -4956,8 +4956,10 @@ public enum Material implements Keyed, Translatable {
+@@ -4927,8 +4927,10 @@ public enum Material implements Keyed, Translatable {
       * Gets the MaterialData class associated with this Material
       *
       * @return MaterialData associated with this Material
@@ -311,7 +311,7 @@ index 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb3
      public Class<? extends MaterialData> getData() {
          Preconditions.checkArgument(legacy, "Cannot get data class of Modern Material");
          return ctor.getDeclaringClass();
-@@ -5413,7 +5415,11 @@ public enum Material implements Keyed, Translatable {
+@@ -5384,7 +5386,11 @@ public enum Material implements Keyed, Translatable {
       * material.
       *
       * @return true if this material can be interacted with.
@@ -687,10 +687,10 @@ index dd1e7b71d7d332b3e22189c7e0eda6d47ec49e55..555d0492c2fcf85c1e2f95f145b974cb
  
      /**
 diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
-index aea98cddf2433fff6066124f880bb80e1c32fa17..f5b047345639cf8e55354cc514d18fd80ff1b712 100644
+index 04bbbaba10cdd7ce3c394692579605d66953ac01..95eb7d7718a74382289ac3a7b2d5fac4c9ec19a2 100644
 --- a/src/main/java/org/bukkit/block/BlockType.java
 +++ b/src/main/java/org/bukkit/block/BlockType.java
-@@ -3576,9 +3576,14 @@ public interface BlockType extends Keyed, Translatable {
+@@ -3551,9 +3551,14 @@ public interface BlockType extends Keyed, Translatable {
       * state as well. This method will return true if there is at least one
       * state in which additional interact handling is performed for the
       * block type.
@@ -809,10 +809,10 @@ index 3afe2787de576f7190d87c796bea0ab34dc30248..875817b807c9f515eb07b03cc85d3689
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 10c957a6bb6227d6c6109085a3b8c3fa5944277c..122ee01c4664617bb1b691d5ff24427abdbedcf2 100644
+index 896b87bfc39b82849e32398161269bffb0577efe..dc944ad75f04f5d2f72639615f64b5bb2d1b4117 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -428,9 +428,9 @@ public enum EntityType implements Keyed, Translatable {
+@@ -417,9 +417,9 @@ public enum EntityType implements Keyed, Translatable {
       *
       * @param name the entity type's name
       * @return the matching entity type or null
@@ -1748,10 +1748,10 @@ index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb6
      public ItemStack getInput() {
          return this.ingredient.getItemStack();
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484ac440cb3 100644
+index 5cc1d77a09d2877992433b020ad2c591bb94d3fd..eb14949da2b96aee75e3bba63af8176c5550a380 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -151,6 +151,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -152,6 +152,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Checks for existence of a localized name.
       *
@@ -1759,7 +1759,7 @@ index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484
       * @return true if this has a localized name
       * @deprecated meta no longer exists
       */
-@@ -163,6 +164,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -164,6 +165,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Plugins should check that hasLocalizedName() returns <code>true</code>
       * before calling this method.
       *
@@ -1767,7 +1767,7 @@ index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484
       * @return the localized name that is set
       * @deprecated meta no longer exists
       */
-@@ -173,6 +175,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -174,6 +176,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Sets the localized name.
       *
@@ -1775,7 +1775,7 @@ index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484
       * @param name the name to set
       * @deprecated meta no longer exists
       */
-@@ -749,7 +752,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -772,7 +775,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       *
       * @return component
       */

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

@@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..2bde2b7c960b321d0c1396212858c780
 +    Sound getFallSound();
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index e4393f2bd71308a58305cb870271d6a647ffcd92..e63fc428543498fc5a12856671d83f13f7de8442 100644
+index 2566c7bb9e770483abdd3398af13179dc747b682..c278e7a3da5989b0f41c571e3cb7579289795e95 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -616,4 +616,25 @@ public interface Block extends Metadatable, Translatable {

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

@@ -5,7 +5,7 @@ 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 03e836b9c2e6d141396cfe4a0034c5dcdcaf9e90..7e4673f672233d69df4bf53244542daa7fdcac75 100644
+index 0d743a27e0955af7b1baee49ce7e62e993a0a8b8..f16f0a72a7b533106e1703197e370d67e13d77a3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2552,6 +2552,10 @@ public final class Bukkit {
@@ -20,7 +20,7 @@ index 03e836b9c2e6d141396cfe4a0034c5dcdcaf9e90..7e4673f672233d69df4bf53244542daa
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 44ebe899f4278b8f7422385710bdc180375475fd..df37ce5da240ead6841e72ebdfddf2cd55caa27b 100644
+index 03d6e69b1771b1aabc22d680d8123239f7863e20..b8f1ecb16e3e1d969873f99f3b029d9a12437bd9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2221,5 +2221,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

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

@@ -10,7 +10,7 @@ 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 e63fc428543498fc5a12856671d83f13f7de8442..745413357506fa7399f8ba44dfe222d1f0c919f1 100644
+index c278e7a3da5989b0f41c571e3cb7579289795e95..4e79dc21824e4b1f286c344b0733057be27fb6c5 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -481,6 +481,52 @@ public interface Block extends Metadatable, Translatable {

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

@@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..b49b72608573ad5b98fc6e0070f6ef10
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index db7dafba43b50146a32d749ec043c5d548b0d6e3..c2352d75e02f7be27fcf9ea69df1bd104a2449bd 100644
+index 72b83dedf025ef971b89e2c6a19fd411488948b7..f9e2b5a7cd3db267d8f543898b9f6b00586d1b4a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1159,4 +1159,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

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

@@ -5,7 +5,7 @@ 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 7e4673f672233d69df4bf53244542daa7fdcac75..57a9b5433ffb22017e24c9be4a2eeaa2f439bea8 100644
+index f16f0a72a7b533106e1703197e370d67e13d77a3..2e44d7e90015d713b952f49f06d3ba7744d1eb42 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2218,6 +2218,25 @@ public final class Bukkit {
@@ -35,7 +35,7 @@ index 7e4673f672233d69df4bf53244542daa7fdcac75..57a9b5433ffb22017e24c9be4a2eeaa2
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index df37ce5da240ead6841e72ebdfddf2cd55caa27b..940f36835b541931ece973636c2e07e1a3c0db5b 100644
+index b8f1ecb16e3e1d969873f99f3b029d9a12437bd9..6d4f181be4000803392a59d3a9314c1d70be7533 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1877,6 +1877,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

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

@@ -6,7 +6,7 @@ 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 57a9b5433ffb22017e24c9be4a2eeaa2f439bea8..a5ab6b1af7da41ccab0ee0810e0ef35a74b3eaca 100644
+index 2e44d7e90015d713b952f49f06d3ba7744d1eb42..40d04b4ebecaa0cff8937451568d998a0dfae088 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2575,6 +2575,15 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 57a9b5433ffb22017e24c9be4a2eeaa2f439bea8..a5ab6b1af7da41ccab0ee0810e0ef35a
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 940f36835b541931ece973636c2e07e1a3c0db5b..1c45e65a3f2c09c1b22f7647ac1093582d4ba109 100644
+index 6d4f181be4000803392a59d3a9314c1d70be7533..90509d2e4c61de29611312c0864ef7622072d540 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2243,5 +2243,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

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

@@ -8,7 +8,7 @@ Serializes using NBT which is safer for server data migrations than bukkits form
 Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 8b5e4756d1c80e55be166dbe1faf57799f9cc03b..66d29e7f4187309d4a55202d1bda4b94e42211b0 100644
+index 012b46c82d9d06d1d2da8da626fc5cde6e9e2ca4..739f117a0fd91ae98b5e5a39ae8e23feca0b741d 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -164,5 +164,9 @@ public interface UnsafeValues {
@@ -22,7 +22,7 @@ index 8b5e4756d1c80e55be166dbe1faf57799f9cc03b..66d29e7f4187309d4a55202d1bda4b94
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index e9c29fc1db686b80bc2477d78ec2b361b8600b9e..af09398e0864d338da530495bfd577db8adbe65a 100644
+index 132cf07816b0d356c94fa4e8b8bfefccce2de103..a919d50b31ed48a43bc47596eae44b3d05a417ee 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -661,6 +661,117 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

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

@@ -261,7 +261,7 @@ index 0000000000000000000000000000000000000000..5245955fb3466d2b89eaad4027d145eb
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 80e894e3d625cde14bfe881d2c367b43a4882cfd..2d3c8febbbab959433101fb9dfc1e0ff9deca192 100644
+index 70fef7c72b4ea24b8fd3bd99cb8f6f37b3b9832b..1a94a914894524b0087044227e9e692102e89e9e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3375,6 +3375,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -210,7 +210,7 @@ index 0000000000000000000000000000000000000000..0203e7efbb8c729ed378c53c2630a523
 +    <T extends Mob> Collection<Goal<T>> getRunningGoalsWithout(T mob, GoalType type);
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a5ab6b1af7da41ccab0ee0810e0ef35a74b3eaca..1393e4b146bdbf55004b54a5fc96e88a7dd7b8f6 100644
+index 40d04b4ebecaa0cff8937451568d998a0dfae088..aca049c29cc7397a830883a45b4b24a33863e533 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2584,6 +2584,16 @@ public final class Bukkit {
@@ -231,7 +231,7 @@ index a5ab6b1af7da41ccab0ee0810e0ef35a74b3eaca..1393e4b146bdbf55004b54a5fc96e88a
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1c45e65a3f2c09c1b22f7647ac1093582d4ba109..89e51b10bd8d89e4bab608a7fb9b491e4e147c0a 100644
+index 90509d2e4c61de29611312c0864ef7622072d540..89208165cc6b864a9273c364ba4b2d6d86e3c31f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2250,5 +2250,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

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

@@ -8,7 +8,7 @@ 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 6c2f01bf452d991faf40b995225bf7b7e49281df..92ceb765ccb80c3b09ac3ede9bcaad6219fabd3d 100644
+index a7824c9f133f433cb9f98326348b4b6ae725a39d..d87261e0500d34696a50e9d6d136ca844c9a2cea 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -308,6 +308,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

patches/api/0193-Support-components-in-ItemMeta.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290d1415357 100644
+index eb14949da2b96aee75e3bba63af8176c5550a380..0151a0523069b00a1cf682ad6b54142aaffcfaa6 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -5,6 +5,7 @@ import java.util.Collection;
@@ -16,7 +16,7 @@ index 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290
  import org.bukkit.NamespacedKey;
  import org.bukkit.Tag;
  import org.bukkit.attribute.Attribute;
-@@ -75,6 +76,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -76,6 +77,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @NotNull
      String getDisplayName();
  
@@ -37,7 +37,7 @@ index 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290
      /**
       * Sets the display name.
       *
-@@ -84,6 +99,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -85,6 +100,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @Deprecated // Paper
      void setDisplayName(@Nullable String name);
  
@@ -54,7 +54,7 @@ index 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290
      /**
       * Checks for existence of an item name.
       * <br>
-@@ -220,6 +245,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -221,6 +246,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @Nullable
      List<String> getLore();
  
@@ -74,7 +74,7 @@ index 59e1987f0f0accef369cc29dbec464185eb7c99c..afdcc2d67d55f2f07c913816e1f5b290
      /**
       * Sets the lore for this item.
       * Removes lore when given null.
-@@ -230,6 +268,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -231,6 +269,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      @Deprecated // Paper
      void setLore(@Nullable List<String> lore);
  

patches/api/0194-added-2-new-TargetReasons-for-1.16-mob-behavior.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] added 2 new TargetReasons for 1.16 mob behavior
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java b/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
-index c6e4d69eecd2789b1d78fe99fe590932e9758ba1..85b318d9ee56a3c22c6b7c9ac408f021e51cb609 100644
+index 808142232a722cb6466bac78d00dc55c18ebe109..ef2d1fe4f2fa7f35ef76f2b4e179050d07b7021a 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
 @@ -159,6 +159,14 @@ public class EntityTargetEvent extends EntityEvent implements Cancellable {

patches/api/0195-Add-entity-liquid-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c3387a88a16cfd9157ade5d8a06eae2540a97288..3cddad9b83a89b243f7dc05c0c6a7f6d431bdceb 100644
+index cc1a619e54c2ce0ee49f81534c56d5b55aa5bfc2..c09064e066435f87fa108552ca7e87ccded0fccf 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -863,5 +863,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

patches/api/0198-Brand-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2d3c8febbbab959433101fb9dfc1e0ff9deca192..54d33be1297a6a4646635ca09cae1f0a2d3fb7fa 100644
+index 1a94a914894524b0087044227e9e692102e89e9e..644c20bcf6bba3f581e15cec21a1295b3dc50d43 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3488,6 +3488,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0200-Add-playPickupItemAnimation-to-LivingEntity.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index c2352d75e02f7be27fcf9ea69df1bd104a2449bd..88d6a5aaf2a686186fab4916480a04f6503d887c 100644
+index f9e2b5a7cd3db267d8f543898b9f6b00586d1b4a..e37ae6f7641c813c916618a60d97679125ebc16e 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1181,4 +1181,29 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

patches/api/0202-Add-methods-to-get-translation-keys.patch

@@ -144,10 +144,10 @@ index b3211a705acc26449675727823aa42ae6bacac4f..8b6584fae0a9d5cccbe350d889fa8b4a
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 3913d0392131375d3e3b34c9da3dbbb341c8eb3b..5f10237b57909d8e457f831392a1629f9854987f 100644
+index fe63fef02ee208a5fc52d30a27519a0506c58f8c..8509519ec0d5509f45e43f28b5bb55d953cebb14 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -135,7 +135,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -136,7 +136,7 @@ import org.jetbrains.annotations.Nullable;
   * An enum of all material IDs accepted by the official server and client
   */
  @SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
@@ -156,7 +156,7 @@ index 3913d0392131375d3e3b34c9da3dbbb341c8eb3b..5f10237b57909d8e457f831392a1629f
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
      STONE(22948),
-@@ -4863,6 +4863,17 @@ public enum Material implements Keyed, Translatable {
+@@ -4834,6 +4834,17 @@ public enum Material implements Keyed, Translatable {
      }
      // Paper end
  
@@ -174,7 +174,7 @@ index 3913d0392131375d3e3b34c9da3dbbb341c8eb3b..5f10237b57909d8e457f831392a1629f
      /**
       * Do not use for any reason.
       *
-@@ -5612,9 +5623,11 @@ public enum Material implements Keyed, Translatable {
+@@ -5583,9 +5594,11 @@ public enum Material implements Keyed, Translatable {
       * material
       * @see #getBlockTranslationKey()
       * @see #getItemTranslationKey()
@@ -251,10 +251,10 @@ index 951c23491390c2c8693d415598ef2de712189220..21f9998b472dc18eb308554f5cdf467f
      /**
       * Maximum health of an Entity.
 diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
-index f46932a12f46895ae10b63f7fbb54750da1bd2ba..b352886e697a1c9869226b583da5240592575064 100644
+index f04aa0300b240f78b56c389fb2851aa4d16fc724..739fef949defca7b6bf4e6b3e079446c24d9b34c 100644
 --- a/src/main/java/org/bukkit/block/Biome.java
 +++ b/src/main/java/org/bukkit/block/Biome.java
-@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
   * There may be additional biomes present in the server, for example from a {@link DataPack}
   * which can be accessed via {@link Registry#BIOME}.
   */
@@ -263,7 +263,7 @@ index f46932a12f46895ae10b63f7fbb54750da1bd2ba..b352886e697a1c9869226b583da52405
  
      Biome OCEAN = getBiome("ocean");
      Biome PLAINS = getBiome("plains");
-@@ -131,4 +131,11 @@ public interface Biome extends OldEnum<Biome>, Keyed {
+@@ -127,4 +127,11 @@ public interface Biome extends OldEnum<Biome>, Keyed {
      static Biome[] values() {
          return Lists.newArrayList(Registry.BIOME).toArray(new Biome[0]);
      }
@@ -302,7 +302,7 @@ index 4e79dc21824e4b1f286c344b0733057be27fb6c5..afed7dfcbc878c19d3821dde77d6ade0
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
-index f5b047345639cf8e55354cc514d18fd80ff1b712..1b026f88d3c231ca38dbe0c1b86124c1e8e2f8cf 100644
+index 95eb7d7718a74382289ac3a7b2d5fac4c9ec19a2..f0c3343e2006f244bb1f99c269bcbaa357feb25f 100644
 --- a/src/main/java/org/bukkit/block/BlockType.java
 +++ b/src/main/java/org/bukkit/block/BlockType.java
 @@ -129,7 +129,7 @@ import org.jetbrains.annotations.Nullable;
@@ -314,7 +314,7 @@ index f5b047345639cf8e55354cc514d18fd80ff1b712..1b026f88d3c231ca38dbe0c1b86124c1
  
      /**
       * Typed represents a subtype of {@link BlockType}s that have a known block
-@@ -3641,4 +3641,13 @@ public interface BlockType extends Keyed, Translatable {
+@@ -3616,4 +3616,13 @@ public interface BlockType extends Keyed, Translatable {
      @Nullable
      @Deprecated(since = "1.20.6")
      Material asMaterial();
@@ -374,10 +374,10 @@ index 865ab3d2015e114d3cac72e0e26e4086a3913b38..f4422da4ebb0dc6551305f3e8468817e
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 122ee01c4664617bb1b691d5ff24427abdbedcf2..5f06ccac0983dacd6a8c54b073c2dc786b373366 100644
+index dc944ad75f04f5d2f72639615f64b5bb2d1b4117..459af298c4e149c3c96cca088f6a3d0db1cf6192 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -45,7 +45,7 @@ import org.jetbrains.annotations.Contract;
+@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Contract;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
@@ -386,7 +386,7 @@ index 122ee01c4664617bb1b691d5ff24427abdbedcf2..5f06ccac0983dacd6a8c54b073c2dc78
  
      // These strings MUST match the strings in nms.EntityTypes and are case sensitive.
      /**
-@@ -474,10 +474,22 @@ public enum EntityType implements Keyed, Translatable {
+@@ -463,10 +463,22 @@ public enum EntityType implements Keyed, Translatable {
  
      @Override
      @NotNull
@@ -554,10 +554,10 @@ index a919d50b31ed48a43bc47596eae44b3d05a417ee..665fe4b551abcd33a4c9bab69746200c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index 3ca11be42a07466ab96bff304dc90cf73cbf1f0d..767f7a1912743133d1a5d98783260a2ff51f99c6 100644
+index 71c4f2cbf8310941b316357d0c799b1e31418d0f..ab5d544942b7a5387998353614a33ca692edb50e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemType.java
 +++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -48,7 +48,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
   * changes may occur. Do not use this API in plugins.
   */
  @ApiStatus.Internal
@@ -566,7 +566,7 @@ index 3ca11be42a07466ab96bff304dc90cf73cbf1f0d..767f7a1912743133d1a5d98783260a2f
  
      /**
       * Typed represents a subtype of {@link ItemType}s that have a known item meta type
-@@ -2448,4 +2448,13 @@ public interface ItemType extends Keyed, Translatable {
+@@ -2409,4 +2409,13 @@ public interface ItemType extends Keyed, Translatable {
      @Nullable
      @Deprecated(since = "1.20.6")
      Material asMaterial();

patches/api/0204-Add-additional-open-container-api-to-HumanEntity.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 92ceb765ccb80c3b09ac3ede9bcaad6219fabd3d..25f671863e23fdb674c55f3e1f50b1f195ca5469 100644
+index d87261e0500d34696a50e9d6d136ca844c9a2cea..3859b12fad09cd181a914d152a9928d5bb720ca2 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -182,6 +182,92 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

patches/api/0205-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 66d29e7f4187309d4a55202d1bda4b94e42211b0..33acd8e0993b1f02a14794f55d0cf568a85a099e 100644
+index 739f117a0fd91ae98b5e5a39ae8e23feca0b741d..bd3567e9b0617c19a92090c8ab6baf17a715073a 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -168,5 +168,12 @@ public interface UnsafeValues {

patches/api/0206-Entity-isTicking.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 3cddad9b83a89b243f7dc05c0c6a7f6d431bdceb..acf0fd930c4a20e5c8e38f5183dd3479acece7ae 100644
+index c09064e066435f87fa108552ca7e87ccded0fccf..0342fbc83bf462017f86d0dda9f49e595a8066b3 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -898,5 +898,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent