Skip to content

Commit ab666a4

Browse files
Machine-MakerMachine-Maker
authored
Deprecating remaining blockkey methods (#7638)
1 parent a939d6e commit ab666a4

9 files changed

+29
-25
lines changed

‎patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Y range: [0, 1023]
1818
X, Z range: [-67 108 864, 67 108 863]
1919

2020
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
21-
index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..58728a0f0722b378efa129e26f0c822b63d1af36 100644
21+
index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..5c5e05673e0912f4dbd6c728f4c3b7fcdae8f0e8 100644
2222
--- a/src/main/java/org/bukkit/Location.java
2323
+++ b/src/main/java/org/bukkit/Location.java
2424
@@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable;
@@ -29,7 +29,7 @@ index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..58728a0f0722b378efa129e26f0c822b
2929
import java.util.function.Predicate;
3030
import org.bukkit.entity.Entity;
3131
import org.bukkit.entity.LivingEntity;
32-
@@ -605,6 +604,17 @@ public class Location implements Cloneable, ConfigurationSerializable {
32+
@@ -605,6 +604,19 @@ public class Location implements Cloneable, ConfigurationSerializable {
3333
blockLoc.setZ(getBlockZ());
3434
return blockLoc;
3535
}
@@ -38,7 +38,9 @@ index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..58728a0f0722b378efa129e26f0c822b
3838
+ /**
3939
+ * @return The block key for this location's block location.
4040
+ * @see Block#getBlockKey(int, int, int)
41+
+ * @deprecated only encodes y block ranges from -512 to 511 and represents an already changed implementation detail
4142
+ */
43+
+ @Deprecated
4244
+ public long toBlockKey() {
4345
+ return Block.getBlockKey(getBlockX(), getBlockY(), getBlockZ());
4446
+ }
@@ -48,10 +50,10 @@ index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..58728a0f0722b378efa129e26f0c822b
4850
* @return A new location where X/Y/Z are the center of the block
4951
*/
5052
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
51-
index ee277a464b1ecaaa7948c333a04e347e6255c904..7d77647dfe085cde87a9d2adb4c02b1f441940d7 100644
53+
index a501384906fa01ddc83476ef2dbbb8d11a03fb8c..449d6882c8f41d9e0f46436c430e071b85eb2775 100644
5254
--- a/src/main/java/org/bukkit/World.java
5355
+++ b/src/main/java/org/bukkit/World.java
54-
@@ -92,6 +92,38 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
56+
@@ -92,6 +92,40 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
5557
@NotNull
5658
public Block getBlockAt(@NotNull Location location);
5759

@@ -62,8 +64,10 @@ index ee277a464b1ecaaa7948c333a04e347e6255c904..7d77647dfe085cde87a9d2adb4c02b1f
6264
+ * @param key The block key. See {@link Block#getBlockKey()}
6365
+ * @return Block at the key
6466
+ * @see Block#getBlockKey(int, int, int)
67+
+ * @deprecated only encodes y block ranges from -512 to 511 and represents an already changed implementation detail
6568
+ */
6669
+ @NotNull
70+
+ @Deprecated
6771
+ public default Block getBlockAtKey(long key) {
6872
+ int x = Block.getBlockKeyX(key);
6973
+ int y = Block.getBlockKeyY(key);

‎patches/api/0144-isChunkGenerated-API.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] isChunkGenerated API
55

66

77
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
8-
index 58728a0f0722b378efa129e26f0c822b63d1af36..88b3e0323dbc4f0fce31b147c7aaa08d65745852 100644
8+
index 5c5e05673e0912f4dbd6c728f4c3b7fcdae8f0e8..57cb548683f7b2972c998afd34176952426f8b47 100644
99
--- a/src/main/java/org/bukkit/Location.java
1010
+++ b/src/main/java/org/bukkit/Location.java
1111
@@ -3,6 +3,7 @@ package org.bukkit;
@@ -34,10 +34,10 @@ index 58728a0f0722b378efa129e26f0c822b63d1af36..88b3e0323dbc4f0fce31b147c7aaa08d
3434
/**
3535
* Sets the position of this Location and returns itself
3636
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
37-
index 7d77647dfe085cde87a9d2adb4c02b1f441940d7..39f7817838c73c78f138c98546a1b797e7529550 100644
37+
index 449d6882c8f41d9e0f46436c430e071b85eb2775..dcca66c345b3c51d7b9956ddd3ac2bf0b789899c 100644
3838
--- a/src/main/java/org/bukkit/World.java
3939
+++ b/src/main/java/org/bukkit/World.java
40-
@@ -255,6 +255,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
40+
@@ -257,6 +257,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
4141
public default Chunk getChunkAt(long chunkKey) {
4242
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
4343
}

‎patches/api/0146-Async-Chunks-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously.
88
Also adds utility methods to Entity to teleport asynchronously.
99

1010
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
11-
index 39f7817838c73c78f138c98546a1b797e7529550..fc8631f45abaaabe2cdb7653c43b98b36a80ec78 100644
11+
index dcca66c345b3c51d7b9956ddd3ac2bf0b789899c..04583189f7ed9a446ed649780e2b99cb5e1ab3ad 100644
1212
--- a/src/main/java/org/bukkit/World.java
1313
+++ b/src/main/java/org/bukkit/World.java
14-
@@ -964,6 +964,482 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
14+
@@ -966,6 +966,482 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1515
}
1616
return nearby;
1717
}

‎patches/api/0159-Add-sun-related-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sun related API
55

66

77
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
8-
index fc8631f45abaaabe2cdb7653c43b98b36a80ec78..656b39a3ca70afb2cb00c3c827e850912ebc4d0e 100644
8+
index 04583189f7ed9a446ed649780e2b99cb5e1ab3ad..f36eb8896ee84c1d3bbce17b11ed05c5f99f2e29 100644
99
--- a/src/main/java/org/bukkit/World.java
1010
+++ b/src/main/java/org/bukkit/World.java
11-
@@ -1791,6 +1791,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
11+
@@ -1793,6 +1793,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1212
*/
1313
public void setFullTime(long time);
1414

‎patches/api/0178-Add-Heightmap-API.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ index 0000000000000000000000000000000000000000..709e44ea1b14ab6917501c928e689cc6
5151
+ SOLID_OR_LIQUID_NO_LEAVES;
5252
+}
5353
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
54-
index 23ca89dde7f6ac9082d4b97fce2959425f3680cb..8321441b8f528a05e297f485672f928e76fe017d 100644
54+
index d4c87bfed81b2d73919705912f59fab05c0ee61b..ef0cb00ca4cb7d2f5e4ec1c950cce036566d1ae4 100644
5555
--- a/src/main/java/org/bukkit/Location.java
5656
+++ b/src/main/java/org/bukkit/Location.java
57-
@@ -638,6 +638,47 @@ public class Location implements Cloneable, ConfigurationSerializable {
57+
@@ -640,6 +640,47 @@ public class Location implements Cloneable, ConfigurationSerializable {
5858
return centerLoc;
5959
}
6060

@@ -103,10 +103,10 @@ index 23ca89dde7f6ac9082d4b97fce2959425f3680cb..8321441b8f528a05e297f485672f928e
103103
* Creates explosion at this location with given power
104104
*
105105
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
106-
index 656b39a3ca70afb2cb00c3c827e850912ebc4d0e..fe2b9b88ad854f29e9162a316ca952b9f0b38121 100644
106+
index f36eb8896ee84c1d3bbce17b11ed05c5f99f2e29..23fd3f85288ef1fbfb104df7a636ad69042704a7 100644
107107
--- a/src/main/java/org/bukkit/World.java
108108
+++ b/src/main/java/org/bukkit/World.java
109-
@@ -162,6 +162,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
109+
@@ -164,6 +164,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
110110
@NotNull
111111
public Block getHighestBlockAt(@NotNull Location location);
112112

‎patches/api/0276-Implement-Keyed-on-World.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Keyed on World
55

66

77
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
8-
index 0aa141c590cf61a1fc99bec4cf8d5590a3ab6519..c8ea04b06d7178c6cc992a9a1b0355a70a035152 100644
8+
index e02ad513d0bc20f1f847d9cffe3f7dbf3269b530..8106fd5806fc47cb7138e01d9d5c458153afa3d5 100644
99
--- a/src/main/java/org/bukkit/Bukkit.java
1010
+++ b/src/main/java/org/bukkit/Bukkit.java
1111
@@ -791,6 +791,18 @@ public final class Bukkit {
@@ -28,7 +28,7 @@ index 0aa141c590cf61a1fc99bec4cf8d5590a3ab6519..c8ea04b06d7178c6cc992a9a1b0355a7
2828
/**
2929
* Gets the map from the given item ID.
3030
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
31-
index 76e42cc79bf3f7e677e06f136fd6c1fe0d94f260..75aba8c3db5198c11e0bb9c262388632a47d93e6 100644
31+
index 36fb8f14da0ed8192a91d509bcee94f99bea9354..d43f785471d3671bad6eb270a87a70b27f85adcb 100644
3232
--- a/src/main/java/org/bukkit/Server.java
3333
+++ b/src/main/java/org/bukkit/Server.java
3434
@@ -673,6 +673,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -50,7 +50,7 @@ index 76e42cc79bf3f7e677e06f136fd6c1fe0d94f260..75aba8c3db5198c11e0bb9c262388632
5050
* Gets the map from the given item ID.
5151
*
5252
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
53-
index 37f0acb893f886ac0605838eb03b4a935b96f85b..47b9b8b476cbc7a4ef329dbd7629195851c8f4ea 100644
53+
index 513de620accbee93a04ef729dd386dadba566a8f..caa674ed1e4b3a940cee05a79d1af47b20e3badb 100644
5454
--- a/src/main/java/org/bukkit/World.java
5555
+++ b/src/main/java/org/bukkit/World.java
5656
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
@@ -62,7 +62,7 @@ index 37f0acb893f886ac0605838eb03b4a935b96f85b..47b9b8b476cbc7a4ef329dbd76291958
6262

6363
// Paper start
6464
/**
65-
@@ -1527,6 +1527,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
65+
@@ -1529,6 +1529,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
6666

6767
@NotNull
6868
java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent);

‎patches/api/0284-More-World-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
55

66

77
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
8-
index 47b9b8b476cbc7a4ef329dbd7629195851c8f4ea..def9f0f9803e71cbe57abcffeb9114a5ab462e54 100644
8+
index caa674ed1e4b3a940cee05a79d1af47b20e3badb..a1922fd862872442ec9dd07b6c24b0d764b11b71 100644
99
--- a/src/main/java/org/bukkit/World.java
1010
+++ b/src/main/java/org/bukkit/World.java
11-
@@ -3645,6 +3645,114 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
11+
@@ -3647,6 +3647,114 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1212
@Nullable
1313
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);
1414

‎patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
55

66

77
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
8-
index d149dd1d3d2703a428006e0c3ab5f9251e560882..22191f733bbda0710ffae425fda1861e3c2ec87f 100644
8+
index 2173d1e675bdb90f3117614e6e52dac61b4fada9..887ad76c3ea44f0dcfcd21f30c0883e023f1ac3a 100644
99
--- a/src/main/java/org/bukkit/World.java
1010
+++ b/src/main/java/org/bukkit/World.java
11-
@@ -759,6 +759,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
11+
@@ -761,6 +761,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1212
@NotNull
1313
public LightningStrike strikeLightningEffect(@NotNull Location loc);
1414

‎patches/api/0365-Implement-regenerateChunk.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement regenerateChunk
55

66

77
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
8-
index 22191f733bbda0710ffae425fda1861e3c2ec87f..8a688583e65cd22e0417f9fd24e51803486d095e 100644
8+
index 887ad76c3ea44f0dcfcd21f30c0883e023f1ac3a..3421be8309c9083c0aaa80afec13c8acc4fc85dd 100644
99
--- a/src/main/java/org/bukkit/World.java
1010
+++ b/src/main/java/org/bukkit/World.java
11-
@@ -507,8 +507,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
11+
@@ -509,8 +509,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1212
* @return Whether the chunk was actually regenerated
1313
*
1414
* @deprecated regenerating a single chunk is not likely to produce the same

0 commit comments

Comments
 (0)