diff options
author | Jake Potrebic <[email protected]> | 2024-06-04 12:40:18 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2024-06-04 15:40:18 -0400 |
commit | 79c1ce184486847c614250e4e2025fd95a61cde5 (patch) | |
tree | 3ffc0ea329adc2c1f05a17e4a99ca1f4014d8121 /patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch | |
parent | 4f13be937eda5ee18010b271474a91894348e3e4 (diff) | |
download | Paper-79c1ce184486847c614250e4e2025fd95a61cde5.tar.gz Paper-79c1ce184486847c614250e4e2025fd95a61cde5.zip |
Add since to deprecated for removals (#10848)
Diffstat (limited to 'patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch')
-rw-r--r-- | patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch index c2205057df..374a6c7913 100644 --- a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -18,7 +18,7 @@ Y range: [0, 1023] X, Z range: [-67 108 864, 67 108 863] diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 41125de49db8eafce4be59cc110ce5be06836a47..042d69e6d4584eb6d678b8ea13a3e4bea78703b8 100644 +index 41125de49db8eafce4be59cc110ce5be06836a47..4df9a225e93aafb1e4af9591c482ac07e7f65422 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable; @@ -40,7 +40,7 @@ index 41125de49db8eafce4be59cc110ce5be06836a47..042d69e6d4584eb6d678b8ea13a3e4be + * @see Block#getBlockKey(int, int, int) + * @deprecated only encodes y block ranges from -512 to 511 and represents an already changed implementation detail + */ -+ @Deprecated ++ @Deprecated(since = "1.18.1") + public long toBlockKey() { + return Block.getBlockKey(getBlockX(), getBlockY(), getBlockZ()); + } @@ -50,7 +50,7 @@ index 41125de49db8eafce4be59cc110ce5be06836a47..042d69e6d4584eb6d678b8ea13a3e4be * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 273c50b6e4f26457415779000cf09aeaffd21733..575fd50b8456beed7c5049a392fca011271a8fe4 100644 +index 273c50b6e4f26457415779000cf09aeaffd21733..0eb6e1b0529d14ed10e901d37c6fdf896e2de8e4 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -99,6 +99,41 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @@ -67,7 +67,7 @@ index 273c50b6e4f26457415779000cf09aeaffd21733..575fd50b8456beed7c5049a392fca011 + * @deprecated only encodes y block ranges from -512 to 511 and represents an already changed implementation detail + */ + @NotNull -+ @Deprecated ++ @Deprecated(since = "1.18.1") + public default Block getBlockAtKey(long key) { + int x = Block.getBlockKeyX(key); + int y = Block.getBlockKeyY(key); @@ -83,7 +83,7 @@ index 273c50b6e4f26457415779000cf09aeaffd21733..575fd50b8456beed7c5049a392fca011 + * @see Block#getBlockKey(int, int, int) + */ + @NotNull -+ @Deprecated ++ @Deprecated(since = "1.18.1") + public default Location getLocationAtKey(long key) { + int x = Block.getBlockKeyX(key); + int y = Block.getBlockKeyY(key); @@ -96,7 +96,7 @@ index 273c50b6e4f26457415779000cf09aeaffd21733..575fd50b8456beed7c5049a392fca011 * Gets the highest non-empty (impassable) block at the given coordinates. * diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index f3b3606dc5881e931853fc2631aad9ca9083474d..a71001677e2b1b0b6225a7be63b8ea5ce4456862 100644 +index f3b3606dc5881e931853fc2631aad9ca9083474d..bb3cf2c5e2acbcd7cf53ad8551a5b11fa6104ada 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -156,6 +156,82 @@ public interface Block extends Metadatable, Translatable { @@ -111,7 +111,7 @@ index f3b3606dc5881e931853fc2631aad9ca9083474d..a71001677e2b1b0b6225a7be63b8ea5c + * @return This block's x, y, and z coordinates packed into a long value + * @deprecated see {@link #getBlockKey(int, int, int)} + */ -+ @Deprecated ++ @Deprecated(since = "1.18.1") + public default long getBlockKey() { + return Block.getBlockKey(this.getX(), this.getY(), this.getZ()); + } @@ -137,7 +137,7 @@ index f3b3606dc5881e931853fc2631aad9ca9083474d..a71001677e2b1b0b6225a7be63b8ea5c + * @return This block's x, y, and z coordinates packed into a long value + * @deprecated only encodes y block ranges from -512 to 511 and represents an already changed implementation detail + */ -+ @Deprecated ++ @Deprecated(since = "1.18.1") + public static long getBlockKey(int x, int y, int z) { + return ((long)x & 0x7FFFFFF) | (((long)z & 0x7FFFFFF) << 27) | ((long)y << 54); + } @@ -149,7 +149,7 @@ index f3b3606dc5881e931853fc2631aad9ca9083474d..a71001677e2b1b0b6225a7be63b8ea5c + * @return The x component from the packed value. + * @deprecated see {@link #getBlockKey(int, int, int)} + */ -+ @Deprecated ++ @Deprecated(since = "1.18.1") + public static int getBlockKeyX(long packed) { + return (int) ((packed << 37) >> 37); + } @@ -161,7 +161,7 @@ index f3b3606dc5881e931853fc2631aad9ca9083474d..a71001677e2b1b0b6225a7be63b8ea5c + * @return The y component from the packed value. + * @deprecated see {@link #getBlockKey(int, int, int)} + */ -+ @Deprecated ++ @Deprecated(since = "1.18.1") + public static int getBlockKeyY(long packed) { + return (int) (packed >> 54); + } @@ -173,7 +173,7 @@ index f3b3606dc5881e931853fc2631aad9ca9083474d..a71001677e2b1b0b6225a7be63b8ea5c + * @return The z component from the packed value. + * @deprecated see {@link #getBlockKey(int, int, int)} + */ -+ @Deprecated ++ @Deprecated(since = "1.18.1") + public static int getBlockKeyZ(long packed) { + return (int) ((packed << 10) >> 37); + } |