diff --git a/patches/unapplied/api/0003-Test-changes.patch b/patches/api/0003-Test-changes.patch similarity index 100% rename from patches/unapplied/api/0003-Test-changes.patch rename to patches/api/0003-Test-changes.patch diff --git a/patches/unapplied/api/0004-Code-Generation.patch b/patches/api/0004-Code-Generation.patch similarity index 100% rename from patches/unapplied/api/0004-Code-Generation.patch rename to patches/api/0004-Code-Generation.patch diff --git a/patches/unapplied/api/0005-Add-FastUtil-to-Bukkit.patch b/patches/api/0005-Add-FastUtil-to-Bukkit.patch similarity index 100% rename from patches/unapplied/api/0005-Add-FastUtil-to-Bukkit.patch rename to patches/api/0005-Add-FastUtil-to-Bukkit.patch diff --git a/patches/unapplied/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch similarity index 98% rename from patches/unapplied/api/0006-Adventure.patch rename to patches/api/0006-Adventure.patch index 7077f2aa8b..72a7192bf0 100644 --- a/patches/unapplied/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -1415,7 +1415,7 @@ index 0f38cffd9d858eb3b959d30388e82a77af913ecb..be29b60651f0ab9cae4e0a3ff1df4e8b throw new UnsupportedOperationException("Not supported yet."); } diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java -index c5ba0f3ad4df1f52efe9795cfe2ded8783657b40..e30ea44c962f685f216dadd174c91a00d880c5cd 100644 +index 9b1247cdf8a2fed812c46c55193d574aafc3bc94..72ea6ddd00eed73459d700d657929f83ba1ca7ee 100644 --- a/src/main/java/org/bukkit/Sound.java +++ b/src/main/java/org/bukkit/Sound.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; @@ -1427,7 +1427,7 @@ index c5ba0f3ad4df1f52efe9795cfe2ded8783657b40..e30ea44c962f685f216dadd174c91a00 AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"), AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"), -@@ -1512,4 +1512,11 @@ public enum Sound implements Keyed { +@@ -1614,4 +1614,11 @@ public enum Sound implements Keyed { public NamespacedKey getKey() { return key; } @@ -2060,10 +2060,10 @@ index b7d8dd30360a38dbdc7bbce40c8e6ced7261f833..0817f2395c2b18828565435568ce651f public void sendRawMessage(@Nullable UUID sender, @NotNull String message); } diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index e2800dc97af5bbb02c555069285a0fa155a9799d..2dc749936df6168073a5bb9f9051d55f8589ac62 100644 +index c349cd16de02981392a8788ddaa3152e901aacff..6a915b5b41daa5ea64913a2d5c611a6167168395 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java -@@ -299,6 +299,19 @@ public abstract class Enchantment implements Keyed { +@@ -295,6 +295,19 @@ public abstract class Enchantment implements Keyed { * @return True if the enchantment may be applied, otherwise False */ public abstract boolean canEnchantItem(@NotNull ItemStack item); @@ -2081,15 +2081,15 @@ index e2800dc97af5bbb02c555069285a0fa155a9799d..2dc749936df6168073a5bb9f9051d55f + public abstract net.kyori.adventure.text.@NotNull Component displayName(int level); + // Paper end - @Override - public boolean equals(Object obj) { + /** + * Gets the Enchantment at the specified key diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java -index 9566e4306ada5e82dede0f002aa06da12c44996b..4d5f0837bd0e02a30c943d8969fb6b13452322e0 100644 +index 7ad7bcf9a9333c8d6d1d7cab53a6d457ec20bbf6..c4f86ba1037f3f0e5d697a0962d71d6f8c7c1fbe 100644 --- a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java +++ b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java -@@ -63,4 +63,11 @@ public class EnchantmentWrapper extends Enchantment { - public boolean conflictsWith(@NotNull Enchantment other) { - return getEnchantment().conflictsWith(other); +@@ -20,4 +20,11 @@ public abstract class EnchantmentWrapper extends Enchantment { + public Enchantment getEnchantment() { + return this; } + // Paper start + @NotNull @@ -2100,19 +2100,19 @@ index 9566e4306ada5e82dede0f002aa06da12c44996b..4d5f0837bd0e02a30c943d8969fb6b13 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index ead9a9aaad3c7469a9393f3c73aa9a5fdb5b7406..121cd27185269339babae1757a604fbb5aabc869 100644 +index 8532b8484d5a493c1c37ad7508597f624f1831c8..978431fd88cfb7d42fcdea8c904633df5c64daed 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; - /** - * Represents a base entity in the world +@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable; + * Not all methods are guaranteed to work/may have side effects when + * {@link #isInWorld()} is false. */ -public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder { +public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder, net.kyori.adventure.text.event.HoverEventSource, net.kyori.adventure.sound.Sound.Emitter { // Paper /** * Gets the entity's current position -@@ -724,4 +724,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -768,4 +768,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @Override Spigot spigot(); // Spigot end @@ -2134,10 +2134,10 @@ index ead9a9aaad3c7469a9393f3c73aa9a5fdb5b7406..121cd27185269339babae1757a604fbb + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa8cf3ae37 100644 +index 8aee70e27688ff85367b3534c6ccb64aeba95d74..d025385f90440dc0a68f926e1777b5e55572dfd8 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -51,7 +51,41 @@ import org.jetbrains.annotations.Nullable; +@@ -52,7 +52,41 @@ import org.jetbrains.annotations.Nullable; /** * Represents a player, connected or not */ @@ -2180,7 +2180,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa /** * {@inheritDoc} -@@ -68,7 +102,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -69,7 +103,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * places defined by plugins. * * @return the friendly name @@ -2190,7 +2190,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa @NotNull public String getDisplayName(); -@@ -80,15 +116,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -81,15 +117,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * places defined by plugins. * * @param name The new display name. @@ -2241,7 +2241,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public String getPlayerListName(); /** -@@ -97,14 +168,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -98,14 +169,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * If the value is null, the name will be identical to {@link #getName()}. * * @param name new player list name @@ -2260,7 +2260,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa @Nullable public String getPlayerListHeader(); -@@ -112,7 +187,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -113,7 +188,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Gets the currently displayed player list footer for this player. * * @return player list header or null @@ -2270,7 +2270,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa @Nullable public String getPlayerListFooter(); -@@ -120,14 +197,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -121,14 +198,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Sets the currently displayed player list header for this player. * * @param header player list header, null for empty @@ -2289,7 +2289,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void setPlayerListFooter(@Nullable String footer); /** -@@ -136,7 +217,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -137,7 +218,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param header player list header, null for empty * @param footer player list footer, null for empty @@ -2299,7 +2299,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer); /** -@@ -174,9 +257,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -175,9 +258,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Kicks player with custom kick message. * * @param message kick message @@ -2325,7 +2325,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa /** * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will * update the entry. -@@ -798,6 +897,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -799,6 +898,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map items); @@ -2432,7 +2432,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa /** * Send a sign change. This fakes a sign change packet for a user at * a certain location. This will not actually change the world in any way. -@@ -815,7 +1014,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -816,7 +1015,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param lines the new text on the sign or null to clear it * @throws IllegalArgumentException if location is null * @throws IllegalArgumentException if lines is non-null and has a length less than 4 @@ -2444,7 +2444,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException; /** -@@ -837,7 +1040,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -838,7 +1041,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException if location is null * @throws IllegalArgumentException if dyeColor is null * @throws IllegalArgumentException if lines is non-null and has a length less than 4 @@ -2456,7 +2456,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException; /** -@@ -860,7 +1067,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -861,7 +1068,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException if location is null * @throws IllegalArgumentException if dyeColor is null * @throws IllegalArgumentException if lines is non-null and has a length less than 4 @@ -2468,7 +2468,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException; /** -@@ -1376,6 +1587,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1377,6 +1588,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * pack correctly. * * @@ -2476,7 +2476,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa * @param url The URL from which the client will download the resource * pack. The string must contain only US-ASCII characters and should * be encoded as per RFC 1738. -@@ -1388,6 +1600,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1389,6 +1601,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2484,7 +2484,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void setResourcePack(@NotNull String url, @Nullable byte[] hash); /** -@@ -1419,6 +1632,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1420,6 +1633,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * pack correctly. * * @@ -2492,7 +2492,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa * @param url The URL from which the client will download the resource * pack. The string must contain only US-ASCII characters and should * be encoded as per RFC 1738. -@@ -1432,8 +1646,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1433,8 +1647,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2550,7 +2550,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa /** * Request that the player's client download and switch resource packs. *

-@@ -1463,6 +1726,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1464,6 +1727,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * pack correctly. * * @@ -2558,7 +2558,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa * @param url The URL from which the client will download the resource * pack. The string must contain only US-ASCII characters and should * be encoded as per RFC 1738. -@@ -1523,8 +1787,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1524,8 +1788,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2614,9 +2614,9 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa + // Paper end + /** - * Gets the Scoreboard displayed to this player - * -@@ -1659,7 +1972,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * Request that the player's client download and switch resource packs. + *

+@@ -1707,7 +2020,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param title Title text * @param subtitle Subtitle text @@ -2625,7 +2625,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa */ @Deprecated public void sendTitle(@Nullable String title, @Nullable String subtitle); -@@ -1678,7 +1991,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1726,7 +2039,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param fadeIn time in ticks for titles to fade in. Defaults to 10. * @param stay time in ticks for titles to stay. Defaults to 70. * @param fadeOut time in ticks for titles to fade out. Defaults to 20. @@ -2635,7 +2635,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut); /** -@@ -1905,6 +2220,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1953,6 +2268,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public int getClientViewDistance(); @@ -2650,7 +2650,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa /** * Gets the player's estimated ping in milliseconds. * -@@ -1930,8 +2253,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1978,8 +2301,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * they wish. * * @return the player's locale @@ -2661,7 +2661,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public String getLocale(); /** -@@ -1983,6 +2308,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2031,6 +2356,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public boolean isAllowingServerListings(); @@ -2676,7 +2676,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa // Spigot start public class Spigot extends Entity.Spigot { -@@ -2014,11 +2347,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2062,11 +2395,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM throw new UnsupportedOperationException("Not supported yet."); } @@ -2690,7 +2690,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa @Override public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); -@@ -2029,7 +2364,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2077,7 +2412,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param component the components to send @@ -2700,7 +2700,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -2039,7 +2376,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2087,7 +2424,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param components the components to send @@ -2710,7 +2710,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -2050,7 +2389,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2098,7 +2437,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param position the screen position * @param sender the sender of the message * @param component the components to send @@ -2720,7 +2720,7 @@ index fc37e0c604e44dd2df54b51cd2f10dd9004f1d98..3f9ed7dfb4633804fe86857dcc9f57aa public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -2061,7 +2402,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2109,7 +2450,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param position the screen position * @param sender the sender of the message * @param components the components to send @@ -3024,10 +3024,10 @@ index 3c2ea8fec3a748cab7f5ad9100d12bd8213ec6c9..a803bfea5400b3578bb4cf3261874e87 * Gets how much EXP the Player should have at respawn. *

diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index ec9f58ea221bfcde706d2454483888c54d44023a..19ba2d948ad83baab2a14ae6f7b3ce43c3d4971f 100644 +index a2e9bedc4d7c56f1ae6bd6ace2dff41537e41829..c3aeb1b622509ecd9e2230ce82e3bf07899fa540 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java -@@ -155,6 +155,18 @@ public enum InventoryType { +@@ -163,6 +163,18 @@ public enum InventoryType { private final String title; private final boolean isCreatable; @@ -3046,7 +3046,7 @@ index ec9f58ea221bfcde706d2454483888c54d44023a..19ba2d948ad83baab2a14ae6f7b3ce43 private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) { this(defaultSize, defaultTitle, true); } -@@ -163,6 +175,7 @@ public enum InventoryType { +@@ -171,6 +183,7 @@ public enum InventoryType { size = defaultSize; title = defaultTitle; this.isCreatable = isCreatable; @@ -3054,7 +3054,7 @@ index ec9f58ea221bfcde706d2454483888c54d44023a..19ba2d948ad83baab2a14ae6f7b3ce43 } public int getDefaultSize() { -@@ -170,6 +183,7 @@ public enum InventoryType { +@@ -178,6 +191,7 @@ public enum InventoryType { } @NotNull diff --git a/patches/unapplied/api/0007-Paper-Utils.patch b/patches/api/0007-Paper-Utils.patch similarity index 100% rename from patches/unapplied/api/0007-Paper-Utils.patch rename to patches/api/0007-Paper-Utils.patch diff --git a/patches/unapplied/api/0008-Use-ASM-for-event-executors.patch b/patches/api/0008-Use-ASM-for-event-executors.patch similarity index 100% rename from patches/unapplied/api/0008-Use-ASM-for-event-executors.patch rename to patches/api/0008-Use-ASM-for-event-executors.patch diff --git a/patches/unapplied/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch similarity index 100% rename from patches/unapplied/api/0009-Paper-Plugins.patch rename to patches/api/0009-Paper-Plugins.patch diff --git a/patches/unapplied/api/0010-Add-Position.patch b/patches/api/0010-Add-Position.patch similarity index 100% rename from patches/unapplied/api/0010-Add-Position.patch rename to patches/api/0010-Add-Position.patch diff --git a/patches/unapplied/api/0011-Timings-v2.patch b/patches/api/0011-Timings-v2.patch similarity index 99% rename from patches/unapplied/api/0011-Timings-v2.patch rename to patches/api/0011-Timings-v2.patch index d04197d735..a7abf56c07 100644 --- a/patches/unapplied/api/0011-Timings-v2.patch +++ b/patches/api/0011-Timings-v2.patch @@ -3455,10 +3455,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 3f9ed7dfb4633804fe86857dcc9f57aa8cf3ae37..e237c2d34cdbd9968eab4628bb1c0155554586e7 100644 +index d025385f90440dc0a68f926e1777b5e55572dfd8..76600c422b70370a23adc8f8c1627fabcc501f07 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2407,7 +2407,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2455,7 +2455,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Deprecated // Paper public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); diff --git a/patches/unapplied/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/unapplied/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/unapplied/api/0013-Player-affects-spawning-API.patch b/patches/api/0013-Player-affects-spawning-API.patch similarity index 86% rename from patches/unapplied/api/0013-Player-affects-spawning-API.patch rename to patches/api/0013-Player-affects-spawning-API.patch index 2ccec677be..3d522e75d5 100644 --- a/patches/unapplied/api/0013-Player-affects-spawning-API.patch +++ b/patches/api/0013-Player-affects-spawning-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e237c2d34cdbd9968eab4628bb1c0155554586e7..081dbaebc0b209839d48ccbda85ae1a9ed0be439 100644 +index 76600c422b70370a23adc8f8c1627fabcc501f07..bb153b7e102410fb0631e7b9bedde84550e268f4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2259,6 +2259,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2307,6 +2307,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Deprecated // Paper public String getLocale(); diff --git a/patches/unapplied/api/0014-Add-getTPS-method.patch b/patches/api/0014-Add-getTPS-method.patch similarity index 100% rename from patches/unapplied/api/0014-Add-getTPS-method.patch rename to patches/api/0014-Add-getTPS-method.patch diff --git a/patches/unapplied/api/0015-Version-Command-2.0.patch b/patches/api/0015-Version-Command-2.0.patch similarity index 100% rename from patches/unapplied/api/0015-Version-Command-2.0.patch rename to patches/api/0015-Version-Command-2.0.patch diff --git a/patches/unapplied/api/0016-Entity-Origin-API.patch b/patches/api/0016-Entity-Origin-API.patch similarity index 94% rename from patches/unapplied/api/0016-Entity-Origin-API.patch rename to patches/api/0016-Entity-Origin-API.patch index 33fcdeb93b..0c88ffbc11 100644 --- a/patches/unapplied/api/0016-Entity-Origin-API.patch +++ b/patches/api/0016-Entity-Origin-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 121cd27185269339babae1757a604fbb5aabc869..63137429779d06fafb162f1bfb823d5149b3c58a 100644 +index 978431fd88cfb7d42fcdea8c904633df5c64daed..24341516dd7d358b391f5e895cd837b5a10a8802 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -739,5 +739,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -783,5 +783,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent default net.kyori.adventure.text.event.HoverEvent asHoverEvent(final @NotNull java.util.function.UnaryOperator op) { return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.customName()))); } diff --git a/patches/unapplied/api/0017-Add-PlayerLocaleChangeEvent.patch b/patches/api/0017-Add-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0017-Add-PlayerLocaleChangeEvent.patch rename to patches/api/0017-Add-PlayerLocaleChangeEvent.patch diff --git a/patches/unapplied/api/0018-Add-view-distance-API.patch b/patches/api/0018-Add-view-distance-API.patch similarity index 97% rename from patches/unapplied/api/0018-Add-view-distance-API.patch rename to patches/api/0018-Add-view-distance-API.patch index 773fca475c..d1d4bfb6ec 100644 --- a/patches/unapplied/api/0018-Add-view-distance-API.patch +++ b/patches/api/0018-Add-view-distance-API.patch @@ -75,10 +75,10 @@ index 30dc2f85b60877930cab68230d3259ce92c08618..2867faf0acbbbb2e99c5b503f0c6bc83 public class Spigot { diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 081dbaebc0b209839d48ccbda85ae1a9ed0be439..fa7637dd594821ffd20a53c6c7f5b3d9fa107564 100644 +index bb153b7e102410fb0631e7b9bedde84550e268f4..17c3fcaca46e1e8f4c14026ee7a6a2d7a472b90c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2273,6 +2273,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2321,6 +2321,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param affects Whether the player can affect mob spawning */ public void setAffectsSpawning(boolean affects); diff --git a/patches/unapplied/api/0019-Add-BeaconEffectEvent.patch b/patches/api/0019-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/unapplied/api/0019-Add-BeaconEffectEvent.patch rename to patches/api/0019-Add-BeaconEffectEvent.patch diff --git a/patches/unapplied/api/0020-Add-PlayerInitialSpawnEvent.patch b/patches/api/0020-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0020-Add-PlayerInitialSpawnEvent.patch rename to patches/api/0020-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/unapplied/api/0021-Expose-server-CommandMap.patch b/patches/api/0021-Expose-server-CommandMap.patch similarity index 100% rename from patches/unapplied/api/0021-Expose-server-CommandMap.patch rename to patches/api/0021-Expose-server-CommandMap.patch diff --git a/patches/unapplied/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch similarity index 96% rename from patches/unapplied/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch rename to patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index fb316a1b47..e665574f51 100644 --- a/patches/unapplied/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -76,10 +76,10 @@ index 7ee7fdc8379078456492da00bb213a0738cc6f08..d94483d1481f233897faf378e6b34b6b * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index fa7637dd594821ffd20a53c6c7f5b3d9fa107564..944153f0d72c6ff5b7250e3d4b4591829deb16c2 100644 +index 17c3fcaca46e1e8f4c14026ee7a6a2d7a472b90c..602d8b81135eba0481280c887f44f1c1855044e1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1102,6 +1102,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1103,6 +1103,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendMap(@NotNull MapView map); diff --git a/patches/unapplied/api/0023-Add-exception-reporting-event.patch b/patches/api/0023-Add-exception-reporting-event.patch similarity index 100% rename from patches/unapplied/api/0023-Add-exception-reporting-event.patch rename to patches/api/0023-Add-exception-reporting-event.patch diff --git a/patches/unapplied/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch similarity index 100% rename from patches/unapplied/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch rename to patches/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch diff --git a/patches/unapplied/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch similarity index 100% rename from patches/unapplied/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch rename to patches/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch diff --git a/patches/unapplied/api/0026-Player-Tab-List-and-Title-APIs.patch b/patches/api/0026-Player-Tab-List-and-Title-APIs.patch similarity index 99% rename from patches/unapplied/api/0026-Player-Tab-List-and-Title-APIs.patch rename to patches/api/0026-Player-Tab-List-and-Title-APIs.patch index 37a7ed9ff4..8ce3d4ab38 100644 --- a/patches/unapplied/api/0026-Player-Tab-List-and-Title-APIs.patch +++ b/patches/api/0026-Player-Tab-List-and-Title-APIs.patch @@ -432,10 +432,10 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 944153f0d72c6ff5b7250e3d4b4591829deb16c2..2025cad529cf317384f6968b7fb65a555b0668c2 100644 +index 602d8b81135eba0481280c887f44f1c1855044e1..fdde0f82531fba370327ff71f59c2c4722d42df2 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1136,6 +1136,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1137,6 +1137,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } diff --git a/patches/unapplied/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/unapplied/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/unapplied/api/0028-Complete-resource-pack-API.patch b/patches/api/0028-Complete-resource-pack-API.patch similarity index 97% rename from patches/unapplied/api/0028-Complete-resource-pack-API.patch rename to patches/api/0028-Complete-resource-pack-API.patch index ac99684151..dbc1b75c1c 100644 --- a/patches/unapplied/api/0028-Complete-resource-pack-API.patch +++ b/patches/api/0028-Complete-resource-pack-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2025cad529cf317384f6968b7fb65a555b0668c2..f2311a9842a4d7c45fc88b9f8ca485005a3b3352 100644 +index fdde0f82531fba370327ff71f59c2c4722d42df2..339b3a4ebae8a522ec3932f901729f88a680d14b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1716,7 +1716,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1717,7 +1717,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the URL is null. * @throws IllegalArgumentException Thrown if the URL is too long. The * length restriction is an implementation specific arbitrary value. @@ -18,7 +18,7 @@ index 2025cad529cf317384f6968b7fb65a555b0668c2..f2311a9842a4d7c45fc88b9f8ca48500 public void setResourcePack(@NotNull String url); /** -@@ -2563,6 +2565,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2611,6 +2613,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM default net.kyori.adventure.text.event.HoverEvent asHoverEvent(final @NotNull java.util.function.UnaryOperator op) { return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName()))); } diff --git a/patches/unapplied/api/0029-Add-a-call-helper-to-Event.patch b/patches/api/0029-Add-a-call-helper-to-Event.patch similarity index 100% rename from patches/unapplied/api/0029-Add-a-call-helper-to-Event.patch rename to patches/api/0029-Add-a-call-helper-to-Event.patch diff --git a/patches/unapplied/api/0030-Add-sender-name-to-commands.yml-replacement.patch b/patches/api/0030-Add-sender-name-to-commands.yml-replacement.patch similarity index 100% rename from patches/unapplied/api/0030-Add-sender-name-to-commands.yml-replacement.patch rename to patches/api/0030-Add-sender-name-to-commands.yml-replacement.patch diff --git a/patches/unapplied/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch similarity index 100% rename from patches/unapplied/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch rename to patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch diff --git a/patches/unapplied/api/0032-Custom-replacement-for-eaten-items.patch b/patches/api/0032-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/unapplied/api/0032-Custom-replacement-for-eaten-items.patch rename to patches/api/0032-Custom-replacement-for-eaten-items.patch diff --git a/patches/unapplied/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/unapplied/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/unapplied/api/0034-EntityPathfindEvent.patch b/patches/api/0034-EntityPathfindEvent.patch similarity index 100% rename from patches/unapplied/api/0034-EntityPathfindEvent.patch rename to patches/api/0034-EntityPathfindEvent.patch diff --git a/patches/unapplied/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch similarity index 100% rename from patches/unapplied/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch rename to patches/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch diff --git a/patches/unapplied/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch similarity index 100% rename from patches/unapplied/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch rename to patches/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch diff --git a/patches/unapplied/api/0037-Add-PlayerUseUnknownEntityEvent.patch b/patches/api/0037-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/unapplied/api/0037-Add-PlayerUseUnknownEntityEvent.patch rename to patches/api/0037-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/unapplied/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/unapplied/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/unapplied/api/0039-Arrow-pickup-rule-API.patch b/patches/api/0039-Arrow-pickup-rule-API.patch similarity index 100% rename from patches/unapplied/api/0039-Arrow-pickup-rule-API.patch rename to patches/api/0039-Arrow-pickup-rule-API.patch diff --git a/patches/unapplied/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/unapplied/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/unapplied/api/0041-LootTable-API.patch b/patches/api/0041-LootTable-API.patch similarity index 100% rename from patches/unapplied/api/0041-LootTable-API.patch rename to patches/api/0041-LootTable-API.patch diff --git a/patches/unapplied/api/0042-Add-EntityZapEvent.patch b/patches/api/0042-Add-EntityZapEvent.patch similarity index 100% rename from patches/unapplied/api/0042-Add-EntityZapEvent.patch rename to patches/api/0042-Add-EntityZapEvent.patch diff --git a/patches/unapplied/api/0043-Misc-Utils.patch b/patches/api/0043-Misc-Utils.patch similarity index 100% rename from patches/unapplied/api/0043-Misc-Utils.patch rename to patches/api/0043-Misc-Utils.patch diff --git a/patches/unapplied/api/0044-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/unapplied/api/0044-Allow-Reloading-of-Command-Aliases.patch rename to patches/api/0044-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/unapplied/api/0045-Add-source-to-PlayerExpChangeEvent.patch b/patches/api/0045-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0045-Add-source-to-PlayerExpChangeEvent.patch rename to patches/api/0045-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/unapplied/api/0046-Add-ProjectileCollideEvent.patch b/patches/api/0046-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/unapplied/api/0046-Add-ProjectileCollideEvent.patch rename to patches/api/0046-Add-ProjectileCollideEvent.patch diff --git a/patches/unapplied/api/0047-Add-String-based-Action-Bar-API.patch b/patches/api/0047-Add-String-based-Action-Bar-API.patch similarity index 91% rename from patches/unapplied/api/0047-Add-String-based-Action-Bar-API.patch rename to patches/api/0047-Add-String-based-Action-Bar-API.patch index adc0d82d97..51988b7560 100644 --- a/patches/unapplied/api/0047-Add-String-based-Action-Bar-API.patch +++ b/patches/api/0047-Add-String-based-Action-Bar-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f2311a9842a4d7c45fc88b9f8ca485005a3b3352..05795d5e86c7427bb962144b66e43f68a9fa3ff3 100644 +index 339b3a4ebae8a522ec3932f901729f88a680d14b..271a6f3f527d45232f992039f6dc1d6419750821 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1103,6 +1103,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1104,6 +1104,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public void sendMap(@NotNull MapView map); // Paper start @@ -48,7 +48,7 @@ index f2311a9842a4d7c45fc88b9f8ca485005a3b3352..05795d5e86c7427bb962144b66e43f68 /** * Sends the component to the player * -@@ -1130,9 +1163,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1131,9 +1164,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Sends an array of components as a single message to the specified screen position of this player * diff --git a/patches/unapplied/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/unapplied/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/unapplied/api/0049-IllegalPacketEvent.patch b/patches/api/0049-IllegalPacketEvent.patch similarity index 100% rename from patches/unapplied/api/0049-IllegalPacketEvent.patch rename to patches/api/0049-IllegalPacketEvent.patch diff --git a/patches/unapplied/api/0050-Fireworks-API-s.patch b/patches/api/0050-Fireworks-API-s.patch similarity index 100% rename from patches/unapplied/api/0050-Fireworks-API-s.patch rename to patches/api/0050-Fireworks-API-s.patch diff --git a/patches/unapplied/api/0051-PlayerTeleportEndGatewayEvent.patch b/patches/api/0051-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/unapplied/api/0051-PlayerTeleportEndGatewayEvent.patch rename to patches/api/0051-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/unapplied/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/unapplied/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/unapplied/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/unapplied/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/unapplied/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch similarity index 100% rename from patches/unapplied/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch rename to patches/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch diff --git a/patches/unapplied/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/unapplied/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/unapplied/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch similarity index 99% rename from patches/unapplied/api/0056-Fix-upstream-javadocs.patch rename to patches/api/0056-Fix-upstream-javadocs.patch index d8af62b178..2f6c7c61ca 100644 --- a/patches/unapplied/api/0056-Fix-upstream-javadocs.patch +++ b/patches/api/0056-Fix-upstream-javadocs.patch @@ -75,7 +75,7 @@ index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f814 * @return temperature at given coordinate */ diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java -index 369b95b1598a43bc53fb3ea4f69ebea18dc34308..656c060aee5d9ce778638253603ed9475a2612a1 100644 +index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc698715440 100644 --- a/src/main/java/org/bukkit/RegionAccessor.java +++ b/src/main/java/org/bukkit/RegionAccessor.java @@ -158,7 +158,7 @@ public interface RegionAccessor { @@ -386,10 +386,10 @@ index ae9eaaa8e38e1d9dfc459926c7fc51ddb89de84a..b2ec535bb1b0ce0c114ddd7638b90218 @Override public int getConversionTime(); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 05795d5e86c7427bb962144b66e43f68a9fa3ff3..74823885b0836db404737199b21c09c1ebcbad3c 100644 +index 271a6f3f527d45232f992039f6dc1d6419750821..cdc797fd351ffb261a0233e48b684dfd3bb62386 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -431,15 +431,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -432,15 +432,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Saves the players current location, health, inventory, motion, and @@ -409,7 +409,7 @@ index 05795d5e86c7427bb962144b66e43f68a9fa3ff3..74823885b0836db404737199b21c09c1 *

* Note: This will overwrite the players current inventory, health, * motion, etc, with the state from the saved dat file. -@@ -735,7 +735,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -736,7 +736,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Plays an effect to just this player. * @@ -418,7 +418,7 @@ index 05795d5e86c7427bb962144b66e43f68a9fa3ff3..74823885b0836db404737199b21c09c1 * @param loc the location to play the effect at * @param effect the {@link Effect} * @param data a data bit needed for some effects -@@ -1120,7 +1120,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1121,7 +1121,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * Use supplied alternative character to the section symbol to represent legacy color codes. * @@ -427,7 +427,7 @@ index 05795d5e86c7427bb962144b66e43f68a9fa3ff3..74823885b0836db404737199b21c09c1 * @param message The message to send * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)} */ -@@ -1586,7 +1586,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1587,7 +1587,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Allows this player to see a player that was previously hidden. If @@ -436,7 +436,7 @@ index 05795d5e86c7427bb962144b66e43f68a9fa3ff3..74823885b0836db404737199b21c09c1 * remain hidden until the other plugin calls this method too. * * @param plugin Plugin that wants to show the player -@@ -1615,7 +1615,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1616,7 +1616,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Allows this player to see an entity that was previously hidden. If diff --git a/patches/unapplied/api/0057-Item-canEntityPickup.patch b/patches/api/0057-Item-canEntityPickup.patch similarity index 100% rename from patches/unapplied/api/0057-Item-canEntityPickup.patch rename to patches/api/0057-Item-canEntityPickup.patch diff --git a/patches/unapplied/api/0058-PlayerAttemptPickupItemEvent.patch b/patches/api/0058-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/unapplied/api/0058-PlayerAttemptPickupItemEvent.patch rename to patches/api/0058-PlayerAttemptPickupItemEvent.patch diff --git a/patches/unapplied/api/0059-Add-UnknownCommandEvent.patch b/patches/api/0059-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/unapplied/api/0059-Add-UnknownCommandEvent.patch rename to patches/api/0059-Add-UnknownCommandEvent.patch diff --git a/patches/unapplied/api/0060-Basic-PlayerProfile-API.patch b/patches/api/0060-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/unapplied/api/0060-Basic-PlayerProfile-API.patch rename to patches/api/0060-Basic-PlayerProfile-API.patch diff --git a/patches/unapplied/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/unapplied/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/unapplied/api/0062-Shoulder-Entities-Release-API.patch b/patches/api/0062-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/unapplied/api/0062-Shoulder-Entities-Release-API.patch rename to patches/api/0062-Shoulder-Entities-Release-API.patch diff --git a/patches/unapplied/api/0063-Entity-fromMobSpawner.patch b/patches/api/0063-Entity-fromMobSpawner.patch similarity index 81% rename from patches/unapplied/api/0063-Entity-fromMobSpawner.patch rename to patches/api/0063-Entity-fromMobSpawner.patch index 7fe0e96d19..98664b4d0a 100644 --- a/patches/unapplied/api/0063-Entity-fromMobSpawner.patch +++ b/patches/api/0063-Entity-fromMobSpawner.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 63137429779d06fafb162f1bfb823d5149b3c58a..4319dbac54b4cce95ad7479d5bd141a2b12ab7ae 100644 +index 24341516dd7d358b391f5e895cd837b5a10a8802..754097d9858b3a74f73c6ca483c2577c837f9f3a 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -749,5 +749,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -793,5 +793,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Nullable Location getOrigin(); diff --git a/patches/unapplied/api/0064-Profile-Lookup-Events.patch b/patches/api/0064-Profile-Lookup-Events.patch similarity index 100% rename from patches/unapplied/api/0064-Profile-Lookup-Events.patch rename to patches/api/0064-Profile-Lookup-Events.patch diff --git a/patches/unapplied/api/0065-Improve-the-Saddle-API-for-Horses.patch b/patches/api/0065-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/unapplied/api/0065-Improve-the-Saddle-API-for-Horses.patch rename to patches/api/0065-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/unapplied/api/0066-Add-getI18NDisplayName-API.patch b/patches/api/0066-Add-getI18NDisplayName-API.patch similarity index 100% rename from patches/unapplied/api/0066-Add-getI18NDisplayName-API.patch rename to patches/api/0066-Add-getI18NDisplayName-API.patch diff --git a/patches/unapplied/api/0067-ensureServerConversions-API.patch b/patches/api/0067-ensureServerConversions-API.patch similarity index 100% rename from patches/unapplied/api/0067-ensureServerConversions-API.patch rename to patches/api/0067-ensureServerConversions-API.patch diff --git a/patches/unapplied/api/0068-LivingEntity-setKiller.patch b/patches/api/0068-LivingEntity-setKiller.patch similarity index 100% rename from patches/unapplied/api/0068-LivingEntity-setKiller.patch rename to patches/api/0068-LivingEntity-setKiller.patch diff --git a/patches/unapplied/api/0069-ProfileWhitelistVerifyEvent.patch b/patches/api/0069-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/unapplied/api/0069-ProfileWhitelistVerifyEvent.patch rename to patches/api/0069-ProfileWhitelistVerifyEvent.patch diff --git a/patches/unapplied/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch similarity index 100% rename from patches/unapplied/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch rename to patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch diff --git a/patches/unapplied/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch similarity index 100% rename from patches/unapplied/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch rename to patches/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch diff --git a/patches/unapplied/api/0072-Add-PlayerJumpEvent.patch b/patches/api/0072-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/unapplied/api/0072-Add-PlayerJumpEvent.patch rename to patches/api/0072-Add-PlayerJumpEvent.patch diff --git a/patches/unapplied/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch similarity index 100% rename from patches/unapplied/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch rename to patches/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch diff --git a/patches/unapplied/api/0074-Add-PlayerArmorChangeEvent.patch b/patches/api/0074-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0074-Add-PlayerArmorChangeEvent.patch rename to patches/api/0074-Add-PlayerArmorChangeEvent.patch diff --git a/patches/unapplied/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/unapplied/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/unapplied/api/0076-AsyncTabCompleteEvent.patch b/patches/api/0076-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/unapplied/api/0076-AsyncTabCompleteEvent.patch rename to patches/api/0076-AsyncTabCompleteEvent.patch diff --git a/patches/unapplied/api/0077-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch similarity index 94% rename from patches/unapplied/api/0077-Expose-client-protocol-version-and-virtual-host.patch rename to patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch index 9c0eed5991..bc5b41f1a8 100644 --- a/patches/unapplied/api/0077-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch @@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 74823885b0836db404737199b21c09c1ebcbad3c..0da374b18e0f602e9836cfaefe07c5219a7d9bd1 100644 +index cdc797fd351ffb261a0233e48b684dfd3bb62386..3f28d02d39c937abf001ae286632b84a5814fb61 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -51,7 +51,7 @@ import org.jetbrains.annotations.Nullable; +@@ -52,7 +52,7 @@ import org.jetbrains.annotations.Nullable; /** * Represents a player, connected or not */ diff --git a/patches/unapplied/api/0078-Display-warning-on-deprecated-recipe-API.patch b/patches/api/0078-Display-warning-on-deprecated-recipe-API.patch similarity index 100% rename from patches/unapplied/api/0078-Display-warning-on-deprecated-recipe-API.patch rename to patches/api/0078-Display-warning-on-deprecated-recipe-API.patch diff --git a/patches/unapplied/api/0079-PlayerPickupExperienceEvent.patch b/patches/api/0079-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/unapplied/api/0079-PlayerPickupExperienceEvent.patch rename to patches/api/0079-PlayerPickupExperienceEvent.patch diff --git a/patches/unapplied/api/0080-ExperienceOrbMergeEvent.patch b/patches/api/0080-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/unapplied/api/0080-ExperienceOrbMergeEvent.patch rename to patches/api/0080-ExperienceOrbMergeEvent.patch diff --git a/patches/unapplied/api/0081-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch similarity index 89% rename from patches/unapplied/api/0081-Ability-to-apply-mending-to-XP-API.patch rename to patches/api/0081-Ability-to-apply-mending-to-XP-API.patch index 77af6fd380..0639dc24a1 100644 --- a/patches/unapplied/api/0081-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch @@ -10,10 +10,10 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 0da374b18e0f602e9836cfaefe07c5219a7d9bd1..e6b4347fc7e14971b8c975f19ff389fdafa16723 100644 +index 3f28d02d39c937abf001ae286632b84a5814fb61..695bdf0bca8af1360d4deeb4aadedf1fb4140223 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1429,6 +1429,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1430,6 +1430,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void resetPlayerWeather(); @@ -29,7 +29,7 @@ index 0da374b18e0f602e9836cfaefe07c5219a7d9bd1..e6b4347fc7e14971b8c975f19ff389fd /** * Gets the player's cooldown between picking up experience orbs. * -@@ -1454,8 +1463,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1455,8 +1464,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Gives the player the amount of experience specified. * * @param amount Exp amount to give diff --git a/patches/unapplied/api/0082-PreCreatureSpawnEvent.patch b/patches/api/0082-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0082-PreCreatureSpawnEvent.patch rename to patches/api/0082-PreCreatureSpawnEvent.patch diff --git a/patches/unapplied/api/0083-PlayerNaturallySpawnCreaturesEvent.patch b/patches/api/0083-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/unapplied/api/0083-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/api/0083-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/unapplied/api/0084-Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/0084-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/unapplied/api/0084-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/api/0084-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/unapplied/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/unapplied/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch rename to patches/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/unapplied/api/0086-Fill-Profile-Property-Events.patch b/patches/api/0086-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/unapplied/api/0086-Fill-Profile-Property-Events.patch rename to patches/api/0086-Fill-Profile-Property-Events.patch diff --git a/patches/unapplied/api/0087-Add-ArmorStand-Item-Meta.patch b/patches/api/0087-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/unapplied/api/0087-Add-ArmorStand-Item-Meta.patch rename to patches/api/0087-Add-ArmorStand-Item-Meta.patch diff --git a/patches/unapplied/api/0088-Optimize-Hoppers.patch b/patches/api/0088-Optimize-Hoppers.patch similarity index 100% rename from patches/unapplied/api/0088-Optimize-Hoppers.patch rename to patches/api/0088-Optimize-Hoppers.patch diff --git a/patches/unapplied/api/0089-Tameable-getOwnerUniqueId-API.patch b/patches/api/0089-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/unapplied/api/0089-Tameable-getOwnerUniqueId-API.patch rename to patches/api/0089-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/unapplied/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/unapplied/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/unapplied/api/0091-Add-extended-PaperServerListPingEvent.patch b/patches/api/0091-Add-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/unapplied/api/0091-Add-extended-PaperServerListPingEvent.patch rename to patches/api/0091-Add-extended-PaperServerListPingEvent.patch diff --git a/patches/unapplied/api/0092-Player.setPlayerProfile-API.patch b/patches/api/0092-Player.setPlayerProfile-API.patch similarity index 97% rename from patches/unapplied/api/0092-Player.setPlayerProfile-API.patch rename to patches/api/0092-Player.setPlayerProfile-API.patch index 9f301f7e9f..1eb1ebd708 100644 --- a/patches/unapplied/api/0092-Player.setPlayerProfile-API.patch +++ b/patches/api/0092-Player.setPlayerProfile-API.patch @@ -93,10 +93,10 @@ index aad8b2fbdbb03fbf32f99b3a533716eca9d42219..405b6a388c3593a83985f766e79b9295 /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e6b4347fc7e14971b8c975f19ff389fdafa16723..43ba9fbec2060786fe1cb24025adc697a88b8678 100644 +index 695bdf0bca8af1360d4deeb4aadedf1fb4140223..7a24cc6617b55bdeea4cf6d70e3abb835b0697bf 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2739,6 +2739,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2787,6 +2787,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED} */ boolean hasResourcePack(); diff --git a/patches/unapplied/api/0093-getPlayerUniqueId-API.patch b/patches/api/0093-getPlayerUniqueId-API.patch similarity index 100% rename from patches/unapplied/api/0093-getPlayerUniqueId-API.patch rename to patches/api/0093-getPlayerUniqueId-API.patch diff --git a/patches/unapplied/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch similarity index 100% rename from patches/unapplied/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch rename to patches/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch diff --git a/patches/unapplied/api/0095-Add-openSign-method-to-HumanEntity.patch b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch similarity index 92% rename from patches/unapplied/api/0095-Add-openSign-method-to-HumanEntity.patch rename to patches/api/0095-Add-openSign-method-to-HumanEntity.patch index 2be7ae4e63..bdc5ae2697 100644 --- a/patches/unapplied/api/0095-Add-openSign-method-to-HumanEntity.patch +++ b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch @@ -36,10 +36,10 @@ index abdca9fe5acc90f167219eb769ece66c35682bb1..b3aa3dc6aa5afbc36cc86741b4cba56f /** * Make the entity drop the item in their hand. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 43ba9fbec2060786fe1cb24025adc697a88b8678..67d253239b86a120162e7fcc56a345b5ebb88ba9 100644 +index 7a24cc6617b55bdeea4cf6d70e3abb835b0697bf..9e2b93ce876ae69ec05bc55b15a4e0ebf054aa50 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2584,10 +2584,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2632,10 +2632,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Open a Sign for editing by the Player. * diff --git a/patches/unapplied/api/0096-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch similarity index 98% rename from patches/unapplied/api/0096-Add-Ban-Methods-to-Player-Objects.patch rename to patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch index ad814c47c7..dd83566b27 100644 --- a/patches/unapplied/api/0096-Add-Ban-Methods-to-Player-Objects.patch +++ b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch @@ -74,10 +74,10 @@ index 12349910297a75c00e64f6ccc7981aeeeb43ecd3..8f2f3e0ac5266f571b62a754921422bb /** * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 67d253239b86a120162e7fcc56a345b5ebb88ba9..e13d09c5d4c62d47f6f4e057a23caea3ed18496a 100644 +index 9e2b93ce876ae69ec05bc55b15a4e0ebf054aa50..203e8555bfd410b9becfa7e0fb88728dfbd98f77 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1103,6 +1103,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1104,6 +1104,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public void sendMap(@NotNull MapView map); // Paper start diff --git a/patches/unapplied/api/0097-EndermanEscapeEvent.patch b/patches/api/0097-EndermanEscapeEvent.patch similarity index 100% rename from patches/unapplied/api/0097-EndermanEscapeEvent.patch rename to patches/api/0097-EndermanEscapeEvent.patch diff --git a/patches/unapplied/api/0098-Enderman.teleportRandomly.patch b/patches/api/0098-Enderman.teleportRandomly.patch similarity index 100% rename from patches/unapplied/api/0098-Enderman.teleportRandomly.patch rename to patches/api/0098-Enderman.teleportRandomly.patch diff --git a/patches/unapplied/api/0099-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch similarity index 100% rename from patches/unapplied/api/0099-Additional-world.getNearbyEntities-API-s.patch rename to patches/api/0099-Additional-world.getNearbyEntities-API-s.patch diff --git a/patches/unapplied/api/0100-Location.isChunkLoaded-API.patch b/patches/api/0100-Location.isChunkLoaded-API.patch similarity index 100% rename from patches/unapplied/api/0100-Location.isChunkLoaded-API.patch rename to patches/api/0100-Location.isChunkLoaded-API.patch diff --git a/patches/unapplied/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 99% rename from patches/unapplied/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch index 44d6571c95..37ce74fa03 100644 --- a/patches/unapplied/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -500,10 +500,10 @@ index 0000000000000000000000000000000000000000..f45b8cfd1611345e8d81ecb8297a586f + } +} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index e2adb9901cc92ede9d44ca9939c6a54d4762eb4b..81bd12c8addcee754c71e5e030c729c7e096fb4c 100644 +index e3c94a56237ccd24a73857eb06404a39fff9c582..5ec5f5d3f8a8995a1ca90f251f856c7f24a940c4 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java -@@ -194,6 +194,18 @@ public enum Particle implements Keyed { +@@ -200,6 +200,18 @@ public enum Particle implements Keyed { return key; } diff --git a/patches/unapplied/api/0102-EndermanAttackPlayerEvent.patch b/patches/api/0102-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/unapplied/api/0102-EndermanAttackPlayerEvent.patch rename to patches/api/0102-EndermanAttackPlayerEvent.patch diff --git a/patches/unapplied/api/0103-WitchConsumePotionEvent.patch b/patches/api/0103-WitchConsumePotionEvent.patch similarity index 100% rename from patches/unapplied/api/0103-WitchConsumePotionEvent.patch rename to patches/api/0103-WitchConsumePotionEvent.patch diff --git a/patches/unapplied/api/0104-WitchThrowPotionEvent.patch b/patches/api/0104-WitchThrowPotionEvent.patch similarity index 100% rename from patches/unapplied/api/0104-WitchThrowPotionEvent.patch rename to patches/api/0104-WitchThrowPotionEvent.patch diff --git a/patches/unapplied/api/0105-Location.toBlockLocation-toCenterLocation.patch b/patches/api/0105-Location.toBlockLocation-toCenterLocation.patch similarity index 100% rename from patches/unapplied/api/0105-Location.toBlockLocation-toCenterLocation.patch rename to patches/api/0105-Location.toBlockLocation-toCenterLocation.patch diff --git a/patches/unapplied/api/0106-PotionEffect-clone-methods.patch b/patches/api/0106-PotionEffect-clone-methods.patch similarity index 100% rename from patches/unapplied/api/0106-PotionEffect-clone-methods.patch rename to patches/api/0106-PotionEffect-clone-methods.patch diff --git a/patches/unapplied/api/0107-WitchReadyPotionEvent.patch b/patches/api/0107-WitchReadyPotionEvent.patch similarity index 100% rename from patches/unapplied/api/0107-WitchReadyPotionEvent.patch rename to patches/api/0107-WitchReadyPotionEvent.patch diff --git a/patches/unapplied/api/0108-ItemStack-getMaxItemUseDuration.patch b/patches/api/0108-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/unapplied/api/0108-ItemStack-getMaxItemUseDuration.patch rename to patches/api/0108-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/unapplied/api/0109-Add-EntityTeleportEndGatewayEvent.patch b/patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/unapplied/api/0109-Add-EntityTeleportEndGatewayEvent.patch rename to patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/unapplied/api/0110-Make-shield-blocking-delay-configurable.patch b/patches/api/0110-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/unapplied/api/0110-Make-shield-blocking-delay-configurable.patch rename to patches/api/0110-Make-shield-blocking-delay-configurable.patch diff --git a/patches/unapplied/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 100% rename from patches/unapplied/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch diff --git a/patches/unapplied/api/0112-Add-getNearbyXXX-methods-to-Location.patch b/patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch similarity index 100% rename from patches/unapplied/api/0112-Add-getNearbyXXX-methods-to-Location.patch rename to patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch diff --git a/patches/unapplied/api/0113-PlayerReadyArrowEvent.patch b/patches/api/0113-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/unapplied/api/0113-PlayerReadyArrowEvent.patch rename to patches/api/0113-PlayerReadyArrowEvent.patch diff --git a/patches/unapplied/api/0114-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/api/0114-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch similarity index 100% rename from patches/unapplied/api/0114-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch rename to patches/api/0114-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch diff --git a/patches/unapplied/api/0115-Expand-Explosions-API.patch b/patches/api/0115-Expand-Explosions-API.patch similarity index 100% rename from patches/unapplied/api/0115-Expand-Explosions-API.patch rename to patches/api/0115-Expand-Explosions-API.patch diff --git a/patches/unapplied/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch similarity index 100% rename from patches/unapplied/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch rename to patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch diff --git a/patches/unapplied/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/unapplied/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/unapplied/api/0118-RangedEntity-API.patch b/patches/api/0118-RangedEntity-API.patch similarity index 100% rename from patches/unapplied/api/0118-RangedEntity-API.patch rename to patches/api/0118-RangedEntity-API.patch diff --git a/patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch b/patches/api/0119-Add-World.getEntity-UUID-API.patch similarity index 100% rename from patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch rename to patches/api/0119-Add-World.getEntity-UUID-API.patch diff --git a/patches/unapplied/api/0120-InventoryCloseEvent-Reason-API.patch b/patches/api/0120-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/unapplied/api/0120-InventoryCloseEvent-Reason-API.patch rename to patches/api/0120-InventoryCloseEvent-Reason-API.patch diff --git a/patches/unapplied/api/0121-Allow-setting-the-vex-s-summoner.patch b/patches/api/0121-Allow-setting-the-vex-s-summoner.patch similarity index 100% rename from patches/unapplied/api/0121-Allow-setting-the-vex-s-summoner.patch rename to patches/api/0121-Allow-setting-the-vex-s-summoner.patch diff --git a/patches/unapplied/api/0122-Entity-getChunk-API.patch b/patches/api/0122-Entity-getChunk-API.patch similarity index 87% rename from patches/unapplied/api/0122-Entity-getChunk-API.patch rename to patches/api/0122-Entity-getChunk-API.patch index 1db2f570f9..55dee522c4 100644 --- a/patches/unapplied/api/0122-Entity-getChunk-API.patch +++ b/patches/api/0122-Entity-getChunk-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API Get the chunk the entity is currently registered to diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 4319dbac54b4cce95ad7479d5bd141a2b12ab7ae..5fc085f785719933eef7ab1b3cf173579c64739b 100644 +index 754097d9858b3a74f73c6ca483c2577c837f9f3a..40affe35704aa1a5e5a6f3661be966391c423ad2 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -3,6 +3,7 @@ package org.bukkit.entity; @@ -17,7 +17,7 @@ index 4319dbac54b4cce95ad7479d5bd141a2b12ab7ae..5fc085f785719933eef7ab1b3cf17357 import org.bukkit.EntityEffect; import org.bukkit.Location; import org.bukkit.Nameable; -@@ -756,5 +757,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -800,5 +801,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if entity spawned from a mob spawner */ boolean fromMobSpawner(); diff --git a/patches/unapplied/api/0123-EnderDragon-Events.patch b/patches/api/0123-EnderDragon-Events.patch similarity index 100% rename from patches/unapplied/api/0123-EnderDragon-Events.patch rename to patches/api/0123-EnderDragon-Events.patch diff --git a/patches/unapplied/api/0124-PlayerElytraBoostEvent.patch b/patches/api/0124-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/unapplied/api/0124-PlayerElytraBoostEvent.patch rename to patches/api/0124-PlayerElytraBoostEvent.patch diff --git a/patches/unapplied/api/0125-PlayerLaunchProjectileEvent.patch b/patches/api/0125-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/unapplied/api/0125-PlayerLaunchProjectileEvent.patch rename to patches/api/0125-PlayerLaunchProjectileEvent.patch diff --git a/patches/unapplied/api/0126-EntityTransformedEvent.patch b/patches/api/0126-EntityTransformedEvent.patch similarity index 100% rename from patches/unapplied/api/0126-EntityTransformedEvent.patch rename to patches/api/0126-EntityTransformedEvent.patch diff --git a/patches/unapplied/api/0127-Allow-disabling-armour-stand-ticking.patch b/patches/api/0127-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/unapplied/api/0127-Allow-disabling-armour-stand-ticking.patch rename to patches/api/0127-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/unapplied/api/0128-SkeletonHorse-Additions.patch b/patches/api/0128-SkeletonHorse-Additions.patch similarity index 100% rename from patches/unapplied/api/0128-SkeletonHorse-Additions.patch rename to patches/api/0128-SkeletonHorse-Additions.patch diff --git a/patches/unapplied/api/0129-Expand-Location-Manipulation-API.patch b/patches/api/0129-Expand-Location-Manipulation-API.patch similarity index 100% rename from patches/unapplied/api/0129-Expand-Location-Manipulation-API.patch rename to patches/api/0129-Expand-Location-Manipulation-API.patch diff --git a/patches/unapplied/api/0130-Expand-ArmorStand-API.patch b/patches/api/0130-Expand-ArmorStand-API.patch similarity index 100% rename from patches/unapplied/api/0130-Expand-ArmorStand-API.patch rename to patches/api/0130-Expand-ArmorStand-API.patch diff --git a/patches/unapplied/api/0131-AnvilDamageEvent.patch b/patches/api/0131-AnvilDamageEvent.patch similarity index 100% rename from patches/unapplied/api/0131-AnvilDamageEvent.patch rename to patches/api/0131-AnvilDamageEvent.patch diff --git a/patches/unapplied/api/0132-Add-TNTPrimeEvent.patch b/patches/api/0132-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/unapplied/api/0132-Add-TNTPrimeEvent.patch rename to patches/api/0132-Add-TNTPrimeEvent.patch diff --git a/patches/unapplied/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 100% rename from patches/unapplied/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch diff --git a/patches/unapplied/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/unapplied/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/unapplied/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch similarity index 100% rename from patches/unapplied/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch rename to patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch diff --git a/patches/unapplied/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch similarity index 100% rename from patches/unapplied/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch rename to patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch diff --git a/patches/unapplied/api/0137-Slime-Pathfinder-Events.patch b/patches/api/0137-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/unapplied/api/0137-Slime-Pathfinder-Events.patch rename to patches/api/0137-Slime-Pathfinder-Events.patch diff --git a/patches/unapplied/api/0138-Add-PhantomPreSpawnEvent.patch b/patches/api/0138-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0138-Add-PhantomPreSpawnEvent.patch rename to patches/api/0138-Add-PhantomPreSpawnEvent.patch diff --git a/patches/unapplied/api/0139-Add-More-Creeper-API.patch b/patches/api/0139-Add-More-Creeper-API.patch similarity index 100% rename from patches/unapplied/api/0139-Add-More-Creeper-API.patch rename to patches/api/0139-Add-More-Creeper-API.patch diff --git a/patches/unapplied/api/0140-Inventory-removeItemAnySlot.patch b/patches/api/0140-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/unapplied/api/0140-Inventory-removeItemAnySlot.patch rename to patches/api/0140-Inventory-removeItemAnySlot.patch diff --git a/patches/unapplied/api/0141-isChunkGenerated-API.patch b/patches/api/0141-isChunkGenerated-API.patch similarity index 100% rename from patches/unapplied/api/0141-isChunkGenerated-API.patch rename to patches/api/0141-isChunkGenerated-API.patch diff --git a/patches/unapplied/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch similarity index 100% rename from patches/unapplied/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch rename to patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch diff --git a/patches/unapplied/api/0143-Async-Chunks-API.patch b/patches/api/0143-Async-Chunks-API.patch similarity index 99% rename from patches/unapplied/api/0143-Async-Chunks-API.patch rename to patches/api/0143-Async-Chunks-API.patch index 6759141f54..a04a93a06c 100644 --- a/patches/unapplied/api/0143-Async-Chunks-API.patch +++ b/patches/api/0143-Async-Chunks-API.patch @@ -485,10 +485,10 @@ index 07f723d5fb72e2eb776af130dc1d5caea16c5295..99a31572fa393a2482548ec55a96cb85 * Get a list of all players in this World * diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 5fc085f785719933eef7ab1b3cf173579c64739b..711d95bfafac0d415895023bdaac4059395667ab 100644 +index 40affe35704aa1a5e5a6f3661be966391c423ad2..bdc547298fd29fe55016a17ff1be0d51619c0e2d 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -165,6 +165,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -168,6 +168,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause); diff --git a/patches/unapplied/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/unapplied/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/unapplied/api/0145-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch similarity index 88% rename from patches/unapplied/api/0145-Expose-attack-cooldown-methods-for-Player.patch rename to patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch index 64c188ee1c..890a298210 100644 --- a/patches/unapplied/api/0145-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e13d09c5d4c62d47f6f4e057a23caea3ed18496a..d6af835abd8b31cf177ad2912215d80ff7629e64 100644 +index 203e8555bfd410b9becfa7e0fb88728dfbd98f77..fe06d06cf97b1b020c771fb455f644d68097f1ef 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2915,6 +2915,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2963,6 +2963,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param profile The new profile to use */ void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile); diff --git a/patches/unapplied/api/0146-Improve-death-events.patch b/patches/api/0146-Improve-death-events.patch similarity index 100% rename from patches/unapplied/api/0146-Improve-death-events.patch rename to patches/api/0146-Improve-death-events.patch diff --git a/patches/unapplied/api/0147-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch similarity index 100% rename from patches/unapplied/api/0147-Add-Git-information-to-version-command-on-startup.patch rename to patches/api/0147-Add-Git-information-to-version-command-on-startup.patch diff --git a/patches/unapplied/api/0148-Mob-Pathfinding-API.patch b/patches/api/0148-Mob-Pathfinding-API.patch similarity index 100% rename from patches/unapplied/api/0148-Mob-Pathfinding-API.patch rename to patches/api/0148-Mob-Pathfinding-API.patch diff --git a/patches/unapplied/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/unapplied/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/unapplied/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 100% rename from patches/unapplied/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch rename to patches/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch diff --git a/patches/unapplied/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 100% rename from patches/unapplied/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch rename to patches/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch diff --git a/patches/unapplied/api/0152-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0152-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/unapplied/api/0152-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/api/0152-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/unapplied/api/0153-Material-API-additions.patch b/patches/api/0153-Material-API-additions.patch similarity index 82% rename from patches/unapplied/api/0153-Material-API-additions.patch rename to patches/api/0153-Material-API-additions.patch index 325006b10b..bf1a41d231 100644 --- a/patches/unapplied/api/0153-Material-API-additions.patch +++ b/patches/api/0153-Material-API-additions.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index f06e06d825ba441ab5887652d5c04202a82707fc..48a42faffc5e117b6d18bc21265caa150117e3ef 100644 +index e15219c93995ff959a6730c17920618c0cdb3311..55fa9e8385e26aecb5690f623c2893972dc2a234 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -118,6 +118,7 @@ import org.jetbrains.annotations.Nullable; +@@ -121,6 +121,7 @@ import org.jetbrains.annotations.Nullable; /** * An enum of all material IDs accepted by the official server and client */ @@ -16,7 +16,7 @@ index f06e06d825ba441ab5887652d5c04202a82707fc..48a42faffc5e117b6d18bc21265caa15 public enum Material implements Keyed, Translatable { // AIR(9648, 0), -@@ -4438,6 +4439,22 @@ public enum Material implements Keyed, Translatable { +@@ -4684,6 +4685,22 @@ public enum Material implements Keyed, Translatable { } } diff --git a/patches/unapplied/api/0154-Add-Material-Tags.patch b/patches/api/0154-Add-Material-Tags.patch similarity index 99% rename from patches/unapplied/api/0154-Add-Material-Tags.patch rename to patches/api/0154-Add-Material-Tags.patch index 7ffc6ee166..e85c3085c0 100644 --- a/patches/unapplied/api/0154-Add-Material-Tags.patch +++ b/patches/api/0154-Add-Material-Tags.patch @@ -1123,7 +1123,7 @@ index 0000000000000000000000000000000000000000..5376e51adf5af15572b0d760b17f2de6 + .ensureSize("WATER_BASED", 11).lock(); +} diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 02f75db7ac55f792e84a08138e89657a3e226ff5..69462a0679c255acee2adb84f590523d3fc3c9aa 100644 +index 85c48fa2d11e6ec8d10f6924ea57f9a9dd800d12..971bc2e3ae0c265664e2fc3105f4be3027edce26 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/unapplied/api/0155-PreSpawnerSpawnEvent.patch b/patches/api/0155-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0155-PreSpawnerSpawnEvent.patch rename to patches/api/0155-PreSpawnerSpawnEvent.patch diff --git a/patches/unapplied/api/0156-Add-LivingEntity-getTargetEntity.patch b/patches/api/0156-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/unapplied/api/0156-Add-LivingEntity-getTargetEntity.patch rename to patches/api/0156-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/unapplied/api/0157-Add-sun-related-API.patch b/patches/api/0157-Add-sun-related-API.patch similarity index 100% rename from patches/unapplied/api/0157-Add-sun-related-API.patch rename to patches/api/0157-Add-sun-related-API.patch diff --git a/patches/unapplied/api/0158-Turtle-API.patch b/patches/api/0158-Turtle-API.patch similarity index 100% rename from patches/unapplied/api/0158-Turtle-API.patch rename to patches/api/0158-Turtle-API.patch diff --git a/patches/unapplied/api/0159-Add-spectator-target-events.patch b/patches/api/0159-Add-spectator-target-events.patch similarity index 100% rename from patches/unapplied/api/0159-Add-spectator-target-events.patch rename to patches/api/0159-Add-spectator-target-events.patch diff --git a/patches/unapplied/api/0160-Add-more-Witch-API.patch b/patches/api/0160-Add-more-Witch-API.patch similarity index 100% rename from patches/unapplied/api/0160-Add-more-Witch-API.patch rename to patches/api/0160-Add-more-Witch-API.patch diff --git a/patches/unapplied/api/0161-Make-the-default-permission-message-configurable.patch b/patches/api/0161-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/unapplied/api/0161-Make-the-default-permission-message-configurable.patch rename to patches/api/0161-Make-the-default-permission-message-configurable.patch diff --git a/patches/unapplied/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/unapplied/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/unapplied/api/0163-Add-more-Zombie-API.patch b/patches/api/0163-Add-more-Zombie-API.patch similarity index 100% rename from patches/unapplied/api/0163-Add-more-Zombie-API.patch rename to patches/api/0163-Add-more-Zombie-API.patch diff --git a/patches/unapplied/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/unapplied/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/unapplied/api/0165-Add-PlayerConnectionCloseEvent.patch b/patches/api/0165-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/unapplied/api/0165-Add-PlayerConnectionCloseEvent.patch rename to patches/api/0165-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/unapplied/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/unapplied/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/unapplied/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/unapplied/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/unapplied/api/0168-BlockDestroyEvent.patch b/patches/api/0168-BlockDestroyEvent.patch similarity index 100% rename from patches/unapplied/api/0168-BlockDestroyEvent.patch rename to patches/api/0168-BlockDestroyEvent.patch diff --git a/patches/unapplied/api/0169-Add-WhitelistToggleEvent.patch b/patches/api/0169-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/unapplied/api/0169-Add-WhitelistToggleEvent.patch rename to patches/api/0169-Add-WhitelistToggleEvent.patch diff --git a/patches/unapplied/api/0170-Add-GS4-Query-event.patch b/patches/api/0170-Add-GS4-Query-event.patch similarity index 100% rename from patches/unapplied/api/0170-Add-GS4-Query-event.patch rename to patches/api/0170-Add-GS4-Query-event.patch diff --git a/patches/unapplied/api/0171-Add-PlayerPostRespawnEvent.patch b/patches/api/0171-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/unapplied/api/0171-Add-PlayerPostRespawnEvent.patch rename to patches/api/0171-Add-PlayerPostRespawnEvent.patch diff --git a/patches/unapplied/api/0172-Entity-getEntitySpawnReason.patch b/patches/api/0172-Entity-getEntitySpawnReason.patch similarity index 87% rename from patches/unapplied/api/0172-Entity-getEntitySpawnReason.patch rename to patches/api/0172-Entity-getEntitySpawnReason.patch index 2b37c961ed..aa296072be 100644 --- a/patches/unapplied/api/0172-Entity-getEntitySpawnReason.patch +++ b/patches/api/0172-Entity-getEntitySpawnReason.patch @@ -12,10 +12,10 @@ or DEFAULT since data was not stored. Co-authored-by: Aurora diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 711d95bfafac0d415895023bdaac4059395667ab..20a83a2fa9f3d65837fffb027b1f8f1e76957770 100644 +index bdc547298fd29fe55016a17ff1be0d51619c0e2d..3117bf9d61b507175cfb673095763a5d6bc802ba 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -795,5 +795,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -839,5 +839,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent // TODO remove impl here return getLocation().getChunk(); } diff --git a/patches/unapplied/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch similarity index 98% rename from patches/unapplied/api/0173-Fix-Spigot-annotation-mistakes.patch rename to patches/api/0173-Fix-Spigot-annotation-mistakes.patch index c62cda9a48..de041038cb 100644 --- a/patches/unapplied/api/0173-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch @@ -285,10 +285,10 @@ index 0b202d378d50946f43434e70d9d511cac06749b0..cf42f6e57e96aa9cb4465e34a6e3f870 if (this.world == null) { return null; diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 48a42faffc5e117b6d18bc21265caa150117e3ef..2d7cd77002c32e88bfa677f86d645ee6b541062c 100644 +index 55fa9e8385e26aecb5690f623c2893972dc2a234..c24fe19600fa8440c130eaea247d5874da3873ec 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4459,20 +4459,20 @@ public enum Material implements Keyed, Translatable { +@@ -4705,20 +4705,20 @@ public enum Material implements Keyed, Translatable { * Do not use for any reason. * * @return ID of this material @@ -313,7 +313,7 @@ index 48a42faffc5e117b6d18bc21265caa150117e3ef..2d7cd77002c32e88bfa677f86d645ee6 public boolean isLegacy() { return legacy; } -@@ -4543,8 +4543,10 @@ public enum Material implements Keyed, Translatable { +@@ -4789,8 +4789,10 @@ public enum Material implements Keyed, Translatable { * Gets the MaterialData class associated with this Material * * @return MaterialData associated with this Material @@ -324,7 +324,7 @@ index 48a42faffc5e117b6d18bc21265caa150117e3ef..2d7cd77002c32e88bfa677f86d645ee6 public Class getData() { Preconditions.checkArgument(legacy, "Cannot get data class of Modern Material"); return ctor.getDeclaringClass(); -@@ -8682,7 +8684,11 @@ public enum Material implements Keyed, Translatable { +@@ -9052,7 +9054,11 @@ public enum Material implements Keyed, Translatable { * material. * * @return true if this material can be interacted with. @@ -438,7 +438,7 @@ index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f return note; } diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 81bd12c8addcee754c71e5e030c729c7e096fb4c..6992600d6cff9ed0a30d37ac4dc5dc0e56ecb2c7 100644 +index 5ec5f5d3f8a8995a1ca90f251f856c7f24a940c4..06c497bf342d82bcd8e481febf348811d19e629a 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java @@ -54,7 +54,9 @@ public enum Particle implements Keyed { @@ -451,7 +451,7 @@ index 81bd12c8addcee754c71e5e030c729c7e096fb4c..6992600d6cff9ed0a30d37ac4dc5dc0e BLOCK_DUST("block", BlockData.class, false), WATER_DROP("rain"), MOB_APPEARANCE("elder_guardian"), -@@ -138,15 +140,21 @@ public enum Particle implements Keyed { +@@ -144,15 +146,21 @@ public enum Particle implements Keyed { // ----- Legacy Separator ----- /** * Uses {@link MaterialData} as DataType @@ -474,10 +474,10 @@ index 81bd12c8addcee754c71e5e030c729c7e096fb4c..6992600d6cff9ed0a30d37ac4dc5dc0e private final NamespacedKey key; diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index c373614a865d6df8a2fe265497cf0b5f074490b0..8e0f985e8a6af728376a85eef998f7881e50786c 100644 +index 3be4214348e72e90f8b59225b3e31db0e6ba7e09..79d1ed1750d9ed843da128a0d047ae455f12ae38 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -197,14 +197,14 @@ public interface Registry extends Iterable { +@@ -184,14 +184,14 @@ public interface Registry extends Iterable { * * @see TrimMaterial */ @@ -494,7 +494,7 @@ index c373614a865d6df8a2fe265497cf0b5f074490b0..8e0f985e8a6af728376a85eef998f788 Registry TRIM_PATTERN = Bukkit.getRegistry(TrimPattern.class); /** * Villager profession. -@@ -286,8 +286,11 @@ public interface Registry extends Iterable { +@@ -273,8 +273,11 @@ public interface Registry extends Iterable { * * @param input non-null input * @return registered object or null if does not exist @@ -789,10 +789,10 @@ index 605af1a9fc48602643aec57dd14e8c4ab657a0bc..b3085c7ff8b3e96083d209f6612c0065 /** diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index bb9ae81870a340c00d7480aff5106dc2c44dab8a..2522f7798962695577479a75f3095b72ee76e442 100644 +index e3f440c9d9ce3b5710ed1b7f71522899fb98459f..a4578c520aa1078a741aac4b12fe89bf82b3c465 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -389,9 +389,9 @@ public enum EntityType implements Keyed, Translatable { +@@ -397,9 +397,9 @@ public enum EntityType implements Keyed, Translatable { * * @param name the entity type's name * @return the matching entity type or null @@ -895,10 +895,10 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d6af835abd8b31cf177ad2912215d80ff7629e64..c463a52aef540e7b69c5ea32bce1239ed6c57a4f 100644 +index fe06d06cf97b1b020c771fb455f644d68097f1ef..1afa65152f56e42793cb53a049e06b16eabe2ce4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1497,11 +1497,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1498,11 +1498,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Forces an update of the player's entire inventory. @@ -1913,10 +1913,10 @@ index 0ea9c6b2420a0f990bd1fdf50fc015e37a7060d8..e99644eae1c662b117aa19060d2484ac /** diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java -index 5f3aa6fd18d57055a6d8494938dff149d51b2803..ceba656b25f74d4bb2eadb9a7eca184b069b4909 100644 +index b7c394fb70cc3449e5c9c5756956d9b048b5c019..3070f039a583647e7c9a8f15d63291cd265db9fc 100644 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java -@@ -220,9 +220,9 @@ public abstract class PotionEffectType implements Keyed { +@@ -239,9 +239,9 @@ public abstract class PotionEffectType implements Keyed { * Returns the unique ID of this type. * * @return Unique ID @@ -1925,10 +1925,10 @@ index 5f3aa6fd18d57055a6d8494938dff149d51b2803..ceba656b25f74d4bb2eadb9a7eca184b */ - @Deprecated + @Deprecated(forRemoval = true, since = "1.20.2") // Paper - public int getId() { - return id; - } -@@ -304,9 +304,9 @@ public abstract class PotionEffectType implements Keyed { + public abstract int getId(); + + /** +@@ -277,9 +277,9 @@ public abstract class PotionEffectType implements Keyed { * * @param id Unique ID to fetch * @return Resulting type, or null if not found. @@ -1939,7 +1939,7 @@ index 5f3aa6fd18d57055a6d8494938dff149d51b2803..ceba656b25f74d4bb2eadb9a7eca184b + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static PotionEffectType getById(int id) { - if (id >= byId.length || id < 0) + PotionEffectType type = ID_MAP.get(id); diff --git a/src/test/java/org/bukkit/materials/MaterialDataTest.java b/src/test/java/org/bukkit/materials/MaterialDataTest.java index 8d78435cc42a9e668b2d4d674b79b4094c3bd1b1..24a8ce4387b897c717b55405f363ffafff45894d 100644 --- a/src/test/java/org/bukkit/materials/MaterialDataTest.java diff --git a/patches/unapplied/api/0174-Server-Tick-Events.patch b/patches/api/0174-Server-Tick-Events.patch similarity index 100% rename from patches/unapplied/api/0174-Server-Tick-Events.patch rename to patches/api/0174-Server-Tick-Events.patch diff --git a/patches/unapplied/api/0175-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0175-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/unapplied/api/0175-PlayerDeathEvent-getItemsToKeep.patch rename to patches/api/0175-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/unapplied/api/0176-Add-Heightmap-API.patch b/patches/api/0176-Add-Heightmap-API.patch similarity index 100% rename from patches/unapplied/api/0176-Add-Heightmap-API.patch rename to patches/api/0176-Add-Heightmap-API.patch diff --git a/patches/unapplied/api/0177-Mob-Spawner-API-Enhancements.patch b/patches/api/0177-Mob-Spawner-API-Enhancements.patch similarity index 85% rename from patches/unapplied/api/0177-Mob-Spawner-API-Enhancements.patch rename to patches/api/0177-Mob-Spawner-API-Enhancements.patch index 4928839428..a59a7e0f31 100644 --- a/patches/unapplied/api/0177-Mob-Spawner-API-Enhancements.patch +++ b/patches/api/0177-Mob-Spawner-API-Enhancements.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Mob Spawner API Enhancements diff --git a/src/main/java/org/bukkit/block/CreatureSpawner.java b/src/main/java/org/bukkit/block/CreatureSpawner.java -index 8dae9611e702d93b202563597c50752c5f5b77d4..3dcab76632c4f8646d7ae62bb8de287eb6ef55b5 100644 +index c33f6573a9cb0a1516539a1947760a093aa08051..5e0fae5a602ab242f00c1f6aead68cc12579bc97 100644 --- a/src/main/java/org/bukkit/block/CreatureSpawner.java +++ b/src/main/java/org/bukkit/block/CreatureSpawner.java -@@ -199,4 +199,30 @@ public interface CreatureSpawner extends TileState { - * @see #getSpawnRange() +@@ -277,4 +277,30 @@ public interface CreatureSpawner extends TileState { */ - public void setSpawnRange(int spawnRange); + @NotNull + public List getPotentialSpawns(); + + // Paper start + /** diff --git a/patches/unapplied/api/0178-Add-BlockSoundGroup-interface.patch b/patches/api/0178-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/unapplied/api/0178-Add-BlockSoundGroup-interface.patch rename to patches/api/0178-Add-BlockSoundGroup-interface.patch diff --git a/patches/unapplied/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/unapplied/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/unapplied/api/0180-Increase-custom-payload-channel-message-size.patch b/patches/api/0180-Increase-custom-payload-channel-message-size.patch similarity index 100% rename from patches/unapplied/api/0180-Increase-custom-payload-channel-message-size.patch rename to patches/api/0180-Increase-custom-payload-channel-message-size.patch diff --git a/patches/unapplied/api/0181-Expose-the-internal-current-tick.patch b/patches/api/0181-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/unapplied/api/0181-Expose-the-internal-current-tick.patch rename to patches/api/0181-Expose-the-internal-current-tick.patch diff --git a/patches/unapplied/api/0182-Improve-Block-breakNaturally-API.patch b/patches/api/0182-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/unapplied/api/0182-Improve-Block-breakNaturally-API.patch rename to patches/api/0182-Improve-Block-breakNaturally-API.patch diff --git a/patches/unapplied/api/0183-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0183-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/unapplied/api/0183-PlayerDeathEvent-shouldDropExperience.patch rename to patches/api/0183-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/unapplied/api/0184-Add-ThrownEggHatchEvent.patch b/patches/api/0184-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/unapplied/api/0184-Add-ThrownEggHatchEvent.patch rename to patches/api/0184-Add-ThrownEggHatchEvent.patch diff --git a/patches/unapplied/api/0185-Entity-Jump-API.patch b/patches/api/0185-Entity-Jump-API.patch similarity index 100% rename from patches/unapplied/api/0185-Entity-Jump-API.patch rename to patches/api/0185-Entity-Jump-API.patch diff --git a/patches/unapplied/api/0186-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0186-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/unapplied/api/0186-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/api/0186-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/unapplied/api/0187-Add-tick-times-API.patch b/patches/api/0187-Add-tick-times-API.patch similarity index 100% rename from patches/unapplied/api/0187-Add-tick-times-API.patch rename to patches/api/0187-Add-tick-times-API.patch diff --git a/patches/unapplied/api/0188-Expose-MinecraftServer-isRunning.patch b/patches/api/0188-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/unapplied/api/0188-Expose-MinecraftServer-isRunning.patch rename to patches/api/0188-Expose-MinecraftServer-isRunning.patch diff --git a/patches/unapplied/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/unapplied/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/unapplied/api/0190-Add-Player-Client-Options-API.patch b/patches/api/0190-Add-Player-Client-Options-API.patch similarity index 98% rename from patches/unapplied/api/0190-Add-Player-Client-Options-API.patch rename to patches/api/0190-Add-Player-Client-Options-API.patch index b656d3e70c..1d1189fbe0 100644 --- a/patches/unapplied/api/0190-Add-Player-Client-Options-API.patch +++ b/patches/api/0190-Add-Player-Client-Options-API.patch @@ -229,10 +229,10 @@ index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f52 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c463a52aef540e7b69c5ea32bce1239ed6c57a4f..46e78e3e7102e3e91f10ac001dca555e13732247 100644 +index 1afa65152f56e42793cb53a049e06b16eabe2ce4..cf2090ee92e7245c028a0e625cdb483665b3821f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2932,6 +2932,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2980,6 +2980,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Reset the cooldown counter to 0, effectively starting the cooldown period. */ void resetCooldown(); diff --git a/patches/unapplied/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/unapplied/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch similarity index 100% rename from patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch rename to patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch diff --git a/patches/unapplied/api/0193-Add-item-slot-convenience-methods.patch b/patches/api/0193-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/unapplied/api/0193-Add-item-slot-convenience-methods.patch rename to patches/api/0193-Add-item-slot-convenience-methods.patch diff --git a/patches/unapplied/api/0194-Villager-Restocks-API.patch b/patches/api/0194-Villager-Restocks-API.patch similarity index 100% rename from patches/unapplied/api/0194-Villager-Restocks-API.patch rename to patches/api/0194-Villager-Restocks-API.patch diff --git a/patches/unapplied/api/0195-Expose-game-version.patch b/patches/api/0195-Expose-game-version.patch similarity index 100% rename from patches/unapplied/api/0195-Expose-game-version.patch rename to patches/api/0195-Expose-game-version.patch diff --git a/patches/unapplied/api/0196-Add-Mob-Goal-API.patch b/patches/api/0196-Add-Mob-Goal-API.patch similarity index 100% rename from patches/unapplied/api/0196-Add-Mob-Goal-API.patch rename to patches/api/0196-Add-Mob-Goal-API.patch diff --git a/patches/unapplied/api/0197-Add-villager-reputation-API.patch b/patches/api/0197-Add-villager-reputation-API.patch similarity index 100% rename from patches/unapplied/api/0197-Add-villager-reputation-API.patch rename to patches/api/0197-Add-villager-reputation-API.patch diff --git a/patches/unapplied/api/0198-Spawn-Reason-API.patch b/patches/api/0198-Spawn-Reason-API.patch similarity index 95% rename from patches/unapplied/api/0198-Spawn-Reason-API.patch rename to patches/api/0198-Spawn-Reason-API.patch index 4c67aec1bf..97edb6ab3f 100644 --- a/patches/unapplied/api/0198-Spawn-Reason-API.patch +++ b/patches/api/0198-Spawn-Reason-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Spawn Reason API diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java -index 656c060aee5d9ce778638253603ed9475a2612a1..b8575fbc7d30a3f4e6862193e3267ab06e91c32f 100644 +index 458119a9ef7ce8e1f59bd47caa5b4bc698715440..316d04db78c23ec236cc6f8d5c17e328cbd8ec75 100644 --- a/src/main/java/org/bukkit/RegionAccessor.java +++ b/src/main/java/org/bukkit/RegionAccessor.java -@@ -308,8 +308,31 @@ public interface RegionAccessor { +@@ -326,8 +326,31 @@ public interface RegionAccessor { * @throws IllegalArgumentException if either parameter is null or the * {@link Entity} requested cannot be spawned */ diff --git a/patches/unapplied/api/0199-Potential-bed-API.patch b/patches/api/0199-Potential-bed-API.patch similarity index 100% rename from patches/unapplied/api/0199-Potential-bed-API.patch rename to patches/api/0199-Potential-bed-API.patch diff --git a/patches/unapplied/api/0200-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0200-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/unapplied/api/0200-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/api/0200-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/unapplied/api/0201-Improve-Arrow-API.patch b/patches/api/0201-Improve-Arrow-API.patch similarity index 100% rename from patches/unapplied/api/0201-Improve-Arrow-API.patch rename to patches/api/0201-Improve-Arrow-API.patch diff --git a/patches/unapplied/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/unapplied/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/unapplied/api/0203-Support-components-in-ItemMeta.patch b/patches/api/0203-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/unapplied/api/0203-Support-components-in-ItemMeta.patch rename to patches/api/0203-Support-components-in-ItemMeta.patch diff --git a/patches/unapplied/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/unapplied/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/unapplied/api/0205-Add-entity-liquid-API.patch b/patches/api/0205-Add-entity-liquid-API.patch similarity index 88% rename from patches/unapplied/api/0205-Add-entity-liquid-API.patch rename to patches/api/0205-Add-entity-liquid-API.patch index 11fa994481..cefdd0dc5a 100644 --- a/patches/unapplied/api/0205-Add-entity-liquid-API.patch +++ b/patches/api/0205-Add-entity-liquid-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 20a83a2fa9f3d65837fffb027b1f8f1e76957770..e9477b04e52fac843c1c15a47325b7bb29f9c6c5 100644 +index 3117bf9d61b507175cfb673095763a5d6bc802ba..72878285779dcfc6f365dc983f79b6e542792b89 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -801,5 +801,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -845,5 +845,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); diff --git a/patches/unapplied/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/unapplied/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/unapplied/api/0207-Add-BellRingEvent.patch b/patches/api/0207-Add-BellRingEvent.patch similarity index 100% rename from patches/unapplied/api/0207-Add-BellRingEvent.patch rename to patches/api/0207-Add-BellRingEvent.patch diff --git a/patches/unapplied/api/0208-Brand-support.patch b/patches/api/0208-Brand-support.patch similarity index 85% rename from patches/unapplied/api/0208-Brand-support.patch rename to patches/api/0208-Brand-support.patch index 96ccbb2ba9..8f8ba72f55 100644 --- a/patches/unapplied/api/0208-Brand-support.patch +++ b/patches/api/0208-Brand-support.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 46e78e3e7102e3e91f10ac001dca555e13732247..45065768d73075f065ca98064ca9813918e05747 100644 +index cf2090ee92e7245c028a0e625cdb483665b3821f..110d3d031ae2408e5caac2fdfd3f8f8efbeb7e05 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3046,6 +3046,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3094,6 +3094,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM // Paper end } diff --git a/patches/unapplied/api/0209-Add-moon-phase-API.patch b/patches/api/0209-Add-moon-phase-API.patch similarity index 86% rename from patches/unapplied/api/0209-Add-moon-phase-API.patch rename to patches/api/0209-Add-moon-phase-API.patch index fcac0b75cb..d949b274a6 100644 --- a/patches/unapplied/api/0209-Add-moon-phase-API.patch +++ b/patches/api/0209-Add-moon-phase-API.patch @@ -47,13 +47,13 @@ index 0000000000000000000000000000000000000000..df05153397b42930cd53d37b30824c7e + } +} diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java -index b8575fbc7d30a3f4e6862193e3267ab06e91c32f..3e5597bac0971f28009a50bfde0cd7f0f10bd876 100644 +index 316d04db78c23ec236cc6f8d5c17e328cbd8ec75..27eff0826d5b5b48697fefd9571886e7bbce74b1 100644 --- a/src/main/java/org/bukkit/RegionAccessor.java +++ b/src/main/java/org/bukkit/RegionAccessor.java -@@ -416,4 +416,12 @@ public interface RegionAccessor { - * {@link HeightMap} +@@ -445,4 +445,12 @@ public interface RegionAccessor { */ - public int getHighestBlockYAt(@NotNull Location location, @NotNull HeightMap heightMap); + @NotNull + public T addEntity(@NotNull T entity); + + // Paper start + /** diff --git a/patches/unapplied/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/unapplied/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/unapplied/api/0211-Add-more-Evoker-API.patch b/patches/api/0211-Add-more-Evoker-API.patch similarity index 100% rename from patches/unapplied/api/0211-Add-more-Evoker-API.patch rename to patches/api/0211-Add-more-Evoker-API.patch diff --git a/patches/unapplied/api/0212-Add-methods-to-get-translation-keys.patch b/patches/api/0212-Add-methods-to-get-translation-keys.patch similarity index 95% rename from patches/unapplied/api/0212-Add-methods-to-get-translation-keys.patch rename to patches/api/0212-Add-methods-to-get-translation-keys.patch index 8d9c9940c2..612c68c938 100644 --- a/patches/unapplied/api/0212-Add-methods-to-get-translation-keys.patch +++ b/patches/api/0212-Add-methods-to-get-translation-keys.patch @@ -119,7 +119,7 @@ index 81e45984a88fc84acd0f76d825abf4ddaed0ac3b..fdc42a79c5af30fdade41ee99245e664 /** diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java -index 3ac563da8c7d2ef70d46fc451a6752f6b1fc1d1e..695a299a3544547bbc24095980221205ce5469ba 100644 +index cca5267019052f77149f9913babd8b17abafe94f..be827e7fef0acb17bd41aeff9dc3dc4da3718e5e 100644 --- a/src/main/java/org/bukkit/GameRule.java +++ b/src/main/java/org/bukkit/GameRule.java @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; @@ -131,7 +131,7 @@ index 3ac563da8c7d2ef70d46fc451a6752f6b1fc1d1e..695a299a3544547bbc24095980221205 private static Map> gameRules = new HashMap<>(); // Boolean rules -@@ -327,4 +327,11 @@ public final class GameRule { +@@ -350,4 +350,11 @@ public final class GameRule { public static GameRule[] values() { return gameRules.values().toArray(new GameRule[gameRules.size()]); } @@ -144,10 +144,10 @@ index 3ac563da8c7d2ef70d46fc451a6752f6b1fc1d1e..695a299a3544547bbc24095980221205 + // Paper end } diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 2d7cd77002c32e88bfa677f86d645ee6b541062c..0e898adaf484aee13430d61be02ac1e72b82da93 100644 +index c24fe19600fa8440c130eaea247d5874da3873ec..af1dca2385215e8fd19353aa6e9c024d4ad814e1 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -119,7 +119,7 @@ import org.jetbrains.annotations.Nullable; +@@ -122,7 +122,7 @@ import org.jetbrains.annotations.Nullable; * An enum of all material IDs accepted by the official server and client */ @SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper @@ -156,7 +156,7 @@ index 2d7cd77002c32e88bfa677f86d645ee6b541062c..0e898adaf484aee13430d61be02ac1e7 // AIR(9648, 0), STONE(22948), -@@ -4453,6 +4453,15 @@ public enum Material implements Keyed, Translatable { +@@ -4699,6 +4699,15 @@ public enum Material implements Keyed, Translatable { } return false; } @@ -172,7 +172,7 @@ index 2d7cd77002c32e88bfa677f86d645ee6b541062c..0e898adaf484aee13430d61be02ac1e7 // Paper end /** -@@ -10956,9 +10965,11 @@ public enum Material implements Keyed, Translatable { +@@ -11402,9 +11411,11 @@ public enum Material implements Keyed, Translatable { * material * @see #getBlockTranslationKey() * @see #getItemTranslationKey() @@ -308,10 +308,10 @@ index 22cfffddb681a7ed95e19f4da6e2c272d22a6f69..4dcfff9aa28eec3467d49d6fcc00f229 // Paper end } diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index 2dc749936df6168073a5bb9f9051d55f8589ac62..1b6f42ff632b1f3f5034c825e99b72f389a890b4 100644 +index 6a915b5b41daa5ea64913a2d5c611a6167168395..4a88198be6634b47fc51e55acc5f6415e4aff1ab 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java -@@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable; +@@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable; /** * The various type of enchantments that may be added to armour or weapons */ @@ -321,10 +321,10 @@ index 2dc749936df6168073a5bb9f9051d55f8589ac62..1b6f42ff632b1f3f5034c825e99b72f3 * Provides protection against environmental damage */ diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java -index 4d5f0837bd0e02a30c943d8969fb6b13452322e0..a39f9c078f42451bd122f3e3729d10ca299bee5f 100644 +index c4f86ba1037f3f0e5d697a0962d71d6f8c7c1fbe..ac0371285370594d4de1554871b19bbcd2311730 100644 --- a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java +++ b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java -@@ -69,5 +69,10 @@ public class EnchantmentWrapper extends Enchantment { +@@ -26,5 +26,10 @@ public abstract class EnchantmentWrapper extends Enchantment { public net.kyori.adventure.text.Component displayName(int level) { return getEnchantment().displayName(level); } @@ -336,10 +336,10 @@ index 4d5f0837bd0e02a30c943d8969fb6b13452322e0..a39f9c078f42451bd122f3e3729d10ca // Paper end } diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 2522f7798962695577479a75f3095b72ee76e442..20e6383543880eca7987500bd041e60297d0b1ff 100644 +index a4578c520aa1078a741aac4b12fe89bf82b3c465..550d66e0d41878717c6a92caade4a8413674f012 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Contract; +@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -348,7 +348,7 @@ index 2522f7798962695577479a75f3095b72ee76e442..20e6383543880eca7987500bd041e602 // These strings MUST match the strings in nms.EntityTypes and are case sensitive. /** -@@ -435,10 +435,22 @@ public enum EntityType implements Keyed, Translatable { +@@ -443,10 +443,22 @@ public enum EntityType implements Keyed, Translatable { @Override @NotNull diff --git a/patches/unapplied/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/unapplied/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/unapplied/api/0214-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/unapplied/api/0214-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/unapplied/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/unapplied/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/unapplied/api/0216-Entity-isTicking.patch b/patches/api/0216-Entity-isTicking.patch similarity index 79% rename from patches/unapplied/api/0216-Entity-isTicking.patch rename to patches/api/0216-Entity-isTicking.patch index 345c297eaa..8d63d599c7 100644 --- a/patches/unapplied/api/0216-Entity-isTicking.patch +++ b/patches/api/0216-Entity-isTicking.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e9477b04e52fac843c1c15a47325b7bb29f9c6c5..1dda73ca06a8d513cc3e9a3e4b1739520ca900ec 100644 +index 72878285779dcfc6f365dc983f79b6e542792b89..9eb90abcdd5ee78e495b2b53ed8643593e9485d3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -836,5 +836,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -880,5 +880,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * Check if entity is in lava */ boolean isInLava(); diff --git a/patches/unapplied/api/0217-Villager-resetOffers.patch b/patches/api/0217-Villager-resetOffers.patch similarity index 100% rename from patches/unapplied/api/0217-Villager-resetOffers.patch rename to patches/api/0217-Villager-resetOffers.patch diff --git a/patches/unapplied/api/0218-Player-elytra-boost-API.patch b/patches/api/0218-Player-elytra-boost-API.patch similarity index 90% rename from patches/unapplied/api/0218-Player-elytra-boost-API.patch rename to patches/api/0218-Player-elytra-boost-API.patch index 17fff34136..2c50e28530 100644 --- a/patches/unapplied/api/0218-Player-elytra-boost-API.patch +++ b/patches/api/0218-Player-elytra-boost-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 45065768d73075f065ca98064ca9813918e05747..0cb487cd32a5d47eeb56da2acbae6cc1e1409b62 100644 +index 110d3d031ae2408e5caac2fdfd3f8f8efbeb7e05..9f1e3bc711e34a1a30aefc7c60068c84e3ea02ba 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2938,6 +2938,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2986,6 +2986,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ @NotNull T getClientOption(@NotNull com.destroystokyo.paper.ClientOption option); diff --git a/patches/unapplied/api/0219-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/unapplied/api/0219-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0219-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/unapplied/api/0220-Add-ignore-discounts-API.patch b/patches/api/0220-Add-ignore-discounts-API.patch similarity index 100% rename from patches/unapplied/api/0220-Add-ignore-discounts-API.patch rename to patches/api/0220-Add-ignore-discounts-API.patch diff --git a/patches/unapplied/api/0221-Item-no-age-no-player-pickup.patch b/patches/api/0221-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/unapplied/api/0221-Item-no-age-no-player-pickup.patch rename to patches/api/0221-Item-no-age-no-player-pickup.patch diff --git a/patches/unapplied/api/0222-Beacon-API-custom-effect-ranges.patch b/patches/api/0222-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/unapplied/api/0222-Beacon-API-custom-effect-ranges.patch rename to patches/api/0222-Beacon-API-custom-effect-ranges.patch diff --git a/patches/unapplied/api/0223-Add-API-for-quit-reason.patch b/patches/api/0223-Add-API-for-quit-reason.patch similarity index 100% rename from patches/unapplied/api/0223-Add-API-for-quit-reason.patch rename to patches/api/0223-Add-API-for-quit-reason.patch diff --git a/patches/unapplied/api/0224-Add-Destroy-Speed-API.patch b/patches/api/0224-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/unapplied/api/0224-Add-Destroy-Speed-API.patch rename to patches/api/0224-Add-Destroy-Speed-API.patch diff --git a/patches/unapplied/api/0225-Add-LivingEntity-clearActiveItem.patch b/patches/api/0225-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/unapplied/api/0225-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0225-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/unapplied/api/0226-Add-PlayerItemCooldownEvent.patch b/patches/api/0226-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/unapplied/api/0226-Add-PlayerItemCooldownEvent.patch rename to patches/api/0226-Add-PlayerItemCooldownEvent.patch diff --git a/patches/unapplied/api/0227-More-lightning-API.patch b/patches/api/0227-More-lightning-API.patch similarity index 100% rename from patches/unapplied/api/0227-More-lightning-API.patch rename to patches/api/0227-More-lightning-API.patch diff --git a/patches/unapplied/api/0228-Add-PlayerShearBlockEvent.patch b/patches/api/0228-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/unapplied/api/0228-Add-PlayerShearBlockEvent.patch rename to patches/api/0228-Add-PlayerShearBlockEvent.patch diff --git a/patches/unapplied/api/0229-Player-Chunk-Load-Unload-Events.patch b/patches/api/0229-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/unapplied/api/0229-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0229-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/unapplied/api/0230-Expose-LivingEntity-hurt-direction.patch b/patches/api/0230-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/unapplied/api/0230-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0230-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/unapplied/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/unapplied/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/unapplied/api/0232-Added-PlayerTradeEvent.patch b/patches/api/0232-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/unapplied/api/0232-Added-PlayerTradeEvent.patch rename to patches/api/0232-Added-PlayerTradeEvent.patch diff --git a/patches/unapplied/api/0233-Add-TargetHitEvent-API.patch b/patches/api/0233-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/unapplied/api/0233-Add-TargetHitEvent-API.patch rename to patches/api/0233-Add-TargetHitEvent-API.patch diff --git a/patches/unapplied/api/0234-Additional-Block-Material-API-s.patch b/patches/api/0234-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/unapplied/api/0234-Additional-Block-Material-API-s.patch rename to patches/api/0234-Additional-Block-Material-API-s.patch diff --git a/patches/unapplied/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/unapplied/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/unapplied/api/0236-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/unapplied/api/0236-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/unapplied/api/0237-Zombie-API-breaking-doors.patch b/patches/api/0237-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/unapplied/api/0237-Zombie-API-breaking-doors.patch rename to patches/api/0237-Zombie-API-breaking-doors.patch diff --git a/patches/unapplied/api/0238-Add-EntityLoadCrossbowEvent.patch b/patches/api/0238-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/unapplied/api/0238-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0238-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/unapplied/api/0239-Added-WorldGameRuleChangeEvent.patch b/patches/api/0239-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0239-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0239-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/unapplied/api/0240-Added-ServerResourcesReloadedEvent.patch b/patches/api/0240-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/unapplied/api/0240-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0240-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/unapplied/api/0241-Add-BlockFailedDispenseEvent.patch b/patches/api/0241-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/unapplied/api/0241-Add-BlockFailedDispenseEvent.patch rename to patches/api/0241-Add-BlockFailedDispenseEvent.patch diff --git a/patches/unapplied/api/0242-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0242-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0242-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0242-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/unapplied/api/0243-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/unapplied/api/0243-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/unapplied/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/unapplied/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/unapplied/api/0245-Add-sendOpLevel-API.patch b/patches/api/0245-Add-sendOpLevel-API.patch similarity index 87% rename from patches/unapplied/api/0245-Add-sendOpLevel-API.patch rename to patches/api/0245-Add-sendOpLevel-API.patch index d8362da637..53c84f2f9d 100644 --- a/patches/unapplied/api/0245-Add-sendOpLevel-API.patch +++ b/patches/api/0245-Add-sendOpLevel-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 0cb487cd32a5d47eeb56da2acbae6cc1e1409b62..107edde2e9189f29dde2211cc9e17cbeed3696ae 100644 +index 9f1e3bc711e34a1a30aefc7c60068c84e3ea02ba..1efce69d16014147ae022ecf33eaed934236a7c1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2958,6 +2958,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3006,6 +3006,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM } // Paper end diff --git a/patches/unapplied/api/0246-Add-PaperRegistry.patch b/patches/api/0246-Add-PaperRegistry.patch similarity index 100% rename from patches/unapplied/api/0246-Add-PaperRegistry.patch rename to patches/api/0246-Add-PaperRegistry.patch diff --git a/patches/unapplied/api/0247-Add-StructuresLocateEvent.patch b/patches/api/0247-Add-StructuresLocateEvent.patch similarity index 99% rename from patches/unapplied/api/0247-Add-StructuresLocateEvent.patch rename to patches/api/0247-Add-StructuresLocateEvent.patch index 83e069116b..9396a38a85 100644 --- a/patches/unapplied/api/0247-Add-StructuresLocateEvent.patch +++ b/patches/api/0247-Add-StructuresLocateEvent.patch @@ -505,10 +505,10 @@ index 0000000000000000000000000000000000000000..1e7b53f9bc13dcd5a0a4a40004591e4f + } +} diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index 8e0f985e8a6af728376a85eef998f7881e50786c..469ef0a9241fddbd869ac2c0662c98b3022cc8aa 100644 +index 79d1ed1750d9ed843da128a0d047ae455f12ae38..4a9c196a2caeb7f1b180347b480ed48056ad6a00 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -261,6 +261,17 @@ public interface Registry extends Iterable { +@@ -248,6 +248,17 @@ public interface Registry extends Iterable { * @see GameEvent */ Registry GAME_EVENT = Objects.requireNonNull(Bukkit.getRegistry(GameEvent.class), "No registry present for GameEvent. This is a bug."); diff --git a/patches/unapplied/api/0248-Add-BlockPreDispenseEvent.patch b/patches/api/0248-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/unapplied/api/0248-Add-BlockPreDispenseEvent.patch rename to patches/api/0248-Add-BlockPreDispenseEvent.patch diff --git a/patches/unapplied/api/0249-Added-missing-vanilla-tags.patch b/patches/api/0249-Added-missing-vanilla-tags.patch similarity index 91% rename from patches/unapplied/api/0249-Added-missing-vanilla-tags.patch rename to patches/api/0249-Added-missing-vanilla-tags.patch index 1b1e570e1a..cfa894aa95 100644 --- a/patches/unapplied/api/0249-Added-missing-vanilla-tags.patch +++ b/patches/api/0249-Added-missing-vanilla-tags.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added missing vanilla tags diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 69462a0679c255acee2adb84f590523d3fc3c9aa..4beb607c31705e182ac04c48bdc2a1de13eb9b4c 100644 +index 971bc2e3ae0c265664e2fc3105f4be3027edce26..31bdecf8cbea40129a568c1761f27fa1ae0f535a 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java @@ -767,6 +767,12 @@ public interface Tag extends Keyed { diff --git a/patches/unapplied/api/0250-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0250-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/unapplied/api/0250-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0250-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/unapplied/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/unapplied/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/unapplied/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/unapplied/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/unapplied/api/0253-add-DragonEggFormEvent.patch b/patches/api/0253-add-DragonEggFormEvent.patch similarity index 100% rename from patches/unapplied/api/0253-add-DragonEggFormEvent.patch rename to patches/api/0253-add-DragonEggFormEvent.patch diff --git a/patches/unapplied/api/0254-EntityMoveEvent.patch b/patches/api/0254-EntityMoveEvent.patch similarity index 100% rename from patches/unapplied/api/0254-EntityMoveEvent.patch rename to patches/api/0254-EntityMoveEvent.patch diff --git a/patches/unapplied/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/unapplied/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/unapplied/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/unapplied/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/unapplied/api/0257-living-entity-allow-attribute-registration.patch b/patches/api/0257-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/unapplied/api/0257-living-entity-allow-attribute-registration.patch rename to patches/api/0257-living-entity-allow-attribute-registration.patch diff --git a/patches/unapplied/api/0258-Add-missing-effects.patch b/patches/api/0258-Add-missing-effects.patch similarity index 100% rename from patches/unapplied/api/0258-Add-missing-effects.patch rename to patches/api/0258-Add-missing-effects.patch diff --git a/patches/unapplied/api/0259-Expose-Tracked-Players.patch b/patches/api/0259-Expose-Tracked-Players.patch similarity index 84% rename from patches/unapplied/api/0259-Expose-Tracked-Players.patch rename to patches/api/0259-Expose-Tracked-Players.patch index ef64931c5d..1abd6a33aa 100644 --- a/patches/unapplied/api/0259-Expose-Tracked-Players.patch +++ b/patches/api/0259-Expose-Tracked-Players.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 1dda73ca06a8d513cc3e9a3e4b1739520ca900ec..e0e3af0f229f8af66de70d7b741200e301476677 100644 +index 9eb90abcdd5ee78e495b2b53ed8643593e9485d3..d98fe98f703ff478ea4427783fd68debe9a6f267 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -841,5 +841,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -885,5 +885,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * Check if entity is inside a ticking chunk */ boolean isTicking(); diff --git a/patches/unapplied/api/0260-Cache-the-result-of-Material-isBlock.patch b/patches/api/0260-Cache-the-result-of-Material-isBlock.patch similarity index 81% rename from patches/unapplied/api/0260-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0260-Cache-the-result-of-Material-isBlock.patch index 7fd62aa199..ee04af53bb 100644 --- a/patches/unapplied/api/0260-Cache-the-result-of-Material-isBlock.patch +++ b/patches/api/0260-Cache-the-result-of-Material-isBlock.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Cache the result of Material#isBlock diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 0e898adaf484aee13430d61be02ac1e72b82da93..c175b12786ce1c864faa898d9948f5dce5776299 100644 +index af1dca2385215e8fd19353aa6e9c024d4ad814e1..85604d2c364c41fed24257a9b02ceeb58712f6a2 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4397,6 +4397,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4643,6 +4643,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla public final Class data; private final boolean legacy; private final NamespacedKey key; @@ -16,7 +16,7 @@ index 0e898adaf484aee13430d61be02ac1e72b82da93..c175b12786ce1c864faa898d9948f5dc private Material(final int id) { this(id, 64); -@@ -4595,6 +4596,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4841,6 +4842,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * @return true if this material is a block */ public boolean isBlock() { @@ -28,7 +28,7 @@ index 0e898adaf484aee13430d61be02ac1e72b82da93..c175b12786ce1c864faa898d9948f5dc switch (this) { // case ACACIA_BUTTON: -@@ -5781,6 +5787,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -6082,6 +6088,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla static { for (Material material : values()) { BY_NAME.put(material.name(), material); diff --git a/patches/unapplied/api/0261-Add-worldborder-events.patch b/patches/api/0261-Add-worldborder-events.patch similarity index 100% rename from patches/unapplied/api/0261-Add-worldborder-events.patch rename to patches/api/0261-Add-worldborder-events.patch diff --git a/patches/unapplied/api/0262-added-PlayerNameEntityEvent.patch b/patches/api/0262-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/unapplied/api/0262-added-PlayerNameEntityEvent.patch rename to patches/api/0262-added-PlayerNameEntityEvent.patch diff --git a/patches/unapplied/api/0263-Add-recipe-to-cook-events.patch b/patches/api/0263-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/unapplied/api/0263-Add-recipe-to-cook-events.patch rename to patches/api/0263-Add-recipe-to-cook-events.patch diff --git a/patches/unapplied/api/0264-Add-Block-isValidTool.patch b/patches/api/0264-Add-Block-isValidTool.patch similarity index 100% rename from patches/unapplied/api/0264-Add-Block-isValidTool.patch rename to patches/api/0264-Add-Block-isValidTool.patch diff --git a/patches/unapplied/api/0265-Expand-world-key-API.patch b/patches/api/0265-Expand-world-key-API.patch similarity index 97% rename from patches/unapplied/api/0265-Expand-world-key-API.patch rename to patches/api/0265-Expand-world-key-API.patch index 0828581a4d..cc4843e552 100644 --- a/patches/unapplied/api/0265-Expand-world-key-API.patch +++ b/patches/api/0265-Expand-world-key-API.patch @@ -28,7 +28,7 @@ index c9f4ec3ff1aaca2f75fe0a7f0c85d63f3dfd97f8..1e6307106391056af17add97080cd1f1 /** * Create a new virtual {@link WorldBorder}. diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java -index 3e5597bac0971f28009a50bfde0cd7f0f10bd876..60ed2b36e18032270c0689cb2405a63a8a962fad 100644 +index 27eff0826d5b5b48697fefd9571886e7bbce74b1..d8b1fa79dc24138dc71e32c14bda71c1d570ed88 100644 --- a/src/main/java/org/bukkit/RegionAccessor.java +++ b/src/main/java/org/bukkit/RegionAccessor.java @@ -18,7 +18,7 @@ import org.jetbrains.annotations.Nullable; @@ -40,7 +40,7 @@ index 3e5597bac0971f28009a50bfde0cd7f0f10bd876..60ed2b36e18032270c0689cb2405a63a /** * Gets the {@link Biome} at the given {@link Location}. -@@ -423,5 +423,14 @@ public interface RegionAccessor { +@@ -452,5 +452,14 @@ public interface RegionAccessor { */ @NotNull io.papermc.paper.world.MoonPhase getMoonPhase(); diff --git a/patches/unapplied/api/0266-Item-Rarity-API.patch b/patches/api/0266-Item-Rarity-API.patch similarity index 95% rename from patches/unapplied/api/0266-Item-Rarity-API.patch rename to patches/api/0266-Item-Rarity-API.patch index 3529ee85d7..efa6d2216d 100644 --- a/patches/unapplied/api/0266-Item-Rarity-API.patch +++ b/patches/api/0266-Item-Rarity-API.patch @@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202 + } +} diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index c175b12786ce1c864faa898d9948f5dce5776299..b852d1f140def272400469c5edae74a966726ea4 100644 +index 85604d2c364c41fed24257a9b02ceeb58712f6a2..8fd928cfe61ab6f06c52eb5e4561fd6860e1f8d9 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4463,6 +4463,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4709,6 +4709,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla return Bukkit.getUnsafe().getBlockTranslationKey(this); } } diff --git a/patches/unapplied/api/0267-Expose-protocol-version.patch b/patches/api/0267-Expose-protocol-version.patch similarity index 100% rename from patches/unapplied/api/0267-Expose-protocol-version.patch rename to patches/api/0267-Expose-protocol-version.patch diff --git a/patches/unapplied/api/0268-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0268-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/unapplied/api/0268-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0268-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/unapplied/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/unapplied/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/unapplied/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/unapplied/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/unapplied/api/0271-Added-PlayerDeepSleepEvent.patch b/patches/api/0271-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/unapplied/api/0271-Added-PlayerDeepSleepEvent.patch rename to patches/api/0271-Added-PlayerDeepSleepEvent.patch diff --git a/patches/unapplied/api/0272-More-World-API.patch b/patches/api/0272-More-World-API.patch similarity index 100% rename from patches/unapplied/api/0272-More-World-API.patch rename to patches/api/0272-More-World-API.patch diff --git a/patches/unapplied/api/0273-Added-PlayerBedFailEnterEvent.patch b/patches/api/0273-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/unapplied/api/0273-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0273-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/unapplied/api/0274-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0274-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/unapplied/api/0274-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0274-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/unapplied/api/0275-PlayerMoveEvent-Improvements.patch b/patches/api/0275-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/unapplied/api/0275-PlayerMoveEvent-Improvements.patch rename to patches/api/0275-PlayerMoveEvent-Improvements.patch diff --git a/patches/unapplied/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/unapplied/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/unapplied/api/0277-Add-more-WanderingTrader-API.patch b/patches/api/0277-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/unapplied/api/0277-Add-more-WanderingTrader-API.patch rename to patches/api/0277-Add-more-WanderingTrader-API.patch diff --git a/patches/unapplied/api/0278-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0278-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/unapplied/api/0278-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0278-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/unapplied/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/unapplied/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/unapplied/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/unapplied/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/unapplied/api/0281-Inventory-close.patch b/patches/api/0281-Inventory-close.patch similarity index 100% rename from patches/unapplied/api/0281-Inventory-close.patch rename to patches/api/0281-Inventory-close.patch diff --git a/patches/unapplied/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/unapplied/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/unapplied/api/0283-Add-basic-Datapack-API.patch b/patches/api/0283-Add-basic-Datapack-API.patch similarity index 100% rename from patches/unapplied/api/0283-Add-basic-Datapack-API.patch rename to patches/api/0283-Add-basic-Datapack-API.patch diff --git a/patches/unapplied/api/0284-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0284-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0284-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0284-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/unapplied/api/0285-ItemStack-repair-check-API.patch b/patches/api/0285-ItemStack-repair-check-API.patch similarity index 100% rename from patches/unapplied/api/0285-ItemStack-repair-check-API.patch rename to patches/api/0285-ItemStack-repair-check-API.patch diff --git a/patches/unapplied/api/0286-More-Enchantment-API.patch b/patches/api/0286-More-Enchantment-API.patch similarity index 93% rename from patches/unapplied/api/0286-More-Enchantment-API.patch rename to patches/api/0286-More-Enchantment-API.patch index 88be180baf..98c3ef060b 100644 --- a/patches/unapplied/api/0286-More-Enchantment-API.patch +++ b/patches/api/0286-More-Enchantment-API.patch @@ -36,10 +36,10 @@ index 0000000000000000000000000000000000000000..e6a40c1fcea761bd66743b50e3da3d14 + } +} diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index 1b6f42ff632b1f3f5034c825e99b72f389a890b4..8183f26545998e076ad93b4e28f3a3ff693d1032 100644 +index 4a88198be6634b47fc51e55acc5f6415e4aff1ab..d50d4c3121a966adcc47173ddb4575f7ad504148 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java -@@ -273,11 +273,7 @@ public abstract class Enchantment implements Keyed, net.kyori.adventure.translat +@@ -269,11 +269,7 @@ public abstract class Enchantment implements Keyed, net.kyori.adventure.translat * Cursed enchantments are found the same way treasure enchantments are * * @return true if the enchantment is cursed @@ -51,7 +51,7 @@ index 1b6f42ff632b1f3f5034c825e99b72f389a890b4..8183f26545998e076ad93b4e28f3a3ff public abstract boolean isCursed(); /** -@@ -311,6 +307,70 @@ public abstract class Enchantment implements Keyed, net.kyori.adventure.translat +@@ -307,6 +303,70 @@ public abstract class Enchantment implements Keyed, net.kyori.adventure.translat * @return the name of the enchantment with {@code level} applied */ public abstract net.kyori.adventure.text.@NotNull Component displayName(int level); @@ -121,12 +121,12 @@ index 1b6f42ff632b1f3f5034c825e99b72f389a890b4..8183f26545998e076ad93b4e28f3a3ff + public abstract java.util.Set getActiveSlots(); // Paper end - @Override + /** diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java -index a39f9c078f42451bd122f3e3729d10ca299bee5f..4a838d6eab5a17d7204dba96a882b6c5a22636fc 100644 +index ac0371285370594d4de1554871b19bbcd2311730..da5d153a3e55a38b767359564001ad8663f9730b 100644 --- a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java +++ b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java -@@ -74,5 +74,42 @@ public class EnchantmentWrapper extends Enchantment { +@@ -31,5 +31,42 @@ public abstract class EnchantmentWrapper extends Enchantment { public @NotNull String translationKey() { return getEnchantment().translationKey(); } diff --git a/patches/unapplied/api/0287-Add-Mob-lookAt-API.patch b/patches/api/0287-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/unapplied/api/0287-Add-Mob-lookAt-API.patch rename to patches/api/0287-Add-Mob-lookAt-API.patch diff --git a/patches/unapplied/api/0288-ItemStack-editMeta.patch b/patches/api/0288-ItemStack-editMeta.patch similarity index 100% rename from patches/unapplied/api/0288-ItemStack-editMeta.patch rename to patches/api/0288-ItemStack-editMeta.patch diff --git a/patches/unapplied/api/0289-Add-EntityInsideBlockEvent.patch b/patches/api/0289-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/unapplied/api/0289-Add-EntityInsideBlockEvent.patch rename to patches/api/0289-Add-EntityInsideBlockEvent.patch diff --git a/patches/unapplied/api/0290-Attributes-API-for-item-defaults.patch b/patches/api/0290-Attributes-API-for-item-defaults.patch similarity index 93% rename from patches/unapplied/api/0290-Attributes-API-for-item-defaults.patch rename to patches/api/0290-Attributes-API-for-item-defaults.patch index 4491dba15e..6a98472b09 100644 --- a/patches/unapplied/api/0290-Attributes-API-for-item-defaults.patch +++ b/patches/api/0290-Attributes-API-for-item-defaults.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Attributes API for item defaults diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index b852d1f140def272400469c5edae74a966726ea4..85bec2ec7bfd68f3b515f62345d5656ac539f2c0 100644 +index 8fd928cfe61ab6f06c52eb5e4561fd6860e1f8d9..64ca3c676703eed55b4ac8a2d4561d483c6935b1 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4474,6 +4474,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4720,6 +4720,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla public io.papermc.paper.inventory.ItemRarity getItemRarity() { return Bukkit.getUnsafe().getItemRarity(this); } diff --git a/patches/unapplied/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/unapplied/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/unapplied/api/0292-More-Lidded-Block-API.patch b/patches/api/0292-More-Lidded-Block-API.patch similarity index 100% rename from patches/unapplied/api/0292-More-Lidded-Block-API.patch rename to patches/api/0292-More-Lidded-Block-API.patch diff --git a/patches/unapplied/api/0293-Add-PlayerKickEvent-causes.patch b/patches/api/0293-Add-PlayerKickEvent-causes.patch similarity index 96% rename from patches/unapplied/api/0293-Add-PlayerKickEvent-causes.patch rename to patches/api/0293-Add-PlayerKickEvent-causes.patch index 63e67ca4a2..c981afdab1 100644 --- a/patches/unapplied/api/0293-Add-PlayerKickEvent-causes.patch +++ b/patches/api/0293-Add-PlayerKickEvent-causes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerKickEvent causes diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 107edde2e9189f29dde2211cc9e17cbeed3696ae..6d8e4f23095716eeaea16206c3a4bb36f794f29f 100644 +index 1efce69d16014147ae022ecf33eaed934236a7c1..7ce512072f242632f17db55224488f18c1cddcc4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -274,6 +274,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -275,6 +275,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param message kick message */ void kick(final net.kyori.adventure.text.@Nullable Component message); diff --git a/patches/unapplied/api/0294-Add-PufferFishStateChangeEvent.patch b/patches/api/0294-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0294-Add-PufferFishStateChangeEvent.patch rename to patches/api/0294-Add-PufferFishStateChangeEvent.patch diff --git a/patches/unapplied/api/0295-Add-BellRevealRaiderEvent.patch b/patches/api/0295-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/unapplied/api/0295-Add-BellRevealRaiderEvent.patch rename to patches/api/0295-Add-BellRevealRaiderEvent.patch diff --git a/patches/unapplied/api/0296-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0296-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/unapplied/api/0296-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0296-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/unapplied/api/0297-Add-more-line-of-sight-methods.patch b/patches/api/0297-Add-more-line-of-sight-methods.patch similarity index 92% rename from patches/unapplied/api/0297-Add-more-line-of-sight-methods.patch rename to patches/api/0297-Add-more-line-of-sight-methods.patch index 1826f238f3..987e135331 100644 --- a/patches/unapplied/api/0297-Add-more-line-of-sight-methods.patch +++ b/patches/api/0297-Add-more-line-of-sight-methods.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add more line of sight methods diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java -index 60ed2b36e18032270c0689cb2405a63a8a962fad..3a0e0af739227d99d854b0d5c9bf342fe9363de4 100644 +index d8b1fa79dc24138dc71e32c14bda71c1d570ed88..b68367f123f029c3ff47eab6bfabd7a894a99da4 100644 --- a/src/main/java/org/bukkit/RegionAccessor.java +++ b/src/main/java/org/bukkit/RegionAccessor.java -@@ -432,5 +432,13 @@ public interface RegionAccessor extends Keyed { // Paper +@@ -461,5 +461,13 @@ public interface RegionAccessor extends Keyed { // Paper @NotNull @Override NamespacedKey getKey(); diff --git a/patches/unapplied/api/0298-Add-WaterBottleSplashEvent.patch b/patches/api/0298-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/unapplied/api/0298-Add-WaterBottleSplashEvent.patch rename to patches/api/0298-Add-WaterBottleSplashEvent.patch diff --git a/patches/unapplied/api/0299-Add-more-LimitedRegion-API.patch b/patches/api/0299-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/unapplied/api/0299-Add-more-LimitedRegion-API.patch rename to patches/api/0299-Add-more-LimitedRegion-API.patch diff --git a/patches/unapplied/api/0300-Missing-Entity-API.patch b/patches/api/0300-Missing-Entity-API.patch similarity index 100% rename from patches/unapplied/api/0300-Missing-Entity-API.patch rename to patches/api/0300-Missing-Entity-API.patch diff --git a/patches/unapplied/api/0301-Adds-PlayerArmSwingEvent.patch b/patches/api/0301-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/unapplied/api/0301-Adds-PlayerArmSwingEvent.patch rename to patches/api/0301-Adds-PlayerArmSwingEvent.patch diff --git a/patches/unapplied/api/0302-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0302-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/unapplied/api/0302-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0302-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/unapplied/api/0303-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0303-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/unapplied/api/0303-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0303-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/unapplied/api/0304-Stinger-API.patch b/patches/api/0304-Stinger-API.patch similarity index 100% rename from patches/unapplied/api/0304-Stinger-API.patch rename to patches/api/0304-Stinger-API.patch diff --git a/patches/unapplied/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/unapplied/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/unapplied/api/0306-Add-PlayerSetSpawnEvent.patch b/patches/api/0306-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0306-Add-PlayerSetSpawnEvent.patch rename to patches/api/0306-Add-PlayerSetSpawnEvent.patch diff --git a/patches/unapplied/api/0307-Added-EntityDamageItemEvent.patch b/patches/api/0307-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/unapplied/api/0307-Added-EntityDamageItemEvent.patch rename to patches/api/0307-Added-EntityDamageItemEvent.patch diff --git a/patches/unapplied/api/0308-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0308-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/unapplied/api/0308-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0308-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/unapplied/api/0309-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0309-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/unapplied/api/0309-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0309-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/unapplied/api/0310-Add-BlockBreakBlockEvent.patch b/patches/api/0310-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/unapplied/api/0310-Add-BlockBreakBlockEvent.patch rename to patches/api/0310-Add-BlockBreakBlockEvent.patch diff --git a/patches/unapplied/api/0311-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0311-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/unapplied/api/0311-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0311-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/unapplied/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/unapplied/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/unapplied/api/0313-More-CommandBlock-API.patch b/patches/api/0313-More-CommandBlock-API.patch similarity index 100% rename from patches/unapplied/api/0313-More-CommandBlock-API.patch rename to patches/api/0313-More-CommandBlock-API.patch diff --git a/patches/unapplied/api/0314-Add-missing-team-sidebar-display-slots.patch b/patches/api/0314-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/unapplied/api/0314-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0314-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/unapplied/api/0315-add-back-EntityPortalExitEvent.patch b/patches/api/0315-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/unapplied/api/0315-add-back-EntityPortalExitEvent.patch rename to patches/api/0315-add-back-EntityPortalExitEvent.patch diff --git a/patches/unapplied/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/unapplied/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/unapplied/api/0317-Get-entity-default-attributes.patch b/patches/api/0317-Get-entity-default-attributes.patch similarity index 94% rename from patches/unapplied/api/0317-Get-entity-default-attributes.patch rename to patches/api/0317-Get-entity-default-attributes.patch index 4ac43c22f3..d655cddecb 100644 --- a/patches/unapplied/api/0317-Get-entity-default-attributes.patch +++ b/patches/api/0317-Get-entity-default-attributes.patch @@ -32,10 +32,10 @@ index 0f09250d536b7405f0dc253afb1f3c4ccbaeb0da..f08e03c71f1e59d31a22822701b4e9ae // Paper end } diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 20e6383543880eca7987500bd041e60297d0b1ff..9d7a63eeaaa332faed901f6b8181b7da40744ab8 100644 +index 550d66e0d41878717c6a92caade4a8413674f012..4aaf268f58038cd5d4101ec3fbfdc20b544d6678 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -449,6 +449,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans +@@ -457,6 +457,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans Preconditions.checkArgument(this != UNKNOWN, "UNKNOWN entities do not have translation keys"); return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this); } diff --git a/patches/unapplied/api/0318-Left-handed-API.patch b/patches/api/0318-Left-handed-API.patch similarity index 100% rename from patches/unapplied/api/0318-Left-handed-API.patch rename to patches/api/0318-Left-handed-API.patch diff --git a/patches/unapplied/api/0319-Add-critical-damage-API.patch b/patches/api/0319-Add-critical-damage-API.patch similarity index 100% rename from patches/unapplied/api/0319-Add-critical-damage-API.patch rename to patches/api/0319-Add-critical-damage-API.patch diff --git a/patches/unapplied/api/0320-Add-more-advancement-API.patch b/patches/api/0320-Add-more-advancement-API.patch similarity index 100% rename from patches/unapplied/api/0320-Add-more-advancement-API.patch rename to patches/api/0320-Add-more-advancement-API.patch diff --git a/patches/unapplied/api/0321-Fix-issues-with-mob-conversion.patch b/patches/api/0321-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/unapplied/api/0321-Fix-issues-with-mob-conversion.patch rename to patches/api/0321-Fix-issues-with-mob-conversion.patch diff --git a/patches/unapplied/api/0322-Add-isCollidable-methods-to-various-places.patch b/patches/api/0322-Add-isCollidable-methods-to-various-places.patch similarity index 95% rename from patches/unapplied/api/0322-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0322-Add-isCollidable-methods-to-various-places.patch index f1d0954f97..4931b0b29f 100644 --- a/patches/unapplied/api/0322-Add-isCollidable-methods-to-various-places.patch +++ b/patches/api/0322-Add-isCollidable-methods-to-various-places.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add isCollidable methods to various places diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 85bec2ec7bfd68f3b515f62345d5656ac539f2c0..7ca70b269e15e818e61a9329e2775789abb4bc73 100644 +index 64ca3c676703eed55b4ac8a2d4561d483c6935b1..9f86ad25a57b3f6e6bda1ce657833837cb3b2292 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4489,6 +4489,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4735,6 +4735,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla public Multimap getItemAttributes(@NotNull EquipmentSlot equipmentSlot) { return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot); } diff --git a/patches/unapplied/api/0323-Goat-ram-API.patch b/patches/api/0323-Goat-ram-API.patch similarity index 100% rename from patches/unapplied/api/0323-Goat-ram-API.patch rename to patches/api/0323-Goat-ram-API.patch diff --git a/patches/unapplied/api/0324-Add-API-for-resetting-a-single-score.patch b/patches/api/0324-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/unapplied/api/0324-Add-API-for-resetting-a-single-score.patch rename to patches/api/0324-Add-API-for-resetting-a-single-score.patch diff --git a/patches/unapplied/api/0325-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0325-Add-Raw-Byte-Entity-Serialization.patch similarity index 94% rename from patches/unapplied/api/0325-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0325-Add-Raw-Byte-Entity-Serialization.patch index ed15969264..46b080adb1 100644 --- a/patches/unapplied/api/0325-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0325-Add-Raw-Byte-Entity-Serialization.patch @@ -24,10 +24,10 @@ index 7dc808f94c42e821fa125073b1a9b853e16d5b41..fc0356b0600946af0a46312cee16b080 * Creates and returns the next EntityId available. *

diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e0e3af0f229f8af66de70d7b741200e301476677..765777b10f5984b0fbdf22ef884e79745d06b4ff 100644 +index d98fe98f703ff478ea4427783fd68debe9a6f267..6356370eed537cec782f036dc73fe5bfbe4c1fb7 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -850,5 +850,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -894,5 +894,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Deprecated @NotNull Set getTrackedPlayers(); diff --git a/patches/unapplied/api/0326-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0326-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0326-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0326-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/unapplied/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/unapplied/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/unapplied/api/0328-Add-more-Campfire-API.patch b/patches/api/0328-Add-more-Campfire-API.patch similarity index 100% rename from patches/unapplied/api/0328-Add-more-Campfire-API.patch rename to patches/api/0328-Add-more-Campfire-API.patch diff --git a/patches/unapplied/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/unapplied/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/unapplied/api/0330-Improve-scoreboard-entries.patch b/patches/api/0330-Improve-scoreboard-entries.patch similarity index 100% rename from patches/unapplied/api/0330-Improve-scoreboard-entries.patch rename to patches/api/0330-Improve-scoreboard-entries.patch diff --git a/patches/unapplied/api/0331-Entity-powdered-snow-API.patch b/patches/api/0331-Entity-powdered-snow-API.patch similarity index 90% rename from patches/unapplied/api/0331-Entity-powdered-snow-API.patch rename to patches/api/0331-Entity-powdered-snow-API.patch index 0a4e36dee8..2a4ece4cef 100644 --- a/patches/unapplied/api/0331-Entity-powdered-snow-API.patch +++ b/patches/api/0331-Entity-powdered-snow-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 765777b10f5984b0fbdf22ef884e79745d06b4ff..edfce041e0cdfe9d33c385dfa1875017d43def80 100644 +index 6356370eed537cec782f036dc73fe5bfbe4c1fb7..6456f7bfc8aa8cb5c9aaf0c06f9130242003ee3e 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -877,5 +877,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -921,5 +921,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return Whether the entity was successfully spawned. */ public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason); diff --git a/patches/unapplied/api/0332-Add-API-for-item-entity-health.patch b/patches/api/0332-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/unapplied/api/0332-Add-API-for-item-entity-health.patch rename to patches/api/0332-Add-API-for-item-entity-health.patch diff --git a/patches/unapplied/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/unapplied/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/unapplied/api/0334-Bucketable-API.patch b/patches/api/0334-Bucketable-API.patch similarity index 100% rename from patches/unapplied/api/0334-Bucketable-API.patch rename to patches/api/0334-Bucketable-API.patch diff --git a/patches/unapplied/api/0335-System-prop-for-default-config-comment-parsing.patch b/patches/api/0335-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/unapplied/api/0335-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0335-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/unapplied/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/unapplied/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/unapplied/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/unapplied/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/unapplied/api/0338-Multiple-Entries-with-Scoreboards.patch b/patches/api/0338-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/unapplied/api/0338-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0338-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/unapplied/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/unapplied/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/unapplied/api/0340-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0340-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/unapplied/api/0340-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0340-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/unapplied/api/0341-Multi-Block-Change-API.patch b/patches/api/0341-Multi-Block-Change-API.patch similarity index 92% rename from patches/unapplied/api/0341-Multi-Block-Change-API.patch rename to patches/api/0341-Multi-Block-Change-API.patch index 2d87c1c71d..6f93a168a6 100644 --- a/patches/unapplied/api/0341-Multi-Block-Change-API.patch +++ b/patches/api/0341-Multi-Block-Change-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Multi Block Change API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 6d8e4f23095716eeaea16206c3a4bb36f794f29f..0e42cd429a75d10f8628acad319ee3dd2cdf02c3 100644 +index 7ce512072f242632f17db55224488f18c1cddcc4..a6053648464d903d1f9501bbeae688240fbfd754 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -851,6 +851,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -852,6 +852,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendBlockDamage(@NotNull Location loc, float progress); diff --git a/patches/unapplied/api/0342-Fix-NotePlayEvent.patch b/patches/api/0342-Fix-NotePlayEvent.patch similarity index 100% rename from patches/unapplied/api/0342-Fix-NotePlayEvent.patch rename to patches/api/0342-Fix-NotePlayEvent.patch diff --git a/patches/unapplied/api/0343-Freeze-Tick-Lock-API.patch b/patches/api/0343-Freeze-Tick-Lock-API.patch similarity index 86% rename from patches/unapplied/api/0343-Freeze-Tick-Lock-API.patch rename to patches/api/0343-Freeze-Tick-Lock-API.patch index f046aa1023..014d92d675 100644 --- a/patches/unapplied/api/0343-Freeze-Tick-Lock-API.patch +++ b/patches/api/0343-Freeze-Tick-Lock-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index edfce041e0cdfe9d33c385dfa1875017d43def80..77e29cada05da8946d718fe331e28e7553922033 100644 +index 6456f7bfc8aa8cb5c9aaf0c06f9130242003ee3e..953bb49b7079647450d3453356d1c8a91be94c01 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -280,6 +280,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -283,6 +283,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isFrozen(); @@ -34,4 +34,4 @@ index edfce041e0cdfe9d33c385dfa1875017d43def80..77e29cada05da8946d718fe331e28e75 + /** * Mark the entity's removal. - */ + * diff --git a/patches/unapplied/api/0344-Dolphin-API.patch b/patches/api/0344-Dolphin-API.patch similarity index 100% rename from patches/unapplied/api/0344-Dolphin-API.patch rename to patches/api/0344-Dolphin-API.patch diff --git a/patches/unapplied/api/0345-More-PotionEffectType-API.patch b/patches/api/0345-More-PotionEffectType-API.patch similarity index 79% rename from patches/unapplied/api/0345-More-PotionEffectType-API.patch rename to patches/api/0345-More-PotionEffectType-API.patch index b9d8d00753..9b41cfd7ff 100644 --- a/patches/unapplied/api/0345-More-PotionEffectType-API.patch +++ b/patches/api/0345-More-PotionEffectType-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] More PotionEffectType API diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index 469ef0a9241fddbd869ac2c0662c98b3022cc8aa..ba934feab58da978311c642408227a1fa686dfbb 100644 +index 4a9c196a2caeb7f1b180347b480ed48056ad6a00..f4dd9e2a1d227727d7e2dc68a6dfb97bb4b16811 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -270,6 +270,31 @@ public interface Registry extends Iterable { +@@ -257,6 +257,31 @@ public interface Registry extends Iterable { */ @Deprecated(forRemoval = true) Registry CONFIGURED_STRUCTURE = Bukkit.getRegistry(io.papermc.paper.world.structure.ConfiguredStructure.class); @@ -29,7 +29,7 @@ index 469ef0a9241fddbd869ac2c0662c98b3022cc8aa..ba934feab58da978311c642408227a1f + @NotNull + @Override + public Iterator iterator() { -+ return Arrays.stream(org.bukkit.potion.PotionEffectType.values()).iterator(); ++ return java.util.Arrays.stream(org.bukkit.potion.PotionEffectType.values()).iterator(); + } + + @Override @@ -41,21 +41,21 @@ index 469ef0a9241fddbd869ac2c0662c98b3022cc8aa..ba934feab58da978311c642408227a1f /** diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java -index ceba656b25f74d4bb2eadb9a7eca184b069b4909..e174b395b9915df11ba01ede05825ef212ede700 100644 +index 3070f039a583647e7c9a8f15d63291cd265db9fc..0d81e2d36e01128b9c697ec6f5c98083ee492d84 100644 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java -@@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable; +@@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; /** * Represents a type of potion and its effect on an entity. */ -public abstract class PotionEffectType implements Keyed { +public abstract class PotionEffectType implements Keyed, net.kyori.adventure.translation.Translatable { // Paper - implement Translatable + private static final BiMap ID_MAP = HashBiMap.create(); + /** - * Increases movement speed. - */ -@@ -363,4 +363,56 @@ public abstract class PotionEffectType implements Keyed { - public static PotionEffectType[] values() { - return Arrays.copyOfRange(byId, 1, byId.length); +@@ -351,4 +351,56 @@ public abstract class PotionEffectType implements Keyed { + + return from; } + // Paper start + /** @@ -63,7 +63,7 @@ index ceba656b25f74d4bb2eadb9a7eca184b069b4909..e174b395b9915df11ba01ede05825ef2 + * + * @return the attribute map + */ -+ public abstract @NotNull Map getEffectAttributes(); ++ public abstract @NotNull java.util.Map getEffectAttributes(); + + /** + * Gets the true modifier amount based on the effect amplifier. @@ -111,22 +111,24 @@ index ceba656b25f74d4bb2eadb9a7eca184b069b4909..e174b395b9915df11ba01ede05825ef2 + // Paper end } diff --git a/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java b/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java -index 6994981bdeccc4b059ae0075d0c8a26b6471d7b3..928f36a4def378dccb6a52196ad60e7b5ff17694 100644 +index a613debb03f6440583f57dd1adb7bb1bebbd636b..718f216c9153a5f03b91ce1de9ee9574e867e32b 100644 --- a/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java +++ b/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java -@@ -27,7 +27,7 @@ public class PotionEffectTypeWrapper extends PotionEffectType { - */ - @NotNull +@@ -19,4 +19,41 @@ public abstract class PotionEffectTypeWrapper extends PotionEffectType { public PotionEffectType getType() { -- return PotionEffectType.getByKey(getKey()); -+ return PotionEffectType.getByKey(super.getKey()); // Paper - } - - @Override -@@ -40,4 +40,30 @@ public class PotionEffectTypeWrapper extends PotionEffectType { - public Color getColor() { - return getType().getColor(); + return this; } ++ ++ @Override ++ public boolean isInstant() { ++ return getType().isInstant(); ++ } ++ ++ @NotNull ++ @Override ++ public org.bukkit.Color getColor() { ++ return getType().getColor(); ++ } + // Paper start + @Override + public @NotNull org.bukkit.NamespacedKey getKey() { diff --git a/patches/unapplied/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/unapplied/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/unapplied/api/0347-Implement-regenerateChunk.patch b/patches/api/0347-Implement-regenerateChunk.patch similarity index 100% rename from patches/unapplied/api/0347-Implement-regenerateChunk.patch rename to patches/api/0347-Implement-regenerateChunk.patch diff --git a/patches/unapplied/api/0348-Add-GameEvent-tags.patch b/patches/api/0348-Add-GameEvent-tags.patch similarity index 79% rename from patches/unapplied/api/0348-Add-GameEvent-tags.patch rename to patches/api/0348-Add-GameEvent-tags.patch index a0481cf89d..12634980d6 100644 --- a/patches/unapplied/api/0348-Add-GameEvent-tags.patch +++ b/patches/api/0348-Add-GameEvent-tags.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add GameEvent tags diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 4beb607c31705e182ac04c48bdc2a1de13eb9b4c..3665b284799726134469b60909efd59da3bd485b 100644 +index 31bdecf8cbea40129a568c1761f27fa1ae0f535a..35d52539f264202d50d70e6aaab4678571dc8ad2 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -968,11 +968,31 @@ public interface Tag extends Keyed { +@@ -968,6 +968,7 @@ public interface Tag extends Keyed { * Vanilla tag representing entities which are dismounted when underwater. */ Tag ENTITY_TYPES_DISMOUNTS_UNDERWATER = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("dismounts_underwater"), EntityType.class); @@ -16,7 +16,9 @@ index 4beb607c31705e182ac04c48bdc2a1de13eb9b4c..3665b284799726134469b60909efd59d /** * Vanilla tag representing entities which are not controlled by their mount. */ - Tag ENTITY_TYPES_NON_CONTROLLING_RIDER = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("non_controlling_rider"), EntityType.class); +@@ -985,6 +986,25 @@ public interface Tag extends Keyed { + */ + Tag ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class); + // Paper start + String REGISTRY_GAME_EVENTS = "game_events"; diff --git a/patches/unapplied/api/0349-Furnace-RecipesUsed-API.patch b/patches/api/0349-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/unapplied/api/0349-Furnace-RecipesUsed-API.patch rename to patches/api/0349-Furnace-RecipesUsed-API.patch diff --git a/patches/unapplied/api/0350-Configurable-sculk-sensor-listener-range.patch b/patches/api/0350-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/unapplied/api/0350-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0350-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/unapplied/api/0351-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0351-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/unapplied/api/0351-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0351-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/unapplied/api/0352-Custom-Potion-Mixes.patch b/patches/api/0352-Custom-Potion-Mixes.patch similarity index 100% rename from patches/unapplied/api/0352-Custom-Potion-Mixes.patch rename to patches/api/0352-Custom-Potion-Mixes.patch diff --git a/patches/unapplied/api/0353-Expose-furnace-minecart-push-values.patch b/patches/api/0353-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/unapplied/api/0353-Expose-furnace-minecart-push-values.patch rename to patches/api/0353-Expose-furnace-minecart-push-values.patch diff --git a/patches/unapplied/api/0354-More-Projectile-API.patch b/patches/api/0354-More-Projectile-API.patch similarity index 100% rename from patches/unapplied/api/0354-More-Projectile-API.patch rename to patches/api/0354-More-Projectile-API.patch diff --git a/patches/unapplied/api/0355-Add-getComputedBiome-API.patch b/patches/api/0355-Add-getComputedBiome-API.patch similarity index 96% rename from patches/unapplied/api/0355-Add-getComputedBiome-API.patch rename to patches/api/0355-Add-getComputedBiome-API.patch index 870758d8da..260ec7d327 100644 --- a/patches/unapplied/api/0355-Add-getComputedBiome-API.patch +++ b/patches/api/0355-Add-getComputedBiome-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add getComputedBiome API diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java -index 3a0e0af739227d99d854b0d5c9bf342fe9363de4..87489972dff661c7c9ec4d128e25e2f7666b598e 100644 +index b68367f123f029c3ff47eab6bfabd7a894a99da4..44ee56a5956cc17194c767a0c1071a2abffe818a 100644 --- a/src/main/java/org/bukkit/RegionAccessor.java +++ b/src/main/java/org/bukkit/RegionAccessor.java @@ -25,6 +25,7 @@ public interface RegionAccessor extends Keyed { // Paper diff --git a/patches/unapplied/api/0356-Add-enchantWithLevels-API.patch b/patches/api/0356-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/unapplied/api/0356-Add-enchantWithLevels-API.patch rename to patches/api/0356-Add-enchantWithLevels-API.patch diff --git a/patches/unapplied/api/0357-Add-TameableDeathMessageEvent.patch b/patches/api/0357-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/unapplied/api/0357-Add-TameableDeathMessageEvent.patch rename to patches/api/0357-Add-TameableDeathMessageEvent.patch diff --git a/patches/unapplied/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/unapplied/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/unapplied/api/0359-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0359-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch similarity index 100% rename from patches/unapplied/api/0359-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch rename to patches/api/0359-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch diff --git a/patches/unapplied/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/unapplied/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/unapplied/api/0361-WorldCreator-keepSpawnLoaded.patch b/patches/api/0361-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/unapplied/api/0361-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0361-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/unapplied/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/unapplied/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/unapplied/api/0363-Add-PlayerStopUsingItemEvent.patch b/patches/api/0363-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/unapplied/api/0363-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0363-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/unapplied/api/0364-Expand-FallingBlock-API.patch b/patches/api/0364-Expand-FallingBlock-API.patch similarity index 100% rename from patches/unapplied/api/0364-Expand-FallingBlock-API.patch rename to patches/api/0364-Expand-FallingBlock-API.patch diff --git a/patches/unapplied/api/0365-Keyed-Cat-Type.patch b/patches/api/0365-Keyed-Cat-Type.patch similarity index 100% rename from patches/unapplied/api/0365-Keyed-Cat-Type.patch rename to patches/api/0365-Keyed-Cat-Type.patch diff --git a/patches/unapplied/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/unapplied/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/unapplied/api/0367-Add-WardenAngerChangeEvent.patch b/patches/api/0367-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0367-Add-WardenAngerChangeEvent.patch rename to patches/api/0367-Add-WardenAngerChangeEvent.patch diff --git a/patches/unapplied/api/0368-Nameable-Banner-API.patch b/patches/api/0368-Nameable-Banner-API.patch similarity index 100% rename from patches/unapplied/api/0368-Nameable-Banner-API.patch rename to patches/api/0368-Nameable-Banner-API.patch diff --git a/patches/unapplied/api/0369-Add-Player-getFishHook.patch b/patches/api/0369-Add-Player-getFishHook.patch similarity index 100% rename from patches/unapplied/api/0369-Add-Player-getFishHook.patch rename to patches/api/0369-Add-Player-getFishHook.patch diff --git a/patches/unapplied/api/0370-More-Teleport-API.patch b/patches/api/0370-More-Teleport-API.patch similarity index 97% rename from patches/unapplied/api/0370-More-Teleport-API.patch rename to patches/api/0370-More-Teleport-API.patch index 40cf296d3f..7cdd65de37 100644 --- a/patches/unapplied/api/0370-More-Teleport-API.patch +++ b/patches/api/0370-More-Teleport-API.patch @@ -120,10 +120,10 @@ index 0000000000000000000000000000000000000000..c8b5b570d44da9524bfc59c7e11b2ae5 + +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 77e29cada05da8946d718fe331e28e7553922033..a7e0454344b145242a19eb8020c9c67b18368bdd 100644 +index 953bb49b7079647450d3453356d1c8a91be94c01..2ea66188468cf32bcaedc5167d4b9b0c6ea9b0b3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -123,10 +123,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * * @param yaw the yaw * @param pitch the pitch @@ -158,10 +158,10 @@ index 77e29cada05da8946d718fe331e28e7553922033..a7e0454344b145242a19eb8020c9c67b * Teleports this entity to the given location. If this entity is riding a * vehicle, it will be dismounted prior to teleportation. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 0e42cd429a75d10f8628acad319ee3dd2cdf02c3..6394f2e3ea47f6b28bab501acacceeb6e46a2ef6 100644 +index a6053648464d903d1f9501bbeae688240fbfd754..2b0826e3cbf684fe15f664c4d9041dc95a991ebd 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3118,6 +3118,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3166,6 +3166,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM String getClientBrandName(); // Paper end diff --git a/patches/unapplied/api/0371-Add-EntityPortalReadyEvent.patch b/patches/api/0371-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/unapplied/api/0371-Add-EntityPortalReadyEvent.patch rename to patches/api/0371-Add-EntityPortalReadyEvent.patch diff --git a/patches/unapplied/api/0372-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0372-Custom-Chat-Completion-Suggestions-API.patch similarity index 91% rename from patches/unapplied/api/0372-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0372-Custom-Chat-Completion-Suggestions-API.patch index ec248378f8..28c67cd7e9 100644 --- a/patches/unapplied/api/0372-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/api/0372-Custom-Chat-Completion-Suggestions-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 6394f2e3ea47f6b28bab501acacceeb6e46a2ef6..83eaf1b4882c552cf72d222d45ed11fd8f8a57b2 100644 +index 2b0826e3cbf684fe15f664c4d9041dc95a991ebd..11294829dc3dc4523110892bb92d6bb5210e01e9 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3002,6 +3002,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3050,6 +3050,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void sendOpLevel(byte level); // Paper end - sendOpLevel API diff --git a/patches/unapplied/api/0373-Collision-API.patch b/patches/api/0373-Collision-API.patch similarity index 87% rename from patches/unapplied/api/0373-Collision-API.patch rename to patches/api/0373-Collision-API.patch index 8a63115a96..394d0d8fee 100644 --- a/patches/unapplied/api/0373-Collision-API.patch +++ b/patches/api/0373-Collision-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Collision API diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java -index 87489972dff661c7c9ec4d128e25e2f7666b598e..14edb1b4caeda0c8aecf3528bd0005fafa6197ff 100644 +index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97eea37abd 100644 --- a/src/main/java/org/bukkit/RegionAccessor.java +++ b/src/main/java/org/bukkit/RegionAccessor.java -@@ -464,5 +464,15 @@ public interface RegionAccessor extends Keyed { // Paper +@@ -493,5 +493,15 @@ public interface RegionAccessor extends Keyed { // Paper * @return whether a line of sight exists between {@code from} and {@code to} */ public boolean lineOfSightExists(@NotNull Location from, @NotNull Location to); @@ -25,10 +25,10 @@ index 87489972dff661c7c9ec4d128e25e2f7666b598e..14edb1b4caeda0c8aecf3528bd0005fa // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index a7e0454344b145242a19eb8020c9c67b18368bdd..368d8da056e41103ad10dde177cc244148c0130e 100644 +index 2ea66188468cf32bcaedc5167d4b9b0c6ea9b0b3..351a7d0aeab5d83564dd543935ba503ea0b68d60 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -927,4 +927,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -971,4 +971,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isInPowderedSnow(); // Paper end diff --git a/patches/unapplied/api/0374-Block-Ticking-API.patch b/patches/api/0374-Block-Ticking-API.patch similarity index 100% rename from patches/unapplied/api/0374-Block-Ticking-API.patch rename to patches/api/0374-Block-Ticking-API.patch diff --git a/patches/unapplied/api/0375-Add-NamespacedKey-biome-methods.patch b/patches/api/0375-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/unapplied/api/0375-Add-NamespacedKey-biome-methods.patch rename to patches/api/0375-Add-NamespacedKey-biome-methods.patch diff --git a/patches/unapplied/api/0376-Also-load-resources-from-LibraryLoader.patch b/patches/api/0376-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/unapplied/api/0376-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0376-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/unapplied/api/0377-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0377-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/unapplied/api/0377-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0377-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/unapplied/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/unapplied/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/unapplied/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/unapplied/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/unapplied/api/0380-Add-getDrops-to-BlockState.patch b/patches/api/0380-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/unapplied/api/0380-Add-getDrops-to-BlockState.patch rename to patches/api/0380-Add-getDrops-to-BlockState.patch diff --git a/patches/unapplied/api/0381-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0381-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0381-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0381-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/unapplied/api/0382-Elder-Guardian-appearance-API.patch b/patches/api/0382-Elder-Guardian-appearance-API.patch similarity index 87% rename from patches/unapplied/api/0382-Elder-Guardian-appearance-API.patch rename to patches/api/0382-Elder-Guardian-appearance-API.patch index a9afce2086..8cd2549b95 100644 --- a/patches/unapplied/api/0382-Elder-Guardian-appearance-API.patch +++ b/patches/api/0382-Elder-Guardian-appearance-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 83eaf1b4882c552cf72d222d45ed11fd8f8a57b2..e7eec77471b725f0d13b13c56e5244dfe4145f1e 100644 +index 11294829dc3dc4523110892bb92d6bb5210e01e9..b42693e8adce3b4dfbed17ad5f3df5ea00f3615b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3182,6 +3182,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3230,6 +3230,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void lookAt(@NotNull org.bukkit.entity.Entity entity, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor, @NotNull io.papermc.paper.entity.LookAnchor entityAnchor); // Paper end - Teleport API diff --git a/patches/unapplied/api/0383-Allow-changing-bed-s-occupied-property.patch b/patches/api/0383-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/unapplied/api/0383-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0383-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/unapplied/api/0384-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0384-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/unapplied/api/0384-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0384-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/unapplied/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/unapplied/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/unapplied/api/0386-Add-entity-knockback-API.patch b/patches/api/0386-Add-entity-knockback-API.patch similarity index 100% rename from patches/unapplied/api/0386-Add-entity-knockback-API.patch rename to patches/api/0386-Add-entity-knockback-API.patch diff --git a/patches/unapplied/api/0387-Added-EntityToggleSitEvent.patch b/patches/api/0387-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/unapplied/api/0387-Added-EntityToggleSitEvent.patch rename to patches/api/0387-Added-EntityToggleSitEvent.patch diff --git a/patches/unapplied/api/0388-Add-Moving-Piston-API.patch b/patches/api/0388-Add-Moving-Piston-API.patch similarity index 100% rename from patches/unapplied/api/0388-Add-Moving-Piston-API.patch rename to patches/api/0388-Add-Moving-Piston-API.patch diff --git a/patches/unapplied/api/0389-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0389-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/unapplied/api/0389-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0389-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/unapplied/api/0390-Add-Player-Warden-Warning-API.patch b/patches/api/0390-Add-Player-Warden-Warning-API.patch similarity index 93% rename from patches/unapplied/api/0390-Add-Player-Warden-Warning-API.patch rename to patches/api/0390-Add-Player-Warden-Warning-API.patch index a24951cd1b..6ab9971525 100644 --- a/patches/unapplied/api/0390-Add-Player-Warden-Warning-API.patch +++ b/patches/api/0390-Add-Player-Warden-Warning-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player Warden Warning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e7eec77471b725f0d13b13c56e5244dfe4145f1e..aaa99aca492b14c775180214345095ec02dbc5fc 100644 +index b42693e8adce3b4dfbed17ad5f3df5ea00f3615b..53026b36fce2a201e81a844b115a274e9495928d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3198,6 +3198,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3246,6 +3246,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param silent whether sound should be silenced */ void showElderGuardian(boolean silent); diff --git a/patches/unapplied/api/0391-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0391-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/unapplied/api/0391-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0391-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/unapplied/api/0392-Add-paper-dumplisteners-command.patch b/patches/api/0392-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/unapplied/api/0392-Add-paper-dumplisteners-command.patch rename to patches/api/0392-Add-paper-dumplisteners-command.patch diff --git a/patches/unapplied/api/0393-ItemStack-damage-API.patch b/patches/api/0393-ItemStack-damage-API.patch similarity index 100% rename from patches/unapplied/api/0393-ItemStack-damage-API.patch rename to patches/api/0393-ItemStack-damage-API.patch diff --git a/patches/unapplied/api/0394-Add-Tick-TemporalUnit.patch b/patches/api/0394-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/unapplied/api/0394-Add-Tick-TemporalUnit.patch rename to patches/api/0394-Add-Tick-TemporalUnit.patch diff --git a/patches/unapplied/api/0395-Friction-API.patch b/patches/api/0395-Friction-API.patch similarity index 100% rename from patches/unapplied/api/0395-Friction-API.patch rename to patches/api/0395-Friction-API.patch diff --git a/patches/unapplied/api/0396-Player-Entity-Tracking-Events.patch b/patches/api/0396-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/unapplied/api/0396-Player-Entity-Tracking-Events.patch rename to patches/api/0396-Player-Entity-Tracking-Events.patch diff --git a/patches/unapplied/api/0397-Add-missing-Fluid-type.patch b/patches/api/0397-Add-missing-Fluid-type.patch similarity index 100% rename from patches/unapplied/api/0397-Add-missing-Fluid-type.patch rename to patches/api/0397-Add-missing-Fluid-type.patch diff --git a/patches/unapplied/api/0398-fix-Instruments.patch b/patches/api/0398-fix-Instruments.patch similarity index 100% rename from patches/unapplied/api/0398-fix-Instruments.patch rename to patches/api/0398-fix-Instruments.patch diff --git a/patches/unapplied/api/0399-Add-BlockLockCheckEvent.patch b/patches/api/0399-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/unapplied/api/0399-Add-BlockLockCheckEvent.patch rename to patches/api/0399-Add-BlockLockCheckEvent.patch diff --git a/patches/unapplied/api/0400-Add-Sneaking-API-for-Entities.patch b/patches/api/0400-Add-Sneaking-API-for-Entities.patch similarity index 80% rename from patches/unapplied/api/0400-Add-Sneaking-API-for-Entities.patch rename to patches/api/0400-Add-Sneaking-API-for-Entities.patch index 2afd3ae1ad..0aab3c95d4 100644 --- a/patches/unapplied/api/0400-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0400-Add-Sneaking-API-for-Entities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 368d8da056e41103ad10dde177cc244148c0130e..d601145b41f7e8d0441c0db7ac98a03361866739 100644 +index 351a7d0aeab5d83564dd543935ba503ea0b68d60..c9139bb7abc881fddd2d5610d9506cd4fce7eba3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -777,6 +777,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -782,6 +782,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @NotNull Pose getPose(); @@ -35,10 +35,10 @@ index 368d8da056e41103ad10dde177cc244148c0130e..d601145b41f7e8d0441c0db7ac98a033 * Get the category of spawn to which this entity belongs. * diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index aaa99aca492b14c775180214345095ec02dbc5fc..71e5e63a259d354b27cdd85d9a7622e95201702c 100644 +index 53026b36fce2a201e81a844b115a274e9495928d..673036dbc9f4bd7b81747d6094bbfcab666cad09 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -414,6 +414,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -415,6 +415,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @return true if player is in sneak mode */ @@ -46,7 +46,7 @@ index aaa99aca492b14c775180214345095ec02dbc5fc..71e5e63a259d354b27cdd85d9a7622e9 public boolean isSneaking(); /** -@@ -421,6 +422,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -422,6 +423,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param sneak true if player should appear sneaking */ diff --git a/patches/unapplied/api/0401-Improve-PortalEvents.patch b/patches/api/0401-Improve-PortalEvents.patch similarity index 100% rename from patches/unapplied/api/0401-Improve-PortalEvents.patch rename to patches/api/0401-Improve-PortalEvents.patch diff --git a/patches/unapplied/api/0402-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0402-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/unapplied/api/0402-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/api/0402-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/unapplied/api/0403-Flying-Fall-Damage-API.patch b/patches/api/0403-Flying-Fall-Damage-API.patch similarity index 88% rename from patches/unapplied/api/0403-Flying-Fall-Damage-API.patch rename to patches/api/0403-Flying-Fall-Damage-API.patch index f4731633c0..ea7650e655 100644 --- a/patches/unapplied/api/0403-Flying-Fall-Damage-API.patch +++ b/patches/api/0403-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 71e5e63a259d354b27cdd85d9a7622e95201702c..72d105674fd93fcedbea07ddb20580e24297f292 100644 +index 673036dbc9f4bd7b81747d6094bbfcab666cad09..fae33e170dd8155df94b9e7c3f277389ac366a5e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1765,6 +1765,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1766,6 +1766,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void setAllowFlight(boolean flight); diff --git a/patches/unapplied/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/unapplied/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/unapplied/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/unapplied/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/unapplied/api/0406-Win-Screen-API.patch b/patches/api/0406-Win-Screen-API.patch similarity index 94% rename from patches/unapplied/api/0406-Win-Screen-API.patch rename to patches/api/0406-Win-Screen-API.patch index 5745690c56..059965c688 100644 --- a/patches/unapplied/api/0406-Win-Screen-API.patch +++ b/patches/api/0406-Win-Screen-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Win Screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 72d105674fd93fcedbea07ddb20580e24297f292..3c904524cdd88196116a089aefe913dd41d1a691 100644 +index fae33e170dd8155df94b9e7c3f277389ac366a5e..12ac53a8ca8d91b8189dbb8775121b89f402de43 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1135,6 +1135,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1136,6 +1136,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendMap(@NotNull MapView map); diff --git a/patches/unapplied/api/0407-Add-Entity-Body-Yaw-API.patch b/patches/api/0407-Add-Entity-Body-Yaw-API.patch similarity index 93% rename from patches/unapplied/api/0407-Add-Entity-Body-Yaw-API.patch rename to patches/api/0407-Add-Entity-Body-Yaw-API.patch index 78d2ed63bb..668bb93956 100644 --- a/patches/unapplied/api/0407-Add-Entity-Body-Yaw-API.patch +++ b/patches/api/0407-Add-Entity-Body-Yaw-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index d601145b41f7e8d0441c0db7ac98a03361866739..07f111b944209dbd395620bae603c42752d1cf25 100644 +index c9139bb7abc881fddd2d5610d9506cd4fce7eba3..bb1ed1e16bd17161bbf554acc03d1e32d3627a80 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -945,6 +945,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -989,6 +989,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return true if in powdered snow. */ boolean isInPowderedSnow(); diff --git a/patches/unapplied/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/unapplied/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/unapplied/api/0409-Add-EntityFertilizeEggEvent.patch b/patches/api/0409-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/unapplied/api/0409-Add-EntityFertilizeEggEvent.patch rename to patches/api/0409-Add-EntityFertilizeEggEvent.patch diff --git a/patches/unapplied/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/unapplied/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/unapplied/api/0411-Add-Shearable-API.patch b/patches/api/0411-Add-Shearable-API.patch similarity index 100% rename from patches/unapplied/api/0411-Add-Shearable-API.patch rename to patches/api/0411-Add-Shearable-API.patch diff --git a/patches/unapplied/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 80% rename from patches/unapplied/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch index 4014e17083..27abcd1f93 100644 --- a/patches/unapplied/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch +++ b/patches/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix SpawnEggMeta#get/setSpawnedType diff --git a/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java b/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java -index 9ae84de43018e2dc9df5e1a56244d8812c2ffbb8..c190dff53e18994c93c35b6a9502cba38e6886ed 100644 +index b3447e22ab880eef7e84ba3c2f0cd6d5d0323d32..35deb3519f46047009b529d6a80517e25e6cf20a 100644 --- a/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java -@@ -15,7 +15,7 @@ public interface SpawnEggMeta extends ItemMeta { +@@ -17,7 +17,7 @@ public interface SpawnEggMeta extends ItemMeta { * @return The entity type. May be null for implementation specific default. * @deprecated different types are different items */ @@ -17,7 +17,7 @@ index 9ae84de43018e2dc9df5e1a56244d8812c2ffbb8..c190dff53e18994c93c35b6a9502cba3 @Contract("-> fail") EntityType getSpawnedType(); -@@ -26,10 +26,26 @@ public interface SpawnEggMeta extends ItemMeta { +@@ -28,7 +28,7 @@ public interface SpawnEggMeta extends ItemMeta { * default. * @deprecated different types are different items */ @@ -26,6 +26,10 @@ index 9ae84de43018e2dc9df5e1a56244d8812c2ffbb8..c190dff53e18994c93c35b6a9502cba3 @Contract("_ -> fail") void setSpawnedType(EntityType type); +@@ -54,6 +54,22 @@ public interface SpawnEggMeta extends ItemMeta { + */ + void setSpawnedEntity(@NotNull EntitySnapshot snapshot); + + // Paper start + /** + * Get the custom type of entity this egg will spawn. diff --git a/patches/unapplied/api/0413-Add-Mob-Experience-reward-API.patch b/patches/api/0413-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/unapplied/api/0413-Add-Mob-Experience-reward-API.patch rename to patches/api/0413-Add-Mob-Experience-reward-API.patch diff --git a/patches/unapplied/api/0414-Expand-PlayerItemMendEvent.patch b/patches/api/0414-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/unapplied/api/0414-Expand-PlayerItemMendEvent.patch rename to patches/api/0414-Expand-PlayerItemMendEvent.patch diff --git a/patches/unapplied/api/0415-Add-transient-modifier-API.patch b/patches/api/0415-Add-transient-modifier-API.patch similarity index 100% rename from patches/unapplied/api/0415-Add-transient-modifier-API.patch rename to patches/api/0415-Add-transient-modifier-API.patch diff --git a/patches/unapplied/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 91% rename from patches/unapplied/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch index 8b67f602b7..650b013220 100644 --- a/patches/unapplied/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch +++ b/patches/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Properly remove the experimental smithing inventory type diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index 19ba2d948ad83baab2a14ae6f7b3ce43c3d4971f..cbce826add9dc2b3187c7bea00c27b785d7517df 100644 +index c3aeb1b622509ecd9e2230ce82e3bf07899fa540..64e59fe706b0bb37fc2439fa88fd40c3167c9fb5 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java -@@ -147,7 +147,7 @@ public enum InventoryType { +@@ -155,7 +155,7 @@ public enum InventoryType { * * @deprecated use {@link #SMITHING} */ diff --git a/patches/unapplied/api/0417-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0417-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/unapplied/api/0417-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0417-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/unapplied/api/0418-Folia-scheduler-and-owned-region-API.patch b/patches/api/0418-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/unapplied/api/0418-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0418-Folia-scheduler-and-owned-region-API.patch index c979729d17..1673b4500f 100644 --- a/patches/unapplied/api/0418-Folia-scheduler-and-owned-region-API.patch +++ b/patches/api/0418-Folia-scheduler-and-owned-region-API.patch @@ -769,10 +769,10 @@ index 383f1fcddaa50a8c94282c7a828912d73accfb62..cd1df326ef937863e427f47e1c8ac872 + // Paper end - Folia region threading API } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 07f111b944209dbd395620bae603c42752d1cf25..6602ce33224a337764f8e94422bad3912e3d545b 100644 +index bb1ed1e16bd17161bbf554acc03d1e32d3627a80..b2f5be3227d5dad5b1ff0129930dcd1944c75cef 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1005,4 +1005,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1049,4 +1049,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean wouldCollideUsing(@NotNull BoundingBox boundingBox); // Paper End - Collision API diff --git a/patches/unapplied/api/0419-Add-event-for-player-editing-sign.patch b/patches/api/0419-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/unapplied/api/0419-Add-event-for-player-editing-sign.patch rename to patches/api/0419-Add-event-for-player-editing-sign.patch diff --git a/patches/unapplied/api/0420-Add-Sign-getInteractableSideFor.patch b/patches/api/0420-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/unapplied/api/0420-Add-Sign-getInteractableSideFor.patch rename to patches/api/0420-Add-Sign-getInteractableSideFor.patch diff --git a/patches/unapplied/api/0421-Fix-BanList-API.patch b/patches/api/0421-Fix-BanList-API.patch similarity index 96% rename from patches/unapplied/api/0421-Fix-BanList-API.patch rename to patches/api/0421-Fix-BanList-API.patch index 1333db6fb0..190177a822 100644 --- a/patches/unapplied/api/0421-Fix-BanList-API.patch +++ b/patches/api/0421-Fix-BanList-API.patch @@ -130,10 +130,10 @@ index e805e629cede1c4c0674282c930cb67852718c3e..5248cf08ef83c7304dd76c42a2f646bb + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 3c904524cdd88196116a089aefe913dd41d1a691..2fddfb32927023c64718664ecca7989c15f15a67 100644 +index 12ac53a8ca8d91b8189dbb8775121b89f402de43..a948445b96a7c8c7803103171df644fc9a6f77f3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -298,7 +298,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -299,7 +299,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * (updated) previous ban */ @Nullable @@ -142,7 +142,7 @@ index 3c904524cdd88196116a089aefe913dd41d1a691..2fddfb32927023c64718664ecca7989c /** * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will -@@ -314,7 +314,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -315,7 +315,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * (updated) previous ban */ @Nullable @@ -151,7 +151,7 @@ index 3c904524cdd88196116a089aefe913dd41d1a691..2fddfb32927023c64718664ecca7989c /** * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will -@@ -330,7 +330,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -331,7 +331,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * (updated) previous ban */ @Nullable diff --git a/patches/unapplied/api/0422-Add-whitelist-events.patch b/patches/api/0422-Add-whitelist-events.patch similarity index 100% rename from patches/unapplied/api/0422-Add-whitelist-events.patch rename to patches/api/0422-Add-whitelist-events.patch diff --git a/patches/unapplied/api/0423-API-for-updating-recipes-on-clients.patch b/patches/api/0423-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/unapplied/api/0423-API-for-updating-recipes-on-clients.patch rename to patches/api/0423-API-for-updating-recipes-on-clients.patch diff --git a/patches/unapplied/api/0424-Add-PlayerFailMoveEvent.patch b/patches/api/0424-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/unapplied/api/0424-Add-PlayerFailMoveEvent.patch rename to patches/api/0424-Add-PlayerFailMoveEvent.patch diff --git a/patches/unapplied/api/0425-Fix-custom-statistic-criteria-creation.patch b/patches/api/0425-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/unapplied/api/0425-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0425-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/unapplied/api/0426-SculkCatalyst-bloom-API.patch b/patches/api/0426-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/unapplied/api/0426-SculkCatalyst-bloom-API.patch rename to patches/api/0426-SculkCatalyst-bloom-API.patch diff --git a/patches/unapplied/api/0427-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0427-API-for-an-entity-s-scoreboard-name.patch similarity index 88% rename from patches/unapplied/api/0427-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0427-API-for-an-entity-s-scoreboard-name.patch index 3f7d2cff28..736aeeac03 100644 --- a/patches/unapplied/api/0427-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/api/0427-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 6602ce33224a337764f8e94422bad3912e3d545b..c6502a549cf791c769ada483d498673eb969294f 100644 +index b2f5be3227d5dad5b1ff0129930dcd1944c75cef..82c67193a2dbb7b0bd0d6381cd0e06af49415d18 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1016,4 +1016,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1060,4 +1060,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler(); // Paper end - Folia schedulers diff --git a/patches/unapplied/api/0428-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0428-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/unapplied/api/0428-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0428-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/unapplied/api/0429-Add-Listing-API-for-Player.patch b/patches/api/0429-Add-Listing-API-for-Player.patch similarity index 89% rename from patches/unapplied/api/0429-Add-Listing-API-for-Player.patch rename to patches/api/0429-Add-Listing-API-for-Player.patch index 5c75d3f032..1273b6fb85 100644 --- a/patches/unapplied/api/0429-Add-Listing-API-for-Player.patch +++ b/patches/api/0429-Add-Listing-API-for-Player.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Listing API for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2fddfb32927023c64718664ecca7989c15f15a67..7b74fe780a8f99068c542f2deb261503ffc3b9e5 100644 +index a948445b96a7c8c7803103171df644fc9a6f77f3..0909c7d1dae6192e3103f4eaeb08bf3efbbd4153 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1901,6 +1901,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1902,6 +1902,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @ApiStatus.Experimental public boolean canSee(@NotNull Entity entity); diff --git a/patches/unapplied/api/0430-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0430-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/unapplied/api/0430-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0430-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/unapplied/api/0431-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0431-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/unapplied/api/0431-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0431-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/unapplied/api/0432-Expand-Pose-API.patch b/patches/api/0432-Expand-Pose-API.patch similarity index 92% rename from patches/unapplied/api/0432-Expand-Pose-API.patch rename to patches/api/0432-Expand-Pose-API.patch index ae91084be1..9ffa45bc36 100644 --- a/patches/unapplied/api/0432-Expand-Pose-API.patch +++ b/patches/api/0432-Expand-Pose-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index c6502a549cf791c769ada483d498673eb969294f..9e3cb75536ae260dc898ab9dafbc1d98398782bc 100644 +index 82c67193a2dbb7b0bd0d6381cd0e06af49415d18..1d0fd7ff8449f815a7d980af0b378181ea8bf8d8 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -794,6 +794,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -799,6 +799,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @param sneak true if the entity should be sneaking */ void setSneaking(boolean sneak); diff --git a/patches/unapplied/api/0433-MerchantRecipe-add-copy-constructor.patch b/patches/api/0433-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/unapplied/api/0433-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0433-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/unapplied/api/0434-More-DragonBattle-API.patch b/patches/api/0434-More-DragonBattle-API.patch similarity index 100% rename from patches/unapplied/api/0434-More-DragonBattle-API.patch rename to patches/api/0434-More-DragonBattle-API.patch diff --git a/patches/unapplied/api/0435-Add-PlayerPickItemEvent.patch b/patches/api/0435-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/unapplied/api/0435-Add-PlayerPickItemEvent.patch rename to patches/api/0435-Add-PlayerPickItemEvent.patch diff --git a/patches/unapplied/api/0436-Allow-trident-custom-damage.patch b/patches/api/0436-Allow-trident-custom-damage.patch similarity index 100% rename from patches/unapplied/api/0436-Allow-trident-custom-damage.patch rename to patches/api/0436-Allow-trident-custom-damage.patch diff --git a/patches/unapplied/api/0437-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0437-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/unapplied/api/0437-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0437-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/unapplied/api/0438-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0438-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/unapplied/api/0438-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0438-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/unapplied/api/0439-Add-OfflinePlayer-isConnected.patch b/patches/api/0439-Add-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/unapplied/api/0439-Add-OfflinePlayer-isConnected.patch rename to patches/api/0439-Add-OfflinePlayer-isConnected.patch diff --git a/patches/unapplied/api/0440-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0440-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/unapplied/api/0440-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0440-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/unapplied/api/0441-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0441-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/unapplied/api/0441-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0441-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/unapplied/api/0442-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0442-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/unapplied/api/0442-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0442-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/unapplied/api/0443-Add-player-idle-duration-API.patch b/patches/api/0443-Add-player-idle-duration-API.patch similarity index 89% rename from patches/unapplied/api/0443-Add-player-idle-duration-API.patch rename to patches/api/0443-Add-player-idle-duration-API.patch index 8326dd41b6..883cee91af 100644 --- a/patches/unapplied/api/0443-Add-player-idle-duration-API.patch +++ b/patches/api/0443-Add-player-idle-duration-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API Implements API for getting and resetting a player's idle duration. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7b74fe780a8f99068c542f2deb261503ffc3b9e5..47fcfa2a3358766dfda2efc9bbcf5b50e3f2f7c1 100644 +index 0909c7d1dae6192e3103f4eaeb08bf3efbbd4153..962283d336e6d53941cebbc3a995d403ff989f66 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3339,6 +3339,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3387,6 +3387,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void increaseWardenWarningLevel(); // Paper end diff --git a/patches/unapplied/api/0444-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0444-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/unapplied/api/0444-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0444-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/unapplied/api/0445-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0445-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/unapplied/api/0445-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0445-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/unapplied/api/0446-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0446-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/unapplied/api/0446-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0446-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/unapplied/api/0447-Add-UUID-attribute-modifier-API.patch b/patches/api/0447-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/unapplied/api/0447-Add-UUID-attribute-modifier-API.patch rename to patches/api/0447-Add-UUID-attribute-modifier-API.patch diff --git a/patches/unapplied/api/0448-Expand-LingeringPotion-API.patch b/patches/api/0448-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/unapplied/api/0448-Expand-LingeringPotion-API.patch rename to patches/api/0448-Expand-LingeringPotion-API.patch diff --git a/patches/unapplied/api/0449-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0449-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/unapplied/api/0449-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0449-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/unapplied/api/0450-Add-Structure-check-API.patch b/patches/api/0450-Add-Structure-check-API.patch similarity index 100% rename from patches/unapplied/api/0450-Add-Structure-check-API.patch rename to patches/api/0450-Add-Structure-check-API.patch