mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 02:25:28 +01:00
52a05907c7
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
160 lines
8.5 KiB
Diff
160 lines
8.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 10 Dec 2022 17:52:45 -0800
|
|
Subject: [PATCH] Deprecate and replace methods with old StructureType
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 52c601328bbf5c1642aa620c8bb466a9d2d231be..c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -949,9 +949,6 @@ public final class Bukkit {
|
|
/**
|
|
* Create a new explorer map targeting the closest nearby structure of a
|
|
* given {@link StructureType}.
|
|
- * <br>
|
|
- * This method uses implementation default values for radius and
|
|
- * findUnexplored (usually 100, true).
|
|
*
|
|
* @param world the world the map will belong to
|
|
* @param location the origin location to find the nearest structure
|
|
@@ -960,7 +957,9 @@ public final class Bukkit {
|
|
*
|
|
* @see World#locateNearestStructure(org.bukkit.Location,
|
|
* org.bukkit.StructureType, int, boolean)
|
|
+ * @deprecated use {@link #createExplorerMap(World, Location, org.bukkit.generator.structure.StructureType, org.bukkit.map.MapCursor.Type)}
|
|
*/
|
|
+ @Deprecated // Paper
|
|
@NotNull
|
|
public static ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType) {
|
|
return server.createExplorerMap(world, location, structureType);
|
|
@@ -983,11 +982,54 @@ public final class Bukkit {
|
|
*
|
|
* @see World#locateNearestStructure(org.bukkit.Location,
|
|
* org.bukkit.StructureType, int, boolean)
|
|
+ * @deprecated use {@link #createExplorerMap(World, Location, org.bukkit.generator.structure.StructureType, org.bukkit.map.MapCursor.Type, int, boolean)}
|
|
*/
|
|
+ @Deprecated // Paper
|
|
@NotNull
|
|
public static ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType, int radius, boolean findUnexplored) {
|
|
return server.createExplorerMap(world, location, structureType, radius, findUnexplored);
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Create a new explorer map targeting the closest nearby structure of a
|
|
+ * given {@link org.bukkit.generator.structure.StructureType}.
|
|
+ * <br>
|
|
+ * This method uses implementation default values for radius and
|
|
+ * findUnexplored (usually 100, true).
|
|
+ *
|
|
+ * @param world the world the map will belong to
|
|
+ * @param location the origin location to find the nearest structure
|
|
+ * @param structureType the type of structure to find
|
|
+ * @param mapIcon the map icon to use on the map
|
|
+ * @return a newly created item stack or null if it can't find a location
|
|
+ *
|
|
+ * @see World#locateNearestStructure(org.bukkit.Location,
|
|
+ * org.bukkit.generator.structure.StructureType, int, boolean)
|
|
+ */
|
|
+ public static @Nullable ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull org.bukkit.generator.structure.StructureType structureType, @NotNull org.bukkit.map.MapCursor.Type mapIcon) {
|
|
+ return server.createExplorerMap(world, location, structureType, mapIcon);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Create a new explorer map targeting the closest nearby structure of a
|
|
+ * given {@link org.bukkit.generator.structure.StructureType}.
|
|
+ *
|
|
+ * @param world the world the map will belong to
|
|
+ * @param location the origin location to find the nearest structure
|
|
+ * @param structureType the type of structure to find
|
|
+ * @param mapIcon the map icon to use on the map
|
|
+ * @param radius radius to search, see World#locateNearestStructure for more
|
|
+ * information
|
|
+ * @param findUnexplored whether to find unexplored structures
|
|
+ * @return the newly created item stack or null if it can't find a location
|
|
+ *
|
|
+ * @see World#locateNearestStructure(org.bukkit.Location,
|
|
+ * org.bukkit.generator.structure.StructureType, int, boolean)
|
|
+ */
|
|
+ public static @Nullable ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull org.bukkit.generator.structure.StructureType structureType, @NotNull org.bukkit.map.MapCursor.Type mapIcon, int radius, boolean findUnexplored) {
|
|
+ return server.createExplorerMap(world, location, structureType, mapIcon, radius, findUnexplored);
|
|
+ }
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Reloads the server, refreshing settings and plugin information.
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 8ba2fbaab7428a42b506fd000fbc162f68ddaed1..50ffca9bccfb582d58ccb13f0decf66e5d91aef3 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -817,16 +817,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*
|
|
* @see World#locateNearestStructure(org.bukkit.Location,
|
|
* org.bukkit.StructureType, int, boolean)
|
|
+ * @deprecated use {@link #createExplorerMap(World, Location, org.bukkit.generator.structure.StructureType, org.bukkit.map.MapCursor.Type)}
|
|
*/
|
|
+ @Deprecated // Paper
|
|
@NotNull
|
|
public ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType);
|
|
|
|
/**
|
|
* Create a new explorer map targeting the closest nearby structure of a
|
|
* given {@link StructureType}.
|
|
- * <br>
|
|
- * This method uses implementation default values for radius and
|
|
- * findUnexplored (usually 100, true).
|
|
*
|
|
* @param world the world the map will belong to
|
|
* @param location the origin location to find the nearest structure
|
|
@@ -838,9 +837,50 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*
|
|
* @see World#locateNearestStructure(org.bukkit.Location,
|
|
* org.bukkit.StructureType, int, boolean)
|
|
+ * @deprecated use {@link #createExplorerMap(World, Location, org.bukkit.generator.structure.StructureType, org.bukkit.map.MapCursor.Type, int, boolean)}
|
|
*/
|
|
+ @Deprecated // Paper
|
|
@NotNull
|
|
public ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType, int radius, boolean findUnexplored);
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Create a new explorer map targeting the closest nearby structure of a
|
|
+ * given {@link org.bukkit.generator.structure.StructureType}.
|
|
+ * <br>
|
|
+ * This method uses implementation default values for radius and
|
|
+ * findUnexplored (usually 100, true).
|
|
+ *
|
|
+ * @param world the world the map will belong to
|
|
+ * @param location the origin location to find the nearest structure
|
|
+ * @param structureType the type of structure to find
|
|
+ * @param mapIcon the map icon to use on the map
|
|
+ * @return a newly created item stack or null if it can't find a location
|
|
+ *
|
|
+ * @see World#locateNearestStructure(org.bukkit.Location,
|
|
+ * org.bukkit.generator.structure.StructureType, int, boolean)
|
|
+ */
|
|
+ default @Nullable ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull org.bukkit.generator.structure.StructureType structureType, @NotNull org.bukkit.map.MapCursor.Type mapIcon) {
|
|
+ return this.createExplorerMap(world, location, structureType, mapIcon, 100, true);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Create a new explorer map targeting the closest nearby structure of a
|
|
+ * given {@link org.bukkit.generator.structure.StructureType}.
|
|
+ *
|
|
+ * @param world the world the map will belong to
|
|
+ * @param location the origin location to find the nearest structure
|
|
+ * @param structureType the type of structure to find
|
|
+ * @param mapIcon the map icon to use on the map
|
|
+ * @param radius radius to search, see World#locateNearestStructure for more
|
|
+ * information
|
|
+ * @param findUnexplored whether to find unexplored structures
|
|
+ * @return the newly created item stack or null if it can't find a location
|
|
+ *
|
|
+ * @see World#locateNearestStructure(org.bukkit.Location,
|
|
+ * org.bukkit.generator.structure.StructureType, int, boolean)
|
|
+ */
|
|
+ @Nullable ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull org.bukkit.generator.structure.StructureType structureType, @NotNull org.bukkit.map.MapCursor.Type mapIcon, int radius, boolean findUnexplored);
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Reloads the server, refreshing settings and plugin information.
|