diff --git a/build.gradle.kts b/build.gradle.kts index 55e86ba3c..16e66dbfb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,7 +49,7 @@ subprojects { configure { repositories.maven { name = "maven" - url = uri("https://repo.pl3x.net/snapshots") + url = uri("https://repo.purpurmc.org/snapshots") credentials(PasswordCredentials::class) } } diff --git a/gradle.properties b/gradle.properties index a19ef711f..4a948e9a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ -group = net.pl3x.purpur -version = 1.18-pre5-R0.1-SNAPSHOT +group = org.purpurmc.purpur +version = 1.18-pre8-R0.1-SNAPSHOT -mcVersion = 1.18-pre5 +mcVersion = 1.18-pre8 packageVersion = 1_18_R1 -paperCommit = 9af14f154713661253c908b2a9cb1a822fe6fd4e +paperCommit = af8691c73b2c150cb4e10dab64908d7c4ca8e553 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/unapplied/api/0001-Build-System-Changes.patch b/patches/api/0001-Build-System-Changes.patch similarity index 87% rename from patches/unapplied/api/0001-Build-System-Changes.patch rename to patches/api/0001-Build-System-Changes.patch index 989ec8c26..dba5317d3 100644 --- a/patches/unapplied/api/0001-Build-System-Changes.patch +++ b/patches/api/0001-Build-System-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Build System Changes todo: merge with rebrand patch diff --git a/build.gradle.kts b/build.gradle.kts -index 92b612126a6bac0b89198a92bbb73b742ec9d064..849126adc8e75324b3dae2d946092bc325064e29 100644 +index 0446e0131198ecd6d6d1e381eec5bbab18031b62..7d6cde4e703ad23f47471e8610ace396d7c22e31 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,6 +39,7 @@ dependencies { 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 77ac892dd..d15cb49e8 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 c34cfba8f9ed7e9dbd0b6b8ffef9fba46abff046..1d1fe3b7341629695de62ff3110b5563f6daee39 100644 +index 395b0706bfbf03741df6ca1ff084618b91140acc..5bd999c3a05d936b19689930c7f64e12c23c3679 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1715,6 +1715,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1727,6 +1727,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Paper end diff --git a/patches/unapplied/api/0003-Purpur-client-support.patch b/patches/api/0003-Purpur-client-support.patch similarity index 82% rename from patches/unapplied/api/0003-Purpur-client-support.patch rename to patches/api/0003-Purpur-client-support.patch index 05495d9be..d486ef68c 100644 --- a/patches/unapplied/api/0003-Purpur-client-support.patch +++ b/patches/api/0003-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 9a6e410206852029f1fea0c4409352d5743dcf64..0e21d2cf8fd2fc4eacce20413967adbc3f29ad9a 100644 +index 7de08c12aec311a8de631a8ec37147579c5e9963..90a1635379f3db8f6158099198d142e6c2cc1c8c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2291,4 +2291,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2290,4 +2290,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/unapplied/api/0004-Default-permissions.patch b/patches/api/0004-Default-permissions.patch similarity index 100% rename from patches/unapplied/api/0004-Default-permissions.patch rename to patches/api/0004-Default-permissions.patch diff --git a/patches/unapplied/api/0005-Ridables.patch b/patches/api/0005-Ridables.patch similarity index 91% rename from patches/unapplied/api/0005-Ridables.patch rename to patches/api/0005-Ridables.patch index 2d4cd7e55..5210e3b38 100644 --- a/patches/unapplied/api/0005-Ridables.patch +++ b/patches/api/0005-Ridables.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Ridables diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index fb0c77c66ca117eaff9487a41f1e280afe6253c6..24d992243c1fac9fa90053c0c9981107650de65e 100644 +index 2405254739a83b2fb517da7fa4ea0721c68f9f6d..825c02793e3aaff45a8a0a9da01d72daf9421bee 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -196,6 +196,11 @@ public interface VanillaGoal extends Goal { - GoalKey RAIDER_CELEBRATION = GoalKey.of(Raider.class, NamespacedKey.minecraft("raider_celebration")); +@@ -197,6 +197,11 @@ public interface VanillaGoal extends Goal { GoalKey RAIDER_MOVE_THROUGH_VILLAGE = GoalKey.of(Raider.class, NamespacedKey.minecraft("raider_move_through_village")); + GoalKey PARROT_WANDER = GoalKey.of(Creature.class, NamespacedKey.minecraft("parrot_wander")); + // Purpur start + GoalKey MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider")); @@ -173,12 +173,12 @@ index 0000000000000000000000000000000000000000..c0ec5a130985e8da4cc9e596a6b70503 + } +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index bafad5764cc3933fcd9602d37bd2e68424cbd575..f1740d0d50e251fa029f22eeaacf2a68b3cd2e96 100644 +index 18795003815d5bb6e04a15256430f69a31b2ace5..0de88cfff94a17ff41d28b569b8d283ad8bf0b49 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -795,4 +795,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -768,4 +768,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ - public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason); + @NotNull Set getTrackedPlayers(); // Paper end + + // Purpur start diff --git a/patches/unapplied/api/0006-Allow-inventory-resizing.patch b/patches/api/0006-Allow-inventory-resizing.patch similarity index 100% rename from patches/unapplied/api/0006-Allow-inventory-resizing.patch rename to patches/api/0006-Allow-inventory-resizing.patch diff --git a/patches/unapplied/api/0007-Llama-API.patch b/patches/api/0007-Llama-API.patch similarity index 100% rename from patches/unapplied/api/0007-Llama-API.patch rename to patches/api/0007-Llama-API.patch diff --git a/patches/unapplied/api/0008-AFK-API.patch b/patches/api/0008-AFK-API.patch similarity index 94% rename from patches/unapplied/api/0008-AFK-API.patch rename to patches/api/0008-AFK-API.patch index a91be2d10..b16e5bf00 100644 --- a/patches/unapplied/api/0008-AFK-API.patch +++ b/patches/api/0008-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 0e21d2cf8fd2fc4eacce20413967adbc3f29ad9a..c86ece55ea81d86412e5bb8952e1df265e325845 100644 +index 90a1635379f3db8f6158099198d142e6c2cc1c8c..dfc092c5f1f4e00d3eabb72b9f15d203cca602f7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2299,5 +2299,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2298,5 +2298,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return True if Player uses Purpur Client */ public boolean usesPurpurClient(); diff --git a/patches/unapplied/api/0009-Bring-back-server-name.patch b/patches/api/0009-Bring-back-server-name.patch similarity index 83% rename from patches/unapplied/api/0009-Bring-back-server-name.patch rename to patches/api/0009-Bring-back-server-name.patch index 89eccfd5f..3512b2837 100644 --- a/patches/unapplied/api/0009-Bring-back-server-name.patch +++ b/patches/api/0009-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 c551010f84ac5d3ebc626c253a8f8282924152c4..a2a97c3ce3c7e7baf67f7f70d9ac2d3dc048075a 100644 +index 7868a54eec71f7b31d7fabf3288eb2dc62649e92..ae8d698a58de2b4c0b42a6f43c63a9e5a4aaa039 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2118,4 +2118,15 @@ public final class Bukkit { +@@ -2120,4 +2120,15 @@ public final class Bukkit { public static Server.Spigot spigot() { return server.spigot(); } @@ -25,7 +25,7 @@ index c551010f84ac5d3ebc626c253a8f8282924152c4..a2a97c3ce3c7e7baf67f7f70d9ac2d3d + // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 1d1fe3b7341629695de62ff3110b5563f6daee39..6daf552c9c528a8bacab7db7a61254312d8e1db6 100644 +index 5bd999c3a05d936b19689930c7f64e12c23c3679..06552f28aacf93ac68db90dccfcd1aa48eaba382 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1849,4 +1849,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/unapplied/api/0010-ExecuteCommandEvent.patch b/patches/api/0010-ExecuteCommandEvent.patch similarity index 100% rename from patches/unapplied/api/0010-ExecuteCommandEvent.patch rename to patches/api/0010-ExecuteCommandEvent.patch diff --git a/patches/unapplied/api/0011-LivingEntity-safeFallDistance.patch b/patches/api/0011-LivingEntity-safeFallDistance.patch similarity index 100% rename from patches/unapplied/api/0011-LivingEntity-safeFallDistance.patch rename to patches/api/0011-LivingEntity-safeFallDistance.patch diff --git a/patches/unapplied/api/0012-Lagging-threshold.patch b/patches/api/0012-Lagging-threshold.patch similarity index 83% rename from patches/unapplied/api/0012-Lagging-threshold.patch rename to patches/api/0012-Lagging-threshold.patch index 078d1c413..0380a975e 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 a2a97c3ce3c7e7baf67f7f70d9ac2d3dc048075a..af9fa63eca06a80f19578a2590a3280948b297ae 100644 +index ae8d698a58de2b4c0b42a6f43c63a9e5a4aaa039..a8fc16f2fa6713a4cbe75c17a8e6743f69c383d5 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2128,5 +2128,14 @@ public final class Bukkit { +@@ -2130,5 +2130,14 @@ public final class Bukkit { public static String getServerName() { return server.getServerName(); } @@ -24,7 +24,7 @@ index a2a97c3ce3c7e7baf67f7f70d9ac2d3dc048075a..af9fa63eca06a80f19578a2590a32809 // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 6daf552c9c528a8bacab7db7a61254312d8e1db6..c6b478fe41dcd6017571c68f3114442f3c9f6415 100644 +index 06552f28aacf93ac68db90dccfcd1aa48eaba382..1910f88c155c6d19d02494e4fea2b86509235e5a 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1857,5 +1857,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi 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-EMC-MonsterEggSpawnEvent.patch b/patches/api/0014-EMC-MonsterEggSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0014-EMC-MonsterEggSpawnEvent.patch rename to patches/api/0014-EMC-MonsterEggSpawnEvent.patch diff --git a/patches/unapplied/api/0015-Player-invulnerabilities.patch b/patches/api/0015-Player-invulnerabilities.patch similarity index 87% rename from patches/unapplied/api/0015-Player-invulnerabilities.patch rename to patches/api/0015-Player-invulnerabilities.patch index 9e8ff7b7d..610dbfa16 100644 --- a/patches/unapplied/api/0015-Player-invulnerabilities.patch +++ b/patches/api/0015-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 c86ece55ea81d86412e5bb8952e1df265e325845..9bc534cdb64ed772429a32468e9a1fbfda0e93c9 100644 +index dfc092c5f1f4e00d3eabb72b9f15d203cca602f7..081713363eaee99b9332f05e8d7afc218a044754 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2318,5 +2318,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2317,5 +2317,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Reset the idle timer back to 0 */ void resetIdleTimer(); diff --git a/patches/unapplied/api/0016-Anvil-API.patch b/patches/api/0016-Anvil-API.patch similarity index 100% rename from patches/unapplied/api/0016-Anvil-API.patch rename to patches/api/0016-Anvil-API.patch diff --git a/patches/unapplied/api/0017-ItemStack-convenience-methods.patch b/patches/api/0017-ItemStack-convenience-methods.patch similarity index 99% rename from patches/unapplied/api/0017-ItemStack-convenience-methods.patch rename to patches/api/0017-ItemStack-convenience-methods.patch index f17c8ff41..71cb850fd 100644 --- a/patches/unapplied/api/0017-ItemStack-convenience-methods.patch +++ b/patches/api/0017-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 f1ff88a5db58eed6087c3e9e6c211a95e00f35b4..bc243e68c5965b62594cc5e1e7e8050731f88765 100644 +index f24820f14d689d49dfea25605199d5299ec28e7c..4e4fcce337047da575a9318c7094614d5270040e 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -9836,4 +9836,40 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata +@@ -9832,4 +9832,40 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata // } } diff --git a/patches/unapplied/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 86% rename from patches/unapplied/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 7a80c70db..d5657b9e1 100644 --- a/patches/unapplied/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index 24d992243c1fac9fa90053c0c9981107650de65e..ed8edd7fe6e88141a1b4cbb0bf4d17ebb1bbf554 100644 +index 825c02793e3aaff45a8a0a9da01d72daf9421bee..fff199d014f93c6655b3d756bcc6fe986c97a81c 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -199,6 +199,8 @@ public interface VanillaGoal extends Goal { +@@ -200,6 +200,8 @@ public interface VanillaGoal extends Goal { // Purpur start GoalKey MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider")); GoalKey HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider")); diff --git a/patches/unapplied/api/0019-ChatColor-conveniences.patch b/patches/api/0019-ChatColor-conveniences.patch similarity index 100% rename from patches/unapplied/api/0019-ChatColor-conveniences.patch rename to patches/api/0019-ChatColor-conveniences.patch diff --git a/patches/unapplied/api/0020-LivingEntity-broadcastItemBreak.patch b/patches/api/0020-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/unapplied/api/0020-LivingEntity-broadcastItemBreak.patch rename to patches/api/0020-LivingEntity-broadcastItemBreak.patch diff --git a/patches/unapplied/api/0021-Item-entity-immunities.patch b/patches/api/0021-Item-entity-immunities.patch similarity index 100% rename from patches/unapplied/api/0021-Item-entity-immunities.patch rename to patches/api/0021-Item-entity-immunities.patch diff --git a/patches/unapplied/api/0022-Spigot-Improve-output-of-plugins-command.patch b/patches/api/0022-Spigot-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/unapplied/api/0022-Spigot-Improve-output-of-plugins-command.patch rename to patches/api/0022-Spigot-Improve-output-of-plugins-command.patch diff --git a/patches/unapplied/api/0023-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/api/0023-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 88% rename from patches/unapplied/api/0023-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/api/0023-Add-option-to-disable-zombie-aggressiveness-towards-.patch index bbd20116a..916ccb8d5 100644 --- a/patches/unapplied/api/0023-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/api/0023-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index ed8edd7fe6e88141a1b4cbb0bf4d17ebb1bbf554..e86034d886a763907145be32eb33718726cf4b79 100644 +index fff199d014f93c6655b3d756bcc6fe986c97a81c..48605ace47735eb425bff0cd044455b6893d7ecb 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -201,6 +201,8 @@ public interface VanillaGoal extends Goal { +@@ -202,6 +202,8 @@ public interface VanillaGoal extends Goal { GoalKey HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider")); GoalKey FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal")); GoalKey ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal")); diff --git a/patches/unapplied/api/0024-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0024-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/unapplied/api/0024-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/api/0024-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/unapplied/api/0025-Alphabetize-in-game-plugins-list.patch b/patches/api/0025-Alphabetize-in-game-plugins-list.patch similarity index 100% rename from patches/unapplied/api/0025-Alphabetize-in-game-plugins-list.patch rename to patches/api/0025-Alphabetize-in-game-plugins-list.patch diff --git a/patches/unapplied/api/0026-Rabid-Wolf-API.patch b/patches/api/0026-Rabid-Wolf-API.patch similarity index 91% rename from patches/unapplied/api/0026-Rabid-Wolf-API.patch rename to patches/api/0026-Rabid-Wolf-API.patch index c7ca483e3..85ee94543 100644 --- a/patches/unapplied/api/0026-Rabid-Wolf-API.patch +++ b/patches/api/0026-Rabid-Wolf-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Rabid Wolf API diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index e86034d886a763907145be32eb33718726cf4b79..0f8f55685fff69b8cf5e1d4771bfda84980d0f74 100644 +index 48605ace47735eb425bff0cd044455b6893d7ecb..6c0ac9c262a3f4469d2eba7f7af6a6fafb2ada1a 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -203,6 +203,7 @@ public interface VanillaGoal extends Goal { +@@ -204,6 +204,7 @@ public interface VanillaGoal extends Goal { GoalKey ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal")); GoalKey DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager")); GoalKey ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager")); diff --git a/patches/unapplied/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch similarity index 98% rename from patches/unapplied/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch rename to patches/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch index bf13df036..31085db5e 100644 --- a/patches/unapplied/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch +++ b/patches/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch @@ -489,10 +489,10 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c6b478fe41dcd6017571c68f3114442f3c9f6415..cc82fdb614110d32b8efb1d3d8a337776dfbf0fd 100644 +index 1910f88c155c6d19d02494e4fea2b86509235e5a..7e138e0b7d9c0ced83911035c1d8a956e432b304 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1688,6 +1688,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1700,6 +1700,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi UnsafeValues getUnsafe(); // Spigot start @@ -503,7 +503,7 @@ index c6b478fe41dcd6017571c68f3114442f3c9f6415..cc82fdb614110d32b8efb1d3d8a33777 @NotNull diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 014c9984018ad5e51a26228a137e1ba4eb3e80c8..a39c0da1663f53b828bb35e662dd81df63b9d045 100644 +index c8c2e5bc2ec1d8d7ea445a1203c9d5a904dfc666..61f682f068749de11320e7b02244fbe6aeb38888 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -87,6 +87,8 @@ public interface UnsafeValues { @@ -515,7 +515,7 @@ index 014c9984018ad5e51a26228a137e1ba4eb3e80c8..a39c0da1663f53b828bb35e662dd81df */ default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher(); -@@ -113,6 +115,8 @@ public interface UnsafeValues { +@@ -105,6 +107,8 @@ public interface UnsafeValues { /** * Return the translation key for the Material, so the client can translate it into the active * locale when using a {@link net.kyori.adventure.text.TranslatableComponent}. @@ -524,7 +524,7 @@ index 014c9984018ad5e51a26228a137e1ba4eb3e80c8..a39c0da1663f53b828bb35e662dd81df * @return the translation key */ String getTranslationKey(Material mat); -@@ -120,6 +124,8 @@ public interface UnsafeValues { +@@ -112,6 +116,8 @@ public interface UnsafeValues { /** * Return the translation key for the Block, so the client can translate it into the active * locale when using a {@link net.kyori.adventure.text.TranslatableComponent}. @@ -533,7 +533,7 @@ index 014c9984018ad5e51a26228a137e1ba4eb3e80c8..a39c0da1663f53b828bb35e662dd81df * @return the translation key */ String getTranslationKey(org.bukkit.block.Block block); -@@ -128,6 +134,8 @@ public interface UnsafeValues { +@@ -120,6 +126,8 @@ public interface UnsafeValues { * Return the translation key for the EntityType, so the client can translate it into the active * locale when using a {@link net.kyori.adventure.text.TranslatableComponent}.
* This is null, when the EntityType isn't known to NMS (custom entities) @@ -542,7 +542,7 @@ index 014c9984018ad5e51a26228a137e1ba4eb3e80c8..a39c0da1663f53b828bb35e662dd81df * @return the translation key */ String getTranslationKey(org.bukkit.entity.EntityType type); -@@ -143,6 +151,8 @@ public interface UnsafeValues { +@@ -135,6 +143,8 @@ public interface UnsafeValues { * Creates and returns the next EntityId available. *

* Use this when sending custom packets, so that there are no collisions on the client or server. @@ -588,7 +588,7 @@ index 14986911b4d0099ea2c91ab2196a771b7dee4c50..d1eed20ea3b27f0800a08b42b62aac40 @NotNull public static WorldCreator ofKey(@NotNull NamespacedKey worldKey) { diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 70caaf05be813ba390412714ba0a39981edc2475..c4729769893fd3243ad60f4ad1bb3d7563ff775f 100644 +index 0dd0beee6800fb34520dfa2d05e5bdda76624d64..bd91840378e036b99bb8e038e91a56d2165c193d 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -184,6 +184,9 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran @@ -668,7 +668,7 @@ index 70274f2e2a1d6f27c4febd9d5d5fa3ee1b49f100..3b98e6e3e6dea0df5fb9462c78e8c142 /** diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java -index 39ce012fcf2b22471a2ace9218f4f696ec93f466..4c6b35c9d8c046b3b3e0cea5063e0e3d9f2fa946 100644 +index e330a0d2be7a73ff84ec18499de6aecbceb5166c..4ed780ff1131ee013b8107ec4d7266be86683518 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -62,6 +62,9 @@ public interface CommandSender extends net.kyori.adventure.audience.Audience, Pe @@ -787,7 +787,7 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..f76ddd80f9fc926f73b1cc50f0a2767a /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index f1740d0d50e251fa029f22eeaacf2a68b3cd2e96..6fdb484f7eda40155898849cb5ae963f75fafa40 100644 +index 0de88cfff94a17ff41d28b569b8d283ad8bf0b49..55a40189d92b2bdf60023c1cc6096cc37dbb1630 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -668,6 +668,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -921,10 +921,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 9bc534cdb64ed772429a32468e9a1fbfda0e93c9..8645cf0dd055b68d7ce49aaf93e4d6c680feca8a 100644 +index 081713363eaee99b9332f05e8d7afc218a044754..fb4d5be0a972a5a8d441a628d796d6ada86cfe79 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2121,6 +2121,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2120,6 +2120,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void resetCooldown(); /** @@ -933,7 +933,7 @@ index 9bc534cdb64ed772429a32468e9a1fbfda0e93c9..8645cf0dd055b68d7ce49aaf93e4d6c6 * @return the client option value of the player */ @NotNull -@@ -2152,6 +2154,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2151,6 +2153,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM // Paper end // Spigot start diff --git a/patches/unapplied/api/0028-PlayerBookTooLargeEvent.patch b/patches/api/0028-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/unapplied/api/0028-PlayerBookTooLargeEvent.patch rename to patches/api/0028-PlayerBookTooLargeEvent.patch diff --git a/patches/unapplied/api/0029-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0029-Full-netherite-armor-grants-fire-resistance.patch similarity index 100% rename from patches/unapplied/api/0029-Full-netherite-armor-grants-fire-resistance.patch rename to patches/api/0029-Full-netherite-armor-grants-fire-resistance.patch diff --git a/patches/unapplied/api/0030-Add-EntityTeleportHinderedEvent.patch b/patches/api/0030-Add-EntityTeleportHinderedEvent.patch similarity index 100% rename from patches/unapplied/api/0030-Add-EntityTeleportHinderedEvent.patch rename to patches/api/0030-Add-EntityTeleportHinderedEvent.patch diff --git a/patches/unapplied/api/0031-Add-StructureGenerateEvent.patch b/patches/api/0031-Add-StructureGenerateEvent.patch similarity index 100% rename from patches/unapplied/api/0031-Add-StructureGenerateEvent.patch rename to patches/api/0031-Add-StructureGenerateEvent.patch diff --git a/patches/unapplied/api/0032-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch similarity index 94% rename from patches/unapplied/api/0032-Conflict-on-change-for-adventure-deprecations.patch rename to patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch index 397cd68d8..24759d248 100644 --- a/patches/unapplied/api/0032-Conflict-on-change-for-adventure-deprecations.patch +++ b/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Conflict on change for adventure deprecations diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index af9fa63eca06a80f19578a2590a3280948b297ae..5d20d91f44a9f0f94183eaea300d1033f292a28e 100644 +index a8fc16f2fa6713a4cbe75c17a8e6743f69c383d5..167d8fa9f8cb5ee67149da3b9b63c613668f20b0 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -347,7 +347,7 @@ public final class Bukkit { +@@ -370,7 +370,7 @@ public final class Bukkit { * @return the number of players * @deprecated in favour of {@link Server#broadcast(net.kyori.adventure.text.Component)} */ @@ -17,7 +17,7 @@ index af9fa63eca06a80f19578a2590a3280948b297ae..5d20d91f44a9f0f94183eaea300d1033 public static int broadcastMessage(@NotNull String message) { return server.broadcastMessage(message); } -@@ -1067,7 +1067,7 @@ public final class Bukkit { +@@ -1099,7 +1099,7 @@ public final class Bukkit { * @return number of message recipients * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)} */ @@ -26,7 +26,7 @@ index af9fa63eca06a80f19578a2590a3280948b297ae..5d20d91f44a9f0f94183eaea300d1033 public static int broadcast(@NotNull String message, @NotNull String permission) { return server.broadcast(message, permission); } -@@ -1346,7 +1346,7 @@ public final class Bukkit { +@@ -1378,7 +1378,7 @@ public final class Bukkit { * * @see InventoryType#isCreatable() */ @@ -35,7 +35,7 @@ index af9fa63eca06a80f19578a2590a3280948b297ae..5d20d91f44a9f0f94183eaea300d1033 @NotNull public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) { return server.createInventory(owner, type, title); -@@ -1396,7 +1396,7 @@ public final class Bukkit { +@@ -1428,7 +1428,7 @@ public final class Bukkit { * @throws IllegalArgumentException if the size is not a multiple of 9 * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)} */ @@ -44,7 +44,7 @@ index af9fa63eca06a80f19578a2590a3280948b297ae..5d20d91f44a9f0f94183eaea300d1033 @NotNull public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException { return server.createInventory(owner, size, title); -@@ -1423,7 +1423,7 @@ public final class Bukkit { +@@ -1455,7 +1455,7 @@ public final class Bukkit { * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)} */ @NotNull @@ -53,7 +53,7 @@ index af9fa63eca06a80f19578a2590a3280948b297ae..5d20d91f44a9f0f94183eaea300d1033 public static Merchant createMerchant(@Nullable String title) { return server.createMerchant(title); } -@@ -1521,7 +1521,7 @@ public final class Bukkit { +@@ -1553,7 +1553,7 @@ public final class Bukkit { * @deprecated in favour of {@link #motd()} */ @NotNull @@ -62,7 +62,7 @@ index af9fa63eca06a80f19578a2590a3280948b297ae..5d20d91f44a9f0f94183eaea300d1033 public static String getMotd() { return server.getMotd(); } -@@ -1543,7 +1543,7 @@ public final class Bukkit { +@@ -1575,7 +1575,7 @@ public final class Bukkit { * @deprecated in favour of {@link #shutdownMessage()} */ @Nullable @@ -72,10 +72,10 @@ index af9fa63eca06a80f19578a2590a3280948b297ae..5d20d91f44a9f0f94183eaea300d1033 return server.getShutdownMessage(); } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index cc82fdb614110d32b8efb1d3d8a337776dfbf0fd..4d15d4b5b23d38599ab227dc1c2a9c25a077e531 100644 +index 7e138e0b7d9c0ced83911035c1d8a956e432b304..c641822847c8f5c3753fa5a4ea97d86fa44b1fa0 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -271,7 +271,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -290,7 +290,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the number of players * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)} */ @@ -84,7 +84,7 @@ index cc82fdb614110d32b8efb1d3d8a337776dfbf0fd..4d15d4b5b23d38599ab227dc1c2a9c25 public int broadcastMessage(@NotNull String message); // Paper start -@@ -865,7 +865,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -891,7 +891,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return number of message recipients * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)} */ @@ -93,7 +93,7 @@ index cc82fdb614110d32b8efb1d3d8a337776dfbf0fd..4d15d4b5b23d38599ab227dc1c2a9c25 public int broadcast(@NotNull String message, @NotNull String permission); // Paper start /** -@@ -1129,7 +1129,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1155,7 +1155,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @see InventoryType#isCreatable() */ @@ -102,7 +102,7 @@ index cc82fdb614110d32b8efb1d3d8a337776dfbf0fd..4d15d4b5b23d38599ab227dc1c2a9c25 @NotNull Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title); -@@ -1173,7 +1173,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1199,7 +1199,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @throws IllegalArgumentException if the size is not a multiple of 9 * @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)} */ @@ -111,7 +111,7 @@ index cc82fdb614110d32b8efb1d3d8a337776dfbf0fd..4d15d4b5b23d38599ab227dc1c2a9c25 @NotNull Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException; -@@ -1196,7 +1196,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1222,7 +1222,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)} */ @NotNull @@ -120,7 +120,7 @@ index cc82fdb614110d32b8efb1d3d8a337776dfbf0fd..4d15d4b5b23d38599ab227dc1c2a9c25 Merchant createMerchant(@Nullable String title); /** -@@ -1276,7 +1276,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1302,7 +1302,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @deprecated in favour of {@link #motd()} */ @NotNull @@ -129,7 +129,7 @@ index cc82fdb614110d32b8efb1d3d8a337776dfbf0fd..4d15d4b5b23d38599ab227dc1c2a9c25 String getMotd(); // Paper start -@@ -1294,7 +1294,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1320,7 +1320,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @deprecated in favour of {@link #shutdownMessage()} */ @Nullable @@ -170,10 +170,10 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981 /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09f8b43db5 100644 +index fb4d5be0a972a5a8d441a628d796d6ada86cfe79..2b2c36e950f1518c795208157f52211a2e93f467 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -74,7 +74,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 @NotNull public String getDisplayName(); -@@ -88,7 +88,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 public void setDisplayName(@Nullable String name); // Paper start -@@ -129,7 +129,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 public String getPlayerListName(); /** -@@ -140,7 +140,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 public void setPlayerListName(@Nullable String name); /** -@@ -149,7 +149,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 @Nullable public String getPlayerListHeader(); -@@ -159,7 +159,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 @Nullable public String getPlayerListFooter(); -@@ -169,7 +169,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 public void setPlayerListHeader(@Nullable String header); /** -@@ -178,7 +178,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 public void setPlayerListFooter(@Nullable String footer); /** -@@ -189,7 +189,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer); /** -@@ -229,7 +229,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 public void kickPlayer(@Nullable String message); // Paper start -@@ -677,7 +677,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -669,7 +669,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException; /** -@@ -698,7 +698,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -690,7 +690,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 8645cf0dd055b68d7ce49aaf93e4d6c680feca8a..6bb80577801e4d37b213f7c160bd3c09 public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException; /** -@@ -1871,7 +1871,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1863,7 +1863,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @deprecated in favour of {@link #locale()} */ @NotNull @@ -591,10 +591,10 @@ index 4f8c85222c7bd33217c7db0ff5f47bf397f8f3e5..c18d6d979bd22814ebdc52b995d2cc7e this.message = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(message); // Paper } diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java -index ede5a41bc071a9c9cea369b227b37a50222f295d..6c6501d73041a6c69e78f34d3bf2a96a7de5f690 100644 +index fd4db14bef92b893ddaf5424e14ee71da22dcf84..dd7d8d8f2f848bdc1c224805afe0b03fb80fe5cd 100644 --- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java -@@ -109,7 +109,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable +@@ -113,7 +113,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable * @deprecated in favour of {@link #motd()} */ @NotNull @@ -603,7 +603,7 @@ index ede5a41bc071a9c9cea369b227b37a50222f295d..6c6501d73041a6c69e78f34d3bf2a96a public String getMotd() { return org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.motd); // Paper } -@@ -120,7 +120,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable +@@ -124,7 +124,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable * @param motd the message of the day * @deprecated in favour of {@link #motd(net.kyori.adventure.text.Component)} */ @@ -746,7 +746,7 @@ index ed0bc2024a0bb85837e25f75ae89d1fe257b2e60..f6e831f844e1fe99a2617bd64c2290d1 this.caption = caption == null ? null : org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(caption); // Paper } diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java -index 6279957b9bc6d22881f092eabf3a99831d85e3ee..24019ed4ff289b9d33da39cee66ea91831bc33c0 100644 +index 75acd6f8f3d774bb79e8e513125e801c5569a244..1eccadd957867e0c5d59a157e16bd4e5557caf68 100644 --- a/src/main/java/org/bukkit/scoreboard/Objective.java +++ b/src/main/java/org/bukkit/scoreboard/Objective.java @@ -47,7 +47,7 @@ public interface Objective { @@ -768,7 +768,7 @@ index 6279957b9bc6d22881f092eabf3a99831d85e3ee..24019ed4ff289b9d33da39cee66ea918 /** diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java -index 93089ce61d2e1888df13b7c9629a79cd6f5f767a..ea0480064068f34ea34d4b68ef12d0f860e58d80 100644 +index f7754ab421c7b452a53c28d1e2fafdccfbba24bf..05026b8bc3d41f0391f7c7a59b56aab899537a3e 100644 --- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java +++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java @@ -89,7 +89,7 @@ public interface Scoreboard { diff --git a/patches/unapplied/api/0033-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0033-Add-enchantment-target-for-bows-and-crossbows.patch similarity index 100% rename from patches/unapplied/api/0033-Add-enchantment-target-for-bows-and-crossbows.patch rename to patches/api/0033-Add-enchantment-target-for-bows-and-crossbows.patch diff --git a/patches/unapplied/api/0034-Iron-golem-poppy-calms-anger.patch b/patches/api/0034-Iron-golem-poppy-calms-anger.patch similarity index 86% rename from patches/unapplied/api/0034-Iron-golem-poppy-calms-anger.patch rename to patches/api/0034-Iron-golem-poppy-calms-anger.patch index ef44b01f5..ecf1347c5 100644 --- a/patches/unapplied/api/0034-Iron-golem-poppy-calms-anger.patch +++ b/patches/api/0034-Iron-golem-poppy-calms-anger.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Iron golem poppy calms anger diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index 0f8f55685fff69b8cf5e1d4771bfda84980d0f74..c7786c4ce66c04b477ab720b2f2dd2589e8e9b98 100644 +index 6c0ac9c262a3f4469d2eba7f7af6a6fafb2ada1a..2b2fd0da10b84a2a93629a8fbd60f1258d45b3ee 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -@@ -204,6 +204,7 @@ public interface VanillaGoal extends Goal { +@@ -205,6 +205,7 @@ public interface VanillaGoal extends Goal { GoalKey DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager")); GoalKey ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager")); GoalKey AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf")); diff --git a/patches/unapplied/api/0035-API-for-any-mob-to-burn-daylight.patch b/patches/api/0035-API-for-any-mob-to-burn-daylight.patch similarity index 91% rename from patches/unapplied/api/0035-API-for-any-mob-to-burn-daylight.patch rename to patches/api/0035-API-for-any-mob-to-burn-daylight.patch index 7ddacd47b..6c3992d21 100644 --- a/patches/unapplied/api/0035-API-for-any-mob-to-burn-daylight.patch +++ b/patches/api/0035-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 6fdb484f7eda40155898849cb5ae963f75fafa40..52b3ba61bd58bdee339ecabeb047564aeaa46bdc 100644 +index 55a40189d92b2bdf60023c1cc6096cc37dbb1630..037b6923f6e548619e5d196b6fa93bfb0dcab8a1 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -842,5 +842,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -815,5 +815,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if ridable in water */ boolean isRidableInWater(); diff --git a/patches/unapplied/api/0036-Flying-Fall-Damage-API.patch b/patches/api/0036-Flying-Fall-Damage-API.patch similarity index 87% rename from patches/unapplied/api/0036-Flying-Fall-Damage-API.patch rename to patches/api/0036-Flying-Fall-Damage-API.patch index a091e4e84..ff59d4013 100644 --- a/patches/unapplied/api/0036-Flying-Fall-Damage-API.patch +++ b/patches/api/0036-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 6bb80577801e4d37b213f7c160bd3c09f8b43db5..639b2e49ffdf9c9bc20f7af177614b35699ac539 100644 +index 2b2c36e950f1518c795208157f52211a2e93f467..d4f66b338ecfe8c1bdcd8f5763e61539923c7efc 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2344,5 +2344,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2343,5 +2343,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param invulnerableTicks Invulnerable ticks remaining */ void setSpawnInvulnerableTicks(int invulnerableTicks); diff --git a/patches/unapplied/api/0037-Add-back-player-spawned-endermite-API.patch b/patches/api/0037-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/unapplied/api/0037-Add-back-player-spawned-endermite-API.patch rename to patches/api/0037-Add-back-player-spawned-endermite-API.patch diff --git a/patches/unapplied/api/0038-Fix-default-permission-system.patch b/patches/api/0038-Fix-default-permission-system.patch similarity index 94% rename from patches/unapplied/api/0038-Fix-default-permission-system.patch rename to patches/api/0038-Fix-default-permission-system.patch index e5cf5acd3..754c4e1e3 100644 --- a/patches/unapplied/api/0038-Fix-default-permission-system.patch +++ b/patches/api/0038-Fix-default-permission-system.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix default permission system diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java -index c94e4cdb5785d5dfcb704c4adabda0b19a20ec7d..0c154e748fe957152777869679bdbdce1524a5a1 100644 +index cd3296fea01648592d2af89b3d80135acb6d0958..45797a6fbae1d8edc4211cb30def24ad4f59bd49 100644 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java -@@ -172,7 +172,7 @@ public class PermissibleBase implements Permissible { +@@ -168,7 +168,7 @@ public class PermissibleBase implements Permissible { for (Permission perm : defaults) { String name = perm.getName().toLowerCase(java.util.Locale.ENGLISH); @@ -17,7 +17,7 @@ index c94e4cdb5785d5dfcb704c4adabda0b19a20ec7d..0c154e748fe957152777869679bdbdce Bukkit.getServer().getPluginManager().subscribeToPermission(name, parent); calculateChildPermissions(perm.getChildren(), false, null); } -@@ -200,7 +200,7 @@ public class PermissibleBase implements Permissible { +@@ -196,7 +196,7 @@ public class PermissibleBase implements Permissible { String name = entry.getKey(); Permission perm = Bukkit.getServer().getPluginManager().getPermission(name); diff --git a/patches/unapplied/api/0039-Summoner-API.patch b/patches/api/0039-Summoner-API.patch similarity index 100% rename from patches/unapplied/api/0039-Summoner-API.patch rename to patches/api/0039-Summoner-API.patch diff --git a/patches/unapplied/api/0040-Clean-up-version-command-output-for-console.patch b/patches/api/0040-Clean-up-version-command-output-for-console.patch similarity index 100% rename from patches/unapplied/api/0040-Clean-up-version-command-output-for-console.patch rename to patches/api/0040-Clean-up-version-command-output-for-console.patch diff --git a/patches/unapplied/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch similarity index 97% rename from patches/unapplied/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch rename to patches/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch index 29a0d8be8..7eb4ab618 100644 --- a/patches/unapplied/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch +++ b/patches/api/0041-Add-force-and-prompt-parameters-to-resource-pack-api.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 639b2e49ffdf9c9bc20f7af177614b35699ac539..2d8ade668c63a72f42ae8e4cdbece22c3686b721 100644 +index d4f66b338ecfe8c1bdcd8f5763e61539923c7efc..40f56815ecee852582b5ed5a86393bee69d90b91 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1494,6 +1494,88 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1486,6 +1486,88 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void setResourcePack(@NotNull String url, @NotNull byte[] hash); diff --git a/patches/unapplied/api/0042-Extended-OfflinePlayer-API.patch b/patches/api/0042-Extended-OfflinePlayer-API.patch similarity index 100% rename from patches/unapplied/api/0042-Extended-OfflinePlayer-API.patch rename to patches/api/0042-Extended-OfflinePlayer-API.patch diff --git a/patches/unapplied/api/0043-Added-the-ability-to-add-combustible-items.patch b/patches/api/0043-Added-the-ability-to-add-combustible-items.patch similarity index 88% rename from patches/unapplied/api/0043-Added-the-ability-to-add-combustible-items.patch rename to patches/api/0043-Added-the-ability-to-add-combustible-items.patch index 5ec2d0dc5..dbcd994dd 100644 --- a/patches/unapplied/api/0043-Added-the-ability-to-add-combustible-items.patch +++ b/patches/api/0043-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 5d20d91f44a9f0f94183eaea300d1033f292a28e..2e86aa13913553306512232a72497ec6b003260c 100644 +index 167d8fa9f8cb5ee67149da3b9b63c613668f20b0..cdfda28119cb1c1f22ec42a37546413b3e4af8da 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2137,5 +2137,24 @@ public final class Bukkit { +@@ -2139,5 +2139,24 @@ public final class Bukkit { public static boolean isLagging() { return server.isLagging(); } @@ -34,7 +34,7 @@ index 5d20d91f44a9f0f94183eaea300d1033f292a28e..2e86aa13913553306512232a72497ec6 // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 4d15d4b5b23d38599ab227dc1c2a9c25a077e531..ccfb8a8dcd51bf998c79298a22e38cebb2be6d39 100644 +index c641822847c8f5c3753fa5a4ea97d86fa44b1fa0..f3b6ba687e3d96fbee592465977df29338dd9a27 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1867,5 +1867,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi