From 862d00478e1cf01bd0fff85e1899493fe25699ef Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 23 Apr 2024 16:26:24 -0700 Subject: [PATCH] work on some API stuff --- .../0173-Fix-Spigot-annotation-mistakes.patch | 24 +- patches/api/0185-Entity-Jump-API.patch | 2 +- ...yPickupItemAnimation-to-LivingEntity.patch | 2 +- ...-Add-methods-to-get-translation-keys.patch | 2 +- ...223-Add-LivingEntity-clearActiveItem.patch | 2 +- ...8-Expose-LivingEntity-hurt-direction.patch | 2 +- patches/api/0282-More-Enchantment-API.patch | 2 +- .../0293-Add-more-line-of-sight-methods.patch | 2 +- patches/api/0296-Missing-Entity-API.patch | 2 +- patches/api/0300-Stinger-API.patch | 2 +- ...-swingHand-EquipmentSlot-convenience.patch | 2 +- .../api/0379-Add-entity-knockback-API.patch | 2 +- patches/api/0386-ItemStack-damage-API.patch | 2 +- patches/api/0388-Friction-API.patch | 2 +- .../api/0399-Add-Entity-Body-Yaw-API.patch | 2 +- ...-to-remove-all-active-potion-effects.patch | 2 +- ...add-missing-Experimental-annotations.patch | 279 ++++++++++++++++-- .../api/0449-Add-HiddenPotionEffect-API.patch | 2 +- 18 files changed, 298 insertions(+), 37 deletions(-) diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch index 4413421992..a5dabdf4d7 100644 --- a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch @@ -729,6 +729,19 @@ index b90f5dc345ad2cdd3ae353dc57f42a14c231d18a..a7b915ded9154d53ac8ca599119c1699 @Nullable public static PistonMoveReaction getById(int id) { return byId.get(id); +diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java +index dddd0e74962d5713c4bb6219fba48aae5763e9ea..a08b285f4dea60a4ba048f58b802573622d2c313 100644 +--- a/src/main/java/org/bukkit/enchantments/Enchantment.java ++++ b/src/main/java/org/bukkit/enchantments/Enchantment.java +@@ -272,7 +272,7 @@ public abstract class Enchantment implements Keyed, Translatable { + * @deprecated enchantment groupings are now managed by tags, not categories + */ + @NotNull +- @Deprecated ++ @Deprecated(forRemoval = true, since = "1.20.5") @org.jetbrains.annotations.Contract("-> fail") // Paper + public abstract EnchantmentTarget getItemTarget(); + + /** diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java index 3afe2787de576f7190d87c796bea0ab34dc30248..58191017244f3949f6174fb108e3a245738a53c4 100644 --- a/src/main/java/org/bukkit/entity/Enderman.java @@ -812,7 +825,7 @@ index f124b35ec76e6cb6a1a0dc464005087043c3efd0..f50aaddf8582be55fd4860ad374d8f22 +@Deprecated(forRemoval = true) // Paper public interface LingeringPotion extends ThrownPotion { } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 8cd525dd8ded0ddbd405c66e9c0fbeb40f788521..a6bcdcbe47e17ebdd423bb0e1fb4e29eb9de01c4 100644 +index 8cd525dd8ded0ddbd405c66e9c0fbeb40f788521..2b791a093a1220be80eb6b9d7202f6596fcf2dd6 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -716,7 +716,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -824,6 +837,15 @@ index 8cd525dd8ded0ddbd405c66e9c0fbeb40f788521..a6bcdcbe47e17ebdd423bb0e1fb4e29e + @Deprecated // Paper public void setSwimming(boolean swimming); + /** +@@ -971,7 +973,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource + * @deprecated entity groupings are now managed by tags, not categories + */ + @NotNull +- @Deprecated ++ @Deprecated(forRemoval = true, since = "1.20.5") @org.jetbrains.annotations.Contract("-> fail") // Paper + public EntityCategory getCategory(); + /** diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621bacf864075 100644 diff --git a/patches/api/0185-Entity-Jump-API.patch b/patches/api/0185-Entity-Jump-API.patch index 86c29fafdc..fb5b69da63 100644 --- a/patches/api/0185-Entity-Jump-API.patch +++ b/patches/api/0185-Entity-Jump-API.patch @@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..a6306c957fcacdcbcc8037b4ee33a167 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index a6bcdcbe47e17ebdd423bb0e1fb4e29eb9de01c4..90466c457657e15796b81ebe50ae873aa9f1774b 100644 +index 2b791a093a1220be80eb6b9d7202f6596fcf2dd6..d134a7406e3960e12e811085257a1e0052abb499 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1149,4 +1149,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch index 19b048763f..8530c705f9 100644 --- a/patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 90466c457657e15796b81ebe50ae873aa9f1774b..79ef7733ba6fd7d34f8bf87218779af5ba74d084 100644 +index d134a7406e3960e12e811085257a1e0052abb499..c71bc11f7a0a72d4e5d609e333ab99031ea813d2 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1171,4 +1171,29 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0210-Add-methods-to-get-translation-keys.patch b/patches/api/0210-Add-methods-to-get-translation-keys.patch index 72c9ae1cbf..c3b0abc261 100644 --- a/patches/api/0210-Add-methods-to-get-translation-keys.patch +++ b/patches/api/0210-Add-methods-to-get-translation-keys.patch @@ -310,7 +310,7 @@ index bf29d9b733afc7c62725d259f4920c4f211cc6d0..1d3812db989a55b6f31bb30dffe70323 // Paper end } diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index dddd0e74962d5713c4bb6219fba48aae5763e9ea..5b831dc9666b68fd9f4497aa3b07beba13fb215f 100644 +index a08b285f4dea60a4ba048f58b802573622d2c313..3375ce0f9ac50cd3f145291ceb587d4e6f72569c 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0223-Add-LivingEntity-clearActiveItem.patch b/patches/api/0223-Add-LivingEntity-clearActiveItem.patch index ae2af3de67..03307beabf 100644 --- a/patches/api/0223-Add-LivingEntity-clearActiveItem.patch +++ b/patches/api/0223-Add-LivingEntity-clearActiveItem.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 79ef7733ba6fd7d34f8bf87218779af5ba74d084..739a8ef8b0d141dd01a15df8666f31fef4fd590e 100644 +index c71bc11f7a0a72d4e5d609e333ab99031ea813d2..ac8d9e3238a4d47170ba8e79bc5f259cbfd3fa33 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1061,6 +1061,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0228-Expose-LivingEntity-hurt-direction.patch b/patches/api/0228-Expose-LivingEntity-hurt-direction.patch index 49b8ae1828..2957bd50ae 100644 --- a/patches/api/0228-Expose-LivingEntity-hurt-direction.patch +++ b/patches/api/0228-Expose-LivingEntity-hurt-direction.patch @@ -26,7 +26,7 @@ index 5ecfb98540c00da05b13bc5370debb89c52cc76f..083d5798ccc7f37c6df5e234c7ef2332 * Get the sleep ticks of the player. This value may be capped. * diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 739a8ef8b0d141dd01a15df8666f31fef4fd590e..ac0f03b6b3d451b4540dd2efee729b32f7f9e371 100644 +index ac8d9e3238a4d47170ba8e79bc5f259cbfd3fa33..b75b79512a8fd7054f0c0c08e34f6900309e522c 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1201,4 +1201,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0282-More-Enchantment-API.patch b/patches/api/0282-More-Enchantment-API.patch index 8348605555..ef1d03e344 100644 --- a/patches/api/0282-More-Enchantment-API.patch +++ b/patches/api/0282-More-Enchantment-API.patch @@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..e6a40c1fcea761bd66743b50e3da3d14 + } +} diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index 5b831dc9666b68fd9f4497aa3b07beba13fb215f..9db31242d736a5be15b48f6cfada5a5121c212dd 100644 +index 3375ce0f9ac50cd3f145291ceb587d4e6f72569c..d38a23dcab5312e610d7ea328b167a6105bbc0a7 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java @@ -291,11 +291,7 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve diff --git a/patches/api/0293-Add-more-line-of-sight-methods.patch b/patches/api/0293-Add-more-line-of-sight-methods.patch index 01d7f5db31..dc87546ce9 100644 --- a/patches/api/0293-Add-more-line-of-sight-methods.patch +++ b/patches/api/0293-Add-more-line-of-sight-methods.patch @@ -23,7 +23,7 @@ index d8b1fa79dc24138dc71e32c14bda71c1d570ed88..b68367f123f029c3ff47eab6bfabd7a8 // Paper end } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ac0f03b6b3d451b4540dd2efee729b32f7f9e371..19aecfc5d9387d9ae94890036f845b58a9327642 100644 +index b75b79512a8fd7054f0c0c08e34f6900309e522c..62a301f2f87b053bcfbf16c9870c3f740eb70022 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -622,6 +622,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0296-Missing-Entity-API.patch b/patches/api/0296-Missing-Entity-API.patch index ed30fe8df6..582dafaea4 100644 --- a/patches/api/0296-Missing-Entity-API.patch +++ b/patches/api/0296-Missing-Entity-API.patch @@ -585,7 +585,7 @@ index 6b3c9bef9a8a34ddc6ff42cf358541a2665bf5e3..9c618a27d590f186f29c5d9094fc565e + // Paper end } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 19aecfc5d9387d9ae94890036f845b58a9327642..0b789c2732e2d86f3201e65004543322a9a28b8b 100644 +index 62a301f2f87b053bcfbf16c9870c3f740eb70022..ce5cf587ce44f2410c1d0bcf459b6309ec70bfee 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -994,6 +994,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0300-Stinger-API.patch b/patches/api/0300-Stinger-API.patch index 14aff16ae5..e209e5da29 100644 --- a/patches/api/0300-Stinger-API.patch +++ b/patches/api/0300-Stinger-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 0b789c2732e2d86f3201e65004543322a9a28b8b..b5551eed2e9090dcbbe97cae25a0c0545285c64f 100644 +index ce5cf587ce44f2410c1d0bcf459b6309ec70bfee..f05883886928169600b6309dd12de3bdb633cca1 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -451,6 +451,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch index e854d90687..fc814196e7 100644 --- a/patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch +++ b/patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index b5551eed2e9090dcbbe97cae25a0c0545285c64f..1041af2b645e15d8a94fe388cb88f1a8adde16f0 100644 +index f05883886928169600b6309dd12de3bdb633cca1..51d3bc142bcd3b349326ae2553660abcf19a2638 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1331,4 +1331,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0379-Add-entity-knockback-API.patch b/patches/api/0379-Add-entity-knockback-API.patch index 1bd8f3077b..b8c91440f6 100644 --- a/patches/api/0379-Add-entity-knockback-API.patch +++ b/patches/api/0379-Add-entity-knockback-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 1041af2b645e15d8a94fe388cb88f1a8adde16f0..30e87d632d12326c70507b3ec9f464af1fb05650 100644 +index 51d3bc142bcd3b349326ae2553660abcf19a2638..6bfc8a2148f504370df938447f4f6b757f1a516b 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1351,4 +1351,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0386-ItemStack-damage-API.patch b/patches/api/0386-ItemStack-damage-API.patch index 99dcb21b8f..e45351b249 100644 --- a/patches/api/0386-ItemStack-damage-API.patch +++ b/patches/api/0386-ItemStack-damage-API.patch @@ -8,7 +8,7 @@ to simulate damage done to an itemstack and all the logic associated with damaging them diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 30e87d632d12326c70507b3ec9f464af1fb05650..4f32d5866b06a78d46db15158598d1e2beb377c1 100644 +index 6bfc8a2148f504370df938447f4f6b757f1a516b..208bab1f5a3200f54141c38ee4272629cfc66da5 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1365,4 +1365,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0388-Friction-API.patch b/patches/api/0388-Friction-API.patch index fee1e8ce76..4aab88652e 100644 --- a/patches/api/0388-Friction-API.patch +++ b/patches/api/0388-Friction-API.patch @@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5 /** * Gets the item stack associated with this item drop. diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 4f32d5866b06a78d46db15158598d1e2beb377c1..951d0960faff8357a42079e10367b2768de835f8 100644 +index 208bab1f5a3200f54141c38ee4272629cfc66da5..806bf6ca0dc87e1956084c61040a3d6139e8bc29 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0399-Add-Entity-Body-Yaw-API.patch b/patches/api/0399-Add-Entity-Body-Yaw-API.patch index b8527349d9..d1d983e166 100644 --- a/patches/api/0399-Add-Entity-Body-Yaw-API.patch +++ b/patches/api/0399-Add-Entity-Body-Yaw-API.patch @@ -53,7 +53,7 @@ index 5a80cf6b16c8fb0457421b7b694a06f43e5e902b..9e7b6ed599759de451429c99bc6876b8 // Paper start - Collision API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 951d0960faff8357a42079e10367b2768de835f8..bc577baad70cdea52aeaaf71d2e110286f9f4265 100644 +index 806bf6ca0dc87e1956084c61040a3d6139e8bc29..166b816f49d9918768f162b0b7134ffd266280f3 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1414,4 +1414,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch index 71e9937870..65345ce8c8 100644 --- a/patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index bc577baad70cdea52aeaaf71d2e110286f9f4265..4c0c548af4d2eff6fb6b6d11ba94a64db08ccb64 100644 +index 166b816f49d9918768f162b0b7134ffd266280f3..5f070c7563151c40cf4d691fc2a10d8a2766982a 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0443-add-missing-Experimental-annotations.patch b/patches/api/0443-add-missing-Experimental-annotations.patch index fb55944d12..57c8519b38 100644 --- a/patches/api/0443-add-missing-Experimental-annotations.patch +++ b/patches/api/0443-add-missing-Experimental-annotations.patch @@ -28,7 +28,7 @@ index 5269df59f0e8099a72c6b628ac1b8c84a0d1a5d5..775fda4b299e1d6dba9b293b2f98505e public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21")); } diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc08bf2a6e5 100644 +index fab8dfb1bd80490f6891687914997cc8580542cd..8e3ab18ca453f407c201e0838ce112dd5e73b830 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -145,54 +145,67 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla @@ -99,7 +99,15 @@ index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc0 CHISELED_TUFF_BRICKS(8601), DRIPSTONE_BLOCK(26227), /** -@@ -311,12 +324,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -299,6 +312,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + * BlockData: {@link Waterlogged} + */ + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + HEAVY_CORE(15788, Waterlogged.class), + AMETHYST_BLOCK(18919), + BUDDING_AMETHYST(13963), +@@ -311,12 +325,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla WEATHERED_COPPER(19699), OXIDIZED_COPPER(19490), @MinecraftExperimental @@ -116,7 +124,7 @@ index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc0 OXIDIZED_CHISELED_COPPER(27719), CUT_COPPER(32519), EXPOSED_CUT_COPPER(18000), -@@ -359,12 +376,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -359,12 +377,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla WAXED_WEATHERED_COPPER(5960), WAXED_OXIDIZED_COPPER(25626), @MinecraftExperimental @@ -133,7 +141,7 @@ index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc0 WAXED_OXIDIZED_CHISELED_COPPER(7735), WAXED_CUT_COPPER(11030), WAXED_EXPOSED_CUT_COPPER(30043), -@@ -2106,41 +2127,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2106,41 +2128,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link Door} */ @MinecraftExperimental @@ -183,7 +191,7 @@ index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc0 WAXED_OXIDIZED_COPPER_DOOR(23888, Door.class), /** * BlockData: {@link TrapDoor} -@@ -2194,41 +2223,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2194,41 +2224,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link TrapDoor} */ @MinecraftExperimental @@ -233,7 +241,7 @@ index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc0 WAXED_OXIDIZED_COPPER_TRAPDOOR(21450, TrapDoor.class), /** * BlockData: {@link Gate} -@@ -2530,6 +2567,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2530,6 +2568,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla EGG(21603, 16), COMPASS(24139), RECOVERY_COMPASS(12710), @@ -242,7 +250,7 @@ index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc0 BUNDLE(16835, 1), FISHING_ROD(4167, 1, 64), CLOCK(14980), -@@ -2636,6 +2675,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2636,6 +2676,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link Crafter} */ @MinecraftExperimental @@ -250,7 +258,7 @@ index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc0 CRAFTER(25243, Crafter.class), FILLED_MAP(23504), SHEARS(27971, 1, 238), -@@ -2676,8 +2716,10 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2676,8 +2717,10 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla BEE_SPAWN_EGG(22924), BLAZE_SPAWN_EGG(4759), @MinecraftExperimental @@ -261,7 +269,51 @@ index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc0 BREEZE_SPAWN_EGG(7580), CAT_SPAWN_EGG(29583), CAMEL_SPAWN_EGG(14760), -@@ -3189,88 +3231,106 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2754,10 +2797,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + EXPERIENCE_BOTTLE(12858), + FIRE_CHARGE(4842), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + WIND_CHARGE(23928), + WRITABLE_BOOK(13393, 1), + WRITTEN_BOOK(24164, 16), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + MACE(4771, 1, 250), + ITEM_FRAME(27318), + GLOW_ITEM_FRAME(26473), +@@ -3156,8 +3201,10 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + RAISER_ARMOR_TRIM_SMITHING_TEMPLATE(29116), + HOST_ARMOR_TRIM_SMITHING_TEMPLATE(12165), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + FLOW_ARMOR_TRIM_SMITHING_TEMPLATE(29175), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BOLT_ARMOR_TRIM_SMITHING_TEMPLATE(9698), + ANGLER_POTTERY_SHERD(9952), + ARCHER_POTTERY_SHERD(21629), +@@ -3168,9 +3215,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + DANGER_POTTERY_SHERD(30506), + EXPLORER_POTTERY_SHERD(5124), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + FLOW_POTTERY_SHERD(4896), + FRIEND_POTTERY_SHERD(18221), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + GUSTER_POTTERY_SHERD(28193), + HEART_POTTERY_SHERD(17607), + HEARTBREAK_POTTERY_SHERD(21108), +@@ -3180,6 +3229,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + PLENTY_POTTERY_SHERD(28236), + PRIZE_POTTERY_SHERD(4341), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + SCRAPE_POTTERY_SHERD(30034), + SHEAF_POTTERY_SHERD(23652), + SHELTER_POTTERY_SHERD(28390), +@@ -3189,99 +3239,121 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link Waterlogged} */ @MinecraftExperimental @@ -367,12 +419,27 @@ index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc0 + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_KEY(12725), @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OMINOUS_TRIAL_KEY(4986), + /** + * BlockData: {@link Vault} + */ + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + VAULT(6288, Vault.class), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + OMINOUS_BOTTLE(26321), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BREEZE_ROD(14281), + /** + * BlockData: {@link Levelled} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 690cf2aedf558396a71b20ba2b8ce737c61dfe43..13fc04abacd36af8755ec0061f4b652f1719d3e5 100644 +index 690cf2aedf558396a71b20ba2b8ce737c61dfe43..bf855d67eb022a35d1926553a43be8494d93fb4d 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java -@@ -129,14 +129,19 @@ public enum Particle implements Keyed { +@@ -129,33 +129,46 @@ public enum Particle implements Keyed { DUST_PLUME("dust_plume"), WHITE_SMOKE("white_smoke"), @MinecraftExperimental @@ -391,9 +458,36 @@ index 690cf2aedf558396a71b20ba2b8ce737c61dfe43..13fc04abacd36af8755ec0061f4b652f + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_SPAWNER_DETECTION("trial_spawner_detection"), @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_SPAWNER_DETECTION_OMINOUS("trial_spawner_detection_ominous"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + VAULT_CONNECTION("vault_connection"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + INFESTED("infested"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ITEM_COBWEB("item_cobweb"), + /** + * Uses {@link BlockData} as DataType + */ + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + DUST_PILLAR("dust_pillar", BlockData.class), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + OMINOUS_SPAWNING("ominous_spawning"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + RAID_OMEN("raid_omen"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + TRIAL_OMEN("trial_omen"), + /** + * Uses {@link BlockData} as DataType diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java -index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c942175093134 100644 +index ddc4c5097214371108dc945371e1d28811352c38..653e5eb126c599aac7de03f22b84d6cfafe48102 100644 --- a/src/main/java/org/bukkit/Sound.java +++ b/src/main/java/org/bukkit/Sound.java @@ -220,40 +220,56 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa @@ -453,7 +547,27 @@ index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c9421 BLOCK_COPPER_TRAPDOOR_OPEN("block.copper_trapdoor.open"), BLOCK_CORAL_BLOCK_BREAK("block.coral_block.break"), BLOCK_CORAL_BLOCK_FALL("block.coral_block.fall"), -@@ -546,14 +562,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa +@@ -360,14 +376,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + BLOCK_HANGING_SIGN_STEP("block.hanging_sign.step"), + BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL("block.hanging_sign.waxed_interact_fail"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_HEAVY_CORE_BREAK("block.heavy_core.break"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_HEAVY_CORE_FALL("block.heavy_core.fall"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_HEAVY_CORE_HIT("block.heavy_core.hit"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_HEAVY_CORE_PLACE("block.heavy_core.place"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_HEAVY_CORE_STEP("block.heavy_core.step"), + BLOCK_HONEY_BLOCK_BREAK("block.honey_block.break"), + BLOCK_HONEY_BLOCK_FALL("block.honey_block.fall"), +@@ -546,14 +567,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa BLOCK_POLISHED_DEEPSLATE_PLACE("block.polished_deepslate.place"), BLOCK_POLISHED_DEEPSLATE_STEP("block.polished_deepslate.step"), @MinecraftExperimental @@ -473,7 +587,7 @@ index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c9421 BLOCK_POLISHED_TUFF_STEP("block.polished_tuff.step"), BLOCK_PORTAL_AMBIENT("block.portal.ambient"), BLOCK_PORTAL_TRAVEL("block.portal.travel"), -@@ -701,34 +722,46 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa +@@ -701,34 +727,46 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa @MinecraftExperimental BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM("block.trial_spawner.about_to_spawn_item"), @MinecraftExperimental @@ -520,7 +634,7 @@ index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c9421 BLOCK_TRIAL_SPAWNER_STEP("block.trial_spawner.step"), BLOCK_TRIPWIRE_ATTACH("block.tripwire.attach"), BLOCK_TRIPWIRE_CLICK_OFF("block.tripwire.click_off"), -@@ -736,14 +769,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa +@@ -736,44 +774,62 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa BLOCK_TRIPWIRE_DETACH("block.tripwire.detach"), BLOCK_TUFF_BREAK("block.tuff.break"), @MinecraftExperimental @@ -540,7 +654,50 @@ index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c9421 BLOCK_TUFF_BRICKS_STEP("block.tuff_bricks.step"), BLOCK_TUFF_FALL("block.tuff.fall"), BLOCK_TUFF_HIT("block.tuff.hit"), -@@ -874,36 +912,51 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + BLOCK_TUFF_PLACE("block.tuff.place"), + BLOCK_TUFF_STEP("block.tuff.step"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_ACTIVATE("block.vault.activate"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_AMBIENT("block.vault.ambient"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_BREAK("block.vault.break"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_CLOSE_SHUTTER("block.vault.close_shutter"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_DEACTIVATE("block.vault.deactivate"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_EJECT_ITEM("block.vault.eject_item"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_FALL("block.vault.fall"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_HIT("block.vault.hit"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_INSERT_ITEM("block.vault.insert_item"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_INSERT_ITEM_FAIL("block.vault.insert_item_fail"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_OPEN_SHUTTER("block.vault.open_shutter"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_PLACE("block.vault.place"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_VAULT_STEP("block.vault.step"), + BLOCK_VINE_BREAK("block.vine.break"), + BLOCK_VINE_FALL("block.vine.fall"), +@@ -874,40 +930,58 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"), ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"), @MinecraftExperimental @@ -565,6 +722,7 @@ index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c9421 + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_DEATH("entity.breeze.death"), @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_DEFLECT("entity.breeze.deflect"), @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation @@ -591,16 +749,50 @@ index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c9421 + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_SLIDE("entity.breeze.slide"), @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_WHIRL("entity.breeze.whirl"), -@@ -1209,6 +1262,7 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ENTITY_BREEZE_WIND_BURST("entity.breeze.wind_burst"), + ENTITY_CAMEL_AMBIENT("entity.camel.ambient"), + ENTITY_CAMEL_DASH("entity.camel.dash"), +@@ -1207,8 +1281,10 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + ENTITY_PARROT_HURT("entity.parrot.hurt"), + ENTITY_PARROT_IMITATE_BLAZE("entity.parrot.imitate.blaze"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_PARROT_IMITATE_BOGGED("entity.parrot.imitate.bogged"), @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_PARROT_IMITATE_BREEZE("entity.parrot.imitate.breeze"), ENTITY_PARROT_IMITATE_CREEPER("entity.parrot.imitate.creeper"), ENTITY_PARROT_IMITATE_DROWNED("entity.parrot.imitate.drowned"), -@@ -1591,10 +1645,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa +@@ -1488,8 +1564,10 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + ENTITY_WARDEN_STEP("entity.warden.step"), + ENTITY_WARDEN_TENDRIL_CLICKS("entity.warden.tendril_clicks"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ENTITY_WIND_CHARGE_THROW("entity.wind_charge.throw"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ENTITY_WIND_CHARGE_WIND_BURST("entity.wind_charge.wind_burst"), + ENTITY_WITCH_AMBIENT("entity.witch.ambient"), + ENTITY_WITCH_CELEBRATE("entity.witch.celebrate"), +@@ -1546,10 +1624,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + ENTITY_ZOMBIFIED_PIGLIN_DEATH("entity.zombified_piglin.death"), + ENTITY_ZOMBIFIED_PIGLIN_HURT("entity.zombified_piglin.hurt"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + EVENT_MOB_EFFECT_BAD_OMEN("event.mob_effect.bad_omen"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + EVENT_MOB_EFFECT_RAID_OMEN("event.mob_effect.raid_omen"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + EVENT_MOB_EFFECT_TRIAL_OMEN("event.mob_effect.trial_omen"), + EVENT_RAID_HORN("event.raid.horn"), + INTENTIONALLY_EMPTY("intentionally_empty"), +@@ -1591,10 +1672,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa ITEM_BUCKET_FILL_POWDER_SNOW("item.bucket.fill_powder_snow"), ITEM_BUCKET_FILL_TADPOLE("item.bucket.fill_tadpole"), @MinecraftExperimental @@ -614,6 +806,23 @@ index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c9421 ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"), ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"), ITEM_CROP_PLANT("item.crop.plant"), +@@ -1649,12 +1733,16 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + ITEM_TRIDENT_THROW("item.trident.throw"), + ITEM_TRIDENT_THUNDER("item.trident.thunder"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ITEM_WOLF_ARMOR_BREAK("item.wolf_armor.break"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ITEM_WOLF_ARMOR_CRACK("item.wolf_armor.crack"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ITEM_WOLF_ARMOR_DAMAGE("item.wolf_armor.damage"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ITEM_WOLF_ARMOR_REPAIR("item.wolf_armor.repair"), + MUSIC_CREATIVE("music.creative"), + MUSIC_CREDITS("music.credits"), diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java index cb5890e0e7bccfee2ba32dd4776f1ae1fdd539e8..7f1dc4288c2d324281e11dc582b6f4ef54bde632 100644 --- a/src/main/java/org/bukkit/Tag.java @@ -647,7 +856,7 @@ index 65d3d8fd5f00114dc388d65321a9affe1b32ce20..8e39f282c771ddafe5d890dcf065c56f private static Structure getStructure(String name) { diff --git a/src/main/java/org/bukkit/loot/LootTables.java b/src/main/java/org/bukkit/loot/LootTables.java -index 0a3bce3b9d27e6a978e0c40d9f16afb8b2e14e9b..a29b4e72de9d9d605a227c3cf66fc9f180750d27 100644 +index 0a3bce3b9d27e6a978e0c40d9f16afb8b2e14e9b..49e3ff6725c656ace6040312a866063494878a5b 100644 --- a/src/main/java/org/bukkit/loot/LootTables.java +++ b/src/main/java/org/bukkit/loot/LootTables.java @@ -35,38 +35,55 @@ public enum LootTables implements Keyed { @@ -706,7 +915,7 @@ index 0a3bce3b9d27e6a978e0c40d9f16afb8b2e14e9b..a29b4e72de9d9d605a227c3cf66fc9f1 TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"), @MinecraftExperimental EQUIPMENT_TRIAL_CHAMBER("equipment/trial_chamber"), -@@ -201,8 +218,10 @@ public enum LootTables implements Keyed { +@@ -201,14 +218,19 @@ public enum LootTables implements Keyed { PIGLIN_BARTERING("gameplay/piglin_bartering"), // Spawners @MinecraftExperimental @@ -716,4 +925,34 @@ index 0a3bce3b9d27e6a978e0c40d9f16afb8b2e14e9b..a29b4e72de9d9d605a227c3cf66fc9f1 + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"), @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OMINOUS_TRIAL_CHAMBER_KEY("spawners/ominous/trial_chamber/key"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + OMINOUS_TRIAL_CHAMBER_CONSUMABLES("spawners/ominous/trial_chamber/consumables"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS("spawners/trial_chamber/items_to_drop_when_ominous"), + // Shearing + SHEARING_BOGGED("shearing/bogged"), +diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java +index 310833ace16b541392b92d12967f75039990b341..4649cc5c1fa690de34ed540e33c20f9bf0b17835 100644 +--- a/src/main/java/org/bukkit/potion/PotionType.java ++++ b/src/main/java/org/bukkit/potion/PotionType.java +@@ -59,12 +59,16 @@ public enum PotionType implements Keyed { + SLOW_FALLING("slow_falling"), + LONG_SLOW_FALLING("long_slow_falling"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + WIND_CHARGED("wind_charged"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + WEAVING("weaving"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + OOZING("oozing"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + INFESTED("infested"), + ; + diff --git a/patches/api/0449-Add-HiddenPotionEffect-API.patch b/patches/api/0449-Add-HiddenPotionEffect-API.patch index 39363e9c3f..30a7bc6c0e 100644 --- a/patches/api/0449-Add-HiddenPotionEffect-API.patch +++ b/patches/api/0449-Add-HiddenPotionEffect-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 4c0c548af4d2eff6fb6b6d11ba94a64db08ccb64..9a5873120e263d77d84183d1909e672f2b303a74 100644 +index 5f070c7563151c40cf4d691fc2a10d8a2766982a..b777e530122549455dcce6fac8d4a151c1c0af42 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource