diff --git a/patches/unapplied-api/0001-Rebrand.patch b/patches/api/0001-Rebrand.patch similarity index 100% rename from patches/unapplied-api/0001-Rebrand.patch rename to patches/api/0001-Rebrand.patch diff --git a/patches/unapplied-api/0002-Purpur-config-files.patch b/patches/api/0002-Purpur-config-files.patch similarity index 85% rename from patches/unapplied-api/0002-Purpur-config-files.patch rename to patches/api/0002-Purpur-config-files.patch index da3a1e3c3..7bb973e55 100644 --- a/patches/unapplied-api/0002-Purpur-config-files.patch +++ b/patches/api/0002-Purpur-config-files.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c8595ffcfcbdd79794d464415287d46acef72b72..607ba7cb902d7053cb570d8f3676ecbadbe56daf 100644 +index bbc4d7d3ca84642828f9a3f788ca26bba900d15b..205b684223cfa4cf0b3938e11926e854509bb7c9 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2257,6 +2257,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2251,6 +2251,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Paper end diff --git a/patches/unapplied-api/0003-Build-System-Changes.patch b/patches/api/0003-Build-System-Changes.patch similarity index 100% rename from patches/unapplied-api/0003-Build-System-Changes.patch rename to patches/api/0003-Build-System-Changes.patch diff --git a/patches/unapplied-api/0004-Purpur-client-support.patch b/patches/api/0004-Purpur-client-support.patch similarity index 82% rename from patches/unapplied-api/0004-Purpur-client-support.patch rename to patches/api/0004-Purpur-client-support.patch index 51b04656d..f284f16d7 100644 --- a/patches/unapplied-api/0004-Purpur-client-support.patch +++ b/patches/api/0004-Purpur-client-support.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index eb34f22e973fe46529eb93f435f5bf7f85091404..813096eee6a09419209baca9139d9aac1593d8ca 100644 +index 7c56182acaf827f4b1a986a61cea8e9960604c98..72680755962efb542cbb3c0aa079af061496b6ff 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3854,4 +3854,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3859,4 +3859,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/unapplied-api/0005-Default-permissions.patch b/patches/api/0005-Default-permissions.patch similarity index 100% rename from patches/unapplied-api/0005-Default-permissions.patch rename to patches/api/0005-Default-permissions.patch diff --git a/patches/unapplied-api/0006-Ridables.patch b/patches/api/0006-Ridables.patch similarity index 100% rename from patches/unapplied-api/0006-Ridables.patch rename to patches/api/0006-Ridables.patch diff --git a/patches/unapplied-api/0007-Allow-inventory-resizing.patch b/patches/api/0007-Allow-inventory-resizing.patch similarity index 83% rename from patches/unapplied-api/0007-Allow-inventory-resizing.patch rename to patches/api/0007-Allow-inventory-resizing.patch index 6b3fad2ac..4b1a9dd6b 100644 --- a/patches/unapplied-api/0007-Allow-inventory-resizing.patch +++ b/patches/api/0007-Allow-inventory-resizing.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow inventory resizing diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index 59b375569a75cb1e1f7c610f96078e102ec0d3ed..a3f74891abbdc51dbbddaeb511f2754e0603c904 100644 +index 851e40dc8af6dcb5670785e006b078af7e72fb76..e814e4f9cf12cd7c783981278f110ccf144263b2 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java -@@ -166,7 +166,7 @@ public enum InventoryType { +@@ -163,7 +163,7 @@ public enum InventoryType { SMITHING_NEW(4, "Upgrade Gear"), ; diff --git a/patches/unapplied-api/0008-Llama-API.patch b/patches/api/0008-Llama-API.patch similarity index 100% rename from patches/unapplied-api/0008-Llama-API.patch rename to patches/api/0008-Llama-API.patch diff --git a/patches/unapplied-api/0009-AFK-API.patch b/patches/api/0009-AFK-API.patch similarity index 95% rename from patches/unapplied-api/0009-AFK-API.patch rename to patches/api/0009-AFK-API.patch index 5500c83f8..196ff8c31 100644 --- a/patches/unapplied-api/0009-AFK-API.patch +++ b/patches/api/0009-AFK-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 813096eee6a09419209baca9139d9aac1593d8ca..a03f473dee39eb160196e2468e4c26c6f8f6ce2a 100644 +index 72680755962efb542cbb3c0aa079af061496b6ff..36d73f14d70c4b1768f3b7dfa235a6a2411e4687 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3862,5 +3862,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3867,5 +3867,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return True if Player uses Purpur Client */ public boolean usesPurpurClient(); diff --git a/patches/unapplied-api/0010-Bring-back-server-name.patch b/patches/api/0010-Bring-back-server-name.patch similarity index 79% rename from patches/unapplied-api/0010-Bring-back-server-name.patch rename to patches/api/0010-Bring-back-server-name.patch index 939ac10be..646286183 100644 --- a/patches/unapplied-api/0010-Bring-back-server-name.patch +++ b/patches/api/0010-Bring-back-server-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 9a219b255b63f10005fc68faacb771dd32f61ac2..203581e1b00241c519f20dac4936d06f95122ea4 100644 +index b9b751ea0d11381e846d5f35f39f285c075c171a..6ee89d60fa560b38cef94d4516fe861f2776bf34 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2913,4 +2913,15 @@ public final class Bukkit { +@@ -2907,4 +2907,15 @@ public final class Bukkit { public static Server.Spigot spigot() { return server.spigot(); } @@ -25,10 +25,10 @@ index 9a219b255b63f10005fc68faacb771dd32f61ac2..203581e1b00241c519f20dac4936d06f + // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index bb96d4266f83029eda3e847860302cd9d14e852e..ae752aebf35d0f1a861086c56d30e6c86c43b599 100644 +index 205b684223cfa4cf0b3938e11926e854509bb7c9..6ed3d3108f3124151c863448c01a2d2e6c0ef53d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2558,4 +2558,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2552,4 +2552,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ boolean isOwnedByCurrentRegion(@NotNull Entity entity); // Paper end - Folia region threading API diff --git a/patches/unapplied-api/0011-ExecuteCommandEvent.patch b/patches/api/0011-ExecuteCommandEvent.patch similarity index 100% rename from patches/unapplied-api/0011-ExecuteCommandEvent.patch rename to patches/api/0011-ExecuteCommandEvent.patch diff --git a/patches/unapplied-api/0012-Lagging-threshold.patch b/patches/api/0012-Lagging-threshold.patch similarity index 79% rename from patches/unapplied-api/0012-Lagging-threshold.patch rename to patches/api/0012-Lagging-threshold.patch index ab3349f93..e35b684c7 100644 --- a/patches/unapplied-api/0012-Lagging-threshold.patch +++ b/patches/api/0012-Lagging-threshold.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 203581e1b00241c519f20dac4936d06f95122ea4..49bf78441db33ad0fbc1ca5dfb42859727ea23f8 100644 +index 6ee89d60fa560b38cef94d4516fe861f2776bf34..7c57fe9ce3ee80816a4d2bfe5af6920cebe39c85 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2923,5 +2923,14 @@ public final class Bukkit { +@@ -2917,5 +2917,14 @@ public final class Bukkit { public static String getServerName() { return server.getServerName(); } @@ -24,10 +24,10 @@ index 203581e1b00241c519f20dac4936d06f95122ea4..49bf78441db33ad0fbc1ca5dfb428597 // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index ae752aebf35d0f1a861086c56d30e6c86c43b599..86fceb2ad3ba00400f65493d669fd4f4423d45ac 100644 +index 6ed3d3108f3124151c863448c01a2d2e6c0ef53d..1cc70661901834cc4c00e8772ae57743d6007b74 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2566,5 +2566,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2560,5 +2560,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull String getServerName(); diff --git a/patches/unapplied-api/0013-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 100% rename from patches/unapplied-api/0013-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch diff --git a/patches/unapplied-api/0014-Anvil-API.patch b/patches/api/0014-Anvil-API.patch similarity index 100% rename from patches/unapplied-api/0014-Anvil-API.patch rename to patches/api/0014-Anvil-API.patch diff --git a/patches/unapplied-api/0015-ItemStack-convenience-methods.patch b/patches/api/0015-ItemStack-convenience-methods.patch similarity index 98% rename from patches/unapplied-api/0015-ItemStack-convenience-methods.patch rename to patches/api/0015-ItemStack-convenience-methods.patch index b61a1dc52..0d3405100 100644 --- a/patches/unapplied-api/0015-ItemStack-convenience-methods.patch +++ b/patches/api/0015-ItemStack-convenience-methods.patch @@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 762216a117145676d3df2b74036799b024461fb7..54c080d650f807b05e5d8347f78e2bc243791172 100644 +index 54704da43cf9c429f3914f0580246dde99aa93c0..e1a677cfde05aba487a09e34e170fea61a125e7d 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -5764,4 +5764,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -5622,4 +5622,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla } return Registry.BLOCK.get(material.key); } @@ -50,7 +50,7 @@ index 762216a117145676d3df2b74036799b024461fb7..54c080d650f807b05e5d8347f78e2bc2 + // Purpur end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 40cde68c7b73a0a92e2a96667a90138d67ce66ff..fee2469bdedff0e55ef4dcda410cac35c6319258 100644 +index 7f5633e7689b82b937d5b985c3e6ae15dc94a20f..e77842896654088cedc19822a99361778336057a 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -19,6 +19,17 @@ import org.bukkit.inventory.meta.ItemMeta; @@ -71,7 +71,7 @@ index 40cde68c7b73a0a92e2a96667a90138d67ce66ff..fee2469bdedff0e55ef4dcda410cac35 /** * Represents a stack of items. -@@ -1081,4 +1092,565 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat +@@ -1089,4 +1100,565 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player); } // Paper end - expose itemstack tooltip lines diff --git a/patches/unapplied-api/0016-LivingEntity-broadcastItemBreak.patch b/patches/api/0016-LivingEntity-broadcastItemBreak.patch similarity index 90% rename from patches/unapplied-api/0016-LivingEntity-broadcastItemBreak.patch rename to patches/api/0016-LivingEntity-broadcastItemBreak.patch index 439fc7df5..7157d3d5f 100644 --- a/patches/unapplied-api/0016-LivingEntity-broadcastItemBreak.patch +++ b/patches/api/0016-LivingEntity-broadcastItemBreak.patch @@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index b777e530122549455dcce6fac8d4a151c1c0af42..aba9952b2256b058eb413ce93f3305c861a200db 100644 +index 5c29956c6db53440322330ff723c7087193641f1..e1079c5c4be99e75a646c090189678dd131f210e 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1447,4 +1447,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/unapplied-api/0017-ChatColor-conveniences.patch b/patches/api/0017-ChatColor-conveniences.patch similarity index 100% rename from patches/unapplied-api/0017-ChatColor-conveniences.patch rename to patches/api/0017-ChatColor-conveniences.patch diff --git a/patches/unapplied-api/0018-Item-entity-immunities.patch b/patches/api/0018-Item-entity-immunities.patch similarity index 100% rename from patches/unapplied-api/0018-Item-entity-immunities.patch rename to patches/api/0018-Item-entity-immunities.patch diff --git a/patches/unapplied-api/0019-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0019-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/unapplied-api/0019-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/api/0019-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/unapplied-api/0020-Rabid-Wolf-API.patch b/patches/api/0020-Rabid-Wolf-API.patch similarity index 100% rename from patches/unapplied-api/0020-Rabid-Wolf-API.patch rename to patches/api/0020-Rabid-Wolf-API.patch diff --git a/patches/unapplied-api/0021-PlayerBookTooLargeEvent.patch b/patches/api/0021-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/unapplied-api/0021-PlayerBookTooLargeEvent.patch rename to patches/api/0021-PlayerBookTooLargeEvent.patch diff --git a/patches/unapplied-api/0022-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0022-Full-netherite-armor-grants-fire-resistance.patch similarity index 100% rename from patches/unapplied-api/0022-Full-netherite-armor-grants-fire-resistance.patch rename to patches/api/0022-Full-netherite-armor-grants-fire-resistance.patch diff --git a/patches/unapplied-api/0023-Add-EntityTeleportHinderedEvent.patch b/patches/api/0023-Add-EntityTeleportHinderedEvent.patch similarity index 100% rename from patches/unapplied-api/0023-Add-EntityTeleportHinderedEvent.patch rename to patches/api/0023-Add-EntityTeleportHinderedEvent.patch diff --git a/patches/unapplied-api/0024-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0024-Add-enchantment-target-for-bows-and-crossbows.patch similarity index 100% rename from patches/unapplied-api/0024-Add-enchantment-target-for-bows-and-crossbows.patch rename to patches/api/0024-Add-enchantment-target-for-bows-and-crossbows.patch diff --git a/patches/unapplied-api/0025-API-for-any-mob-to-burn-daylight.patch b/patches/api/0025-API-for-any-mob-to-burn-daylight.patch similarity index 94% rename from patches/unapplied-api/0025-API-for-any-mob-to-burn-daylight.patch rename to patches/api/0025-API-for-any-mob-to-burn-daylight.patch index fdb5da886..7e51c8eea 100644 --- a/patches/unapplied-api/0025-API-for-any-mob-to-burn-daylight.patch +++ b/patches/api/0025-API-for-any-mob-to-burn-daylight.patch @@ -23,7 +23,7 @@ index 514611cf71cafc8e7e07ef901c2ccad03cd5f31b..8c9c4183785a47b64f084f4b8cdac53d // Purpur end } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index aba9952b2256b058eb413ce93f3305c861a200db..61a046584acf48693489ff551a0dd4c4b16af9ff 100644 +index e1079c5c4be99e75a646c090189678dd131f210e..544b1d8aa5665fd2567605014adee6222d2cb312 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1455,5 +1455,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/unapplied-api/0026-Add-back-player-spawned-endermite-API.patch b/patches/api/0026-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/unapplied-api/0026-Add-back-player-spawned-endermite-API.patch rename to patches/api/0026-Add-back-player-spawned-endermite-API.patch diff --git a/patches/unapplied-api/0027-Fix-default-permission-system.patch b/patches/api/0027-Fix-default-permission-system.patch similarity index 100% rename from patches/unapplied-api/0027-Fix-default-permission-system.patch rename to patches/api/0027-Fix-default-permission-system.patch diff --git a/patches/unapplied-api/0028-Summoner-API.patch b/patches/api/0028-Summoner-API.patch similarity index 100% rename from patches/unapplied-api/0028-Summoner-API.patch rename to patches/api/0028-Summoner-API.patch diff --git a/patches/unapplied-api/0029-Clean-up-version-command-output.patch b/patches/api/0029-Clean-up-version-command-output.patch similarity index 100% rename from patches/unapplied-api/0029-Clean-up-version-command-output.patch rename to patches/api/0029-Clean-up-version-command-output.patch diff --git a/patches/unapplied-api/0030-Extended-OfflinePlayer-API.patch b/patches/api/0030-Extended-OfflinePlayer-API.patch similarity index 97% rename from patches/unapplied-api/0030-Extended-OfflinePlayer-API.patch rename to patches/api/0030-Extended-OfflinePlayer-API.patch index af97d3dd0..583ed5e63 100644 --- a/patches/unapplied-api/0030-Extended-OfflinePlayer-API.patch +++ b/patches/api/0030-Extended-OfflinePlayer-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Extended OfflinePlayer API diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 30298a629b39bd43ce14b414fc697b2dfcbea89c..ce00af9121de7a910aaea4e0685a06d4cf31b4e3 100644 +index 3993fecec5b4c2bbd77e175a168afcad571ce4d1..d0206c9c2f423a9b77237d9a005b9ee139dae70f 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -557,4 +557,106 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio diff --git a/patches/unapplied-api/0031-Added-the-ability-to-add-combustible-items.patch b/patches/api/0031-Added-the-ability-to-add-combustible-items.patch similarity index 85% rename from patches/unapplied-api/0031-Added-the-ability-to-add-combustible-items.patch rename to patches/api/0031-Added-the-ability-to-add-combustible-items.patch index 617e78ecc..ccff23472 100644 --- a/patches/unapplied-api/0031-Added-the-ability-to-add-combustible-items.patch +++ b/patches/api/0031-Added-the-ability-to-add-combustible-items.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 49bf78441db33ad0fbc1ca5dfb42859727ea23f8..0b298161d8b94d655113328ebc0cd19a65619c72 100644 +index 7c57fe9ce3ee80816a4d2bfe5af6920cebe39c85..11c99892e9537e4e84b598ee082cef1afe56f33a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2932,5 +2932,24 @@ public final class Bukkit { +@@ -2926,5 +2926,24 @@ public final class Bukkit { public static boolean isLagging() { return server.isLagging(); } @@ -34,10 +34,10 @@ index 49bf78441db33ad0fbc1ca5dfb42859727ea23f8..0b298161d8b94d655113328ebc0cd19a // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 86fceb2ad3ba00400f65493d669fd4f4423d45ac..cecf7b49e3858359ae7eaa4318180d7f11728a7a 100644 +index 1cc70661901834cc4c00e8772ae57743d6007b74..cb20702273cfb21dbd00f93138c166f018d75971 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2573,5 +2573,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2567,5 +2567,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return True if lagging */ boolean isLagging(); diff --git a/patches/unapplied-api/0032-Grindstone-API.patch b/patches/api/0032-Grindstone-API.patch similarity index 100% rename from patches/unapplied-api/0032-Grindstone-API.patch rename to patches/api/0032-Grindstone-API.patch diff --git a/patches/unapplied-api/0033-Shears-can-have-looting-enchantment.patch b/patches/api/0033-Shears-can-have-looting-enchantment.patch similarity index 100% rename from patches/unapplied-api/0033-Shears-can-have-looting-enchantment.patch rename to patches/api/0033-Shears-can-have-looting-enchantment.patch diff --git a/patches/unapplied-api/0034-Lobotomize-stuck-villagers.patch b/patches/api/0034-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/unapplied-api/0034-Lobotomize-stuck-villagers.patch rename to patches/api/0034-Lobotomize-stuck-villagers.patch diff --git a/patches/unapplied-api/0035-Add-local-difficulty-api.patch b/patches/api/0035-Add-local-difficulty-api.patch similarity index 100% rename from patches/unapplied-api/0035-Add-local-difficulty-api.patch rename to patches/api/0035-Add-local-difficulty-api.patch diff --git a/patches/unapplied-api/0036-Remove-Timings.patch b/patches/api/0036-Remove-Timings.patch similarity index 100% rename from patches/unapplied-api/0036-Remove-Timings.patch rename to patches/api/0036-Remove-Timings.patch diff --git a/patches/unapplied-api/0037-Add-Bee-API.patch b/patches/api/0037-Add-Bee-API.patch similarity index 100% rename from patches/unapplied-api/0037-Add-Bee-API.patch rename to patches/api/0037-Add-Bee-API.patch diff --git a/patches/unapplied-api/0038-Debug-Marker-API.patch b/patches/api/0038-Debug-Marker-API.patch similarity index 97% rename from patches/unapplied-api/0038-Debug-Marker-API.patch rename to patches/api/0038-Debug-Marker-API.patch index 13c232987..d8134fd7b 100644 --- a/patches/unapplied-api/0038-Debug-Marker-API.patch +++ b/patches/api/0038-Debug-Marker-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ad5f2a8991c3b7925626fd463110765ff964beb9..bb09c468ab1261ea4eaf59012d30a2e45199caf7 100644 +index 11c99892e9537e4e84b598ee082cef1afe56f33a..0430e8238609336a4fa0bd220a7c44f6af264945 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2951,5 +2951,89 @@ public final class Bukkit { +@@ -2945,5 +2945,89 @@ public final class Bukkit { public static void removeFuel(@NotNull Material material) { server.removeFuel(material); } @@ -99,10 +99,10 @@ index ad5f2a8991c3b7925626fd463110765ff964beb9..bb09c468ab1261ea4eaf59012d30a2e4 // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e75cccea44c9a693dfe52a419c742da9a62da42a..36d8ce7a21513600ab10b7e6f47c9f1d2cc51947 100644 +index cb20702273cfb21dbd00f93138c166f018d75971..ceb81148f5fd17f00d1a0fb2df1f31c45aa6807d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2588,5 +2588,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2582,5 +2582,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param material The material that will no longer be a fuel */ public void removeFuel(@NotNull Material material); @@ -260,10 +260,10 @@ index 25a049040a982194e7337d283898b252568f09e0..0f2f7cb8acb226d6f9a1085ec9cac3f8 /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a03f473dee39eb160196e2468e4c26c6f8f6ce2a..2443f32d5a832b8913cd00042b94fda96658a3c2 100644 +index 36d73f14d70c4b1768f3b7dfa235a6a2411e4687..cdc0f844c1c2f7c8f0faee9112750354762ec5de 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3882,5 +3882,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3887,5 +3887,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @deprecated Use {@link #resetIdleDuration()} instead */ void resetIdleTimer(); diff --git a/patches/unapplied-api/0039-Add-death-screen-API.patch b/patches/api/0039-Add-death-screen-API.patch similarity index 89% rename from patches/unapplied-api/0039-Add-death-screen-API.patch rename to patches/api/0039-Add-death-screen-API.patch index 30f3605f9..e130f9931 100644 --- a/patches/unapplied-api/0039-Add-death-screen-API.patch +++ b/patches/api/0039-Add-death-screen-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2443f32d5a832b8913cd00042b94fda96658a3c2..c41b5e13c519b3f48cbc866ad77b153cdde13136 100644 +index cdc0f844c1c2f7c8f0faee9112750354762ec5de..eb79e62e753524d6782842c662b0a50ab5ac0811 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3952,5 +3952,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3957,5 +3957,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Clears all debug block highlights */ void clearBlockHighlights(); diff --git a/patches/unapplied-api/0040-Language-API.patch b/patches/api/0040-Language-API.patch similarity index 100% rename from patches/unapplied-api/0040-Language-API.patch rename to patches/api/0040-Language-API.patch diff --git a/patches/unapplied-api/0041-Add-log-suppression-for-LibraryLoader.patch b/patches/api/0041-Add-log-suppression-for-LibraryLoader.patch similarity index 100% rename from patches/unapplied-api/0041-Add-log-suppression-for-LibraryLoader.patch rename to patches/api/0041-Add-log-suppression-for-LibraryLoader.patch diff --git a/patches/unapplied-api/0042-Fire-Immunity-API.patch b/patches/api/0042-Fire-Immunity-API.patch similarity index 100% rename from patches/unapplied-api/0042-Fire-Immunity-API.patch rename to patches/api/0042-Fire-Immunity-API.patch diff --git a/patches/unapplied-api/0043-Added-goat-ram-event.patch b/patches/api/0043-Added-goat-ram-event.patch similarity index 100% rename from patches/unapplied-api/0043-Added-goat-ram-event.patch rename to patches/api/0043-Added-goat-ram-event.patch diff --git a/patches/unapplied-api/0044-Add-PreExplodeEvents.patch b/patches/api/0044-Add-PreExplodeEvents.patch similarity index 100% rename from patches/unapplied-api/0044-Add-PreExplodeEvents.patch rename to patches/api/0044-Add-PreExplodeEvents.patch diff --git a/patches/unapplied-api/0045-Stored-Bee-API.patch b/patches/api/0045-Stored-Bee-API.patch similarity index 100% rename from patches/unapplied-api/0045-Stored-Bee-API.patch rename to patches/api/0045-Stored-Bee-API.patch diff --git a/patches/unapplied-api/0046-Explorer-Map-API.patch b/patches/api/0046-Explorer-Map-API.patch similarity index 100% rename from patches/unapplied-api/0046-Explorer-Map-API.patch rename to patches/api/0046-Explorer-Map-API.patch diff --git a/patches/unapplied-api/0047-Stonecutter-damage.patch b/patches/api/0047-Stonecutter-damage.patch similarity index 90% rename from patches/unapplied-api/0047-Stonecutter-damage.patch rename to patches/api/0047-Stonecutter-damage.patch index 8d0888381..e80a56e87 100644 --- a/patches/unapplied-api/0047-Stonecutter-damage.patch +++ b/patches/api/0047-Stonecutter-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stonecutter damage diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java -index 446b3ffd5caca5344be1c250475679834cd0d4a2..3da8d3d8925cd7a111c0c357bceecfd3a801c8eb 100644 +index ca634147935c3bda8abad5dc73327e51381793a8..02c6a087dc41ffb004bcc20284135844188f8142 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java @@ -303,7 +303,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {