diff --git a/patches/api/0053-Fix-upstream-javadoc-warnings-and-errors.patch b/patches/api/0053-Fix-upstream-javadocs.patch similarity index 63% rename from patches/api/0053-Fix-upstream-javadoc-warnings-and-errors.patch rename to patches/api/0053-Fix-upstream-javadocs.patch index cf1fd5708d..2f2c092e6e 100644 --- a/patches/api/0053-Fix-upstream-javadoc-warnings-and-errors.patch +++ b/patches/api/0053-Fix-upstream-javadocs.patch @@ -1,10 +1,36 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 10 Jun 2017 16:59:40 -0500 -Subject: [PATCH] Fix upstream javadoc warnings and errors +Subject: [PATCH] Fix upstream javadocs Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues. +diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java +index 02045103fc776a149cd05a779461acb6164b656f..03f5d90d58617d463cb15e0b1d5b7bd76d8f4b21 100644 +--- a/src/main/java/org/bukkit/Bukkit.java ++++ b/src/main/java/org/bukkit/Bukkit.java +@@ -1123,6 +1123,8 @@ public final class Bukkit { + + /** + * Gets every player that has ever played on this server. ++ *

++ * This method can be expensive as it loads all the player data files from the disk. + * + * @return an array containing all previous players + */ +diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java +index 1d13a4c289e6a764b3b080455a86e17a5e60929e..294b6092b438ad3d09bf3ad28d08ffdfdda4ac5c 100644 +--- a/src/main/java/org/bukkit/Server.java ++++ b/src/main/java/org/bukkit/Server.java +@@ -945,6 +945,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + + /** + * Gets every player that has ever played on this server. ++ *

++ * This method can be expensive as it loads all the player data files from the disk. + * + * @return an array containing all previous players + */ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java index 9d5c5b5f7d7ae4f0278410833d9d385242872498..2301a5c6ada86b63b1c0207a6d89b0da4c167bbb 100644 --- a/src/main/java/org/bukkit/entity/Player.java diff --git a/patches/api/0057-Basic-PlayerProfile-API.patch b/patches/api/0057-Basic-PlayerProfile-API.patch index 78b5ea245d..2ba01359a9 100644 --- a/patches/api/0057-Basic-PlayerProfile-API.patch +++ b/patches/api/0057-Basic-PlayerProfile-API.patch @@ -267,10 +267,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 02045103fc776a149cd05a779461acb6164b656f..fc29c3982b80f70ba7eb37262f3ba3b9dcdfdbcd 100644 +index 03f5d90d58617d463cb15e0b1d5b7bd76d8f4b21..faa02f8ad00d1634c75f5372740b6cefdf9cb94e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1857,6 +1857,40 @@ public final class Bukkit { +@@ -1859,6 +1859,40 @@ public final class Bukkit { public static boolean suggestPlayerNamesWhenNullTabCompletions() { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -312,10 +312,10 @@ index 02045103fc776a149cd05a779461acb6164b656f..fc29c3982b80f70ba7eb37262f3ba3b9 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 1d13a4c289e6a764b3b080455a86e17a5e60929e..e1123bd39196c5ca81b4e0b7da633f41d9485091 100644 +index 294b6092b438ad3d09bf3ad28d08ffdfdda4ac5c..8ad09e03927acebfd3eb17c0e7fe390eeadd2a28 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1633,5 +1633,33 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1635,5 +1635,33 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return true if player names should be suggested */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/patches/api/0164-Make-the-default-permission-message-configurable.patch b/patches/api/0164-Make-the-default-permission-message-configurable.patch index 90d28841db..c15acc84b7 100644 --- a/patches/api/0164-Make-the-default-permission-message-configurable.patch +++ b/patches/api/0164-Make-the-default-permission-message-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 922431356145b3abb154812c4593ed87d5383b06..6aabf764231d29b0d9c83c0c40e1088c34d6f168 100644 +index 85bdfecaecbb2303f55742d024aa3b1d4f89dcf6..d8c6d6252e79ee7d4c2a1ba4618e833772192c12 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1872,6 +1872,15 @@ public final class Bukkit { +@@ -1874,6 +1874,15 @@ public final class Bukkit { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -25,10 +25,10 @@ index 922431356145b3abb154812c4593ed87d5383b06..6aabf764231d29b0d9c83c0c40e1088c * Creates a PlayerProfile for the specified uuid, with name as null * @param uuid UUID to create profile for diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 9a44e497ae0c027acd39566681833b992e4e274b..f5f41fb37fd8dbdcffe47eefa939aecdad8210c0 100644 +index 01f48e15bf502b4e8bd415bf606bbe22b2343380..4c7ceb92bd529e263b08ce53a8fcdfe91d4e5136 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1646,6 +1646,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1648,6 +1648,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/patches/api/0178-Fix-Spigot-annotation-mistakes.patch b/patches/api/0178-Fix-Spigot-annotation-mistakes.patch index cf9a383aca..791e3f3ca4 100644 --- a/patches/api/0178-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0178-Fix-Spigot-annotation-mistakes.patch @@ -9,10 +9,10 @@ a ton of noise to plugin developers. These do not help plugin developers if they bring moise noise than value. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6aabf764231d29b0d9c83c0c40e1088c34d6f168..228a7874bc8c280c43971a89ba9cbb14f7d10cb0 100644 +index d8c6d6252e79ee7d4c2a1ba4618e833772192c12..cb3cecd97217a6c282e7a5fcacb7099dc08183b2 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1468,7 +1468,7 @@ public final class Bukkit { +@@ -1470,7 +1470,7 @@ public final class Bukkit { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -21,7 +21,7 @@ index 6aabf764231d29b0d9c83c0c40e1088c34d6f168..228a7874bc8c280c43971a89ba9cbb14 public static ScoreboardManager getScoreboardManager() { return server.getScoreboardManager(); } -@@ -1765,7 +1765,7 @@ public final class Bukkit { +@@ -1767,7 +1767,7 @@ public final class Bukkit { * @param clazz the class of the tag entries * @return the tag or null */ @@ -62,10 +62,10 @@ index 88b3e0323dbc4f0fce31b147c7aaa08d65745852..23ca89dde7f6ac9082d4b97fce295942 if (this.world == null) { return null; diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f5f41fb37fd8dbdcffe47eefa939aecdad8210c0..878b1b196e9b0ba7f8688f6741dcce1f6bfe6cb3 100644 +index 4c7ceb92bd529e263b08ce53a8fcdfe91d4e5136..6636a5192b48cde5a8cf5fe16d6d31596f33be47 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1242,7 +1242,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1244,7 +1244,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -74,7 +74,7 @@ index f5f41fb37fd8dbdcffe47eefa939aecdad8210c0..878b1b196e9b0ba7f8688f6741dcce1f ScoreboardManager getScoreboardManager(); /** -@@ -1512,7 +1512,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1514,7 +1514,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param clazz the class of the tag entries * @return the tag or null */ diff --git a/patches/api/0186-Expose-the-internal-current-tick.patch b/patches/api/0186-Expose-the-internal-current-tick.patch index 173c927126..fe7f0e9b55 100644 --- a/patches/api/0186-Expose-the-internal-current-tick.patch +++ b/patches/api/0186-Expose-the-internal-current-tick.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 228a7874bc8c280c43971a89ba9cbb14f7d10cb0..a99486ee6bedd9743ee8aa34f32b73aebab74bc7 100644 +index cb3cecd97217a6c282e7a5fcacb7099dc08183b2..4a45ae0ebedb1b45c7167a8a8b9a79797302eea8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1914,6 +1914,10 @@ public final class Bukkit { +@@ -1916,6 +1916,10 @@ public final class Bukkit { public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) { return server.createProfile(uuid, name); } @@ -20,10 +20,10 @@ index 228a7874bc8c280c43971a89ba9cbb14f7d10cb0..a99486ee6bedd9743ee8aa34f32b73ae @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index a09513f74b3fb9790958f40a7ebef952f9e304f2..14838cf97760b3b4de07bad24e30dfa851cb468f 100644 +index 6636a5192b48cde5a8cf5fe16d6d31596f33be47..de0bf2b6b4ca4cc5ca3f53fb195db9fcd8000894 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1680,5 +1680,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1682,5 +1682,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name); diff --git a/patches/api/0193-Add-tick-times-API.patch b/patches/api/0193-Add-tick-times-API.patch index d1a0e5e6d6..ad0500cfc8 100644 --- a/patches/api/0193-Add-tick-times-API.patch +++ b/patches/api/0193-Add-tick-times-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index a99486ee6bedd9743ee8aa34f32b73aebab74bc7..00bdd2f71f3ccde3fa64b597dc9c926319b96519 100644 +index 4a45ae0ebedb1b45c7167a8a8b9a79797302eea8..9a5888032602616996a27aa93dbe3b89356acd05 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1669,6 +1669,25 @@ public final class Bukkit { +@@ -1671,6 +1671,25 @@ public final class Bukkit { public static double[] getTPS() { return server.getTPS(); } @@ -35,10 +35,10 @@ index a99486ee6bedd9743ee8aa34f32b73aebab74bc7..00bdd2f71f3ccde3fa64b597dc9c9263 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 14838cf97760b3b4de07bad24e30dfa851cb468f..d7b4d1deda0d02deb96e33917f1b013c6dbee98d 100644 +index de0bf2b6b4ca4cc5ca3f53fb195db9fcd8000894..685b4af3a0a041c4c65e3435f42ab83d2feb5d4e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1416,6 +1416,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1418,6 +1418,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull public double[] getTPS(); diff --git a/patches/api/0194-Expose-MinecraftServer-isRunning.patch b/patches/api/0194-Expose-MinecraftServer-isRunning.patch index 1bcc12f082..91b1ca18c8 100644 --- a/patches/api/0194-Expose-MinecraftServer-isRunning.patch +++ b/patches/api/0194-Expose-MinecraftServer-isRunning.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 00bdd2f71f3ccde3fa64b597dc9c926319b96519..96039e4f17dd2860bf78ccfca4656da1129ef5af 100644 +index 9a5888032602616996a27aa93dbe3b89356acd05..eb82ccb5923847bbb48972e8145a12cb5dcedd17 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1937,6 +1937,15 @@ public final class Bukkit { +@@ -1939,6 +1939,15 @@ public final class Bukkit { public static int getCurrentTick() { return server.getCurrentTick(); } @@ -26,10 +26,10 @@ index 00bdd2f71f3ccde3fa64b597dc9c926319b96519..96039e4f17dd2860bf78ccfca4656da1 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d7b4d1deda0d02deb96e33917f1b013c6dbee98d..6ee70b7be4cf04d74f8941c321e08105d86d4edf 100644 +index 685b4af3a0a041c4c65e3435f42ab83d2feb5d4e..300779fe31a71be182edde10fd3beac812fae504 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1702,5 +1702,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1704,5 +1704,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return Current tick */ int getCurrentTick(); diff --git a/patches/api/0203-Add-Mob-Goal-API.patch b/patches/api/0203-Add-Mob-Goal-API.patch index 7e587739b5..7f1d34acf5 100644 --- a/patches/api/0203-Add-Mob-Goal-API.patch +++ b/patches/api/0203-Add-Mob-Goal-API.patch @@ -520,10 +520,10 @@ index 0000000000000000000000000000000000000000..fb0c77c66ca117eaff9487a41f1e280a + @Deprecated GoalKey UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset")); +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 152ba4281d730643957ead601a91beefce7893da..f9f9a3f0689e6494bd56f288319930018052c38b 100644 +index eb82ccb5923847bbb48972e8145a12cb5dcedd17..efcbc1e667fab15a55fe44b234dc9713aec895f2 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1946,6 +1946,16 @@ public final class Bukkit { +@@ -1948,6 +1948,16 @@ public final class Bukkit { public static boolean isStopping() { return server.isStopping(); } @@ -541,10 +541,10 @@ index 152ba4281d730643957ead601a91beefce7893da..f9f9a3f0689e6494bd56f28831993001 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b45551e606369f69a3777d15c35ffa5af3dfdf67..e0b79d23f4c16505cf54afb822b2f6c370560931 100644 +index 300779fe31a71be182edde10fd3beac812fae504..b666d5f03bfb5cc91570688382f541498dd1a1c5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1709,5 +1709,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1711,5 +1711,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return true if server is in the process of being shutdown */ boolean isStopping(); diff --git a/patches/api/0217-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0217-Allow-delegation-to-vanilla-chunk-gen.patch index cf85204e56..c730d55f24 100644 --- a/patches/api/0217-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/api/0217-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 8553330a96d5902110b904da79a91c9900162adf..14200e67d00679eed47402d3789614e31e1b5514 100644 +index ba49dfc7547da0e1e408c2afc70b1f42a1beb76c..a5bad2633506ded8394f7706c0eced9c395c13e8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1569,6 +1569,22 @@ public final class Bukkit { +@@ -1571,6 +1571,22 @@ public final class Bukkit { return server.createChunkData(world); } @@ -32,10 +32,10 @@ index 8553330a96d5902110b904da79a91c9900162adf..14200e67d00679eed47402d3789614e3 * Creates a boss bar instance to display to players. The progress * defaults to 1.0 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index dbfe95698deb1a6bfcc5cebf5916f5a974b293e0..bcb584a244a7e56586571f51baa5cab35780a59e 100644 +index 2b21ffb60312cdd2033096b52155610b689f3294..a0695411d3a55babd3cb5f926c3496985ef6e402 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1327,6 +1327,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1329,6 +1329,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public ChunkGenerator.ChunkData createChunkData(@NotNull World world); diff --git a/patches/api/0302-Add-basic-Datapack-API.patch b/patches/api/0302-Add-basic-Datapack-API.patch index 183615564c..604250692d 100644 --- a/patches/api/0302-Add-basic-Datapack-API.patch +++ b/patches/api/0302-Add-basic-Datapack-API.patch @@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7 + +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6bec329379971532eaa44cc8d231c2244ed84975..85a6687be7d26215680054af1524dc946960b75a 100644 +index fa99f414c2ce515bbdb6d8ca7bb94aa2ad1f640a..76dc042f5fbac39065a97d270666f905ddc59a1c 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2028,6 +2028,14 @@ public final class Bukkit { +@@ -2030,6 +2030,14 @@ public final class Bukkit { public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() { return server.getMobGoals(); } @@ -89,10 +89,10 @@ index 6bec329379971532eaa44cc8d231c2244ed84975..85a6687be7d26215680054af1524dc94 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index dccd769cdd63f78b51caa09aaf6931a4c1882fb9..024da3febe3fd6c54aa30e99cb08300bc38ddb92 100644 +index 14dc56c8e7702e63875f6d2f8aa804a109107456..83870d54a5ff1017ad7455e9c931fdee54354434 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1780,5 +1780,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1782,5 +1782,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();