From 89435671635ef0e0133ed6b858280a0eb127e216 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Tue, 15 Jun 2021 09:28:24 -0400 Subject: [PATCH] =?UTF-8?q?update=20api=20=20=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0002-Purpur-config-files.patch | 0 .../0003-Default-permissions.patch | 0 .../0004-Allow-inventory-resizing.patch | 0 .../0005-Advancement-API.patch | 0 .../0006-Llama-API.patch | 0 .../{api-remapped => api}/0007-AFK-API.patch | 4 +- .../0008-Bring-back-server-name.patch | 0 .../0009-ExecuteCommandEvent.patch | 0 .../0010-LivingEntity-safeFallDistance.patch | 4 +- .../0011-Lagging-threshold.patch | 0 .../0012-ItemFactory-getMonsterEgg.patch | 2 +- ...013-PlayerSetSpawnerTypeWithEggEvent.patch | 0 .../0014-EMC-MonsterEggSpawnEvent.patch | 0 .../0015-Villager-resetOffers.patch | 6 +-- .../0016-Player-invulnerabilities.patch | 4 +- .../0017-Anvil-API.patch | 0 .../0018-ItemStack-convenience-methods.patch | 4 +- ...ed-to-crystals-and-crystals-shoot-ph.patch | 0 .../0020-ChatColor-conveniences.patch | 0 .../{api-remapped => api}/0021-Ridables.patch | 4 +- ...igurable-permission-message-upgrades.patch | 0 ...0023-LivingEntity-broadcastItemBreak.patch | 4 +- .../0024-Item-entity-immunities.patch | 0 ...ot-Improve-output-of-plugins-command.patch | 0 ...sable-zombie-aggressiveness-towards-.patch | 0 ...e-to-recipe-s-ExactChoice-ingredient.patch | 0 ...-check-to-EntityDamagedByEntityEvent.patch | 0 .../0029-Left-handed-API.patch | 0 ...030-Alphabetize-in-game-plugins-list.patch | 0 .../0031-Rabid-Wolf-API.patch | 0 ...oc-warnings-missing-param-and-return.patch | 43 ++++++------------- .../0033-PlayerBookTooLargeEvent.patch | 0 ...therite-armor-grants-fire-resistance.patch | 4 +- ...0035-Add-EntityTeleportHinderedEvent.patch | 0 .../0036-Add-StructureGenerateEvent.patch | 0 ...-Add-unsafe-Entity-serialization-API.patch | 4 +- ...on-change-for-adventure-deprecations.patch | 32 +++++++------- ...ntment-target-for-bows-and-crossbows.patch | 0 .../0040-Iron-golem-poppy-calms-anger.patch | 0 ...041-API-for-any-mob-to-burn-daylight.patch | 8 ++-- .../0042-Flying-Fall-Damage-API.patch | 4 +- 41 files changed, 56 insertions(+), 71 deletions(-) rename patches/{api-remapped => api}/0002-Purpur-config-files.patch (100%) rename patches/{api-remapped => api}/0003-Default-permissions.patch (100%) rename patches/{api-remapped => api}/0004-Allow-inventory-resizing.patch (100%) rename patches/{api-remapped => api}/0005-Advancement-API.patch (100%) rename patches/{api-remapped => api}/0006-Llama-API.patch (100%) rename patches/{api-remapped => api}/0007-AFK-API.patch (94%) rename patches/{api-remapped => api}/0008-Bring-back-server-name.patch (100%) rename patches/{api-remapped => api}/0009-ExecuteCommandEvent.patch (100%) rename patches/{api-remapped => api}/0010-LivingEntity-safeFallDistance.patch (86%) rename patches/{api-remapped => api}/0011-Lagging-threshold.patch (100%) rename patches/{api-remapped => api}/0012-ItemFactory-getMonsterEgg.patch (91%) rename patches/{api-remapped => api}/0013-PlayerSetSpawnerTypeWithEggEvent.patch (100%) rename patches/{api-remapped => api}/0014-EMC-MonsterEggSpawnEvent.patch (100%) rename patches/{api-remapped => api}/0015-Villager-resetOffers.patch (78%) rename patches/{api-remapped => api}/0016-Player-invulnerabilities.patch (87%) rename patches/{api-remapped => api}/0017-Anvil-API.patch (100%) rename patches/{api-remapped => api}/0018-ItemStack-convenience-methods.patch (99%) rename patches/{api-remapped => api}/0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch (100%) rename patches/{api-remapped => api}/0020-ChatColor-conveniences.patch (100%) rename patches/{api-remapped => api}/0021-Ridables.patch (97%) rename patches/{api-remapped => api}/0022-Configurable-permission-message-upgrades.patch (100%) rename patches/{api-remapped => api}/0023-LivingEntity-broadcastItemBreak.patch (84%) rename patches/{api-remapped => api}/0024-Item-entity-immunities.patch (100%) rename patches/{api-remapped => api}/0025-Spigot-Improve-output-of-plugins-command.patch (100%) rename patches/{api-remapped => api}/0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch (100%) rename patches/{api-remapped => api}/0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch (100%) rename patches/{api-remapped => api}/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch (100%) rename patches/{api-remapped => api}/0029-Left-handed-API.patch (100%) rename patches/{api-remapped => api}/0030-Alphabetize-in-game-plugins-list.patch (100%) rename patches/{api-remapped => api}/0031-Rabid-Wolf-API.patch (100%) rename patches/{api-remapped => api}/0032-Fix-javadoc-warnings-missing-param-and-return.patch (97%) rename patches/{api-remapped => api}/0033-PlayerBookTooLargeEvent.patch (100%) rename patches/{api-remapped => api}/0034-Full-netherite-armor-grants-fire-resistance.patch (84%) rename patches/{api-remapped => api}/0035-Add-EntityTeleportHinderedEvent.patch (100%) rename patches/{api-remapped => api}/0036-Add-StructureGenerateEvent.patch (100%) rename patches/{api-remapped => api}/0037-Add-unsafe-Entity-serialization-API.patch (95%) rename patches/{api-remapped => api}/0038-Conflict-on-change-for-adventure-deprecations.patch (97%) rename patches/{api-remapped => api}/0039-Add-enchantment-target-for-bows-and-crossbows.patch (100%) rename patches/{api-remapped => api}/0040-Iron-golem-poppy-calms-anger.patch (100%) rename patches/{api-remapped => api}/0041-API-for-any-mob-to-burn-daylight.patch (83%) rename patches/{api-remapped => api}/0042-Flying-Fall-Damage-API.patch (87%) diff --git a/patches/api-remapped/0002-Purpur-config-files.patch b/patches/api/0002-Purpur-config-files.patch similarity index 100% rename from patches/api-remapped/0002-Purpur-config-files.patch rename to patches/api/0002-Purpur-config-files.patch diff --git a/patches/api-remapped/0003-Default-permissions.patch b/patches/api/0003-Default-permissions.patch similarity index 100% rename from patches/api-remapped/0003-Default-permissions.patch rename to patches/api/0003-Default-permissions.patch diff --git a/patches/api-remapped/0004-Allow-inventory-resizing.patch b/patches/api/0004-Allow-inventory-resizing.patch similarity index 100% rename from patches/api-remapped/0004-Allow-inventory-resizing.patch rename to patches/api/0004-Allow-inventory-resizing.patch diff --git a/patches/api-remapped/0005-Advancement-API.patch b/patches/api/0005-Advancement-API.patch similarity index 100% rename from patches/api-remapped/0005-Advancement-API.patch rename to patches/api/0005-Advancement-API.patch diff --git a/patches/api-remapped/0006-Llama-API.patch b/patches/api/0006-Llama-API.patch similarity index 100% rename from patches/api-remapped/0006-Llama-API.patch rename to patches/api/0006-Llama-API.patch diff --git a/patches/api-remapped/0007-AFK-API.patch b/patches/api/0007-AFK-API.patch similarity index 94% rename from patches/api-remapped/0007-AFK-API.patch rename to patches/api/0007-AFK-API.patch index c09b73189..091b73eac 100644 --- a/patches/api-remapped/0007-AFK-API.patch +++ b/patches/api/0007-AFK-API.patch @@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a4b236d75e77176a163094edd31f81725bbf4eca..ebb94111b851396832ecf5f84f4e829a4fe0b62e 100644 +index da83b4cbed0be6f693c7cbb1cc032356f12d7883..6f7af42646139789df1fe005949fdec29b4f47c9 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2099,4 +2099,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2126,4 +2126,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/api-remapped/0008-Bring-back-server-name.patch b/patches/api/0008-Bring-back-server-name.patch similarity index 100% rename from patches/api-remapped/0008-Bring-back-server-name.patch rename to patches/api/0008-Bring-back-server-name.patch diff --git a/patches/api-remapped/0009-ExecuteCommandEvent.patch b/patches/api/0009-ExecuteCommandEvent.patch similarity index 100% rename from patches/api-remapped/0009-ExecuteCommandEvent.patch rename to patches/api/0009-ExecuteCommandEvent.patch diff --git a/patches/api-remapped/0010-LivingEntity-safeFallDistance.patch b/patches/api/0010-LivingEntity-safeFallDistance.patch similarity index 86% rename from patches/api-remapped/0010-LivingEntity-safeFallDistance.patch rename to patches/api/0010-LivingEntity-safeFallDistance.patch index 7383c9a68..ed1002474 100644 --- a/patches/api-remapped/0010-LivingEntity-safeFallDistance.patch +++ b/patches/api/0010-LivingEntity-safeFallDistance.patch @@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ccb81ceee74fff50ec3ed88ae0a41f790c40ae87..b96edbf7e5a2bf66a9ebf9300368e8f6a8d561f9 100644 +index cda05df6784dd4d6a09710a416dcb71c016dabfc..fa0bd6b4f5a19724723cd7d1c76b0a098dceb3c6 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -873,4 +873,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -880,4 +880,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ void setHurtDirection(float hurtDirection); // Paper end diff --git a/patches/api-remapped/0011-Lagging-threshold.patch b/patches/api/0011-Lagging-threshold.patch similarity index 100% rename from patches/api-remapped/0011-Lagging-threshold.patch rename to patches/api/0011-Lagging-threshold.patch diff --git a/patches/api-remapped/0012-ItemFactory-getMonsterEgg.patch b/patches/api/0012-ItemFactory-getMonsterEgg.patch similarity index 91% rename from patches/api-remapped/0012-ItemFactory-getMonsterEgg.patch rename to patches/api/0012-ItemFactory-getMonsterEgg.patch index f426c80eb..fae6f4cf2 100644 --- a/patches/api-remapped/0012-ItemFactory-getMonsterEgg.patch +++ b/patches/api/0012-ItemFactory-getMonsterEgg.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemFactory#getMonsterEgg diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index ec7c07564608386c3f7d4322d0af4cbb7d92bc74..39323b3151c733392333858a2dbf1f3f8637341e 100644 +index 0a4466c6ca519c3a5da76ff870fb2a4e3a06effd..858dd1a5df74f9b36966ad55b5b66d4424b00c62 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -242,4 +242,15 @@ public interface ItemFactory { diff --git a/patches/api-remapped/0013-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 100% rename from patches/api-remapped/0013-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch diff --git a/patches/api-remapped/0014-EMC-MonsterEggSpawnEvent.patch b/patches/api/0014-EMC-MonsterEggSpawnEvent.patch similarity index 100% rename from patches/api-remapped/0014-EMC-MonsterEggSpawnEvent.patch rename to patches/api/0014-EMC-MonsterEggSpawnEvent.patch diff --git a/patches/api-remapped/0015-Villager-resetOffers.patch b/patches/api/0015-Villager-resetOffers.patch similarity index 78% rename from patches/api-remapped/0015-Villager-resetOffers.patch rename to patches/api/0015-Villager-resetOffers.patch index ae3bbedfd..e65eabd68 100644 --- a/patches/api-remapped/0015-Villager-resetOffers.patch +++ b/patches/api/0015-Villager-resetOffers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Villager#resetOffers diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java -index c8777a476e38ef5e72b6709761990a339eb43d2b..ed703af452cd7db5e47608b4ff6ec049f76ed03a 100644 +index 511b96841f7342d0a6b38d7cff56252ea8ef9bfe..0e2615b6e2be21abfb0116e6f1e02416bac97f74 100644 --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java @@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager { @@ -20,5 +20,5 @@ index c8777a476e38ef5e72b6709761990a339eb43d2b..ed703af452cd7db5e47608b4ff6ec049 + // Purpur end + /** - * Represents Villager type, usually corresponding to what biome they spawn - * in. + * Causes this villager to shake his head. + */ diff --git a/patches/api-remapped/0016-Player-invulnerabilities.patch b/patches/api/0016-Player-invulnerabilities.patch similarity index 87% rename from patches/api-remapped/0016-Player-invulnerabilities.patch rename to patches/api/0016-Player-invulnerabilities.patch index 6ef8db412..c1541edf2 100644 --- a/patches/api-remapped/0016-Player-invulnerabilities.patch +++ b/patches/api/0016-Player-invulnerabilities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ebb94111b851396832ecf5f84f4e829a4fe0b62e..77f075f7b87dd750a6cc89be7c6fc41afa05507d 100644 +index 6f7af42646139789df1fe005949fdec29b4f47c9..be55fb44fbfc0132c500c770013023a8097c7a53 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2119,5 +2119,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2146,5 +2146,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Reset the idle timer back to 0 */ void resetIdleTimer(); diff --git a/patches/api-remapped/0017-Anvil-API.patch b/patches/api/0017-Anvil-API.patch similarity index 100% rename from patches/api-remapped/0017-Anvil-API.patch rename to patches/api/0017-Anvil-API.patch diff --git a/patches/api-remapped/0018-ItemStack-convenience-methods.patch b/patches/api/0018-ItemStack-convenience-methods.patch similarity index 99% rename from patches/api-remapped/0018-ItemStack-convenience-methods.patch rename to patches/api/0018-ItemStack-convenience-methods.patch index f7418988d..b61d417ff 100644 --- a/patches/api-remapped/0018-ItemStack-convenience-methods.patch +++ b/patches/api/0018-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 e2b3470e3c9a97671723f5a67f722fb86fb07fbf..560b441ef35e507236e683b04f6a774c5949a078 100644 +index d635c4fb85d3eeea3853037b2da5881c4853b193..a51f4a3f77cfb946dc3b9fc8e367d6f08377a6de 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -8731,4 +8731,40 @@ public enum Material implements Keyed { +@@ -9822,4 +9822,40 @@ public enum Material implements Keyed { // } } diff --git a/patches/api-remapped/0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from patches/api-remapped/0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/api/0019-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/patches/api-remapped/0020-ChatColor-conveniences.patch b/patches/api/0020-ChatColor-conveniences.patch similarity index 100% rename from patches/api-remapped/0020-ChatColor-conveniences.patch rename to patches/api/0020-ChatColor-conveniences.patch diff --git a/patches/api-remapped/0021-Ridables.patch b/patches/api/0021-Ridables.patch similarity index 97% rename from patches/api-remapped/0021-Ridables.patch rename to patches/api/0021-Ridables.patch index 0031ab00b..49733614c 100644 --- a/patches/api-remapped/0021-Ridables.patch +++ b/patches/api/0021-Ridables.patch @@ -169,10 +169,10 @@ index 0000000000000000000000000000000000000000..c0ec5a130985e8da4cc9e596a6b70503 + } +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 46985eaea3d3b00d1dd88c2dd5a2bc53d518c64f..38c6ecba4a6090ee42180ff52db42bac8e7f95d7 100644 +index a9e455c5b3bbe4edbdb71f86f5c6eebc2f605547..c6f33ed7502fe8ad58f937ac2e326b85416452c2 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -704,4 +704,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -753,4 +753,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ public boolean isTicking(); // Paper end diff --git a/patches/api-remapped/0022-Configurable-permission-message-upgrades.patch b/patches/api/0022-Configurable-permission-message-upgrades.patch similarity index 100% rename from patches/api-remapped/0022-Configurable-permission-message-upgrades.patch rename to patches/api/0022-Configurable-permission-message-upgrades.patch diff --git a/patches/api-remapped/0023-LivingEntity-broadcastItemBreak.patch b/patches/api/0023-LivingEntity-broadcastItemBreak.patch similarity index 84% rename from patches/api-remapped/0023-LivingEntity-broadcastItemBreak.patch rename to patches/api/0023-LivingEntity-broadcastItemBreak.patch index ff7ac9306..2fbc61607 100644 --- a/patches/api-remapped/0023-LivingEntity-broadcastItemBreak.patch +++ b/patches/api/0023-LivingEntity-broadcastItemBreak.patch @@ -5,10 +5,10 @@ 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 b96edbf7e5a2bf66a9ebf9300368e8f6a8d561f9..f64cd3a467ccb4f773138542a6beb61ab2e1ae40 100644 +index fa0bd6b4f5a19724723cd7d1c76b0a098dceb3c6..86dd7fbbd98f32f164a15b5b2e9cf6f4664fbef1 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -888,5 +888,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -895,5 +895,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param safeFallDistance Safe fall distance */ void setSafeFallDistance(float safeFallDistance); diff --git a/patches/api-remapped/0024-Item-entity-immunities.patch b/patches/api/0024-Item-entity-immunities.patch similarity index 100% rename from patches/api-remapped/0024-Item-entity-immunities.patch rename to patches/api/0024-Item-entity-immunities.patch diff --git a/patches/api-remapped/0025-Spigot-Improve-output-of-plugins-command.patch b/patches/api/0025-Spigot-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/api-remapped/0025-Spigot-Improve-output-of-plugins-command.patch rename to patches/api/0025-Spigot-Improve-output-of-plugins-command.patch diff --git a/patches/api-remapped/0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/api/0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/api-remapped/0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/api/0026-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/api-remapped/0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/api-remapped/0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/api/0027-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/api-remapped/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/api/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch similarity index 100% rename from patches/api-remapped/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch rename to patches/api/0028-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch diff --git a/patches/api-remapped/0029-Left-handed-API.patch b/patches/api/0029-Left-handed-API.patch similarity index 100% rename from patches/api-remapped/0029-Left-handed-API.patch rename to patches/api/0029-Left-handed-API.patch diff --git a/patches/api-remapped/0030-Alphabetize-in-game-plugins-list.patch b/patches/api/0030-Alphabetize-in-game-plugins-list.patch similarity index 100% rename from patches/api-remapped/0030-Alphabetize-in-game-plugins-list.patch rename to patches/api/0030-Alphabetize-in-game-plugins-list.patch diff --git a/patches/api-remapped/0031-Rabid-Wolf-API.patch b/patches/api/0031-Rabid-Wolf-API.patch similarity index 100% rename from patches/api-remapped/0031-Rabid-Wolf-API.patch rename to patches/api/0031-Rabid-Wolf-API.patch diff --git a/patches/api-remapped/0032-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch similarity index 97% rename from patches/api-remapped/0032-Fix-javadoc-warnings-missing-param-and-return.patch rename to patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch index e6978a9d8..45cc5ea0e 100644 --- a/patches/api-remapped/0032-Fix-javadoc-warnings-missing-param-and-return.patch +++ b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch @@ -661,10 +661,10 @@ index d1757f3d456ff9efce26ce8baa1d16d896908cc2..a5db52386e11e4b5511ae417a0e7ac92 TASK(ChatColor.GREEN), CHALLENGE(ChatColor.DARK_PURPLE), diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 08e6f1741685f54506c8a4ff29bbd30f62cf8e45..8efd2669bd5e3dfa47ff8fcb858333210eb5c201 100644 +index ca488173a20bcf3427906f0a6548f06a97c9dc36..3b6fd2083d00a0cf2add91302a74c8f905563d09 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java -@@ -183,6 +183,9 @@ public interface Block extends Metadatable { +@@ -184,6 +184,9 @@ public interface Block extends Metadatable { * {@code int z = (int) ((packed << 10) >> 37);} *

* @@ -847,7 +847,7 @@ index 6c475a3723721b33bb7709d8c1bbf487a10f9bbe..210d955e9bbb669c8ce644c935c1607a + */ public interface DragonFireball extends Fireball {} diff --git a/src/main/java/org/bukkit/entity/Endermite.java b/src/main/java/org/bukkit/entity/Endermite.java -index d9be83961b28b927a587f6dbb339b531520e4865..1ff4c5e283ac05c405c09bd4b853066452614696 100644 +index 9e7f42caab1204036f4203354c115fd40c6def92..f76ddd80f9fc926f73b1cc50f0a2767abbc549bb 100644 --- a/src/main/java/org/bukkit/entity/Endermite.java +++ b/src/main/java/org/bukkit/entity/Endermite.java @@ -1,5 +1,8 @@ @@ -860,10 +860,10 @@ index d9be83961b28b927a587f6dbb339b531520e4865..1ff4c5e283ac05c405c09bd4b8530664 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 38c6ecba4a6090ee42180ff52db42bac8e7f95d7..b47e31d2b9b41b39b46892fe10bf36d82c5d8e1b 100644 +index c6f33ed7502fe8ad58f937ac2e326b85416452c2..6a16e4dcebaf6c899859039774383125dd03e59a 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -622,6 +622,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -668,6 +668,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent Pose getPose(); // Spigot start @@ -873,7 +873,7 @@ index 38c6ecba4a6090ee42180ff52db42bac8e7f95d7..b47e31d2b9b41b39b46892fe10bf36d8 public class Spigot extends CommandSender.Spigot { } -@@ -671,36 +674,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -720,36 +723,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent /** * Check if entity is in rain @@ -925,7 +925,7 @@ index 38c6ecba4a6090ee42180ff52db42bac8e7f95d7..b47e31d2b9b41b39b46892fe10bf36d8 public boolean isTicking(); // Paper end diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 692b75eb78405874077c850bfc72e247ccc80860..31fc511edc33635438e93d3c14292305ac30a38f 100644 +index f415b61b0d4b57e1557aaf240a0f2ad5915035fc..e501ef166445ad6c515b95151d151ef759bea8f5 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java @@ -20,6 +20,9 @@ import org.jetbrains.annotations.Contract; @@ -994,10 +994,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8 NORMAL(false), diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 77f075f7b87dd750a6cc89be7c6fc41afa05507d..700aa4b70b0f540aefae9f7db807214c52422d20 100644 +index be55fb44fbfc0132c500c770013023a8097c7a53..f1e5727e5ff8db2195d1f80a4938c1d9b05718cc 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1921,6 +1921,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1948,6 +1948,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void resetCooldown(); /** @@ -1006,7 +1006,7 @@ index 77f075f7b87dd750a6cc89be7c6fc41afa05507d..700aa4b70b0f540aefae9f7db807214c * @return the client option value of the player */ @NotNull -@@ -1960,6 +1962,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1987,6 +1989,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM // Paper end // Spigot start @@ -1072,21 +1072,6 @@ index 4623e0d767b343cbdc6fcf20b3b2ff7ff14863cf..ca3f98a8272bab3c9f57f59b077b206c public interface ShulkerBullet extends Projectile { /** -diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java -index 684477b894e52ff33f9fce2edf76e58c292dd75e..581abc69290ca14b8e64f50fdf5a49c14be13940 100644 ---- a/src/main/java/org/bukkit/entity/Skeleton.java -+++ b/src/main/java/org/bukkit/entity/Skeleton.java -@@ -27,7 +27,9 @@ public interface Skeleton extends Monster, RangedEntity { // Paper - @Contract("_ -> fail") - public void setSkeletonType(SkeletonType type); - -- /* -+ /** -+ * Skeleton type -+ * - * @deprecated classes are different types - */ - @Deprecated diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java index 65e68da98ab66ed781bce2f0dbe0913be48d2990..cb708ae66f60a36ac0f529614743e33511e4bd90 100644 --- a/src/main/java/org/bukkit/entity/Tameable.java @@ -1183,10 +1168,10 @@ index 25d26e3fe713311e66d7e634a6c32af61f4cef59..2825263c102d3f9ed37f6884e09ec5ef /** diff --git a/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java b/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java -index 4aaa78afdda2d2351f8c4ed46a52e0cf77ec437c..4d2d821003840b7fc1ca412d71b841341c7b51ec 100644 +index 2519e3eb9c6274476310913fdcb765c490d50962..44b07ced26449983a58e936c5d6d5ed2f7022fb4 100644 --- a/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java +++ b/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java -@@ -8,6 +8,9 @@ import org.bukkit.event.HandlerList; +@@ -12,6 +12,9 @@ import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -1196,7 +1181,7 @@ index 4aaa78afdda2d2351f8c4ed46a52e0cf77ec437c..4d2d821003840b7fc1ca412d71b84134 public class CauldronLevelChangeEvent extends BlockEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); -@@ -75,6 +78,9 @@ public class CauldronLevelChangeEvent extends BlockEvent implements Cancellable +@@ -119,6 +122,9 @@ public class CauldronLevelChangeEvent extends BlockEvent implements Cancellable return handlers; } @@ -1416,7 +1401,7 @@ index c7b17eabf07b829a02afe7c1f27a5127b6bfea70..d4e2bcf8ce8fc2af851b471490147f00 /** diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 39323b3151c733392333858a2dbf1f3f8637341e..b2af5217a74266917365c3bf216a780b95c833bd 100644 +index 858dd1a5df74f9b36966ad55b5b66d4424b00c62..e7dd844f2359fdaf903632bb3761382ee9dc38b5 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -148,6 +148,7 @@ public interface ItemFactory { diff --git a/patches/api-remapped/0033-PlayerBookTooLargeEvent.patch b/patches/api/0033-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/api-remapped/0033-PlayerBookTooLargeEvent.patch rename to patches/api/0033-PlayerBookTooLargeEvent.patch diff --git a/patches/api-remapped/0034-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0034-Full-netherite-armor-grants-fire-resistance.patch similarity index 84% rename from patches/api-remapped/0034-Full-netherite-armor-grants-fire-resistance.patch rename to patches/api/0034-Full-netherite-armor-grants-fire-resistance.patch index 4cf6d1a0e..266d29fac 100644 --- a/patches/api-remapped/0034-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/api/0034-Full-netherite-armor-grants-fire-resistance.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Full netherite armor grants fire resistance diff --git a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java -index 16b5fd279b0cb926900247618bcdb381a93f5a35..d592c62aadb3245396865c098c5979f2a162f868 100644 +index b915c3cab168a2bbdca740e662baaa708d425e41..476b33dd26af55f787f64c37d9a8cd2d0dc2a7f7 100644 --- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java -@@ -213,6 +213,12 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable +@@ -217,6 +217,12 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable * When all effects are removed due to a bucket of milk. */ MILK, diff --git a/patches/api-remapped/0035-Add-EntityTeleportHinderedEvent.patch b/patches/api/0035-Add-EntityTeleportHinderedEvent.patch similarity index 100% rename from patches/api-remapped/0035-Add-EntityTeleportHinderedEvent.patch rename to patches/api/0035-Add-EntityTeleportHinderedEvent.patch diff --git a/patches/api-remapped/0036-Add-StructureGenerateEvent.patch b/patches/api/0036-Add-StructureGenerateEvent.patch similarity index 100% rename from patches/api-remapped/0036-Add-StructureGenerateEvent.patch rename to patches/api/0036-Add-StructureGenerateEvent.patch diff --git a/patches/api-remapped/0037-Add-unsafe-Entity-serialization-API.patch b/patches/api/0037-Add-unsafe-Entity-serialization-API.patch similarity index 95% rename from patches/api-remapped/0037-Add-unsafe-Entity-serialization-API.patch rename to patches/api/0037-Add-unsafe-Entity-serialization-API.patch index db374eca0..0d8c3d980 100644 --- a/patches/api-remapped/0037-Add-unsafe-Entity-serialization-API.patch +++ b/patches/api/0037-Add-unsafe-Entity-serialization-API.patch @@ -50,10 +50,10 @@ index ef3011d74ce9acf02d0ee857033816854134ec0e..b2502aaab690b1414a1adffdf64e5a54 + // Purpur end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index b47e31d2b9b41b39b46892fe10bf36d82c5d8e1b..7fa5242bd44c9b19648d79fa8fecbb7ee125288e 100644 +index 6a16e4dcebaf6c899859039774383125dd03e59a..0b8357f012e3bafcd3b5fb4043392b42cf5cfc2a 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -751,5 +751,24 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -800,5 +800,24 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if ridable in water */ boolean isRidableInWater(); diff --git a/patches/api-remapped/0038-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch similarity index 97% rename from patches/api-remapped/0038-Conflict-on-change-for-adventure-deprecations.patch rename to patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch index 3aadbae90..438d3bc7f 100644 --- a/patches/api-remapped/0038-Conflict-on-change-for-adventure-deprecations.patch +++ b/patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch @@ -139,7 +139,7 @@ index 31b776d35786a932eb912010778ff83b35244f6d..8d3c9a355bea2b217f69f6eb70e0962a /** diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java -index 6ea9b54d95d80070c01a612c0ce2ab37f0b4ad41..fe9ec9cb7875df4a40d1c4155e13cca9b3628b30 100644 +index cdcf02ff9e80f5908a8fa22e82701445d5e2d298..83eba2421cdfa56c2f5b9ebaac18d56360164fed 100644 --- a/src/main/java/org/bukkit/block/Sign.java +++ b/src/main/java/org/bukkit/block/Sign.java @@ -48,7 +48,7 @@ public interface Sign extends TileState, Colorable { @@ -170,10 +170,10 @@ index 6ea9b54d95d80070c01a612c0ce2ab37f0b4ad41..fe9ec9cb7875df4a40d1c4155e13cca9 /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936ea601312 100644 +index f1e5727e5ff8db2195d1f80a4938c1d9b05718cc..9f2bab23c0e11532816381e54591aa10b2b30d9b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -72,7 +72,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -75,7 +75,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return the friendly name * @deprecated in favour of {@link #displayName()} */ @@ -182,7 +182,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 @NotNull public String getDisplayName(); -@@ -86,7 +86,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -89,7 +89,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param name The new display name. * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)} */ @@ -191,7 +191,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 public void setDisplayName(@Nullable String name); // Paper start -@@ -127,7 +127,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -130,7 +130,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @deprecated in favour of {@link #playerListName()} */ @NotNull @@ -200,7 +200,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 public String getPlayerListName(); /** -@@ -138,7 +138,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -141,7 +141,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param name new player list name * @deprecated in favour of {@link #playerListName(net.kyori.adventure.text.Component)} */ @@ -209,7 +209,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 public void setPlayerListName(@Nullable String name); /** -@@ -147,7 +147,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -150,7 +150,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return player list header or null * @deprecated in favour of {@link #playerListHeader()} */ @@ -218,7 +218,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 @Nullable public String getPlayerListHeader(); -@@ -157,7 +157,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -160,7 +160,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return player list header or null * @deprecated in favour of {@link #playerListFooter()} */ @@ -227,7 +227,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 @Nullable public String getPlayerListFooter(); -@@ -167,7 +167,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -170,7 +170,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param header player list header, null for empty * @deprecated in favour of {@link #sendPlayerListHeader(net.kyori.adventure.text.Component)} */ @@ -236,7 +236,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 public void setPlayerListHeader(@Nullable String header); /** -@@ -176,7 +176,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -179,7 +179,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param footer player list footer, null for empty * @deprecated in favour of {@link #sendPlayerListFooter(net.kyori.adventure.text.Component)} */ @@ -245,7 +245,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 public void setPlayerListFooter(@Nullable String footer); /** -@@ -187,7 +187,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -190,7 +190,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param footer player list footer, null for empty * @deprecated in favour of {@link #sendPlayerListHeaderAndFooter(net.kyori.adventure.text.Component, net.kyori.adventure.text.Component)} */ @@ -254,7 +254,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer); /** -@@ -227,7 +227,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -230,7 +230,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param message kick message * @deprecated in favour of {@link #kick(net.kyori.adventure.text.Component)} */ @@ -263,7 +263,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 public void kickPlayer(@Nullable String message); // Paper start -@@ -598,7 +598,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -625,7 +625,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException if lines is non-null and has a length less than 4 * @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List)} */ @@ -272,7 +272,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException; -@@ -620,7 +620,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -647,7 +647,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException if lines is non-null and has a length less than 4 * @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List, org.bukkit.DyeColor)} */ @@ -281,7 +281,7 @@ index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936 public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException; /** -@@ -1769,7 +1769,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1796,7 +1796,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @deprecated in favour of {@link #locale()} */ @NotNull @@ -432,7 +432,7 @@ index 851a189d42e271679abc78f95049d8badf7a2b64..7057c2e95267ad32190c5666f20a0566 this.joinMessage = joinMessage != null ? org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(joinMessage) : null; // Paper } diff --git a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java -index 02914c0743852e9e4fd2c085fd4b735e74d8875b..94688093671949551992a8c80904cd6042deb83b 100644 +index 05ecfd8c133e72d198faeeded8c757c231c871cc..e57020767879b51f212d7a3e563a386adb390c5b 100644 --- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java @@ -85,7 +85,7 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable { diff --git a/patches/api-remapped/0039-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0039-Add-enchantment-target-for-bows-and-crossbows.patch similarity index 100% rename from patches/api-remapped/0039-Add-enchantment-target-for-bows-and-crossbows.patch rename to patches/api/0039-Add-enchantment-target-for-bows-and-crossbows.patch diff --git a/patches/api-remapped/0040-Iron-golem-poppy-calms-anger.patch b/patches/api/0040-Iron-golem-poppy-calms-anger.patch similarity index 100% rename from patches/api-remapped/0040-Iron-golem-poppy-calms-anger.patch rename to patches/api/0040-Iron-golem-poppy-calms-anger.patch diff --git a/patches/api-remapped/0041-API-for-any-mob-to-burn-daylight.patch b/patches/api/0041-API-for-any-mob-to-burn-daylight.patch similarity index 83% rename from patches/api-remapped/0041-API-for-any-mob-to-burn-daylight.patch rename to patches/api/0041-API-for-any-mob-to-burn-daylight.patch index edec35d7d..0dcced6b7 100644 --- a/patches/api-remapped/0041-API-for-any-mob-to-burn-daylight.patch +++ b/patches/api/0041-API-for-any-mob-to-burn-daylight.patch @@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight Co-authored by: Encode42 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 7fa5242bd44c9b19648d79fa8fecbb7ee125288e..62d8d7dbd4d602ca8cb00ff0cf1331583b398323 100644 +index 0b8357f012e3bafcd3b5fb4043392b42cf5cfc2a..c9d64da90a05f252d91dd10d2d5f62ba66afb944 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -770,5 +770,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -819,5 +819,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return Whether the entity was successfully spawned. */ boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason); @@ -23,10 +23,10 @@ index 7fa5242bd44c9b19648d79fa8fecbb7ee125288e..62d8d7dbd4d602ca8cb00ff0cf133158 // Purpur end } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index f64cd3a467ccb4f773138542a6beb61ab2e1ae40..41f91ab59e34b2b15432d3941e4ee5658b24f10e 100644 +index 86dd7fbbd98f32f164a15b5b2e9cf6f4664fbef1..90e8c4bc68d1563061b6c6efc5e9040735c67dcd 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -895,5 +895,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -902,5 +902,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param slot Equipment slot to play break animation for */ void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot); diff --git a/patches/api-remapped/0042-Flying-Fall-Damage-API.patch b/patches/api/0042-Flying-Fall-Damage-API.patch similarity index 87% rename from patches/api-remapped/0042-Flying-Fall-Damage-API.patch rename to patches/api/0042-Flying-Fall-Damage-API.patch index 388129ea0..7815ecb17 100644 --- a/patches/api-remapped/0042-Flying-Fall-Damage-API.patch +++ b/patches/api/0042-Flying-Fall-Damage-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 0fb3b5a9ee1cc53b69b6d89766080936ea601312..2d849d0b63d4fc5faa439bad6b9448e3200c26fd 100644 +index 9f2bab23c0e11532816381e54591aa10b2b30d9b..b780666bbed552f61cac740fd1f775963a5bcd19 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2145,5 +2145,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2172,5 +2172,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param invulnerableTicks Invulnerable ticks remaining */ void setSpawnInvulnerableTicks(int invulnerableTicks);