diff --git a/patches/unapplied/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch similarity index 92% rename from patches/unapplied/api/0002-Build-system-changes.patch rename to patches/api/0002-Build-system-changes.patch index 98f071089..9c0f602ed 100644 --- a/patches/unapplied/api/0002-Build-system-changes.patch +++ b/patches/api/0002-Build-system-changes.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 386d8c36510e69a69ce4536e67af4a6e4e886685..75d59838512a8385c95222083a67b81d060b6a90 100644 +index 17e8858e01d80c422947f507e9d77b7532788752..82444d3b95881702910369ec5694dd9f327ad81a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -14,15 +14,27 @@ dependencies { - api("com.google.code.gson:gson:2.10") +@@ -15,15 +15,27 @@ dependencies { api("net.md-5:bungeecord-chat:1.16-R0.4") api("org.yaml:snakeyaml:1.33") + api("org.joml:joml:1.10.5") + // Paper start + api("com.googlecode.json-simple:json-simple:1.1.1") { + isTransitive = false // includes junit @@ -37,7 +37,7 @@ index 386d8c36510e69a69ce4536e67af4a6e4e886685..75d59838512a8385c95222083a67b81d testImplementation("org.apache.commons:commons-lang3:3.12.0") testImplementation("junit:junit:4.13.2") testImplementation("org.hamcrest:hamcrest-library:1.3") -@@ -64,7 +76,7 @@ tasks.withType { +@@ -65,7 +77,7 @@ tasks.withType { options.links( "https://guava.dev/releases/31.0.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", @@ -46,7 +46,7 @@ index 386d8c36510e69a69ce4536e67af4a6e4e886685..75d59838512a8385c95222083a67b81d "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", ) -@@ -79,3 +91,14 @@ tasks.withType { +@@ -80,3 +92,14 @@ tasks.withType { } } } diff --git a/patches/unapplied/api/0003-Test-changes.patch b/patches/api/0003-Test-changes.patch similarity index 99% rename from patches/unapplied/api/0003-Test-changes.patch rename to patches/api/0003-Test-changes.patch index cebba1f62..ad9026060 100644 --- a/patches/unapplied/api/0003-Test-changes.patch +++ b/patches/api/0003-Test-changes.patch @@ -11,10 +11,10 @@ Subject: [PATCH] Test changes Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 75d59838512a8385c95222083a67b81d060b6a90..4c34d36b1f62ea08e6a64d15effb3c07370200cf 100644 +index 82444d3b95881702910369ec5694dd9f327ad81a..c06eda648d8626c86afb2140d6a583ddf82f295c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -34,6 +34,7 @@ dependencies { +@@ -35,6 +35,7 @@ dependencies { compileOnlyApi(checkerQual) testCompileOnly(checkerQual) // Paper end diff --git a/patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch similarity index 82% rename from patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch rename to patches/api/0004-Add-FastUtil-to-Bukkit.patch index 1e19cea19..a3b6bc3d5 100644 --- a/patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch +++ b/patches/api/0004-Add-FastUtil-to-Bukkit.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/build.gradle.kts b/build.gradle.kts -index 4c34d36b1f62ea08e6a64d15effb3c07370200cf..57634e3710f459e6f42c5d284d873091afdd1ea4 100644 +index c06eda648d8626c86afb2140d6a583ddf82f295c..464a209dbf52ebdfa287a553778a37c382a5405c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -18,6 +18,7 @@ dependencies { +@@ -19,6 +19,7 @@ dependencies { api("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false // includes junit } diff --git a/patches/unapplied/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch similarity index 99% rename from patches/unapplied/api/0005-Adventure.patch rename to patches/api/0005-Adventure.patch index b0b97dfe0..d69faf366 100644 --- a/patches/unapplied/api/0005-Adventure.patch +++ b/patches/api/0005-Adventure.patch @@ -7,10 +7,10 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 57634e3710f459e6f42c5d284d873091afdd1ea4..45f29dd1b1d683f6a4d8b91b81274565d75d4d73 100644 +index 464a209dbf52ebdfa287a553778a37c382a5405c..23b1e7600d2507be60cb8543773b91f4851afb4f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -8,17 +8,37 @@ java { +@@ -8,11 +8,24 @@ java { withJavadocJar() } @@ -34,8 +34,9 @@ index 57634e3710f459e6f42c5d284d873091afdd1ea4..45f29dd1b1d683f6a4d8b91b81274565 - api("net.md-5:bungeecord-chat:1.16-R0.4") + api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper api("org.yaml:snakeyaml:1.33") + api("org.joml:joml:1.10.5") // Paper start - api("com.googlecode.json-simple:json-simple:1.1.1") { +@@ -20,6 +33,13 @@ dependencies { isTransitive = false // includes junit } api("it.unimi.dsi:fastutil:8.5.6") @@ -49,7 +50,7 @@ index 57634e3710f459e6f42c5d284d873091afdd1ea4..45f29dd1b1d683f6a4d8b91b81274565 // Paper end compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") -@@ -79,9 +99,24 @@ tasks.withType { +@@ -80,9 +100,24 @@ tasks.withType { "https://guava.dev/releases/31.0.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations @@ -1354,7 +1355,7 @@ index 52dd3148ae2a3480982593dc627ef7eede52bc5a..892e03189957b0072827be4fd485dd98 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 6b360758cd4cb02145f18ce743b51f91a471a650..bf8eea5464f4b09198e7b621419a3adade9f4601 100644 +index 5676389bb85607112194fd9a6741ab88254d18bb..fad12a883046010274c8b44426096bfe4703bcc3 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; @@ -1366,7 +1367,7 @@ index 6b360758cd4cb02145f18ce743b51f91a471a650..bf8eea5464f4b09198e7b621419a3ada AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"), AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"), -@@ -1416,4 +1416,12 @@ public enum Sound implements Keyed { +@@ -1478,4 +1478,12 @@ public enum Sound implements Keyed { public NamespacedKey getKey() { return key; } @@ -1918,7 +1919,7 @@ 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 8489a0b009223b727b0393840374550a1cc192ff..bdcf5219ff1e4d4c0dc8a3423bc17b453b779473 100644 +index 281518d6e1f67722134e22d89b71106aae0c4397..0a539af95e1bd331cec241403a15e4e6dbf6d996 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; @@ -1930,7 +1931,7 @@ index 8489a0b009223b727b0393840374550a1cc192ff..bdcf5219ff1e4d4c0dc8a3423bc17b45 /** * Gets the entity's current position -@@ -683,4 +683,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -709,4 +709,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @Override Spigot spigot(); // Spigot end @@ -1952,7 +1953,7 @@ index 8489a0b009223b727b0393840374550a1cc192ff..bdcf5219ff1e4d4c0dc8a3423bc17b45 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67a7783865 100644 +index c60e1fc1cad1b9889a508602df84840723b7b966..baf0887ec941533f8007f2c7f7ab78f16b45bd74 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -39,7 +39,28 @@ import org.jetbrains.annotations.Nullable; @@ -2251,7 +2252,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException; /** -@@ -1058,6 +1234,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1089,6 +1265,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * pack correctly. * * @@ -2259,7 +2260,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 * @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. -@@ -1114,8 +1291,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1145,8 +1322,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2270,7 +2271,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 /** * Request that the player's client download and switch resource packs. *

-@@ -1151,6 +1330,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1182,6 +1361,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param hash The sha1 hash sum of the resource pack file which is used * to apply a cached version of the pack directly without downloading * if it is available. Hast to be 20 bytes long! @@ -2325,7 +2326,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 * @param force If true, the client will be disconnected from the server * when it declines to use the resource pack. * @throws IllegalArgumentException Thrown if the URL is null. -@@ -1205,8 +1432,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1236,8 +1463,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2383,7 +2384,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 /** * Gets the Scoreboard displayed to this player * -@@ -1322,7 +1598,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1353,7 +1629,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param title Title text * @param subtitle Subtitle text @@ -2392,7 +2393,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 */ @Deprecated public void sendTitle(@Nullable String title, @Nullable String subtitle); -@@ -1341,7 +1617,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1372,7 +1648,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. @@ -2402,7 +2403,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut); /** -@@ -1568,6 +1846,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1599,6 +1877,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public int getClientViewDistance(); @@ -2417,7 +2418,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 /** * Gets the player's estimated ping in milliseconds. * -@@ -1593,8 +1879,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1624,8 +1910,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * they wish. * * @return the player's locale @@ -2428,7 +2429,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 public String getLocale(); /** -@@ -1636,6 +1924,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1667,6 +1955,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public boolean isAllowingServerListings(); @@ -2443,7 +2444,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 // Spigot start public class Spigot extends Entity.Spigot { -@@ -1690,11 +1986,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1721,11 +2017,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM throw new UnsupportedOperationException("Not supported yet."); } @@ -2457,7 +2458,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 @Override public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); -@@ -1705,7 +2003,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1736,7 +2034,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param component the components to send @@ -2467,7 +2468,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 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."); } -@@ -1715,7 +2015,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1746,7 +2046,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param components the components to send @@ -2477,7 +2478,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 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."); } -@@ -1726,7 +2028,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1757,7 +2059,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 @@ -2487,7 +2488,7 @@ index 9f49dc054e7755392139ffbacc6365f9c742b085..b4a27acb8579e86483646379878fbf67 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."); } -@@ -1737,7 +2041,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1768,7 +2072,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 @@ -2736,10 +2737,10 @@ index 3c2ea8fec3a748cab7f5ad9100d12bd8213ec6c9..1f1df82c9bcf18bad1187e3f24ede190 * 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 21ef4150d41a57fdc4f405fea1f578448f0c860b..b917c13a30254a83cc2ea87279d427276bc75074 100644 +index 8573f5d1b14e27f4ba4de5f68e74f83d8329371b..456eb20f8d603b1ebbaa11b8832e56c08406b7c9 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java -@@ -144,6 +144,18 @@ public enum InventoryType { +@@ -151,6 +151,18 @@ public enum InventoryType { private final String title; private final boolean isCreatable; @@ -2758,7 +2759,7 @@ index 21ef4150d41a57fdc4f405fea1f578448f0c860b..b917c13a30254a83cc2ea87279d42727 private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) { this(defaultSize, defaultTitle, true); } -@@ -152,6 +164,7 @@ public enum InventoryType { +@@ -159,6 +171,7 @@ public enum InventoryType { size = defaultSize; title = defaultTitle; this.isCreatable = isCreatable; @@ -2766,7 +2767,7 @@ index 21ef4150d41a57fdc4f405fea1f578448f0c860b..b917c13a30254a83cc2ea87279d42727 } public int getDefaultSize() { -@@ -159,6 +172,7 @@ public enum InventoryType { +@@ -166,6 +179,7 @@ public enum InventoryType { } @NotNull @@ -3677,10 +3678,10 @@ index 5adbe0514129abf3cfbc4b29a213f522359fe2e1..732d8d0436dc76cff33394b43452ff8f /** diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java -index 14346d83bc99581b18e53d19af03708c0bf22cf7..a4e3d526db2d17dc923cbe82e53d3c902d61e1f3 100644 +index 5fc95b83dbcd8e533afe6539f97829ce7a52224f..dbf316b63bf3d0c0695ceca84985d67f0f95c906 100644 --- a/src/main/java/org/bukkit/inventory/InventoryView.java +++ b/src/main/java/org/bukkit/inventory/InventoryView.java -@@ -446,11 +446,25 @@ public abstract class InventoryView { +@@ -447,11 +447,25 @@ public abstract class InventoryView { return getPlayer().setWindowProperty(prop, value); } diff --git a/patches/unapplied/api/0006-Paper-Utils.patch b/patches/api/0006-Paper-Utils.patch similarity index 100% rename from patches/unapplied/api/0006-Paper-Utils.patch rename to patches/api/0006-Paper-Utils.patch diff --git a/patches/unapplied/api/0007-Use-ASM-for-event-executors.patch b/patches/api/0007-Use-ASM-for-event-executors.patch similarity index 99% rename from patches/unapplied/api/0007-Use-ASM-for-event-executors.patch rename to patches/api/0007-Use-ASM-for-event-executors.patch index 60a7c14e4..378b866fb 100644 --- a/patches/unapplied/api/0007-Use-ASM-for-event-executors.patch +++ b/patches/api/0007-Use-ASM-for-event-executors.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index 45f29dd1b1d683f6a4d8b91b81274565d75d4d73..44af6bd382dca476e4afd458a743ae56c91a8dee 100644 +index 23b1e7600d2507be60cb8543773b91f4851afb4f..d95b3d504ddc9ed76fc86cd45fa922d68e597827 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -39,6 +39,9 @@ dependencies { +@@ -40,6 +40,9 @@ dependencies { apiAndDocs("net.kyori:adventure-text-serializer-legacy") apiAndDocs("net.kyori:adventure-text-serializer-plain") apiAndDocs("net.kyori:adventure-text-logger-slf4j") diff --git a/patches/unapplied/api/0008-Paper-Plugins.patch b/patches/api/0008-Paper-Plugins.patch similarity index 99% rename from patches/unapplied/api/0008-Paper-Plugins.patch rename to patches/api/0008-Paper-Plugins.patch index 1d10b9ab5..f00f09d78 100644 --- a/patches/unapplied/api/0008-Paper-Plugins.patch +++ b/patches/api/0008-Paper-Plugins.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Paper Plugins diff --git a/build.gradle.kts b/build.gradle.kts -index 44af6bd382dca476e4afd458a743ae56c91a8dee..f5aa8d96dce1dbac78a99535786cf9c0085b3b80 100644 +index d95b3d504ddc9ed76fc86cd45fa922d68e597827..9d6e604c7667985dc8107a5df9d36c53e8006326 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -44,7 +44,7 @@ dependencies { +@@ -45,7 +45,7 @@ dependencies { implementation("org.ow2.asm:asm-commons:9.4") // Paper end @@ -1401,10 +1401,10 @@ index 94f8ceb965cecb5669a84a0ec61c0f706c2a2673..e773db6da357ad210eb24d4c389af2dc } } diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java -index 0c9f4d1e9104fa6951114c1f9ec954dfcc749196..f1ae66989afaa433bf2896e0bfe2cea472f774d8 100644 +index 77a380537b338fdd0aa2f6777ff775056cc6b221..028805bcdb1d2bb0d11387db165b7376579e5f60 100644 --- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java +++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java -@@ -194,7 +194,7 @@ import org.yaml.snakeyaml.nodes.Tag; +@@ -195,7 +195,7 @@ import org.yaml.snakeyaml.nodes.Tag; * inferno.burningdeaths: true * */ @@ -1413,7 +1413,7 @@ index 0c9f4d1e9104fa6951114c1f9ec954dfcc749196..f1ae66989afaa433bf2896e0bfe2cea4 private static final Pattern VALID_NAME = Pattern.compile("^[A-Za-z0-9 _.-]+$"); private static final ThreadLocal YAML = new ThreadLocal() { @Override -@@ -254,6 +254,70 @@ public final class PluginDescriptionFile { +@@ -255,6 +255,70 @@ public final class PluginDescriptionFile { private Set awareness = ImmutableSet.of(); private String apiVersion = null; private List libraries = ImmutableList.of(); diff --git a/patches/unapplied/api/0009-Add-Position.patch b/patches/api/0009-Add-Position.patch similarity index 100% rename from patches/unapplied/api/0009-Add-Position.patch rename to patches/api/0009-Add-Position.patch diff --git a/patches/unapplied/api/0010-Timings-v2.patch b/patches/api/0010-Timings-v2.patch similarity index 99% rename from patches/unapplied/api/0010-Timings-v2.patch rename to patches/api/0010-Timings-v2.patch index 0a4e45138..d6cb96940 100644 --- a/patches/unapplied/api/0010-Timings-v2.patch +++ b/patches/api/0010-Timings-v2.patch @@ -3392,10 +3392,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 b4a27acb8579e86483646379878fbf67a7783865..05d8c6e65d5aed5c0b38e9d3c5becdca361a4829 100644 +index baf0887ec941533f8007f2c7f7ab78f16b45bd74..8d8a540c844e5365eed75a87db197a8fd4249bcd 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2046,7 +2046,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2077,7 +2077,14 @@ 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/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/unapplied/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/unapplied/api/0012-Player-affects-spawning-API.patch b/patches/api/0012-Player-affects-spawning-API.patch similarity index 86% rename from patches/unapplied/api/0012-Player-affects-spawning-API.patch rename to patches/api/0012-Player-affects-spawning-API.patch index 79b855356..5410c2f5e 100644 --- a/patches/unapplied/api/0012-Player-affects-spawning-API.patch +++ b/patches/api/0012-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 05d8c6e65d5aed5c0b38e9d3c5becdca361a4829..ab29ddf09a178b70c7afad33d282cb39fcd7e92a 100644 +index 8d8a540c844e5365eed75a87db197a8fd4249bcd..4ddea8d71723db4326459c96324a817c70492261 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1885,6 +1885,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1916,6 +1916,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Deprecated // Paper public String getLocale(); diff --git a/patches/unapplied/api/0013-Add-getTPS-method.patch b/patches/api/0013-Add-getTPS-method.patch similarity index 100% rename from patches/unapplied/api/0013-Add-getTPS-method.patch rename to patches/api/0013-Add-getTPS-method.patch diff --git a/patches/unapplied/api/0014-Version-Command-2.0.patch b/patches/api/0014-Version-Command-2.0.patch similarity index 100% rename from patches/unapplied/api/0014-Version-Command-2.0.patch rename to patches/api/0014-Version-Command-2.0.patch diff --git a/patches/unapplied/api/0015-Entity-Origin-API.patch b/patches/api/0015-Entity-Origin-API.patch similarity index 94% rename from patches/unapplied/api/0015-Entity-Origin-API.patch rename to patches/api/0015-Entity-Origin-API.patch index 9ed5bdd08..a832f7333 100644 --- a/patches/unapplied/api/0015-Entity-Origin-API.patch +++ b/patches/api/0015-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 bdcf5219ff1e4d4c0dc8a3423bc17b453b779473..a4dfac73b8510f0dddd65751b8430be1abdabbdd 100644 +index 0a539af95e1bd331cec241403a15e4e6dbf6d996..1b0b365905d4e7f77d3f792797816eeb35d31c69 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -698,5 +698,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -724,5 +724,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/0016-Add-PlayerLocaleChangeEvent.patch b/patches/api/0016-Add-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0016-Add-PlayerLocaleChangeEvent.patch rename to patches/api/0016-Add-PlayerLocaleChangeEvent.patch diff --git a/patches/unapplied/api/0017-Add-view-distance-API.patch b/patches/api/0017-Add-view-distance-API.patch similarity index 97% rename from patches/unapplied/api/0017-Add-view-distance-API.patch rename to patches/api/0017-Add-view-distance-API.patch index 8c17924c1..334a8d41b 100644 --- a/patches/unapplied/api/0017-Add-view-distance-API.patch +++ b/patches/api/0017-Add-view-distance-API.patch @@ -75,10 +75,10 @@ index ed57cd69d88504b78782271c9a3d423a29471674..8a6a548314eef8d486be908e38e3a456 public class Spigot { diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ab29ddf09a178b70c7afad33d282cb39fcd7e92a..3c7665d5e96e710eb1ebb439a0bc0fd441bd2532 100644 +index 4ddea8d71723db4326459c96324a817c70492261..a8310063973bb18502d561903b78149a6fda4939 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1899,6 +1899,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1930,6 +1930,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/0018-Add-BeaconEffectEvent.patch b/patches/api/0018-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/unapplied/api/0018-Add-BeaconEffectEvent.patch rename to patches/api/0018-Add-BeaconEffectEvent.patch diff --git a/patches/unapplied/api/0019-Add-PlayerInitialSpawnEvent.patch b/patches/api/0019-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0019-Add-PlayerInitialSpawnEvent.patch rename to patches/api/0019-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/unapplied/api/0020-Expose-server-CommandMap.patch b/patches/api/0020-Expose-server-CommandMap.patch similarity index 100% rename from patches/unapplied/api/0020-Expose-server-CommandMap.patch rename to patches/api/0020-Expose-server-CommandMap.patch diff --git a/patches/unapplied/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch similarity index 96% rename from patches/unapplied/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch rename to patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 8a7f6124f..82a4b09bf 100644 --- a/patches/unapplied/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -76,7 +76,7 @@ index 6a7b91af3e738613cf79c13e2844efe9a2efd254..bef555b3de44fed312b45a5d5cd811b1 * 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 3c7665d5e96e710eb1ebb439a0bc0fd441bd2532..1fe1d5a0a777ecaab9ac1d8092e5a46ddacf4e18 100644 +index a8310063973bb18502d561903b78149a6fda4939..a2c813d6d94ae2a87278d92445635ae8dd3ab00a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -813,6 +813,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -120,5 +120,5 @@ index 3c7665d5e96e710eb1ebb439a0bc0fd441bd2532..1fe1d5a0a777ecaab9ac1d8092e5a46d + // Paper end + /** - * Forces an update of the player's entire inventory. - * + * Add custom chat completion suggestions shown to the player while typing a + * message. diff --git a/patches/unapplied/api/0022-Add-exception-reporting-event.patch b/patches/api/0022-Add-exception-reporting-event.patch similarity index 100% rename from patches/unapplied/api/0022-Add-exception-reporting-event.patch rename to patches/api/0022-Add-exception-reporting-event.patch diff --git a/patches/unapplied/api/0023-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/api/0023-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch similarity index 100% rename from patches/unapplied/api/0023-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch rename to patches/api/0023-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch diff --git a/patches/unapplied/api/0024-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/api/0024-Fix-ServerListPingEvent-flagging-as-Async.patch similarity index 100% rename from patches/unapplied/api/0024-Fix-ServerListPingEvent-flagging-as-Async.patch rename to patches/api/0024-Fix-ServerListPingEvent-flagging-as-Async.patch diff --git a/patches/unapplied/api/0025-Player-Tab-List-and-Title-APIs.patch b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch similarity index 99% rename from patches/unapplied/api/0025-Player-Tab-List-and-Title-APIs.patch rename to patches/api/0025-Player-Tab-List-and-Title-APIs.patch index 9e9998bd4..ffe43fb42 100644 --- a/patches/unapplied/api/0025-Player-Tab-List-and-Title-APIs.patch +++ b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch @@ -432,7 +432,7 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 1fe1d5a0a777ecaab9ac1d8092e5a46ddacf4e18..d108c0485110be014b7dc05a3ade660b750f1dce 100644 +index a2c813d6d94ae2a87278d92445635ae8dd3ab00a..3e2b8c1ae51404352adccc9ad108982173306ee9 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -847,6 +847,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/unapplied/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/unapplied/api/0027-Complete-resource-pack-API.patch b/patches/api/0027-Complete-resource-pack-API.patch similarity index 97% rename from patches/unapplied/api/0027-Complete-resource-pack-API.patch rename to patches/api/0027-Complete-resource-pack-API.patch index 6658f5134..f51362288 100644 --- a/patches/unapplied/api/0027-Complete-resource-pack-API.patch +++ b/patches/api/0027-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 d108c0485110be014b7dc05a3ade660b750f1dce..e3bd8634defd69ecb8146ea19e11c0ffc14374d9 100644 +index 3e2b8c1ae51404352adccc9ad108982173306ee9..cdc67b2c6770119ada67033b388befa607bd46db 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1363,7 +1363,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1394,7 +1394,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 d108c0485110be014b7dc05a3ade660b750f1dce..e3bd8634defd69ecb8146ea19e11c0ff public void setResourcePack(@NotNull String url); /** -@@ -2179,6 +2181,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2210,6 +2212,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/0028-Add-a-call-helper-to-Event.patch b/patches/api/0028-Add-a-call-helper-to-Event.patch similarity index 100% rename from patches/unapplied/api/0028-Add-a-call-helper-to-Event.patch rename to patches/api/0028-Add-a-call-helper-to-Event.patch diff --git a/patches/unapplied/api/0029-Add-sender-name-to-commands.yml-replacement.patch b/patches/api/0029-Add-sender-name-to-commands.yml-replacement.patch similarity index 100% rename from patches/unapplied/api/0029-Add-sender-name-to-commands.yml-replacement.patch rename to patches/api/0029-Add-sender-name-to-commands.yml-replacement.patch diff --git a/patches/unapplied/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch similarity index 100% rename from patches/unapplied/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch rename to patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch diff --git a/patches/unapplied/api/0031-Custom-replacement-for-eaten-items.patch b/patches/api/0031-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/unapplied/api/0031-Custom-replacement-for-eaten-items.patch rename to patches/api/0031-Custom-replacement-for-eaten-items.patch diff --git a/patches/unapplied/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/unapplied/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/unapplied/api/0033-EntityPathfindEvent.patch b/patches/api/0033-EntityPathfindEvent.patch similarity index 100% rename from patches/unapplied/api/0033-EntityPathfindEvent.patch rename to patches/api/0033-EntityPathfindEvent.patch diff --git a/patches/unapplied/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch similarity index 100% rename from patches/unapplied/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch rename to patches/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch diff --git a/patches/unapplied/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch similarity index 100% rename from patches/unapplied/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch rename to patches/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch diff --git a/patches/unapplied/api/0036-Add-PlayerUseUnknownEntityEvent.patch b/patches/api/0036-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/unapplied/api/0036-Add-PlayerUseUnknownEntityEvent.patch rename to patches/api/0036-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/unapplied/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/unapplied/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/unapplied/api/0038-Arrow-pickup-rule-API.patch b/patches/api/0038-Arrow-pickup-rule-API.patch similarity index 100% rename from patches/unapplied/api/0038-Arrow-pickup-rule-API.patch rename to patches/api/0038-Arrow-pickup-rule-API.patch diff --git a/patches/unapplied/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/unapplied/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/unapplied/api/0040-LootTable-API.patch b/patches/api/0040-LootTable-API.patch similarity index 100% rename from patches/unapplied/api/0040-LootTable-API.patch rename to patches/api/0040-LootTable-API.patch diff --git a/patches/unapplied/api/0041-Add-EntityZapEvent.patch b/patches/api/0041-Add-EntityZapEvent.patch similarity index 100% rename from patches/unapplied/api/0041-Add-EntityZapEvent.patch rename to patches/api/0041-Add-EntityZapEvent.patch diff --git a/patches/unapplied/api/0042-Misc-Utils.patch b/patches/api/0042-Misc-Utils.patch similarity index 100% rename from patches/unapplied/api/0042-Misc-Utils.patch rename to patches/api/0042-Misc-Utils.patch diff --git a/patches/unapplied/api/0043-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0043-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/unapplied/api/0043-Allow-Reloading-of-Command-Aliases.patch rename to patches/api/0043-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/unapplied/api/0044-Add-source-to-PlayerExpChangeEvent.patch b/patches/api/0044-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0044-Add-source-to-PlayerExpChangeEvent.patch rename to patches/api/0044-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/unapplied/api/0045-Add-ProjectileCollideEvent.patch b/patches/api/0045-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/unapplied/api/0045-Add-ProjectileCollideEvent.patch rename to patches/api/0045-Add-ProjectileCollideEvent.patch diff --git a/patches/unapplied/api/0046-Add-String-based-Action-Bar-API.patch b/patches/api/0046-Add-String-based-Action-Bar-API.patch similarity index 96% rename from patches/unapplied/api/0046-Add-String-based-Action-Bar-API.patch rename to patches/api/0046-Add-String-based-Action-Bar-API.patch index 1ef6da305..5d8a11a0a 100644 --- a/patches/unapplied/api/0046-Add-String-based-Action-Bar-API.patch +++ b/patches/api/0046-Add-String-based-Action-Bar-API.patch @@ -5,7 +5,7 @@ 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 e3bd8634defd69ecb8146ea19e11c0ffc14374d9..da9febacac135ebecf0236a7cda589cb1d527ef0 100644 +index cdc67b2c6770119ada67033b388befa607bd46db..0fdaf416960ace84fbe9b9c461641efbb8b631a4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -814,6 +814,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/unapplied/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/unapplied/api/0048-IllegalPacketEvent.patch b/patches/api/0048-IllegalPacketEvent.patch similarity index 100% rename from patches/unapplied/api/0048-IllegalPacketEvent.patch rename to patches/api/0048-IllegalPacketEvent.patch diff --git a/patches/unapplied/api/0049-Fireworks-API-s.patch b/patches/api/0049-Fireworks-API-s.patch similarity index 100% rename from patches/unapplied/api/0049-Fireworks-API-s.patch rename to patches/api/0049-Fireworks-API-s.patch diff --git a/patches/unapplied/api/0050-PlayerTeleportEndGatewayEvent.patch b/patches/api/0050-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/unapplied/api/0050-PlayerTeleportEndGatewayEvent.patch rename to patches/api/0050-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/unapplied/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/unapplied/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/unapplied/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/unapplied/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/unapplied/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch similarity index 100% rename from patches/unapplied/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch rename to patches/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch diff --git a/patches/unapplied/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/unapplied/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/unapplied/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch similarity index 99% rename from patches/unapplied/api/0055-Fix-upstream-javadocs.patch rename to patches/api/0055-Fix-upstream-javadocs.patch index 4426cb60e..5576f1e78 100644 --- a/patches/unapplied/api/0055-Fix-upstream-javadocs.patch +++ b/patches/api/0055-Fix-upstream-javadocs.patch @@ -134,7 +134,7 @@ index 2926fa6071bc7640cc10280b5c3962b0ce7686f1..4f63988848443aff55619bc12ef12c92 * Instructs this Mob to set the specified LivingEntity as its target. *

diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index da9febacac135ebecf0236a7cda589cb1d527ef0..7e3e717d6831ac6a206d58313c7f2da0c4b92e6b 100644 +index 0fdaf416960ace84fbe9b9c461641efbb8b631a4..1017db005f8c7a095911f5dd0dbe37d9fc239c95 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -310,15 +310,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0056-Item-canEntityPickup.patch b/patches/api/0056-Item-canEntityPickup.patch similarity index 100% rename from patches/unapplied/api/0056-Item-canEntityPickup.patch rename to patches/api/0056-Item-canEntityPickup.patch diff --git a/patches/unapplied/api/0057-PlayerAttemptPickupItemEvent.patch b/patches/api/0057-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/unapplied/api/0057-PlayerAttemptPickupItemEvent.patch rename to patches/api/0057-PlayerAttemptPickupItemEvent.patch diff --git a/patches/unapplied/api/0058-Add-UnknownCommandEvent.patch b/patches/api/0058-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/unapplied/api/0058-Add-UnknownCommandEvent.patch rename to patches/api/0058-Add-UnknownCommandEvent.patch diff --git a/patches/unapplied/api/0059-Basic-PlayerProfile-API.patch b/patches/api/0059-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/unapplied/api/0059-Basic-PlayerProfile-API.patch rename to patches/api/0059-Basic-PlayerProfile-API.patch diff --git a/patches/unapplied/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/unapplied/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/unapplied/api/0061-Shoulder-Entities-Release-API.patch b/patches/api/0061-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/unapplied/api/0061-Shoulder-Entities-Release-API.patch rename to patches/api/0061-Shoulder-Entities-Release-API.patch diff --git a/patches/unapplied/api/0062-Entity-fromMobSpawner.patch b/patches/api/0062-Entity-fromMobSpawner.patch similarity index 81% rename from patches/unapplied/api/0062-Entity-fromMobSpawner.patch rename to patches/api/0062-Entity-fromMobSpawner.patch index 9735cb4cc..5589904f6 100644 --- a/patches/unapplied/api/0062-Entity-fromMobSpawner.patch +++ b/patches/api/0062-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 a4dfac73b8510f0dddd65751b8430be1abdabbdd..6b0bfcfd22105fbdf09c11bbec009ba19116abd9 100644 +index 1b0b365905d4e7f77d3f792797816eeb35d31c69..c10e19e06f0c4e33b2c5a4a1446b151f818e92db 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -708,5 +708,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -734,5 +734,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Nullable Location getOrigin(); diff --git a/patches/unapplied/api/0063-Profile-Lookup-Events.patch b/patches/api/0063-Profile-Lookup-Events.patch similarity index 100% rename from patches/unapplied/api/0063-Profile-Lookup-Events.patch rename to patches/api/0063-Profile-Lookup-Events.patch diff --git a/patches/unapplied/api/0064-Improve-the-Saddle-API-for-Horses.patch b/patches/api/0064-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/unapplied/api/0064-Improve-the-Saddle-API-for-Horses.patch rename to patches/api/0064-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/unapplied/api/0065-Add-getI18NDisplayName-API.patch b/patches/api/0065-Add-getI18NDisplayName-API.patch similarity index 100% rename from patches/unapplied/api/0065-Add-getI18NDisplayName-API.patch rename to patches/api/0065-Add-getI18NDisplayName-API.patch diff --git a/patches/unapplied/api/0066-ensureServerConversions-API.patch b/patches/api/0066-ensureServerConversions-API.patch similarity index 100% rename from patches/unapplied/api/0066-ensureServerConversions-API.patch rename to patches/api/0066-ensureServerConversions-API.patch diff --git a/patches/unapplied/api/0067-LivingEntity-setKiller.patch b/patches/api/0067-LivingEntity-setKiller.patch similarity index 100% rename from patches/unapplied/api/0067-LivingEntity-setKiller.patch rename to patches/api/0067-LivingEntity-setKiller.patch diff --git a/patches/unapplied/api/0068-ProfileWhitelistVerifyEvent.patch b/patches/api/0068-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/unapplied/api/0068-ProfileWhitelistVerifyEvent.patch rename to patches/api/0068-ProfileWhitelistVerifyEvent.patch diff --git a/patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch similarity index 94% rename from patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch rename to patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch index 07b00d1fb..f9beb9f10 100644 --- a/patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/build.gradle.kts b/build.gradle.kts -index f5aa8d96dce1dbac78a99535786cf9c0085b3b80..9421e45653e68922a51cf0071792e6fa7999d0b8 100644 +index 9d6e604c7667985dc8107a5df9d36c53e8006326..1de2f8f345a287d93aad106dd13472a7837ec805 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -39,6 +39,8 @@ dependencies { +@@ -40,6 +40,8 @@ dependencies { apiAndDocs("net.kyori:adventure-text-serializer-legacy") apiAndDocs("net.kyori:adventure-text-serializer-plain") apiAndDocs("net.kyori:adventure-text-logger-slf4j") diff --git a/patches/unapplied/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch similarity index 100% rename from patches/unapplied/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch rename to patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch diff --git a/patches/unapplied/api/0071-Add-PlayerJumpEvent.patch b/patches/api/0071-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/unapplied/api/0071-Add-PlayerJumpEvent.patch rename to patches/api/0071-Add-PlayerJumpEvent.patch diff --git a/patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch similarity index 100% rename from patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch rename to patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch diff --git a/patches/unapplied/api/0073-Add-PlayerArmorChangeEvent.patch b/patches/api/0073-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0073-Add-PlayerArmorChangeEvent.patch rename to patches/api/0073-Add-PlayerArmorChangeEvent.patch diff --git a/patches/unapplied/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/unapplied/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/unapplied/api/0075-AsyncTabCompleteEvent.patch b/patches/api/0075-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/unapplied/api/0075-AsyncTabCompleteEvent.patch rename to patches/api/0075-AsyncTabCompleteEvent.patch diff --git a/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch similarity index 96% rename from patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch rename to patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch index 72133bbfd..4bd060d2b 100644 --- a/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7e3e717d6831ac6a206d58313c7f2da0c4b92e6b..0267319ee4e4a7ec3b28ad83572c8e8684d2f9fe 100644 +index 1017db005f8c7a095911f5dd0dbe37d9fc239c95..2f2cce2a8b4b26fbe85da10f55f7313112b05435 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/unapplied/api/0077-Display-warning-on-deprecated-recipe-API.patch b/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch similarity index 100% rename from patches/unapplied/api/0077-Display-warning-on-deprecated-recipe-API.patch rename to patches/api/0077-Display-warning-on-deprecated-recipe-API.patch diff --git a/patches/unapplied/api/0078-PlayerPickupExperienceEvent.patch b/patches/api/0078-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/unapplied/api/0078-PlayerPickupExperienceEvent.patch rename to patches/api/0078-PlayerPickupExperienceEvent.patch diff --git a/patches/unapplied/api/0079-ExperienceOrbMergeEvent.patch b/patches/api/0079-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/unapplied/api/0079-ExperienceOrbMergeEvent.patch rename to patches/api/0079-ExperienceOrbMergeEvent.patch diff --git a/patches/unapplied/api/0080-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch similarity index 91% rename from patches/unapplied/api/0080-Ability-to-apply-mending-to-XP-API.patch rename to patches/api/0080-Ability-to-apply-mending-to-XP-API.patch index 48e086013..f2305d7a9 100644 --- a/patches/unapplied/api/0080-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/api/0080-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 0267319ee4e4a7ec3b28ad83572c8e8684d2f9fe..d68c7751d135c0e600907ae3a1ddd55f591dcade 100644 +index 2f2cce2a8b4b26fbe85da10f55f7313112b05435..af92443e50b66e526d382c820e1b2e27c6e1b461 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1097,12 +1097,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1128,12 +1128,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void resetPlayerWeather(); diff --git a/patches/unapplied/api/0081-PreCreatureSpawnEvent.patch b/patches/api/0081-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0081-PreCreatureSpawnEvent.patch rename to patches/api/0081-PreCreatureSpawnEvent.patch diff --git a/patches/unapplied/api/0082-PlayerNaturallySpawnCreaturesEvent.patch b/patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/unapplied/api/0082-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/unapplied/api/0083-Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/unapplied/api/0083-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/unapplied/api/0084-Fill-Profile-Property-Events.patch b/patches/api/0084-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/unapplied/api/0084-Fill-Profile-Property-Events.patch rename to patches/api/0084-Fill-Profile-Property-Events.patch diff --git a/patches/unapplied/api/0085-PlayerAdvancementCriterionGrantEvent.patch b/patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/unapplied/api/0085-PlayerAdvancementCriterionGrantEvent.patch rename to patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/unapplied/api/0086-Add-ArmorStand-Item-Meta.patch b/patches/api/0086-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/unapplied/api/0086-Add-ArmorStand-Item-Meta.patch rename to patches/api/0086-Add-ArmorStand-Item-Meta.patch diff --git a/patches/unapplied/api/0087-Optimize-Hoppers.patch b/patches/api/0087-Optimize-Hoppers.patch similarity index 100% rename from patches/unapplied/api/0087-Optimize-Hoppers.patch rename to patches/api/0087-Optimize-Hoppers.patch diff --git a/patches/unapplied/api/0088-Tameable-getOwnerUniqueId-API.patch b/patches/api/0088-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/unapplied/api/0088-Tameable-getOwnerUniqueId-API.patch rename to patches/api/0088-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/unapplied/api/0090-Add-extended-PaperServerListPingEvent.patch b/patches/api/0090-Add-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/unapplied/api/0090-Add-extended-PaperServerListPingEvent.patch rename to patches/api/0090-Add-extended-PaperServerListPingEvent.patch diff --git a/patches/unapplied/api/0091-Player.setPlayerProfile-API.patch b/patches/api/0091-Player.setPlayerProfile-API.patch similarity index 97% rename from patches/unapplied/api/0091-Player.setPlayerProfile-API.patch rename to patches/api/0091-Player.setPlayerProfile-API.patch index 7da06195b..d6a68d225 100644 --- a/patches/unapplied/api/0091-Player.setPlayerProfile-API.patch +++ b/patches/api/0091-Player.setPlayerProfile-API.patch @@ -93,10 +93,10 @@ index bf1102b4481b8c9b9c4f5ba0c561556b75fea077..8539bac19bf9ba1a66689a9af90e088a /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d68c7751d135c0e600907ae3a1ddd55f591dcade..ccde3d91163b27e27334d859120e0eb851846d1d 100644 +index af92443e50b66e526d382c820e1b2e27c6e1b461..95163d95b80f245712839af4c03e0df721809117 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2355,6 +2355,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2386,6 +2386,20 @@ 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/0092-getPlayerUniqueId-API.patch b/patches/api/0092-getPlayerUniqueId-API.patch similarity index 100% rename from patches/unapplied/api/0092-getPlayerUniqueId-API.patch rename to patches/api/0092-getPlayerUniqueId-API.patch diff --git a/patches/unapplied/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch similarity index 100% rename from patches/unapplied/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch rename to patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch diff --git a/patches/unapplied/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch similarity index 90% rename from patches/unapplied/api/0094-Add-openSign-method-to-HumanEntity.patch rename to patches/api/0094-Add-openSign-method-to-HumanEntity.patch index fada2d139..35ce07a5a 100644 --- a/patches/unapplied/api/0094-Add-openSign-method-to-HumanEntity.patch +++ b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch @@ -24,10 +24,10 @@ index abdca9fe5acc90f167219eb769ece66c35682bb1..9715a9d36187e2eecfeab1a05087d27c /** * 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 ccde3d91163b27e27334d859120e0eb851846d1d..b35d53ef3fd560a4790b5d7850c5d50f7bea2163 100644 +index 95163d95b80f245712839af4c03e0df721809117..3a9dd66d8f30c04342180097d8de44933304b88c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2210,7 +2210,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2241,7 +2241,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Open a Sign for editing by the Player. * diff --git a/patches/unapplied/api/0095-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch similarity index 98% rename from patches/unapplied/api/0095-Add-Ban-Methods-to-Player-Objects.patch rename to patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch index 7d5a95c9c..f83a6082c 100644 --- a/patches/unapplied/api/0095-Add-Ban-Methods-to-Player-Objects.patch +++ b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch @@ -74,7 +74,7 @@ index 3ba8ff1a41ac9fd96fd4dec5cbe0f714fef93022..b39ed4eb2e7d9e40805e201d77973877 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b35d53ef3fd560a4790b5d7850c5d50f7bea2163..cfa1a685fbf2be603a6f95eaa6519c7ffe954c23 100644 +index 3a9dd66d8f30c04342180097d8de44933304b88c..c43cf2bdf24de153d16017e50d9b5723218e3d44 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -814,6 +814,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0096-EndermanEscapeEvent.patch b/patches/api/0096-EndermanEscapeEvent.patch similarity index 100% rename from patches/unapplied/api/0096-EndermanEscapeEvent.patch rename to patches/api/0096-EndermanEscapeEvent.patch diff --git a/patches/unapplied/api/0097-Enderman.teleportRandomly.patch b/patches/api/0097-Enderman.teleportRandomly.patch similarity index 100% rename from patches/unapplied/api/0097-Enderman.teleportRandomly.patch rename to patches/api/0097-Enderman.teleportRandomly.patch diff --git a/patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0098-Additional-world.getNearbyEntities-API-s.patch similarity index 100% rename from patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch rename to patches/api/0098-Additional-world.getNearbyEntities-API-s.patch diff --git a/patches/unapplied/api/0099-Location.isChunkLoaded-API.patch b/patches/api/0099-Location.isChunkLoaded-API.patch similarity index 100% rename from patches/unapplied/api/0099-Location.isChunkLoaded-API.patch rename to patches/api/0099-Location.isChunkLoaded-API.patch diff --git a/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 99% rename from patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch index 2b43acd65..61aaa593e 100644 --- a/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/api/0100-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 9f646171b3ac617fb5217d5ab9c106c3100a8c8d..2315fffc4a1a5bebc50a703e9df59df8121c2200 100644 +index 0ca7955003eea0556a04a54056152ec27d93a9ee..93244e6d940891f1297d4a26a80ba155af306071 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java -@@ -160,6 +160,17 @@ public enum Particle { +@@ -163,6 +163,17 @@ public enum Particle { return dataType; } diff --git a/patches/unapplied/api/0101-EndermanAttackPlayerEvent.patch b/patches/api/0101-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/unapplied/api/0101-EndermanAttackPlayerEvent.patch rename to patches/api/0101-EndermanAttackPlayerEvent.patch diff --git a/patches/unapplied/api/0102-WitchConsumePotionEvent.patch b/patches/api/0102-WitchConsumePotionEvent.patch similarity index 100% rename from patches/unapplied/api/0102-WitchConsumePotionEvent.patch rename to patches/api/0102-WitchConsumePotionEvent.patch diff --git a/patches/unapplied/api/0103-WitchThrowPotionEvent.patch b/patches/api/0103-WitchThrowPotionEvent.patch similarity index 100% rename from patches/unapplied/api/0103-WitchThrowPotionEvent.patch rename to patches/api/0103-WitchThrowPotionEvent.patch diff --git a/patches/unapplied/api/0104-Location.toBlockLocation-toCenterLocation.patch b/patches/api/0104-Location.toBlockLocation-toCenterLocation.patch similarity index 100% rename from patches/unapplied/api/0104-Location.toBlockLocation-toCenterLocation.patch rename to patches/api/0104-Location.toBlockLocation-toCenterLocation.patch diff --git a/patches/unapplied/api/0105-PotionEffect-clone-methods.patch b/patches/api/0105-PotionEffect-clone-methods.patch similarity index 100% rename from patches/unapplied/api/0105-PotionEffect-clone-methods.patch rename to patches/api/0105-PotionEffect-clone-methods.patch diff --git a/patches/unapplied/api/0106-WitchReadyPotionEvent.patch b/patches/api/0106-WitchReadyPotionEvent.patch similarity index 100% rename from patches/unapplied/api/0106-WitchReadyPotionEvent.patch rename to patches/api/0106-WitchReadyPotionEvent.patch diff --git a/patches/unapplied/api/0107-ItemStack-getMaxItemUseDuration.patch b/patches/api/0107-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/unapplied/api/0107-ItemStack-getMaxItemUseDuration.patch rename to patches/api/0107-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/unapplied/api/0108-Add-EntityTeleportEndGatewayEvent.patch b/patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/unapplied/api/0108-Add-EntityTeleportEndGatewayEvent.patch rename to patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/unapplied/api/0109-Make-shield-blocking-delay-configurable.patch b/patches/api/0109-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/unapplied/api/0109-Make-shield-blocking-delay-configurable.patch rename to patches/api/0109-Make-shield-blocking-delay-configurable.patch diff --git a/patches/unapplied/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 100% rename from patches/unapplied/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch diff --git a/patches/unapplied/api/0111-Add-getNearbyXXX-methods-to-Location.patch b/patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch similarity index 100% rename from patches/unapplied/api/0111-Add-getNearbyXXX-methods-to-Location.patch rename to patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch diff --git a/patches/unapplied/api/0112-PlayerReadyArrowEvent.patch b/patches/api/0112-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/unapplied/api/0112-PlayerReadyArrowEvent.patch rename to patches/api/0112-PlayerReadyArrowEvent.patch diff --git a/patches/unapplied/api/0113-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/api/0113-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch similarity index 100% rename from patches/unapplied/api/0113-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch rename to patches/api/0113-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch diff --git a/patches/unapplied/api/0114-Expand-Explosions-API.patch b/patches/api/0114-Expand-Explosions-API.patch similarity index 100% rename from patches/unapplied/api/0114-Expand-Explosions-API.patch rename to patches/api/0114-Expand-Explosions-API.patch diff --git a/patches/unapplied/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch similarity index 100% rename from patches/unapplied/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch rename to patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch diff --git a/patches/unapplied/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/unapplied/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/unapplied/api/0117-RangedEntity-API.patch b/patches/api/0117-RangedEntity-API.patch similarity index 100% rename from patches/unapplied/api/0117-RangedEntity-API.patch rename to patches/api/0117-RangedEntity-API.patch diff --git a/patches/unapplied/api/0118-Add-World.getEntity-UUID-API.patch b/patches/api/0118-Add-World.getEntity-UUID-API.patch similarity index 100% rename from patches/unapplied/api/0118-Add-World.getEntity-UUID-API.patch rename to patches/api/0118-Add-World.getEntity-UUID-API.patch diff --git a/patches/unapplied/api/0119-InventoryCloseEvent-Reason-API.patch b/patches/api/0119-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/unapplied/api/0119-InventoryCloseEvent-Reason-API.patch rename to patches/api/0119-InventoryCloseEvent-Reason-API.patch diff --git a/patches/unapplied/api/0120-Allow-setting-the-vex-s-summoner.patch b/patches/api/0120-Allow-setting-the-vex-s-summoner.patch similarity index 100% rename from patches/unapplied/api/0120-Allow-setting-the-vex-s-summoner.patch rename to patches/api/0120-Allow-setting-the-vex-s-summoner.patch diff --git a/patches/unapplied/api/0121-Entity-getChunk-API.patch b/patches/api/0121-Entity-getChunk-API.patch similarity index 87% rename from patches/unapplied/api/0121-Entity-getChunk-API.patch rename to patches/api/0121-Entity-getChunk-API.patch index 03c704f7a..31b028b90 100644 --- a/patches/unapplied/api/0121-Entity-getChunk-API.patch +++ b/patches/api/0121-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 6b0bfcfd22105fbdf09c11bbec009ba19116abd9..7c867a54e18798d782971a68548eac541e9f50c0 100644 +index c10e19e06f0c4e33b2c5a4a1446b151f818e92db..13e0316b2446c1d10b2ff3582b948265de21bfef 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 6b0bfcfd22105fbdf09c11bbec009ba19116abd9..7c867a54e18798d782971a68548eac54 import org.bukkit.EntityEffect; import org.bukkit.Location; import org.bukkit.Nameable; -@@ -715,5 +716,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -741,5 +742,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/0122-EnderDragon-Events.patch b/patches/api/0122-EnderDragon-Events.patch similarity index 100% rename from patches/unapplied/api/0122-EnderDragon-Events.patch rename to patches/api/0122-EnderDragon-Events.patch diff --git a/patches/unapplied/api/0123-PlayerElytraBoostEvent.patch b/patches/api/0123-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/unapplied/api/0123-PlayerElytraBoostEvent.patch rename to patches/api/0123-PlayerElytraBoostEvent.patch diff --git a/patches/unapplied/api/0124-PlayerLaunchProjectileEvent.patch b/patches/api/0124-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/unapplied/api/0124-PlayerLaunchProjectileEvent.patch rename to patches/api/0124-PlayerLaunchProjectileEvent.patch diff --git a/patches/unapplied/api/0125-EntityTransformedEvent.patch b/patches/api/0125-EntityTransformedEvent.patch similarity index 100% rename from patches/unapplied/api/0125-EntityTransformedEvent.patch rename to patches/api/0125-EntityTransformedEvent.patch diff --git a/patches/unapplied/api/0126-Allow-disabling-armour-stand-ticking.patch b/patches/api/0126-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/unapplied/api/0126-Allow-disabling-armour-stand-ticking.patch rename to patches/api/0126-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/unapplied/api/0127-SkeletonHorse-Additions.patch b/patches/api/0127-SkeletonHorse-Additions.patch similarity index 100% rename from patches/unapplied/api/0127-SkeletonHorse-Additions.patch rename to patches/api/0127-SkeletonHorse-Additions.patch diff --git a/patches/unapplied/api/0128-Expand-Location-Manipulation-API.patch b/patches/api/0128-Expand-Location-Manipulation-API.patch similarity index 100% rename from patches/unapplied/api/0128-Expand-Location-Manipulation-API.patch rename to patches/api/0128-Expand-Location-Manipulation-API.patch diff --git a/patches/unapplied/api/0129-Expand-ArmorStand-API.patch b/patches/api/0129-Expand-ArmorStand-API.patch similarity index 100% rename from patches/unapplied/api/0129-Expand-ArmorStand-API.patch rename to patches/api/0129-Expand-ArmorStand-API.patch diff --git a/patches/unapplied/api/0130-AnvilDamageEvent.patch b/patches/api/0130-AnvilDamageEvent.patch similarity index 100% rename from patches/unapplied/api/0130-AnvilDamageEvent.patch rename to patches/api/0130-AnvilDamageEvent.patch diff --git a/patches/unapplied/api/0131-Add-TNTPrimeEvent.patch b/patches/api/0131-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/unapplied/api/0131-Add-TNTPrimeEvent.patch rename to patches/api/0131-Add-TNTPrimeEvent.patch diff --git a/patches/unapplied/api/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 100% rename from patches/unapplied/api/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to patches/api/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch diff --git a/patches/unapplied/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/unapplied/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/unapplied/api/0134-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0134-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch similarity index 100% rename from patches/unapplied/api/0134-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch rename to patches/api/0134-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch diff --git a/patches/unapplied/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch similarity index 100% rename from patches/unapplied/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch rename to patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch diff --git a/patches/unapplied/api/0136-Slime-Pathfinder-Events.patch b/patches/api/0136-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/unapplied/api/0136-Slime-Pathfinder-Events.patch rename to patches/api/0136-Slime-Pathfinder-Events.patch diff --git a/patches/unapplied/api/0137-Add-PhantomPreSpawnEvent.patch b/patches/api/0137-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0137-Add-PhantomPreSpawnEvent.patch rename to patches/api/0137-Add-PhantomPreSpawnEvent.patch diff --git a/patches/unapplied/api/0138-Add-More-Creeper-API.patch b/patches/api/0138-Add-More-Creeper-API.patch similarity index 100% rename from patches/unapplied/api/0138-Add-More-Creeper-API.patch rename to patches/api/0138-Add-More-Creeper-API.patch diff --git a/patches/unapplied/api/0139-Inventory-removeItemAnySlot.patch b/patches/api/0139-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/unapplied/api/0139-Inventory-removeItemAnySlot.patch rename to patches/api/0139-Inventory-removeItemAnySlot.patch diff --git a/patches/unapplied/api/0140-isChunkGenerated-API.patch b/patches/api/0140-isChunkGenerated-API.patch similarity index 100% rename from patches/unapplied/api/0140-isChunkGenerated-API.patch rename to patches/api/0140-isChunkGenerated-API.patch diff --git a/patches/unapplied/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch similarity index 100% rename from patches/unapplied/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch rename to patches/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch diff --git a/patches/unapplied/api/0142-Async-Chunks-API.patch b/patches/api/0142-Async-Chunks-API.patch similarity index 99% rename from patches/unapplied/api/0142-Async-Chunks-API.patch rename to patches/api/0142-Async-Chunks-API.patch index e81a73302..9a7ff55a9 100644 --- a/patches/unapplied/api/0142-Async-Chunks-API.patch +++ b/patches/api/0142-Async-Chunks-API.patch @@ -495,7 +495,7 @@ index 8075ff77eddb971a0a73dad3c9b809131b5db343..12c1731cd3e7138b30a509bf1c6de937 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 7c867a54e18798d782971a68548eac541e9f50c0..fb3187692878e9686d54c8d022035eba2cea6f25 100644 +index 13e0316b2446c1d10b2ff3582b948265de21bfef..6fb14175962ec9730e4b70330481ec21d2c87da5 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -164,6 +164,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/unapplied/api/0143-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0143-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/unapplied/api/0143-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/api/0143-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/unapplied/api/0144-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch similarity index 88% rename from patches/unapplied/api/0144-Expose-attack-cooldown-methods-for-Player.patch rename to patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch index 3852129e7..9194ef5da 100644 --- a/patches/unapplied/api/0144-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/api/0144-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 cfa1a685fbf2be603a6f95eaa6519c7ffe954c23..98b50de33b9c48e25da0a19747cd1599df5becfc 100644 +index c43cf2bdf24de153d16017e50d9b5723218e3d44..2904aa66e83d8cde9954c13d89f8337bbfc75137 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2525,6 +2525,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2556,6 +2556,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/0145-Improve-death-events.patch b/patches/api/0145-Improve-death-events.patch similarity index 100% rename from patches/unapplied/api/0145-Improve-death-events.patch rename to patches/api/0145-Improve-death-events.patch diff --git a/patches/unapplied/api/0146-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0146-Add-Git-information-to-version-command-on-startup.patch similarity index 100% rename from patches/unapplied/api/0146-Add-Git-information-to-version-command-on-startup.patch rename to patches/api/0146-Add-Git-information-to-version-command-on-startup.patch diff --git a/patches/unapplied/api/0147-Mob-Pathfinding-API.patch b/patches/api/0147-Mob-Pathfinding-API.patch similarity index 100% rename from patches/unapplied/api/0147-Mob-Pathfinding-API.patch rename to patches/api/0147-Mob-Pathfinding-API.patch diff --git a/patches/unapplied/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/unapplied/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/unapplied/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 100% rename from patches/unapplied/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch rename to patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch diff --git a/patches/unapplied/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 100% rename from patches/unapplied/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch rename to patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch diff --git a/patches/unapplied/api/0151-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/unapplied/api/0151-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/unapplied/api/0152-Material-API-additions.patch b/patches/api/0152-Material-API-additions.patch similarity index 82% rename from patches/unapplied/api/0152-Material-API-additions.patch rename to patches/api/0152-Material-API-additions.patch index 92dc2c0e9..78dcc836e 100644 --- a/patches/unapplied/api/0152-Material-API-additions.patch +++ b/patches/api/0152-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 d1cb98a43e1135c53fd4ae544272ff6225f387f6..a4a85c62e87c18e38ba16e3966a41e6631ec8add 100644 +index bef8b78665c7304c88c068a7367c0d1bed3f2045..b96bae74f0c9619609590737d9b856292cb56691 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -112,6 +112,7 @@ import org.jetbrains.annotations.Nullable; +@@ -115,6 +115,7 @@ import org.jetbrains.annotations.Nullable; /** * An enum of all material IDs accepted by the official server and client */ @@ -16,7 +16,7 @@ index d1cb98a43e1135c53fd4ae544272ff6225f387f6..a4a85c62e87c18e38ba16e3966a41e66 public enum Material implements Keyed, Translatable { // AIR(9648, 0), -@@ -4273,6 +4274,22 @@ public enum Material implements Keyed, Translatable { +@@ -4389,6 +4390,22 @@ public enum Material implements Keyed, Translatable { } } diff --git a/patches/unapplied/api/0153-Add-Material-Tags.patch b/patches/api/0153-Add-Material-Tags.patch similarity index 99% rename from patches/unapplied/api/0153-Add-Material-Tags.patch rename to patches/api/0153-Add-Material-Tags.patch index a9f31f66b..59f85ce17 100644 --- a/patches/unapplied/api/0153-Add-Material-Tags.patch +++ b/patches/api/0153-Add-Material-Tags.patch @@ -1118,7 +1118,7 @@ index 0000000000000000000000000000000000000000..d7eb49a05c3f0cacf285f8995433c5d5 + .ensureSize("WATER_BASED", 11).lock(); +} diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index bceaa1a97b2c5cc15c8f54ae8f6f18029708627a..15699ee58e06880a508689f761ecfdb77d44d182 100644 +index 3ba1efc150d050a2f3bd3b4a7b35b73b557ff607..ef96155a6625cdfd9ebe75957fd2d3fa408039c5 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/0154-PreSpawnerSpawnEvent.patch b/patches/api/0154-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0154-PreSpawnerSpawnEvent.patch rename to patches/api/0154-PreSpawnerSpawnEvent.patch diff --git a/patches/unapplied/api/0155-Add-LivingEntity-getTargetEntity.patch b/patches/api/0155-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/unapplied/api/0155-Add-LivingEntity-getTargetEntity.patch rename to patches/api/0155-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/unapplied/api/0156-Add-sun-related-API.patch b/patches/api/0156-Add-sun-related-API.patch similarity index 100% rename from patches/unapplied/api/0156-Add-sun-related-API.patch rename to patches/api/0156-Add-sun-related-API.patch diff --git a/patches/unapplied/api/0157-Turtle-API.patch b/patches/api/0157-Turtle-API.patch similarity index 100% rename from patches/unapplied/api/0157-Turtle-API.patch rename to patches/api/0157-Turtle-API.patch diff --git a/patches/unapplied/api/0158-Add-spectator-target-events.patch b/patches/api/0158-Add-spectator-target-events.patch similarity index 100% rename from patches/unapplied/api/0158-Add-spectator-target-events.patch rename to patches/api/0158-Add-spectator-target-events.patch diff --git a/patches/unapplied/api/0159-Add-more-Witch-API.patch b/patches/api/0159-Add-more-Witch-API.patch similarity index 100% rename from patches/unapplied/api/0159-Add-more-Witch-API.patch rename to patches/api/0159-Add-more-Witch-API.patch diff --git a/patches/unapplied/api/0160-Make-the-default-permission-message-configurable.patch b/patches/api/0160-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/unapplied/api/0160-Make-the-default-permission-message-configurable.patch rename to patches/api/0160-Make-the-default-permission-message-configurable.patch diff --git a/patches/unapplied/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/unapplied/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/unapplied/api/0162-Add-more-Zombie-API.patch b/patches/api/0162-Add-more-Zombie-API.patch similarity index 100% rename from patches/unapplied/api/0162-Add-more-Zombie-API.patch rename to patches/api/0162-Add-more-Zombie-API.patch diff --git a/patches/unapplied/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/unapplied/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/unapplied/api/0164-Add-PlayerConnectionCloseEvent.patch b/patches/api/0164-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/unapplied/api/0164-Add-PlayerConnectionCloseEvent.patch rename to patches/api/0164-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/unapplied/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/unapplied/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/unapplied/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/unapplied/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/unapplied/api/0167-BlockDestroyEvent.patch b/patches/api/0167-BlockDestroyEvent.patch similarity index 100% rename from patches/unapplied/api/0167-BlockDestroyEvent.patch rename to patches/api/0167-BlockDestroyEvent.patch diff --git a/patches/unapplied/api/0168-Add-WhitelistToggleEvent.patch b/patches/api/0168-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/unapplied/api/0168-Add-WhitelistToggleEvent.patch rename to patches/api/0168-Add-WhitelistToggleEvent.patch diff --git a/patches/unapplied/api/0169-Add-GS4-Query-event.patch b/patches/api/0169-Add-GS4-Query-event.patch similarity index 100% rename from patches/unapplied/api/0169-Add-GS4-Query-event.patch rename to patches/api/0169-Add-GS4-Query-event.patch diff --git a/patches/unapplied/api/0170-Add-PlayerPostRespawnEvent.patch b/patches/api/0170-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/unapplied/api/0170-Add-PlayerPostRespawnEvent.patch rename to patches/api/0170-Add-PlayerPostRespawnEvent.patch diff --git a/patches/unapplied/api/0171-Entity-getEntitySpawnReason.patch b/patches/api/0171-Entity-getEntitySpawnReason.patch similarity index 85% rename from patches/unapplied/api/0171-Entity-getEntitySpawnReason.patch rename to patches/api/0171-Entity-getEntitySpawnReason.patch index ef8d83b27..713f65284 100644 --- a/patches/unapplied/api/0171-Entity-getEntitySpawnReason.patch +++ b/patches/api/0171-Entity-getEntitySpawnReason.patch @@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index fb3187692878e9686d54c8d022035eba2cea6f25..383844bf956e70cc8a821913d5b2560226d8e2fc 100644 +index 6fb14175962ec9730e4b70330481ec21d2c87da5..84e201c1695e9a97354f84156d82c47f9b722281 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -754,5 +754,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -780,5 +780,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent // TODO remove impl here return getLocation().getChunk(); } diff --git a/patches/unapplied/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch similarity index 98% rename from patches/unapplied/api/0172-Fix-Spigot-annotation-mistakes.patch rename to patches/api/0172-Fix-Spigot-annotation-mistakes.patch index 005e2563d..6dc87530b 100644 --- a/patches/unapplied/api/0172-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch @@ -79,10 +79,10 @@ index 20978b269a7757a561d6b872cc77898b44bbd272..2b9a117804a8ca54b47e51e23359bd6e 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 a4a85c62e87c18e38ba16e3966a41e6631ec8add..e883bb46461eb40b018ebe8c07caff96046fd11d 100644 +index b96bae74f0c9619609590737d9b856292cb56691..a5fe6fe103df59c01649ddcd0e1f27c27a452cff 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4303,11 +4303,11 @@ public enum Material implements Keyed, Translatable { +@@ -4419,11 +4419,11 @@ public enum Material implements Keyed, Translatable { } /** @@ -96,7 +96,7 @@ index a4a85c62e87c18e38ba16e3966a41e6631ec8add..e883bb46461eb40b018ebe8c07caff96 public boolean isLegacy() { return legacy; } -@@ -4378,8 +4378,10 @@ public enum Material implements Keyed, Translatable { +@@ -4494,8 +4494,10 @@ public enum Material implements Keyed, Translatable { * Gets the MaterialData class associated with this Material * * @return MaterialData associated with this Material @@ -357,10 +357,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 98b50de33b9c48e25da0a19747cd1599df5becfc..fec96fff783995ccb7df24bd40368885ed9eefa1 100644 +index 2904aa66e83d8cde9954c13d89f8337bbfc75137..65ce6e016bcbb43711d6a1ae077330eafb8037e0 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1432,9 +1432,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1463,9 +1463,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param plugin Plugin that wants to hide the entity * @param entity Entity to hide @@ -371,7 +371,7 @@ index 98b50de33b9c48e25da0a19747cd1599df5becfc..fec96fff783995ccb7df24bd40368885 public void hideEntity(@NotNull Plugin plugin, @NotNull Entity entity); /** -@@ -1444,9 +1443,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1475,9 +1474,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param plugin Plugin that wants to show the entity * @param entity Entity to show @@ -382,7 +382,7 @@ index 98b50de33b9c48e25da0a19747cd1599df5becfc..fec96fff783995ccb7df24bd40368885 public void showEntity(@NotNull Plugin plugin, @NotNull Entity entity); /** -@@ -1455,9 +1453,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1486,9 +1484,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param entity Entity to check * @return True if the provided entity is not being hidden from this * player diff --git a/patches/unapplied/api/0173-Server-Tick-Events.patch b/patches/api/0173-Server-Tick-Events.patch similarity index 100% rename from patches/unapplied/api/0173-Server-Tick-Events.patch rename to patches/api/0173-Server-Tick-Events.patch diff --git a/patches/unapplied/api/0174-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/unapplied/api/0174-PlayerDeathEvent-getItemsToKeep.patch rename to patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/unapplied/api/0175-Add-Heightmap-API.patch b/patches/api/0175-Add-Heightmap-API.patch similarity index 100% rename from patches/unapplied/api/0175-Add-Heightmap-API.patch rename to patches/api/0175-Add-Heightmap-API.patch diff --git a/patches/unapplied/api/0176-Mob-Spawner-API-Enhancements.patch b/patches/api/0176-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/unapplied/api/0176-Mob-Spawner-API-Enhancements.patch rename to patches/api/0176-Mob-Spawner-API-Enhancements.patch diff --git a/patches/unapplied/api/0177-Add-BlockSoundGroup-interface.patch b/patches/api/0177-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/unapplied/api/0177-Add-BlockSoundGroup-interface.patch rename to patches/api/0177-Add-BlockSoundGroup-interface.patch diff --git a/patches/unapplied/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/unapplied/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/unapplied/api/0179-Increase-custom-payload-channel-message-size.patch b/patches/api/0179-Increase-custom-payload-channel-message-size.patch similarity index 100% rename from patches/unapplied/api/0179-Increase-custom-payload-channel-message-size.patch rename to patches/api/0179-Increase-custom-payload-channel-message-size.patch diff --git a/patches/unapplied/api/0180-Expose-the-internal-current-tick.patch b/patches/api/0180-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/unapplied/api/0180-Expose-the-internal-current-tick.patch rename to patches/api/0180-Expose-the-internal-current-tick.patch diff --git a/patches/unapplied/api/0181-Improve-Block-breakNaturally-API.patch b/patches/api/0181-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/unapplied/api/0181-Improve-Block-breakNaturally-API.patch rename to patches/api/0181-Improve-Block-breakNaturally-API.patch diff --git a/patches/unapplied/api/0182-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/unapplied/api/0182-PlayerDeathEvent-shouldDropExperience.patch rename to patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/unapplied/api/0183-Add-ThrownEggHatchEvent.patch b/patches/api/0183-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/unapplied/api/0183-Add-ThrownEggHatchEvent.patch rename to patches/api/0183-Add-ThrownEggHatchEvent.patch diff --git a/patches/unapplied/api/0184-Entity-Jump-API.patch b/patches/api/0184-Entity-Jump-API.patch similarity index 100% rename from patches/unapplied/api/0184-Entity-Jump-API.patch rename to patches/api/0184-Entity-Jump-API.patch diff --git a/patches/unapplied/api/0185-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/unapplied/api/0185-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/unapplied/api/0186-Add-tick-times-API.patch b/patches/api/0186-Add-tick-times-API.patch similarity index 100% rename from patches/unapplied/api/0186-Add-tick-times-API.patch rename to patches/api/0186-Add-tick-times-API.patch diff --git a/patches/unapplied/api/0187-Expose-MinecraftServer-isRunning.patch b/patches/api/0187-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/unapplied/api/0187-Expose-MinecraftServer-isRunning.patch rename to patches/api/0187-Expose-MinecraftServer-isRunning.patch diff --git a/patches/unapplied/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/unapplied/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/unapplied/api/0189-Add-Player-Client-Options-API.patch b/patches/api/0189-Add-Player-Client-Options-API.patch similarity index 98% rename from patches/unapplied/api/0189-Add-Player-Client-Options-API.patch rename to patches/api/0189-Add-Player-Client-Options-API.patch index 0c8b5c379..ceefedd88 100644 --- a/patches/unapplied/api/0189-Add-Player-Client-Options-API.patch +++ b/patches/api/0189-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 fec96fff783995ccb7df24bd40368885ed9eefa1..36735fff136986bf4d3fac0ad431d36a95a6439f 100644 +index 65ce6e016bcbb43711d6a1ae077330eafb8037e0..4ceabd992c26b0e2c9df9d0e10495322b3a92585 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2542,6 +2542,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2573,6 +2573,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/0190-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/unapplied/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/unapplied/api/0191-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0191-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch similarity index 100% rename from patches/unapplied/api/0191-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch rename to patches/api/0191-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch diff --git a/patches/unapplied/api/0192-Add-item-slot-convenience-methods.patch b/patches/api/0192-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/unapplied/api/0192-Add-item-slot-convenience-methods.patch rename to patches/api/0192-Add-item-slot-convenience-methods.patch diff --git a/patches/unapplied/api/0193-Villager-Restocks-API.patch b/patches/api/0193-Villager-Restocks-API.patch similarity index 100% rename from patches/unapplied/api/0193-Villager-Restocks-API.patch rename to patches/api/0193-Villager-Restocks-API.patch diff --git a/patches/unapplied/api/0194-Expose-game-version.patch b/patches/api/0194-Expose-game-version.patch similarity index 100% rename from patches/unapplied/api/0194-Expose-game-version.patch rename to patches/api/0194-Expose-game-version.patch diff --git a/patches/unapplied/api/0195-Add-Mob-Goal-API.patch b/patches/api/0195-Add-Mob-Goal-API.patch similarity index 100% rename from patches/unapplied/api/0195-Add-Mob-Goal-API.patch rename to patches/api/0195-Add-Mob-Goal-API.patch diff --git a/patches/unapplied/api/0196-Add-villager-reputation-API.patch b/patches/api/0196-Add-villager-reputation-API.patch similarity index 100% rename from patches/unapplied/api/0196-Add-villager-reputation-API.patch rename to patches/api/0196-Add-villager-reputation-API.patch diff --git a/patches/unapplied/api/0197-Spawn-Reason-API.patch b/patches/api/0197-Spawn-Reason-API.patch similarity index 100% rename from patches/unapplied/api/0197-Spawn-Reason-API.patch rename to patches/api/0197-Spawn-Reason-API.patch diff --git a/patches/unapplied/api/0198-Potential-bed-API.patch b/patches/api/0198-Potential-bed-API.patch similarity index 100% rename from patches/unapplied/api/0198-Potential-bed-API.patch rename to patches/api/0198-Potential-bed-API.patch diff --git a/patches/unapplied/api/0199-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/unapplied/api/0199-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/unapplied/api/0200-Improve-Arrow-API.patch b/patches/api/0200-Improve-Arrow-API.patch similarity index 100% rename from patches/unapplied/api/0200-Improve-Arrow-API.patch rename to patches/api/0200-Improve-Arrow-API.patch diff --git a/patches/unapplied/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/unapplied/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/unapplied/api/0202-Support-components-in-ItemMeta.patch b/patches/api/0202-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/unapplied/api/0202-Support-components-in-ItemMeta.patch rename to patches/api/0202-Support-components-in-ItemMeta.patch diff --git a/patches/unapplied/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/unapplied/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/unapplied/api/0204-Add-entity-liquid-API.patch b/patches/api/0204-Add-entity-liquid-API.patch similarity index 88% rename from patches/unapplied/api/0204-Add-entity-liquid-API.patch rename to patches/api/0204-Add-entity-liquid-API.patch index 6a336e117..c9c084142 100644 --- a/patches/unapplied/api/0204-Add-entity-liquid-API.patch +++ b/patches/api/0204-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 383844bf956e70cc8a821913d5b2560226d8e2fc..63d334b93cd8e8fa9015af5529a5f9420312af34 100644 +index 84e201c1695e9a97354f84156d82c47f9b722281..3eb1cc7556ef0e8f3cc3d270c22ba293ac50c6c8 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -760,5 +760,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -786,5 +786,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); diff --git a/patches/unapplied/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/unapplied/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/unapplied/api/0206-Brand-support.patch b/patches/api/0206-Brand-support.patch similarity index 85% rename from patches/unapplied/api/0206-Brand-support.patch rename to patches/api/0206-Brand-support.patch index 40d09661e..a16a34be3 100644 --- a/patches/unapplied/api/0206-Brand-support.patch +++ b/patches/api/0206-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 36735fff136986bf4d3fac0ad431d36a95a6439f..5d65fc6f2f87810999144f97cdf08fdbe2859d4b 100644 +index 4ceabd992c26b0e2c9df9d0e10495322b3a92585..40191fb054e90724e5f28b4078d41073c7bc5dc5 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2674,6 +2674,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2705,6 +2705,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM // Paper end } diff --git a/patches/unapplied/api/0207-Support-hex-colors-in-getLastColors.patch b/patches/api/0207-Support-hex-colors-in-getLastColors.patch similarity index 100% rename from patches/unapplied/api/0207-Support-hex-colors-in-getLastColors.patch rename to patches/api/0207-Support-hex-colors-in-getLastColors.patch diff --git a/patches/unapplied/api/0208-Add-setMaxPlayers-API.patch b/patches/api/0208-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/unapplied/api/0208-Add-setMaxPlayers-API.patch rename to patches/api/0208-Add-setMaxPlayers-API.patch diff --git a/patches/unapplied/api/0209-Add-BellRingEvent.patch b/patches/api/0209-Add-BellRingEvent.patch similarity index 100% rename from patches/unapplied/api/0209-Add-BellRingEvent.patch rename to patches/api/0209-Add-BellRingEvent.patch diff --git a/patches/unapplied/api/0210-Add-moon-phase-API.patch b/patches/api/0210-Add-moon-phase-API.patch similarity index 100% rename from patches/unapplied/api/0210-Add-moon-phase-API.patch rename to patches/api/0210-Add-moon-phase-API.patch diff --git a/patches/unapplied/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/unapplied/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/unapplied/api/0212-Add-more-Evoker-API.patch b/patches/api/0212-Add-more-Evoker-API.patch similarity index 100% rename from patches/unapplied/api/0212-Add-more-Evoker-API.patch rename to patches/api/0212-Add-more-Evoker-API.patch diff --git a/patches/unapplied/api/0213-Add-methods-to-get-translation-keys.patch b/patches/api/0213-Add-methods-to-get-translation-keys.patch similarity index 96% rename from patches/unapplied/api/0213-Add-methods-to-get-translation-keys.patch rename to patches/api/0213-Add-methods-to-get-translation-keys.patch index 0f9e2fd1a..db10406a1 100644 --- a/patches/unapplied/api/0213-Add-methods-to-get-translation-keys.patch +++ b/patches/api/0213-Add-methods-to-get-translation-keys.patch @@ -119,7 +119,7 @@ index 938c3217f92e6d3ef9a637269c469f8359af6347..ef49495909a37d718a87d5dfbcd644d4 /** diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java -index 0a66077d152a3c89fa7a277663969767798eb100..b02490737409eb80a2d2fb275c9a60b6078a8133 100644 +index 753bfcec441533071120d925c83789ef53afa176..c6bc84a8755b2fe5d7d8d3ec857700ec1cba3c9b 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 0a66077d152a3c89fa7a277663969767798eb100..b02490737409eb80a2d2fb275c9a60b6 private static Map> gameRules = new HashMap<>(); // Boolean rules -@@ -314,4 +314,11 @@ public final class GameRule { +@@ -323,4 +323,11 @@ public final class GameRule { public static GameRule[] values() { return gameRules.values().toArray(new GameRule[gameRules.size()]); } @@ -144,10 +144,10 @@ index 0a66077d152a3c89fa7a277663969767798eb100..b02490737409eb80a2d2fb275c9a60b6 + // Paper end } diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index e883bb46461eb40b018ebe8c07caff96046fd11d..89af89e5fb49e202e80ea7688c62f8e119f4ddfe 100644 +index a5fe6fe103df59c01649ddcd0e1f27c27a452cff..0aa1692731ffb05e812f904459853da6080c3f9f 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -113,7 +113,7 @@ import org.jetbrains.annotations.Nullable; +@@ -116,7 +116,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 e883bb46461eb40b018ebe8c07caff96046fd11d..89af89e5fb49e202e80ea7688c62f8e1 // AIR(9648, 0), STONE(22948), -@@ -4288,6 +4288,15 @@ public enum Material implements Keyed, Translatable { +@@ -4404,6 +4404,15 @@ public enum Material implements Keyed, Translatable { } return false; } @@ -172,7 +172,7 @@ index e883bb46461eb40b018ebe8c07caff96046fd11d..89af89e5fb49e202e80ea7688c62f8e1 // Paper end /** -@@ -10596,9 +10605,11 @@ public enum Material implements Keyed, Translatable { +@@ -10847,9 +10856,11 @@ public enum Material implements Keyed, Translatable { * material * @see #getBlockTranslationKey() * @see #getItemTranslationKey() @@ -311,7 +311,7 @@ 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 2caa5f82e206b231fd9e9f5508c3713816e5a0e4..80897ed8641a2bdc4e3557e20f3a8ae4b8c5da69 100644 +index 8b913a9458d20c5c387b41bad21c353335b7c6b9..5f78a801d6fd10a0e0fa3ccf13bb1456eed12c13 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; @@ -323,7 +323,7 @@ index 2caa5f82e206b231fd9e9f5508c3713816e5a0e4..80897ed8641a2bdc4e3557e20f3a8ae4 // These strings MUST match the strings in nms.EntityTypes and are case sensitive. /** -@@ -430,7 +430,19 @@ public enum EntityType implements Keyed, Translatable { +@@ -435,7 +435,19 @@ public enum EntityType implements Keyed, Translatable { @Override @NotNull diff --git a/patches/unapplied/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/unapplied/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/unapplied/api/0215-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0215-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/unapplied/api/0215-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0215-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/unapplied/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/unapplied/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/unapplied/api/0217-Entity-isTicking.patch b/patches/api/0217-Entity-isTicking.patch similarity index 79% rename from patches/unapplied/api/0217-Entity-isTicking.patch rename to patches/api/0217-Entity-isTicking.patch index 4c7f25a3c..3e634e27d 100644 --- a/patches/unapplied/api/0217-Entity-isTicking.patch +++ b/patches/api/0217-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 63d334b93cd8e8fa9015af5529a5f9420312af34..6ff9a29ddda50c2e073c1ab02b13d5ff0bdeb903 100644 +index 3eb1cc7556ef0e8f3cc3d270c22ba293ac50c6c8..2c7c53b96b92ea9ef4e185558d744d0955a5e9e7 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -795,5 +795,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -821,5 +821,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * Check if entity is in lava */ boolean isInLava(); diff --git a/patches/unapplied/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch similarity index 85% rename from patches/unapplied/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch rename to patches/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch index b597f2983..bc84bc045 100644 --- a/patches/unapplied/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch +++ b/patches/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Clarify the Javadocs for Entity.getEntitySpawnReason() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 6ff9a29ddda50c2e073c1ab02b13d5ff0bdeb903..277dc1f3a0002f5102bc2a6be4412d179bbdb713 100644 +index 2c7c53b96b92ea9ef4e185558d744d0955a5e9e7..81d9f085905283e54c3bd597e15ac1bf693f541f 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -756,7 +756,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -782,7 +782,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent } /** diff --git a/patches/unapplied/api/0219-Villager-resetOffers.patch b/patches/api/0219-Villager-resetOffers.patch similarity index 100% rename from patches/unapplied/api/0219-Villager-resetOffers.patch rename to patches/api/0219-Villager-resetOffers.patch diff --git a/patches/unapplied/api/0220-Player-elytra-boost-API.patch b/patches/api/0220-Player-elytra-boost-API.patch similarity index 88% rename from patches/unapplied/api/0220-Player-elytra-boost-API.patch rename to patches/api/0220-Player-elytra-boost-API.patch index 6d77f7e60..aa1a957b0 100644 --- a/patches/unapplied/api/0220-Player-elytra-boost-API.patch +++ b/patches/api/0220-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 5d65fc6f2f87810999144f97cdf08fdbe2859d4b..43bee9f08f02564d48c21f350f54131e6c63f321 100644 +index 40191fb054e90724e5f28b4078d41073c7bc5dc5..f6bbd49e655c5f89d77f36ca21952679ab31b6bb 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2548,6 +2548,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2579,6 +2579,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ @NotNull T getClientOption(@NotNull com.destroystokyo.paper.ClientOption option); diff --git a/patches/unapplied/api/0221-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0221-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/unapplied/api/0221-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0221-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/unapplied/api/0222-Add-ignore-discounts-API.patch b/patches/api/0222-Add-ignore-discounts-API.patch similarity index 100% rename from patches/unapplied/api/0222-Add-ignore-discounts-API.patch rename to patches/api/0222-Add-ignore-discounts-API.patch diff --git a/patches/unapplied/api/0223-Item-no-age-no-player-pickup.patch b/patches/api/0223-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/unapplied/api/0223-Item-no-age-no-player-pickup.patch rename to patches/api/0223-Item-no-age-no-player-pickup.patch diff --git a/patches/unapplied/api/0224-Beacon-API-custom-effect-ranges.patch b/patches/api/0224-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/unapplied/api/0224-Beacon-API-custom-effect-ranges.patch rename to patches/api/0224-Beacon-API-custom-effect-ranges.patch diff --git a/patches/unapplied/api/0225-Add-API-for-quit-reason.patch b/patches/api/0225-Add-API-for-quit-reason.patch similarity index 100% rename from patches/unapplied/api/0225-Add-API-for-quit-reason.patch rename to patches/api/0225-Add-API-for-quit-reason.patch diff --git a/patches/unapplied/api/0226-Add-Destroy-Speed-API.patch b/patches/api/0226-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/unapplied/api/0226-Add-Destroy-Speed-API.patch rename to patches/api/0226-Add-Destroy-Speed-API.patch diff --git a/patches/unapplied/api/0227-Add-LivingEntity-clearActiveItem.patch b/patches/api/0227-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/unapplied/api/0227-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0227-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/unapplied/api/0228-Add-PlayerItemCooldownEvent.patch b/patches/api/0228-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/unapplied/api/0228-Add-PlayerItemCooldownEvent.patch rename to patches/api/0228-Add-PlayerItemCooldownEvent.patch diff --git a/patches/unapplied/api/0229-More-lightning-API.patch b/patches/api/0229-More-lightning-API.patch similarity index 100% rename from patches/unapplied/api/0229-More-lightning-API.patch rename to patches/api/0229-More-lightning-API.patch diff --git a/patches/unapplied/api/0230-Add-PlayerShearBlockEvent.patch b/patches/api/0230-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/unapplied/api/0230-Add-PlayerShearBlockEvent.patch rename to patches/api/0230-Add-PlayerShearBlockEvent.patch diff --git a/patches/unapplied/api/0231-Enable-multi-release-plugin-jars.patch b/patches/api/0231-Enable-multi-release-plugin-jars.patch similarity index 100% rename from patches/unapplied/api/0231-Enable-multi-release-plugin-jars.patch rename to patches/api/0231-Enable-multi-release-plugin-jars.patch diff --git a/patches/unapplied/api/0232-Player-Chunk-Load-Unload-Events.patch b/patches/api/0232-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/unapplied/api/0232-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0232-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/unapplied/api/0233-Expose-LivingEntity-hurt-direction.patch b/patches/api/0233-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/unapplied/api/0233-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0233-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/unapplied/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/unapplied/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/unapplied/api/0235-Added-PlayerTradeEvent.patch b/patches/api/0235-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/unapplied/api/0235-Added-PlayerTradeEvent.patch rename to patches/api/0235-Added-PlayerTradeEvent.patch diff --git a/patches/unapplied/api/0236-Add-TargetHitEvent-API.patch b/patches/api/0236-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/unapplied/api/0236-Add-TargetHitEvent-API.patch rename to patches/api/0236-Add-TargetHitEvent-API.patch diff --git a/patches/unapplied/api/0237-Additional-Block-Material-API-s.patch b/patches/api/0237-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/unapplied/api/0237-Additional-Block-Material-API-s.patch rename to patches/api/0237-Additional-Block-Material-API-s.patch diff --git a/patches/unapplied/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 90% rename from patches/unapplied/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch index e69906336..d297dd5c2 100644 --- a/patches/unapplied/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch +++ b/patches/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add API to get Material from Boats and Minecarts diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java -index ebab99bd0c4bc6ca19ba92ece93a5f903b38f9b3..fbe0a946d821e479fd3097021058d95732ace1b3 100644 +index 88852215d01f3fc4866449f7b826f6603b0ed9d8..f7548098bcdd033d9c530fdc584fc5538c635ca1 100644 --- a/src/main/java/org/bukkit/entity/Boat.java +++ b/src/main/java/org/bukkit/entity/Boat.java -@@ -174,4 +174,14 @@ public interface Boat extends Vehicle { +@@ -175,4 +175,14 @@ public interface Boat extends Vehicle { ON_LAND, IN_AIR; } diff --git a/patches/unapplied/api/0239-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0239-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/unapplied/api/0239-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0239-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/unapplied/api/0240-Zombie-API-breaking-doors.patch b/patches/api/0240-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/unapplied/api/0240-Zombie-API-breaking-doors.patch rename to patches/api/0240-Zombie-API-breaking-doors.patch diff --git a/patches/unapplied/api/0241-Add-EntityLoadCrossbowEvent.patch b/patches/api/0241-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/unapplied/api/0241-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0241-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/unapplied/api/0242-Added-WorldGameRuleChangeEvent.patch b/patches/api/0242-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0242-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0242-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/unapplied/api/0243-Added-ServerResourcesReloadedEvent.patch b/patches/api/0243-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/unapplied/api/0243-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0243-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/unapplied/api/0244-Add-BlockFailedDispenseEvent.patch b/patches/api/0244-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/unapplied/api/0244-Add-BlockFailedDispenseEvent.patch rename to patches/api/0244-Add-BlockFailedDispenseEvent.patch diff --git a/patches/unapplied/api/0245-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0245-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0245-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0245-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/unapplied/api/0246-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0246-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/unapplied/api/0246-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0246-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/unapplied/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/unapplied/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/unapplied/api/0248-Add-sendOpLevel-API.patch b/patches/api/0248-Add-sendOpLevel-API.patch similarity index 87% rename from patches/unapplied/api/0248-Add-sendOpLevel-API.patch rename to patches/api/0248-Add-sendOpLevel-API.patch index 5ea68e238..e332e795e 100644 --- a/patches/unapplied/api/0248-Add-sendOpLevel-API.patch +++ b/patches/api/0248-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 43bee9f08f02564d48c21f350f54131e6c63f321..e499452a8be3f3eec2429c4958877e40117ae594 100644 +index f6bbd49e655c5f89d77f36ca21952679ab31b6bb..6c4d148202c3378e361fd8068c00cc0b67d6dc1e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2561,6 +2561,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2592,6 +2592,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ @Nullable Firework boostElytra(@NotNull ItemStack firework); diff --git a/patches/unapplied/api/0249-Add-PaperRegistry.patch b/patches/api/0249-Add-PaperRegistry.patch similarity index 100% rename from patches/unapplied/api/0249-Add-PaperRegistry.patch rename to patches/api/0249-Add-PaperRegistry.patch diff --git a/patches/unapplied/api/0250-Add-StructuresLocateEvent.patch b/patches/api/0250-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/unapplied/api/0250-Add-StructuresLocateEvent.patch rename to patches/api/0250-Add-StructuresLocateEvent.patch diff --git a/patches/unapplied/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 82% rename from patches/unapplied/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch index ae5787045..73b9ed048 100644 --- a/patches/unapplied/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch +++ b/patches/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Return chat component with empty text instead of throwing diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java -index a4e3d526db2d17dc923cbe82e53d3c902d61e1f3..2448e70d75ae7a678c6befac4506c103edb78875 100644 +index dbf316b63bf3d0c0695ceca84985d67f0f95c906..daca40b63e95ea33178bcb54ad45911da591ca54 100644 --- a/src/main/java/org/bukkit/inventory/InventoryView.java +++ b/src/main/java/org/bukkit/inventory/InventoryView.java -@@ -450,7 +450,7 @@ public abstract class InventoryView { +@@ -451,7 +451,7 @@ public abstract class InventoryView { /** * Get the title of this inventory window. * diff --git a/patches/unapplied/api/0252-Add-BlockPreDispenseEvent.patch b/patches/api/0252-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/unapplied/api/0252-Add-BlockPreDispenseEvent.patch rename to patches/api/0252-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0253-Added-missing-vanilla-tags.patch b/patches/api/0253-Added-missing-vanilla-tags.patch new file mode 100644 index 000000000..06920bad6 --- /dev/null +++ b/patches/api/0253-Added-missing-vanilla-tags.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sun, 3 Jan 2021 20:03:40 -0800 +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 ef96155a6625cdfd9ebe75957fd2d3fa408039c5..aeef4dea5ea7e5581988e5fedcfec29eee8d58eb 100644 +--- a/src/main/java/org/bukkit/Tag.java ++++ b/src/main/java/org/bukkit/Tag.java +@@ -724,6 +724,12 @@ public interface Tag extends Keyed { + * Vanilla item tag representing all chest boat items. + */ + Tag ITEMS_CHEST_BOATS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("chest_boats"), Material.class); ++ // Paper start ++ /** ++ * Vanilla item tag representing all non-flammable wood items. ++ */ ++ Tag ITEMS_NON_FLAMMABLE_WOOD = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("non_flammable_wood"), Material.class); ++ // Paper end + /** + * Vanilla item tag representing all fish items. + */ diff --git a/patches/unapplied/api/0254-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0254-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/unapplied/api/0254-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0254-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/unapplied/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/unapplied/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/unapplied/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/unapplied/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/unapplied/api/0257-add-DragonEggFormEvent.patch b/patches/api/0257-add-DragonEggFormEvent.patch similarity index 100% rename from patches/unapplied/api/0257-add-DragonEggFormEvent.patch rename to patches/api/0257-add-DragonEggFormEvent.patch diff --git a/patches/unapplied/api/0258-EntityMoveEvent.patch b/patches/api/0258-EntityMoveEvent.patch similarity index 100% rename from patches/unapplied/api/0258-EntityMoveEvent.patch rename to patches/api/0258-EntityMoveEvent.patch diff --git a/patches/unapplied/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/unapplied/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/unapplied/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/unapplied/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/unapplied/api/0261-living-entity-allow-attribute-registration.patch b/patches/api/0261-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/unapplied/api/0261-living-entity-allow-attribute-registration.patch rename to patches/api/0261-living-entity-allow-attribute-registration.patch diff --git a/patches/unapplied/api/0262-Add-missing-effects.patch b/patches/api/0262-Add-missing-effects.patch similarity index 100% rename from patches/unapplied/api/0262-Add-missing-effects.patch rename to patches/api/0262-Add-missing-effects.patch diff --git a/patches/unapplied/api/0263-Expose-Tracked-Players.patch b/patches/api/0263-Expose-Tracked-Players.patch similarity index 82% rename from patches/unapplied/api/0263-Expose-Tracked-Players.patch rename to patches/api/0263-Expose-Tracked-Players.patch index ddcf41272..22bf58c5b 100644 --- a/patches/unapplied/api/0263-Expose-Tracked-Players.patch +++ b/patches/api/0263-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 277dc1f3a0002f5102bc2a6be4412d179bbdb713..e3218b5c170e1916a991aa1fae6a4f4e26dc034d 100644 +index 81d9f085905283e54c3bd597e15ac1bf693f541f..e0265937a5daf968a9a3f453f4aabf37f76d2c1c 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -800,5 +800,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -826,5 +826,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * Check if entity is inside a ticking chunk */ boolean isTicking(); diff --git a/patches/unapplied/api/0264-Cache-the-result-of-Material-isBlock.patch b/patches/api/0264-Cache-the-result-of-Material-isBlock.patch similarity index 81% rename from patches/unapplied/api/0264-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0264-Cache-the-result-of-Material-isBlock.patch index 4ba6e7432..300816541 100644 --- a/patches/unapplied/api/0264-Cache-the-result-of-Material-isBlock.patch +++ b/patches/api/0264-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 89af89e5fb49e202e80ea7688c62f8e119f4ddfe..7e447f8be7dc9768df487e1f7f4b9aafedb33e2d 100644 +index 0aa1692731ffb05e812f904459853da6080c3f9f..f8440fd7a7c9a00124cb387c6ba3b0973df0d145 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4232,6 +4232,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4348,6 +4348,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 89af89e5fb49e202e80ea7688c62f8e119f4ddfe..7e447f8be7dc9768df487e1f7f4b9aaf private Material(final int id) { this(id, 64); -@@ -4430,6 +4431,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4546,6 +4547,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 89af89e5fb49e202e80ea7688c62f8e119f4ddfe..7e447f8be7dc9768df487e1f7f4b9aaf switch (this) { // case ACACIA_BUTTON: -@@ -5585,6 +5591,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -5727,6 +5733,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/0265-Add-worldborder-events.patch b/patches/api/0265-Add-worldborder-events.patch similarity index 100% rename from patches/unapplied/api/0265-Add-worldborder-events.patch rename to patches/api/0265-Add-worldborder-events.patch diff --git a/patches/unapplied/api/0266-added-PlayerNameEntityEvent.patch b/patches/api/0266-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/unapplied/api/0266-added-PlayerNameEntityEvent.patch rename to patches/api/0266-added-PlayerNameEntityEvent.patch diff --git a/patches/unapplied/api/0267-Add-recipe-to-cook-events.patch b/patches/api/0267-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/unapplied/api/0267-Add-recipe-to-cook-events.patch rename to patches/api/0267-Add-recipe-to-cook-events.patch diff --git a/patches/unapplied/api/0268-Add-Block-isValidTool.patch b/patches/api/0268-Add-Block-isValidTool.patch similarity index 100% rename from patches/unapplied/api/0268-Add-Block-isValidTool.patch rename to patches/api/0268-Add-Block-isValidTool.patch diff --git a/patches/unapplied/api/0269-Expand-world-key-API.patch b/patches/api/0269-Expand-world-key-API.patch similarity index 100% rename from patches/unapplied/api/0269-Expand-world-key-API.patch rename to patches/api/0269-Expand-world-key-API.patch diff --git a/patches/unapplied/api/0270-Item-Rarity-API.patch b/patches/api/0270-Item-Rarity-API.patch similarity index 95% rename from patches/unapplied/api/0270-Item-Rarity-API.patch rename to patches/api/0270-Item-Rarity-API.patch index 5739e52d6..3c537d1f5 100644 --- a/patches/unapplied/api/0270-Item-Rarity-API.patch +++ b/patches/api/0270-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 7e447f8be7dc9768df487e1f7f4b9aafedb33e2d..eb8aa093148eea3b2fcafe06e8f1277ebbe2f275 100644 +index f8440fd7a7c9a00124cb387c6ba3b0973df0d145..1afeac98a9facbe25edc9a96d906b31d8327f047 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4298,6 +4298,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4414,6 +4414,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla return Bukkit.getUnsafe().getBlockTranslationKey(this); } } diff --git a/patches/unapplied/api/0271-Expose-protocol-version.patch b/patches/api/0271-Expose-protocol-version.patch similarity index 100% rename from patches/unapplied/api/0271-Expose-protocol-version.patch rename to patches/api/0271-Expose-protocol-version.patch diff --git a/patches/unapplied/api/0272-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0272-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/unapplied/api/0272-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0272-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/unapplied/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/unapplied/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/unapplied/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/unapplied/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/unapplied/api/0275-Added-PlayerDeepSleepEvent.patch b/patches/api/0275-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/unapplied/api/0275-Added-PlayerDeepSleepEvent.patch rename to patches/api/0275-Added-PlayerDeepSleepEvent.patch diff --git a/patches/unapplied/api/0276-More-World-API.patch b/patches/api/0276-More-World-API.patch similarity index 100% rename from patches/unapplied/api/0276-More-World-API.patch rename to patches/api/0276-More-World-API.patch diff --git a/patches/unapplied/api/0277-Added-PlayerBedFailEnterEvent.patch b/patches/api/0277-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/unapplied/api/0277-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0277-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/unapplied/api/0278-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0278-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/unapplied/api/0278-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0278-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/unapplied/api/0279-PlayerMoveEvent-Improvements.patch b/patches/api/0279-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/unapplied/api/0279-PlayerMoveEvent-Improvements.patch rename to patches/api/0279-PlayerMoveEvent-Improvements.patch diff --git a/patches/unapplied/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/unapplied/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/unapplied/api/0281-Add-more-WanderingTrader-API.patch b/patches/api/0281-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/unapplied/api/0281-Add-more-WanderingTrader-API.patch rename to patches/api/0281-Add-more-WanderingTrader-API.patch diff --git a/patches/unapplied/api/0282-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0282-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/unapplied/api/0282-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0282-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/unapplied/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/unapplied/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/unapplied/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/unapplied/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/unapplied/api/0285-Inventory-close.patch b/patches/api/0285-Inventory-close.patch similarity index 100% rename from patches/unapplied/api/0285-Inventory-close.patch rename to patches/api/0285-Inventory-close.patch diff --git a/patches/unapplied/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/unapplied/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/unapplied/api/0287-Add-basic-Datapack-API.patch b/patches/api/0287-Add-basic-Datapack-API.patch similarity index 100% rename from patches/unapplied/api/0287-Add-basic-Datapack-API.patch rename to patches/api/0287-Add-basic-Datapack-API.patch diff --git a/patches/unapplied/api/0288-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0288-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0288-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0288-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/unapplied/api/0289-ItemStack-repair-check-API.patch b/patches/api/0289-ItemStack-repair-check-API.patch similarity index 100% rename from patches/unapplied/api/0289-ItemStack-repair-check-API.patch rename to patches/api/0289-ItemStack-repair-check-API.patch diff --git a/patches/unapplied/api/0290-More-Enchantment-API.patch b/patches/api/0290-More-Enchantment-API.patch similarity index 100% rename from patches/unapplied/api/0290-More-Enchantment-API.patch rename to patches/api/0290-More-Enchantment-API.patch diff --git a/patches/unapplied/api/0291-Add-Mob-lookAt-API.patch b/patches/api/0291-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/unapplied/api/0291-Add-Mob-lookAt-API.patch rename to patches/api/0291-Add-Mob-lookAt-API.patch diff --git a/patches/unapplied/api/0292-ItemStack-editMeta.patch b/patches/api/0292-ItemStack-editMeta.patch similarity index 100% rename from patches/unapplied/api/0292-ItemStack-editMeta.patch rename to patches/api/0292-ItemStack-editMeta.patch diff --git a/patches/unapplied/api/0293-Add-EntityInsideBlockEvent.patch b/patches/api/0293-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/unapplied/api/0293-Add-EntityInsideBlockEvent.patch rename to patches/api/0293-Add-EntityInsideBlockEvent.patch diff --git a/patches/unapplied/api/0294-Attributes-API-for-item-defaults.patch b/patches/api/0294-Attributes-API-for-item-defaults.patch similarity index 93% rename from patches/unapplied/api/0294-Attributes-API-for-item-defaults.patch rename to patches/api/0294-Attributes-API-for-item-defaults.patch index 3f96334e6..b24d43c54 100644 --- a/patches/unapplied/api/0294-Attributes-API-for-item-defaults.patch +++ b/patches/api/0294-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 eb8aa093148eea3b2fcafe06e8f1277ebbe2f275..9c6291531d3081bf601364815fdd0a9b801eee50 100644 +index 1afeac98a9facbe25edc9a96d906b31d8327f047..a2a5c3d6ab37dd5908ba5dbd228e8ad4bea2f799 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4309,6 +4309,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4425,6 +4425,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/0295-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0295-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/unapplied/api/0295-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0295-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/unapplied/api/0296-More-Lidded-Block-API.patch b/patches/api/0296-More-Lidded-Block-API.patch similarity index 100% rename from patches/unapplied/api/0296-More-Lidded-Block-API.patch rename to patches/api/0296-More-Lidded-Block-API.patch diff --git a/patches/unapplied/api/0297-Add-PlayerKickEvent-causes.patch b/patches/api/0297-Add-PlayerKickEvent-causes.patch similarity index 97% rename from patches/unapplied/api/0297-Add-PlayerKickEvent-causes.patch rename to patches/api/0297-Add-PlayerKickEvent-causes.patch index bba583f00..8e6394f9c 100644 --- a/patches/unapplied/api/0297-Add-PlayerKickEvent-causes.patch +++ b/patches/api/0297-Add-PlayerKickEvent-causes.patch @@ -5,7 +5,7 @@ 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 e499452a8be3f3eec2429c4958877e40117ae594..528fee6866f6bb988e62627161e62f7b74fdb574 100644 +index 6c4d148202c3378e361fd8068c00cc0b67d6dc1e..b834537b1fa7ee349d10fe1ac5aa7e7dca4e35f7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -249,6 +249,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0298-Add-PufferFishStateChangeEvent.patch b/patches/api/0298-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0298-Add-PufferFishStateChangeEvent.patch rename to patches/api/0298-Add-PufferFishStateChangeEvent.patch diff --git a/patches/unapplied/api/0299-Add-BellRevealRaiderEvent.patch b/patches/api/0299-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/unapplied/api/0299-Add-BellRevealRaiderEvent.patch rename to patches/api/0299-Add-BellRevealRaiderEvent.patch diff --git a/patches/unapplied/api/0300-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0300-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/unapplied/api/0300-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0300-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/unapplied/api/0301-Add-more-line-of-sight-methods.patch b/patches/api/0301-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/unapplied/api/0301-Add-more-line-of-sight-methods.patch rename to patches/api/0301-Add-more-line-of-sight-methods.patch diff --git a/patches/unapplied/api/0302-Add-WaterBottleSplashEvent.patch b/patches/api/0302-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/unapplied/api/0302-Add-WaterBottleSplashEvent.patch rename to patches/api/0302-Add-WaterBottleSplashEvent.patch diff --git a/patches/unapplied/api/0303-Add-more-LimitedRegion-API.patch b/patches/api/0303-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/unapplied/api/0303-Add-more-LimitedRegion-API.patch rename to patches/api/0303-Add-more-LimitedRegion-API.patch diff --git a/patches/unapplied/api/0304-Missing-Entity-Behavior-API.patch b/patches/api/0304-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/unapplied/api/0304-Missing-Entity-Behavior-API.patch rename to patches/api/0304-Missing-Entity-Behavior-API.patch diff --git a/patches/unapplied/api/0305-Adds-PlayerArmSwingEvent.patch b/patches/api/0305-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/unapplied/api/0305-Adds-PlayerArmSwingEvent.patch rename to patches/api/0305-Adds-PlayerArmSwingEvent.patch diff --git a/patches/unapplied/api/0306-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0306-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/unapplied/api/0306-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0306-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/unapplied/api/0307-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0307-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/unapplied/api/0307-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0307-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/unapplied/api/0308-Stinger-API.patch b/patches/api/0308-Stinger-API.patch similarity index 100% rename from patches/unapplied/api/0308-Stinger-API.patch rename to patches/api/0308-Stinger-API.patch diff --git a/patches/unapplied/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/unapplied/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/unapplied/api/0310-Add-PlayerSetSpawnEvent.patch b/patches/api/0310-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/unapplied/api/0310-Add-PlayerSetSpawnEvent.patch rename to patches/api/0310-Add-PlayerSetSpawnEvent.patch diff --git a/patches/unapplied/api/0311-Added-EntityDamageItemEvent.patch b/patches/api/0311-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/unapplied/api/0311-Added-EntityDamageItemEvent.patch rename to patches/api/0311-Added-EntityDamageItemEvent.patch diff --git a/patches/unapplied/api/0312-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0312-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/unapplied/api/0312-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0312-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/unapplied/api/0313-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0313-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/unapplied/api/0313-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0313-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/unapplied/api/0314-Add-BlockBreakBlockEvent.patch b/patches/api/0314-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/unapplied/api/0314-Add-BlockBreakBlockEvent.patch rename to patches/api/0314-Add-BlockBreakBlockEvent.patch diff --git a/patches/unapplied/api/0315-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0315-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/unapplied/api/0315-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0315-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/unapplied/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/unapplied/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/unapplied/api/0317-More-CommandBlock-API.patch b/patches/api/0317-More-CommandBlock-API.patch similarity index 100% rename from patches/unapplied/api/0317-More-CommandBlock-API.patch rename to patches/api/0317-More-CommandBlock-API.patch diff --git a/patches/unapplied/api/0318-Add-missing-team-sidebar-display-slots.patch b/patches/api/0318-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/unapplied/api/0318-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0318-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/unapplied/api/0319-add-back-EntityPortalExitEvent.patch b/patches/api/0319-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/unapplied/api/0319-add-back-EntityPortalExitEvent.patch rename to patches/api/0319-add-back-EntityPortalExitEvent.patch diff --git a/patches/unapplied/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/unapplied/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/unapplied/api/0321-Get-entity-default-attributes.patch b/patches/api/0321-Get-entity-default-attributes.patch similarity index 94% rename from patches/unapplied/api/0321-Get-entity-default-attributes.patch rename to patches/api/0321-Get-entity-default-attributes.patch index 78cb2ccbe..72fbc2434 100644 --- a/patches/unapplied/api/0321-Get-entity-default-attributes.patch +++ b/patches/api/0321-Get-entity-default-attributes.patch @@ -32,10 +32,10 @@ index 0d47278d68cdf015cb980721c234a3abee39646a..29ccd90e2733b528ef0866f93053adf6 // Paper end } diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 80897ed8641a2bdc4e3557e20f3a8ae4b8c5da69..4915c1064a9b6bf1d485f9e6e42b9f6e4e12f236 100644 +index 5f78a801d6fd10a0e0fa3ccf13bb1456eed12c13..9f935266f51f4ea5d1193031f52e5327350cc06f 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -444,5 +444,24 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans +@@ -449,5 +449,24 @@ 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/0322-Left-handed-API.patch b/patches/api/0322-Left-handed-API.patch similarity index 100% rename from patches/unapplied/api/0322-Left-handed-API.patch rename to patches/api/0322-Left-handed-API.patch diff --git a/patches/unapplied/api/0323-Add-more-advancement-API.patch b/patches/api/0323-Add-more-advancement-API.patch similarity index 100% rename from patches/unapplied/api/0323-Add-more-advancement-API.patch rename to patches/api/0323-Add-more-advancement-API.patch diff --git a/patches/unapplied/api/0324-Add-ItemFactory-getSpawnEgg-API.patch b/patches/api/0324-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/unapplied/api/0324-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/api/0324-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/unapplied/api/0325-Add-critical-damage-API.patch b/patches/api/0325-Add-critical-damage-API.patch similarity index 100% rename from patches/unapplied/api/0325-Add-critical-damage-API.patch rename to patches/api/0325-Add-critical-damage-API.patch diff --git a/patches/unapplied/api/0326-Fix-issues-with-mob-conversion.patch b/patches/api/0326-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/unapplied/api/0326-Fix-issues-with-mob-conversion.patch rename to patches/api/0326-Fix-issues-with-mob-conversion.patch diff --git a/patches/unapplied/api/0327-Add-isCollidable-methods-to-various-places.patch b/patches/api/0327-Add-isCollidable-methods-to-various-places.patch similarity index 95% rename from patches/unapplied/api/0327-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0327-Add-isCollidable-methods-to-various-places.patch index 07f73f6ca..299033bd7 100644 --- a/patches/unapplied/api/0327-Add-isCollidable-methods-to-various-places.patch +++ b/patches/api/0327-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 9c6291531d3081bf601364815fdd0a9b801eee50..33371518fc8c5d97625f3d528ba8fee25d8c9c00 100644 +index a2a5c3d6ab37dd5908ba5dbd228e8ad4bea2f799..716a40b055e693cfda38d2d8223ce4320919a332 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4324,6 +4324,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4440,6 +4440,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/0328-Goat-ram-API.patch b/patches/api/0328-Goat-ram-API.patch similarity index 100% rename from patches/unapplied/api/0328-Goat-ram-API.patch rename to patches/api/0328-Goat-ram-API.patch diff --git a/patches/unapplied/api/0329-Add-API-for-resetting-a-single-score.patch b/patches/api/0329-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/unapplied/api/0329-Add-API-for-resetting-a-single-score.patch rename to patches/api/0329-Add-API-for-resetting-a-single-score.patch diff --git a/patches/unapplied/api/0330-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0330-Add-Raw-Byte-Entity-Serialization.patch similarity index 94% rename from patches/unapplied/api/0330-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0330-Add-Raw-Byte-Entity-Serialization.patch index 9e1ddaecb..d939672f1 100644 --- a/patches/unapplied/api/0330-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0330-Add-Raw-Byte-Entity-Serialization.patch @@ -24,10 +24,10 @@ index 2a23e93d9e308c5eba0a2b658f11f571a0c01e26..b8ca571f8e88e7b676c5d1e1d90f6e5c * 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 e3218b5c170e1916a991aa1fae6a4f4e26dc034d..570d446869022008d01ba382e85ec69fcb25f99d 100644 +index e0265937a5daf968a9a3f453f4aabf37f76d2c1c..24a409ff2bc554edde610a223f20bbfc09ef5152 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -807,5 +807,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -833,5 +833,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return players in tracking range */ @NotNull Set getTrackedPlayers(); diff --git a/patches/unapplied/api/0331-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0331-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0331-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0331-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/unapplied/api/0332-Add-player-health-update-API.patch b/patches/api/0332-Add-player-health-update-API.patch similarity index 91% rename from patches/unapplied/api/0332-Add-player-health-update-API.patch rename to patches/api/0332-Add-player-health-update-API.patch index 65256c5aa..c218a50cc 100644 --- a/patches/unapplied/api/0332-Add-player-health-update-API.patch +++ b/patches/api/0332-Add-player-health-update-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 528fee6866f6bb988e62627161e62f7b74fdb574..b8649646550d92e74d81f8502ce7a0e3479ebced 100644 +index b834537b1fa7ee349d10fe1ac5aa7e7dca4e35f7..eca9b83ef932979517f9232def0a8c3eaf087d96 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1949,6 +1949,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1980,6 +1980,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public double getHealthScale(); diff --git a/patches/unapplied/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/unapplied/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/unapplied/api/0334-Add-more-Campfire-API.patch b/patches/api/0334-Add-more-Campfire-API.patch similarity index 100% rename from patches/unapplied/api/0334-Add-more-Campfire-API.patch rename to patches/api/0334-Add-more-Campfire-API.patch diff --git a/patches/unapplied/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/unapplied/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/unapplied/api/0336-Improve-scoreboard-entries.patch b/patches/api/0336-Improve-scoreboard-entries.patch similarity index 100% rename from patches/unapplied/api/0336-Improve-scoreboard-entries.patch rename to patches/api/0336-Improve-scoreboard-entries.patch diff --git a/patches/unapplied/api/0337-Entity-powdered-snow-API.patch b/patches/api/0337-Entity-powdered-snow-API.patch similarity index 90% rename from patches/unapplied/api/0337-Entity-powdered-snow-API.patch rename to patches/api/0337-Entity-powdered-snow-API.patch index 7d732256f..5f8078650 100644 --- a/patches/unapplied/api/0337-Entity-powdered-snow-API.patch +++ b/patches/api/0337-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 570d446869022008d01ba382e85ec69fcb25f99d..62abbe2149bfb6cb4a38027899863a535e19e94c 100644 +index 24a409ff2bc554edde610a223f20bbfc09ef5152..970a07fdc68fc988adbd8cdceccb97960709dff3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -834,5 +834,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -860,5 +860,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/0338-Add-API-for-item-entity-health.patch b/patches/api/0338-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/unapplied/api/0338-Add-API-for-item-entity-health.patch rename to patches/api/0338-Add-API-for-item-entity-health.patch diff --git a/patches/unapplied/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/unapplied/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/unapplied/api/0340-Bucketable-API.patch b/patches/api/0340-Bucketable-API.patch similarity index 100% rename from patches/unapplied/api/0340-Bucketable-API.patch rename to patches/api/0340-Bucketable-API.patch diff --git a/patches/unapplied/api/0341-System-prop-for-default-config-comment-parsing.patch b/patches/api/0341-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/unapplied/api/0341-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0341-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/unapplied/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/unapplied/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/unapplied/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/unapplied/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/unapplied/api/0344-Multiple-Entries-with-Scoreboards.patch b/patches/api/0344-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/unapplied/api/0344-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0344-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/unapplied/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/unapplied/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/unapplied/api/0346-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0346-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/unapplied/api/0346-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0346-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/unapplied/api/0347-Multi-Block-Change-API.patch b/patches/api/0347-Multi-Block-Change-API.patch similarity index 94% rename from patches/unapplied/api/0347-Multi-Block-Change-API.patch rename to patches/api/0347-Multi-Block-Change-API.patch index 32dc167c9..c04b59d60 100644 --- a/patches/unapplied/api/0347-Multi-Block-Change-API.patch +++ b/patches/api/0347-Multi-Block-Change-API.patch @@ -5,7 +5,7 @@ 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 b8649646550d92e74d81f8502ce7a0e3479ebced..596af6bb00429bad7d36ea9b06573ec0aacc4cff 100644 +index eca9b83ef932979517f9232def0a8c3eaf087d96..f3fe0266778d9d513f6a561b8829644d1f66e617 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -646,6 +646,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0348-Fix-NotePlayEvent.patch b/patches/api/0348-Fix-NotePlayEvent.patch similarity index 100% rename from patches/unapplied/api/0348-Fix-NotePlayEvent.patch rename to patches/api/0348-Fix-NotePlayEvent.patch diff --git a/patches/unapplied/api/0349-Freeze-Tick-Lock-API.patch b/patches/api/0349-Freeze-Tick-Lock-API.patch similarity index 92% rename from patches/unapplied/api/0349-Freeze-Tick-Lock-API.patch rename to patches/api/0349-Freeze-Tick-Lock-API.patch index cb1a3463a..7ebe09b2b 100644 --- a/patches/unapplied/api/0349-Freeze-Tick-Lock-API.patch +++ b/patches/api/0349-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ 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 62abbe2149bfb6cb4a38027899863a535e19e94c..b878509ff536f2d728c800a0ae6cd36802570b31 100644 +index 970a07fdc68fc988adbd8cdceccb97960709dff3..b92096ec80198aa007ed1aeff057db463ec11c0b 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -279,6 +279,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/unapplied/api/0350-Dolphin-API.patch b/patches/api/0350-Dolphin-API.patch similarity index 100% rename from patches/unapplied/api/0350-Dolphin-API.patch rename to patches/api/0350-Dolphin-API.patch diff --git a/patches/unapplied/api/0351-More-PotionEffectType-API.patch b/patches/api/0351-More-PotionEffectType-API.patch similarity index 100% rename from patches/unapplied/api/0351-More-PotionEffectType-API.patch rename to patches/api/0351-More-PotionEffectType-API.patch diff --git a/patches/unapplied/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/unapplied/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/unapplied/api/0353-Implement-regenerateChunk.patch b/patches/api/0353-Implement-regenerateChunk.patch similarity index 100% rename from patches/unapplied/api/0353-Implement-regenerateChunk.patch rename to patches/api/0353-Implement-regenerateChunk.patch diff --git a/patches/unapplied/api/0354-Add-GameEvent-tags.patch b/patches/api/0354-Add-GameEvent-tags.patch similarity index 55% rename from patches/unapplied/api/0354-Add-GameEvent-tags.patch rename to patches/api/0354-Add-GameEvent-tags.patch index f9ed3733f..6fc6bfda7 100644 --- a/patches/unapplied/api/0354-Add-GameEvent-tags.patch +++ b/patches/api/0354-Add-GameEvent-tags.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Add GameEvent tags diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 4d14135fcaceba1197132835c8c6504bac14a30e..bf05153566e8009451c25ea6b60cbe706e959493 100644 +index aeef4dea5ea7e5581988e5fedcfec29eee8d58eb..8f9a18ae5cdc51a2cc4ac0e45781fdce91172b6c 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -882,6 +882,18 @@ public interface Tag extends Keyed { +@@ -917,6 +917,24 @@ public interface Tag extends Keyed { + * Vanilla tag representing entities which are dismounted when underwater. */ - @Deprecated(forRemoval = true) - Tag SKELETONS = ENTITY_TYPES_SKELETONS; -+ + Tag ENTITY_TYPES_DISMOUNTS_UNDERWATER = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("dismounts_underwater"), EntityType.class); ++ // Paper start + String REGISTRY_GAME_EVENTS = "game_events"; + + /** @@ -24,6 +24,12 @@ index 4d14135fcaceba1197132835c8c6504bac14a30e..bf05153566e8009451c25ea6b60cbe70 + * Tag for game events that are ignored if the entity is sneaking + */ + Tag GAME_EVENT_IGNORE_VIBRATIONS_SNEAKING = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("ignore_vibrations_sneaking"), GameEvent.class); - // Paper end ++ ++ /** ++ * Tag for game events that an allay can listen to ++ */ ++ Tag GAME_EVENT_ALLAY_CAN_LISTEN = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("allay_can_listen"), GameEvent.class); ++ // Paper end /** + * Returns whether or not this tag has an entry for the specified item. diff --git a/patches/unapplied/api/0355-Furnace-RecipesUsed-API.patch b/patches/api/0355-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/unapplied/api/0355-Furnace-RecipesUsed-API.patch rename to patches/api/0355-Furnace-RecipesUsed-API.patch diff --git a/patches/unapplied/api/0356-Configurable-sculk-sensor-listener-range.patch b/patches/api/0356-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/unapplied/api/0356-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0356-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/unapplied/api/0357-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0357-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/unapplied/api/0357-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0357-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/unapplied/api/0358-Custom-Potion-Mixes.patch b/patches/api/0358-Custom-Potion-Mixes.patch similarity index 100% rename from patches/unapplied/api/0358-Custom-Potion-Mixes.patch rename to patches/api/0358-Custom-Potion-Mixes.patch diff --git a/patches/unapplied/api/0359-Expose-furnace-minecart-push-values.patch b/patches/api/0359-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/unapplied/api/0359-Expose-furnace-minecart-push-values.patch rename to patches/api/0359-Expose-furnace-minecart-push-values.patch diff --git a/patches/unapplied/api/0360-More-Projectile-API.patch b/patches/api/0360-More-Projectile-API.patch similarity index 100% rename from patches/unapplied/api/0360-More-Projectile-API.patch rename to patches/api/0360-More-Projectile-API.patch diff --git a/patches/unapplied/api/0361-Add-getComputedBiome-API.patch b/patches/api/0361-Add-getComputedBiome-API.patch similarity index 100% rename from patches/unapplied/api/0361-Add-getComputedBiome-API.patch rename to patches/api/0361-Add-getComputedBiome-API.patch diff --git a/patches/unapplied/api/0362-Add-enchantWithLevels-API.patch b/patches/api/0362-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/unapplied/api/0362-Add-enchantWithLevels-API.patch rename to patches/api/0362-Add-enchantWithLevels-API.patch diff --git a/patches/unapplied/api/0363-Add-TameableDeathMessageEvent.patch b/patches/api/0363-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/unapplied/api/0363-Add-TameableDeathMessageEvent.patch rename to patches/api/0363-Add-TameableDeathMessageEvent.patch diff --git a/patches/unapplied/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/unapplied/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/unapplied/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/unapplied/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/unapplied/api/0366-WorldCreator-keepSpawnLoaded.patch b/patches/api/0366-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/unapplied/api/0366-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0366-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/unapplied/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/unapplied/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/unapplied/api/0368-Add-PlayerStopUsingItemEvent.patch b/patches/api/0368-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/unapplied/api/0368-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0368-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/unapplied/api/0369-FallingBlock-auto-expire-setting.patch b/patches/api/0369-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/unapplied/api/0369-FallingBlock-auto-expire-setting.patch rename to patches/api/0369-FallingBlock-auto-expire-setting.patch diff --git a/patches/unapplied/api/0370-Keyed-Cat-Type.patch b/patches/api/0370-Keyed-Cat-Type.patch similarity index 100% rename from patches/unapplied/api/0370-Keyed-Cat-Type.patch rename to patches/api/0370-Keyed-Cat-Type.patch diff --git a/patches/unapplied/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/unapplied/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/unapplied/api/0372-Add-WardenAngerChangeEvent.patch b/patches/api/0372-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0372-Add-WardenAngerChangeEvent.patch rename to patches/api/0372-Add-WardenAngerChangeEvent.patch diff --git a/patches/unapplied/api/0373-Nameable-Banner-API.patch b/patches/api/0373-Nameable-Banner-API.patch similarity index 100% rename from patches/unapplied/api/0373-Nameable-Banner-API.patch rename to patches/api/0373-Nameable-Banner-API.patch diff --git a/patches/unapplied/api/0374-Add-Player-getFishHook.patch b/patches/api/0374-Add-Player-getFishHook.patch similarity index 100% rename from patches/unapplied/api/0374-Add-Player-getFishHook.patch rename to patches/api/0374-Add-Player-getFishHook.patch diff --git a/patches/unapplied/api/0375-More-Teleport-API.patch b/patches/api/0375-More-Teleport-API.patch similarity index 97% rename from patches/unapplied/api/0375-More-Teleport-API.patch rename to patches/api/0375-More-Teleport-API.patch index 926db17d8..8fe52e096 100644 --- a/patches/unapplied/api/0375-More-Teleport-API.patch +++ b/patches/api/0375-More-Teleport-API.patch @@ -125,7 +125,7 @@ index 0000000000000000000000000000000000000000..dbacefc919fd6ed6a0f5cdaa0f695a12 + +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index b878509ff536f2d728c800a0ae6cd36802570b31..ec2adecad37c321b7852c34020dc1c61bef5dd8d 100644 +index b92096ec80198aa007ed1aeff057db463ec11c0b..d15ff4d1b975e2a872adc13528942662fa1a3b6b 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -122,10 +122,34 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -165,10 +165,10 @@ index b878509ff536f2d728c800a0ae6cd36802570b31..ec2adecad37c321b7852c34020dc1c61 * 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 596af6bb00429bad7d36ea9b06573ec0aacc4cff..7b239b001288e773920195f3602b3f7103f80884 100644 +index f3fe0266778d9d513f6a561b8829644d1f66e617..058c2f9da196d68477d5fbdcf55b507401e5f3ef 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2762,6 +2762,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2793,6 +2793,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM String getClientBrandName(); // Paper end diff --git a/patches/unapplied/api/0376-Add-EntityPortalReadyEvent.patch b/patches/api/0376-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/unapplied/api/0376-Add-EntityPortalReadyEvent.patch rename to patches/api/0376-Add-EntityPortalReadyEvent.patch diff --git a/patches/unapplied/api/0377-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0377-Custom-Chat-Completion-Suggestions-API.patch similarity index 89% rename from patches/unapplied/api/0377-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0377-Custom-Chat-Completion-Suggestions-API.patch index fbfa26a4a..26092bb58 100644 --- a/patches/unapplied/api/0377-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/api/0377-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 7b239b001288e773920195f3602b3f7103f80884..5c2705fc7fbb28d1ec0c7711295aff7efa5bc3ba 100644 +index 058c2f9da196d68477d5fbdcf55b507401e5f3ef..607415c6dae4f107406365a97925d1cb89c630d8 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2626,6 +2626,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2657,6 +2657,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException If the level is negative or greater than {@code 4} (i.e. not within {@code [0, 4]}). */ void sendOpLevel(byte level); diff --git a/patches/unapplied/api/0378-Collision-API.patch b/patches/api/0378-Collision-API.patch similarity index 93% rename from patches/unapplied/api/0378-Collision-API.patch rename to patches/api/0378-Collision-API.patch index e1c1c5aa0..208b29b0d 100644 --- a/patches/unapplied/api/0378-Collision-API.patch +++ b/patches/api/0378-Collision-API.patch @@ -25,10 +25,10 @@ index 3f7e860de4e28745fcdf8d2f41f4a8c210f48909..39fa4c65e0f61450901662ff5c08d54a // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index ec2adecad37c321b7852c34020dc1c61bef5dd8d..833a8abcdcbe70b2912779f6e179fa3739d099bd 100644 +index d15ff4d1b975e2a872adc13528942662fa1a3b6b..4d7a0cd1ec5e55c4244e30dc957e75d1feada78c 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -886,4 +886,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -912,4 +912,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isInPowderedSnow(); // Paper end diff --git a/patches/unapplied/api/0379-Block-Ticking-API.patch b/patches/api/0379-Block-Ticking-API.patch similarity index 100% rename from patches/unapplied/api/0379-Block-Ticking-API.patch rename to patches/api/0379-Block-Ticking-API.patch diff --git a/patches/unapplied/api/0380-Add-NamespacedKey-biome-methods.patch b/patches/api/0380-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/unapplied/api/0380-Add-NamespacedKey-biome-methods.patch rename to patches/api/0380-Add-NamespacedKey-biome-methods.patch diff --git a/patches/unapplied/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 95% rename from patches/unapplied/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch index 6e1f31553..dec28c483 100644 --- a/patches/unapplied/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch +++ b/patches/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 5c2705fc7fbb28d1ec0c7711295aff7efa5bc3ba..8ad4b7b85c86259b3ba415cea2e398403bd91ffe 100644 +index 607415c6dae4f107406365a97925d1cb89c630d8..13d3676f9a394ba10f772b89b30dde55c3f4a133 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -638,7 +638,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0382-Also-load-resources-from-LibraryLoader.patch b/patches/api/0382-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/unapplied/api/0382-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0382-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/unapplied/api/0383-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0383-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/unapplied/api/0383-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0383-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/unapplied/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/unapplied/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/unapplied/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 96% rename from patches/unapplied/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch index 92a4ba129..52d54bf98 100644 --- a/patches/unapplied/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch +++ b/patches/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose codepoint limit in YamlConfigOptions, and increase diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java -index 559b876d1156c04e4e417fb07439bbbc78bea065..9903be1739a5f8657f182b641e93d8b3480f3d57 100644 +index 4b17c796b187b5d3a6459c4470c0c1b6ba3815ff..0bd07ce5c119c2ed77273bfcb8422ce35138dc89 100644 --- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java +++ b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java @@ -97,6 +97,7 @@ public class YamlConfiguration extends FileConfiguration { diff --git a/patches/unapplied/api/0386-Add-getDrops-to-BlockState.patch b/patches/api/0386-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/unapplied/api/0386-Add-getDrops-to-BlockState.patch rename to patches/api/0386-Add-getDrops-to-BlockState.patch diff --git a/patches/unapplied/api/0387-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0387-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/unapplied/api/0387-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0387-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/unapplied/api/0388-Elder-Guardian-appearance-API.patch b/patches/api/0388-Elder-Guardian-appearance-API.patch similarity index 87% rename from patches/unapplied/api/0388-Elder-Guardian-appearance-API.patch rename to patches/api/0388-Elder-Guardian-appearance-API.patch index 67f57fff4..1eb891c37 100644 --- a/patches/unapplied/api/0388-Elder-Guardian-appearance-API.patch +++ b/patches/api/0388-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 8ad4b7b85c86259b3ba415cea2e398403bd91ffe..9f5dfdf6318860f2a2a5f213425d1a2d945b0ea4 100644 +index 13d3676f9a394ba10f772b89b30dde55c3f4a133..c37096864750581dd6a646c13eb96be1aaf24441 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2836,6 +2836,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2867,6 +2867,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/0389-Allow-changing-bed-s-occupied-property.patch b/patches/api/0389-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/unapplied/api/0389-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0389-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/unapplied/api/0390-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0390-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/unapplied/api/0390-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0390-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/unapplied/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/unapplied/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/unapplied/api/0392-Add-entity-knockback-API.patch b/patches/api/0392-Add-entity-knockback-API.patch similarity index 100% rename from patches/unapplied/api/0392-Add-entity-knockback-API.patch rename to patches/api/0392-Add-entity-knockback-API.patch diff --git a/patches/unapplied/api/0393-Added-EntityToggleSitEvent.patch b/patches/api/0393-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/unapplied/api/0393-Added-EntityToggleSitEvent.patch rename to patches/api/0393-Added-EntityToggleSitEvent.patch diff --git a/patches/unapplied/api/0394-Add-Moving-Piston-API.patch b/patches/api/0394-Add-Moving-Piston-API.patch similarity index 100% rename from patches/unapplied/api/0394-Add-Moving-Piston-API.patch rename to patches/api/0394-Add-Moving-Piston-API.patch diff --git a/patches/unapplied/api/0395-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0395-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/unapplied/api/0395-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0395-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/unapplied/api/0396-Add-Player-Warden-Warning-API.patch b/patches/api/0396-Add-Player-Warden-Warning-API.patch similarity index 93% rename from patches/unapplied/api/0396-Add-Player-Warden-Warning-API.patch rename to patches/api/0396-Add-Player-Warden-Warning-API.patch index c18b7a64d..a53050c05 100644 --- a/patches/unapplied/api/0396-Add-Player-Warden-Warning-API.patch +++ b/patches/api/0396-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 9f5dfdf6318860f2a2a5f213425d1a2d945b0ea4..33c2dd4ef74f20d33cc81eccd6a55f02550ce3ea 100644 +index c37096864750581dd6a646c13eb96be1aaf24441..02155e8f4fbb7fe1a0782a6e3cc347394679abc1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2852,6 +2852,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2883,6 +2883,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/0397-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0397-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/unapplied/api/0397-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0397-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/unapplied/api/0398-Add-paper-dumplisteners-command.patch b/patches/api/0398-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/unapplied/api/0398-Add-paper-dumplisteners-command.patch rename to patches/api/0398-Add-paper-dumplisteners-command.patch diff --git a/patches/unapplied/api/0399-ItemStack-damage-API.patch b/patches/api/0399-ItemStack-damage-API.patch similarity index 100% rename from patches/unapplied/api/0399-ItemStack-damage-API.patch rename to patches/api/0399-ItemStack-damage-API.patch diff --git a/patches/unapplied/api/0400-Add-Tick-TemporalUnit.patch b/patches/api/0400-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/unapplied/api/0400-Add-Tick-TemporalUnit.patch rename to patches/api/0400-Add-Tick-TemporalUnit.patch diff --git a/patches/unapplied/api/0401-Friction-API.patch b/patches/api/0401-Friction-API.patch similarity index 100% rename from patches/unapplied/api/0401-Friction-API.patch rename to patches/api/0401-Friction-API.patch diff --git a/patches/unapplied/api/0402-Player-Entity-Tracking-Events.patch b/patches/api/0402-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/unapplied/api/0402-Player-Entity-Tracking-Events.patch rename to patches/api/0402-Player-Entity-Tracking-Events.patch diff --git a/patches/unapplied/api/0403-Add-missing-Fluid-type.patch b/patches/api/0403-Add-missing-Fluid-type.patch similarity index 100% rename from patches/unapplied/api/0403-Add-missing-Fluid-type.patch rename to patches/api/0403-Add-missing-Fluid-type.patch diff --git a/patches/unapplied/api/0404-Mark-experimental-api-as-such.patch b/patches/api/0404-Mark-experimental-api-as-such.patch similarity index 87% rename from patches/unapplied/api/0404-Mark-experimental-api-as-such.patch rename to patches/api/0404-Mark-experimental-api-as-such.patch index f9ae383a2..dffbaf043 100644 --- a/patches/unapplied/api/0404-Mark-experimental-api-as-such.patch +++ b/patches/api/0404-Mark-experimental-api-as-such.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Mark experimental api as such diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611dac94a41c 100644 +index 716a40b055e693cfda38d2d8223ce4320919a332..3ac13a9ed56dc8386ded8fb77f7e1161dce3827e 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -154,9 +154,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - ACACIA_PLANKS(31312), +@@ -158,9 +158,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + CHERRY_PLANKS(8354), DARK_OAK_PLANKS(20869), MANGROVE_PLANKS(7078), + @org.jetbrains.annotations.ApiStatus.Experimental // Paper @@ -20,7 +20,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_MOSAIC(10715), /** * BlockData: {@link Sapling} -@@ -352,6 +354,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -368,6 +370,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Orientable} */ @@ -28,7 +28,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_BLOCK(20770, Orientable.class), /** * BlockData: {@link Orientable} -@@ -428,6 +431,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -452,6 +455,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Orientable} */ @@ -36,7 +36,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d STRIPPED_BAMBOO_BLOCK(14799, Orientable.class), /** * BlockData: {@link Orientable} -@@ -622,10 +626,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -663,10 +667,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Slab} */ @@ -49,15 +49,15 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_MOSAIC_SLAB(22118, Slab.class), /** * BlockData: {@link Slab} -@@ -712,6 +718,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -753,6 +759,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link ChiseledBookshelf} */ + @org.jetbrains.annotations.ApiStatus.Experimental // Paper CHISELED_BOOKSHELF(8099, ChiseledBookshelf.class), - MOSSY_COBBLESTONE(21900), - OBSIDIAN(32723), -@@ -805,6 +812,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + /** + * BlockData: {@link DecoratedPot} +@@ -854,6 +861,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Fence} */ @@ -65,7 +65,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_FENCE(17207, Fence.class), /** * BlockData: {@link Fence} -@@ -981,10 +989,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -1034,10 +1042,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Stairs} */ @@ -78,7 +78,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_MOSAIC_STAIRS(20977, Stairs.class), /** * BlockData: {@link Stairs} -@@ -1828,6 +1838,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -1885,6 +1895,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Switch} */ @@ -86,7 +86,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_BUTTON(21810, Switch.class), /** * BlockData: {@link Switch} -@@ -1884,6 +1895,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -1945,6 +1956,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Powerable} */ @@ -94,7 +94,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_PRESSURE_PLATE(26740, Powerable.class), /** * BlockData: {@link Powerable} -@@ -1928,6 +1940,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -1993,6 +2005,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Door} */ @@ -102,7 +102,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_DOOR(19971, Door.class), /** * BlockData: {@link Door} -@@ -1972,6 +1985,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2041,6 +2054,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link TrapDoor} */ @@ -110,7 +110,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_TRAPDOOR(9174, TrapDoor.class), /** * BlockData: {@link TrapDoor} -@@ -2012,6 +2026,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2085,6 +2099,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Gate} */ @@ -118,7 +118,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_FENCE_GATE(14290, Gate.class), /** * BlockData: {@link Gate} -@@ -2060,7 +2075,9 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2135,7 +2150,9 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla DARK_OAK_CHEST_BOAT(8733, 1), MANGROVE_BOAT(20792, 1), MANGROVE_CHEST_BOAT(18572, 1), @@ -128,7 +128,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_CHEST_RAFT(20056, 1), /** * BlockData: {@link StructureBlock} -@@ -2194,6 +2211,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2273,6 +2290,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Sign} */ @@ -136,7 +136,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_SIGN(26139, 16, Sign.class), /** * BlockData: {@link Sign} -@@ -2206,42 +2224,52 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2285,46 +2303,57 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link HangingSign} */ @@ -165,6 +165,11 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d /** * BlockData: {@link HangingSign} */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper + CHERRY_HANGING_SIGN(5088, 16, HangingSign.class), + /** + * BlockData: {@link HangingSign} + */ + @org.jetbrains.annotations.ApiStatus.Experimental // Paper DARK_OAK_HANGING_SIGN(23360, 16, HangingSign.class), /** @@ -189,7 +194,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d WARPED_HANGING_SIGN(8195, 16, HangingSign.class), BUCKET(15215, 16), WATER_BUCKET(8802, 1), -@@ -2265,6 +2293,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2348,6 +2377,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla EGG(21603, 16), COMPASS(24139), RECOVERY_COMPASS(12710), @@ -197,7 +202,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BUNDLE(16835, 1), FISHING_ROD(4167, 1, 64), CLOCK(14980), -@@ -2405,6 +2434,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2488,6 +2518,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla BEE_SPAWN_EGG(22924), BLAZE_SPAWN_EGG(4759), CAT_SPAWN_EGG(29583), @@ -205,7 +210,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d CAMEL_SPAWN_EGG(14760), CAVE_SPIDER_SPAWN_EGG(23341), CHICKEN_SPAWN_EGG(5462), -@@ -2515,6 +2545,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2599,6 +2630,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Rotatable} */ @@ -213,7 +218,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d PIGLIN_HEAD(5512, Rotatable.class), NETHER_STAR(12469), PUMPKIN_PIE(28725), -@@ -2916,46 +2947,57 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -3022,50 +3054,62 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link WallSign} */ @@ -242,6 +247,11 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d /** * BlockData: {@link WallHangingSign} */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper + CHERRY_WALL_HANGING_SIGN(10953, WallHangingSign.class), + /** + * BlockData: {@link WallHangingSign} + */ + @org.jetbrains.annotations.ApiStatus.Experimental // Paper JUNGLE_WALL_HANGING_SIGN(16691, WallHangingSign.class), /** @@ -271,7 +281,7 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d BAMBOO_WALL_HANGING_SIGN(6669, WallHangingSign.class), /** * BlockData: {@link RedstoneWallTorch} -@@ -3063,6 +3105,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -3175,6 +3219,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Directional} */ @@ -280,10 +290,10 @@ index 33371518fc8c5d97625f3d528ba8fee25d8c9c00..7eb5413ea1d94ddacd98edb57074611d /** * BlockData: {@link Directional} diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index bf05153566e8009451c25ea6b60cbe706e959493..84dbfefb2cfc10a1ac7d9712535fcaecc9af6a2d 100644 +index 8f9a18ae5cdc51a2cc4ac0e45781fdce91172b6c..bfcf1f54596dbea22336a4eb441d64399358c580 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -142,6 +142,7 @@ public interface Tag extends Keyed { +@@ -146,6 +146,7 @@ public interface Tag extends Keyed { /** * Vanilla block tag representing all bamboo blocks. */ @@ -291,7 +301,7 @@ index bf05153566e8009451c25ea6b60cbe706e959493..84dbfefb2cfc10a1ac7d9712535fcaec Tag BAMBOO_BLOCKS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("bamboo_blocks"), Material.class); /** * Vanilla block tag representing all banner blocks. -@@ -312,14 +313,17 @@ public interface Tag extends Keyed { +@@ -320,14 +321,17 @@ public interface Tag extends Keyed { /** * Vanilla block tag representing all ceiling signs. */ @@ -309,7 +319,7 @@ index bf05153566e8009451c25ea6b60cbe706e959493..84dbfefb2cfc10a1ac7d9712535fcaec Tag ALL_HANGING_SIGNS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("all_hanging_signs"), Material.class); /** * Vanilla block tag representing all signs, regardless of type. -@@ -745,6 +749,7 @@ public interface Tag extends Keyed { +@@ -757,6 +761,7 @@ public interface Tag extends Keyed { /** * Vanilla item tag representing all books that may be placed on bookshelves. */ @@ -317,7 +327,7 @@ index bf05153566e8009451c25ea6b60cbe706e959493..84dbfefb2cfc10a1ac7d9712535fcaec Tag ITEMS_BOOKSHELF_BOOKS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("bookshelf_books"), Material.class); /** * Vanilla item tag representing all items that may be placed in beacons. -@@ -765,6 +770,7 @@ public interface Tag extends Keyed { +@@ -777,6 +782,7 @@ public interface Tag extends Keyed { /** * Vanilla item tag representing all hanging signs. */ @@ -403,11 +413,11 @@ index 283b21024d7a6eeebbf7306f95fce7eb4714bac6..7c9273b07b39b656796983cb43cd7f09 public interface WallHangingSign extends Directional, Waterlogged { } diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java -index fbe0a946d821e479fd3097021058d95732ace1b3..f54136f7f1ed11bd8e49cc48f8f50ebde694c327 100644 +index f7548098bcdd033d9c530fdc584fc5538c635ca1..bfa6ea36446084a26b090321e9b63e262f69c995 100644 --- a/src/main/java/org/bukkit/entity/Boat.java +++ b/src/main/java/org/bukkit/entity/Boat.java -@@ -143,6 +143,7 @@ public interface Boat extends Vehicle { - ACACIA(Material.ACACIA_PLANKS), +@@ -144,6 +144,7 @@ public interface Boat extends Vehicle { + CHERRY(Material.CHERRY_PLANKS), DARK_OAK(Material.DARK_OAK_PLANKS), MANGROVE(Material.MANGROVE_PLANKS), + @org.jetbrains.annotations.ApiStatus.Experimental // Paper @@ -427,7 +437,7 @@ index 17e4e0a822d4372e0a98612294ec0bd728830164..f827d8f508441a035974974d34450879 /** diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 4915c1064a9b6bf1d485f9e6e42b9f6e4e12f236..91664b99f1158cb8a2e3c72ec082bf3c39487649 100644 +index 9f935266f51f4ea5d1193031f52e5327350cc06f..0303841e461a64db863e3732d2d7c763b50b9eb0 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java @@ -278,6 +278,7 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans @@ -436,10 +446,10 @@ index 4915c1064a9b6bf1d485f9e6e42b9f6e4e12f236..91664b99f1158cb8a2e3c72ec082bf3c WARDEN("warden", Warden.class, -1), + @org.jetbrains.annotations.ApiStatus.Experimental // Paper CAMEL("camel", Camel.class, -1), - /** - * A fishing line and bobber. + BLOCK_DISPLAY("block_display", BlockDisplay.class, -1), + INTERACTION("interaction", Interaction.class, -1), diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index b917c13a30254a83cc2ea87279d427276bc75074..8d7ad84c2bdafa8c8a385fe31acb887a883194ff 100644 +index 456eb20f8d603b1ebbaa11b8832e56c08406b7c9..822b1f50dee09fbc8070e34724fe8e5673d80e1d 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java @@ -137,6 +137,7 @@ public enum InventoryType { @@ -448,8 +458,8 @@ index b917c13a30254a83cc2ea87279d427276bc75074..8d7ad84c2bdafa8c8a385fe31acb887a */ + @org.jetbrains.annotations.ApiStatus.Experimental // Paper CHISELED_BOOKSHELF(6, "Chiseled Bookshelf"), - ; - + /** + * The new smithing inventory, with 3 CRAFTING slots and 1 RESULT slot. diff --git a/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java b/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java index b99f26079c14931d443615fa81eac9791080ecb0..47a8f451e8112bf533778f25166dcf1966057c70 100644 --- a/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java diff --git a/patches/unapplied/api/0405-fix-Instruments.patch b/patches/api/0405-fix-Instruments.patch similarity index 98% rename from patches/unapplied/api/0405-fix-Instruments.patch rename to patches/api/0405-fix-Instruments.patch index b4068fdbf..405d24b5e 100644 --- a/patches/unapplied/api/0405-fix-Instruments.patch +++ b/patches/api/0405-fix-Instruments.patch @@ -105,7 +105,7 @@ index de976be7132d05506fde7a839cac3954b0dd8da4..27dafd1850d3b984a6af155f5c08ee54 public static Instrument getByType(final byte type) { return BY_DATA.get(type); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 33c2dd4ef74f20d33cc81eccd6a55f02550ce3ea..ac992523f09ffe35a55ef6f67115d3862504c2a6 100644 +index 02155e8f4fbb7fe1a0782a6e3cc347394679abc1..37639815182969c97dc678c2552f84a546fbafa7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -390,9 +390,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0406-Add-BlockLockCheckEvent.patch b/patches/api/0406-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/unapplied/api/0406-Add-BlockLockCheckEvent.patch rename to patches/api/0406-Add-BlockLockCheckEvent.patch diff --git a/patches/unapplied/api/0407-Add-Sneaking-API-for-Entities.patch b/patches/api/0407-Add-Sneaking-API-for-Entities.patch similarity index 87% rename from patches/unapplied/api/0407-Add-Sneaking-API-for-Entities.patch rename to patches/api/0407-Add-Sneaking-API-for-Entities.patch index a5e5ca057..a9caac21b 100644 --- a/patches/unapplied/api/0407-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0407-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 833a8abcdcbe70b2912779f6e179fa3739d099bd..11cf1bb585e2754bda443b776e9fcaf0a6cc289e 100644 +index 4d7a0cd1ec5e55c4244e30dc957e75d1feada78c..365350d38b2eee00d22bad09ab95c6054f11d536 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -738,6 +738,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -764,6 +764,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @NotNull Pose getPose(); @@ -35,7 +35,7 @@ index 833a8abcdcbe70b2912779f6e179fa3739d099bd..11cf1bb585e2754bda443b776e9fcaf0 * 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 ac992523f09ffe35a55ef6f67115d3862504c2a6..213eb6bf962b4bd6fcab9f8a5fa90962e7805d8c 100644 +index 37639815182969c97dc678c2552f84a546fbafa7..1bca5f0567c4d32d2dac780b0bcebaf0a1d626d8 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -293,6 +293,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0408-Improve-PortalEvents.patch b/patches/api/0408-Improve-PortalEvents.patch similarity index 100% rename from patches/unapplied/api/0408-Improve-PortalEvents.patch rename to patches/api/0408-Improve-PortalEvents.patch diff --git a/patches/unapplied/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/unapplied/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/unapplied/api/0410-Flying-Fall-Damage-API.patch b/patches/api/0410-Flying-Fall-Damage-API.patch similarity index 88% rename from patches/unapplied/api/0410-Flying-Fall-Damage-API.patch rename to patches/api/0410-Flying-Fall-Damage-API.patch index 9cbe27900..e8489dd64 100644 --- a/patches/unapplied/api/0410-Flying-Fall-Damage-API.patch +++ b/patches/api/0410-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 213eb6bf962b4bd6fcab9f8a5fa90962e7805d8c..b8d0548099cd118dcfcfa5391594b46f0740d10e 100644 +index 1bca5f0567c4d32d2dac780b0bcebaf0a1d626d8..dfe407ad3f5eef963a447ad4f89605300545a595 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1423,6 +1423,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1454,6 +1454,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void setAllowFlight(boolean flight); diff --git a/patches/unapplied/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/unapplied/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/unapplied/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/unapplied/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/unapplied/api/0413-Win-Screen-API.patch b/patches/api/0413-Win-Screen-API.patch similarity index 96% rename from patches/unapplied/api/0413-Win-Screen-API.patch rename to patches/api/0413-Win-Screen-API.patch index 927695fc9..d38cac94b 100644 --- a/patches/unapplied/api/0413-Win-Screen-API.patch +++ b/patches/api/0413-Win-Screen-API.patch @@ -5,7 +5,7 @@ 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 b8d0548099cd118dcfcfa5391594b46f0740d10e..fd890d0a3a2c92ad821ade7711191bdb0e3e3624 100644 +index dfe407ad3f5eef963a447ad4f89605300545a595..660f28e371176c62e38a84b187958aceb235c8e3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -854,6 +854,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/unapplied/api/0414-Add-Entity-Body-Yaw-API.patch b/patches/api/0414-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/unapplied/api/0414-Add-Entity-Body-Yaw-API.patch rename to patches/api/0414-Add-Entity-Body-Yaw-API.patch diff --git a/patches/unapplied/api/0415-Add-missing-isFuel-Material-entries.patch b/patches/api/0415-Add-missing-isFuel-Material-entries.patch similarity index 84% rename from patches/unapplied/api/0415-Add-missing-isFuel-Material-entries.patch rename to patches/api/0415-Add-missing-isFuel-Material-entries.patch index e240cc62e..755391163 100644 --- a/patches/unapplied/api/0415-Add-missing-isFuel-Material-entries.patch +++ b/patches/api/0415-Add-missing-isFuel-Material-entries.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add missing isFuel Material entries diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0ebaf764fae7 100644 +index 3ac13a9ed56dc8386ded8fb77f7e1161dce3827e..3f13ff43f8d24ad3c7750e27302f365f7e4bc569 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -7459,6 +7459,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -7650,6 +7650,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla case ACACIA_DOOR: case ACACIA_FENCE: case ACACIA_FENCE_GATE: @@ -16,7 +16,7 @@ index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0eba case ACACIA_LOG: case ACACIA_PLANKS: case ACACIA_PRESSURE_PLATE: -@@ -7470,9 +7471,27 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -7661,9 +7662,27 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla case ACACIA_WOOD: case AZALEA: case BAMBOO: @@ -44,7 +44,7 @@ index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0eba case BARREL: case BIRCH_BOAT: case BIRCH_BUTTON: -@@ -7480,6 +7499,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -7671,6 +7690,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla case BIRCH_DOOR: case BIRCH_FENCE: case BIRCH_FENCE_GATE: @@ -52,7 +52,7 @@ index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0eba case BIRCH_LOG: case BIRCH_PLANKS: case BIRCH_PRESSURE_PLATE: -@@ -7520,6 +7540,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -7711,6 +7731,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla case DARK_OAK_DOOR: case DARK_OAK_FENCE: case DARK_OAK_FENCE_GATE: @@ -60,7 +60,7 @@ index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0eba case DARK_OAK_LOG: case DARK_OAK_PLANKS: case DARK_OAK_PRESSURE_PLATE: -@@ -7548,6 +7569,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -7739,6 +7760,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla case JUNGLE_DOOR: case JUNGLE_FENCE: case JUNGLE_FENCE_GATE: @@ -68,7 +68,7 @@ index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0eba case JUNGLE_LOG: case JUNGLE_PLANKS: case JUNGLE_PRESSURE_PLATE: -@@ -7579,6 +7601,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -7770,6 +7792,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla case MANGROVE_DOOR: case MANGROVE_FENCE: case MANGROVE_FENCE_GATE: @@ -76,7 +76,7 @@ index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0eba case MANGROVE_LOG: case MANGROVE_PLANKS: case MANGROVE_PRESSURE_PLATE: -@@ -7596,6 +7619,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -7787,6 +7810,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla case OAK_DOOR: case OAK_FENCE: case OAK_FENCE_GATE: @@ -84,7 +84,7 @@ index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0eba case OAK_LOG: case OAK_PLANKS: case OAK_PRESSURE_PLATE: -@@ -7625,6 +7649,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -7816,6 +7840,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla case SPRUCE_DOOR: case SPRUCE_FENCE: case SPRUCE_FENCE_GATE: @@ -92,7 +92,7 @@ index 7eb5413ea1d94ddacd98edb57074611dac94a41c..6bbb47d1f9d8d45326232024e82a0eba case SPRUCE_LOG: case SPRUCE_PLANKS: case SPRUCE_PRESSURE_PLATE: -@@ -7637,6 +7662,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -7828,6 +7853,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla case STICK: case STRIPPED_ACACIA_LOG: case STRIPPED_ACACIA_WOOD: diff --git a/patches/unapplied/api/0416-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0416-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/unapplied/api/0416-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0416-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/unapplied/api/0417-Add-EntityFertilizeEggEvent.patch b/patches/api/0417-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/unapplied/api/0417-Add-EntityFertilizeEggEvent.patch rename to patches/api/0417-Add-EntityFertilizeEggEvent.patch diff --git a/patches/unapplied/api/0418-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0418-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/unapplied/api/0418-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0418-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/unapplied/api/0253-Added-missing-vanilla-tags.patch b/patches/unapplied/api/0253-Added-missing-vanilla-tags.patch deleted file mode 100644 index 950884771..000000000 --- a/patches/unapplied/api/0253-Added-missing-vanilla-tags.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Sun, 3 Jan 2021 20:03:40 -0800 -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 15699ee58e06880a508689f761ecfdb77d44d182..4d14135fcaceba1197132835c8c6504bac14a30e 100644 ---- a/src/main/java/org/bukkit/Tag.java -+++ b/src/main/java/org/bukkit/Tag.java -@@ -712,6 +712,12 @@ public interface Tag extends Keyed { - * Vanilla item tag representing all chest boat items. - */ - Tag ITEMS_CHEST_BOATS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("chest_boats"), Material.class); -+ // Paper start -+ /** -+ * Vanilla item tag representing all non-flammable wood items. -+ */ -+ Tag ITEMS_NON_FLAMMABLE_WOOD = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("non_flammable_wood"), Material.class); -+ // Paper end - /** - * Vanilla item tag representing all fish items. - */ -@@ -839,6 +845,44 @@ public interface Tag extends Keyed { - * Vanilla tag representing entities which can be eaten by frogs. - */ - Tag ENTITY_TYPES_FROG_FOOD = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("frog_food"), EntityType.class); -+ // Paper start -+ /** -+ * Key for the built-in entity registry -+ * @deprecated use {@link #REGISTRY_ENTITY_TYPES} -+ */ -+ @Deprecated(forRemoval = true) -+ String REGISTRY_ENTITIES = REGISTRY_ENTITY_TYPES; -+ /** -+ * Vanilla entity tag representing arrow entities. -+ * @deprecated use {@link #ENTITY_TYPES_ARROWS} -+ */ -+ @Deprecated(forRemoval = true) -+ Tag ARROWS = ENTITY_TYPES_ARROWS; -+ /** -+ * Vanilla entity tag representing entities that live in beehives -+ * @deprecated use {@link #ENTITY_TYPES_BEEHIVE_INHABITORS} -+ */ -+ @Deprecated(forRemoval = true) -+ Tag BEEHIVE_INHABITORS = ENTITY_TYPES_BEEHIVE_INHABITORS; -+ /** -+ * Vanilla entity tag representing projectiles that impact -+ * @deprecated use {@link #ENTITY_TYPES_IMPACT_PROJECTILES} -+ */ -+ @Deprecated(forRemoval = true) -+ Tag IMPACT_PROJECTILES = ENTITY_TYPES_IMPACT_PROJECTILES; -+ /** -+ * Vanilla entity tag for village raiders -+ * @deprecated use {@link #ENTITY_TYPES_RAIDERS} -+ */ -+ @Deprecated(forRemoval = true) -+ Tag RAIDERS = ENTITY_TYPES_RAIDERS; -+ /** -+ * Vanilla entity tag for skeleton types -+ * @deprecated use {@link #ENTITY_TYPES_SKELETONS} -+ */ -+ @Deprecated(forRemoval = true) -+ Tag SKELETONS = ENTITY_TYPES_SKELETONS; -+ // Paper end - - /** - * Returns whether or not this tag has an entry for the specified item.