diff --git a/patches/api/0007-Add-Position.patch b/patches/api/0007-Add-Position.patch new file mode 100644 index 0000000000..2300664a07 --- /dev/null +++ b/patches/api/0007-Add-Position.patch @@ -0,0 +1,422 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sun, 20 Mar 2022 10:42:28 -0700 +Subject: [PATCH] Add Position + + +diff --git a/src/main/java/io/papermc/paper/math/BlockPosition.java b/src/main/java/io/papermc/paper/math/BlockPosition.java +new file mode 100644 +index 0000000000000000000000000000000000000000..f164d32cfbd5bfd84f3067a149d34bb1185a7e00 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/math/BlockPosition.java +@@ -0,0 +1,98 @@ ++package io.papermc.paper.math; ++ ++import org.bukkit.Axis; ++import org.bukkit.block.BlockFace; ++import org.jetbrains.annotations.ApiStatus; ++import org.jetbrains.annotations.Contract; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * A position represented with integers. ++ *

++ * May see breaking changes until Experimental annotation is removed. ++ * @see FinePosition ++ */ ++@ApiStatus.Experimental ++public interface BlockPosition extends Position { ++ ++ @Override ++ default double x() { ++ return this.blockX(); ++ } ++ ++ @Override ++ default double y() { ++ return this.blockY(); ++ } ++ ++ @Override ++ default double z() { ++ return this.blockZ(); ++ } ++ ++ @Override ++ default boolean isBlock() { ++ return true; ++ } ++ ++ @Override ++ default boolean isFine() { ++ return false; ++ } ++ ++ @Override ++ default @NotNull BlockPosition toBlock() { ++ return this; ++ } ++ ++ @Override ++ default @NotNull BlockPosition offset(int x, int y, int z) { ++ return x == 0 && y == 0 && z == 0 ? this : new BlockPositionImpl(this.blockX() + x, this.blockY() + y, this.blockZ() + z); ++ } ++ ++ @Override ++ default @NotNull FinePosition offset(double x, double y, double z) { ++ return new FinePositionImpl(this.blockX() + z, this.blockY() + y, this.blockZ() + z); ++ } ++ ++ /** ++ * Returns a block position offset by 1 in the direction specified. ++ * ++ * @param blockFace the block face to offset towards ++ * @return the offset block position ++ */ ++ @Contract(value = "_ -> new", pure = true) ++ default @NotNull BlockPosition offset(@NotNull BlockFace blockFace) { ++ return this.offset(blockFace, 1); ++ } ++ ++ /** ++ * Returns a block position offset in the direction specified ++ * multiplied by the amount. ++ * ++ * @param blockFace the block face to offset towards ++ * @param amount the number of times to move in that direction ++ * @return the offset block position ++ */ ++ @Contract(pure = true) ++ default @NotNull BlockPosition offset(@NotNull BlockFace blockFace, int amount) { ++ return amount == 0 ? this : new BlockPositionImpl(this.blockX() + (blockFace.getModX() * amount), this.blockY() + (blockFace.getModY() * amount), this.blockZ() + (blockFace.getModZ() * amount)); ++ } ++ ++ /** ++ * Returns a block position offset by the amount along ++ * the specified axis. ++ * ++ * @param axis the axis to offset along ++ * @param amount the amount to offset along that axis ++ * @return the offset block position ++ */ ++ @Contract(pure = true) ++ default @NotNull BlockPosition offset(@NotNull Axis axis, int amount) { ++ return amount == 0 ? this : switch (axis) { ++ case X -> new BlockPositionImpl(this.blockX() + amount, this.blockY(), this.blockZ()); ++ case Y -> new BlockPositionImpl(this.blockX(), this.blockY() + amount, this.blockZ()); ++ case Z -> new BlockPositionImpl(this.blockX(), this.blockY(), this.blockZ() + amount); ++ }; ++ } ++} +diff --git a/src/main/java/io/papermc/paper/math/BlockPositionImpl.java b/src/main/java/io/papermc/paper/math/BlockPositionImpl.java +new file mode 100644 +index 0000000000000000000000000000000000000000..eb5a3f26c7ba56c6715827f52c0013a860ec7d9a +--- /dev/null ++++ b/src/main/java/io/papermc/paper/math/BlockPositionImpl.java +@@ -0,0 +1,4 @@ ++package io.papermc.paper.math; ++ ++record BlockPositionImpl(int blockX, int blockY, int blockZ) implements BlockPosition { ++} +diff --git a/src/main/java/io/papermc/paper/math/FinePosition.java b/src/main/java/io/papermc/paper/math/FinePosition.java +new file mode 100644 +index 0000000000000000000000000000000000000000..d8df70d731573cf2446044925f218876d62fd7cf +--- /dev/null ++++ b/src/main/java/io/papermc/paper/math/FinePosition.java +@@ -0,0 +1,56 @@ ++package io.papermc.paper.math; ++ ++import org.bukkit.util.NumberConversions; ++import org.bukkit.util.Vector; ++import org.jetbrains.annotations.ApiStatus; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * A position represented with doubles. ++ *

++ * May see breaking changes until Experimental annotation is removed. ++ * @see BlockPosition ++ */ ++@ApiStatus.Experimental ++public interface FinePosition extends Position { ++ ++ @Override ++ default int blockX() { ++ return NumberConversions.floor(this.x()); ++ } ++ ++ @Override ++ default int blockY() { ++ return NumberConversions.floor(this.y()); ++ } ++ ++ @Override ++ default int blockZ() { ++ return NumberConversions.floor(this.z()); ++ } ++ ++ @Override ++ default boolean isBlock() { ++ return false; ++ } ++ ++ @Override ++ default boolean isFine() { ++ return true; ++ } ++ ++ @Override ++ default @NotNull BlockPosition toBlock() { ++ return new BlockPositionImpl(this.blockX(), this.blockY(), this.blockZ()); ++ } ++ ++ @Override ++ default @NotNull FinePosition offset(int x, int y, int z) { ++ return this.offset((double) x, y, z); ++ } ++ ++ @Override ++ default @NotNull FinePosition offset(double x, double y, double z) { ++ return x == 0.0 && y == 0.0 && z == 0.0 ? this : new FinePositionImpl(this.x() + x, this.y() + y, this.z() + z); ++ } ++} +diff --git a/src/main/java/io/papermc/paper/math/FinePositionImpl.java b/src/main/java/io/papermc/paper/math/FinePositionImpl.java +new file mode 100644 +index 0000000000000000000000000000000000000000..93476aaf8d21efb5a30b6d2cc2eeda8100fb72d0 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/math/FinePositionImpl.java +@@ -0,0 +1,4 @@ ++package io.papermc.paper.math; ++ ++record FinePositionImpl(double x, double y, double z) implements FinePosition { ++} +diff --git a/src/main/java/io/papermc/paper/math/Position.java b/src/main/java/io/papermc/paper/math/Position.java +new file mode 100644 +index 0000000000000000000000000000000000000000..300da713dcc303b340efad70efe57facf5422964 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/math/Position.java +@@ -0,0 +1,184 @@ ++package io.papermc.paper.math; ++ ++import org.bukkit.Location; ++import org.bukkit.World; ++import org.bukkit.util.Vector; ++import org.jetbrains.annotations.ApiStatus; ++import org.jetbrains.annotations.Contract; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * Common interface for {@link FinePosition} and {@link BlockPosition}. ++ *

