From 175280220b54a95e962e971aa750f65bcf68c53e Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Sun, 29 Jul 2018 15:09:54 +1000 Subject: [PATCH] SPIGOT-4182: Implement cursor captions By: md_5 --- .../main/java/org/bukkit/map/MapCursor.java | 42 ++++++++++++++++--- .../org/bukkit/map/MapCursorCollection.java | 16 +++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/map/MapCursor.java b/paper-api/src/main/java/org/bukkit/map/MapCursor.java index 94b26ae27e..3205c92d25 100644 --- a/paper-api/src/main/java/org/bukkit/map/MapCursor.java +++ b/paper-api/src/main/java/org/bukkit/map/MapCursor.java @@ -21,11 +21,7 @@ public final class MapCursor { */ @Deprecated public MapCursor(byte x, byte y, byte direction, byte type, boolean visible) { - this.x = x; - this.y = y; - setDirection(direction); - setRawType(type); - this.visible = visible; + this(x, y, direction, type, visible, null); } /** @@ -38,11 +34,47 @@ public final class MapCursor { * @param visible Whether the cursor is visible by default. */ public MapCursor(byte x, byte y, byte direction, Type type, boolean visible) { + this(x, y, direction, type, visible, null); + } + + /** + * Initialize the map cursor. + * + * @param x The x coordinate, from -128 to 127. + * @param y The y coordinate, from -128 to 127. + * @param direction The facing of the cursor, from 0 to 15. + * @param type The type (color/style) of the map cursor. + * @param visible Whether the cursor is visible by default. + * @param caption cursor caption + * @deprecated Magic value + */ + @Deprecated + public MapCursor(byte x, byte y, byte direction, byte type, boolean visible, String caption) { + this.x = x; + this.y = y; + setDirection(direction); + setRawType(type); + this.visible = visible; + this.caption = caption; + } + + /** + * Initialize the map cursor. + * + * @param x The x coordinate, from -128 to 127. + * @param y The y coordinate, from -128 to 127. + * @param direction The facing of the cursor, from 0 to 15. + * @param type The type (color/style) of the map cursor. + * @param visible Whether the cursor is visible by default. + * @param caption cursor caption + */ + public MapCursor(byte x, byte y, byte direction, Type type, boolean visible, String caption) { this.x = x; this.y = y; setDirection(direction); setType(type); this.visible = visible; + this.caption = caption; } /** diff --git a/paper-api/src/main/java/org/bukkit/map/MapCursorCollection.java b/paper-api/src/main/java/org/bukkit/map/MapCursorCollection.java index 1dc9025d68..802d736d90 100644 --- a/paper-api/src/main/java/org/bukkit/map/MapCursorCollection.java +++ b/paper-api/src/main/java/org/bukkit/map/MapCursorCollection.java @@ -93,4 +93,20 @@ public final class MapCursorCollection { return addCursor(new MapCursor((byte) x, (byte) y, direction, type, visible)); } + /** + * Add a cursor to the collection. + * + * @param x The x coordinate, from -128 to 127. + * @param y The y coordinate, from -128 to 127. + * @param direction The facing of the cursor, from 0 to 15. + * @param type The type (color/style) of the map cursor. + * @param visible Whether the cursor is visible. + * @param caption banner caption + * @return The newly added MapCursor. + * @deprecated Magic value + */ + @Deprecated + public MapCursor addCursor(int x, int y, byte direction, byte type, boolean visible, String caption) { + return addCursor(new MapCursor((byte) x, (byte) y, direction, type, visible, caption)); + } }