diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 2ae045b5b3..2a2f448809 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -76,7 +76,6 @@ public class WidgetID public static final int SLAYER_REWARDS_GROUP_ID = 426; public static final int PRIVATE_CHAT = 163; public static final int CHATBOX_GROUP_ID = 162; - public static final int WORLD_MAP_MENU_GROUP_ID = 160; public static final int VOLCANIC_MINE_GROUP_ID = 611; public static final int BA_ATTACKER_GROUP_ID = 485; public static final int BA_COLLECTOR_GROUP_ID = 486; @@ -175,8 +174,7 @@ public class WidgetID static final int BOTTOM_BAR = 23; static final int SEARCH = 26; static final int SURFACE_SELECTOR = 34; - static final int TOOLTIP = 43; - static final int OPTION = 48; + static final int TOOLTIP = 41; } static class SlayerRewards @@ -359,6 +357,7 @@ public class WidgetID static final int SPEC_ORB = 29; static final int WORLDMAP_ORB = 43; static final int WIKI_BANNER = 45; + static final int WORLDMAP_OPTIONS = 48; } static class LoginClickToPlayScreen diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 1ae170ede5..0a47c8993a 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -55,7 +55,6 @@ public enum WidgetInfo WORLD_MAP_SEARCH(WidgetID.WORLD_MAP_GROUP_ID, WidgetID.WorldMap.SEARCH), WORLD_MAP_SURFACE_SELECTOR(WidgetID.WORLD_MAP_GROUP_ID, WidgetID.WorldMap.SURFACE_SELECTOR), WORLD_MAP_TOOLTIP(WidgetID.WORLD_MAP_GROUP_ID, WidgetID.WorldMap.TOOLTIP), - WORLD_MAP_OPTION(WidgetID.WORLD_MAP_MENU_GROUP_ID, WidgetID.WorldMap.OPTION), CLUE_SCROLL_TEXT(WidgetID.CLUE_SCROLL_GROUP_ID, WidgetID.Cluescroll.CLUE_TEXT), CLUE_SCROLL_REWARD_ITEM_CONTAINER(WidgetID.CLUE_SCROLL_REWARD_GROUP_ID, WidgetID.Cluescroll.CLUE_SCROLL_ITEM_CONTAINER), @@ -183,6 +182,7 @@ public enum WidgetInfo MINIMAP_SPEC_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.SPEC_ORB), MINIMAP_WORLDMAP_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB), MINIMAP_WIKI_BANNER(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WIKI_BANNER), + MINIMAP_WORLDMAP_OPTIONS(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_OPTIONS), LMS_INFO(WidgetID.LMS_GROUP_ID, WidgetID.Lms.INFO), LMS_KDA(WidgetID.LMS_INGAME_GROUP_ID, WidgetID.LmsKDA.INFO), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerSharingManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerSharingManager.java index ff4be28f8a..d311a51319 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerSharingManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerSharingManager.java @@ -46,7 +46,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.events.WidgetMenuOptionClicked; -import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_OPTION; +import static net.runelite.api.widgets.WidgetInfo.MINIMAP_WORLDMAP_OPTIONS; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.eventbus.Subscribe; @@ -57,9 +57,9 @@ import net.runelite.client.menus.WidgetMenuOption; @Slf4j class GroundMarkerSharingManager { - private static final WidgetMenuOption EXPORT_MARKERS_OPTION = new WidgetMenuOption("Export", "Ground Markers", WORLD_MAP_OPTION); - private static final WidgetMenuOption IMPORT_MARKERS_OPTION = new WidgetMenuOption("Import", "Ground Markers", WORLD_MAP_OPTION); - private static final WidgetMenuOption CLEAR_MARKERS_OPTION = new WidgetMenuOption("Clear", "Ground Markers", WORLD_MAP_OPTION); + private static final WidgetMenuOption EXPORT_MARKERS_OPTION = new WidgetMenuOption("Export", "Ground Markers", MINIMAP_WORLDMAP_OPTIONS); + private static final WidgetMenuOption IMPORT_MARKERS_OPTION = new WidgetMenuOption("Import", "Ground Markers", MINIMAP_WORLDMAP_OPTIONS); + private static final WidgetMenuOption CLEAR_MARKERS_OPTION = new WidgetMenuOption("Clear", "Ground Markers", MINIMAP_WORLDMAP_OPTIONS); private final GroundMarkerPlugin plugin; private final Client client; @@ -108,7 +108,7 @@ class GroundMarkerSharingManager public void onWidgetMenuOptionClicked(WidgetMenuOptionClicked event) { // ensure that the option clicked is the export markers option - if (event.getWidget() != WORLD_MAP_OPTION) + if (event.getWidget() != MINIMAP_WORLDMAP_OPTIONS) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java index 003a5bbc2e..f5cc4b6a51 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java @@ -28,7 +28,7 @@ import com.google.inject.Binder; import javax.inject.Inject; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.WidgetMenuOptionClicked; -import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_OPTION; +import static net.runelite.api.widgets.WidgetInfo.MINIMAP_WORLDMAP_OPTIONS; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.input.KeyManager; import net.runelite.client.input.MouseManager; @@ -44,7 +44,7 @@ import net.runelite.client.ui.overlay.OverlayManager; ) public class InstanceMapPlugin extends Plugin { - private final WidgetMenuOption openMapOption = new WidgetMenuOption("Show", "Instance Map", WORLD_MAP_OPTION); + private final WidgetMenuOption openMapOption = new WidgetMenuOption("Show", "Instance Map", MINIMAP_WORLDMAP_OPTIONS); @Inject private InstanceMapInputListener inputListener; @@ -115,7 +115,7 @@ public class InstanceMapPlugin extends Plugin @Subscribe public void onWidgetMenuOptionClicked(WidgetMenuOptionClicked event) { - if (event.getWidget() != WORLD_MAP_OPTION) + if (event.getWidget() != MINIMAP_WORLDMAP_OPTIONS) { return; } diff --git a/runelite-client/src/test/java/net/runelite/client/menus/MenuManagerTest.java b/runelite-client/src/test/java/net/runelite/client/menus/MenuManagerTest.java index 891170ca48..30ca3dfeda 100644 --- a/runelite-client/src/test/java/net/runelite/client/menus/MenuManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/menus/MenuManagerTest.java @@ -34,7 +34,7 @@ import static net.runelite.api.MenuAction.CC_OP; import static net.runelite.api.MenuAction.RUNELITE; import net.runelite.api.MenuEntry; import net.runelite.api.events.MenuEntryAdded; -import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_OPTION; +import static net.runelite.api.widgets.WidgetInfo.MINIMAP_WORLDMAP_OPTIONS; import net.runelite.client.util.Text; import static org.junit.Assert.assertArrayEquals; import org.junit.Before; @@ -70,7 +70,7 @@ public class MenuManagerTest { CANCEL.setOption("Cancel"); CANCEL.setType(MenuAction.CANCEL.getId()); - CANCEL.setParam1(WORLD_MAP_OPTION.getPackedId()); + CANCEL.setParam1(MINIMAP_WORLDMAP_OPTIONS.getPackedId()); } @Before @@ -94,19 +94,19 @@ public class MenuManagerTest final MenuEntry third = new MenuEntry(); first.setOption("Test"); first.setTarget("First Entry"); - first.setParam1(WORLD_MAP_OPTION.getPackedId()); + first.setParam1(MINIMAP_WORLDMAP_OPTIONS.getPackedId()); first.setType(RUNELITE.getId()); second.setOption("Test"); second.setTarget("Second Entry"); - second.setParam1(WORLD_MAP_OPTION.getPackedId()); + second.setParam1(MINIMAP_WORLDMAP_OPTIONS.getPackedId()); second.setType(RUNELITE.getId()); third.setOption("Test"); third.setTarget("Third Entry"); - third.setParam1(WORLD_MAP_OPTION.getPackedId()); + third.setParam1(MINIMAP_WORLDMAP_OPTIONS.getPackedId()); third.setType(RUNELITE.getId()); - menuManager.addManagedCustomMenu(new WidgetMenuOption(first.getOption(), first.getTarget(), WORLD_MAP_OPTION)); - menuManager.addManagedCustomMenu(new WidgetMenuOption(second.getOption(), second.getTarget(), WORLD_MAP_OPTION)); - menuManager.addManagedCustomMenu(new WidgetMenuOption(third.getOption(), third.getTarget(), WORLD_MAP_OPTION)); + menuManager.addManagedCustomMenu(new WidgetMenuOption(first.getOption(), first.getTarget(), MINIMAP_WORLDMAP_OPTIONS)); + menuManager.addManagedCustomMenu(new WidgetMenuOption(second.getOption(), second.getTarget(), MINIMAP_WORLDMAP_OPTIONS)); + menuManager.addManagedCustomMenu(new WidgetMenuOption(third.getOption(), third.getTarget(), MINIMAP_WORLDMAP_OPTIONS)); menuManager.onMenuEntryAdded(new MenuEntryAdded( CANCEL.getOption(),