Patch cleanup

2022-06-07 19:03:07 +02:00 · 2022-06-07 19:03:07 +02:00 · 56e64243ed
commit 56e64243ed
parent cb05aa6b8b
173 changed files with 184 additions and 184 deletions
--- a/patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch
+++ b/patches/unapplied/api/0004-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 364b6215d2facb0273a67ff605ccb8e707e080b8..3777d12874ede329410a6bf1c0533deb44924d73 100644
+index e49f4853e36f493754841231eeb5dd093b3788e0..98afa6a25131dc626ea7a5122f33df6bd2d39178 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
--- a/patches/unapplied/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/api/0008-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 b1d770a62e499d909de4352303409fcfdc5d58a9..fc7d17fd3028f790ff9e034e8234bf0506f017c2 100644
+index 35de49ea52b507dd925ed3c118518a335035a710..5c6b7f5095a5bb7290e1edefb0c9e985123f80d8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -75,6 +75,20 @@ public final class Bukkit {
@ -32,7 +32,7 @@ index b1d770a62e499d909de4352303409fcfdc5d58a9..fc7d17fd3028f790ff9e034e8234bf05
      * 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 465a7f5312a5d5b65f7366f476b7c42795f53105..dd79325a8f52190c44b833870043d167641211a6 100644
+index bbb4eb3c4e46ade7dd939c2b0e4436161d6f8a1e..1dedbea03e259679e101a8443b662b20375adfd0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -60,6 +60,18 @@ import org.jetbrains.annotations.Nullable;
--- a/patches/unapplied/api/0011-Version-Command-2.0.patch
+++ b/patches/unapplied/api/0011-Version-Command-2.0.patch
@ -56,7 +56,7 @@ index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c7
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index ce5794d684a1126ec9acbf4af17f5d6fa783f551..5ba6c7a69937badd64256248560268fb695d5f74 100644
+index c9ecd5b1908e05a1b39dadcded27241672adcddf..355c46f1c1f08072446f3cc92c0d22898933a7fc 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -94,5 +94,12 @@ public interface UnsafeValues {
--- a/patches/unapplied/api/0026-Use-ASM-for-event-executors.patch
+++ b/patches/unapplied/api/0026-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 19b65a9b56b73f873ef646d14a6cf091b69d3873..bc6f68a0cadeec865401e9cb0dce89460484b148 100644
+index eefc024acc3e14ae21855df7f2f358bd1e0a9e38..da7aa34850b39500f89f01a2969d3a1a5a80f80f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -39,6 +39,9 @@ dependencies {
--- a/patches/unapplied/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch
@ -46,7 +46,7 @@ index 9c1cd95e125b1d7677daea1575a466a1b955053a..acd69a5d946974e0b50439a987127506
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index c4dcafac892169a7bfcc065701fffb43c6cfdf44..b1152f4dede61383232cc6713d448840612eac13 100644
+index 8d7a61b711cec7eff0e71b9ae942f3050196d955..fc5e398adc8f24187f1ffc0c4b3b429e3c6b25eb 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
@@ -99,7 +99,7 @@ public abstract class Command {
--- a/patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/unapplied/api/0069-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 bc6f68a0cadeec865401e9cb0dce89460484b148..d6c4abc30af2b535644707a240b60d1b613785e9 100644
+index da7aa34850b39500f89f01a2969d3a1a5a80f80f..01798255d45f2a642df00156f11dd2bcd8108079 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -39,6 +39,8 @@ dependencies {
--- a/patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@ -87,7 +87,7 @@ index f99d60ae4003f953b5680a997e9e43e63c035b0c..c943bd801b54519ba6cf5d45aec593d7
 
     /**
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 657243776c8a2abb5a57e5c407212a8387d649eb..4fa5f7140ea97e1b6a63808b59115bfb1a85cb32 100644
+index 24e3eaa008e53af8d77439e4f2ab9007285d7826..684d7b1105350660fe7fc66f57a49db7f39610b4 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -44,6 +44,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
--- a/patches/unapplied/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/api/0074-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 ce1e1e6cc6740d568fbf859c7e2c014fab5a59cd..62ab55729e69bfac8eb4b40d877b945d95df27cd 100644
+index b4094e042c1619cfcdd68c27f82979a7562ddf55..d29bdc125dba0128d93d57e8d9393b970e6c00a9 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
@@ -271,6 +271,16 @@ public interface Block extends Metadatable {
--- a/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch
@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f32eaa35d9152564300455a24c811e15d3ab694f..204c337558e84304de4f511473be8cccb2a8cd4f 100644
+index 9d23a4019814f4662f4ab9a47b3fceff656c5245..f9f708bda24751353dd61951418731a2eea5abb0 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable;
--- a/patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.

 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 31f6f781a0403bf6388d668f0effaed5aae94468..25e0d571710403c334bd73ce1b97109dd65c3244 100644
+index c7c45e2de8cca1bf8b8e12752e08db62403efa6a..c30b44ff26f8f253902754452a0816f07c7fd035 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -2,6 +2,9 @@ package org.bukkit.event.player;
--- a/patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch
+++ b/patches/unapplied/api/0098-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 8a2ca11be9ebde91268b20d25a35e1d6842f49de..e6d6283f3dd76b6c5af34374a05a5ab966419d06 100644
+index 9adbc26b78e64188fc5b3f00980d310f817b43bc..1e171fe09eab0487f039a51c36021fb9df0302c9 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -1,6 +1,9 @@
@ -277,7 +277,7 @@ index 8a2ca11be9ebde91268b20d25a35e1d6842f49de..e6d6283f3dd76b6c5af34374a05a5ab9
      * Get a list of all players in this World
      *
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 25e0d571710403c334bd73ce1b97109dd65c3244..033960f566861e303b9cb61aae4c02add501d93f 100644
+index c30b44ff26f8f253902754452a0816f07c7fd035..9acf1fb404ccf9b3bc06a448c3099ca2e838facf 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
--- a/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch
@ -522,7 +522,7 @@ index 8d048a8f1446f862dcc61952971b54bab9bb2ac3..60a70b9e7a613e64a31a127264f17485
      * Options which can be applied to redstone dust particles - a particle
      * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e6d6283f3dd76b6c5af34374a05a5ab966419d06..d4c55682f6b2433808a2f0542189a5672d4991ea 100644
+index 1e171fe09eab0487f039a51c36021fb9df0302c9..5c01bd7c97a52a172c95de43570b97bc2a5ffa35 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -2784,7 +2784,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
--- a/patches/unapplied/api/0115-Expand-Explosions-API.patch
+++ b/patches/unapplied/api/0115-Expand-Explosions-API.patch
@ -106,7 +106,7 @@ index bbc636baef2e2b0586c7d517be428438ca26ab66..a8d4f7972d07ddde171b4a1ec470a4c6
      * 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 d4c55682f6b2433808a2f0542189a5672d4991ea..68b10c8643e9c2c873e627b2185f983a9c1023aa 100644
+index 5c01bd7c97a52a172c95de43570b97bc2a5ffa35..3bb24a54df61b9c3b44c9013b156385ae5f650fa 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -1421,6 +1421,88 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
--- a/patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/api/0119-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 68b10c8643e9c2c873e627b2185f983a9c1023aa..057b7ace5428d2799d33d91097f6cec786c7bd58 100644
+index 3bb24a54df61b9c3b44c9013b156385ae5f650fa..c51f086057b8265ff044dce89442c6ffff901e43 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -941,6 +941,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
--- a/patches/unapplied/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/patches/unapplied/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch
@ -7,7 +7,7 @@ Not here to name and shame, only so server admins can be aware of which
 plugins have and haven't been updated.

 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 5ba6c7a69937badd64256248560268fb695d5f74..db272568d7dee924083e37c55bdbf90f05fafc69 100644
+index 355c46f1c1f08072446f3cc92c0d22898933a7fc..cbf7df30a7ec8445c8492e3b9f108747dbe1717b 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -101,5 +101,11 @@ public interface UnsafeValues {
--- a/patches/unapplied/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/unapplied/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch
@ -44,7 +44,7 @@ index 06737962b844275a74ee2407cc09918599cbaea4..1a4b6922c0a881b60ddf305b1e2b3af0
      * 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 057b7ace5428d2799d33d91097f6cec786c7bd58..ee277a464b1ecaaa7948c333a04e347e6255c904 100644
+index c51f086057b8265ff044dce89442c6ffff901e43..400109746016767be364ae2f2e51505f1cbb4287 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -209,6 +209,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
--- a/patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@ -50,7 +50,7 @@ index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..5c5e05673e0912f4dbd6c728f4c3b7fc
      * @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 a501384906fa01ddc83476ef2dbbb8d11a03fb8c..449d6882c8f41d9e0f46436c430e071b85eb2775 100644
+index 400109746016767be364ae2f2e51505f1cbb4287..3111b4706bf3d8bbe7b96268d5450a96455c659c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -92,6 +92,40 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
--- a/patches/unapplied/api/0144-isChunkGenerated-API.patch
+++ b/patches/unapplied/api/0144-isChunkGenerated-API.patch
@ -34,7 +34,7 @@ index 5c5e05673e0912f4dbd6c728f4c3b7fcdae8f0e8..57cb548683f7b2972c998afd34176952
     /**
      * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 449d6882c8f41d9e0f46436c430e071b85eb2775..dcca66c345b3c51d7b9956ddd3ac2bf0b789899c 100644
+index 3111b4706bf3d8bbe7b96268d5450a96455c659c..e775645a12c7102d9f4b5bcb55556df87e2fad75 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -257,6 +257,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
--- a/patches/unapplied/api/0146-Async-Chunks-API.patch
+++ b/patches/unapplied/api/0146-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 dcca66c345b3c51d7b9956ddd3ac2bf0b789899c..04583189f7ed9a446ed649780e2b99cb5e1ab3ad 100644
+index e775645a12c7102d9f4b5bcb55556df87e2fad75..284f79085f96f4044a92c37932c21c5dd7b50d0d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -966,6 +966,482 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
--- a/patches/unapplied/api/0149-Improve-death-events.patch
+++ b/patches/unapplied/api/0149-Improve-death-events.patch
@ -180,7 +180,7 @@ index a5984ab06cce95d30e70511e125f69339b574c04..e19a3df9aa2204b44c0b029bda141ae6
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-index a01d4c21bedc7f1a54f5a330bb4c2909ce3a18e4..48f272747b8d5ab43f79a9d474713aca79f121b7 100644
+index 7941c60b0e1840785ba2b250071591bd75bc6e35..a871eddf73f918c0e3d2554ef8d9cfd0f830fcaa 100644
 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
@@ -63,6 +63,17 @@ public class PlayerDeathEvent extends EntityDeathEvent {
--- a/patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@ -226,7 +226,7 @@ index c65f0d6569c130b4920a9e71ad24af6427f1f030..01bcb3a1bdb5accdf844d0178cec3d25
         return key;
     }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 69f68ca2d62c2cfe07a193776054c14c352a5942..45baebc97f0aec8abc9a894bc135e4767d7c9e35 100644
+index a19635c38705e6221ae25d58e976e483e7ed17e4..71c7780424a986a95852b1ca15116096896500df 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
@@ -444,4 +444,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
--- a/patches/unapplied/api/0156-Add-Material-Tags.patch
+++ b/patches/unapplied/api/0156-Add-Material-Tags.patch
@ -1067,7 +1067,7 @@ index 0000000000000000000000000000000000000000..d7eb49a05c3f0cacf285f8995433c5d5
 +        .ensureSize("WATER_BASED", 11).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 5a25301a81b0e88a4891cbc4710289544d44105c..34d23f53acf00620223731c4fdacffde9cff41a8 100644
+index 107d12d447be481928ee796f73b7acb2c4b9b2d8..42d0f31c2be2d39c4481f98c0756c4f1ae337717 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;
--- a/patches/unapplied/api/0159-Add-sun-related-API.patch
+++ b/patches/unapplied/api/0159-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 04583189f7ed9a446ed649780e2b99cb5e1ab3ad..f36eb8896ee84c1d3bbce17b11ed05c5f99f2e29 100644
+index 284f79085f96f4044a92c37932c21c5dd7b50d0d..b4c77e92f286e0159c8f25a063a964aaf1b1bd8c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -1793,6 +1793,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
--- a/patches/unapplied/api/0163-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/api/0163-Make-the-default-permission-message-configurable.patch
@ -43,7 +43,7 @@ index 2042f4963c53d5a903f0de1fec6a9af3a7b2bba4..b8ed8d5d48cb4f1b2f598e2c48e4423a
      * 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 d039f722ab9f08bc485b581832b50830c7145c2d..97dc60444746c37c44ff5c8056f4fed04a944714 100644
+index fc5e398adc8f24187f1ffc0c4b3b429e3c6b25eb..4c608818a797c12cba6aa91643a915cf0bae77f5 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
@@ -184,10 +184,9 @@ public abstract class Command {
--- a/patches/unapplied/api/0175-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/unapplied/api/0175-Fix-Spigot-annotation-mistakes.patch
@ -428,7 +428,7 @@ index 5408a8c123942a56ef11597ae6cdb77e14f741e3..29bb84145be18ef9162abdfc8820f2b3
 public class PlayerShowEntityEvent extends PlayerEvent {
 
 diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-index d14d3851a7b0340668f44f5213f0e18072d7481b..eff4c1cb410e032ee287084cb51b59fd9f84df8d 100644
+index 4c9a64ace0d0f9f83d31ea75dabdf4666d48461a..e70e6949a9d5a5a37f0c92e139071d4060548e96 100644
 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
 +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
@@ -515,7 +515,9 @@ public abstract class ChunkGenerator {
@ -717,7 +717,7 @@ index 7f6d3c71c5b3a9aa54c84a4c3b7c3614a0d477ce..1bab04b44d99c974b1cc099d127b93df
         return removeIngredient(count, ingredient.getItemType(), ingredient.getData());
     }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 45baebc97f0aec8abc9a894bc135e4767d7c9e35..a761b8369e1f78b28146b0a4cce121e507d4a738 100644
+index 71c7780424a986a95852b1ca15116096896500df..5428aeb018c415f8e9bb46c84a627adf70829259 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
@@ -74,8 +74,10 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
--- a/patches/unapplied/api/0178-Add-Heightmap-API.patch
+++ b/patches/unapplied/api/0178-Add-Heightmap-API.patch
@ -103,7 +103,7 @@ index d4c87bfed81b2d73919705912f59fab05c0ee61b..ef0cb00ca4cb7d2f5e4ec1c950cce036
      * Creates explosion at this location with given power
      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index f36eb8896ee84c1d3bbce17b11ed05c5f99f2e29..23fd3f85288ef1fbfb104df7a636ad69042704a7 100644
+index 4f9f8e51e1a99a2d19643d105b839562ebe0b600..f463450c35e6fbba95c57a3a27192b667cb9e093 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -164,6 +164,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
--- a/patches/unapplied/api/0183-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/api/0183-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 b4256e2c66e3f578a4499dc1fff50f213898b96b..6a2cf46d54ae6c93e95e78c5fa98e6aef48c168f 100644
+index d9f245ec7998655116c485b5607a130cb443765e..f6a862fcf269865eacc67088833bfdd09b661654 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2196,6 +2196,10 @@ public final class Bukkit {
--- a/patches/unapplied/api/0184-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/api/0184-PlayerDeathEvent-shouldDropExperience.patch
@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience


 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-index 61d12cb8f0a924abf696b6da7258f34dbb7b51b6..8175e5329f7fb6da4c7faf695162b51492114dc3 100644
+index 5f7d0d08be8bca06c9aa89659b7865a7b5a547f8..9d95218b49895ab76b00fe9524d9b25ea9f9b8c2 100644
 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
@@ -1,6 +1,8 @@
--- a/patches/unapplied/api/0185-Add-effect-to-block-break-naturally.patch
+++ b/patches/unapplied/api/0185-Add-effect-to-block-break-naturally.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add effect to block break naturally


 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 7ea765d5d653b1b84e73fd8c4d9d923049bd06ff..c88c4223928c2e47f1a85b73165cf433806677df 100644
+index db441e463b02ee734f85c855f5538cd41041dbae..1e7ee68e56f8d4399c2cbf26aa45bf8b599b3b02 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
@@ -480,6 +480,26 @@ public interface Block extends Metadatable {
--- a/patches/unapplied/api/0189-Add-tick-times-API.patch
+++ b/patches/unapplied/api/0189-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 6a2cf46d54ae6c93e95e78c5fa98e6aef48c168f..c1e1a311ea5fb4826f6b400b098262e177e22318 100644
+index f6a862fcf269865eacc67088833bfdd09b661654..3fb45f03f3901de5592e2bb6ba8f75b5fd474509 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1898,6 +1898,25 @@ public final class Bukkit {
--- a/patches/unapplied/api/0190-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/api/0190-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 c1e1a311ea5fb4826f6b400b098262e177e22318..96f1619a188d569398bbc2bb8ff0b4bd8f08f825 100644
+index 3fb45f03f3901de5592e2bb6ba8f75b5fd474509..5d5f1e52f2ff19a48776a4fdbd026d67e538bec9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2219,6 +2219,15 @@ public final class Bukkit {
--- a/patches/unapplied/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.

 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index db272568d7dee924083e37c55bdbf90f05fafc69..f9434c19c1bf355a734b3a1ddf32c81fb7abf9eb 100644
+index cbf7df30a7ec8445c8492e3b9f108747dbe1717b..1b5f36b78d81b688ded88ab91e36d9df8c5d64ee 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -107,5 +107,9 @@ public interface UnsafeValues {
--- a/patches/unapplied/api/0199-Expose-game-version.patch
+++ b/patches/unapplied/api/0199-Expose-game-version.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 13d8d2d955ada2765b6c6773f77a5407c86cc390..9bcde6496876bf184654c829e73b730b2e70bba6 100644
+index 5d5f1e52f2ff19a48776a4fdbd026d67e538bec9..8a782b8b65a9a99318ed1a1f1e8631197d0e5eeb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -135,6 +135,18 @@ public final class Bukkit {
@ -28,7 +28,7 @@ index 13d8d2d955ada2765b6c6773f77a5407c86cc390..9bcde6496876bf184654c829e73b730b
      * 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 5cd3a9a6066b01525c0d3a54e852e876535f37d3..5cd733705f47f9fc77d1b10065d93a9b0356f5ea 100644
+index d59a7e0c9ec50040fb0b2cc3239cae46760aba04..9b2c1eb7e215a9227c60bc85906fed33ec1dd60a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -112,6 +112,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
--- a/patches/unapplied/api/0200-Add-Mob-Goal-API.patch
+++ b/patches/unapplied/api/0200-Add-Mob-Goal-API.patch
@ -523,7 +523,7 @@ index 0000000000000000000000000000000000000000..8fd399f791b45eb7fc62693ca954eea0
 +    @Deprecated GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 08ac59d4f0935a79323ff34eb585b8a5b5a072b4..21b026aa0f53cf2608b64f9603185562cd237d2d 100644
+index 8a782b8b65a9a99318ed1a1f1e8631197d0e5eeb..43674a3fb8b0b1dc4bef13ecaf83f68f06b29ec1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2240,6 +2240,16 @@ public final class Bukkit {
--- a/patches/unapplied/api/0209-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/api/0209-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 8c48a5c61b5afb5407ebf5d734858a0177e3ffa1..77f52b117dec8b99a507995a587505229eadb89e 100644
+index 5428aeb018c415f8e9bb46c84a627adf70829259..f1e9a7626c4efb99be78f1056dc04b06bbe13c87 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;
--- a/patches/unapplied/api/0214-Add-setMaxPlayers-API.patch
+++ b/patches/unapplied/api/0214-Add-setMaxPlayers-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d9581a6270df9e3507cf60a9049ef59e7ff464af..cf453476006563d8f9c165809c89d73089a84acc 100644
+index 43674a3fb8b0b1dc4bef13ecaf83f68f06b29ec1..4eafa8f3342648d0b58642102d6c75a8a79c9764 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -188,6 +188,17 @@ public final class Bukkit {
@ -27,7 +27,7 @@ index d9581a6270df9e3507cf60a9049ef59e7ff464af..cf453476006563d8f9c165809c89d730
      * Get the game port that the server runs on.
      *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b78ccbf832199fe84b351c7467a3d9be39f2f819..8f6878d2b6a43ec90f5011df6530083bdf6166cb 100644
+index c11d802408c793c6410118bd281a21e59394066f..a7ba813396fab77bed292422f881b5a0952972fb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -159,6 +159,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
--- a/patches/unapplied/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/api/0223-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 580e73c3fc0e647ad128ab7d845c15fbe80484a3..b24439b379be1a90dde4e6f4dbe5ca3fdd8face4 100644
+index e10edf17a87d18e9d9a22c6793d6ac78054d841b..035dfcd9d483152a050e45409f15b015b135fb38 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -140,5 +140,12 @@ public interface UnsafeValues {
--- a/patches/unapplied/api/0228-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/api/0228-Add-getOfflinePlayerIfCached-String.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f9fdb1882a283e47604136a27d1c95266b988a37..8072924c977e0a23ee743ca8d613b9ea5de885fa 100644
+index 4eafa8f3342648d0b58642102d6c75a8a79c9764..37a295b2bbf7127713e19f224e788e0adb8823f4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1188,6 +1188,27 @@ public final class Bukkit {
--- a/patches/unapplied/api/0233-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/api/0233-Add-Destroy-Speed-API.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>

 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 3f1c58e813afe90eaf467e0b76949ed8df752939..68a91de4ab068fd32dc883a9427475c07218941e 100644
+index 2c837ea822f3b0c4ec312f0c956fe1b778cbd5e9..4a408361ac86b8c490942686c2709817338f4f59 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
@@ -656,5 +656,29 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
--- a/patches/unapplied/api/0244-Additional-Block-Material-API-s.patch
+++ b/patches/unapplied/api/0244-Additional-Block-Material-API-s.patch
@ -9,7 +9,7 @@ process to do this in the Bukkit API
 Adds API for buildable, replaceable, burnable too.

 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 839867cd0a92fc0ea2b9ea009b67a841f8c7edd6..bcf3dc1bc640dc270446db0e1da081272d3933f1 100644
+index 4a408361ac86b8c490942686c2709817338f4f59..43a0e57a6db702b2a40e151f151bfaa63b9d95d5 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
@@ -438,6 +438,42 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
--- a/patches/unapplied/api/0256-Add-PaperRegistry.patch
+++ b/patches/unapplied/api/0256-Add-PaperRegistry.patch
@ -91,7 +91,7 @@ index 0000000000000000000000000000000000000000..f29e76a6b66ddfec12ddf8db6dcb2df6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index b24439b379be1a90dde4e6f4dbe5ca3fdd8face4..0697214210a6e87f690b9454d9651d06ca57a524 100644
+index 035dfcd9d483152a050e45409f15b015b135fb38..abe79e4a2233341d0030742b823a0cfb5af97f41 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -147,5 +147,15 @@ public interface UnsafeValues {
--- a/patches/unapplied/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Return chat component with empty text instead of throwing


 diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java
-index 664de64b020cf9090a2fbee0afe2bfaf150adc3c..b06995aa57aa9cba0bb59f1d26d81015619a08e6 100644
+index a4e3d526db2d17dc923cbe82e53d3c902d61e1f3..2448e70d75ae7a678c6befac4506c103edb78875 100644
 --- a/src/main/java/org/bukkit/inventory/InventoryView.java
 +++ b/src/main/java/org/bukkit/inventory/InventoryView.java
@@ -450,7 +450,7 @@ public abstract class InventoryView {
--- a/patches/unapplied/api/0271-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/unapplied/api/0271-Cache-the-result-of-Material-isBlock.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Cache the result of Material#isBlock


 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 733223b0b0a1490afd0957957798e010a2373216..9e6380ed86b11cc763afa02ddaf124ee98e24797 100644
+index f2ca0a11f0d7f8c48f7464045eded5486c1128af..b93f0af3a06ee4fb00964066e1b6d1d13dfec5c3 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
@@ -3932,6 +3932,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
--- a/patches/unapplied/api/0275-Add-Block-isValidTool.patch
+++ b/patches/unapplied/api/0275-Add-Block-isValidTool.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add Block#isValidTool


 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index bcf3dc1bc640dc270446db0e1da081272d3933f1..cff83028e9a08466551db4698cf4860553dd750d 100644
+index 43a0e57a6db702b2a40e151f151bfaa63b9d95d5..c847bc83c0911007d226f1a8c6f1d0cefa9a1689 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
@@ -229,6 +229,15 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
--- a/patches/unapplied/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch
@ -5,7 +5,7 @@ Subject: [PATCH] add get-set drop chance to EntityEquipment


 diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-index ac9e606b85e0715b7e1b331a987c0ee34ee541ff..7b21e913a3ac9beb5dab91f11b1a0aa62e33ad36 100644
+index 42f76751ec414648ee719c341d471d947bf85be6..58d52f6e1660ebdb098566a2ae6b50c8b44dc0d9 100644
 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
 +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
@@ -513,4 +513,32 @@ public interface EntityEquipment {
--- a/patches/unapplied/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent


 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 033960f566861e303b9cb61aae4c02add501d93f..694a81769076ea58aae9f14f076ab80c9952c957 100644
+index 9acf1fb404ccf9b3bc06a448c3099ca2e838facf..baee5038ec7c3e190a328016d9ab290ae48badf6 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -20,6 +20,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
--- a/patches/unapplied/api/0295-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/api/0295-Add-basic-Datapack-API.patch
@ -70,7 +70,7 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c7fe6865e1a14116b61ae69c26d4af2d8af11955..64fc7215eb93b50173ed716c1dde1a151a0edf6e 100644
+index 3a2137c6505ef0e14875f7eaa7809509750fb625..5da1155557c6a662632717ac55d546dd91dee3fa 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2294,6 +2294,14 @@ public final class Bukkit {
--- a/patches/unapplied/api/0313-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/unapplied/api/0313-Add-Git-information-to-version-command-on-startup.patch
@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7732d26277ca8b845898cb01c7623a2f175f0aaa..2af2a948dc9c0d4ad28fccb1c9a2b28d5db99203 100644
+index 5da1155557c6a662632717ac55d546dd91dee3fa..3e3e48f467eef561eeada98c6b99388e23595d7f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -53,6 +53,7 @@ import org.bukkit.util.CachedServerIcon;
--- a/patches/unapplied/api/0340-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/api/0340-Add-Raw-Byte-Entity-Serialization.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization


 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 54b0fe21d3b6379e6550a3b1dc81c2a44e7699da..b39d1474210da1974d7e95f10daaf496a9330442 100644
+index be8d5c172b0a300648f21e2163ccf0a9cd7915ee..4fcafddf3792b66c618f91e04d102f374de565a8 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -112,6 +112,14 @@ public interface UnsafeValues {
--- a/patches/unapplied/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/unapplied/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 746e988f67e1d3218556e52ad70a4f5133d1bc1e..6f9ffbb907b7f14ae2cfc3cae45ea277c00d461c 100644
+index 3e3e48f467eef561eeada98c6b99388e23595d7f..32d346fb12c976253a3731df6613983f01a9ebb5 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1861,6 +1861,24 @@ public final class Bukkit {
@ -61,7 +61,7 @@ index 2409c0023f90689399c8ceba179b800156d16eea..64e4667efbf60204076ef32d64aa3a76
      * Creates a boss bar instance to display to players. The progress
      * defaults to 1.0
 diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-index eff4c1cb410e032ee287084cb51b59fd9f84df8d..7c24e9d207bad6eff6793e2348fd34a462a49e5d 100644
+index e70e6949a9d5a5a37f0c92e139071d4060548e96..ef756dcd55146af71649658eadc45b70d3ba057f 100644
 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
 +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
@@ -454,6 +454,22 @@ public abstract class ChunkGenerator {
--- a/patches/unapplied/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent


 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 694a81769076ea58aae9f14f076ab80c9952c957..356d1154b0732e2daf242d60fa715dba9f2dc9db 100644
+index baee5038ec7c3e190a328016d9ab290ae48badf6..635b8787fc235b61c0d5677def034656e4ec4cef 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -22,6 +22,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
--- a/patches/unapplied/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/unapplied/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch
@ -5,7 +5,7 @@ Subject: [PATCH] API for creating command sender which forwards feedback


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6f9ffbb907b7f14ae2cfc3cae45ea277c00d461c..9a7a2ad3d245b5215b914ef1a00fb65a83639871 100644
+index 32d346fb12c976253a3731df6613983f01a9ebb5..7fcb2d84e707576531ddb9a7dd85cf0481ae58ce 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1392,6 +1392,20 @@ public final class Bukkit {
--- a/patches/unapplied/api/0371-Custom-Potion-Mixes.patch
+++ b/patches/unapplied/api/0371-Custom-Potion-Mixes.patch
@ -102,7 +102,7 @@ index 0000000000000000000000000000000000000000..cb6d93526b637946aec311bef103ad30
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9a7a2ad3d245b5215b914ef1a00fb65a83639871..d8666481f9a407403d0114ff02024fd3c50c27c4 100644
+index 7fcb2d84e707576531ddb9a7dd85cf0481ae58ce..a87399fa4838d4b2c1ff9cc35d433ae76cc149bf 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2353,6 +2353,15 @@ public final class Bukkit {
--- a/patches/unapplied/api/0374-Add-getComputedBiome-API.patch
+++ b/patches/unapplied/api/0374-Add-getComputedBiome-API.patch
@ -51,7 +51,7 @@ index 43b53c21af01e0f496c8aaacff82dfdfadaf40f6..3f7e860de4e28745fcdf8d2f41f4a8c2
      * Sets the {@link Biome} at the given {@link Location}.
      *
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 3e980c630452c8ea72227bc4cd92c605253cd41b..f95b7a60dd6f3ed25f84296f249eb0776855d255 100644
+index cff39708e66208921da15d12d94407d6b6950298..e405c279f6135c94c775a856ab88fd3cace6bd5c 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
@@ -370,10 +370,22 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran