diff options
Diffstat (limited to 'patches/api/0166-Fix-Spigot-annotation-mistakes.patch')
| -rw-r--r-- | patches/api/0166-Fix-Spigot-annotation-mistakes.patch | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch index 8b72c6da07..c781240a60 100644 --- a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch @@ -690,7 +690,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..fd4a9bdcfb6775dfbdb7492e6c9eb90722d2ecdc 100644 +index 3e07fc1bc0e08d0cfd998711c7fd547b2b7b6b73..f4a739d8022d19a7ae0ee9bf93eb5c4846b4bd40 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 { @@ -700,7 +700,7 @@ index 3e07fc1bc0e08d0cfd998711c7fd547b2b7b6b73..fd4a9bdcfb6775dfbdb7492e6c9eb907 + * @deprecated use {@link #getBlockData()} */ @NotNull -+ @Deprecated // Paper ++ @Deprecated(forRemoval = true, since = "1.13") MaterialData getData(); /** @@ -710,7 +710,7 @@ index 3e07fc1bc0e08d0cfd998711c7fd547b2b7b6b73..fd4a9bdcfb6775dfbdb7492e6c9eb907 * @param data New block specific metadata + * @deprecated use {@link #setBlockData(BlockData)} */ -+ @Deprecated // Paper ++ @Deprecated(forRemoval = true, since = "1.13") void setData(@NotNull MaterialData data); /** @@ -794,7 +794,7 @@ index 493f81ba879d1eb29a32722da27e4ff7ce4c68a8..8bf9bf7940d2911486e9d3a4f688cfae public ItemStack getWeapon(); diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java -index 3afe2787de576f7190d87c796bea0ab34dc30248..58191017244f3949f6174fb108e3a245738a53c4 100644 +index 3afe2787de576f7190d87c796bea0ab34dc30248..875817b807c9f515eb07b03cc85d368955388dc3 100644 --- a/src/main/java/org/bukkit/entity/Enderman.java +++ b/src/main/java/org/bukkit/entity/Enderman.java @@ -25,15 +25,19 @@ public interface Enderman extends Monster { @@ -804,7 +804,7 @@ index 3afe2787de576f7190d87c796bea0ab34dc30248..58191017244f3949f6174fb108e3a245 + * @deprecated use {@link #getCarriedBlock()} */ @NotNull -+ @Deprecated // Paper ++ @Deprecated(forRemoval = true, since = "1.13") public MaterialData getCarriedMaterial(); /** @@ -813,7 +813,7 @@ index 3afe2787de576f7190d87c796bea0ab34dc30248..58191017244f3949f6174fb108e3a245 * @param material data to set the carried block to + * @deprecated use {@link #setCarriedBlock(BlockData)} */ -+ @Deprecated // Paper ++ @Deprecated(forRemoval = true, since = "1.13") public void setCarriedMaterial(@NotNull MaterialData material); /** @@ -913,7 +913,7 @@ index b5ea7b60b47f056553a1cec766c57e0f75735633..ec35111df4b38fd55cc34f4baedebcf3 /** diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java -index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621bacf864075 100644 +index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..a1e4328994a119de2966dce5470581b5a520d55e 100644 --- a/src/main/java/org/bukkit/entity/Minecart.java +++ b/src/main/java/org/bukkit/entity/Minecart.java @@ -101,7 +101,9 @@ public interface Minecart extends Vehicle { @@ -922,7 +922,7 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba * @param material the material to set as display block. + * @deprecated use {@link #setDisplayBlockData(BlockData)} */ -+ @Deprecated // Paper ++ @Deprecated(forRemoval = true, since = "1.13") public void setDisplayBlock(@Nullable MaterialData material); /** @@ -933,7 +933,7 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba + * @deprecated use {@link #getDisplayBlockData()} */ @NotNull -+ @Deprecated // Paper ++ @Deprecated(forRemoval = true, since = "1.13") public MaterialData getDisplayBlock(); /** @@ -1540,7 +1540,7 @@ index 3d08beee52f2247db6f6e679206ed6a965fbf9a8..1b4f9b93860e58762ac28715adad5a67 /** diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index d125d29759167996a90b7b69d92d944e80af22ab..d5dd79c98f4d37b09d232214f06ed7dca3a7e6dd 100644 +index d125d29759167996a90b7b69d92d944e80af22ab..e9c29fc1db686b80bc2477d78ec2b361b8600b9e 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; @@ -1551,6 +1551,15 @@ index d125d29759167996a90b7b69d92d944e80af22ab..d5dd79c98f4d37b09d232214f06ed7dc import org.bukkit.Utility; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.enchantments.Enchantment; +@@ -82,7 +83,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat + * @param data the data value or null + * @deprecated this method uses an ambiguous data byte object + */ +- @Deprecated ++ @Deprecated(forRemoval = true, since = "1.13") + 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()) { @@ -179,8 +180,10 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat * Gets the MaterialData for this stack of items * @@ -1558,7 +1567,7 @@ index d125d29759167996a90b7b69d92d944e80af22ab..d5dd79c98f4d37b09d232214f06ed7dc + * @deprecated cast to {@link org.bukkit.inventory.meta.BlockDataMeta} and use {@link org.bukkit.inventory.meta.BlockDataMeta#getBlockData(Material)} */ @Nullable -+ @Deprecated // Paper ++ @Deprecated(forRemoval = true, since = "1.13") public MaterialData getData() { Material mat = Bukkit.getUnsafe().toLegacy(getType()); if (data == null && mat != null && mat.getData() != null) { @@ -1568,7 +1577,7 @@ index d125d29759167996a90b7b69d92d944e80af22ab..d5dd79c98f4d37b09d232214f06ed7dc * @param data New MaterialData for this item + * @deprecated cast to {@link org.bukkit.inventory.meta.BlockDataMeta} and use {@link org.bukkit.inventory.meta.BlockDataMeta#setBlockData(org.bukkit.block.data.BlockData)} */ -+ @Deprecated // Paper ++ @Deprecated(forRemoval = true, since = "1.13") public void setData(@Nullable MaterialData data) { if (data == null) { this.data = data; |