|
6 | 6 | import lombok.extern.slf4j.Slf4j; |
7 | 7 | import net.runelite.api.Client; |
8 | 8 | import net.runelite.api.MenuAction; |
| 9 | +import net.runelite.api.MenuEntry; |
9 | 10 | import net.runelite.api.SoundEffectID; |
10 | | -import net.runelite.api.events.MenuOptionClicked; |
11 | 11 | import net.runelite.api.events.MenuEntryAdded; |
12 | 12 | import net.runelite.client.config.ConfigManager; |
13 | 13 | import net.runelite.client.eventbus.Subscribe; |
14 | 14 | import net.runelite.client.plugins.Plugin; |
15 | 15 | import net.runelite.client.plugins.PluginDescriptor; |
16 | | -import net.runelite.api.MenuEntry; |
17 | | -import org.apache.commons.lang3.ArrayUtils; |
18 | 16 |
|
19 | 17 | @Slf4j |
20 | 18 | @PluginDescriptor( |
@@ -56,35 +54,27 @@ public void onMenuEntryAdded(MenuEntryAdded event) |
56 | 54 | break; |
57 | 55 | } |
58 | 56 |
|
59 | | - MenuEntry[] menuEntries = client.getMenu().getMenuEntries(); |
60 | | - MenuEntry newEntry = client.getMenu().createMenuEntry(menuEntries.length - 1) |
61 | | - .setOption(newOption) |
62 | | - .setType(MenuAction.CC_OP); |
63 | | - |
64 | | - menuEntries = ArrayUtils.add(menuEntries, newEntry); |
65 | | - client.getMenu().setMenuEntries(menuEntries); |
| 57 | + client.getMenu() |
| 58 | + .createMenuEntry(-1) |
| 59 | + .setType(MenuAction.RUNELITE_HIGH_PRIORITY) |
| 60 | + .setOption(newOption) |
| 61 | + .onClick(this::onCompassAction); |
66 | 62 | } |
67 | 63 | } |
68 | 64 |
|
69 | | - @Subscribe |
70 | | - public void onMenuOptionClicked(MenuOptionClicked event) |
| 65 | + public void onCompassAction(MenuEntry event) |
71 | 66 | { |
72 | | - if (event.getMenuAction() == MenuAction.CC_OP) |
| 67 | + switch (event.getOption()) |
73 | 68 | { |
74 | | - switch (event.getMenuOption()) |
75 | | - { |
76 | | - case SNAP_CARDINAL: |
77 | | - alignYaw(); |
78 | | - event.consume(); |
79 | | - client.playSoundEffect(SoundEffectID.UI_BOOP); |
80 | | - break; |
| 69 | + case SNAP_CARDINAL: |
| 70 | + alignYaw(); |
| 71 | + client.playSoundEffect(SoundEffectID.UI_BOOP); |
| 72 | + break; |
81 | 73 |
|
82 | | - case CYCLE_CARDINAL: |
83 | | - cycleYaw(); |
84 | | - event.consume(); |
85 | | - client.playSoundEffect(SoundEffectID.UI_BOOP); |
86 | | - break; |
87 | | - } |
| 74 | + case CYCLE_CARDINAL: |
| 75 | + cycleYaw(); |
| 76 | + client.playSoundEffect(SoundEffectID.UI_BOOP); |
| 77 | + break; |
88 | 78 | } |
89 | 79 | } |
90 | 80 |
|
|
0 commit comments