mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
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 b82260cdee74a82b78c103467f7e2888ba4d06c1..ca27559cf4aa1c2e44fdca2022e213b1b1c80f4e 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -935,9 +935,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
|
|
@@ -946,7 +943,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);
|
|
@@ -969,11 +968,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 f18f5db804053e072134508ef38252391895549a..b4f8281d3797ec825a7671f38077cd65d5a1d76e 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -800,16 +800,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
|
|
@@ -821,9 +820,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.
|