++ * May see breaking changes until Experimental annotation is removed. ++ */ ++@ApiStatus.Experimental ++public interface Position { ++ ++ FinePosition FINE_ZERO = new FinePositionImpl(0, 0, 0); ++ BlockPosition BLOCK_ZERO = new BlockPositionImpl(0, 0, 0); ++ ++ /** ++ * Gets the block x value for this position ++ * ++ * @return the block x value ++ */ ++ int blockX(); ++ ++ /** ++ * Gets the block x value for this position ++ * ++ * @return the block x value ++ */ ++ int blockY(); ++ ++ /** ++ * Gets the block x value for this position ++ * ++ * @return the block x value ++ */ ++ int blockZ(); ++ ++ /** ++ * Gets the x value for this position ++ * ++ * @return the x value ++ */ ++ double x(); ++ ++ /** ++ * Gets the y value for this position ++ * ++ * @return the y value ++ */ ++ double y(); ++ ++ /** ++ * Gets the z value for this position ++ * ++ * @return the z value ++ */ ++ double z(); ++ ++ /** ++ * Checks of this position represents a {@link BlockPosition} ++ * ++ * @return true if block ++ */ ++ boolean isBlock(); ++ ++ /** ++ * Checks if this position represents a {@link FinePosition} ++ * ++ * @return true if fine ++ */ ++ boolean isFine(); ++ ++ /** ++ * Returns a position offset by the specified amounts. ++ * ++ * @param x x value to offset ++ * @param y y value to offset ++ * @param z z value to offset ++ * @return the offset position ++ */ ++ @NotNull Position offset(int x, int y, int z); ++ ++ /** ++ * Returns a position offset by the specified amounts. ++ * ++ * @param x x value to offset ++ * @param y y value to offset ++ * @param z z value to offset ++ * @return the offset position ++ */ ++ @NotNull FinePosition offset(double x, double y, double z); ++ ++ /** ++ * Returns a new position at the center of the block position this represents ++ * ++ * @return a new center position ++ */ ++ @Contract(value = "-> new", pure = true) ++ default @NotNull FinePosition toCenter() { ++ return new FinePositionImpl(this.blockX() + 0.5, this.blockY() + 0.5, this.blockZ() + 0.5); ++ } ++ ++ /** ++ * Returns the block position of this position ++ * or itself if it already is a block position ++ * ++ * @return the block position ++ */ ++ @Contract(pure = true) ++ @NotNull BlockPosition toBlock(); ++ ++ /** ++ * Converts this position to a vector ++ * ++ * @return a new vector ++ */ ++ @Contract(value = "-> new", pure = true) ++ default @NotNull Vector toVector() { ++ return new Vector(this.x(), this.y(), this.z()); ++ } ++ ++ /** ++ * Creates a new location object at this position with the specified world ++ * ++ * @param world the world for the location object ++ * @return a new location ++ */ ++ @Contract(value = "_ -> new", pure = true) ++ default @NotNull Location toLocation(@NotNull World world) { ++ return new Location(world, this.x(), this.y(), this.z()); ++ } ++ ++ /** ++ * Creates a position at the coordinates ++ * ++ * @param x x coord ++ * @param y y coord ++ * @param z z coord ++ * @return a position with those coords ++ */ ++ @Contract(value = "_, _, _ -> new", pure = true) ++ static @NotNull BlockPosition block(int x, int y, int z) { ++ return new BlockPositionImpl(x, y, z); ++ } ++ ++ /** ++ * Creates a position from the location. ++ * ++ * @param location the location to copy the position of ++ * @return a new position at that location ++ */ ++ @Contract(value = "_ -> new", pure = true) ++ static @NotNull BlockPosition block(@NotNull Location location) { ++ return new BlockPositionImpl(location.getBlockX(), location.getBlockY(), location.getBlockZ()); ++ } ++ ++ /** ++ * Creates a position at the coordinates ++ * ++ * @param x x coord ++ * @param y y coord ++ * @param z z coord ++ * @return a position with those coords ++ */ ++ @Contract(value = "_, _, _ -> new", pure = true) ++ static @NotNull FinePosition fine(double x, double y, double z) { ++ return new FinePositionImpl(x, y, z); ++ } ++ ++ /** ++ * Creates a position from the location. ++ * ++ * @param location the location to copy the position of ++ * @return a new position at that location ++ */ ++ @Contract(value = "_ -> new", pure = true) ++ static @NotNull FinePosition fine(@NotNull Location location) { ++ return new FinePositionImpl(location.getX(), location.getY(), location.getZ()); ++ } ++} +diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java +index 7c4db051472fb6a6c6d24092dc6f75487356690a..3b99f359f556e6f2c341d55fa69b7462e69b6546 100644 +--- a/src/main/java/org/bukkit/Location.java ++++ b/src/main/java/org/bukkit/Location.java +@@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable; + * magnitude than 360 are valid, but may be normalized to any other equivalent + * representation by the implementation. + */ +-public class Location implements Cloneable, ConfigurationSerializable { ++public class Location implements Cloneable, ConfigurationSerializable, io.papermc.paper.math.FinePosition { // Paper + private Reference world; + private double x; + private double y; +@@ -706,4 +706,26 @@ public class Location implements Cloneable, ConfigurationSerializable { + } + return pitch; + } ++ ++ // Paper - add Position ++ @Override ++ public double x() { ++ return this.getX(); ++ } ++ ++ @Override ++ public double y() { ++ return this.getY(); ++ } ++ ++ @Override ++ public double z() { ++ return this.getZ(); ++ } ++ ++ @Override ++ public @NotNull Location toLocation(@NotNull World world) { ++ return new Location(world, this.x(), this.y(), this.z(), this.getYaw(), this.getPitch()); ++ } ++ // Paper end + } diff --git a/patches/api/0007-Timings-v2.patch b/patches/api/0008-Timings-v2.patch similarity index 100% rename from patches/api/0007-Timings-v2.patch rename to patches/api/0008-Timings-v2.patch diff --git a/patches/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0009-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 98% rename from patches/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/api/0009-Add-command-line-option-to-load-extra-plugin-jars-no.patch index 882f4d93ce..aab62144b6 100644 --- a/patches/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/api/0009-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 557cf1ff29e16fa942545ceca14696c2a50b2d4d..a5c02f744664248f46aa35452318b6a728cd4afd 100644 +index e24589a4cb42b0163e4a1455b8b11d7130b5cd41..71a09ed2b9863d2d339967f41ab6373ec27429d3 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -76,6 +76,20 @@ public final class Bukkit { @@ -32,7 +32,7 @@ index 557cf1ff29e16fa942545ceca14696c2a50b2d4d..a5c02f744664248f46aa35452318b6a7 * Attempts to set the {@link Server} singleton. *

diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index a2ae6b84fe20e43292f1442401a472dcce1600ec..da13ae75ca1892c21a35aff02f92b91783a868bf 100644 +index ac087402c90dad4b3c499fcf8507e50e9099cea5..a4f8035b40eebff8afe01788781128b04247f28c 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -61,6 +61,18 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0009-Player-affects-spawning-API.patch b/patches/api/0010-Player-affects-spawning-API.patch similarity index 100% rename from patches/api/0009-Player-affects-spawning-API.patch rename to patches/api/0010-Player-affects-spawning-API.patch diff --git a/patches/api/0010-Add-getTPS-method.patch b/patches/api/0011-Add-getTPS-method.patch similarity index 100% rename from patches/api/0010-Add-getTPS-method.patch rename to patches/api/0011-Add-getTPS-method.patch diff --git a/patches/api/0011-Version-Command-2.0.patch b/patches/api/0012-Version-Command-2.0.patch similarity index 98% rename from patches/api/0011-Version-Command-2.0.patch rename to patches/api/0012-Version-Command-2.0.patch index 6714ff1b26..e1dd11c10e 100644 --- a/patches/api/0011-Version-Command-2.0.patch +++ b/patches/api/0012-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 c9ecd5b1908e05a1b39dadcded27241672adcddf..355c46f1c1f08072446f3cc92c0d22898933a7fc 100644 +index d45cc92ca30e79173f30aae10724beeec6d22398..c67d2e96e30261e480f1df96464befac03d78a69 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -95,5 +95,12 @@ public interface UnsafeValues { diff --git a/patches/api/0012-Entity-Origin-API.patch b/patches/api/0013-Entity-Origin-API.patch similarity index 96% rename from patches/api/0012-Entity-Origin-API.patch rename to patches/api/0013-Entity-Origin-API.patch index 38b4bb97a1..9ed5bdd083 100644 --- a/patches/api/0012-Entity-Origin-API.patch +++ b/patches/api/0013-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 a829779ac56a271cad463806984991b4713a27be..20c529bdd94a6bac09d9f8222f33dfc9e8d53fa9 100644 +index bdcf5219ff1e4d4c0dc8a3423bc17b453b779473..a4dfac73b8510f0dddd65751b8430be1abdabbdd 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -698,5 +698,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0013-Add-PlayerLocaleChangeEvent.patch b/patches/api/0014-Add-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/api/0013-Add-PlayerLocaleChangeEvent.patch rename to patches/api/0014-Add-PlayerLocaleChangeEvent.patch diff --git a/patches/api/0014-Add-view-distance-API.patch b/patches/api/0015-Add-view-distance-API.patch similarity index 100% rename from patches/api/0014-Add-view-distance-API.patch rename to patches/api/0015-Add-view-distance-API.patch diff --git a/patches/api/0015-Add-BeaconEffectEvent.patch b/patches/api/0016-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/api/0015-Add-BeaconEffectEvent.patch rename to patches/api/0016-Add-BeaconEffectEvent.patch diff --git a/patches/api/0016-Add-PlayerInitialSpawnEvent.patch b/patches/api/0017-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/api/0016-Add-PlayerInitialSpawnEvent.patch rename to patches/api/0017-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/api/0017-Automatically-disable-plugins-that-fail-to-load.patch b/patches/api/0018-Automatically-disable-plugins-that-fail-to-load.patch similarity index 100% rename from patches/api/0017-Automatically-disable-plugins-that-fail-to-load.patch rename to patches/api/0018-Automatically-disable-plugins-that-fail-to-load.patch diff --git a/patches/api/0018-Expose-server-CommandMap.patch b/patches/api/0019-Expose-server-CommandMap.patch similarity index 100% rename from patches/api/0018-Expose-server-CommandMap.patch rename to patches/api/0019-Expose-server-CommandMap.patch diff --git a/patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch similarity index 96% rename from patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch rename to patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index ddb12482a0..99ec6d6bc6 100644 --- a/patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/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 5475f7df443a31e839d353e251b0d9d55e53a84f..7a8eaf46ecd37163dbe34beb2cf8754bddae302f 100644 +index 1035ce181415a19f8d6460f70d3d900e3f7017d3..316146305465b68b703e898206745de94ad5350f 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -379,6 +379,30 @@ public final class Bukkit { @@ -41,7 +41,7 @@ index 5475f7df443a31e839d353e251b0d9d55e53a84f..7a8eaf46ecd37163dbe34beb2cf8754b * 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 2dac2c6e01b4f230750605ab1f49317927705c6b..1aed052ea337f2875b581064bd8e79d8a5a1a9ec 100644 +index 6a7b91af3e738613cf79c13e2844efe9a2efd254..bef555b3de44fed312b45a5d5cd811b18fda88c8 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -312,6 +312,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0020-Add-exception-reporting-event.patch b/patches/api/0021-Add-exception-reporting-event.patch similarity index 100% rename from patches/api/0020-Add-exception-reporting-event.patch rename to patches/api/0021-Add-exception-reporting-event.patch diff --git a/patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch similarity index 100% rename from patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch rename to patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch diff --git a/patches/api/0022-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/api/0023-Fix-ServerListPingEvent-flagging-as-Async.patch similarity index 100% rename from patches/api/0022-Fix-ServerListPingEvent-flagging-as-Async.patch rename to patches/api/0023-Fix-ServerListPingEvent-flagging-as-Async.patch diff --git a/patches/api/0023-Player-Tab-List-and-Title-APIs.patch b/patches/api/0024-Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/api/0023-Player-Tab-List-and-Title-APIs.patch rename to patches/api/0024-Player-Tab-List-and-Title-APIs.patch diff --git a/patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0025-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/api/0025-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/api/0025-Complete-resource-pack-API.patch b/patches/api/0026-Complete-resource-pack-API.patch similarity index 100% rename from patches/api/0025-Complete-resource-pack-API.patch rename to patches/api/0026-Complete-resource-pack-API.patch diff --git a/patches/api/0026-Use-ASM-for-event-executors.patch b/patches/api/0027-Use-ASM-for-event-executors.patch similarity index 99% rename from patches/api/0026-Use-ASM-for-event-executors.patch rename to patches/api/0027-Use-ASM-for-event-executors.patch index 8f14b61d08..a54f62a007 100644 --- a/patches/api/0026-Use-ASM-for-event-executors.patch +++ b/patches/api/0027-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 3320666626cdadefc045331d33c3e9e9741344fc..68d751b045665f8006cc56e7fd3e2b2dcbda5a02 100644 +index c9f9174a085174b96897c013e0ecb79738c2e9e3..9d650b937610d83748b30d724cee97afd715167f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,6 +39,9 @@ dependencies { diff --git a/patches/api/0027-Add-a-call-helper-to-Event.patch b/patches/api/0028-Add-a-call-helper-to-Event.patch similarity index 100% rename from patches/api/0027-Add-a-call-helper-to-Event.patch rename to patches/api/0028-Add-a-call-helper-to-Event.patch diff --git a/patches/api/0028-Add-sender-name-to-commands.yml-replacement.patch b/patches/api/0029-Add-sender-name-to-commands.yml-replacement.patch similarity index 100% rename from patches/api/0028-Add-sender-name-to-commands.yml-replacement.patch rename to patches/api/0029-Add-sender-name-to-commands.yml-replacement.patch diff --git a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch similarity index 100% rename from patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch rename to patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch diff --git a/patches/api/0030-Custom-replacement-for-eaten-items.patch b/patches/api/0031-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/api/0030-Custom-replacement-for-eaten-items.patch rename to patches/api/0031-Custom-replacement-for-eaten-items.patch diff --git a/patches/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/api/0032-EntityPathfindEvent.patch b/patches/api/0033-EntityPathfindEvent.patch similarity index 100% rename from patches/api/0032-EntityPathfindEvent.patch rename to patches/api/0033-EntityPathfindEvent.patch diff --git a/patches/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch similarity index 100% rename from patches/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch rename to patches/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch diff --git a/patches/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch similarity index 100% rename from patches/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch rename to patches/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch diff --git a/patches/api/0035-Add-PlayerUseUnknownEntityEvent.patch b/patches/api/0036-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/api/0035-Add-PlayerUseUnknownEntityEvent.patch rename to patches/api/0036-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/api/0037-Arrow-pickup-rule-API.patch b/patches/api/0038-Arrow-pickup-rule-API.patch similarity index 100% rename from patches/api/0037-Arrow-pickup-rule-API.patch rename to patches/api/0038-Arrow-pickup-rule-API.patch diff --git a/patches/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/api/0039-LootTable-API.patch b/patches/api/0040-LootTable-API.patch similarity index 100% rename from patches/api/0039-LootTable-API.patch rename to patches/api/0040-LootTable-API.patch diff --git a/patches/api/0040-Add-EntityZapEvent.patch b/patches/api/0041-Add-EntityZapEvent.patch similarity index 100% rename from patches/api/0040-Add-EntityZapEvent.patch rename to patches/api/0041-Add-EntityZapEvent.patch diff --git a/patches/api/0041-Misc-Utils.patch b/patches/api/0042-Misc-Utils.patch similarity index 100% rename from patches/api/0041-Misc-Utils.patch rename to patches/api/0042-Misc-Utils.patch diff --git a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0043-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/api/0042-Allow-Reloading-of-Command-Aliases.patch rename to patches/api/0043-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/api/0043-Add-source-to-PlayerExpChangeEvent.patch b/patches/api/0044-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/api/0043-Add-source-to-PlayerExpChangeEvent.patch rename to patches/api/0044-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/api/0044-Add-ProjectileCollideEvent.patch b/patches/api/0045-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/api/0044-Add-ProjectileCollideEvent.patch rename to patches/api/0045-Add-ProjectileCollideEvent.patch diff --git a/patches/api/0045-Add-String-based-Action-Bar-API.patch b/patches/api/0046-Add-String-based-Action-Bar-API.patch similarity index 100% rename from patches/api/0045-Add-String-based-Action-Bar-API.patch rename to patches/api/0046-Add-String-based-Action-Bar-API.patch diff --git a/patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/api/0047-IllegalPacketEvent.patch b/patches/api/0048-IllegalPacketEvent.patch similarity index 100% rename from patches/api/0047-IllegalPacketEvent.patch rename to patches/api/0048-IllegalPacketEvent.patch diff --git a/patches/api/0048-Fireworks-API-s.patch b/patches/api/0049-Fireworks-API-s.patch similarity index 100% rename from patches/api/0048-Fireworks-API-s.patch rename to patches/api/0049-Fireworks-API-s.patch diff --git a/patches/api/0049-PlayerTeleportEndGatewayEvent.patch b/patches/api/0050-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/api/0049-PlayerTeleportEndGatewayEvent.patch rename to patches/api/0050-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 93% rename from patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch index 91de10f039..d90b03ed52 100644 --- a/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/patches/api/0051-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 887b85849803cee22a41a701b43cdc9085ba0dc3..e0683e69029e8ac423bda79521045b06673eabf3 100644 +index 75a87b221cc0f6334c5283130a7b2bfdf4eedd03..e6c9942f7820f2b8750c1bb0825c8bdbc6f4b99e 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -45,6 +45,33 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch similarity index 100% rename from patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch rename to patches/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch diff --git a/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/api/0054-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch similarity index 100% rename from patches/api/0054-Fix-upstream-javadocs.patch rename to patches/api/0055-Fix-upstream-javadocs.patch diff --git a/patches/api/0055-Item-canEntityPickup.patch b/patches/api/0056-Item-canEntityPickup.patch similarity index 100% rename from patches/api/0055-Item-canEntityPickup.patch rename to patches/api/0056-Item-canEntityPickup.patch diff --git a/patches/api/0056-PlayerAttemptPickupItemEvent.patch b/patches/api/0057-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/api/0056-PlayerAttemptPickupItemEvent.patch rename to patches/api/0057-PlayerAttemptPickupItemEvent.patch diff --git a/patches/api/0057-Add-UnknownCommandEvent.patch b/patches/api/0058-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/api/0057-Add-UnknownCommandEvent.patch rename to patches/api/0058-Add-UnknownCommandEvent.patch diff --git a/patches/api/0058-Basic-PlayerProfile-API.patch b/patches/api/0059-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/api/0058-Basic-PlayerProfile-API.patch rename to patches/api/0059-Basic-PlayerProfile-API.patch diff --git a/patches/api/0059-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/api/0059-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/api/0060-Shoulder-Entities-Release-API.patch b/patches/api/0061-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/api/0060-Shoulder-Entities-Release-API.patch rename to patches/api/0061-Shoulder-Entities-Release-API.patch diff --git a/patches/api/0061-Entity-fromMobSpawner.patch b/patches/api/0062-Entity-fromMobSpawner.patch similarity index 88% rename from patches/api/0061-Entity-fromMobSpawner.patch rename to patches/api/0062-Entity-fromMobSpawner.patch index b0560b7aad..9735cb4cc6 100644 --- a/patches/api/0061-Entity-fromMobSpawner.patch +++ b/patches/api/0062-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 20c529bdd94a6bac09d9f8222f33dfc9e8d53fa9..e598c7c90d625313b8a935418bb68e0e6cb6bc6e 100644 +index a4dfac73b8510f0dddd65751b8430be1abdabbdd..6b0bfcfd22105fbdf09c11bbec009ba19116abd9 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -708,5 +708,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0062-Profile-Lookup-Events.patch b/patches/api/0063-Profile-Lookup-Events.patch similarity index 100% rename from patches/api/0062-Profile-Lookup-Events.patch rename to patches/api/0063-Profile-Lookup-Events.patch diff --git a/patches/api/0063-Improve-the-Saddle-API-for-Horses.patch b/patches/api/0064-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/api/0063-Improve-the-Saddle-API-for-Horses.patch rename to patches/api/0064-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/api/0064-Add-getI18NDisplayName-API.patch b/patches/api/0065-Add-getI18NDisplayName-API.patch similarity index 100% rename from patches/api/0064-Add-getI18NDisplayName-API.patch rename to patches/api/0065-Add-getI18NDisplayName-API.patch diff --git a/patches/api/0065-ensureServerConversions-API.patch b/patches/api/0066-ensureServerConversions-API.patch similarity index 100% rename from patches/api/0065-ensureServerConversions-API.patch rename to patches/api/0066-ensureServerConversions-API.patch diff --git a/patches/api/0066-Make-plugins-list-alphabetical.patch b/patches/api/0067-Make-plugins-list-alphabetical.patch similarity index 100% rename from patches/api/0066-Make-plugins-list-alphabetical.patch rename to patches/api/0067-Make-plugins-list-alphabetical.patch diff --git a/patches/api/0067-LivingEntity-setKiller.patch b/patches/api/0068-LivingEntity-setKiller.patch similarity index 100% rename from patches/api/0067-LivingEntity-setKiller.patch rename to patches/api/0068-LivingEntity-setKiller.patch diff --git a/patches/api/0068-ProfileWhitelistVerifyEvent.patch b/patches/api/0069-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/api/0068-ProfileWhitelistVerifyEvent.patch rename to patches/api/0069-ProfileWhitelistVerifyEvent.patch diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch similarity index 95% rename from patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch rename to patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch index 1baed8390d..2fbad5cbc1 100644 --- a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0070-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 f0f8047cb3a43b447dc50b730dab3d0bc471b25a..435db1ffe47476bcb7067802faad7aee7e4c3f54 100644 +index 9d650b937610d83748b30d724cee97afd715167f..3c4dd6ebc2289c44c2f5723e7920aadffdc51884 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,6 +39,8 @@ dependencies { diff --git a/patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch similarity index 100% rename from patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch rename to patches/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch diff --git a/patches/api/0071-Add-PlayerJumpEvent.patch b/patches/api/0072-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/api/0071-Add-PlayerJumpEvent.patch rename to patches/api/0072-Add-PlayerJumpEvent.patch diff --git a/patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch similarity index 100% rename from patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch rename to patches/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch diff --git a/patches/api/0073-Add-PlayerArmorChangeEvent.patch b/patches/api/0074-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/api/0073-Add-PlayerArmorChangeEvent.patch rename to patches/api/0074-Add-PlayerArmorChangeEvent.patch diff --git a/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/api/0075-AsyncTabCompleteEvent.patch b/patches/api/0076-AsyncTabCompleteEvent.patch similarity index 99% rename from patches/api/0075-AsyncTabCompleteEvent.patch rename to patches/api/0076-AsyncTabCompleteEvent.patch index 92a32f4d5f..205825a521 100644 --- a/patches/api/0075-AsyncTabCompleteEvent.patch +++ b/patches/api/0076-AsyncTabCompleteEvent.patch @@ -578,7 +578,7 @@ index 270e6d8ad4358baa256cee5f16cff281f063ce3b..4a3451af454295ac3e1b688e6665cad9 @Override diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 93498307004b68b934fbfa1aeb3aaf0e97cbdac7..bbe81f7a420f913ffdcad913a3c43ff41ead41f5 100644 +index 8275a5d7e1de39a5171e254f449a42c6defd3445..4bca64b2a44ae032730575ecba39f9737a5a1ec7 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -48,6 +48,8 @@ public class AnnotationTest { diff --git a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch rename to patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch b/patches/api/0078-Display-warning-on-deprecated-recipe-API.patch similarity index 100% rename from patches/api/0077-Display-warning-on-deprecated-recipe-API.patch rename to patches/api/0078-Display-warning-on-deprecated-recipe-API.patch diff --git a/patches/api/0078-PlayerPickupExperienceEvent.patch b/patches/api/0079-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/api/0078-PlayerPickupExperienceEvent.patch rename to patches/api/0079-PlayerPickupExperienceEvent.patch diff --git a/patches/api/0079-ExperienceOrbMergeEvent.patch b/patches/api/0080-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/api/0079-ExperienceOrbMergeEvent.patch rename to patches/api/0080-ExperienceOrbMergeEvent.patch diff --git a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/api/0080-Ability-to-apply-mending-to-XP-API.patch rename to patches/api/0081-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/api/0081-PreCreatureSpawnEvent.patch b/patches/api/0082-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/api/0081-PreCreatureSpawnEvent.patch rename to patches/api/0082-PreCreatureSpawnEvent.patch diff --git a/patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch b/patches/api/0083-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/api/0083-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/0084-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/api/0084-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/api/0084-Fill-Profile-Property-Events.patch b/patches/api/0085-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/api/0084-Fill-Profile-Property-Events.patch rename to patches/api/0085-Fill-Profile-Property-Events.patch diff --git a/patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch b/patches/api/0086-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch rename to patches/api/0086-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/api/0086-Add-ArmorStand-Item-Meta.patch b/patches/api/0087-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/api/0086-Add-ArmorStand-Item-Meta.patch rename to patches/api/0087-Add-ArmorStand-Item-Meta.patch diff --git a/patches/api/0087-Optimize-Hoppers.patch b/patches/api/0088-Optimize-Hoppers.patch similarity index 100% rename from patches/api/0087-Optimize-Hoppers.patch rename to patches/api/0088-Optimize-Hoppers.patch diff --git a/patches/api/0088-Tameable-getOwnerUniqueId-API.patch b/patches/api/0089-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/api/0088-Tameable-getOwnerUniqueId-API.patch rename to patches/api/0089-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/api/0090-Add-extended-PaperServerListPingEvent.patch b/patches/api/0091-Add-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/api/0090-Add-extended-PaperServerListPingEvent.patch rename to patches/api/0091-Add-extended-PaperServerListPingEvent.patch diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/api/0092-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/api/0091-Player.setPlayerProfile-API.patch rename to patches/api/0092-Player.setPlayerProfile-API.patch diff --git a/patches/api/0092-getPlayerUniqueId-API.patch b/patches/api/0093-getPlayerUniqueId-API.patch similarity index 91% rename from patches/api/0092-getPlayerUniqueId-API.patch rename to patches/api/0093-getPlayerUniqueId-API.patch index 41de8c76ab..a287baa5a2 100644 --- a/patches/api/0092-getPlayerUniqueId-API.patch +++ b/patches/api/0093-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 a452adcbf8657c501ad92f4cb361b551992f128f..908e1aba5257688bb70fbf1ed83d2212305263a1 100644 +index ec1af46667d8590ea218370249286f86652f3ac4..aa4217c87756cffe774aaa2d390217b9056c4b95 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -657,6 +657,20 @@ public final class Bukkit { @@ -34,7 +34,7 @@ index a452adcbf8657c501ad92f4cb361b551992f128f..908e1aba5257688bb70fbf1ed83d2212 * 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 e90056341407f58ff6ce2d9b80c8f3f64464e650..b0e6446c0dc49088878d7ae453dc3eee8b346f4e 100644 +index 8539bac19bf9ba1a66689a9af90e088a03f9c152..c46cae77e6a1d3f01b08ff03407eb1a564d000de 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -559,6 +559,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch similarity index 100% rename from patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch rename to patches/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch diff --git a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/api/0094-Add-openSign-method-to-HumanEntity.patch rename to patches/api/0095-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch similarity index 100% rename from patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch rename to patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch diff --git a/patches/api/0096-EndermanEscapeEvent.patch b/patches/api/0097-EndermanEscapeEvent.patch similarity index 100% rename from patches/api/0096-EndermanEscapeEvent.patch rename to patches/api/0097-EndermanEscapeEvent.patch diff --git a/patches/api/0097-Enderman.teleportRandomly.patch b/patches/api/0098-Enderman.teleportRandomly.patch similarity index 100% rename from patches/api/0097-Enderman.teleportRandomly.patch rename to patches/api/0098-Enderman.teleportRandomly.patch diff --git a/patches/api/0098-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch similarity index 99% rename from patches/api/0098-Additional-world.getNearbyEntities-API-s.patch rename to patches/api/0099-Additional-world.getNearbyEntities-API-s.patch index 8b9cd24e5b..3659b5a65e 100644 --- a/patches/api/0098-Additional-world.getNearbyEntities-API-s.patch +++ b/patches/api/0099-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 e0683e69029e8ac423bda79521045b06673eabf3..cf7baa9cd691b02aeaa4d94d5e999e661e003a44 100644 +index e6c9942f7820f2b8750c1bb0825c8bdbc6f4b99e..3539e63993cc21f9eecda9046b759cebdfec80ff 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,6 +1,9 @@ diff --git a/patches/api/0099-Location.isChunkLoaded-API.patch b/patches/api/0100-Location.isChunkLoaded-API.patch similarity index 83% rename from patches/api/0099-Location.isChunkLoaded-API.patch rename to patches/api/0100-Location.isChunkLoaded-API.patch index 426944c4f9..be4937a770 100644 --- a/patches/api/0099-Location.isChunkLoaded-API.patch +++ b/patches/api/0100-Location.isChunkLoaded-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Location.isChunkLoaded() API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 7c4db051472fb6a6c6d24092dc6f75487356690a..3be91f6c9b355c9e8562796d719f5a6ce566d85a 100644 +index 3b99f359f556e6f2c341d55fa69b7462e69b6546..e71beb48f2e35d97b9d5bf8dbf5ddbc0673565fe 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm return this; } diff --git a/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 99% rename from patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch index bd90d2165d..c8a0f69c4b 100644 --- a/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -522,7 +522,7 @@ index 9f646171b3ac617fb5217d5ab9c106c3100a8c8d..2315fffc4a1a5bebc50a703e9df59df8 * 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 cf7baa9cd691b02aeaa4d94d5e999e661e003a44..9ffe69abd0aa706d56e4eff3587cb453a437ba26 100644 +index 3539e63993cc21f9eecda9046b759cebdfec80ff..8b48ce606523528f4322296b61a64bd12067387c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2787,7 +2787,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0101-EndermanAttackPlayerEvent.patch b/patches/api/0102-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/api/0101-EndermanAttackPlayerEvent.patch rename to patches/api/0102-EndermanAttackPlayerEvent.patch diff --git a/patches/api/0102-Close-Plugin-Class-Loaders-on-Disable.patch b/patches/api/0103-Close-Plugin-Class-Loaders-on-Disable.patch similarity index 100% rename from patches/api/0102-Close-Plugin-Class-Loaders-on-Disable.patch rename to patches/api/0103-Close-Plugin-Class-Loaders-on-Disable.patch diff --git a/patches/api/0103-WitchConsumePotionEvent.patch b/patches/api/0104-WitchConsumePotionEvent.patch similarity index 100% rename from patches/api/0103-WitchConsumePotionEvent.patch rename to patches/api/0104-WitchConsumePotionEvent.patch diff --git a/patches/api/0104-WitchThrowPotionEvent.patch b/patches/api/0105-WitchThrowPotionEvent.patch similarity index 100% rename from patches/api/0104-WitchThrowPotionEvent.patch rename to patches/api/0105-WitchThrowPotionEvent.patch diff --git a/patches/api/0105-Location.toBlockLocation-toCenterLocation.patch b/patches/api/0106-Location.toBlockLocation-toCenterLocation.patch similarity index 91% rename from patches/api/0105-Location.toBlockLocation-toCenterLocation.patch rename to patches/api/0106-Location.toBlockLocation-toCenterLocation.patch index 03e2f6215b..30032ac6cf 100644 --- a/patches/api/0105-Location.toBlockLocation-toCenterLocation.patch +++ b/patches/api/0106-Location.toBlockLocation-toCenterLocation.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Location.toBlockLocation/toCenterLocation() Convert location objects to their block coordinates, or the center of the block diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 3be91f6c9b355c9e8562796d719f5a6ce566d85a..a90010fea189c5ac9a59a0e6d04c0457243a3280 100644 +index e71beb48f2e35d97b9d5bf8dbf5ddbc0673565fe..5a219f132747eb62204e98de4cb850748a43c9b4 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm } public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper diff --git a/patches/api/0106-PotionEffect-clone-methods.patch b/patches/api/0107-PotionEffect-clone-methods.patch similarity index 100% rename from patches/api/0106-PotionEffect-clone-methods.patch rename to patches/api/0107-PotionEffect-clone-methods.patch diff --git a/patches/api/0107-WitchReadyPotionEvent.patch b/patches/api/0108-WitchReadyPotionEvent.patch similarity index 100% rename from patches/api/0107-WitchReadyPotionEvent.patch rename to patches/api/0108-WitchReadyPotionEvent.patch diff --git a/patches/api/0108-ItemStack-getMaxItemUseDuration.patch b/patches/api/0109-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/api/0108-ItemStack-getMaxItemUseDuration.patch rename to patches/api/0109-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch b/patches/api/0110-Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch rename to patches/api/0110-Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/api/0110-Make-shield-blocking-delay-configurable.patch b/patches/api/0111-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/api/0110-Make-shield-blocking-delay-configurable.patch rename to patches/api/0111-Make-shield-blocking-delay-configurable.patch diff --git a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0112-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 100% rename from patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to patches/api/0112-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch diff --git a/patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch b/patches/api/0113-Add-getNearbyXXX-methods-to-Location.patch similarity index 98% rename from patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch rename to patches/api/0113-Add-getNearbyXXX-methods-to-Location.patch index 7c85a03490..f34c5396b7 100644 --- a/patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch +++ b/patches/api/0113-Add-getNearbyXXX-methods-to-Location.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add "getNearbyXXX" methods to Location diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index a90010fea189c5ac9a59a0e6d04c0457243a3280..bbc636baef2e2b0586c7d517be428438ca26ab66 100644 +index 5a219f132747eb62204e98de4cb850748a43c9b4..6693e3d8dc2519facb12db981a6b6325faa095bf 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -12,6 +12,15 @@ import org.bukkit.util.Vector; @@ -24,7 +24,7 @@ index a90010fea189c5ac9a59a0e6d04c0457243a3280..bbc636baef2e2b0586c7d517be428438 /** * Represents a 3-dimensional position in a world. *
-@@ -558,6 +567,248 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -558,6 +567,248 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm centerLoc.setZ(getBlockZ() + 0.5); return centerLoc; } diff --git a/patches/api/0113-PlayerReadyArrowEvent.patch b/patches/api/0114-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/api/0113-PlayerReadyArrowEvent.patch rename to patches/api/0114-PlayerReadyArrowEvent.patch diff --git a/patches/api/0114-Add-EntityKnockbackByEntityEvent.patch b/patches/api/0115-Add-EntityKnockbackByEntityEvent.patch similarity index 100% rename from patches/api/0114-Add-EntityKnockbackByEntityEvent.patch rename to patches/api/0115-Add-EntityKnockbackByEntityEvent.patch diff --git a/patches/api/0115-Expand-Explosions-API.patch b/patches/api/0116-Expand-Explosions-API.patch similarity index 97% rename from patches/api/0115-Expand-Explosions-API.patch rename to patches/api/0116-Expand-Explosions-API.patch index fee2c850bb..eefb112a52 100644 --- a/patches/api/0115-Expand-Explosions-API.patch +++ b/patches/api/0116-Expand-Explosions-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index bbc636baef2e2b0586c7d517be428438ca26ab66..a8d4f7972d07ddde171b4a1ec470a4c616e02b2e 100644 +index 6693e3d8dc2519facb12db981a6b6325faa095bf..5a6b33c6d9a68affdbd02c13fdb0854e011e327d 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -7,6 +7,7 @@ import java.util.HashMap; @@ -17,7 +17,7 @@ index bbc636baef2e2b0586c7d517be428438ca26ab66..a8d4f7972d07ddde171b4a1ec470a4c6 import org.bukkit.util.NumberConversions; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; -@@ -568,6 +569,87 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -568,6 +569,87 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm return centerLoc; } @@ -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 9ffe69abd0aa706d56e4eff3587cb453a437ba26..147fa28678f09ebc0fdaf3f26ba0693a74a683f2 100644 +index 8b48ce606523528f4322296b61a64bd12067387c..fd50f3a12863d1bc65d1880c939389f7b5d2c53c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1424,6 +1424,88 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0117-ItemStack-API-additions-for-quantity-flags-lore.patch similarity index 100% rename from patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch rename to patches/api/0117-ItemStack-API-additions-for-quantity-flags-lore.patch diff --git a/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/0118-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/api/0118-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/api/0118-RangedEntity-API.patch b/patches/api/0119-RangedEntity-API.patch similarity index 100% rename from patches/api/0118-RangedEntity-API.patch rename to patches/api/0119-RangedEntity-API.patch diff --git a/patches/api/0119-Add-World.getEntity-UUID-API.patch b/patches/api/0120-Add-World.getEntity-UUID-API.patch similarity index 91% rename from patches/api/0119-Add-World.getEntity-UUID-API.patch rename to patches/api/0120-Add-World.getEntity-UUID-API.patch index 7fbb9ef9d6..7a8b323bb4 100644 --- a/patches/api/0119-Add-World.getEntity-UUID-API.patch +++ b/patches/api/0120-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 147fa28678f09ebc0fdaf3f26ba0693a74a683f2..f46032ac8d48ba172e6a9157dd6b477ddf2cd4cb 100644 +index fd50f3a12863d1bc65d1880c939389f7b5d2c53c..c58c9c7791eff28ba8f847f5bc60e0db757ababd 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -944,6 +944,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0120-InventoryCloseEvent-Reason-API.patch b/patches/api/0121-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/api/0120-InventoryCloseEvent-Reason-API.patch rename to patches/api/0121-InventoryCloseEvent-Reason-API.patch diff --git a/patches/api/0121-Allow-setting-the-vex-s-summoner.patch b/patches/api/0122-Allow-setting-the-vex-s-summoner.patch similarity index 100% rename from patches/api/0121-Allow-setting-the-vex-s-summoner.patch rename to patches/api/0122-Allow-setting-the-vex-s-summoner.patch diff --git a/patches/api/0122-Entity-getChunk-API.patch b/patches/api/0123-Entity-getChunk-API.patch similarity index 92% rename from patches/api/0122-Entity-getChunk-API.patch rename to patches/api/0123-Entity-getChunk-API.patch index 68c747ae93..03c704f7ab 100644 --- a/patches/api/0122-Entity-getChunk-API.patch +++ b/patches/api/0123-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 e598c7c90d625313b8a935418bb68e0e6cb6bc6e..c6f14159067a14afd44378aaa9ac840aba2e2f9c 100644 +index 6b0bfcfd22105fbdf09c11bbec009ba19116abd9..7c867a54e18798d782971a68548eac541e9f50c0 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; diff --git a/patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch b/patches/api/0124-Add-an-asterisk-to-legacy-API-plugins.patch similarity index 97% rename from patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch rename to patches/api/0124-Add-an-asterisk-to-legacy-API-plugins.patch index 4415c7b9ee..f9f9578ccb 100644 --- a/patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch +++ b/patches/api/0124-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 355c46f1c1f08072446f3cc92c0d22898933a7fc..cbf7df30a7ec8445c8492e3b9f108747dbe1717b 100644 +index c67d2e96e30261e480f1df96464befac03d78a69..81da1def96d18704303cadd72261a1b2fcbb9fc5 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -102,5 +102,11 @@ public interface UnsafeValues { diff --git a/patches/api/0124-EnderDragon-Events.patch b/patches/api/0125-EnderDragon-Events.patch similarity index 100% rename from patches/api/0124-EnderDragon-Events.patch rename to patches/api/0125-EnderDragon-Events.patch diff --git a/patches/api/0125-PlayerElytraBoostEvent.patch b/patches/api/0126-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/api/0125-PlayerElytraBoostEvent.patch rename to patches/api/0126-PlayerElytraBoostEvent.patch diff --git a/patches/api/0126-PlayerLaunchProjectileEvent.patch b/patches/api/0127-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/api/0126-PlayerLaunchProjectileEvent.patch rename to patches/api/0127-PlayerLaunchProjectileEvent.patch diff --git a/patches/api/0127-EntityTransformedEvent.patch b/patches/api/0128-EntityTransformedEvent.patch similarity index 100% rename from patches/api/0127-EntityTransformedEvent.patch rename to patches/api/0128-EntityTransformedEvent.patch diff --git a/patches/api/0128-Allow-disabling-armour-stand-ticking.patch b/patches/api/0129-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/api/0128-Allow-disabling-armour-stand-ticking.patch rename to patches/api/0129-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/api/0129-SkeletonHorse-Additions.patch b/patches/api/0130-SkeletonHorse-Additions.patch similarity index 100% rename from patches/api/0129-SkeletonHorse-Additions.patch rename to patches/api/0130-SkeletonHorse-Additions.patch diff --git a/patches/api/0130-Expand-Location-Manipulation-API.patch b/patches/api/0131-Expand-Location-Manipulation-API.patch similarity index 94% rename from patches/api/0130-Expand-Location-Manipulation-API.patch rename to patches/api/0131-Expand-Location-Manipulation-API.patch index 2251a2d78d..3820295c2e 100644 --- a/patches/api/0130-Expand-Location-Manipulation-API.patch +++ b/patches/api/0131-Expand-Location-Manipulation-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Expand Location Manipulation API Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z); diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index a8d4f7972d07ddde171b4a1ec470a4c616e02b2e..36ed248f0716f2cc465c08ab851b7d83d4c7c0a7 100644 +index 5a6b33c6d9a68affdbd02c13fdb0854e011e327d..943c3364f6b931fe11f9a6099504590b2da34657 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -546,6 +546,54 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -546,6 +546,54 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper // Paper start diff --git a/patches/api/0131-Expand-ArmorStand-API.patch b/patches/api/0132-Expand-ArmorStand-API.patch similarity index 100% rename from patches/api/0131-Expand-ArmorStand-API.patch rename to patches/api/0132-Expand-ArmorStand-API.patch diff --git a/patches/api/0132-AnvilDamageEvent.patch b/patches/api/0133-AnvilDamageEvent.patch similarity index 100% rename from patches/api/0132-AnvilDamageEvent.patch rename to patches/api/0133-AnvilDamageEvent.patch diff --git a/patches/api/0133-Remove-deadlock-risk-in-firing-async-events.patch b/patches/api/0134-Remove-deadlock-risk-in-firing-async-events.patch similarity index 100% rename from patches/api/0133-Remove-deadlock-risk-in-firing-async-events.patch rename to patches/api/0134-Remove-deadlock-risk-in-firing-async-events.patch diff --git a/patches/api/0134-Add-TNTPrimeEvent.patch b/patches/api/0135-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/api/0134-Add-TNTPrimeEvent.patch rename to patches/api/0135-Add-TNTPrimeEvent.patch diff --git a/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 100% rename from patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch diff --git a/patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch similarity index 100% rename from patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch rename to patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch diff --git a/patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch similarity index 98% rename from patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch rename to patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch index 5a8996d135..1a41281590 100644 --- a/patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -18,7 +18,7 @@ Y range: [0, 1023] X, Z range: [-67 108 864, 67 108 863] diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..5c5e05673e0912f4dbd6c728f4c3b7fcdae8f0e8 100644 +index 943c3364f6b931fe11f9a6099504590b2da34657..16a604b6315daff228c827fe02b1234cca3e884d 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable; @@ -29,7 +29,7 @@ index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..5c5e05673e0912f4dbd6c728f4c3b7fc import java.util.function.Predicate; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; -@@ -605,6 +604,19 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -605,6 +604,19 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm blockLoc.setZ(getBlockZ()); return blockLoc; } diff --git a/patches/api/0139-Slime-Pathfinder-Events.patch b/patches/api/0140-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/api/0139-Slime-Pathfinder-Events.patch rename to patches/api/0140-Slime-Pathfinder-Events.patch diff --git a/patches/api/0140-Add-PhantomPreSpawnEvent.patch b/patches/api/0141-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/api/0140-Add-PhantomPreSpawnEvent.patch rename to patches/api/0141-Add-PhantomPreSpawnEvent.patch diff --git a/patches/api/0141-Add-More-Creeper-API.patch b/patches/api/0142-Add-More-Creeper-API.patch similarity index 100% rename from patches/api/0141-Add-More-Creeper-API.patch rename to patches/api/0142-Add-More-Creeper-API.patch diff --git a/patches/api/0142-Inventory-removeItemAnySlot.patch b/patches/api/0143-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/api/0142-Inventory-removeItemAnySlot.patch rename to patches/api/0143-Inventory-removeItemAnySlot.patch diff --git a/patches/api/0143-isChunkGenerated-API.patch b/patches/api/0144-isChunkGenerated-API.patch similarity index 94% rename from patches/api/0143-isChunkGenerated-API.patch rename to patches/api/0144-isChunkGenerated-API.patch index 222f76220e..0704b7f0db 100644 --- a/patches/api/0143-isChunkGenerated-API.patch +++ b/patches/api/0144-isChunkGenerated-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] isChunkGenerated API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 5c5e05673e0912f4dbd6c728f4c3b7fcdae8f0e8..57cb548683f7b2972c998afd34176952426f8b47 100644 +index 16a604b6315daff228c827fe02b1234cca3e884d..20978b269a7757a561d6b872cc77898b44bbd272 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -3,6 +3,7 @@ package org.bukkit; @@ -16,7 +16,7 @@ index 5c5e05673e0912f4dbd6c728f4c3b7fcdae8f0e8..57cb548683f7b2972c998afd34176952 import java.util.HashMap; import java.util.Map; import org.bukkit.block.Block; -@@ -545,6 +546,16 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -545,6 +546,16 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper // Paper start diff --git a/patches/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch similarity index 100% rename from patches/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch rename to patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch diff --git a/patches/api/0145-Async-Chunks-API.patch b/patches/api/0146-Async-Chunks-API.patch similarity index 100% rename from patches/api/0145-Async-Chunks-API.patch rename to patches/api/0146-Async-Chunks-API.patch diff --git a/patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch rename to patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/api/0148-Improve-death-events.patch b/patches/api/0149-Improve-death-events.patch similarity index 100% rename from patches/api/0148-Improve-death-events.patch rename to patches/api/0149-Improve-death-events.patch diff --git a/patches/api/0149-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0150-Add-Git-information-to-version-command-on-startup.patch similarity index 98% rename from patches/api/0149-Add-Git-information-to-version-command-on-startup.patch rename to patches/api/0150-Add-Git-information-to-version-command-on-startup.patch index 533ac1f870..f28988d16b 100644 --- a/patches/api/0149-Add-Git-information-to-version-command-on-startup.patch +++ b/patches/api/0150-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 908e1aba5257688bb70fbf1ed83d2212305263a1..303e539338383d0d7825b873611ca5843ee1c0a3 100644 +index aa4217c87756cffe774aaa2d390217b9056c4b95..6567da9e9c89f1995b9c3544b4dd767d66e6f5f2 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -54,6 +54,7 @@ import org.bukkit.util.CachedServerIcon; diff --git a/patches/api/0150-Mob-Pathfinding-API.patch b/patches/api/0151-Mob-Pathfinding-API.patch similarity index 100% rename from patches/api/0150-Mob-Pathfinding-API.patch rename to patches/api/0151-Mob-Pathfinding-API.patch diff --git a/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 100% rename from patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch rename to patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch diff --git a/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 100% rename from patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch rename to patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch diff --git a/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/api/0155-Material-API-additions.patch b/patches/api/0156-Material-API-additions.patch similarity index 100% rename from patches/api/0155-Material-API-additions.patch rename to patches/api/0156-Material-API-additions.patch diff --git a/patches/api/0156-Add-Material-Tags.patch b/patches/api/0157-Add-Material-Tags.patch similarity index 100% rename from patches/api/0156-Add-Material-Tags.patch rename to patches/api/0157-Add-Material-Tags.patch diff --git a/patches/api/0157-PreSpawnerSpawnEvent.patch b/patches/api/0158-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/api/0157-PreSpawnerSpawnEvent.patch rename to patches/api/0158-PreSpawnerSpawnEvent.patch diff --git a/patches/api/0158-Add-LivingEntity-getTargetEntity.patch b/patches/api/0159-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/api/0158-Add-LivingEntity-getTargetEntity.patch rename to patches/api/0159-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/api/0159-Add-sun-related-API.patch b/patches/api/0160-Add-sun-related-API.patch similarity index 100% rename from patches/api/0159-Add-sun-related-API.patch rename to patches/api/0160-Add-sun-related-API.patch diff --git a/patches/api/0160-Turtle-API.patch b/patches/api/0161-Turtle-API.patch similarity index 100% rename from patches/api/0160-Turtle-API.patch rename to patches/api/0161-Turtle-API.patch diff --git a/patches/api/0161-Add-spectator-target-events.patch b/patches/api/0162-Add-spectator-target-events.patch similarity index 100% rename from patches/api/0161-Add-spectator-target-events.patch rename to patches/api/0162-Add-spectator-target-events.patch diff --git a/patches/api/0162-Add-more-Witch-API.patch b/patches/api/0163-Add-more-Witch-API.patch similarity index 100% rename from patches/api/0162-Add-more-Witch-API.patch rename to patches/api/0163-Add-more-Witch-API.patch diff --git a/patches/api/0163-Make-the-default-permission-message-configurable.patch b/patches/api/0164-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/api/0163-Make-the-default-permission-message-configurable.patch rename to patches/api/0164-Make-the-default-permission-message-configurable.patch diff --git a/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/api/0165-Add-more-Zombie-API.patch b/patches/api/0166-Add-more-Zombie-API.patch similarity index 100% rename from patches/api/0165-Add-more-Zombie-API.patch rename to patches/api/0166-Add-more-Zombie-API.patch diff --git a/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/api/0167-Add-PlayerConnectionCloseEvent.patch b/patches/api/0168-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/api/0167-Add-PlayerConnectionCloseEvent.patch rename to patches/api/0168-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/api/0170-BlockDestroyEvent.patch b/patches/api/0171-BlockDestroyEvent.patch similarity index 100% rename from patches/api/0170-BlockDestroyEvent.patch rename to patches/api/0171-BlockDestroyEvent.patch diff --git a/patches/api/0171-Add-WhitelistToggleEvent.patch b/patches/api/0172-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/api/0171-Add-WhitelistToggleEvent.patch rename to patches/api/0172-Add-WhitelistToggleEvent.patch diff --git a/patches/api/0172-Add-GS4-Query-event.patch b/patches/api/0173-Add-GS4-Query-event.patch similarity index 100% rename from patches/api/0172-Add-GS4-Query-event.patch rename to patches/api/0173-Add-GS4-Query-event.patch diff --git a/patches/api/0173-Add-PlayerPostRespawnEvent.patch b/patches/api/0174-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/api/0173-Add-PlayerPostRespawnEvent.patch rename to patches/api/0174-Add-PlayerPostRespawnEvent.patch diff --git a/patches/api/0174-Entity-getEntitySpawnReason.patch b/patches/api/0175-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/api/0174-Entity-getEntitySpawnReason.patch rename to patches/api/0175-Entity-getEntitySpawnReason.patch diff --git a/patches/api/0175-Fix-Spigot-annotation-mistakes.patch b/patches/api/0176-Fix-Spigot-annotation-mistakes.patch similarity index 99% rename from patches/api/0175-Fix-Spigot-annotation-mistakes.patch rename to patches/api/0176-Fix-Spigot-annotation-mistakes.patch index 14eafe77a6..4135cb4d0d 100644 --- a/patches/api/0175-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0176-Fix-Spigot-annotation-mistakes.patch @@ -48,10 +48,10 @@ index f9c9ae463aacd593e3aa9caf037ea1e23d56c780..f8ae143acbf586d5279b44f7311ca97f /** diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 57cb548683f7b2972c998afd34176952426f8b47..d4c87bfed81b2d73919705912f59fab05c0ee61b 100644 +index 20978b269a7757a561d6b872cc77898b44bbd272..2b9a117804a8ca54b47e51e23359bd6e01087641 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm * @param y The y-coordinate of this new location * @param z The z-coordinate of this new location */ @@ -60,7 +60,7 @@ index 57cb548683f7b2972c998afd34176952426f8b47..d4c87bfed81b2d73919705912f59fab0 this(world, x, y, z, 0, 0); } -@@ -60,7 +60,7 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -60,7 +60,7 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm * @param yaw The absolute rotation on the x-plane, in degrees * @param pitch The absolute rotation on the y-plane, in degrees */ @@ -69,7 +69,7 @@ index 57cb548683f7b2972c998afd34176952426f8b47..d4c87bfed81b2d73919705912f59fab0 if (world != null) { this.world = new WeakReference<>(world); } -@@ -102,7 +102,7 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -102,7 +102,7 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm * @throws IllegalArgumentException when world is unloaded * @see #isWorldLoaded() */ diff --git a/patches/api/0176-Server-Tick-Events.patch b/patches/api/0177-Server-Tick-Events.patch similarity index 100% rename from patches/api/0176-Server-Tick-Events.patch rename to patches/api/0177-Server-Tick-Events.patch diff --git a/patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch rename to patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/api/0178-Add-Heightmap-API.patch b/patches/api/0179-Add-Heightmap-API.patch similarity index 98% rename from patches/api/0178-Add-Heightmap-API.patch rename to patches/api/0179-Add-Heightmap-API.patch index c891f6d3f2..ff70e17363 100644 --- a/patches/api/0178-Add-Heightmap-API.patch +++ b/patches/api/0179-Add-Heightmap-API.patch @@ -51,10 +51,10 @@ index 0000000000000000000000000000000000000000..709e44ea1b14ab6917501c928e689cc6 + SOLID_OR_LIQUID_NO_LEAVES; +} diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index d4c87bfed81b2d73919705912f59fab05c0ee61b..ef0cb00ca4cb7d2f5e4ec1c950cce036566d1ae4 100644 +index 2b9a117804a8ca54b47e51e23359bd6e01087641..6bbf8468bc47e82b0aeb164e49cdb73d93bae87b 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java -@@ -640,6 +640,47 @@ public class Location implements Cloneable, ConfigurationSerializable { +@@ -640,6 +640,47 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm return centerLoc; } diff --git a/patches/api/0179-Mob-Spawner-API-Enhancements.patch b/patches/api/0180-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/api/0179-Mob-Spawner-API-Enhancements.patch rename to patches/api/0180-Mob-Spawner-API-Enhancements.patch diff --git a/patches/api/0180-Add-BlockSoundGroup-interface.patch b/patches/api/0181-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/api/0180-Add-BlockSoundGroup-interface.patch rename to patches/api/0181-Add-BlockSoundGroup-interface.patch diff --git a/patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/api/0182-Increase-custom-payload-channel-message-size.patch b/patches/api/0183-Increase-custom-payload-channel-message-size.patch similarity index 100% rename from patches/api/0182-Increase-custom-payload-channel-message-size.patch rename to patches/api/0183-Increase-custom-payload-channel-message-size.patch diff --git a/patches/api/0183-Expose-the-internal-current-tick.patch b/patches/api/0184-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/api/0183-Expose-the-internal-current-tick.patch rename to patches/api/0184-Expose-the-internal-current-tick.patch diff --git a/patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch rename to patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/api/0185-Add-effect-to-block-break-naturally.patch b/patches/api/0186-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/api/0185-Add-effect-to-block-break-naturally.patch rename to patches/api/0186-Add-effect-to-block-break-naturally.patch diff --git a/patches/api/0186-Add-ThrownEggHatchEvent.patch b/patches/api/0187-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/api/0186-Add-ThrownEggHatchEvent.patch rename to patches/api/0187-Add-ThrownEggHatchEvent.patch diff --git a/patches/api/0187-Entity-Jump-API.patch b/patches/api/0188-Entity-Jump-API.patch similarity index 100% rename from patches/api/0187-Entity-Jump-API.patch rename to patches/api/0188-Entity-Jump-API.patch diff --git a/patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0189-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/api/0189-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/api/0189-Add-tick-times-API.patch b/patches/api/0190-Add-tick-times-API.patch similarity index 100% rename from patches/api/0189-Add-tick-times-API.patch rename to patches/api/0190-Add-tick-times-API.patch diff --git a/patches/api/0190-Expose-MinecraftServer-isRunning.patch b/patches/api/0191-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/api/0190-Expose-MinecraftServer-isRunning.patch rename to patches/api/0191-Expose-MinecraftServer-isRunning.patch diff --git a/patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0192-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 96% rename from patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/api/0192-Add-Raw-Byte-ItemStack-Serialization.patch index 135e9466ce..923dca3f3f 100644 --- a/patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch +++ b/patches/api/0192-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 5e2135cf4310eeea5da5ddb12d6e6bc32ecec93d..7c74163031cd8b49b9fe98241356697fd06c54c5 100644 +index 81da1def96d18704303cadd72261a1b2fcbb9fc5..5453b2ae459b2d5171ef7129c29891b721ee8e0b 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -108,5 +108,9 @@ public interface UnsafeValues { diff --git a/patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/api/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch similarity index 100% rename from patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch rename to patches/api/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch diff --git a/patches/api/0193-Make-JavaPluginLoader-thread-safe.patch b/patches/api/0194-Make-JavaPluginLoader-thread-safe.patch similarity index 100% rename from patches/api/0193-Make-JavaPluginLoader-thread-safe.patch rename to patches/api/0194-Make-JavaPluginLoader-thread-safe.patch diff --git a/patches/api/0194-Add-Player-Client-Options-API.patch b/patches/api/0195-Add-Player-Client-Options-API.patch similarity index 100% rename from patches/api/0194-Add-Player-Client-Options-API.patch rename to patches/api/0195-Add-Player-Client-Options-API.patch diff --git a/patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0196-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/api/0196-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch similarity index 100% rename from patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch rename to patches/api/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch diff --git a/patches/api/0197-Add-item-slot-convenience-methods.patch b/patches/api/0198-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/api/0197-Add-item-slot-convenience-methods.patch rename to patches/api/0198-Add-item-slot-convenience-methods.patch diff --git a/patches/api/0198-Villager-Restocks-API.patch b/patches/api/0199-Villager-Restocks-API.patch similarity index 100% rename from patches/api/0198-Villager-Restocks-API.patch rename to patches/api/0199-Villager-Restocks-API.patch diff --git a/patches/api/0199-Expose-game-version.patch b/patches/api/0200-Expose-game-version.patch similarity index 89% rename from patches/api/0199-Expose-game-version.patch rename to patches/api/0200-Expose-game-version.patch index be7aec4713..585d8e02a9 100644 --- a/patches/api/0199-Expose-game-version.patch +++ b/patches/api/0200-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 4771149c9fcee5e51c5313fffb105ad6f68a256a..022a3de1bc7969a1db7395a910782bde1468758a 100644 +index 51a43429e58fbebf8c95d23257cd9c84ce57b1aa..f4897529322f57eaf0d26ce82307dcd785511af8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -155,6 +155,18 @@ public final class Bukkit { @@ -28,7 +28,7 @@ index 4771149c9fcee5e51c5313fffb105ad6f68a256a..022a3de1bc7969a1db7395a910782bde * 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 201cbb0d33fc25e90b7960894eb6a9e6ef0d107b..832b19712612fdbac5d2f472aab203b14f7e4a46 100644 +index 122ef60bcb1548713f2e355cb77eccbebcd17f04..97c2708b69ff01f9e7898ad7282016cac605bc79 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -113,6 +113,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0200-Add-Mob-Goal-API.patch b/patches/api/0201-Add-Mob-Goal-API.patch similarity index 100% rename from patches/api/0200-Add-Mob-Goal-API.patch rename to patches/api/0201-Add-Mob-Goal-API.patch diff --git a/patches/api/0201-Add-villager-reputation-API.patch b/patches/api/0202-Add-villager-reputation-API.patch similarity index 100% rename from patches/api/0201-Add-villager-reputation-API.patch rename to patches/api/0202-Add-villager-reputation-API.patch diff --git a/patches/api/0202-Spawn-Reason-API.patch b/patches/api/0203-Spawn-Reason-API.patch similarity index 100% rename from patches/api/0202-Spawn-Reason-API.patch rename to patches/api/0203-Spawn-Reason-API.patch diff --git a/patches/api/0203-Potential-bed-API.patch b/patches/api/0204-Potential-bed-API.patch similarity index 100% rename from patches/api/0203-Potential-bed-API.patch rename to patches/api/0204-Potential-bed-API.patch diff --git a/patches/api/0204-Prioritise-own-classes-where-possible.patch b/patches/api/0205-Prioritise-own-classes-where-possible.patch similarity index 100% rename from patches/api/0204-Prioritise-own-classes-where-possible.patch rename to patches/api/0205-Prioritise-own-classes-where-possible.patch diff --git a/patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch b/patches/api/0206-Provide-a-useful-PluginClassLoader-toString.patch similarity index 100% rename from patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch rename to patches/api/0206-Provide-a-useful-PluginClassLoader-toString.patch diff --git a/patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0207-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/api/0207-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/api/0207-Improve-Arrow-API.patch b/patches/api/0208-Improve-Arrow-API.patch similarity index 100% rename from patches/api/0207-Improve-Arrow-API.patch rename to patches/api/0208-Improve-Arrow-API.patch diff --git a/patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0209-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0209-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0209-Support-components-in-ItemMeta.patch b/patches/api/0210-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/api/0209-Support-components-in-ItemMeta.patch rename to patches/api/0210-Support-components-in-ItemMeta.patch diff --git a/patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0211-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0211-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0211-Add-entity-liquid-API.patch b/patches/api/0212-Add-entity-liquid-API.patch similarity index 100% rename from patches/api/0211-Add-entity-liquid-API.patch rename to patches/api/0212-Add-entity-liquid-API.patch diff --git a/patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0213-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0213-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0213-Brand-support.patch b/patches/api/0214-Brand-support.patch similarity index 100% rename from patches/api/0213-Brand-support.patch rename to patches/api/0214-Brand-support.patch diff --git a/patches/api/0214-Support-hex-colors-in-getLastColors.patch b/patches/api/0215-Support-hex-colors-in-getLastColors.patch similarity index 100% rename from patches/api/0214-Support-hex-colors-in-getLastColors.patch rename to patches/api/0215-Support-hex-colors-in-getLastColors.patch diff --git a/patches/api/0215-Add-setMaxPlayers-API.patch b/patches/api/0216-Add-setMaxPlayers-API.patch similarity index 88% rename from patches/api/0215-Add-setMaxPlayers-API.patch rename to patches/api/0216-Add-setMaxPlayers-API.patch index e37f12a879..c442fa7975 100644 --- a/patches/api/0215-Add-setMaxPlayers-API.patch +++ b/patches/api/0216-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 f3f8a6db7ee1b4ea1aaf6bc972fa02a8af5f3772..2d26f1fd3bbbe95e7a73bb5ebc7d85c9e066c1ee 100644 +index 93a74792837e6dcff354e5f0afb7aacd0a19f7e1..6d98664f2da191c2327e80b8212c1ad979f7d6ac 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -208,6 +208,17 @@ public final class Bukkit { @@ -27,7 +27,7 @@ index f3f8a6db7ee1b4ea1aaf6bc972fa02a8af5f3772..2d26f1fd3bbbe95e7a73bb5ebc7d85c9 * 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 4f17bc607639bb3d20a1694ffb02d22d283348b3..634a7e38987bc18232c07e5f767b37b523f13920 100644 +index cd3ce4155ff46d85d4c603a688dd96893400ed77..936ebaf531a76cab12809cfa334e2b0d89e625c3 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -160,6 +160,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0216-Add-BellRingEvent.patch b/patches/api/0217-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0216-Add-BellRingEvent.patch rename to patches/api/0217-Add-BellRingEvent.patch diff --git a/patches/api/0217-Add-moon-phase-API.patch b/patches/api/0218-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0217-Add-moon-phase-API.patch rename to patches/api/0218-Add-moon-phase-API.patch diff --git a/patches/api/0218-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/api/0218-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/api/0219-Add-more-Evoker-API.patch b/patches/api/0220-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0219-Add-more-Evoker-API.patch rename to patches/api/0220-Add-more-Evoker-API.patch diff --git a/patches/api/0220-Add-methods-to-get-translation-keys.patch b/patches/api/0221-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/api/0220-Add-methods-to-get-translation-keys.patch rename to patches/api/0221-Add-methods-to-get-translation-keys.patch diff --git a/patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0222-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0222-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0224-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 89% rename from patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0224-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index 849e0790ca..0d12123896 100644 --- a/patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/api/0224-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 b69e8210d6d7a534804af9ed1b877dab9d5bc139..0994d65c7ad94bcbf661ca66839ddfcc5c8b8899 100644 +index b518720355d8a8dcd55cb755e4e1fa9fc3dfc52b..824833a04df15551c8dd9ddfa8d4c1c9cf6d49c0 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -141,5 +141,12 @@ public interface UnsafeValues { diff --git a/patches/api/0224-Entity-isTicking.patch b/patches/api/0225-Entity-isTicking.patch similarity index 100% rename from patches/api/0224-Entity-isTicking.patch rename to patches/api/0225-Entity-isTicking.patch diff --git a/patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch similarity index 91% rename from patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch rename to patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch index 094bcc1ce8..b597f29830 100644 --- a/patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch +++ b/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Clarify the Javadocs for Entity.getEntitySpawnReason() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index be83ba864e2b9df50275f0fcdb50dc57a955ebec..f9b2251dbb7c9fe7dccc0fd28b4c00881124b6f3 100644 +index 6ff9a29ddda50c2e073c1ab02b13d5ff0bdeb903..277dc1f3a0002f5102bc2a6be4412d179bbdb713 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -756,7 +756,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0226-Villager-resetOffers.patch b/patches/api/0227-Villager-resetOffers.patch similarity index 100% rename from patches/api/0226-Villager-resetOffers.patch rename to patches/api/0227-Villager-resetOffers.patch diff --git a/patches/api/0227-Player-elytra-boost-API.patch b/patches/api/0228-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0227-Player-elytra-boost-API.patch rename to patches/api/0228-Player-elytra-boost-API.patch diff --git a/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0229-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/api/0228-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0229-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/api/0229-Add-ignore-discounts-API.patch b/patches/api/0230-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0229-Add-ignore-discounts-API.patch rename to patches/api/0230-Add-ignore-discounts-API.patch diff --git a/patches/api/0230-Item-no-age-no-player-pickup.patch b/patches/api/0231-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/api/0230-Item-no-age-no-player-pickup.patch rename to patches/api/0231-Item-no-age-no-player-pickup.patch diff --git a/patches/api/0231-Beacon-API-custom-effect-ranges.patch b/patches/api/0232-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0231-Beacon-API-custom-effect-ranges.patch rename to patches/api/0232-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0232-Add-API-for-quit-reason.patch b/patches/api/0233-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0232-Add-API-for-quit-reason.patch rename to patches/api/0233-Add-API-for-quit-reason.patch diff --git a/patches/api/0233-Add-Destroy-Speed-API.patch b/patches/api/0234-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/api/0233-Add-Destroy-Speed-API.patch rename to patches/api/0234-Add-Destroy-Speed-API.patch diff --git a/patches/api/0234-Add-LivingEntity-clearActiveItem.patch b/patches/api/0235-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/api/0234-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0235-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/api/0235-Add-PlayerItemCooldownEvent.patch b/patches/api/0236-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0235-Add-PlayerItemCooldownEvent.patch rename to patches/api/0236-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0236-More-lightning-API.patch b/patches/api/0237-More-lightning-API.patch similarity index 100% rename from patches/api/0236-More-lightning-API.patch rename to patches/api/0237-More-lightning-API.patch diff --git a/patches/api/0237-Add-PlayerShearBlockEvent.patch b/patches/api/0238-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0237-Add-PlayerShearBlockEvent.patch rename to patches/api/0238-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0238-Enable-multi-release-plugin-jars.patch b/patches/api/0239-Enable-multi-release-plugin-jars.patch similarity index 100% rename from patches/api/0238-Enable-multi-release-plugin-jars.patch rename to patches/api/0239-Enable-multi-release-plugin-jars.patch diff --git a/patches/api/0239-Player-Chunk-Load-Unload-Events.patch b/patches/api/0240-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0239-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0240-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0240-Expose-LivingEntity-hurt-direction.patch b/patches/api/0241-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/api/0240-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0241-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0242-Added-PlayerTradeEvent.patch b/patches/api/0243-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0242-Added-PlayerTradeEvent.patch rename to patches/api/0243-Added-PlayerTradeEvent.patch diff --git a/patches/api/0243-Add-TargetHitEvent-API.patch b/patches/api/0244-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0243-Add-TargetHitEvent-API.patch rename to patches/api/0244-Add-TargetHitEvent-API.patch diff --git a/patches/api/0244-Additional-Block-Material-API-s.patch b/patches/api/0245-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/api/0244-Additional-Block-Material-API-s.patch rename to patches/api/0245-Additional-Block-Material-API-s.patch diff --git a/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0246-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0246-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0247-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0247-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0247-Zombie-API-breaking-doors.patch b/patches/api/0248-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0247-Zombie-API-breaking-doors.patch rename to patches/api/0248-Zombie-API-breaking-doors.patch diff --git a/patches/api/0248-Add-EntityLoadCrossbowEvent.patch b/patches/api/0249-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0248-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0249-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0249-Added-WorldGameRuleChangeEvent.patch b/patches/api/0250-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0249-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0250-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0250-Added-ServerResourcesReloadedEvent.patch b/patches/api/0251-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0250-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0251-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0251-Add-BlockFailedDispenseEvent.patch b/patches/api/0252-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0251-Add-BlockFailedDispenseEvent.patch rename to patches/api/0252-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0252-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0253-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0252-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0253-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0254-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0254-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0255-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0255-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0255-Add-sendOpLevel-API.patch b/patches/api/0256-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0255-Add-sendOpLevel-API.patch rename to patches/api/0256-Add-sendOpLevel-API.patch diff --git a/patches/api/0256-Add-PaperRegistry.patch b/patches/api/0257-Add-PaperRegistry.patch similarity index 97% rename from patches/api/0256-Add-PaperRegistry.patch rename to patches/api/0257-Add-PaperRegistry.patch index f413eb437b..c5486a380d 100644 --- a/patches/api/0256-Add-PaperRegistry.patch +++ b/patches/api/0257-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 0994d65c7ad94bcbf661ca66839ddfcc5c8b8899..ab2b02ad179354c791dbb17963977a5c1478d553 100644 +index 824833a04df15551c8dd9ddfa8d4c1c9cf6d49c0..3d5185a1a3a5e5e1b1428ddbedec38f908f5870a 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -148,5 +148,15 @@ public interface UnsafeValues { diff --git a/patches/api/0257-Add-StructuresLocateEvent.patch b/patches/api/0258-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/api/0257-Add-StructuresLocateEvent.patch rename to patches/api/0258-Add-StructuresLocateEvent.patch diff --git a/patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/api/0259-Add-BlockPreDispenseEvent.patch b/patches/api/0260-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0259-Add-BlockPreDispenseEvent.patch rename to patches/api/0260-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0260-Added-Vanilla-Entity-Tags.patch b/patches/api/0261-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/api/0260-Added-Vanilla-Entity-Tags.patch rename to patches/api/0261-Added-Vanilla-Entity-Tags.patch diff --git a/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0264-add-DragonEggFormEvent.patch b/patches/api/0265-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0264-add-DragonEggFormEvent.patch rename to patches/api/0265-add-DragonEggFormEvent.patch diff --git a/patches/api/0265-EntityMoveEvent.patch b/patches/api/0266-EntityMoveEvent.patch similarity index 100% rename from patches/api/0265-EntityMoveEvent.patch rename to patches/api/0266-EntityMoveEvent.patch diff --git a/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0268-living-entity-allow-attribute-registration.patch b/patches/api/0269-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0268-living-entity-allow-attribute-registration.patch rename to patches/api/0269-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0269-Add-missing-effects.patch b/patches/api/0270-Add-missing-effects.patch similarity index 100% rename from patches/api/0269-Add-missing-effects.patch rename to patches/api/0270-Add-missing-effects.patch diff --git a/patches/api/0270-Expose-Tracked-Players.patch b/patches/api/0271-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0270-Expose-Tracked-Players.patch rename to patches/api/0271-Expose-Tracked-Players.patch diff --git a/patches/api/0271-Cache-the-result-of-Material-isBlock.patch b/patches/api/0272-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0271-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0272-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0272-Add-worldborder-events.patch b/patches/api/0273-Add-worldborder-events.patch similarity index 100% rename from patches/api/0272-Add-worldborder-events.patch rename to patches/api/0273-Add-worldborder-events.patch diff --git a/patches/api/0273-added-PlayerNameEntityEvent.patch b/patches/api/0274-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0273-added-PlayerNameEntityEvent.patch rename to patches/api/0274-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0274-Add-recipe-to-cook-events.patch b/patches/api/0275-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0274-Add-recipe-to-cook-events.patch rename to patches/api/0275-Add-recipe-to-cook-events.patch diff --git a/patches/api/0275-Add-Block-isValidTool.patch b/patches/api/0276-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0275-Add-Block-isValidTool.patch rename to patches/api/0276-Add-Block-isValidTool.patch diff --git a/patches/api/0276-Expand-world-key-API.patch b/patches/api/0277-Expand-world-key-API.patch similarity index 95% rename from patches/api/0276-Expand-world-key-API.patch rename to patches/api/0277-Expand-world-key-API.patch index 18e3661446..c9288c202d 100644 --- a/patches/api/0276-Expand-world-key-API.patch +++ b/patches/api/0277-Expand-world-key-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expand world key API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f1e1efaebfd9fe4399ff9d23c76f7dde6419ff71..db44d88bf169f59a759be165094876497487d756 100644 +index ceb8d207843df5ddc852d44928286648a652eedb..197cf8cdd3d51c3e01ec737981601f37764315c6 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -811,6 +811,18 @@ public final class Bukkit { @@ -56,7 +56,7 @@ index 2fa3de66107162ccaa158b369e2c4a926ecaff92..aa534b1a9a1fb84a2fbd4b372f313bb4 // Paper end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 50542df291d90a667af119fb9fcc3db2535ae6b5..723057dcc769bd29acdb82561ee0126ed467579d 100644 +index 02b898d441c42771903d5839c3cde544b1a25778..1a3b4f20c7126caf8a34040028f735083bf47150 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -671,6 +671,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -78,7 +78,7 @@ index 50542df291d90a667af119fb9fcc3db2535ae6b5..723057dcc769bd29acdb82561ee0126e * Create a new virtual {@link WorldBorder}. *

diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index ab2b02ad179354c791dbb17963977a5c1478d553..0fe8efe3f5d16768dde497693c3f098dffbd1584 100644 +index 3d5185a1a3a5e5e1b1428ddbedec38f908f5870a..b359a7bff658c4b3ff569e78e0751dc07437bb48 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -158,5 +158,10 @@ public interface UnsafeValues { diff --git a/patches/api/0277-Item-Rarity-API.patch b/patches/api/0278-Item-Rarity-API.patch similarity index 100% rename from patches/api/0277-Item-Rarity-API.patch rename to patches/api/0278-Item-Rarity-API.patch diff --git a/patches/api/0278-Expose-protocol-version.patch b/patches/api/0279-Expose-protocol-version.patch similarity index 88% rename from patches/api/0278-Expose-protocol-version.patch rename to patches/api/0279-Expose-protocol-version.patch index 13e59bd86a..ec1f242ac2 100644 --- a/patches/api/0278-Expose-protocol-version.patch +++ b/patches/api/0279-Expose-protocol-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 50397eecc867810ad6a89ce740814592082ad99e..3a515f13fe5ec6582ddeb38eb316e919062a0e16 100644 +index bc8e86f83423a0abdfe3516076636b02192e7501..8650d5b9bd322f0b67382fcd7900f922c5134a97 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -180,5 +180,12 @@ public interface UnsafeValues { diff --git a/patches/api/0279-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0279-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0280-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0280-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0281-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0281-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0282-Added-PlayerDeepSleepEvent.patch b/patches/api/0283-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0282-Added-PlayerDeepSleepEvent.patch rename to patches/api/0283-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0283-More-World-API.patch b/patches/api/0284-More-World-API.patch similarity index 100% rename from patches/api/0283-More-World-API.patch rename to patches/api/0284-More-World-API.patch diff --git a/patches/api/0284-Added-PlayerBedFailEnterEvent.patch b/patches/api/0285-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0284-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0285-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0285-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0285-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0286-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0286-PlayerMoveEvent-Improvements.patch b/patches/api/0287-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0286-PlayerMoveEvent-Improvements.patch rename to patches/api/0287-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0287-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0287-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0288-Add-more-WanderingTrader-API.patch b/patches/api/0289-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0288-Add-more-WanderingTrader-API.patch rename to patches/api/0289-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0289-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0289-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0290-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0290-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0290-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0291-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0291-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0292-Inventory-close.patch b/patches/api/0293-Inventory-close.patch similarity index 100% rename from patches/api/0292-Inventory-close.patch rename to patches/api/0293-Inventory-close.patch diff --git a/patches/api/0293-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0293-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0294-Add-basic-Datapack-API.patch b/patches/api/0295-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0294-Add-basic-Datapack-API.patch rename to patches/api/0295-Add-basic-Datapack-API.patch diff --git a/patches/api/0295-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0295-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0296-ItemStack-repair-check-API.patch b/patches/api/0297-ItemStack-repair-check-API.patch similarity index 96% rename from patches/api/0296-ItemStack-repair-check-API.patch rename to patches/api/0297-ItemStack-repair-check-API.patch index ec49eff783..ad6d09f01e 100644 --- a/patches/api/0296-ItemStack-repair-check-API.patch +++ b/patches/api/0297-ItemStack-repair-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 3a515f13fe5ec6582ddeb38eb316e919062a0e16..55e09755499cc49ecb9068fec2ff60c8258af587 100644 +index 8650d5b9bd322f0b67382fcd7900f922c5134a97..6f4e02065bcb4130f5a30de01f3adbe3513c1d70 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -181,6 +181,16 @@ public interface UnsafeValues { diff --git a/patches/api/0297-More-Enchantment-API.patch b/patches/api/0298-More-Enchantment-API.patch similarity index 100% rename from patches/api/0297-More-Enchantment-API.patch rename to patches/api/0298-More-Enchantment-API.patch diff --git a/patches/api/0298-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch similarity index 100% rename from patches/api/0298-List-all-missing-hard-depends-not-just-first.patch rename to patches/api/0299-List-all-missing-hard-depends-not-just-first.patch diff --git a/patches/api/0299-Add-Mob-lookAt-API.patch b/patches/api/0300-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0299-Add-Mob-lookAt-API.patch rename to patches/api/0300-Add-Mob-lookAt-API.patch diff --git a/patches/api/0300-ItemStack-editMeta.patch b/patches/api/0301-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0300-ItemStack-editMeta.patch rename to patches/api/0301-ItemStack-editMeta.patch diff --git a/patches/api/0301-Add-EntityInsideBlockEvent.patch b/patches/api/0302-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0301-Add-EntityInsideBlockEvent.patch rename to patches/api/0302-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0302-Attributes-API-for-item-defaults.patch b/patches/api/0303-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0302-Attributes-API-for-item-defaults.patch rename to patches/api/0303-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0303-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0303-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0304-More-Lidded-Block-API.patch b/patches/api/0305-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0304-More-Lidded-Block-API.patch rename to patches/api/0305-More-Lidded-Block-API.patch diff --git a/patches/api/0305-Add-PlayerKickEvent-causes.patch b/patches/api/0306-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0305-Add-PlayerKickEvent-causes.patch rename to patches/api/0306-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0306-Add-PufferFishStateChangeEvent.patch b/patches/api/0307-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0306-Add-PufferFishStateChangeEvent.patch rename to patches/api/0307-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0307-Add-BellRevealRaiderEvent.patch b/patches/api/0308-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0307-Add-BellRevealRaiderEvent.patch rename to patches/api/0308-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0308-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0308-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0309-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0309-Add-more-line-of-sight-methods.patch b/patches/api/0310-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0309-Add-more-line-of-sight-methods.patch rename to patches/api/0310-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0310-Add-WaterBottleSplashEvent.patch b/patches/api/0311-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/api/0310-Add-WaterBottleSplashEvent.patch rename to patches/api/0311-Add-WaterBottleSplashEvent.patch diff --git a/patches/api/0311-Add-more-LimitedRegion-API.patch b/patches/api/0312-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0311-Add-more-LimitedRegion-API.patch rename to patches/api/0312-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0312-Missing-Entity-Behavior-API.patch b/patches/api/0313-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/api/0312-Missing-Entity-Behavior-API.patch rename to patches/api/0313-Missing-Entity-Behavior-API.patch diff --git a/patches/api/0313-Adds-PlayerArmSwingEvent.patch b/patches/api/0314-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0313-Adds-PlayerArmSwingEvent.patch rename to patches/api/0314-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0314-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0314-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0315-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0316-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0315-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0316-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0316-Stinger-API.patch b/patches/api/0317-Stinger-API.patch similarity index 100% rename from patches/api/0316-Stinger-API.patch rename to patches/api/0317-Stinger-API.patch diff --git a/patches/api/0317-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0317-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0318-Add-PlayerSetSpawnEvent.patch b/patches/api/0319-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0318-Add-PlayerSetSpawnEvent.patch rename to patches/api/0319-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0319-Added-EntityDamageItemEvent.patch b/patches/api/0320-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0319-Added-EntityDamageItemEvent.patch rename to patches/api/0320-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0320-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0321-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0320-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0321-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0321-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0321-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0322-Add-BlockBreakBlockEvent.patch b/patches/api/0323-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0322-Add-BlockBreakBlockEvent.patch rename to patches/api/0323-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0323-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0323-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0324-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0324-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0325-More-CommandBlock-API.patch b/patches/api/0326-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0325-More-CommandBlock-API.patch rename to patches/api/0326-More-CommandBlock-API.patch diff --git a/patches/api/0326-Fix-plugin-provides-load-order.patch b/patches/api/0327-Fix-plugin-provides-load-order.patch similarity index 100% rename from patches/api/0326-Fix-plugin-provides-load-order.patch rename to patches/api/0327-Fix-plugin-provides-load-order.patch diff --git a/patches/api/0327-Add-missing-team-sidebar-display-slots.patch b/patches/api/0328-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0327-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0328-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0328-add-back-EntityPortalExitEvent.patch b/patches/api/0329-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0328-add-back-EntityPortalExitEvent.patch rename to patches/api/0329-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0329-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0329-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0330-Get-entity-default-attributes.patch b/patches/api/0331-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0330-Get-entity-default-attributes.patch rename to patches/api/0331-Get-entity-default-attributes.patch diff --git a/patches/api/0331-Left-handed-API.patch b/patches/api/0332-Left-handed-API.patch similarity index 100% rename from patches/api/0331-Left-handed-API.patch rename to patches/api/0332-Left-handed-API.patch diff --git a/patches/api/0332-Add-more-advancement-API.patch b/patches/api/0333-Add-more-advancement-API.patch similarity index 100% rename from patches/api/0332-Add-more-advancement-API.patch rename to patches/api/0333-Add-more-advancement-API.patch diff --git a/patches/api/0333-Add-ItemFactory-getSpawnEgg-API.patch b/patches/api/0334-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/api/0333-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/api/0334-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/api/0334-Add-critical-damage-API.patch b/patches/api/0335-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0334-Add-critical-damage-API.patch rename to patches/api/0335-Add-critical-damage-API.patch diff --git a/patches/api/0335-Fix-issues-with-mob-conversion.patch b/patches/api/0336-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0335-Fix-issues-with-mob-conversion.patch rename to patches/api/0336-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0336-Add-isCollidable-methods-to-various-places.patch b/patches/api/0337-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0336-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0337-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0337-Goat-ram-API.patch b/patches/api/0338-Goat-ram-API.patch similarity index 100% rename from patches/api/0337-Goat-ram-API.patch rename to patches/api/0338-Goat-ram-API.patch diff --git a/patches/api/0338-Add-API-for-resetting-a-single-score.patch b/patches/api/0339-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0338-Add-API-for-resetting-a-single-score.patch rename to patches/api/0339-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/api/0340-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0341-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0340-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0341-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0341-Add-player-health-update-API.patch b/patches/api/0342-Add-player-health-update-API.patch similarity index 100% rename from patches/api/0341-Add-player-health-update-API.patch rename to patches/api/0342-Add-player-health-update-API.patch diff --git a/patches/api/0342-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0342-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0343-Add-more-Campfire-API.patch b/patches/api/0344-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0343-Add-more-Campfire-API.patch rename to patches/api/0344-Add-more-Campfire-API.patch diff --git a/patches/api/0344-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/api/0344-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/api/0345-Improve-scoreboard-entries.patch b/patches/api/0346-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0345-Improve-scoreboard-entries.patch rename to patches/api/0346-Improve-scoreboard-entries.patch diff --git a/patches/api/0346-Entity-powdered-snow-API.patch b/patches/api/0347-Entity-powdered-snow-API.patch similarity index 100% rename from patches/api/0346-Entity-powdered-snow-API.patch rename to patches/api/0347-Entity-powdered-snow-API.patch diff --git a/patches/api/0347-Add-API-for-item-entity-health.patch b/patches/api/0348-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0347-Add-API-for-item-entity-health.patch rename to patches/api/0348-Add-API-for-item-entity-health.patch diff --git a/patches/api/0348-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0348-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0349-Bucketable-API.patch b/patches/api/0350-Bucketable-API.patch similarity index 100% rename from patches/api/0349-Bucketable-API.patch rename to patches/api/0350-Bucketable-API.patch diff --git a/patches/api/0350-System-prop-for-default-config-comment-parsing.patch b/patches/api/0351-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0350-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0351-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0351-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0351-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0352-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0353-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/api/0352-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/api/0353-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/api/0353-Multiple-Entries-with-Scoreboards.patch b/patches/api/0354-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0353-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0354-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0354-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0355-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0354-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0355-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0355-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0356-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0355-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0356-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0356-Multi-Block-Change-API.patch b/patches/api/0357-Multi-Block-Change-API.patch similarity index 100% rename from patches/api/0356-Multi-Block-Change-API.patch rename to patches/api/0357-Multi-Block-Change-API.patch diff --git a/patches/api/0357-Fix-NotePlayEvent.patch b/patches/api/0358-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0357-Fix-NotePlayEvent.patch rename to patches/api/0358-Fix-NotePlayEvent.patch diff --git a/patches/api/0358-Freeze-Tick-Lock-API.patch b/patches/api/0359-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/api/0358-Freeze-Tick-Lock-API.patch rename to patches/api/0359-Freeze-Tick-Lock-API.patch diff --git a/patches/api/0359-Dolphin-API.patch b/patches/api/0360-Dolphin-API.patch similarity index 100% rename from patches/api/0359-Dolphin-API.patch rename to patches/api/0360-Dolphin-API.patch diff --git a/patches/api/0360-More-PotionEffectType-API.patch b/patches/api/0361-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0360-More-PotionEffectType-API.patch rename to patches/api/0361-More-PotionEffectType-API.patch diff --git a/patches/api/0361-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0362-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0361-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0362-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0362-Implement-regenerateChunk.patch b/patches/api/0363-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0362-Implement-regenerateChunk.patch rename to patches/api/0363-Implement-regenerateChunk.patch diff --git a/patches/api/0363-Don-t-load-plugins-prefixed-with-a-dot.patch b/patches/api/0364-Don-t-load-plugins-prefixed-with-a-dot.patch similarity index 100% rename from patches/api/0363-Don-t-load-plugins-prefixed-with-a-dot.patch rename to patches/api/0364-Don-t-load-plugins-prefixed-with-a-dot.patch diff --git a/patches/api/0364-Add-GameEvent-tags.patch b/patches/api/0365-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0364-Add-GameEvent-tags.patch rename to patches/api/0365-Add-GameEvent-tags.patch diff --git a/patches/api/0365-Furnace-RecipesUsed-API.patch b/patches/api/0366-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0365-Furnace-RecipesUsed-API.patch rename to patches/api/0366-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0366-Configurable-sculk-sensor-listener-range.patch b/patches/api/0367-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0366-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0367-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0367-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0368-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0367-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0368-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0368-Custom-Potion-Mixes.patch b/patches/api/0369-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0368-Custom-Potion-Mixes.patch rename to patches/api/0369-Custom-Potion-Mixes.patch diff --git a/patches/api/0369-Expose-furnace-minecart-push-values.patch b/patches/api/0370-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0369-Expose-furnace-minecart-push-values.patch rename to patches/api/0370-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0370-More-Projectile-API.patch b/patches/api/0371-More-Projectile-API.patch similarity index 100% rename from patches/api/0370-More-Projectile-API.patch rename to patches/api/0371-More-Projectile-API.patch diff --git a/patches/api/0371-Add-getComputedBiome-API.patch b/patches/api/0372-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0371-Add-getComputedBiome-API.patch rename to patches/api/0372-Add-getComputedBiome-API.patch diff --git a/patches/api/0372-Add-enchantWithLevels-API.patch b/patches/api/0373-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0372-Add-enchantWithLevels-API.patch rename to patches/api/0373-Add-enchantWithLevels-API.patch diff --git a/patches/api/0373-Add-TameableDeathMessageEvent.patch b/patches/api/0374-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0373-Add-TameableDeathMessageEvent.patch rename to patches/api/0374-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0374-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0374-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0375-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0376-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0375-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0376-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0376-Update-Folder-Uses-Plugin-Name.patch b/patches/api/0377-Update-Folder-Uses-Plugin-Name.patch similarity index 100% rename from patches/api/0376-Update-Folder-Uses-Plugin-Name.patch rename to patches/api/0377-Update-Folder-Uses-Plugin-Name.patch diff --git a/patches/api/0377-WorldCreator-keepSpawnLoaded.patch b/patches/api/0378-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0377-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0378-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0378-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0379-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0378-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0379-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0379-Add-PlayerStopUsingItemEvent.patch b/patches/api/0380-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0379-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0380-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0380-FallingBlock-auto-expire-setting.patch b/patches/api/0381-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/api/0380-FallingBlock-auto-expire-setting.patch rename to patches/api/0381-FallingBlock-auto-expire-setting.patch diff --git a/patches/api/0381-Keyed-Cat-Type.patch b/patches/api/0382-Keyed-Cat-Type.patch similarity index 100% rename from patches/api/0381-Keyed-Cat-Type.patch rename to patches/api/0382-Keyed-Cat-Type.patch diff --git a/patches/api/0382-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0383-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/api/0382-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0383-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/api/0383-Add-WardenAngerChangeEvent.patch b/patches/api/0384-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0383-Add-WardenAngerChangeEvent.patch rename to patches/api/0384-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0384-Nameable-Banner-API.patch b/patches/api/0385-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0384-Nameable-Banner-API.patch rename to patches/api/0385-Nameable-Banner-API.patch diff --git a/patches/api/0385-Add-Player-getFishHook.patch b/patches/api/0386-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0385-Add-Player-getFishHook.patch rename to patches/api/0386-Add-Player-getFishHook.patch diff --git a/patches/api/0386-More-Teleport-API.patch b/patches/api/0387-More-Teleport-API.patch similarity index 100% rename from patches/api/0386-More-Teleport-API.patch rename to patches/api/0387-More-Teleport-API.patch diff --git a/patches/api/0387-Add-EntityPortalReadyEvent.patch b/patches/api/0388-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0387-Add-EntityPortalReadyEvent.patch rename to patches/api/0388-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0388-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/api/0388-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/api/0389-Collision-API.patch b/patches/api/0390-Collision-API.patch similarity index 100% rename from patches/api/0389-Collision-API.patch rename to patches/api/0390-Collision-API.patch diff --git a/patches/api/0390-Block-Ticking-API.patch b/patches/api/0391-Block-Ticking-API.patch similarity index 100% rename from patches/api/0390-Block-Ticking-API.patch rename to patches/api/0391-Block-Ticking-API.patch diff --git a/patches/api/0391-Add-NamespacedKey-biome-methods.patch b/patches/api/0392-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/api/0391-Add-NamespacedKey-biome-methods.patch rename to patches/api/0392-Add-NamespacedKey-biome-methods.patch diff --git a/patches/api/0392-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 100% rename from patches/api/0392-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch diff --git a/patches/api/0393-Also-load-resources-from-LibraryLoader.patch b/patches/api/0394-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/api/0393-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0394-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0395-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0395-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0396-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0396-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0397-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0397-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0397-Add-system-property-to-print-stacktrace-on-bad-plugi.patch b/patches/api/0398-Add-system-property-to-print-stacktrace-on-bad-plugi.patch similarity index 100% rename from patches/api/0397-Add-system-property-to-print-stacktrace-on-bad-plugi.patch rename to patches/api/0398-Add-system-property-to-print-stacktrace-on-bad-plugi.patch diff --git a/patches/api/0398-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch similarity index 100% rename from patches/api/0398-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch rename to patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch diff --git a/patches/api/0399-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0400-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0399-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0400-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0400-Elder-Guardian-appearance-API.patch b/patches/api/0401-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0400-Elder-Guardian-appearance-API.patch rename to patches/api/0401-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0401-Allow-changing-bed-s-occupied-property.patch b/patches/api/0402-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/api/0401-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0402-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0402-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0403-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0402-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0403-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0403-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0404-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0403-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0404-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0404-Add-entity-knockback-API.patch b/patches/api/0405-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0404-Add-entity-knockback-API.patch rename to patches/api/0405-Add-entity-knockback-API.patch diff --git a/patches/api/0405-Added-EntityToggleSitEvent.patch b/patches/api/0406-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0405-Added-EntityToggleSitEvent.patch rename to patches/api/0406-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0406-Add-Moving-Piston-API.patch b/patches/api/0407-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0406-Add-Moving-Piston-API.patch rename to patches/api/0407-Add-Moving-Piston-API.patch diff --git a/patches/api/0407-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0408-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0407-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0408-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0408-Add-Player-Warden-Warning-API.patch b/patches/api/0409-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/api/0408-Add-Player-Warden-Warning-API.patch rename to patches/api/0409-Add-Player-Warden-Warning-API.patch diff --git a/patches/api/0409-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0410-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0409-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0410-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0410-Add-paper-dumplisteners-command.patch b/patches/api/0411-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0410-Add-paper-dumplisteners-command.patch rename to patches/api/0411-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0411-ItemStack-damage-API.patch b/patches/api/0412-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0411-ItemStack-damage-API.patch rename to patches/api/0412-ItemStack-damage-API.patch diff --git a/patches/api/0412-Add-Tick-TemporalUnit.patch b/patches/api/0413-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0412-Add-Tick-TemporalUnit.patch rename to patches/api/0413-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0413-Friction-API.patch b/patches/api/0414-Friction-API.patch similarity index 100% rename from patches/api/0413-Friction-API.patch rename to patches/api/0414-Friction-API.patch diff --git a/patches/api/0414-Player-Entity-Tracking-Events.patch b/patches/api/0415-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0414-Player-Entity-Tracking-Events.patch rename to patches/api/0415-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0415-Add-missing-Fluid-type.patch b/patches/api/0416-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0415-Add-missing-Fluid-type.patch rename to patches/api/0416-Add-missing-Fluid-type.patch diff --git a/patches/api/0416-Future-API-Plans.patch b/patches/api/0417-Future-API-Plans.patch similarity index 100% rename from patches/api/0416-Future-API-Plans.patch rename to patches/api/0417-Future-API-Plans.patch diff --git a/patches/api/0417-Mark-experimental-api-as-such.patch b/patches/api/0418-Mark-experimental-api-as-such.patch similarity index 100% rename from patches/api/0417-Mark-experimental-api-as-such.patch rename to patches/api/0418-Mark-experimental-api-as-such.patch diff --git a/patches/api/0418-fix-Instruments.patch b/patches/api/0419-fix-Instruments.patch similarity index 100% rename from patches/api/0418-fix-Instruments.patch rename to patches/api/0419-fix-Instruments.patch