mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
de04cbced5
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: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 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 adfaf27b872aa5614a31ff5f32cf9336c6f2ee49..48fab492609e0bae459d20cc2eae78b87e37ab75 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -926,7 +926,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);
|
|
@@ -935,9 +937,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
|
|
@@ -949,11 +948,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 36a21c39f834faa6fec29a319588ddc58715a747..9af4bc16da09e59009c47911219e99450cdf2aa5 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -784,16 +784,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
|
|
@@ -805,9 +804,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.
|