diff options
Diffstat (limited to 'patches/api/0005-Adventure.patch')
| -rw-r--r-- | patches/api/0005-Adventure.patch | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index f6719b30e8..85a8f914ad 100644 --- a/patches/api/0005-Adventure.patch +++ b/patches/api/0005-Adventure.patch @@ -763,10 +763,10 @@ index 0000000000000000000000000000000000000000..6e94562d79206d88b74b53814f9423f1 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d45d1fc74 100644 +index 1cd0bc6b58b1fe391f77b95182ed848f2e74a9a5..55b61b5971ac0848174bd4d59952408c437f0e60 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -389,7 +389,9 @@ public final class Bukkit { +@@ -390,7 +390,9 @@ public final class Bukkit { * * @param message the message * @return the number of players @@ -776,7 +776,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d public static int broadcastMessage(@NotNull String message) { return server.broadcastMessage(message); } -@@ -1105,6 +1107,19 @@ public final class Bukkit { +@@ -1181,6 +1183,19 @@ public final class Bukkit { server.shutdown(); } @@ -796,7 +796,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d /** * Broadcasts the specified message to every user with the given * permission name. -@@ -1114,6 +1129,21 @@ public final class Bukkit { +@@ -1190,6 +1205,21 @@ public final class Bukkit { * permissibles} must have to receive the broadcast * @return number of message recipients */ @@ -818,7 +818,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d public static int broadcast(@NotNull String message, @NotNull String permission) { return server.broadcast(message, permission); } -@@ -1375,6 +1405,7 @@ public final class Bukkit { +@@ -1451,6 +1481,7 @@ public final class Bukkit { return server.createInventory(owner, type); } @@ -826,7 +826,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d /** * Creates an empty inventory with the specified type and title. If the type * is {@link InventoryType#CHEST}, the new inventory has a size of 27; -@@ -1400,6 +1431,38 @@ public final class Bukkit { +@@ -1476,6 +1507,38 @@ public final class Bukkit { * @see InventoryType#isCreatable() */ @NotNull @@ -865,7 +865,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) { return server.createInventory(owner, type, title); } -@@ -1418,6 +1481,7 @@ public final class Bukkit { +@@ -1494,6 +1557,7 @@ public final class Bukkit { return server.createInventory(owner, size); } @@ -873,7 +873,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d /** * Creates an empty inventory of type {@link InventoryType#CHEST} with the * specified size and title. -@@ -1430,10 +1494,30 @@ public final class Bukkit { +@@ -1506,10 +1570,30 @@ public final class Bukkit { * @throws IllegalArgumentException if the size is not a multiple of 9 */ @NotNull @@ -904,7 +904,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d /** * Creates an empty merchant. * -@@ -1441,7 +1525,20 @@ public final class Bukkit { +@@ -1517,7 +1601,20 @@ public final class Bukkit { * when the merchant inventory is viewed * @return a new merchant */ @@ -925,7 +925,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d public static Merchant createMerchant(@Nullable String title) { return server.createMerchant(title); } -@@ -1558,12 +1655,43 @@ public final class Bukkit { +@@ -1634,12 +1731,43 @@ public final class Bukkit { return server.isPrimaryThread(); } @@ -969,7 +969,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d public static String getMotd() { return server.getMotd(); } -@@ -1572,7 +1700,9 @@ public final class Bukkit { +@@ -1648,7 +1776,9 @@ public final class Bukkit { * Set the message that is displayed on the server list. * * @param motd The message to be displayed @@ -979,7 +979,7 @@ index ffb6ff5793f8702f6974ff53b53380e00d2d4057..b7bc68c5d0dbb41c089f59b7db51342d public static void setMotd(@NotNull String motd) { server.setMotd(motd); } -@@ -1581,8 +1711,10 @@ public final class Bukkit { +@@ -1657,8 +1787,10 @@ public final class Bukkit { * Gets the default message that is displayed when the server is stopped. * * @return the shutdown message @@ -1161,10 +1161,10 @@ index ae7b51341fb66c41b8a7c4604fd273d876e311be..4034fcb9abc39b12f0de47c4b679f2ef + // Paper end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3eead8a112 100644 +index 3a0f7405a481327dd94cfb5fc693ce07c2223954..19d61b2425794b2ca4dbc76bda9e23abe97fc30d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -61,13 +61,13 @@ import org.jetbrains.annotations.Nullable; +@@ -62,13 +62,13 @@ import org.jetbrains.annotations.Nullable; /** * Represents a server implementation. */ @@ -1180,7 +1180,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e */ public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin"; -@@ -75,7 +75,7 @@ public interface Server extends PluginMessageRecipient { +@@ -76,7 +76,7 @@ public interface Server extends PluginMessageRecipient { * Used for all announcement messages, such as informing users that a * player has joined. * <p> @@ -1189,7 +1189,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e */ public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user"; -@@ -328,7 +328,9 @@ public interface Server extends PluginMessageRecipient { +@@ -329,7 +329,9 @@ public interface Server extends PluginMessageRecipient { * * @param message the message * @return the number of players @@ -1199,7 +1199,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e public int broadcastMessage(@NotNull String message); /** -@@ -946,8 +948,33 @@ public interface Server extends PluginMessageRecipient { +@@ -1015,8 +1017,33 @@ public interface Server extends PluginMessageRecipient { * @param permission the required permission {@link Permissible * permissibles} must have to receive the broadcast * @return number of message recipients @@ -1233,7 +1233,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e /** * Gets the player by the given name, regardless if they are offline or -@@ -1164,6 +1191,35 @@ public interface Server extends PluginMessageRecipient { +@@ -1233,6 +1260,35 @@ public interface Server extends PluginMessageRecipient { @NotNull Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type); @@ -1269,7 +1269,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e /** * Creates an empty inventory with the specified type and title. If the type * is {@link InventoryType#CHEST}, the new inventory has a size of 27; -@@ -1185,9 +1241,11 @@ public interface Server extends PluginMessageRecipient { +@@ -1254,9 +1310,11 @@ public interface Server extends PluginMessageRecipient { * @return The new inventory. * @throws IllegalArgumentException if the {@link InventoryType} cannot be * viewed. @@ -1281,7 +1281,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e @NotNull Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title); -@@ -1203,6 +1261,22 @@ public interface Server extends PluginMessageRecipient { +@@ -1272,6 +1330,22 @@ public interface Server extends PluginMessageRecipient { @NotNull Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException; @@ -1304,7 +1304,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e /** * Creates an empty inventory of type {@link InventoryType#CHEST} with the * specified size and title. -@@ -1213,18 +1287,32 @@ public interface Server extends PluginMessageRecipient { +@@ -1282,18 +1356,32 @@ public interface Server extends PluginMessageRecipient { * viewed * @return a new inventory * @throws IllegalArgumentException if the size is not a multiple of 9 @@ -1337,7 +1337,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e Merchant createMerchant(@Nullable String title); /** -@@ -1320,27 +1408,56 @@ public interface Server extends PluginMessageRecipient { +@@ -1389,27 +1477,56 @@ public interface Server extends PluginMessageRecipient { */ boolean isPrimaryThread(); @@ -1394,7 +1394,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e String getShutdownMessage(); /** -@@ -1722,7 +1839,9 @@ public interface Server extends PluginMessageRecipient { +@@ -1791,7 +1908,9 @@ public interface Server extends PluginMessageRecipient { * Sends the component to the player * * @param component the components to send @@ -1404,7 +1404,7 @@ index 8263a17a46c2aa7f976b37b80933acd850b9434a..e3602c6703b29ffec17ef7806c9deb3e public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1731,7 +1850,9 @@ public interface Server extends PluginMessageRecipient { +@@ -1800,7 +1919,9 @@ public interface Server extends PluginMessageRecipient { * Sends an array of components as a single message to the player * * @param components the components to send @@ -4007,13 +4007,13 @@ index e12996492c1558fed9fab30de9f8018e0ed7fac3..002acfbdce1db10f7ba1b6a013e678f5 /** diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 502a1fd398fb0dcfbaf82081a655e2efc3bf71dc..30770d03044da684aa8c79ca74796050c319f6be 100644 +index e606f63a284db71663aee667597447b875e20627..6b1c55249b39a45c33ac49bacef4e9d80ba8cc3a 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java -@@ -172,4 +172,24 @@ public interface ItemFactory { +@@ -217,4 +217,24 @@ public interface ItemFactory { */ - @Nullable - Material getSpawnEgg(@NotNull EntityType type); + @NotNull + ItemStack enchantItem(@NotNull final ItemStack item, final int level, final boolean allowTreasures); + + // Paper start - Adventure + /** |