1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-21 22:15:18 +01:00
PaperMC/patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch
2024-12-03 17:58:41 +01:00

159 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 886c1aab96bd34739665c22793217f3f41ba92d0..c3c76dd82b209f6720afc51622aeb3fd92f1c0c2 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 897d659e45d1a32c1bdaf8e0941f00597261a0b9..1b968953fdf470bff32122bd06c4f83f27b97383 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.