From 1be3d0749e0af8fc10d46f18099cdc14afa3ebee Mon Sep 17 00:00:00 2001
From: Bukkit/Spigot <noreply+git-bukkit@papermc.io>
Date: Thu, 25 Apr 2024 07:49:38 +1000
Subject: [PATCH] SPIGOT-7355: More field renames and fixes

- Rename MapCursor Types to match their Minecraft names
- SPIGOT-7355: Rename ItemFlag#HIDE_POTION_EFFECTS to better reflect its function

By: DerFrZocker <derrieple@gmail.com>
---
 .../main/java/org/bukkit/StructureType.java   |  4 +--
 .../java/org/bukkit/inventory/ItemFlag.java   |  2 +-
 .../main/java/org/bukkit/map/MapCursor.java   | 28 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/StructureType.java b/paper-api/src/main/java/org/bukkit/StructureType.java
index 7707def6e9..2cc81c2048 100644
--- a/paper-api/src/main/java/org/bukkit/StructureType.java
+++ b/paper-api/src/main/java/org/bukkit/StructureType.java
@@ -78,7 +78,7 @@ public final class StructureType implements Keyed {
      * They come in my different variations. The cold variants consist primarily
      * of stone brick, and the warm variants consist of sandstone.
      */
-    public static final StructureType OCEAN_RUIN = register(new StructureType("ocean_ruin", MapCursor.Type.TEMPLE));
+    public static final StructureType OCEAN_RUIN = register(new StructureType("ocean_ruin", MapCursor.Type.MONUMENT));
 
     /**
      * Desert pyramids (also known as desert temples) are found in deserts.
@@ -107,7 +107,7 @@ public final class StructureType implements Keyed {
      * lanterns. They are the only place guardians and elder guardians spawn
      * naturally.
      */
-    public static final StructureType OCEAN_MONUMENT = register(new StructureType("monument", MapCursor.Type.TEMPLE));
+    public static final StructureType OCEAN_MONUMENT = register(new StructureType("monument", MapCursor.Type.MONUMENT));
 
     /**
      * End Cities are tall castle-like structures that generate in the outer
diff --git a/paper-api/src/main/java/org/bukkit/inventory/ItemFlag.java b/paper-api/src/main/java/org/bukkit/inventory/ItemFlag.java
index 42fcc31147..8453bd058d 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/ItemFlag.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ItemFlag.java
@@ -29,7 +29,7 @@ public enum ItemFlag {
      * Setting to show/hide potion effects, book and firework information, map
      * tooltips, patterns of banners, and enchantments of enchanted books.
      */
-    HIDE_POTION_EFFECTS,
+    HIDE_ADDITIONAL_TOOLTIP,
     /**
      * Setting to show/hide dyes from colored leather armor.
      */
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 4ddddc5d91..9679cc595b 100644
--- a/paper-api/src/main/java/org/bukkit/map/MapCursor.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapCursor.java
@@ -228,16 +228,16 @@ public final class MapCursor {
      * resource pack.
      */
     public enum Type implements Keyed {
-        WHITE_POINTER(0, "player"),
-        GREEN_POINTER(1, "frame"),
-        RED_POINTER(2, "red_marker"),
-        BLUE_POINTER(3, "blue_marker"),
-        WHITE_CROSS(4, "target_x"),
-        RED_MARKER(5, "target_point"),
-        WHITE_CIRCLE(6, "player_off_map"),
-        SMALL_WHITE_CIRCLE(7, "player_off_limits"),
+        PLAYER(0, "player"),
+        FRAME(1, "frame"),
+        RED_MARKER(2, "red_marker"),
+        BLUE_MARKER(3, "blue_marker"),
+        TARGET_X(4, "target_x"),
+        TARGET_POINT(5, "target_point"),
+        PLAYER_OFF_MAP(6, "player_off_map"),
+        PLAYER_OFF_LIMITS(7, "player_off_limits"),
         MANSION(8, "mansion"),
-        TEMPLE(9, "monument"),
+        MONUMENT(9, "monument"),
         BANNER_WHITE(10, "banner_white"),
         BANNER_ORANGE(11, "banner_orange"),
         BANNER_MAGENTA(12, "banner_magenta"),
@@ -255,11 +255,11 @@ public final class MapCursor {
         BANNER_RED(24, "banner_red"),
         BANNER_BLACK(25, "banner_black"),
         RED_X(26, "red_x"),
-        DESERT_VILLAGE(27, "village_desert"),
-        PLAINS_VILLAGE(28, "village_plains"),
-        SAVANNA_VILLAGE(29, "village_savanna"),
-        SNOWY_VILLAGE(30, "village_snowy"),
-        TAIGA_VILLAGE(31, "village_taiga"),
+        VILLAGE_DESERT(27, "village_desert"),
+        VILLAGE_PLAINS(28, "village_plains"),
+        VILLAGE_SAVANNA(29, "village_savanna"),
+        VILLAGE_SNOWY(30, "village_snowy"),
+        VILLAGE_TAIGA(31, "village_taiga"),
         JUNGLE_TEMPLE(32, "jungle_temple"),
         SWAMP_HUT(33, "swamp_hut"),
         TRIAL_CHAMBERS(34, "trial_chambers")