diff options
Diffstat (limited to 'patches/api/0166-Fix-Spigot-annotation-mistakes.patch')
-rw-r--r-- | patches/api/0166-Fix-Spigot-annotation-mistakes.patch | 624 |
1 files changed, 312 insertions, 312 deletions
diff --git a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch index bc117b0fdf..cecb58ef75 100644 --- a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch @@ -12,7 +12,7 @@ that continues to have use (internally). These do not help plugin developers if they bring moise noise than value. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f9067281bd5f1ac11dcb9cc2e19f3c5f17face21..03e836b9c2e6d141396cfe4a0034c5dcdcaf9e90 100644 +index e0b22dd1124f02a78e5adfcf2179eadebff1dba6..0d743a27e0955af7b1baee49ce7e62e993a0a8b8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -883,9 +883,8 @@ public final class Bukkit { @@ -21,8 +21,8 @@ index f9067281bd5f1ac11dcb9cc2e19f3c5f17face21..03e836b9c2e6d141396cfe4a0034c5dc * @return a map view if it exists, or null otherwise - * @deprecated Magic value */ -- @Deprecated -+ //@Deprecated // Paper - Not a magic value +- @Deprecated(since = "1.6.2") ++ // @Deprecated(since = "1.6.2") // Paper - Not a magic value @Nullable public static MapView getMap(int id) { return server.getMap(id); @@ -48,8 +48,8 @@ index f9067281bd5f1ac11dcb9cc2e19f3c5f17face21..03e836b9c2e6d141396cfe4a0034c5dc - * @deprecated Persistent storage of users should be by UUID as names are no longer - * unique past a single session. */ -- @Deprecated -+ // @Deprecated // Paper +- @Deprecated(since = "1.7.5") ++ // @Deprecated(since = "1.7.5") // Paper @NotNull public static OfflinePlayer getOfflinePlayer(@NotNull String name) { return server.getOfflinePlayer(name); @@ -63,7 +63,7 @@ index f9067281bd5f1ac11dcb9cc2e19f3c5f17face21..03e836b9c2e6d141396cfe4a0034c5dc return server.getScoreboardManager(); } diff --git a/src/main/java/org/bukkit/CoalType.java b/src/main/java/org/bukkit/CoalType.java -index c07499dbdd49d70717dbd674d97b6dbcfd7e9d5b..039b71c6471d00123226edda0fe839fd946029c4 100644 +index 082632bcfa16342abf811aae30fcb280029ca1cf..ede570814963a0fb93e2e5affa54439880cd685b 100644 --- a/src/main/java/org/bukkit/CoalType.java +++ b/src/main/java/org/bukkit/CoalType.java @@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable; @@ -75,7 +75,7 @@ index c07499dbdd49d70717dbd674d97b6dbcfd7e9d5b..039b71c6471d00123226edda0fe839fd COAL(0x0), CHARCOAL(0x1); diff --git a/src/main/java/org/bukkit/CropState.java b/src/main/java/org/bukkit/CropState.java -index fb4832fb796a38c0f5f51cf80a67259924f2c607..a4f88f4420b855a08f98b77fa1ff35dcec9da8a9 100644 +index c36e0ffe9b1d637d2fe3192a21f585e44437f48b..9420e919088392c6aac4114356af7a2096478195 100644 --- a/src/main/java/org/bukkit/CropState.java +++ b/src/main/java/org/bukkit/CropState.java @@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable; @@ -87,7 +87,7 @@ index fb4832fb796a38c0f5f51cf80a67259924f2c607..a4f88f4420b855a08f98b77fa1ff35dc /** diff --git a/src/main/java/org/bukkit/Difficulty.java b/src/main/java/org/bukkit/Difficulty.java -index 3f6cbefc2b1414ba2dad709e79288013b3ef73be..f35801783538d3377b04131b8bf6effd7eb8e1a5 100644 +index c1f1f29b70311ae51e4ce1be455b6557eb5fcc06..f35801783538d3377b04131b8bf6effd7eb8e1a5 100644 --- a/src/main/java/org/bukkit/Difficulty.java +++ b/src/main/java/org/bukkit/Difficulty.java @@ -44,9 +44,9 @@ public enum Difficulty { @@ -97,7 +97,7 @@ index 3f6cbefc2b1414ba2dad709e79288013b3ef73be..f35801783538d3377b04131b8bf6effd - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public int getValue() { return value; @@ -109,13 +109,13 @@ index 3f6cbefc2b1414ba2dad709e79288013b3ef73be..f35801783538d3377b04131b8bf6effd - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static Difficulty getByValue(final int value) { return BY_ID.get(value); diff --git a/src/main/java/org/bukkit/DyeColor.java b/src/main/java/org/bukkit/DyeColor.java -index bd213cabddd8752e609544f24cfba95405726155..47df858e095c4423c20e49e029d72f0f50d2c924 100644 +index 807747db77d1e4d008c3e4086f9bf65415020cad..2f038f233afd4210687586800070d5f61e40562a 100644 --- a/src/main/java/org/bukkit/DyeColor.java +++ b/src/main/java/org/bukkit/DyeColor.java @@ -96,9 +96,9 @@ public enum DyeColor { @@ -125,7 +125,7 @@ index bd213cabddd8752e609544f24cfba95405726155..47df858e095c4423c20e49e029d72f0f - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public byte getWoolData() { return woolData; @@ -137,7 +137,7 @@ index bd213cabddd8752e609544f24cfba95405726155..47df858e095c4423c20e49e029d72f0f - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static DyeColor getByWoolData(final byte data) { @@ -149,13 +149,13 @@ index bd213cabddd8752e609544f24cfba95405726155..47df858e095c4423c20e49e029d72f0f - * @deprecated legacy use only + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.13") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @NotNull public static DyeColor legacyValueOf(@Nullable String name) { return "SILVER".equals(name) ? DyeColor.LIGHT_GRAY : DyeColor.valueOf(name); diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java -index 0d0777771485a76d960da2f16e963b19d2cf6c2d..fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38 100644 +index c19620185026b8a6c535c9d328473699ad15a26e..d63395e588ec0d2ce7303379c9bee56cf7c33064 100644 --- a/src/main/java/org/bukkit/Effect.java +++ b/src/main/java/org/bukkit/Effect.java @@ -357,9 +357,9 @@ public enum Effect { @@ -165,7 +165,7 @@ index 0d0777771485a76d960da2f16e963b19d2cf6c2d..fd9cf25f2fdef5ee3b7143f27e5f43df - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public int getId() { return this.id; @@ -177,13 +177,13 @@ index 0d0777771485a76d960da2f16e963b19d2cf6c2d..fd9cf25f2fdef5ee3b7143f27e5f43df - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static Effect getById(int id) { return BY_ID.get(id); diff --git a/src/main/java/org/bukkit/EntityEffect.java b/src/main/java/org/bukkit/EntityEffect.java -index 9db85b2f6ffd56bbc4db1f75f8769f1c15d5950f..5341957b10cccd7bce5a7595699b1d90412a01d0 100644 +index 5b8dc0c5c2c062f8fe7bff9546c2cb5ed6c714c2..d7ccccdf3f5e2c572efd528a92e240ec6ea60028 100644 --- a/src/main/java/org/bukkit/EntityEffect.java +++ b/src/main/java/org/bukkit/EntityEffect.java @@ -345,9 +345,9 @@ public enum EntityEffect { @@ -193,13 +193,13 @@ index 9db85b2f6ffd56bbc4db1f75f8769f1c15d5950f..5341957b10cccd7bce5a7595699b1d90 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public byte getData() { return data; } diff --git a/src/main/java/org/bukkit/GameMode.java b/src/main/java/org/bukkit/GameMode.java -index 938c3217f92e6d3ef9a637269c469f8359af6347..81e45984a88fc84acd0f76d825abf4ddaed0ac3b 100644 +index 3d693c42a8e277425a768ceaed9b40bc3d6cfba8..81e45984a88fc84acd0f76d825abf4ddaed0ac3b 100644 --- a/src/main/java/org/bukkit/GameMode.java +++ b/src/main/java/org/bukkit/GameMode.java @@ -44,9 +44,9 @@ public enum GameMode { @@ -209,7 +209,7 @@ index 938c3217f92e6d3ef9a637269c469f8359af6347..81e45984a88fc84acd0f76d825abf4dd - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public int getValue() { return value; @@ -221,13 +221,13 @@ index 938c3217f92e6d3ef9a637269c469f8359af6347..81e45984a88fc84acd0f76d825abf4dd - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static GameMode getByValue(final int value) { return BY_ID.get(value); diff --git a/src/main/java/org/bukkit/GrassSpecies.java b/src/main/java/org/bukkit/GrassSpecies.java -index f9c9ae463aacd593e3aa9caf037ea1e23d56c780..38ccfd0a1b38e7a87185e668d3c020816c68a66b 100644 +index 9b6d8134f1b1b12e23dcd7e76cba1b78e20e360c..43da0eb033f7cb65e3b2cacd67946bc9dc187678 100644 --- a/src/main/java/org/bukkit/GrassSpecies.java +++ b/src/main/java/org/bukkit/GrassSpecies.java @@ -6,7 +6,9 @@ import org.jetbrains.annotations.Nullable; @@ -272,7 +272,7 @@ index b02efba048be00e42502111fcdd2297529926666..fb4b6f0e908ffa50c3b2f8d04d9f3810 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 6ebf024d5c2d5fc7253319b68ceed212de1cd73d..309a79cbe65498c90d9e135607bc246688ac6274 100644 +index 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb341c8eb3b 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -4867,20 +4867,20 @@ public enum Material implements Keyed, Translatable { @@ -282,7 +282,7 @@ index 6ebf024d5c2d5fc7253319b68ceed212de1cd73d..309a79cbe65498c90d9e135607bc2466 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @ApiStatus.Internal // Paper public int getId() { Preconditions.checkArgument(legacy, "Cannot get ID of Modern Material"); @@ -295,8 +295,8 @@ index 6ebf024d5c2d5fc7253319b68ceed212de1cd73d..309a79cbe65498c90d9e135607bc2466 * * @return legacy status */ -- @Deprecated -+ // @Deprecated // Paper - this is useful, don't deprecate +- @Deprecated(since = "1.13") ++ // @Deprecated(since = "1.13") // Paper - this is useful, don't deprecate public boolean isLegacy() { return legacy; } @@ -324,7 +324,7 @@ index 6ebf024d5c2d5fc7253319b68ceed212de1cd73d..309a79cbe65498c90d9e135607bc2466 BlockType type = asBlockType(); return type != null && type.isInteractable(); diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java -index 9b61129c3ef83d0bfceba54aba2effa12bc90678..cbdaa121dbc1876d0cd55f4b7b57f283ecaa8f1a 100644 +index 499c2293fe2eea3eaf7ede476e836704e13e5a02..ceb1009252e25e244baab9208b7494666aebc508 100644 --- a/src/main/java/org/bukkit/NamespacedKey.java +++ b/src/main/java/org/bukkit/NamespacedKey.java @@ -74,12 +74,14 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap @@ -361,7 +361,7 @@ index f43209cf7b752c26718c303ca8c3e1c7d9912ad3..d6c09d88189b3e9ecc629d8cf18a2b81 /** diff --git a/src/main/java/org/bukkit/Note.java b/src/main/java/org/bukkit/Note.java -index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f7f412399 100644 +index 3ecd0f34b7221bd80305f6cbf4a0e8397b7ba0a2..aff858346776386f1288b648b221404f7f412399 100644 --- a/src/main/java/org/bukkit/Note.java +++ b/src/main/java/org/bukkit/Note.java @@ -39,9 +39,9 @@ public class Note { @@ -371,7 +371,7 @@ index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public byte getId() { return getId(false); @@ -383,7 +383,7 @@ index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public byte getId(boolean sharped) { byte id = (byte) (sharped && sharpable ? this.id + 1 : this.id); @@ -395,7 +395,7 @@ index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public boolean isSharped(byte id) { if (id == getId(false)) { @@ -407,7 +407,7 @@ index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static Tone getById(byte id) { @@ -419,7 +419,7 @@ index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public byte getId() { return note; @@ -456,7 +456,7 @@ index f0e806865910578110f4794f7ebe93640516e7c1..b4f297f90e3c1deaa1fc3f4418418588 Preconditions.checkArgument(input != null, "input must not be null"); diff --git a/src/main/java/org/bukkit/SandstoneType.java b/src/main/java/org/bukkit/SandstoneType.java -index 6277451c3c6c551078c237cd767b6d70c4f585ea..7d33b3e2f81c14d3aeb800b39e7823831ecc39e4 100644 +index 2306c5a6a6e3f27e580b024d5418c4944c75e881..d2ea2c81f94093414399512e289cea6c12855ec2 100644 --- a/src/main/java/org/bukkit/SandstoneType.java +++ b/src/main/java/org/bukkit/SandstoneType.java @@ -6,7 +6,9 @@ import org.jetbrains.annotations.Nullable; @@ -470,7 +470,7 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..7d33b3e2f81c14d3aeb800b39e782383 CRACKED(0x0), GLYPHED(0x1), diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 2719461e49a74f979d49dea9c664dfe3da8d2c8e..44ebe899f4278b8f7422385710bdc180375475fd 100644 +index 7b5f6091c8e930526a2a5346a02b52912c38e2af..03d6e69b1771b1aabc22d680d8123239f7863e20 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -744,9 +744,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -479,8 +479,8 @@ index 2719461e49a74f979d49dea9c664dfe3da8d2c8e..44ebe899f4278b8f7422385710bdc180 * @return a map view if it exists, or null otherwise - * @deprecated Magic value */ -- @Deprecated -+ //@Deprecated // Paper - Not a magic value +- @Deprecated(since = "1.6.2") ++ // @Deprecated(since = "1.6.2") // Paper - Not a magic value @Nullable public MapView getMap(int id); @@ -506,8 +506,8 @@ index 2719461e49a74f979d49dea9c664dfe3da8d2c8e..44ebe899f4278b8f7422385710bdc180 - * @deprecated Persistent storage of users should be by UUID as names are no longer - * unique past a single session. */ -- @Deprecated -+ // @Deprecated // Paper +- @Deprecated(since = "1.7.5") ++ // @Deprecated(since = "1.7.5") // Paper @NotNull public OfflinePlayer getOfflinePlayer(@NotNull String name); @@ -521,33 +521,33 @@ index 2719461e49a74f979d49dea9c664dfe3da8d2c8e..44ebe899f4278b8f7422385710bdc180 /** diff --git a/src/main/java/org/bukkit/SkullType.java b/src/main/java/org/bukkit/SkullType.java -index 49f2f1128892fa991ed18785cd954b07ddd8e51a..08a946aaf29726d19be970c19d0bbbc59dd21efe 100644 +index 9b9769429470d7a3ac9c4498f896dd26d0474570..d2135724fb175674b4649b9e775d762d7fcc897e 100644 --- a/src/main/java/org/bukkit/SkullType.java +++ b/src/main/java/org/bukkit/SkullType.java @@ -4,7 +4,7 @@ package org.bukkit; * Represents the different types of skulls. * @deprecated check {@link Material} instead */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.13") ++@Deprecated(since = "1.13", forRemoval = true) public enum SkullType { SKELETON, WITHER, diff --git a/src/main/java/org/bukkit/TreeSpecies.java b/src/main/java/org/bukkit/TreeSpecies.java -index 01285301621c88c9e383e18c46eabd302341a338..57e010a57f804bd9f2a78710d6f52928ad476197 100644 +index 9203f396c84746c584f760987d4a47377633b0e7..abbe7c3b2984dc03098780d5678553685ea78dc4 100644 --- a/src/main/java/org/bukkit/TreeSpecies.java +++ b/src/main/java/org/bukkit/TreeSpecies.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.Nullable; * * @deprecated Deprecated, see usage methods for replacement(s) */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.19") +-@Deprecated(since = "1.19") ++@Deprecated(since = "1.19", forRemoval = true) public enum TreeSpecies { /** diff --git a/src/main/java/org/bukkit/UndefinedNullability.java b/src/main/java/org/bukkit/UndefinedNullability.java -index 4d4265c237179470e1fd017721a8dd595f114013..3babc9df26276300392d3f92ee6e317c33643b0b 100644 +index 3f0ea49056c4bc8aeb8e59743807e72baea554cc..ce93ac1ada2c4058733c1952f6df8324fc78774b 100644 --- a/src/main/java/org/bukkit/UndefinedNullability.java +++ b/src/main/java/org/bukkit/UndefinedNullability.java @@ -14,6 +14,7 @@ import org.jetbrains.annotations.ApiStatus; @@ -556,7 +556,7 @@ index 4d4265c237179470e1fd017721a8dd595f114013..3babc9df26276300392d3f92ee6e317c @Retention(RetentionPolicy.CLASS) [email protected] // Paper @ApiStatus.Internal - @Deprecated + @Deprecated(since = "1.13.2") public @interface UndefinedNullability { diff --git a/src/main/java/org/bukkit/Vibration.java b/src/main/java/org/bukkit/Vibration.java index e455eb21abf121dc6ff10ff8a13dd06f67096a8f..bbc01e7c192ae6689c301670047ff114306c57cb 100644 @@ -590,7 +590,7 @@ index e455eb21abf121dc6ff10ff8a13dd06f67096a8f..bbc01e7c192ae6689c301670047ff114 return origin; } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index a8fe8c2f4327f0bee60eeac565620117f3fde2ee..7ef12976430272d814374ee066e975457111b7f3 100644 +index 10e9981c9068c39dfdda5c9f82558d481288a8c6..85900b9f41379d9c8366ae9f2f9e94f54f504ffb 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -418,9 +418,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @@ -599,8 +599,8 @@ index a8fe8c2f4327f0bee60eeac565620117f3fde2ee..7ef12976430272d814374ee066e97545 * - * @deprecated This method is not guaranteed to work suitably across all client implementations. */ -- @Deprecated -+ //@Deprecated // Paper +- @Deprecated(since = "1.8") ++ // @Deprecated(since = "1.8") // Paper public boolean refreshChunk(int x, int z); /** @@ -631,7 +631,7 @@ index a8fe8c2f4327f0bee60eeac565620117f3fde2ee..7ef12976430272d814374ee066e97545 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public int getId() { return id; @@ -643,13 +643,13 @@ index a8fe8c2f4327f0bee60eeac565620117f3fde2ee..7ef12976430272d814374ee066e97545 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static Environment getEnvironment(int id) { return lookup.get(id); diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index bb3cf2c5e2acbcd7cf53ad8551a5b11fa6104ada..e4393f2bd71308a58305cb870271d6a647ffcd92 100644 +index a5b03162e5c0484db57d0ce0e57e945840fe1357..2566c7bb9e770483abdd3398af13179dc747b682 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -526,7 +526,7 @@ public interface Block extends Metadatable, Translatable { @@ -662,7 +662,7 @@ index bb3cf2c5e2acbcd7cf53ad8551a5b11fa6104ada..e4393f2bd71308a58305cb870271d6a6 /** * Returns if the given item is a preferred choice to break this Block. diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java -index 3e07fc1bc0e08d0cfd998711c7fd547b2b7b6b73..f4a739d8022d19a7ae0ee9bf93eb5c4846b4bd40 100644 +index dd1e7b71d7d332b3e22189c7e0eda6d47ec49e55..555d0492c2fcf85c1e2f95f145b974cb75bc5ecc 100644 --- a/src/main/java/org/bukkit/block/BlockState.java +++ b/src/main/java/org/bukkit/block/BlockState.java @@ -36,8 +36,10 @@ public interface BlockState extends Metadatable { @@ -687,7 +687,7 @@ index 3e07fc1bc0e08d0cfd998711c7fd547b2b7b6b73..f4a739d8022d19a7ae0ee9bf93eb5c48 /** diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java -index cd575a28733a101b3b18ecdeb28ce474413045d6..5ba088456e2c647a719c4ee1e6f006f5c1cca651 100644 +index aea98cddf2433fff6066124f880bb80e1c32fa17..f5b047345639cf8e55354cc514d18fd80ff1b712 100644 --- a/src/main/java/org/bukkit/block/BlockType.java +++ b/src/main/java/org/bukkit/block/BlockType.java @@ -3576,9 +3576,14 @@ public interface BlockType extends Keyed, Translatable { @@ -719,7 +719,7 @@ index 4bd127b3646307398e0c937c3e36ab671235b72b..f2557a87f468ee20c2d276dbfc0e9a97 /** diff --git a/src/main/java/org/bukkit/block/PistonMoveReaction.java b/src/main/java/org/bukkit/block/PistonMoveReaction.java -index b90f5dc345ad2cdd3ae353dc57f42a14c231d18a..a7b915ded9154d53ac8ca599119c1699cfca2265 100644 +index c171f89ea418a3c4eb64436d08486df56d7cf74f..a7b915ded9154d53ac8ca599119c1699cfca2265 100644 --- a/src/main/java/org/bukkit/block/PistonMoveReaction.java +++ b/src/main/java/org/bukkit/block/PistonMoveReaction.java @@ -48,9 +48,9 @@ public enum PistonMoveReaction { @@ -729,7 +729,7 @@ index b90f5dc345ad2cdd3ae353dc57f42a14c231d18a..a7b915ded9154d53ac8ca599119c1699 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public int getId() { return this.id; @@ -741,38 +741,38 @@ index b90f5dc345ad2cdd3ae353dc57f42a14c231d18a..a7b915ded9154d53ac8ca599119c1699 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static PistonMoveReaction getById(int id) { return byId.get(id); diff --git a/src/main/java/org/bukkit/block/SuspiciousSand.java b/src/main/java/org/bukkit/block/SuspiciousSand.java -index a7c4e4baf14dd64e454028002c1c5d4f83ec1659..53c61cfa4c2cdc3adfe1c5b43fb15eebeb4b74d1 100644 +index 3b5f6341c8ffdd356084462c86f26b1d2ddc512f..b223318c48812ca5ee82b8970c59fa19af9c7044 100644 --- a/src/main/java/org/bukkit/block/SuspiciousSand.java +++ b/src/main/java/org/bukkit/block/SuspiciousSand.java @@ -5,6 +5,6 @@ package org.bukkit.block; * * @see BrushableBlock */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.20") +-@Deprecated(since = "1.20") ++@Deprecated(since = "1.20", forRemoval = true) public interface SuspiciousSand extends BrushableBlock { } diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index 378ef178bdcf0d71b5d80fc5028ce738437f9391..25985a3872ac142c0a3b2fb2dc5387ecdd3ff5b3 100644 +index 4d8defb32544c4cb972d257f58e4eabbc14a2176..3ba81dc0e6bb907ca0ff2215ec1ac68ef0726352 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java @@ -263,7 +263,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 +- @Deprecated(since = "1.20.5") ++ @Deprecated(since = "1.20.5", forRemoval = true) @org.jetbrains.annotations.Contract("-> fail") // Paper public abstract EnchantmentTarget getItemTarget(); /** diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index 493f81ba879d1eb29a32722da27e4ff7ce4c68a8..8bf9bf7940d2911486e9d3a4f688cfae3f6173f2 100644 +index c901990454ec930169b0dc561987bea101f9b6ae..ebb6976aba314f592459cdfa49f6c15079207fd2 100644 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java @@ -157,7 +157,7 @@ public interface AbstractArrow extends Projectile { @@ -809,7 +809,7 @@ index 3afe2787de576f7190d87c796bea0ab34dc30248..875817b807c9f515eb07b03cc85d3689 /** diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 17d9669be0eb48e54b230ad15e66463167cfb7d6..e758a13ea84f472dcdf7fe31e2ea23c0e554c4c7 100644 +index 10c957a6bb6227d6c6109085a3b8c3fa5944277c..122ee01c4664617bb1b691d5ff24427abdbedcf2 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java @@ -428,9 +428,9 @@ public enum EntityType implements Keyed, Translatable { @@ -819,7 +819,7 @@ index 17d9669be0eb48e54b230ad15e66463167cfb7d6..e758a13ea84f472dcdf7fe31e2ea23c0 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Contract("null -> null") @Nullable @@ -838,7 +838,7 @@ index bd718c1cf6f20cd716d2fac11556437b4a5aab2e..586ac8abbd1a0f2724fdfadc01370cb6 /** diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java -index b27447d7a2833f84cf05946c851f5b6740a578e3..5afeb2f6c82e8f752229462c2d7846f6ae7a4b44 100644 +index 186d0bbfca0320c1b3b18733254ddda6b7e6940c..608628b6328e4235fe2be0e4189babb5188361aa 100644 --- a/src/main/java/org/bukkit/entity/LightningStrike.java +++ b/src/main/java/org/bukkit/entity/LightningStrike.java @@ -84,6 +84,10 @@ public interface LightningStrike extends Entity { @@ -866,7 +866,7 @@ index b27447d7a2833f84cf05946c851f5b6740a578e3..5afeb2f6c82e8f752229462c2d7846f6 // Spigot end } diff --git a/src/main/java/org/bukkit/entity/LingeringPotion.java b/src/main/java/org/bukkit/entity/LingeringPotion.java -index bafef53c1d449135f1300c8c8fbb06f482ba67e1..f50aaddf8582be55fd4860ad374d8f2206991897 100644 +index 949ba8410cf89f0d31fc72ac05b5aa929919d9e2..ad8519ab9b4198b09a8c4d6e08deae7c066b0ee0 100644 --- a/src/main/java/org/bukkit/entity/LingeringPotion.java +++ b/src/main/java/org/bukkit/entity/LingeringPotion.java @@ -3,7 +3,8 @@ package org.bukkit.entity; @@ -877,11 +877,11 @@ index bafef53c1d449135f1300c8c8fbb06f482ba67e1..f50aaddf8582be55fd4860ad374d8f22 + * @deprecated should not be used for anything, use {@link ThrownPotion} and + * set the potion via the methods there. */ --@Deprecated -+@Deprecated(forRemoval = true) // Paper +-@Deprecated(since = "1.20.5") ++@Deprecated(since = "1.20.5", 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 9e0137ea412ec8c65b2903a76499ba8222446ea3..db7dafba43b50146a32d749ec043c5d548b0d6e3 100644 +index 775f18abe007edc73ed60eb45f84bd79912f9331..72b83dedf025ef971b89e2c6a19fd411488948b7 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 @@ -898,8 +898,8 @@ index 9e0137ea412ec8c65b2903a76499ba8222446ea3..db7dafba43b50146a32d749ec043c5d5 * @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 +- @Deprecated(since = "1.20.5") ++ @Deprecated(since = "1.20.5", forRemoval = true) @org.jetbrains.annotations.Contract("-> fail") // Paper public EntityCategory getCategory(); /** @@ -942,7 +942,7 @@ index 60522888bc320ba0a55655532e19185fac816bd1..4aa07d4edb2c81d0ae7999b30ad53ff8 /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 76ffe308ae2e3bc36c0e7e1a98adc4b307f4211f..80e894e3d625cde14bfe881d2c367b43a4882cfd 100644 +index f84c55b9a93aae762ed28cc536eccbd7a503177a..70fef7c72b4ea24b8fd3bd99cb8f6f37b3b9832b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1680,11 +1680,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -959,15 +959,15 @@ index 76ffe308ae2e3bc36c0e7e1a98adc4b307f4211f..80e894e3d625cde14bfe881d2c367b43 /** diff --git a/src/main/java/org/bukkit/entity/Projectile.java b/src/main/java/org/bukkit/entity/Projectile.java -index 906b33b7569fff5dd78258f9765e879180a52834..06e3ad9cd8f39de0ef6ead794df1492415bc4302 100644 +index 22d6dfdd8a271d067ab3493f35289a34b16ac310..fe64f4e87a0f600b5f1522f788f78ccfc5d7c7ea 100644 --- a/src/main/java/org/bukkit/entity/Projectile.java +++ b/src/main/java/org/bukkit/entity/Projectile.java @@ -29,7 +29,7 @@ public interface Projectile extends Entity { * @return true if it should bounce. * @deprecated does not do anything */ -- @Deprecated -+ @Deprecated(forRemoval = true) +- @Deprecated(since = "1.20.2") ++ @Deprecated(since = "1.20.2", forRemoval = true) public boolean doesBounce(); /** @@ -975,12 +975,12 @@ index 906b33b7569fff5dd78258f9765e879180a52834..06e3ad9cd8f39de0ef6ead794df14924 * @param doesBounce whether or not it should bounce. * @deprecated does not do anything */ -- @Deprecated -+ @Deprecated(forRemoval = true) +- @Deprecated(since = "1.20.2") ++ @Deprecated(since = "1.20.2", forRemoval = true) public void setBounce(boolean doesBounce); } diff --git a/src/main/java/org/bukkit/entity/SplashPotion.java b/src/main/java/org/bukkit/entity/SplashPotion.java -index 9cb08fe7201a9f91e88c7b1ee22c17889a7bf1c3..c0fcfccdf476106b48e626a099658c04244ebff8 100644 +index e706a78e3a74a564bfc3f0c4777aa6add5a91be9..c4702ce06d73118f03a1827cbc652cbff6e59d9b 100644 --- a/src/main/java/org/bukkit/entity/SplashPotion.java +++ b/src/main/java/org/bukkit/entity/SplashPotion.java @@ -3,7 +3,8 @@ package org.bukkit.entity; @@ -991,8 +991,8 @@ index 9cb08fe7201a9f91e88c7b1ee22c17889a7bf1c3..c0fcfccdf476106b48e626a099658c04 + * @deprecated should not be used for anything, use {@link ThrownPotion} and + * set the potion via the methods there. */ --@Deprecated -+@Deprecated(forRemoval = true) // Paper +-@Deprecated(since = "1.14") ++@Deprecated(since = "1.14", forRemoval = true) // Paper public interface SplashPotion extends ThrownPotion { } diff --git a/src/main/java/org/bukkit/entity/ZombieVillager.java b/src/main/java/org/bukkit/entity/ZombieVillager.java index 7cc1d9a966454af70b7c25735fe474fe3eb97eb4..e38f38ebfc6e85f29b09c4bb3e2ea79639078ad0 100644 @@ -1071,7 +1071,7 @@ index f4efb2190ae4b1fa1823d5c97ad518c6d34f0a1a..3d6c0ecc70a748b8508b55513f9d5fa6 super(theBlock); this.result = result; diff --git a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java -index 7ae338bcecff2ce25939035181457ced505b3a49..27564727edbd9f093e3a021ce6f30e1146a8ddbb 100644 +index 4c8f388897ff9ddd077695172622c5550651858b..5a56eeb4bdb340920306d03014e536cceb568147 100644 --- a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java +++ b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java @@ -23,7 +23,7 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab @@ -1245,7 +1245,7 @@ index 80a0a4ad813d6453b30273d25942e6612bb05c1b..18bb808e73c7a78f367ccdb44d5fe12b this.inventory = inventory; this.containerType = containerType; diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java -index f2a2a2ad9930499c5bf624e73571a3294a90db14..c8540a42ab44647fdd112ce4f731f3dc0df552f4 100644 +index 5832c610e4fad1372e70dc01bd04ba684a89b492..ff2d64550d8d834fb8e0e859bee5a8ff3329701e 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java @@ -88,7 +88,7 @@ public class InventoryClickEvent extends InventoryInteractEvent { @@ -1258,15 +1258,15 @@ index f2a2a2ad9930499c5bf624e73571a3294a90db14..c8540a42ab44647fdd112ce4f731f3dc return getView().getCursor(); } diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index 3e6ac5beb137efd8ecd80e2e9b17015cb38e8a0a..ae4ae1fa6d407665ef03edcdef683d741668acf1 100644 +index f80d5bc893efd8846365b4677ef1407158b1abc8..06e037ce94b368b3685ab04ba46c1ab5e5479dbb 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java @@ -155,7 +155,7 @@ public enum InventoryType { * * @deprecated use {@link #SMITHING} */ -- @Deprecated -+ @Deprecated(forRemoval = true) // Paper +- @Deprecated(since = "1.20.1") ++ @Deprecated(since = "1.20.1", forRemoval = true) // Paper SMITHING_NEW(4, "Upgrade Gear", MenuType.SMITHING), ; @@ -1359,7 +1359,7 @@ index 6bafc62e2235a6b783cbf96f4dabeeaf02bd5178..50c762d777ac90a05772501a28cacff8 cancelledCollision = cancel; } diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java -index c0b749a5bbf4980d01fed74768bb61909b579cb9..7e7a53b41013f1bf8956c0e278820f18d77b2f0d 100644 +index b4dab4cf521c7fb067e88d985572f12d14a2c8df..4e8d0b2f7364c8d5b6c272f566f8d40ce6b4ceb9 100644 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java @@ -656,7 +656,9 @@ public abstract class ChunkGenerator { @@ -1431,7 +1431,7 @@ index df81bac9ecff697f98941e5c8490e10391e90090..a32977ba3ba60a1c9aee6e469d5d6cd1 /** * Get the current recipe formed on the crafting inventory, if any. diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java -index 2dde946443fee1f6e79b882cbcb448549dc0c99c..127302aa7c22f59438de66fffa0b03ae84a2a8ad 100644 +index 720038083f8c8ab1f29ac424f2d9dbb5cbc8b533..97c8b338f83f409a652fbaec5105e98b8af751e2 100644 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java @@ -525,6 +525,6 @@ public interface EntityEquipment { @@ -1443,7 +1443,7 @@ index 2dde946443fee1f6e79b882cbcb448549dc0c99c..127302aa7c22f59438de66fffa0b03ae Entity getHolder(); } diff --git a/src/main/java/org/bukkit/inventory/FurnaceRecipe.java b/src/main/java/org/bukkit/inventory/FurnaceRecipe.java -index 1d442dc16cbb0fed21714d47007f3f11e30c57d4..af8f7b88edf0fa790edcf16356a030c4834f531e 100644 +index 82d4d0329adda9766ddf2eada3b3684dfef3f32e..d76fbab349a6bfa0ae8b8959d19145ce9b41c7bd 100644 --- a/src/main/java/org/bukkit/inventory/FurnaceRecipe.java +++ b/src/main/java/org/bukkit/inventory/FurnaceRecipe.java @@ -67,8 +67,10 @@ public class FurnaceRecipe extends CookingRecipe<FurnaceRecipe> { @@ -1500,7 +1500,7 @@ index f1a48eab1a357ae64545e1f1dc941c383cff8707..466d1bd7089b76f48f953e1a51c611ec /** * Checks if the inventory contains any ItemStacks with the given diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java -index ebc14022c9ef9b0b3331ee53e96a32667e4762e0..5c258b6077277575daa5d96349837bdf06f42500 100644 +index 0b5e2f4760a43a7a8d3de7bca557027822145a18..5c258b6077277575daa5d96349837bdf06f42500 100644 --- a/src/main/java/org/bukkit/inventory/InventoryView.java +++ b/src/main/java/org/bukkit/inventory/InventoryView.java @@ -123,9 +123,9 @@ public interface InventoryView { @@ -1510,7 +1510,7 @@ index ebc14022c9ef9b0b3331ee53e96a32667e4762e0..5c258b6077277575daa5d96349837bdf - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public int getId() { return id; @@ -1564,7 +1564,7 @@ index c1ec8efffd5ff2a4dcb1d761be9a431a62284607..a1d8ef8eda3c0256e8c82b7a01c3e7b1 /** diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index d125d29759167996a90b7b69d92d944e80af22ab..e9c29fc1db686b80bc2477d78ec2b361b8600b9e 100644 +index 080d9a9e26131eb43649104c3d59691308f79fe7..132cf07816b0d356c94fa4e8b8bfefccce2de103 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -10,6 +10,7 @@ import org.bukkit.Material; @@ -1579,8 +1579,8 @@ index d125d29759167996a90b7b69d92d944e80af22ab..e9c29fc1db686b80bc2477d78ec2b361 * @param data the data value or null * @deprecated this method uses an ambiguous data byte object */ -- @Deprecated -+ @Deprecated(forRemoval = true, since = "1.13") +- @Deprecated(since = "1.4.5") ++ @Deprecated(since = "1.4.5", forRemoval = true) public ItemStack(@NotNull Material type, final int amount, final short damage, @Nullable final Byte data) { Preconditions.checkArgument(type != null, "Material cannot be null"); if (type.isLegacy()) { @@ -1615,7 +1615,7 @@ index d125d29759167996a90b7b69d92d944e80af22ab..e9c29fc1db686b80bc2477d78ec2b361 return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone(); } diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java -index 476fe14faa39f02444cab8ad95d4401033dc6938..2c54660dc1fbc7c1232096797a23cae1262888e9 100644 +index b1f4b8f2666e8012eb8a1e21a2b958fe6e03f74f..4294e9296fed42d01b431dbabec97fda26308530 100644 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java @@ -16,8 +16,7 @@ public interface PlayerInventory extends Inventory { @@ -1651,7 +1651,7 @@ index 476fe14faa39f02444cab8ad95d4401033dc6938..2c54660dc1fbc7c1232096797a23cae1 /** diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index fa03cf187db29896f5af046b311f67881aee0ff4..295d82dd73b600e9436d2bbec0e11dbeaf78bbf4 100644 +index 90b58219ca99dfd4368119183bb414e51c0f0dd1..af540a218d92ca44f5f1bdecdb9ca9f89a7b1ef2 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -107,8 +107,10 @@ public class ShapedRecipe extends CraftingRecipe { @@ -1676,7 +1676,7 @@ index fa03cf187db29896f5af046b311f67881aee0ff4..295d82dd73b600e9436d2bbec0e11dbe public Map<Character, ItemStack> getIngredientMap() { HashMap<Character, ItemStack> result = new HashMap<Character, ItemStack>(); diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 63a233cc819d8d6995d14b9dbfabc14d89af54cc..3bf5064cd6ceb05ea98b18993da46c67be140115 100644 +index d4a9572a0fedee8993d32ca006a28a242d148e36..449f1ea47f8e5d8aa09e0db3dbfe75a6c05158ef 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -44,8 +44,10 @@ public class ShapelessRecipe extends CraftingRecipe { @@ -1748,7 +1748,7 @@ index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb6 public ItemStack getInput() { return this.ingredient.getItemStack(); diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 480dd9a5ff334e6f32b98aa0108ff02e6f7077ab..59e1987f0f0accef369cc29dbec464185eb7c99c 100644 +index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484ac440cb3 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -151,6 +151,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste @@ -1785,7 +1785,7 @@ index 480dd9a5ff334e6f32b98aa0108ff02e6f7077ab..59e1987f0f0accef369cc29dbec46418 /** diff --git a/src/main/java/org/bukkit/inventory/meta/MapMeta.java b/src/main/java/org/bukkit/inventory/meta/MapMeta.java -index 32055a8890425e0b819930f3059da5ea9dfca553..26a336dade83baee97d20eb39a058925659f5777 100644 +index 8b0b36cd2ef2efc4bb68bb725c62117fe5b9c838..721164c26c5e219f854f65ab150a46670f4d33bd 100644 --- a/src/main/java/org/bukkit/inventory/meta/MapMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/MapMeta.java @@ -16,13 +16,8 @@ public interface MapMeta extends ItemMeta { @@ -1798,8 +1798,8 @@ index 32055a8890425e0b819930f3059da5ea9dfca553..26a336dade83baee97d20eb39a058925 - * for example will generate a new map with a different ID). The xxxMapView - * family of methods should be used instead. */ -- @Deprecated -+ //@Deprecated // Paper +- @Deprecated(since = "1.13.2") ++ //@Deprecated(since = "1.13.2") // Paper boolean hasMapId(); /** @@ -1813,8 +1813,8 @@ index 32055a8890425e0b819930f3059da5ea9dfca553..26a336dade83baee97d20eb39a058925 - * for example will generate a new map with a different ID). The xxxMapView - * family of methods should be used instead. */ -- @Deprecated -+ //@Deprecated // Paper +- @Deprecated(since = "1.13.2") ++ // @Deprecated(since = "1.13.2") // Paper int getMapId(); /** @@ -1832,7 +1832,7 @@ index c56e81eb71bccc03378aea71096fdf66b4bfa784..16713c9d4cfaed5ad509b4075121e44c /** diff --git a/src/main/java/org/bukkit/map/MapCanvas.java b/src/main/java/org/bukkit/map/MapCanvas.java -index edef478786bb7456af29ca960009873095830050..e8ac449e6280827beb6d2699df75b1d52a922c9b 100644 +index fcad167c03dd4f59702142a38ff5bf79ed198031..e63f9586e1cfefd8d1ab4a784444240f42e7b204 100644 --- a/src/main/java/org/bukkit/map/MapCanvas.java +++ b/src/main/java/org/bukkit/map/MapCanvas.java @@ -95,9 +95,9 @@ public interface MapCanvas { @@ -1842,8 +1842,8 @@ index edef478786bb7456af29ca960009873095830050..e8ac449e6280827beb6d2699df75b1d5 - * @deprecated Magic value, use {@link #getPixelColor(int, int)} + * @deprecated use {@link #getPixelColor(int, int)} */ -- @Deprecated -+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper +- @Deprecated(since = "1.19") ++ @Deprecated(since = "1.19", forRemoval = true) // Paper public byte getPixel(int x, int y); /** @@ -1854,13 +1854,13 @@ index edef478786bb7456af29ca960009873095830050..e8ac449e6280827beb6d2699df75b1d5 - * @deprecated Magic value, use {@link #getBasePixelColor(int, int)} + * @deprecated use {@link #getBasePixelColor(int, int)} */ -- @Deprecated -+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper +- @Deprecated(since = "1.19") ++ @Deprecated(since = "1.19", forRemoval = true) // Paper public byte getBasePixel(int x, int y); /** diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java -index 871adbf2f9015dffac9edc3ce35aa6acd3b75526..0899981b9ab1f98dacc617156d12779421e4c275 100644 +index 8de6d0c53bce0279a82b84b408e83d2128077400..bd1c0417fbf72731e6301bf79966c6ea4102fc70 100644 --- a/src/main/java/org/bukkit/map/MapCursor.java +++ b/src/main/java/org/bukkit/map/MapCursor.java @@ -163,9 +163,9 @@ public final class MapCursor { @@ -1870,7 +1870,7 @@ index 871adbf2f9015dffac9edc3ce35aa6acd3b75526..0899981b9ab1f98dacc617156d127794 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public byte getRawType() { return type.getValue(); @@ -1882,8 +1882,8 @@ index 871adbf2f9015dffac9edc3ce35aa6acd3b75526..0899981b9ab1f98dacc617156d127794 - * @deprecated Magic value + * @deprecated use {@link #setType(Type)} */ -- @Deprecated -+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper +- @Deprecated(since = "1.6.2") ++ @Deprecated(since = "1.6.2", forRemoval = true) // Paper public void setRawType(byte type) { Type enumType = Type.byValue(type); Preconditions.checkArgument(enumType != null, "Unknown type by id %s", type); @@ -1894,7 +1894,7 @@ index 871adbf2f9015dffac9edc3ce35aa6acd3b75526..0899981b9ab1f98dacc617156d127794 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper byte getValue(); @@ -1906,13 +1906,13 @@ index 871adbf2f9015dffac9edc3ce35aa6acd3b75526..0899981b9ab1f98dacc617156d127794 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable static Type byValue(byte value) { for (Type t : values()) { diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java -index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..c80faa079eca1564847070f0338fc98024639829 100644 +index 13000c247e3e1a345832e6bd2d4f6074ef2a1b88..448f37249d21ecb321f53956878fe62293ed34ae 100644 --- a/src/main/java/org/bukkit/map/MapPalette.java +++ b/src/main/java/org/bukkit/map/MapPalette.java @@ -197,9 +197,9 @@ public final class MapPalette { @@ -1922,8 +1922,8 @@ index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..c80faa079eca1564847070f0338fc980 - * @deprecated Magic value + * @deprecated use color-related methods */ -- @Deprecated -+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper +- @Deprecated(since = "1.6.2") ++ @Deprecated(since = "1.6.2", forRemoval = true) // Paper @NotNull public static byte[] imageToBytes(@NotNull Image image) { BufferedImage temp = new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB); @@ -1934,8 +1934,8 @@ index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..c80faa079eca1564847070f0338fc980 - * @deprecated Magic value + * @deprecated use color-related methods */ -- @Deprecated -+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper +- @Deprecated(since = "1.6.2") ++ @Deprecated(since = "1.6.2", forRemoval = true) // Paper public static byte matchColor(int r, int g, int b) { return matchColor(new Color(r, g, b)); } @@ -1946,8 +1946,8 @@ index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..c80faa079eca1564847070f0338fc980 - * @deprecated Magic value + * @deprecated use color-related methods */ -- @Deprecated -+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper +- @Deprecated(since = "1.6.2") ++ @Deprecated(since = "1.6.2", forRemoval = true) // Paper public static byte matchColor(@NotNull Color color) { if (color.getAlpha() < 128) return 0; @@ -1958,8 +1958,8 @@ index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..c80faa079eca1564847070f0338fc980 - * @deprecated Magic value + * @deprecated use color directly */ -- @Deprecated -+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper +- @Deprecated(since = "1.6.2") ++ @Deprecated(since = "1.6.2", forRemoval = true) // Paper @NotNull public static Color getColor(byte index) { // Minecraft has 143 colors, some of which have negative byte representations @@ -1970,13 +1970,13 @@ index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..c80faa079eca1564847070f0338fc980 - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.19") + @org.jetbrains.annotations.ApiStatus.Internal // Paper byte matchColor(@NotNull Color color); } } diff --git a/src/main/java/org/bukkit/map/MapView.java b/src/main/java/org/bukkit/map/MapView.java -index 9b8b68b66dc15b06800251702c2722623c8462a0..e998c5d871e02564c24260a8205dcfafb6e703d9 100644 +index 73bca3d371d4fe7033bb062d5f42ea4efd40d913..e998c5d871e02564c24260a8205dcfafb6e703d9 100644 --- a/src/main/java/org/bukkit/map/MapView.java +++ b/src/main/java/org/bukkit/map/MapView.java @@ -32,9 +32,9 @@ public interface MapView { @@ -1986,7 +1986,7 @@ index 9b8b68b66dc15b06800251702c2722623c8462a0..e998c5d871e02564c24260a8205dcfaf - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static Scale valueOf(byte value) { @@ -1998,437 +1998,437 @@ index 9b8b68b66dc15b06800251702c2722623c8462a0..e998c5d871e02564c24260a8205dcfaf - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public byte getValue() { return value; } diff --git a/src/main/java/org/bukkit/material/Banner.java b/src/main/java/org/bukkit/material/Banner.java -index 08ce9d8bc6dcd9beec5f75c1b7cd5d98e8c9e168..e1a87c09b90618aacaf728ebdc5a13e255200fef 100644 +index cd78e2c35d44ad5fa53947f84f818ef54e5d84fa..e3c2711690459326b875f6f94a2c34a19421d5ed 100644 --- a/src/main/java/org/bukkit/material/Banner.java +++ b/src/main/java/org/bukkit/material/Banner.java @@ -7,7 +7,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated +-@Deprecated(since = "1.14.1") +@Deprecated(forRemoval = true, since = "1.13") public class Banner extends MaterialData implements Attachable { public Banner() { diff --git a/src/main/java/org/bukkit/material/Bed.java b/src/main/java/org/bukkit/material/Bed.java -index c5256129e00a63d2699fbae213470ed7197c4571..54c89d319940a39b3439e3af09d87c21112a8486 100644 +index ff49e6e5b5f75d0a421908445a0c19d2de19b64e..5aafea9c6bbda2ff4282e321ae8815ef46d78e9f 100644 --- a/src/main/java/org/bukkit/material/Bed.java +++ b/src/main/java/org/bukkit/material/Bed.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated +-@Deprecated(since = "1.14.1") +@Deprecated(forRemoval = true, since = "1.13") public class Bed extends MaterialData implements Directional { /** diff --git a/src/main/java/org/bukkit/material/Button.java b/src/main/java/org/bukkit/material/Button.java -index da7d016cf118932c9cc9ddcfb4a2abd4b4356fb5..3c3d867911b6424d03094d3cc1056dd291825dce 100644 +index 794dc81d0b7cad8c4a5c12389f5f19b8e1835a94..6c708737865440442aeaf818e7700c2998d95309 100644 --- a/src/main/java/org/bukkit/material/Button.java +++ b/src/main/java/org/bukkit/material/Button.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated +-@Deprecated(since = "1.14.1") +@Deprecated(forRemoval = true, since = "1.13") public class Button extends SimpleAttachableMaterialData implements Redstone { public Button() { super(Material.LEGACY_STONE_BUTTON); diff --git a/src/main/java/org/bukkit/material/Cake.java b/src/main/java/org/bukkit/material/Cake.java -index d39dd491626cd84f83169cf5c2135d05516d77f2..f14ebe07bf898e54a7f0cbe740c02cf5e1851d41 100644 +index 5fd7b198e812b028dfa90271ccb59c1822a8b683..0d0d41c184652d8b34cf36cacbc8c3910ee579b7 100644 --- a/src/main/java/org/bukkit/material/Cake.java +++ b/src/main/java/org/bukkit/material/Cake.java @@ -6,7 +6,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Cake extends MaterialData { public Cake() { super(Material.LEGACY_CAKE_BLOCK); diff --git a/src/main/java/org/bukkit/material/Cauldron.java b/src/main/java/org/bukkit/material/Cauldron.java -index b331b4c27e58d766dd1759062c9c198c348a58bb..d43caa8d64396a16d6e00cbf0d05cb291fa20c2e 100644 +index a72c74400a5e0b97ba0e88b99dbbf5e90e4f92e0..b8a15af79f9fdf0a948d6a0172bb9f250ed8ce3b 100644 --- a/src/main/java/org/bukkit/material/Cauldron.java +++ b/src/main/java/org/bukkit/material/Cauldron.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Cauldron extends MaterialData { private static final int CAULDRON_FULL = 3; private static final int CAULDRON_EMPTY = 0; diff --git a/src/main/java/org/bukkit/material/Chest.java b/src/main/java/org/bukkit/material/Chest.java -index 4d120d3c33566606ff7d8b03c32341bf2ac147c4..89bb1a34d620d6c39901a315629bc8f43f3d3181 100644 +index 302bf01e8b0eafdddab940cfe9d3d894329ce8f9..a07e320f3d7a32d11f3bb1c136ca2574dd9cf40f 100644 --- a/src/main/java/org/bukkit/material/Chest.java +++ b/src/main/java/org/bukkit/material/Chest.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Chest extends DirectionalContainer { public Chest() { diff --git a/src/main/java/org/bukkit/material/Coal.java b/src/main/java/org/bukkit/material/Coal.java -index fb842cfa7bf29ca6c670fc98e7deecaab31c71f2..f6c61c9005046386c3e8f36b0144f1c9c83f7e9c 100644 +index bc60ab8bda785798b36873596e6c186556ef73b3..bdb8345371cd64ec8bf17174ec9d874341572527 100644 --- a/src/main/java/org/bukkit/material/Coal.java +++ b/src/main/java/org/bukkit/material/Coal.java @@ -9,7 +9,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Coal extends MaterialData { public Coal() { super(Material.LEGACY_COAL); diff --git a/src/main/java/org/bukkit/material/CocoaPlant.java b/src/main/java/org/bukkit/material/CocoaPlant.java -index b1b1c729d182b676d8ea69a8d3c942c6820863dd..f2baf516ea97de4ce55915cee0507f2c07e2f9d5 100644 +index db1cdd8e26c71ca16b195307f4ba5b57b341cf9f..bebb09bca0565d18c4028ff6aa7a52fa4ff63c7a 100644 --- a/src/main/java/org/bukkit/material/CocoaPlant.java +++ b/src/main/java/org/bukkit/material/CocoaPlant.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class CocoaPlant extends MaterialData implements Directional, Attachable { public enum CocoaPlantSize { diff --git a/src/main/java/org/bukkit/material/Command.java b/src/main/java/org/bukkit/material/Command.java -index bcac1b08294569b218722278568b7106e1ce48f3..e8ac121789e8f3b3fe8982a660ed702f5e3a36c7 100644 +index c83abea1a81bacc8973004f31388c985e1ed70f4..d7953e28d050c03d37146484c0c5b346dd0bc84d 100644 --- a/src/main/java/org/bukkit/material/Command.java +++ b/src/main/java/org/bukkit/material/Command.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Command extends MaterialData implements Redstone { public Command() { super(Material.LEGACY_COMMAND); diff --git a/src/main/java/org/bukkit/material/Comparator.java b/src/main/java/org/bukkit/material/Comparator.java -index 49d32d54438ad689bc7768342dc84d31e5f30285..7dcb7097119c0e170f29f04ff30d145966d78a1b 100644 +index 047f571be36e9f3862d04836b47d2168d6d91013..ec3a9ee830694162a31857b8c3559e76fada049a 100644 --- a/src/main/java/org/bukkit/material/Comparator.java +++ b/src/main/java/org/bukkit/material/Comparator.java @@ -12,7 +12,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Comparator extends MaterialData implements Directional, Redstone { protected static final BlockFace DEFAULT_DIRECTION = BlockFace.NORTH; protected static final boolean DEFAULT_SUBTRACTION_MODE = false; diff --git a/src/main/java/org/bukkit/material/Crops.java b/src/main/java/org/bukkit/material/Crops.java -index 4cf3de5fbba8617bc8edab9ca1c0ddee8033ed09..c73724d7b3ece146da6f7dd67167e7cd01fa3977 100644 +index b76c144f4497ced42212916cff112161926a41c8..1de6ad1dc1c0aaa3e3d2877c61afc772eb46c634 100644 --- a/src/main/java/org/bukkit/material/Crops.java +++ b/src/main/java/org/bukkit/material/Crops.java @@ -15,7 +15,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Crops extends MaterialData { protected static final Material DEFAULT_TYPE = Material.LEGACY_CROPS; protected static final CropState DEFAULT_STATE = CropState.SEEDED; diff --git a/src/main/java/org/bukkit/material/DetectorRail.java b/src/main/java/org/bukkit/material/DetectorRail.java -index e8ab2904214f160c56aa01bc106d96f59042e706..6c7c021e654ab020d4a1638d2e9d8b438ea70fdd 100644 +index 3a46eea9120999a91b3127daa8fe3b0f456e35fe..234132a9e85a1a76ceaba4744fecc4c6afcdf7d5 100644 --- a/src/main/java/org/bukkit/material/DetectorRail.java +++ b/src/main/java/org/bukkit/material/DetectorRail.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class DetectorRail extends ExtendedRails implements PressureSensor { public DetectorRail() { super(Material.LEGACY_DETECTOR_RAIL); diff --git a/src/main/java/org/bukkit/material/Diode.java b/src/main/java/org/bukkit/material/Diode.java -index 36a62258bcdea8136672ef6b2313a3877b3c724c..490f345cfd2e9e0da151bc81f52c50b41c5933ca 100644 +index 1576aaab7f06fc34c5ffa3a2b0ee797d67c19cbb..68c1e05726cf5b6bdc81cfdc8b0364ac91858649 100644 --- a/src/main/java/org/bukkit/material/Diode.java +++ b/src/main/java/org/bukkit/material/Diode.java @@ -13,7 +13,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Diode extends MaterialData implements Directional, Redstone { protected static final BlockFace DEFAULT_DIRECTION = BlockFace.NORTH; diff --git a/src/main/java/org/bukkit/material/DirectionalContainer.java b/src/main/java/org/bukkit/material/DirectionalContainer.java -index 0190e5f3df5b86a0d8f912baf0570a4f54853829..6a8ec139c03a6dcdfcb8f55e5fac55f1c0c43156 100644 +index c862d36ff2593b56e29f795c2d114a44afc17eec..aac0197ff88853c21f9eaa084c25c24846c26168 100644 --- a/src/main/java/org/bukkit/material/DirectionalContainer.java +++ b/src/main/java/org/bukkit/material/DirectionalContainer.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class DirectionalContainer extends MaterialData implements Directional { public DirectionalContainer(final Material type) { diff --git a/src/main/java/org/bukkit/material/Dispenser.java b/src/main/java/org/bukkit/material/Dispenser.java -index b12993a93781bd8a3d218a0dd102e357996ee79e..49e56116f0b224033c25b797e9c28011bbd9cf8f 100644 +index 340f372a9288811e9a650b55fad127d4887ec91c..c676d03b1313812a33fbead3fe4745223a00489e 100644 --- a/src/main/java/org/bukkit/material/Dispenser.java +++ b/src/main/java/org/bukkit/material/Dispenser.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Dispenser extends FurnaceAndDispenser { public Dispenser() { diff --git a/src/main/java/org/bukkit/material/Door.java b/src/main/java/org/bukkit/material/Door.java -index d04ece5abab7a22abc4283d3043a52d4286d4103..48de4417c835db433e7a0884330b11a7afc39303 100644 +index a92da22234dea8543bc1180eb4f2942ddcc4061e..0205e134f608b6f9c674595c55e699dde1edbf35 100644 --- a/src/main/java/org/bukkit/material/Door.java +++ b/src/main/java/org/bukkit/material/Door.java @@ -22,7 +22,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Door extends MaterialData implements Directional, Openable { // This class breaks API contracts on Directional and Openable because diff --git a/src/main/java/org/bukkit/material/Dye.java b/src/main/java/org/bukkit/material/Dye.java -index f34f23da74013006ec453b539bb10751dcb3ecee..b2cc9c9173742c9f88bb78b0fb2e2138db95e80c 100644 +index 72d494631a4779f5b2147492a0dc8085b4b388b8..11375c51c0ed3493642335e1c8ef2d6c36987735 100644 --- a/src/main/java/org/bukkit/material/Dye.java +++ b/src/main/java/org/bukkit/material/Dye.java @@ -9,7 +9,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Dye extends MaterialData implements Colorable { public Dye() { super(Material.LEGACY_INK_SACK); diff --git a/src/main/java/org/bukkit/material/EnderChest.java b/src/main/java/org/bukkit/material/EnderChest.java -index ad232cacd94230fbcabb894cf35d540aff1d8662..f621a3ba0056db8a1b5b734252aad676214b4128 100644 +index 65f286a7ca3ebd98a9b0e2cd89b4775e769beaad..1d49f78e32eba67a21b4e7f23d3bb1d0f8532711 100644 --- a/src/main/java/org/bukkit/material/EnderChest.java +++ b/src/main/java/org/bukkit/material/EnderChest.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class EnderChest extends DirectionalContainer { public EnderChest() { diff --git a/src/main/java/org/bukkit/material/ExtendedRails.java b/src/main/java/org/bukkit/material/ExtendedRails.java -index 9b2577f7b5bab678d9e491323772ce616181ade3..fcea4a5169d1535b0696783fa73c05494702770d 100644 +index cbbf953b746c27ea2e30324ecea26543fa397cbb..23a329c7cef93f7f146edac9b0829f82aec4f76a 100644 --- a/src/main/java/org/bukkit/material/ExtendedRails.java +++ b/src/main/java/org/bukkit/material/ExtendedRails.java @@ -10,7 +10,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class ExtendedRails extends Rails { public ExtendedRails(final Material type) { diff --git a/src/main/java/org/bukkit/material/FlowerPot.java b/src/main/java/org/bukkit/material/FlowerPot.java -index 6101e33288dded9ce871fe6c6f0b36c895d7214a..8fe99e15203cca6ed6b238ec3a7b57670940fbfb 100644 +index 45ebe2671b01fdd918dd6254d48dc35d0f46a899..5bf2cc1baeb9a7fd329cb49f34b8ba6cef4a4862 100644 --- a/src/main/java/org/bukkit/material/FlowerPot.java +++ b/src/main/java/org/bukkit/material/FlowerPot.java @@ -10,7 +10,7 @@ import org.bukkit.TreeSpecies; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.9.4") ++@Deprecated(since = "1.13", forRemoval = true) public class FlowerPot extends MaterialData { /** diff --git a/src/main/java/org/bukkit/material/Furnace.java b/src/main/java/org/bukkit/material/Furnace.java -index 380f7f4b1f3adaa59c3202db02221abec2678fd7..338b37fbbbb165399cfd45ed109bd18cdf5a14b9 100644 +index 7bfc7c6edb6fea760dc568932da6ba4716b7f995..9cd029934d40e9490ef6309fb50b066fc19623a0 100644 --- a/src/main/java/org/bukkit/material/Furnace.java +++ b/src/main/java/org/bukkit/material/Furnace.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Furnace extends FurnaceAndDispenser { public Furnace() { diff --git a/src/main/java/org/bukkit/material/FurnaceAndDispenser.java b/src/main/java/org/bukkit/material/FurnaceAndDispenser.java -index effa0d8a95ccbd58aa2b85a27cfccb4787e71422..e627c8ff419086a3bae221c65eeb2ec9453ab075 100644 +index b7fb6cf424becdfc356e0ea2c57b7fd38ccdf0b2..119dca552267b1ca0b566ddff1f8e70253af5f56 100644 --- a/src/main/java/org/bukkit/material/FurnaceAndDispenser.java +++ b/src/main/java/org/bukkit/material/FurnaceAndDispenser.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class FurnaceAndDispenser extends DirectionalContainer { public FurnaceAndDispenser(final Material type) { diff --git a/src/main/java/org/bukkit/material/Gate.java b/src/main/java/org/bukkit/material/Gate.java -index fc67fc59a75410f7aa70609ebc9538bfdecdd403..52d468ae5b21ea00b20314731ca26542d64e455b 100644 +index 10c259338f16d2a0e8b18a79b4f159f1fb782d3f..441a796cbb546e4a577f7189ea463614c6028281 100644 --- a/src/main/java/org/bukkit/material/Gate.java +++ b/src/main/java/org/bukkit/material/Gate.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Gate extends MaterialData implements Directional, Openable { private static final byte OPEN_BIT = 0x4; private static final byte DIR_BIT = 0x3; diff --git a/src/main/java/org/bukkit/material/Hopper.java b/src/main/java/org/bukkit/material/Hopper.java -index cfd32666c274383204dee9f9734ffb06184d2aaa..9983f53d05b5edc7a6bb54eaf65733639ccfa883 100644 +index b5fc3746c8c6c72656a17880823c26e49b23c1d2..69abe65bca9562382c4307be497fb41fe38ce935 100644 --- a/src/main/java/org/bukkit/material/Hopper.java +++ b/src/main/java/org/bukkit/material/Hopper.java @@ -12,7 +12,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Hopper extends MaterialData implements Directional, Redstone { protected static final BlockFace DEFAULT_DIRECTION = BlockFace.DOWN; diff --git a/src/main/java/org/bukkit/material/Ladder.java b/src/main/java/org/bukkit/material/Ladder.java -index de263530823aa8c1ae8b4a9bd2497d7239156384..dcccad5a6a517fb5e2409363751e9f94fdc24241 100644 +index ab607ae626ef6832955d25126285998d007013e4..ada73c2576e112926fa573e0665fa2879e8056bd 100644 --- a/src/main/java/org/bukkit/material/Ladder.java +++ b/src/main/java/org/bukkit/material/Ladder.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Ladder extends SimpleAttachableMaterialData { public Ladder() { super(Material.LEGACY_LADDER); diff --git a/src/main/java/org/bukkit/material/Leaves.java b/src/main/java/org/bukkit/material/Leaves.java -index 923a794ac1d2f43b680165dfddb4119faf5ecdd1..75c52aeb4fc01dfc83a3985249d4d577d3aec578 100644 +index 69f47d00f17a8de564fc7d7903df7624d7872db2..f9dd206a4070dd9d24ad97616da7de81b9607f0b 100644 --- a/src/main/java/org/bukkit/material/Leaves.java +++ b/src/main/java/org/bukkit/material/Leaves.java @@ -13,7 +13,7 @@ import org.bukkit.TreeSpecies; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Leaves extends Wood { protected static final Material DEFAULT_TYPE = Material.LEGACY_LEAVES; protected static final boolean DEFAULT_DECAYABLE = true; diff --git a/src/main/java/org/bukkit/material/Lever.java b/src/main/java/org/bukkit/material/Lever.java -index 09f290f8898914b77f89c1546f285a6e6212499e..9ed20612235775c6e6f93b1cea5d2b7e73c2aa83 100644 +index e2add49ce34b46c24154cd9f0c5a755a2013cddf..1c1b36ea1ca646a3624c19c837cf4292da8c2464 100644 --- a/src/main/java/org/bukkit/material/Lever.java +++ b/src/main/java/org/bukkit/material/Lever.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Lever extends SimpleAttachableMaterialData implements Redstone { public Lever() { super(Material.LEGACY_LEVER); diff --git a/src/main/java/org/bukkit/material/LongGrass.java b/src/main/java/org/bukkit/material/LongGrass.java -index 497857ec37482ff477eab77d680b2a1bec52ea14..1c683ad7c4c72671e74c5d2d4b5f872adc9f9021 100644 +index 5b7f21fff6570b848f21b6bf0a2806ac4f85ae3f..4db8006dc4210d416f1ea296528e458655f7824d 100644 --- a/src/main/java/org/bukkit/material/LongGrass.java +++ b/src/main/java/org/bukkit/material/LongGrass.java @@ -9,7 +9,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class LongGrass extends MaterialData { public LongGrass() { super(Material.LEGACY_LONG_GRASS); diff --git a/src/main/java/org/bukkit/material/MaterialData.java b/src/main/java/org/bukkit/material/MaterialData.java -index ccaddb87922b3afe22a350a3e5e5e7af86b2f398..b2b04456590b86a755b392a1ab4d88fa49f2b2bb 100644 +index 4b778e828f6d1b6b9cbb766ae7681f586812f1ec..874559af354ca12166f239882d95c74056f8d57f 100644 --- a/src/main/java/org/bukkit/material/MaterialData.java +++ b/src/main/java/org/bukkit/material/MaterialData.java @@ -9,7 +9,7 @@ import org.bukkit.inventory.ItemStack; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.13") ++@Deprecated(since = "1.13", forRemoval = true) public class MaterialData implements Cloneable { private final Material type; private byte data = 0; diff --git a/src/main/java/org/bukkit/material/MonsterEggs.java b/src/main/java/org/bukkit/material/MonsterEggs.java -index 2fac218f1e237d4b867c1e6215fe40151dcceaf0..4f450808ead1464b8cb7192bfaa8005ccb5e3d0c 100644 +index 3c25dd940ebe0c8b1b091a7062073c093f150bd3..8fc242e4eb98af9b40bc54e1436b568d7890987c 100644 --- a/src/main/java/org/bukkit/material/MonsterEggs.java +++ b/src/main/java/org/bukkit/material/MonsterEggs.java @@ -10,7 +10,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class MonsterEggs extends TexturedMaterial { private static final List<Material> textures = new ArrayList<Material>(); diff --git a/src/main/java/org/bukkit/material/Mushroom.java b/src/main/java/org/bukkit/material/Mushroom.java -index 8927b307adcc3c98aa96caea38ea2eb9338e284e..e219d29fde408d464015f51dc64b93a929e48320 100644 +index 6e41bddacbe82e8c9195f3a5f270d211924d8c58..a05959f97390525bd6881770a3087093a7089cad 100644 --- a/src/main/java/org/bukkit/material/Mushroom.java +++ b/src/main/java/org/bukkit/material/Mushroom.java @@ -17,7 +17,7 @@ import org.bukkit.material.types.MushroomBlockTexture; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Mushroom extends MaterialData { private static final byte NORTH_LIMIT = 4; private static final byte SOUTH_LIMIT = 6; diff --git a/src/main/java/org/bukkit/material/NetherWarts.java b/src/main/java/org/bukkit/material/NetherWarts.java -index 1fed8b937a68bfd12d04e04b962e1627c36a074f..3d437cc6b35dbef4819b05326b86dfc926655a2a 100644 +index 1e6f4c6cc4bfd0fc20870251c04920f133239e6b..da784d87d260b9782d8a3a817cb4bdb69f65a867 100644 --- a/src/main/java/org/bukkit/material/NetherWarts.java +++ b/src/main/java/org/bukkit/material/NetherWarts.java @@ -9,7 +9,7 @@ import org.bukkit.NetherWartsState; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class NetherWarts extends MaterialData { public NetherWarts() { super(Material.LEGACY_NETHER_WARTS); diff --git a/src/main/java/org/bukkit/material/Observer.java b/src/main/java/org/bukkit/material/Observer.java -index 843790b331e1ed1db9e46716251851b0782497c1..079b0569332102e3f5c427a5c97c01cb1a609e6c 100644 +index e7ade2dd22826d52f5624fdfba3496c1468af0e9..06c7206b871981c8f874e009aad8167fe572668e 100644 --- a/src/main/java/org/bukkit/material/Observer.java +++ b/src/main/java/org/bukkit/material/Observer.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Observer extends MaterialData implements Directional, Redstone { public Observer() { @@ -2444,80 +2444,80 @@ index 0ae54f973d11df74abb3105cf9226afb130b4f33..df2c2a774155d79ccf6fa7f366fe011a /** diff --git a/src/main/java/org/bukkit/material/PistonBaseMaterial.java b/src/main/java/org/bukkit/material/PistonBaseMaterial.java -index 8165e94339097ac5cf8e27ebc60256c8fefd7d63..e7d05b6873c11f531cbea167ee006942bbc2249b 100644 +index a0fe943735ca40813e2c629407f87471f9f7df3d..2fdd7f2adf34a0ed11235c135bca295601f89a21 100644 --- a/src/main/java/org/bukkit/material/PistonBaseMaterial.java +++ b/src/main/java/org/bukkit/material/PistonBaseMaterial.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class PistonBaseMaterial extends MaterialData implements Directional, Redstone { public PistonBaseMaterial(final Material type) { diff --git a/src/main/java/org/bukkit/material/PistonExtensionMaterial.java b/src/main/java/org/bukkit/material/PistonExtensionMaterial.java -index e7cfc7158b5d31376ddb8f5415e22e76c6d62f10..9ab0b57a492a6d503ad72d41f3a52b358d73361a 100644 +index 19dfe68e3380165e5f1ce3a5aa506db000d75e32..c87e54ca5a1420ec6212800ab33744cdb8bcab9d 100644 --- a/src/main/java/org/bukkit/material/PistonExtensionMaterial.java +++ b/src/main/java/org/bukkit/material/PistonExtensionMaterial.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class PistonExtensionMaterial extends MaterialData implements Attachable { public PistonExtensionMaterial(final Material type) { diff --git a/src/main/java/org/bukkit/material/PoweredRail.java b/src/main/java/org/bukkit/material/PoweredRail.java -index feebc5c7359098d41abcccb1f1d8afe2a54a9130..27c8974c8fe68af51960dbad91dd424c9c3bfd17 100644 +index e563c8e53a748bbe42ff8ae867c964444b391519..d24968b9e3067e70cc17a9bd2d9c204787b01d3e 100644 --- a/src/main/java/org/bukkit/material/PoweredRail.java +++ b/src/main/java/org/bukkit/material/PoweredRail.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class PoweredRail extends ExtendedRails implements Redstone { public PoweredRail() { super(Material.LEGACY_POWERED_RAIL); diff --git a/src/main/java/org/bukkit/material/PressurePlate.java b/src/main/java/org/bukkit/material/PressurePlate.java -index ffababbc1b1ef1f19e941beb6412457b839e92eb..0d7f0a7d0001ebbf9920e8d2f82786c5dae6d2e8 100644 +index 8827062fcd26741ead93fd2c0614719045034ae1..a04c024a48367ba36a92a6738200c73a855fbfec 100644 --- a/src/main/java/org/bukkit/material/PressurePlate.java +++ b/src/main/java/org/bukkit/material/PressurePlate.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class PressurePlate extends MaterialData implements PressureSensor { public PressurePlate() { super(Material.LEGACY_WOOD_PLATE); diff --git a/src/main/java/org/bukkit/material/Pumpkin.java b/src/main/java/org/bukkit/material/Pumpkin.java -index 7c1b5eea0aba649bc9ed6b05836609e7cda314c0..c9241e64ade6e2aac739159c088aa3bee6bdd219 100644 +index 55b0ade2cbf3ba147fbd34768fb95e7eb9398477..49e3442377e1fb89dfdb2ea97a62f16c69bfe5ab 100644 --- a/src/main/java/org/bukkit/material/Pumpkin.java +++ b/src/main/java/org/bukkit/material/Pumpkin.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Pumpkin extends MaterialData implements Directional { public Pumpkin() { diff --git a/src/main/java/org/bukkit/material/Rails.java b/src/main/java/org/bukkit/material/Rails.java -index 0b041ee66c38cb884a0d69d1cc17df3fe25f7533..de12e71214ed22e40925a1b65260694c80321ff0 100644 +index 8b6b0139da8127d38dfb3b1f3e70ddf530d1788c..852e06835f8bb0982cb260e3660290fb3e6ecf50 100644 --- a/src/main/java/org/bukkit/material/Rails.java +++ b/src/main/java/org/bukkit/material/Rails.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Rails extends MaterialData { public Rails() { @@ -2534,280 +2534,280 @@ index 3e46603f8cd38041394e0e1baf788d9009b3ffc7..eb621f34d0461c9bfe1bd7535344b677 /** diff --git a/src/main/java/org/bukkit/material/RedstoneTorch.java b/src/main/java/org/bukkit/material/RedstoneTorch.java -index 40956914366195f8a658952923ea7e92235dc4a8..b46b2dde7cd74abd8e05a5222856efdf551ec2ad 100644 +index 369f1826ecaafdb0ca096e8dd1506f35b8ceb283..9c7f7f72922ccd1ecf9dfba8618d7c618d9cf718 100644 --- a/src/main/java/org/bukkit/material/RedstoneTorch.java +++ b/src/main/java/org/bukkit/material/RedstoneTorch.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class RedstoneTorch extends Torch implements Redstone { public RedstoneTorch() { super(Material.LEGACY_REDSTONE_TORCH_ON); diff --git a/src/main/java/org/bukkit/material/RedstoneWire.java b/src/main/java/org/bukkit/material/RedstoneWire.java -index 8877ef48eb8de20b220d40c8068e5da2566d6109..b21be01e753fa16159161ebfea46586ca3895313 100644 +index 01f93fbacc6152a3786a4082e00d92d2c0ce2920..b9a88c4efadcea415ebc65ffeb9df90a929230c3 100644 --- a/src/main/java/org/bukkit/material/RedstoneWire.java +++ b/src/main/java/org/bukkit/material/RedstoneWire.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class RedstoneWire extends MaterialData implements Redstone { public RedstoneWire() { super(Material.LEGACY_REDSTONE_WIRE); diff --git a/src/main/java/org/bukkit/material/Sandstone.java b/src/main/java/org/bukkit/material/Sandstone.java -index 8d8673edcd19d03077e7d53388c3ba2e9d80a618..8c52df074acdf51957502782615786d3bb2752ed 100644 +index 6bab43f68a9282106586a63a31a5784e0bbe71e5..302db083d129a91eb24ddc06d835c85ce10bdf9a 100644 --- a/src/main/java/org/bukkit/material/Sandstone.java +++ b/src/main/java/org/bukkit/material/Sandstone.java @@ -9,7 +9,7 @@ import org.bukkit.SandstoneType; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Sandstone extends MaterialData { public Sandstone() { super(Material.LEGACY_SANDSTONE); diff --git a/src/main/java/org/bukkit/material/Sapling.java b/src/main/java/org/bukkit/material/Sapling.java -index c615a0022256887022ba7f347c19005478c35691..93d1bcac74ea8c4159462786865b6512713d5d91 100644 +index 84daf0d756ecfd6d46c9b6398b29ae5994364ce3..9a34ed6241a3b6a170d7e3a3cf52dbd49e82dc1b 100644 --- a/src/main/java/org/bukkit/material/Sapling.java +++ b/src/main/java/org/bukkit/material/Sapling.java @@ -11,7 +11,7 @@ import org.bukkit.TreeSpecies; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Sapling extends Wood { /** diff --git a/src/main/java/org/bukkit/material/Sign.java b/src/main/java/org/bukkit/material/Sign.java -index 3b32679b4a670aaaaeb0481265d189a3bb99bdca..d96002acf89e67c6eb29d1d572192d461bb072b3 100644 +index 48cd4599b723b1fe8cab0e2d439773ea31f28569..ed63a98e8902d4f473881777f905fdc8ff9b1293 100644 --- a/src/main/java/org/bukkit/material/Sign.java +++ b/src/main/java/org/bukkit/material/Sign.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Sign extends MaterialData implements Attachable { public Sign() { super(Material.LEGACY_SIGN_POST); diff --git a/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java b/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java -index 6267d81ba2e9dde3f8a1063df66940086b4f5fce..2d1b640a8ff5d4492408f64e6b01af9ab0ce839e 100644 +index d9527c6f786f7e9628dcb18afd20f36051d8b922..500eb54ba22f0534a858a4374aae1f62c30b1cdf 100644 --- a/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java +++ b/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public abstract class SimpleAttachableMaterialData extends MaterialData implements Attachable { public SimpleAttachableMaterialData(Material type, BlockFace direction) { diff --git a/src/main/java/org/bukkit/material/Skull.java b/src/main/java/org/bukkit/material/Skull.java -index a73ad62468a9589f78e270a82cd9ac8ff1b240b2..bebe06be7279ce1c14c8c81ee58202f2ca3c3e20 100644 +index 8339519118c24206db38b55f8756941e9f762abc..95a38ab49303ebb38b8dfc0f996d8e786e273aa7 100644 --- a/src/main/java/org/bukkit/material/Skull.java +++ b/src/main/java/org/bukkit/material/Skull.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Skull extends MaterialData implements Directional { public Skull() { super(Material.LEGACY_SKULL); diff --git a/src/main/java/org/bukkit/material/SmoothBrick.java b/src/main/java/org/bukkit/material/SmoothBrick.java -index e4812b7cef9847745d147aad87181c4eb903f5df..171771ab8d3a0b095ed74c4da608a61769f6a2f1 100644 +index 0dfbe2891ff9f3a8f18e7e9867b2eab7fb3b4ae0..f97a874360ed0890df8452535698cb9148b57c1a 100644 --- a/src/main/java/org/bukkit/material/SmoothBrick.java +++ b/src/main/java/org/bukkit/material/SmoothBrick.java @@ -10,7 +10,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class SmoothBrick extends TexturedMaterial { private static final List<Material> textures = new ArrayList<Material>(); diff --git a/src/main/java/org/bukkit/material/SpawnEgg.java b/src/main/java/org/bukkit/material/SpawnEgg.java -index a177021d259110ebf0c26e5a19cea5d9f6f3a8a8..f14a918b41d61869bc3b4a644011f4d2260c19ae 100644 +index 601bd3cfd38d02d0e8b652c4c4771795cc2349c6..69011a06f0cd695370b63798113e30c4e4039f28 100644 --- a/src/main/java/org/bukkit/material/SpawnEgg.java +++ b/src/main/java/org/bukkit/material/SpawnEgg.java @@ -8,7 +8,7 @@ import org.bukkit.inventory.meta.SpawnEggMeta; * Represents a spawn egg that can be used to spawn mobs * @deprecated use {@link SpawnEggMeta} */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.11") ++@Deprecated(since = "1.13", forRemoval = true) public class SpawnEgg extends MaterialData { public SpawnEgg() { diff --git a/src/main/java/org/bukkit/material/Stairs.java b/src/main/java/org/bukkit/material/Stairs.java -index e5db60bd0d5c0d4990d418cf89415274c7698a9d..e7fe9cec387e2c86549cfad086839a241840582d 100644 +index c68a7045b98471ca150a00e977489cb0802eab10..3b3ca6e6e907521b18b7ce74cd5fb2edd58d2371 100644 --- a/src/main/java/org/bukkit/material/Stairs.java +++ b/src/main/java/org/bukkit/material/Stairs.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Stairs extends MaterialData implements Directional { public Stairs(final Material type) { diff --git a/src/main/java/org/bukkit/material/Step.java b/src/main/java/org/bukkit/material/Step.java -index ea94222120ddd4e692b67cf48b029af9ed0e5835..b7417693ff9efc5d6fc9d1899b0bb03c9664f903 100644 +index dc5eedb278c07e7f447fe8aae7a182d33b05cdfd..2ca3794b697dedec5b34d73104886c51e292575f 100644 --- a/src/main/java/org/bukkit/material/Step.java +++ b/src/main/java/org/bukkit/material/Step.java @@ -10,7 +10,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Step extends TexturedMaterial { private static final List<Material> textures = new ArrayList<Material>(); static { diff --git a/src/main/java/org/bukkit/material/TexturedMaterial.java b/src/main/java/org/bukkit/material/TexturedMaterial.java -index 6e0a834794453eff7b3efc93e90c9bf49ef7c688..fcac4e6aafd906c14683f0ab0843a7b9ca4d62c7 100644 +index 39adc75f7f81075f61a26e775b622ffc4eec4cff..361e2697308fbddc12e3bdbff336d6dfd6f39a25 100644 --- a/src/main/java/org/bukkit/material/TexturedMaterial.java +++ b/src/main/java/org/bukkit/material/TexturedMaterial.java @@ -9,7 +9,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public abstract class TexturedMaterial extends MaterialData { public TexturedMaterial(Material m) { diff --git a/src/main/java/org/bukkit/material/Torch.java b/src/main/java/org/bukkit/material/Torch.java -index a4f0c62dcd39f94a68bca8cc76311847118d9ad1..2dafb1bb9779cc25471b5dfc0176a81014e8c840 100644 +index 194cd646221af2dd11f78ca427a7e672120ad1ca..b74e70f89c8a237eac0f0d0c4d5a94bd964a4163 100644 --- a/src/main/java/org/bukkit/material/Torch.java +++ b/src/main/java/org/bukkit/material/Torch.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Torch extends SimpleAttachableMaterialData { public Torch() { super(Material.LEGACY_TORCH); diff --git a/src/main/java/org/bukkit/material/TrapDoor.java b/src/main/java/org/bukkit/material/TrapDoor.java -index effedfc714d67254428b548bba74264cdba4ba15..ed8035f3f45d07a08346efeebf206bcfdb083bc6 100644 +index 24b4391a915f5ffd8b236277764c73b25acddfff..3c1082931790b5b65792a04f63f70cd00d2db118 100644 --- a/src/main/java/org/bukkit/material/TrapDoor.java +++ b/src/main/java/org/bukkit/material/TrapDoor.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class TrapDoor extends SimpleAttachableMaterialData implements Openable { public TrapDoor() { super(Material.LEGACY_TRAP_DOOR); diff --git a/src/main/java/org/bukkit/material/Tree.java b/src/main/java/org/bukkit/material/Tree.java -index e759f50339903ab10f50bebe56bab5cfe8d9f7e0..4f79b8ac23e4851da9ed41858eafaffa39efb59a 100644 +index 5c733a33633829efc7c6429dcff2ef5146bcc347..0c113a39a6a954a1606c2eeeb236838d341d2388 100644 --- a/src/main/java/org/bukkit/material/Tree.java +++ b/src/main/java/org/bukkit/material/Tree.java @@ -13,7 +13,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Tree extends Wood { protected static final Material DEFAULT_TYPE = Material.LEGACY_LOG; protected static final BlockFace DEFAULT_DIRECTION = BlockFace.UP; diff --git a/src/main/java/org/bukkit/material/Tripwire.java b/src/main/java/org/bukkit/material/Tripwire.java -index e5ffa4db87b435df8c04f1b43521fda6493fd43d..eb667f22b7a143d695cf78219986230c57ab229f 100644 +index 4378b2992b32b730d1cc8fa43a8ac693b9c5e2a6..676d5ebeac4536d37e24ccf2ce4c7a9aa4816c03 100644 --- a/src/main/java/org/bukkit/material/Tripwire.java +++ b/src/main/java/org/bukkit/material/Tripwire.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Tripwire extends MaterialData { public Tripwire() { diff --git a/src/main/java/org/bukkit/material/TripwireHook.java b/src/main/java/org/bukkit/material/TripwireHook.java -index 80aa1c7bc7a1ef71b51101b154361feff4dcf88e..8a19008272897fa32b0b30504545a9873b82a54c 100644 +index 458a3e9fc2e8f6d2a0a5c665422cee063c521f56..1864bb64d7dd464064fd0f63e7d78d9dd623dced 100644 --- a/src/main/java/org/bukkit/material/TripwireHook.java +++ b/src/main/java/org/bukkit/material/TripwireHook.java @@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class TripwireHook extends SimpleAttachableMaterialData implements Redstone { public TripwireHook() { diff --git a/src/main/java/org/bukkit/material/Vine.java b/src/main/java/org/bukkit/material/Vine.java -index 07a4f3b1511e274affe751aad2b9020b49df815f..574b09896f25e42e20c8953e9668cc4edae31348 100644 +index 784ea52519fee07507cd42a449e75afdec72aa66..4cb1d983217ce727f1ad39af1075640ce797a01f 100644 --- a/src/main/java/org/bukkit/material/Vine.java +++ b/src/main/java/org/bukkit/material/Vine.java @@ -11,7 +11,7 @@ import org.bukkit.block.BlockFace; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Vine extends MaterialData { private static final int VINE_NORTH = 0x4; private static final int VINE_EAST = 0x8; diff --git a/src/main/java/org/bukkit/material/Wood.java b/src/main/java/org/bukkit/material/Wood.java -index 5d51c9286dbf71ff4bb8717d5e83431b1815770e..2d4556ce2367395d42d622d94f073de9ae4e4a36 100644 +index 62253cfc84473bfa0028271893a87984385c356b..d139a212f46f970839dec8607c40937e2750cc40 100644 --- a/src/main/java/org/bukkit/material/Wood.java +++ b/src/main/java/org/bukkit/material/Wood.java @@ -13,7 +13,7 @@ import org.bukkit.TreeSpecies; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Wood extends MaterialData { protected static final Material DEFAULT_TYPE = Material.LEGACY_WOOD; protected static final TreeSpecies DEFAULT_SPECIES = TreeSpecies.GENERIC; diff --git a/src/main/java/org/bukkit/material/WoodenStep.java b/src/main/java/org/bukkit/material/WoodenStep.java -index b99a9a304d1c14c187ad2721424d5e5caed90973..827bcd7284919a7f7a71a3ea53c2c67bbbca378b 100644 +index 24990ed25759cd7a77bbd1b88bedb6063d1b3463..df6223d836bbb1ff0233f3071b0464df8ad9616c 100644 --- a/src/main/java/org/bukkit/material/WoodenStep.java +++ b/src/main/java/org/bukkit/material/WoodenStep.java @@ -11,7 +11,7 @@ import org.bukkit.TreeSpecies; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class WoodenStep extends Wood { protected static final Material DEFAULT_TYPE = Material.LEGACY_WOOD_STEP; protected static final boolean DEFAULT_INVERTED = false; diff --git a/src/main/java/org/bukkit/material/Wool.java b/src/main/java/org/bukkit/material/Wool.java -index 3b17409a98b53538989a8d2d5ad1b80643befeab..c5b32246f9d777d5b02f27ca616bdf8323a14ccd 100644 +index 5ad1f9f1995d3b8e4d71126c66217e817c587291..9758818bfbcee789bc8a705df0ff3c0b2fe56e97 100644 --- a/src/main/java/org/bukkit/material/Wool.java +++ b/src/main/java/org/bukkit/material/Wool.java @@ -8,7 +8,7 @@ import org.bukkit.Material; * @deprecated all usage of MaterialData is deprecated and subject to removal. * Use {@link org.bukkit.block.data.BlockData}. */ --@Deprecated -+@Deprecated(forRemoval = true, since = "1.13") +-@Deprecated(since = "1.14.1") ++@Deprecated(since = "1.13", forRemoval = true) public class Wool extends MaterialData implements Colorable { public Wool() { super(Material.LEGACY_WOOL); diff --git a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java b/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java -index 0ea9c6b2420a0f990bd1fdf50fc015e37a7060d8..e99644eae1c662b117aa19060d2484aca19fe0a4 100644 +index 0044381b8ac521968b0915b76a74fd1f2542c2d0..8e6e22cefb432b07aa59f8b73b89e952bacbf902 100644 --- a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java +++ b/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java @@ -7,7 +7,9 @@ import org.jetbrains.annotations.Nullable; @@ -2821,7 +2821,7 @@ index 0ea9c6b2420a0f990bd1fdf50fc015e37a7060d8..e99644eae1c662b117aa19060d2484ac /** diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java -index bd9ea2fe16b81f5ef5e83427e49c898db69cd4dc..e2d1d26b9debbe1ef852f0260180200a916a7db7 100644 +index 7fbcb12516a77b594061375abb0a447832abccc2..6375eed0ef4f8e897a00b4f77fb45b354888e74e 100644 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java @@ -278,9 +278,9 @@ public abstract class PotionEffectType implements Keyed, Translatable { @@ -2831,8 +2831,8 @@ index bd9ea2fe16b81f5ef5e83427e49c898db69cd4dc..e2d1d26b9debbe1ef852f0260180200a - * @deprecated Magic value + * @deprecated use {@link #key()} */ -- @Deprecated -+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper +- @Deprecated(since = "1.6.2") ++ @Deprecated(since = "1.6.2", forRemoval = true) // Paper public abstract int getId(); /** @@ -2843,7 +2843,7 @@ index bd9ea2fe16b81f5ef5e83427e49c898db69cd4dc..e2d1d26b9debbe1ef852f0260180200a - * @deprecated Magic value + * @apiNote Internal Use Only */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static PotionEffectType getById(int id) { |