rs-client: refactoring (#1344)

* Rename some things to be more consistent everywhere

* rs-client: refactoring

* MenuAction -> MenuOpcode merge

runelite-api/src/main/java/net/runelite/api/Client.java

@@ -1685,7 +1685,7 @@ public interface Client extends GameShell
 	 *
 	 * @param param0 This is SceneX for gameObject, index for items, and 0 for npc.
 	 * @param param1 This is SceneY for gameObject, static for items, and 0 for npc.
-	 * @param type Menu entry Action type.
+	 * @param type Menu entry Action opcode.
 	 * @param id Targets ID
 	 * @param menuEntry Do these actually matter?
 	 * @param targetString Do these actually matter?

runelite-api/src/main/java/net/runelite/api/DecorativeObject.java

@@ -40,8 +40,8 @@ public interface DecorativeObject extends TileObject
 	Polygon getConvexHull();
 	Polygon getConvexHull2();
 
-	Entity getRenderable();
+	Entity getEntity1();
-	Entity getRenderable2();
+	Entity getEntity2();
 
 	Model getModel1();
 

runelite-api/src/main/java/net/runelite/api/GameObject.java

@@ -68,7 +68,7 @@ public interface GameObject extends TileObject
 	 */
 	Angle getOrientation();
 
-	Entity getRenderable();
+	Entity getEntity();
 
 	int getRsOrientation();
 

runelite-api/src/main/java/net/runelite/api/GroundObject.java

@@ -29,7 +29,7 @@ package net.runelite.api;
  */
 public interface GroundObject extends TileObject
 {
-	Entity getRenderable();
+	Entity getEntity();
 
 	Model getModel();
 }

runelite-api/src/main/java/net/runelite/api/MenuEntry.java

@@ -57,7 +57,7 @@ public class MenuEntry
 	/**
 	 * The action the entry will trigger.
 	 */
-	private int type;
+	private int opcode;
 	/**
 	 * An additional parameter for the action.
 	 */
@@ -80,7 +80,7 @@ public class MenuEntry
 			src.getOption(),
 			src.getTarget(),
 			src.getIdentifier(),
-			src.getType(),
+			src.getOpcode(),
 			src.getParam0(),
 			src.getParam1(),
 			src.isForceLeftClick()

runelite-api/src/main/java/net/runelite/api/MenuOpcode.java

@@ -30,7 +30,7 @@ import java.util.Map;
 /**
  * An enumeration of right-click menu actions.
  */
-public enum MenuAction
+public enum MenuOpcode
 {
 	/**
 	 * Menu action for using an item in your inventory on a tile object (GameObject or GroundObject).
@@ -281,19 +281,19 @@ public enum MenuAction
 
 	public static final int MENU_ACTION_DEPRIORITIZE_OFFSET = 2000;
 
-	private static final Map<Integer, MenuAction> map = new HashMap<>();
+	private static final Map<Integer, MenuOpcode> map = new HashMap<>();
 
 	static
 	{
-		for (MenuAction menuAction : values())
+		for (MenuOpcode menuOpcode : values())
 		{
-			map.put(menuAction.getId(), menuAction);
+			map.put(menuOpcode.getId(), menuOpcode);
 		}
 	}
 
 	private final int id;
 
-	MenuAction(int id)
+	MenuOpcode(int id)
 	{
 		this.id = id;
 	}
@@ -303,7 +303,7 @@ public enum MenuAction
 		return id;
 	}
 
-	public static MenuAction of(int id)
+	public static MenuOpcode of(int id)
 	{
 		return map.getOrDefault(id, UNKNOWN);
 	}

runelite-api/src/main/java/net/runelite/api/Tile.java

@@ -73,14 +73,14 @@ public interface Tile
 	 *
 	 * @return the paint
 	 */
-	TilePaint getSceneTilePaint();
+	TilePaint getTilePaint();
 
 	/**
 	 * Gets the model of the tile in the scene.
 	 *
 	 * @return the tile model
 	 */
-	TileModel getSceneTileModel();
+	TileModel getTileModel();
 
 	/**
 	 * Gets the location coordinate of the tile in the world.

runelite-api/src/main/java/net/runelite/api/WallObject.java

@@ -50,8 +50,8 @@ public interface WallObject extends TileObject
 	 */
 	int getConfig();
 
-	Entity getRenderable1();
+	Entity getEntity1();
-	Entity getRenderable2();
+	Entity getEntity2();
 
 	Model getModelA();
 	Model getModelB();

runelite-api/src/main/java/net/runelite/api/events/MenuEntryAdded.java

@@ -52,7 +52,7 @@ public class MenuEntryAdded implements Event
 
 	public int getType()
 	{
-		return menuEntry.getType();
+		return menuEntry.getOpcode();
 	}
 
 	public int getIdentifier()

runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java

@@ -27,7 +27,7 @@ package net.runelite.api.events;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Setter;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 
 /**
@@ -79,11 +79,11 @@ public class MenuOptionClicked implements Event
 	}
 
 	/**
-	 * MenuAction but int-ish
+	 * MenuOpcode but int-ish
 	 */
-	public int getType()
+	public int getOpcode()
 	{
-		return menuEntry.getType();
+		return menuEntry.getOpcode();
 	}
 
 	/**
@@ -118,9 +118,9 @@ public class MenuOptionClicked implements Event
 	/**
 	 * The action performed.
 	 */
-	public MenuAction getMenuAction()
+	public MenuOpcode getMenuOpcode()
 	{
-		return MenuAction.of(getType());
+		return MenuOpcode.of(getOpcode());
 	}
 
 	/**

runelite-api/src/main/java/net/runelite/api/widgets/WidgetConfig.java

@@ -91,7 +91,7 @@ public class WidgetConfig
 	/**
 	 * Add a USE option
 	 *
-	 * @see// MenuAction#ITEM_USE
+	 * @see// MenuOpcode#ITEM_USE
 	 */
 	public static final int ITEM_USE_OP = 1 << 31;
 }

runelite-client/src/main/java/net/runelite/client/menus/BaseComparableEntry.java

@@ -80,7 +80,7 @@ public class BaseComparableEntry extends AbstractComparableEntry
 
 		if (type != -1)
 		{
-			int type = entry.getType();
+			int type = entry.getOpcode();
 
 			if (this.type != type)
 			{

runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java

@@ -47,8 +47,8 @@ import javax.inject.Singleton;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
-import static net.runelite.api.MenuAction.MENU_ACTION_DEPRIORITIZE_OFFSET;
+import static net.runelite.api.MenuOpcode.MENU_ACTION_DEPRIORITIZE_OFFSET;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.NPCDefinition;
 import net.runelite.api.events.BeforeRender;
@@ -166,7 +166,7 @@ public class MenuManager
 				if (p.matches(entry))
 				{
 					// Other entries need to be deprioritized if their types are lower than 1000
-					if (entry.getType() >= 1000 && !shouldDeprioritize)
+					if (entry.getOpcode() >= 1000 && !shouldDeprioritize)
 					{
 						shouldDeprioritize = true;
 					}
@@ -202,8 +202,8 @@ public class MenuManager
 					// Do not need to swap with itself or if the swapFrom is already the first entry
 					if (swapFrom != null && swapFrom != entry && swapFrom != Iterables.getLast(newEntries))
 					{
-						// Deprioritize entries if the swaps are not in similar type groups
+						// Deprioritize entries if the swaps are not in similar opcode groups
-						if ((swapFrom.getType() >= 1000 && entry.getType() < 1000) || (entry.getType() >= 1000 && swapFrom.getType() < 1000) && !shouldDeprioritize)
+						if ((swapFrom.getOpcode() >= 1000 && entry.getOpcode() < 1000) || (entry.getOpcode() >= 1000 && swapFrom.getOpcode() < 1000) && !shouldDeprioritize)
 						{
 							shouldDeprioritize = true;
 						}
@@ -221,9 +221,9 @@ public class MenuManager
 		{
 			for (MenuEntry entry : newEntries)
 			{
-				if (entry.getType() <= MENU_ACTION_DEPRIORITIZE_OFFSET)
+				if (entry.getOpcode() <= MENU_ACTION_DEPRIORITIZE_OFFSET)
 				{
-					entry.setType(entry.getType() + MENU_ACTION_DEPRIORITIZE_OFFSET);
+					entry.setOpcode(entry.getOpcode() + MENU_ACTION_DEPRIORITIZE_OFFSET);
 				}
 			}
 		}
@@ -268,7 +268,7 @@ public class MenuManager
 				menuEntry.setOption(currentMenu.getMenuOption());
 				menuEntry.setParam1(widgetId);
 				menuEntry.setTarget(currentMenu.getMenuTarget());
-				menuEntry.setType(MenuAction.RUNELITE.getId());
+				menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 
 				client.setMenuEntries(menuEntries);
 			}
@@ -441,7 +441,7 @@ public class MenuManager
 			}
 		}
 
-		if (event.getMenuAction() != MenuAction.RUNELITE)
+		if (event.getMenuOpcode() != MenuOpcode.RUNELITE)
 		{
 			return; // not a player menu
 		}
@@ -480,7 +480,7 @@ public class MenuManager
 	{
 		client.getPlayerOptions()[playerOptionIndex] = menuText;
 		client.getPlayerOptionsPriorities()[playerOptionIndex] = true;
-		client.getPlayerMenuTypes()[playerOptionIndex] = MenuAction.RUNELITE.getId();
+		client.getPlayerMenuTypes()[playerOptionIndex] = MenuOpcode.RUNELITE.getId();
 
 		playerMenuIndexMap.put(playerOptionIndex, menuText);
 	}
@@ -670,7 +670,7 @@ public class MenuManager
 	}
 
 	/**
-	 * Adds to the map of swaps - Non-strict option/target, but with type & id
+	 * Adds to the map of swaps - Non-strict option/target, but with opcode & id
 	 * ID's of -1 are ignored in matches()!
 	 */
 	public void addSwap(String option, String target, int id, int type, String option2, String target2, int id2, int type2)

runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java

@@ -39,7 +39,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.ItemID;
 import static net.runelite.api.ItemID.AGILITY_ARENA_TICKET;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Player;
 import net.runelite.api.Skill;
@@ -502,7 +502,7 @@ public class AgilityPlugin extends Plugin
 		}
 
 		//Guarding against non-first option because agility shortcuts are always that type of event.
-		if (event.getType() != MenuAction.GAME_OBJECT_FIRST_OPTION.getId())
+		if (event.getType() != MenuOpcode.GAME_OBJECT_FIRST_OPTION.getId())
 		{
 			return;
 		}

runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java

@@ -30,7 +30,7 @@ import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
 import net.runelite.client.ui.overlay.OverlayMenuEntry;

runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java

@@ -29,7 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
 import net.runelite.client.ui.overlay.OverlayMenuEntry;

runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java

@@ -49,7 +49,7 @@ import net.runelite.api.Item;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.ItemID;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.VarClientInt;
 import net.runelite.api.VarClientStr;
@@ -343,7 +343,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis
 			editTags.setParam1(event.getActionParam1());
 			editTags.setTarget(event.getTarget());
 			editTags.setOption(text);
-			editTags.setType(MenuAction.RUNELITE.getId());
+			editTags.setOpcode(MenuOpcode.RUNELITE.getId());
 			editTags.setIdentifier(event.getIdentifier());
 			entries = Arrays.copyOf(entries, entries.length + 1);
 			entries[entries.length - 1] = editTags;
@@ -356,7 +356,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis
 	private void onMenuOptionClicked(MenuOptionClicked event)
 	{
 		if (event.getActionParam1() == WidgetInfo.BANK_ITEM_CONTAINER.getId()
-			&& event.getMenuAction() == MenuAction.RUNELITE
+			&& event.getMenuOpcode() == MenuOpcode.RUNELITE
 			&& event.getOption().startsWith(EDIT_TAGS_MENU_OPTION))
 		{
 			event.consume();

runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java

@@ -55,7 +55,7 @@ import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.ItemDefinition;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Point;
 import net.runelite.api.ScriptEvent;
@@ -579,7 +579,7 @@ public class TabInterface
 		}
 
 		if (chatboxPanelManager.getCurrentInput() != null
-			&& event.getMenuAction() != MenuAction.CANCEL
+			&& event.getMenuOpcode() != MenuOpcode.CANCEL
 			&& !event.getMenuEntry().equals(SCROLL_UP)
 			&& !event.getMenuEntry().equals(SCROLL_DOWN))
 		{
@@ -587,7 +587,7 @@ public class TabInterface
 		}
 
 		if (event.getIdentifier() == WidgetInfo.BANK_ITEM_CONTAINER.getId()
-			&& event.getMenuAction() == MenuAction.EXAMINE_ITEM_BANK_EQ
+			&& event.getMenuOpcode() == MenuOpcode.EXAMINE_ITEM_BANK_EQ
 			&& event.getOption().equalsIgnoreCase("withdraw-x"))
 		{
 			waitSearchTick = true;
@@ -631,7 +631,7 @@ public class TabInterface
 		}
 		else if (activeTab != null
 			&& event.getActionParam1() == WidgetInfo.BANK_ITEM_CONTAINER.getId()
-			&& event.getMenuAction() == MenuAction.RUNELITE
+			&& event.getMenuOpcode() == MenuOpcode.RUNELITE
 			&& event.getOption().startsWith(REMOVE_TAG))
 		{
 			// Add "remove" menu entry to all items in bank while tab is selected
@@ -645,7 +645,7 @@ public class TabInterface
 				bankSearch.search(InputType.SEARCH, TAG_SEARCH + activeTab.getTag(), true);
 			}
 		}
-		else if (event.getMenuAction() == MenuAction.RUNELITE
+		else if (event.getMenuOpcode() == MenuOpcode.RUNELITE
 			&& ((event.getActionParam1() == WidgetInfo.BANK_DEPOSIT_INVENTORY.getId() && event.getOption().equals(TAG_INVENTORY))
 			|| (event.getActionParam1() == WidgetInfo.BANK_DEPOSIT_EQUIPMENT.getId() && event.getOption().equals(TAG_GEAR))))
 		{
@@ -1065,7 +1065,7 @@ public class TabInterface
 		entry.setParam1(event.getActionParam1());
 		entry.setTarget(target);
 		entry.setOption(option);
-		entry.setType(MenuAction.RUNELITE.getId());
+		entry.setOpcode(MenuOpcode.RUNELITE.getId());
 		entry.setIdentifier(event.getIdentifier());
 		entries = Arrays.copyOf(entries, entries.length + 1);
 		entries[entries.length - 1] = entry;

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java

@@ -28,7 +28,7 @@ package net.runelite.client.plugins.barbarianassault;
 import com.google.common.collect.ImmutableSet;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.client.menus.BaseComparableEntry;
 import static net.runelite.client.menus.ComparableEntries.newBaseComparableEntry;
 
@@ -62,10 +62,10 @@ public enum Menus
 	TELL_TOFU_HEALER_HORN(Role.HEALER, newBaseComparableEntry("tell-tofu", "healer horn", -1, -1, true, true)),
 	TELL_CRACKERS_HEALER_HORN(Role.HEALER, newBaseComparableEntry("tell-crackers", "healer horn", -1, -1, true, true)),
 	TELL_WORMS_HEALER_HORN(Role.HEALER, newBaseComparableEntry("tell-worms", "healer horn", -1, -1, true, true)),
-	USE_VIAL_GROUND(Role.HEALER, newBaseComparableEntry("use", "healing vial", -1, MenuAction.ITEM_USE_ON_GROUND_ITEM.getId(), true, false)),
+	USE_VIAL_GROUND(Role.HEALER, newBaseComparableEntry("use", "healing vial", -1, MenuOpcode.ITEM_USE_ON_GROUND_ITEM.getId(), true, false)),
-	USE_VIAL_ITEM(Role.HEALER, newBaseComparableEntry("use", "healing vial", -1, MenuAction.ITEM_USE_ON_WIDGET_ITEM.getId(), true, false)),
+	USE_VIAL_ITEM(Role.HEALER, newBaseComparableEntry("use", "healing vial", -1, MenuOpcode.ITEM_USE_ON_WIDGET_ITEM.getId(), true, false)),
-	USE_VIAL_NPC(Role.HEALER, newBaseComparableEntry("use", "healing vial", -1, MenuAction.ITEM_USE_ON_NPC.getId(), true, false)),
+	USE_VIAL_NPC(Role.HEALER, newBaseComparableEntry("use", "healing vial", -1, MenuOpcode.ITEM_USE_ON_NPC.getId(), true, false)),
-	USE_VIAL_WIDGET(Role.HEALER, newBaseComparableEntry("use", "healing vial", -1, MenuAction.ITEM_USE_ON_WIDGET.getId(), true, false)),
+	USE_VIAL_WIDGET(Role.HEALER, newBaseComparableEntry("use", "healing vial", -1, MenuOpcode.ITEM_USE_ON_WIDGET.getId(), true, false)),
 
 	CONVERT_COLLECTOR_CONVERTER(Role.COLLECTOR, newBaseComparableEntry("convert", "collector converter", -1, -1, true, true)),
 	LOAD_EGG_HOPPER(Role.COLLECTOR, newBaseComparableEntry("load", "egg hopper", -1, -1, true, true)),

runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java

@@ -30,7 +30,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Varbits;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;

runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java

@@ -29,7 +29,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import static net.runelite.api.Varbits.BLAST_FURNACE_COFFER;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;

runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java

@@ -30,7 +30,7 @@ import java.awt.image.BufferedImage;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;

runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java

@@ -31,7 +31,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.ItemID;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Varbits;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;

runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java

@@ -30,7 +30,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;

runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java

@@ -8,7 +8,7 @@ import java.awt.image.BufferedImage;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
 import net.runelite.client.game.SkillIconManager;
 import net.runelite.client.ui.overlay.Overlay;

runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java

@@ -12,7 +12,7 @@ import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.MessageNode;
 import static net.runelite.api.ScriptID.CHATBOX_INPUT;
@@ -164,7 +164,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 			final MenuEntry menuEntry = new MenuEntry();
 			menuEntry.setOption(TRANSLATE);
 			menuEntry.setTarget(event.getTarget());
-			menuEntry.setType(MenuAction.RUNELITE.getId());
+			menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 			menuEntry.setParam0(event.getActionParam0());
 			menuEntry.setParam1(event.getActionParam1());
 			menuEntry.setIdentifier(event.getIdentifier());

runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java

@@ -32,7 +32,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import static net.runelite.api.ItemID.SPADE;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.plugins.cluescrolls.clues.ClueScroll;
 import net.runelite.client.plugins.cluescrolls.clues.item.ItemRequirement;
 import net.runelite.client.plugins.cluescrolls.clues.item.SingleItemRequirement;

runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Player;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;

runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Player;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;

runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java

@@ -30,7 +30,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.client.RuneLite;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.config.ChatColorConfig;
@@ -147,7 +147,7 @@ public class ConfigPlugin extends Plugin
 	private void onOverlayMenuClicked(OverlayMenuClicked overlayMenuClicked)
 	{
 		OverlayMenuEntry overlayMenuEntry = overlayMenuClicked.getEntry();
-		if (overlayMenuEntry.getMenuAction() == MenuAction.RUNELITE_OVERLAY_CONFIG)
+		if (overlayMenuEntry.getMenuOpcode() == MenuOpcode.RUNELITE_OVERLAY_CONFIG)
 		{
 			Overlay overlay = overlayMenuClicked.getOverlay();
 			Plugin plugin = overlay.getPlugin();

runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java

@@ -36,7 +36,7 @@ import javax.inject.Singleton;
 import static net.runelite.api.AnimationID.COOKING_FIRE;
 import static net.runelite.api.AnimationID.COOKING_RANGE;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
 import net.runelite.client.plugins.xptracker.XpTrackerService;
 import net.runelite.client.ui.overlay.Overlay;

runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java

@@ -31,7 +31,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.NPC;
 import net.runelite.api.Varbits;
 import net.runelite.api.coords.WorldPoint;

runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java

@@ -35,8 +35,8 @@ import net.runelite.api.Actor;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
-import static net.runelite.api.MenuAction.MENU_ACTION_DEPRIORITIZE_OFFSET;
+import static net.runelite.api.MenuOpcode.MENU_ACTION_DEPRIORITIZE_OFFSET;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
@@ -66,7 +66,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 @Slf4j
 public class CorpPlugin extends Plugin
 {
-	private static final int NPC_SECTION_ACTION = MenuAction.NPC_SECOND_OPTION.getId();
+	private static final int NPC_SECTION_ACTION = MenuOpcode.NPC_SECOND_OPTION.getId();
 	private static final String ATTACK = "Attack";
 	private static final String DARK_ENERGY_CORE = "Dark energy core";
 
@@ -263,7 +263,7 @@ public class CorpPlugin extends Plugin
 		MenuEntry[] menuEntries = client.getMenuEntries();
 		MenuEntry menuEntry = menuEntries[menuEntries.length - 1];
 
-		menuEntry.setType(NPC_SECTION_ACTION + MENU_ACTION_DEPRIORITIZE_OFFSET);
+		menuEntry.setOpcode(NPC_SECTION_ACTION + MENU_ACTION_DEPRIORITIZE_OFFSET);
 		client.setMenuEntries(menuEntries);
 	}
 

runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java

@@ -310,7 +310,7 @@ class DevToolsOverlay extends Overlay
 				{
 					if (player.getLocalLocation().distanceTo(gameObject.getLocalLocation()) <= MAX_DISTANCE)
 					{
-						Entity entity = gameObject.getRenderable();
+						Entity entity = gameObject.getEntity();
 						if (entity instanceof DynamicObject)
 						{
 							OverlayUtil.renderTileOverlay(graphics, gameObject, "ID: " + gameObject.getId() + " Anim: " + ((DynamicObject) entity).getAnimationID(), TURQOISE);

runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java

@@ -36,7 +36,7 @@ import lombok.Getter;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.Experience;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
 import net.runelite.api.Player;
@@ -71,8 +71,8 @@ import org.slf4j.LoggerFactory;
 @Getter
 public class DevToolsPlugin extends Plugin
 {
-	private static final List<MenuAction> EXAMINE_MENU_ACTIONS = ImmutableList.of(MenuAction.EXAMINE_ITEM,
+	private static final List<MenuOpcode> EXAMINE_MENU_ACTIONS = ImmutableList.of(MenuOpcode.EXAMINE_ITEM,
-		MenuAction.EXAMINE_ITEM_GROUND, MenuAction.EXAMINE_NPC, MenuAction.EXAMINE_OBJECT);
+		MenuOpcode.EXAMINE_ITEM_GROUND, MenuOpcode.EXAMINE_NPC, MenuOpcode.EXAMINE_OBJECT);
 
 	@Inject
 	private Client client;
@@ -379,7 +379,7 @@ public class DevToolsPlugin extends Plugin
 			return;
 		}
 
-		MenuAction action = MenuAction.of(event.getType());
+		MenuOpcode action = MenuOpcode.of(event.getType());
 
 		if (EXAMINE_MENU_ACTIONS.contains(action))
 		{
@@ -389,7 +389,7 @@ public class DevToolsPlugin extends Plugin
 			final int identifier = event.getIdentifier();
 			String info = "ID: ";
 
-			if (action == MenuAction.EXAMINE_NPC)
+			if (action == MenuOpcode.EXAMINE_NPC)
 			{
 				NPC npc = client.getCachedNPCs()[identifier];
 				info += npc.getId();
@@ -398,7 +398,7 @@ public class DevToolsPlugin extends Plugin
 			{
 				info += identifier;
 
-				if (action == MenuAction.EXAMINE_OBJECT)
+				if (action == MenuOpcode.EXAMINE_OBJECT)
 				{
 					WorldPoint point = WorldPoint.fromScene(client, entry.getParam0(), entry.getParam1(), client.getPlane());
 					info += " X: " + point.getX() + " Y: " + point.getY();

runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java

@@ -138,7 +138,7 @@ public class ExaminePlugin extends Plugin
 
 		ExamineType type;
 		int id, quantity = -1;
-		switch (event.getMenuAction())
+		switch (event.getMenuOpcode())
 		{
 			case EXAMINE_ITEM:
 			{

runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java

@@ -30,7 +30,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
 import net.runelite.client.plugins.xptracker.XpTrackerService;
 import net.runelite.client.ui.overlay.Overlay;

runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java

@@ -37,7 +37,7 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.Friend;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Nameable;
 import net.runelite.api.events.MenuEntryAdded;
@@ -187,7 +187,7 @@ public class FriendNotesPlugin extends Plugin
 			// Build "Add Note" or "Edit Note" menu entry
 			final MenuEntry addNote = new MenuEntry();
 			addNote.setOption(hoveredFriend == null || hoveredFriend.getNote() == null ? ADD_NOTE : EDIT_NOTE);
-			addNote.setType(MenuAction.RUNELITE.getId());
+			addNote.setOpcode(MenuOpcode.RUNELITE.getId());
 			addNote.setTarget(event.getTarget()); //Preserve color codes here
 			addNote.setParam0(event.getActionParam0());
 			addNote.setParam1(event.getActionParam1());

runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java

@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.Friend;
 import net.runelite.api.Ignore;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Nameable;
 import net.runelite.api.events.MenuEntryAdded;
@@ -131,7 +131,7 @@ public class FriendTaggingPlugin extends Plugin
 			// Build "Add Note" or "Edit Note" menu entry
 			final MenuEntry entry = new MenuEntry();
 			entry.setOption(friendName == null || getTag(friendName) == null ? ADD_TAG : DELETE_TAG);
-			entry.setType(MenuAction.RUNELITE.getId());
+			entry.setOpcode(MenuOpcode.RUNELITE.getId());
 			entry.setTarget(event.getTarget()); //Preserve color codes here
 			entry.setParam0(event.getActionParam0());
 			entry.setParam1(event.getActionParam1());

runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletTimer.java

@@ -30,7 +30,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Player;
 import net.runelite.client.chat.ChatColorType;
 import net.runelite.client.chat.ChatMessageBuilder;

runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java

@@ -100,13 +100,13 @@ class SceneUploader
 			reset(bridge);
 		}
 
-		TilePaint tilePaint = tile.getSceneTilePaint();
+		TilePaint tilePaint = tile.getTilePaint();
 		if (tilePaint != null)
 		{
 			tilePaint.setBufferOffset(-1);
 		}
 
-		TileModel sceneTileModel = tile.getSceneTileModel();
+		TileModel sceneTileModel = tile.getTileModel();
 		if (sceneTileModel != null)
 		{
 			sceneTileModel.setBufferOffset(-1);
@@ -115,26 +115,26 @@ class SceneUploader
 		WallObject wallObject = tile.getWallObject();
 		if (wallObject != null)
 		{
-			if (wallObject.getRenderable1() instanceof Model)
+			if (wallObject.getEntity1() instanceof Model)
 			{
-				((Model) wallObject.getRenderable1()).setBufferOffset(-1);
+				((Model) wallObject.getEntity1()).setBufferOffset(-1);
 			}
-			if (wallObject.getRenderable2() instanceof Model)
+			if (wallObject.getEntity2() instanceof Model)
 			{
-				((Model) wallObject.getRenderable2()).setBufferOffset(-1);
+				((Model) wallObject.getEntity2()).setBufferOffset(-1);
 			}
 		}
 
 		GroundObject groundObject = tile.getGroundObject();
-		if (groundObject != null && groundObject.getRenderable() instanceof Model)
+		if (groundObject != null && groundObject.getEntity() instanceof Model)
 		{
-			((Model) groundObject.getRenderable()).setBufferOffset(-1);
+			((Model) groundObject.getEntity()).setBufferOffset(-1);
 		}
 
 		DecorativeObject decorativeObject = tile.getDecorativeObject();
-		if (decorativeObject != null && decorativeObject.getRenderable() instanceof Model)
+		if (decorativeObject != null && decorativeObject.getEntity1() instanceof Model)
 		{
-			((Model) decorativeObject.getRenderable()).setBufferOffset(-1);
+			((Model) decorativeObject.getEntity1()).setBufferOffset(-1);
 		}
 
 		GameObject[] gameObjects = tile.getGameObjects();
@@ -144,9 +144,9 @@ class SceneUploader
 			{
 				continue;
 			}
-			if (gameObject.getRenderable() instanceof Model)
+			if (gameObject.getEntity() instanceof Model)
 			{
-				((Model) gameObject.getRenderable()).setBufferOffset(-1);
+				((Model) gameObject.getEntity()).setBufferOffset(-1);
 			}
 		}
 	}
@@ -159,7 +159,7 @@ class SceneUploader
 			upload(bridge, vertexBuffer, uvBuffer);
 		}
 
-		TilePaint tilePaint = tile.getSceneTilePaint();
+		TilePaint tilePaint = tile.getTilePaint();
 		if (tilePaint != null)
 		{
 			tilePaint.setBufferOffset(offset);
@@ -181,7 +181,7 @@ class SceneUploader
 			}
 		}
 
-		TileModel sceneTileModel = tile.getSceneTileModel();
+		TileModel sceneTileModel = tile.getTileModel();
 		if (sceneTileModel != null)
 		{
 			sceneTileModel.setBufferOffset(offset);
@@ -206,13 +206,13 @@ class SceneUploader
 		WallObject wallObject = tile.getWallObject();
 		if (wallObject != null)
 		{
-			Entity entity1 = wallObject.getRenderable1();
+			Entity entity1 = wallObject.getEntity1();
 			if (entity1 instanceof Model)
 			{
 				uploadModel((Model) entity1, vertexBuffer, uvBuffer);
 			}
 
-			Entity entity2 = wallObject.getRenderable2();
+			Entity entity2 = wallObject.getEntity2();
 			if (entity2 instanceof Model)
 			{
 				uploadModel((Model) entity2, vertexBuffer, uvBuffer);
@@ -222,7 +222,7 @@ class SceneUploader
 		GroundObject groundObject = tile.getGroundObject();
 		if (groundObject != null)
 		{
-			Entity entity = groundObject.getRenderable();
+			Entity entity = groundObject.getEntity();
 			if (entity instanceof Model)
 			{
 				uploadModel((Model) entity, vertexBuffer, uvBuffer);
@@ -232,13 +232,13 @@ class SceneUploader
 		DecorativeObject decorativeObject = tile.getDecorativeObject();
 		if (decorativeObject != null)
 		{
-			Entity entity = decorativeObject.getRenderable();
+			Entity entity = decorativeObject.getEntity1();
 			if (entity instanceof Model)
 			{
 				uploadModel((Model) entity, vertexBuffer, uvBuffer);
 			}
 
-			Entity entity2 = decorativeObject.getRenderable2();
+			Entity entity2 = decorativeObject.getEntity2();
 			if (entity2 instanceof Model)
 			{
 				uploadModel((Model) entity2, vertexBuffer, uvBuffer);
@@ -253,10 +253,10 @@ class SceneUploader
 				continue;
 			}
 
-			Entity entity = gameObject.getRenderable();
+			Entity entity = gameObject.getEntity();
 			if (entity instanceof Model)
 			{
-				uploadModel((Model) gameObject.getRenderable(), vertexBuffer, uvBuffer);
+				uploadModel((Model) gameObject.getEntity(), vertexBuffer, uvBuffer);
 			}
 		}
 	}

runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java

@@ -54,7 +54,7 @@ import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.ItemDefinition;
 import static net.runelite.api.ItemID.COINS_995;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Varbits;
 import net.runelite.api.events.ChatMessage;
@@ -449,7 +449,7 @@ public class GrandExchangePlugin extends Plugin
 			case WidgetID.GRAND_EXCHANGE_INVENTORY_GROUP_ID:
 			case WidgetID.SHOP_INVENTORY_GROUP_ID:
 				menuEntry.setOption(SEARCH_GRAND_EXCHANGE);
-				menuEntry.setType(MenuAction.RUNELITE.getId());
+				menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 				client.setMenuEntries(entries);
 		}
 	}

runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java

@@ -56,8 +56,8 @@ import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemID;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.TileItemPile;
-import net.runelite.api.MenuAction;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Node;
 import net.runelite.api.Player;
@@ -124,14 +124,14 @@ public class GroundItemsPlugin extends Plugin
 	private static final int NORMAL_DURATION_MILLIS = 60 * 1000;
 	private static final int NORMAL_DURATION_TICKS = (int) floor(60 / 0.6);
 	// Ground item menu options
-	private static final int FIRST_OPTION = MenuAction.GROUND_ITEM_FIRST_OPTION.getId();
+	private static final int FIRST_OPTION = MenuOpcode.GROUND_ITEM_FIRST_OPTION.getId();
-	private static final int SECOND_OPTION = MenuAction.GROUND_ITEM_SECOND_OPTION.getId();
+	private static final int SECOND_OPTION = MenuOpcode.GROUND_ITEM_SECOND_OPTION.getId();
-	private static final int THIRD_OPTION = MenuAction.GROUND_ITEM_THIRD_OPTION.getId(); // this is Take
+	private static final int THIRD_OPTION = MenuOpcode.GROUND_ITEM_THIRD_OPTION.getId(); // this is Take
-	private static final int FOURTH_OPTION = MenuAction.GROUND_ITEM_FOURTH_OPTION.getId();
+	private static final int FOURTH_OPTION = MenuOpcode.GROUND_ITEM_FOURTH_OPTION.getId();
-	private static final int FIFTH_OPTION = MenuAction.GROUND_ITEM_FIFTH_OPTION.getId();
+	private static final int FIFTH_OPTION = MenuOpcode.GROUND_ITEM_FIFTH_OPTION.getId();
-	private static final int EXAMINE_ITEM = MenuAction.EXAMINE_ITEM_GROUND.getId();
+	private static final int EXAMINE_ITEM = MenuOpcode.EXAMINE_ITEM_GROUND.getId();
-	private static final int WALK = MenuAction.WALK.getId();
+	private static final int WALK = MenuOpcode.WALK.getId();
-	private static final int CAST_ON_ITEM = MenuAction.SPELL_CAST_ON_GROUND_ITEM.getId();
+	private static final int CAST_ON_ITEM = MenuOpcode.SPELL_CAST_ON_GROUND_ITEM.getId();
 	private static final String TELEGRAB_TEXT = ColorUtil.wrapWithColorTag("Telekinetic Grab", Color.GREEN) + ColorUtil.prependColorTag(" -> ", Color.WHITE);
 	private final Map<Integer, Color> priceChecks = new LinkedHashMap<>();
 	@Getter(AccessLevel.PACKAGE)
@@ -450,7 +450,7 @@ public class GroundItemsPlugin extends Plugin
 
 			if (this.collapseEntries)
 			{
-				int menuType = menuEntry.getType();
+				int menuType = menuEntry.getOpcode();
 				if (menuType == FIRST_OPTION || menuType == SECOND_OPTION || menuType == THIRD_OPTION
 					|| menuType == FOURTH_OPTION || menuType == FIFTH_OPTION || menuType == EXAMINE_ITEM)
 				{
@@ -472,12 +472,12 @@ public class GroundItemsPlugin extends Plugin
 
 		newEntries.sort((a, b) ->
 		{
-			final int aMenuType = a.getEntry().getType();
+			final int aMenuType = a.getEntry().getOpcode();
 			if (aMenuType == FIRST_OPTION || aMenuType == SECOND_OPTION || aMenuType == THIRD_OPTION
 				|| aMenuType == FOURTH_OPTION || aMenuType == FIFTH_OPTION || aMenuType == EXAMINE_ITEM
 				|| aMenuType == WALK)
 			{ // only check for item related menu types, so we don't sort other stuff
-				final int bMenuType = b.getEntry().getType();
+				final int bMenuType = b.getEntry().getOpcode();
 				if (bMenuType == FIRST_OPTION || bMenuType == SECOND_OPTION || bMenuType == THIRD_OPTION
 					|| bMenuType == FOURTH_OPTION || bMenuType == FIFTH_OPTION || bMenuType == EXAMINE_ITEM
 					|| bMenuType == WALK)
@@ -942,7 +942,7 @@ public class GroundItemsPlugin extends Plugin
 
 	private void onMenuOptionClicked(MenuOptionClicked menuOptionClicked)
 	{
-		if (menuOptionClicked.getMenuAction() == MenuAction.ITEM_DROP)
+		if (menuOptionClicked.getMenuOpcode() == MenuOpcode.ITEM_DROP)
 		{
 			int itemId = menuOptionClicked.getIdentifier();
 			// Keep a queue of recently dropped items to better detect

runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java

@@ -47,7 +47,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import static net.runelite.api.Constants.CHUNK_SIZE;
 import net.runelite.api.GameState;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Tile;
 import net.runelite.api.coords.LocalPoint;
@@ -320,7 +320,7 @@ public class GroundMarkerPlugin extends Plugin
 				final String option = (stream.isPresent() && stream.get().getGroup() == i) ? UNMARK : MARK;
 				menuEntry.setOption(ColorUtil.prependColorTag(Text.removeTags(option + (i == 1 ? "" : " (Group " + i + ")")), getColor(i)));
 				menuEntry.setTarget(event.getTarget());
-				menuEntry.setType(MenuAction.RUNELITE.getId());
+				menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 
 				lastIndex++;
 			}

runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java

@@ -39,7 +39,7 @@ import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.ConfigChanged;
@@ -202,7 +202,7 @@ public class HiscorePlugin extends Plugin
 			final MenuEntry lookup = new MenuEntry();
 			lookup.setOption(LOOKUP);
 			lookup.setTarget(event.getTarget());
-			lookup.setType(MenuAction.RUNELITE.getId());
+			lookup.setOpcode(MenuOpcode.RUNELITE.getId());
 			lookup.setParam0(event.getActionParam0());
 			lookup.setParam1(event.getActionParam1());
 			lookup.setIdentifier(event.getIdentifier());

runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java

@@ -32,7 +32,7 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.MenuOpened;
@@ -182,7 +182,7 @@ public class InventoryTagsPlugin extends Plugin
 
 	private void onMenuOptionClicked(final MenuOptionClicked event)
 	{
-		if (event.getMenuAction() != MenuAction.RUNELITE)
+		if (event.getMenuOpcode() != MenuOpcode.RUNELITE)
 		{
 			return;
 		}
@@ -235,7 +235,7 @@ public class InventoryTagsPlugin extends Plugin
 				newMenu.setTarget(ColorUtil.prependColorTag(groupName, MoreObjects.firstNonNull(color, Color.WHITE)));
 				newMenu.setIdentifier(itemId);
 				newMenu.setParam1(widgetId);
-				newMenu.setType(MenuAction.RUNELITE.getId());
+				newMenu.setOpcode(MenuOpcode.RUNELITE.getId());
 				menuList[num++] = newMenu;
 			}
 

runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java

@@ -36,7 +36,7 @@ import net.runelite.api.Item;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.ItemID;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.widgets.WidgetID;
 import net.runelite.api.widgets.WidgetInfo;
@@ -90,7 +90,7 @@ class ItemPricesOverlay extends Overlay
 		}
 
 		final MenuEntry menuEntry = menuEntries[last];
-		final MenuAction action = MenuAction.of(menuEntry.getType());
+		final MenuOpcode action = MenuOpcode.of(menuEntry.getOpcode());
 		final int widgetId = menuEntry.getParam1();
 		final int groupId = WidgetInfo.TO_GROUP(widgetId);
 

runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java

@@ -41,7 +41,7 @@ import net.runelite.api.Client;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.Player;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.AnimationChanged;
@@ -208,7 +208,7 @@ public class KourendLibraryPlugin extends Plugin
 
 	private void onMenuOptionClicked(MenuOptionClicked menuOpt)
 	{
-		if (MenuAction.GAME_OBJECT_FIRST_OPTION == menuOpt.getMenuAction() && menuOpt.getTarget().contains("Bookshelf"))
+		if (MenuOpcode.GAME_OBJECT_FIRST_OPTION == menuOpt.getMenuOpcode() && menuOpt.getTarget().contains("Bookshelf"))
 		{
 			lastBookcaseClick = WorldPoint.fromScene(client, menuOpt.getActionParam0(), menuOpt.getActionParam1(), client.getPlane());
 			overlay.setHidden(false);

runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java

@@ -626,7 +626,7 @@ public class LootTrackerPlugin extends Plugin
 				chestLooted = true;
 				break;
 			case (WidgetID.CLUE_SCROLL_REWARD_GROUP_ID):
-				// event type should be set via ChatMessage for clue scrolls.
+				// event opcode should be set via ChatMessage for clue scrolls.
 				// Clue Scrolls use same InventoryID as Barrows
 				container = client.getItemContainer(InventoryID.BARROWS_REWARD);
 				break;

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java

@@ -48,9 +48,9 @@ import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
-import static net.runelite.api.MenuAction.MENU_ACTION_DEPRIORITIZE_OFFSET;
+import static net.runelite.api.MenuOpcode.MENU_ACTION_DEPRIORITIZE_OFFSET;
-import static net.runelite.api.MenuAction.WALK;
+import static net.runelite.api.MenuOpcode.WALK;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
 import net.runelite.api.Player;
@@ -116,9 +116,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 {
 	private static final String CONFIG_GROUP = "shiftclick";
 	private static final int PURO_PURO_REGION_ID = 10307;
-	private static final Set<MenuAction> NPC_MENU_TYPES = ImmutableSet.of(
+	private static final Set<MenuOpcode> NPC_MENU_TYPES = ImmutableSet.of(
-		MenuAction.NPC_FIRST_OPTION, MenuAction.NPC_SECOND_OPTION, MenuAction.NPC_THIRD_OPTION,
+		MenuOpcode.NPC_FIRST_OPTION, MenuOpcode.NPC_SECOND_OPTION, MenuOpcode.NPC_THIRD_OPTION,
-		MenuAction.NPC_FOURTH_OPTION, MenuAction.NPC_FIFTH_OPTION, MenuAction.EXAMINE_NPC
+		MenuOpcode.NPC_FOURTH_OPTION, MenuOpcode.NPC_FIFTH_OPTION, MenuOpcode.EXAMINE_NPC
 	);
 	private static final Splitter NEWLINE_SPLITTER = Splitter
 		.on("\n")
@@ -534,7 +534,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			{
 				MenuEntry[] menuEntries = client.getMenuEntries();
 				MenuEntry menuEntry = menuEntries[menuEntries.length - 1];
-				menuEntry.setType(MenuAction.WALK.getId() + MENU_ACTION_DEPRIORITIZE_OFFSET);
+				menuEntry.setOpcode(MenuOpcode.WALK.getId() + MENU_ACTION_DEPRIORITIZE_OFFSET);
 				client.setMenuEntries(menuEntries);
 			}
 			else if (option.equalsIgnoreCase("examine"))
@@ -549,7 +549,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 		if (hintArrowNpc != null
 			&& hintArrowNpc.getIndex() == eventId
-			&& NPC_MENU_TYPES.contains(MenuAction.of(event.getType())))
+			&& NPC_MENU_TYPES.contains(MenuOpcode.of(event.getType())))
 		{
 			return;
 		}

runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java

@@ -45,7 +45,7 @@ import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.ItemID;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import static net.runelite.api.ObjectID.DEPLETED_VEIN_26665;
 import static net.runelite.api.ObjectID.DEPLETED_VEIN_26666;
 import static net.runelite.api.ObjectID.DEPLETED_VEIN_26667;
@@ -244,7 +244,7 @@ public class MiningPlugin extends Plugin
 	private void onMenuOptionClicked(MenuOptionClicked event)
 	{
 		//TODO: should work hopefully
-		if (event.getMenuAction() != MenuAction.RUNELITE || event.getActionParam1() != WidgetInfo.INVENTORY.getId())
+		if (event.getMenuOpcode() != MenuOpcode.RUNELITE || event.getActionParam1() != WidgetInfo.INVENTORY.getId())
 		{
 			return;
 		}

runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java

@@ -30,7 +30,7 @@ import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
 import net.runelite.client.ui.overlay.OverlayMenuEntry;

runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java

@@ -52,7 +52,7 @@ import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.ItemID;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
 import static net.runelite.api.ObjectID.DEPLETED_VEIN_26665;
@@ -374,7 +374,7 @@ public class MotherlodePlugin extends Plugin
 			return;
 		}
 
-		if (MINE_SPOTS.contains(menu.getIdentifier()) &&  menu.getMenuAction() == MenuAction.GAME_OBJECT_FIRST_OPTION)
+		if (MINE_SPOTS.contains(menu.getIdentifier()) &&  menu.getMenuOpcode() == MenuOpcode.GAME_OBJECT_FIRST_OPTION)
 		{
 			resetIdleChecks();
 			int veinX = menu.getActionParam0();

runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java

@@ -32,7 +32,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Varbits;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;

runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java

@@ -30,7 +30,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.VarClientInt;
 import net.runelite.api.widgets.Widget;
@@ -75,7 +75,7 @@ class MouseHighlightOverlay extends Overlay
 		MenuEntry menuEntry = menuEntries[last];
 		String target = menuEntry.getTarget();
 		String option = menuEntry.getOption();
-		int type = menuEntry.getType();
+		int type = menuEntry.getOpcode();
 
 		if (shouldNotRenderMenuAction(type))
 		{
@@ -145,12 +145,12 @@ class MouseHighlightOverlay extends Overlay
 
 	private boolean shouldNotRenderMenuAction(int type)
 	{
-		return type == MenuAction.RUNELITE_OVERLAY.getId()
+		return type == MenuOpcode.RUNELITE_OVERLAY.getId()
 				|| (!plugin.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type));
 	}
 
 	private boolean isMenuActionRightClickOnly(int type)
 	{
-		return type == MenuAction.EXAMINE_ITEM_BANK_EQ.getId();
+		return type == MenuOpcode.EXAMINE_ITEM_BANK_EQ.getId();
 	}
 }

runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java

@@ -30,7 +30,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.ItemID;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.VarPlayer;
 import net.runelite.api.Varbits;
 import net.runelite.api.widgets.Widget;

runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java

@@ -49,8 +49,8 @@ import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.GraphicID;
 import net.runelite.api.GraphicsObject;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
-import static net.runelite.api.MenuAction.MENU_ACTION_DEPRIORITIZE_OFFSET;
+import static net.runelite.api.MenuOpcode.MENU_ACTION_DEPRIORITIZE_OFFSET;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
 import net.runelite.api.coords.WorldPoint;
@@ -89,8 +89,8 @@ public class NpcIndicatorsPlugin extends Plugin
 	private static final String TAG = "Tag";
 	private static final String UNTAG = "Un-tag";
 
-	private static final Set<MenuAction> NPC_MENU_ACTIONS = ImmutableSet.of(MenuAction.NPC_FIRST_OPTION, MenuAction.NPC_SECOND_OPTION,
+	private static final Set<MenuOpcode> NPC_MENU_ACTIONS = ImmutableSet.of(MenuOpcode.NPC_FIRST_OPTION, MenuOpcode.NPC_SECOND_OPTION,
-		MenuAction.NPC_THIRD_OPTION, MenuAction.NPC_FOURTH_OPTION, MenuAction.NPC_FIFTH_OPTION);
+		MenuOpcode.NPC_THIRD_OPTION, MenuOpcode.NPC_FOURTH_OPTION, MenuOpcode.NPC_FIFTH_OPTION);
 
 	@Inject
 	private Client client;
@@ -304,14 +304,14 @@ public class NpcIndicatorsPlugin extends Plugin
 		}
 
 		if (this.highlightMenuNames &&
-			NPC_MENU_ACTIONS.contains(MenuAction.of(type)) &&
+			NPC_MENU_ACTIONS.contains(MenuOpcode.of(type)) &&
 			highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier()))
 		{
 			final MenuEntry menuEntry = menuEntries[menuEntries.length - 1];
 			menuEntry.setTarget(target);
 			client.setMenuEntries(menuEntries);
 		}
-		else if (hotKeyPressed && type == MenuAction.EXAMINE_NPC.getId())
+		else if (hotKeyPressed && type == MenuOpcode.EXAMINE_NPC.getId())
 		{
 			// Add tag option
 			menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1);
@@ -321,14 +321,14 @@ public class NpcIndicatorsPlugin extends Plugin
 			tagEntry.setParam0(event.getActionParam0());
 			tagEntry.setParam1(event.getActionParam1());
 			tagEntry.setIdentifier(event.getIdentifier());
-			tagEntry.setType(MenuAction.RUNELITE.getId());
+			tagEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 			client.setMenuEntries(menuEntries);
 		}
 	}
 
 	private void onMenuOptionClicked(MenuOptionClicked click)
 	{
-		if (click.getMenuAction() != MenuAction.RUNELITE ||
+		if (click.getMenuOpcode() != MenuOpcode.RUNELITE ||
 			!(click.getOption().equals(TAG) || click.getOption().equals(UNTAG)))
 		{
 			return;

runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java

@@ -47,7 +47,7 @@ import static net.runelite.api.Constants.REGION_SIZE;
 import net.runelite.api.DecorativeObject;
 import net.runelite.api.GameObject;
 import net.runelite.api.GameState;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.ObjectDefinition;
 import net.runelite.api.Scene;
@@ -242,7 +242,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
 
 	private void onMenuEntryAdded(MenuEntryAdded event)
 	{
-		if (!hotKeyPressed || event.getType() != MenuAction.EXAMINE_OBJECT.getId())
+		if (!hotKeyPressed || event.getType() != MenuOpcode.EXAMINE_OBJECT.getId())
 		{
 			return;
 		}
@@ -258,13 +258,13 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
 		menuEntry.setParam0(event.getActionParam0());
 		menuEntry.setParam1(event.getActionParam1());
 		menuEntry.setIdentifier(event.getIdentifier());
-		menuEntry.setType(MenuAction.RUNELITE.getId());
+		menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 		client.setMenuEntries(menuEntries);
 	}
 
 	private void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (event.getMenuAction() != MenuAction.RUNELITE
+		if (event.getMenuOpcode() != MenuOpcode.RUNELITE
 			|| !(event.getOption().equals(MARK) || event.getOption().equals(UNMARK)))
 		{
 			return;

runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java

@@ -35,7 +35,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.NPC;
 import net.runelite.api.Player;
 import net.runelite.api.Varbits;

runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java

@@ -32,7 +32,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Player;
 import net.runelite.api.Skill;
 import net.runelite.client.game.HiscoreManager;

runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java

@@ -45,7 +45,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Skill;
 import net.runelite.api.SoundEffectID;
@@ -216,7 +216,7 @@ public class PartyPlugin extends Plugin implements KeyListener
 
 	private void onOverlayMenuClicked(OverlayMenuClicked event)
 	{
-		if (event.getEntry().getMenuAction() == MenuAction.RUNELITE_OVERLAY &&
+		if (event.getEntry().getMenuOpcode() == MenuOpcode.RUNELITE_OVERLAY &&
 			event.getEntry().getTarget().equals("Party") &&
 			event.getEntry().getOption().equals("Leave"))
 		{

runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java

@@ -33,7 +33,7 @@ import java.util.Map;
 import java.util.UUID;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.client.plugins.party.data.PartyData;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayMenuEntry;
@@ -63,7 +63,7 @@ public class PartyStatsOverlay extends Overlay
 		this.party = party;
 		body.setBorder(new Rectangle());
 		body.setGap(new Point(0, ComponentConstants.STANDARD_BORDER / 2));
-		getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, "Leave", "Party"));
+		getMenuEntries().add(new OverlayMenuEntry(MenuOpcode.RUNELITE_OVERLAY, "Leave", "Party"));
 	}
 
 	@Override

runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java

@@ -29,7 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayMenuEntry;
 import net.runelite.client.ui.overlay.OverlayPosition;
@@ -59,9 +59,9 @@ public class PerformanceStatsOverlay extends Overlay
 		setPriority(OverlayPriority.LOW);
 		this.tracker = tracker;
 
-		getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, "Pause", TARGET));
+		getMenuEntries().add(new OverlayMenuEntry(MenuOpcode.RUNELITE_OVERLAY, "Pause", TARGET));
-		getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, "Reset", TARGET));
+		getMenuEntries().add(new OverlayMenuEntry(MenuOpcode.RUNELITE_OVERLAY, "Reset", TARGET));
-		getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, "Submit", TARGET));
+		getMenuEntries().add(new OverlayMenuEntry(MenuOpcode.RUNELITE_OVERLAY, "Submit", TARGET));
 
 		panelComponent.setPreferredSize(new Dimension(350, 0));
 		panelComponent.setBackgroundColor(ComponentConstants.STANDARD_BACKGROUND_COLOR);

runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java

@@ -37,19 +37,19 @@ import net.runelite.api.ClanMember;
 import net.runelite.api.ClanMemberRank;
 import static net.runelite.api.ClanMemberRank.UNRANKED;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.FOLLOW;
+import static net.runelite.api.MenuOpcode.FOLLOW;
-import static net.runelite.api.MenuAction.ITEM_USE_ON_PLAYER;
+import static net.runelite.api.MenuOpcode.ITEM_USE_ON_PLAYER;
-import static net.runelite.api.MenuAction.PLAYER_EIGTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_EIGTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_FIFTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_FIFTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_FIRST_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_FIRST_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_FOURTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_FOURTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_SECOND_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_SECOND_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_SEVENTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_SEVENTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_SIXTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_SIXTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_THIRD_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_THIRD_OPTION;
-import static net.runelite.api.MenuAction.RUNELITE;
+import static net.runelite.api.MenuOpcode.RUNELITE;
-import static net.runelite.api.MenuAction.SPELL_CAST_ON_PLAYER;
+import static net.runelite.api.MenuOpcode.SPELL_CAST_ON_PLAYER;
-import static net.runelite.api.MenuAction.TRADE;
+import static net.runelite.api.MenuOpcode.TRADE;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Player;
 import net.runelite.api.events.ClanMemberJoined;

runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java

@@ -41,7 +41,7 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.SpriteID;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.game.ItemManager;

runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java

@@ -32,7 +32,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.ClanMember;
 import net.runelite.api.Client;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.VarPlayer;
 import net.runelite.api.Varbits;
 import net.runelite.client.ui.overlay.Overlay;
@@ -63,9 +63,9 @@ public class RaidsPartyOverlay extends Overlay
 		super(plugin);
 		setPosition(OverlayPosition.TOP_RIGHT);
 		setPriority(OverlayPriority.HIGH);
-		getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Raids party overlay"));
+		getMenuEntries().add(new OverlayMenuEntry(MenuOpcode.RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Raids party overlay"));
-		getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, PARTY_OVERLAY_RESET, "Raids party overlay"));
+		getMenuEntries().add(new OverlayMenuEntry(MenuOpcode.RUNELITE_OVERLAY, PARTY_OVERLAY_RESET, "Raids party overlay"));
-		getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, PARTY_OVERLAY_REFRESH, "Raids party overlay"));
+		getMenuEntries().add(new OverlayMenuEntry(MenuOpcode.RUNELITE_OVERLAY, PARTY_OVERLAY_REFRESH, "Raids party overlay"));
 	}
 
 	@Override

runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java

@@ -51,7 +51,7 @@ import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.InstanceTemplates;
 import net.runelite.api.ItemID;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.NullObjectID;
 import static net.runelite.api.Perspective.SCENE_SIZE;
 import net.runelite.api.Player;
@@ -549,7 +549,7 @@ public class RaidsPlugin extends Plugin
 	private void onOverlayMenuClicked(OverlayMenuClicked event)
 	{
 		OverlayMenuEntry entry = event.getEntry();
-		if (entry.getMenuAction() == MenuAction.RUNELITE_OVERLAY &&
+		if (entry.getMenuOpcode() == MenuOpcode.RUNELITE_OVERLAY &&
 			entry.getTarget().equals("Raids party overlay"))
 		{
 			switch (entry.getOption())

runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java

@@ -31,7 +31,7 @@ import java.util.Locale;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Varbits;
 import static net.runelite.client.plugins.raids.RaidsPlugin.POINTS_FORMAT;
 import net.runelite.client.ui.overlay.Overlay;

runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java

@@ -57,7 +57,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.api.events.MenuOptionClicked;
@@ -129,7 +129,7 @@ public class SlayermusiqPlugin extends Plugin
 
 	private void onMenuOptionClicked(MenuOptionClicked ev)
 	{
-		if (ev.getMenuAction() == MenuAction.RUNELITE && ev.getOption().equals(MENUOP_SLAYERMUSIQ))
+		if (ev.getMenuOpcode() == MenuOpcode.RUNELITE && ev.getOption().equals(MENUOP_SLAYERMUSIQ))
 		{
 			ev.consume();
 			String quest = Text.removeTags(ev.getTarget());
@@ -147,7 +147,7 @@ public class SlayermusiqPlugin extends Plugin
 		menuEntry.setOption(MENUOP_SLAYERMUSIQ);
 		menuEntry.setParam0(widgetIndex);
 		menuEntry.setParam1(widgetID);
-		menuEntry.setType(MenuAction.RUNELITE.getId());
+		menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 
 		return menuEntry;
 	}

runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java

@@ -34,7 +34,7 @@ import javax.inject.Singleton;
 import static net.runelite.api.AnimationID.SMITHING_CANNONBALL;
 import static net.runelite.api.AnimationID.SMITHING_SMELTING;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
 import net.runelite.client.plugins.xptracker.XpTrackerService;
 import net.runelite.client.ui.overlay.Overlay;

runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.ItemID;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;

runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java

@@ -28,7 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.NPC;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.plugins.theatre.TheatreRoom;

runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java

@@ -3,7 +3,7 @@ package net.runelite.client.plugins.theatre.rooms.xarpus;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;

runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java

@@ -5,7 +5,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Player;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.ui.overlay.Overlay;

runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java

@@ -31,18 +31,18 @@ import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.FOLLOW;
+import static net.runelite.api.MenuOpcode.FOLLOW;
-import static net.runelite.api.MenuAction.ITEM_USE_ON_PLAYER;
+import static net.runelite.api.MenuOpcode.ITEM_USE_ON_PLAYER;
-import static net.runelite.api.MenuAction.PLAYER_EIGTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_EIGTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_FIFTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_FIFTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_FIRST_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_FIRST_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_FOURTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_FOURTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_SECOND_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_SECOND_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_SEVENTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_SEVENTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_SIXTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_SIXTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_THIRD_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_THIRD_OPTION;
-import static net.runelite.api.MenuAction.SPELL_CAST_ON_PLAYER;
+import static net.runelite.api.MenuOpcode.SPELL_CAST_ON_PLAYER;
-import static net.runelite.api.MenuAction.TRADE;
+import static net.runelite.api.MenuOpcode.TRADE;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Player;
 import net.runelite.api.events.ConfigChanged;

runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java

@@ -14,7 +14,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayMenuEntry;
@@ -40,7 +40,7 @@ public class WhaleWatchersOverlay extends Overlay
 	@Inject
 	public WhaleWatchersOverlay(final Client client, final WhaleWatchersPlugin plugin)
 	{
-		OverlayMenuEntry resetMenuEntry = new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY,
+		OverlayMenuEntry resetMenuEntry = new OverlayMenuEntry(MenuOpcode.RUNELITE_OVERLAY,
 			"Reset", "Damage Counter");
 		this.getMenuEntries().add(resetMenuEntry);
 		this.client = client;

runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java

@@ -22,7 +22,7 @@ import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.InventoryID;
 import net.runelite.api.ItemID;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.Skill;
 import net.runelite.api.SkullIcon;
 import net.runelite.api.VarPlayer;
@@ -202,7 +202,7 @@ public class WhaleWatchersPlugin extends Plugin
 
 	private void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (this.showDamageCounter && event.getMenuAction().equals(MenuAction.SPELL_CAST_ON_PLAYER))
+		if (this.showDamageCounter && event.getMenuOpcode().equals(MenuOpcode.SPELL_CAST_ON_PLAYER))
 		{
 			inCombat = true;
 		}

runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java

@@ -33,7 +33,7 @@ import javax.inject.Provider;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
 import net.runelite.api.NPCDefinition;
@@ -221,7 +221,7 @@ public class WikiPlugin extends Plugin
 			String name;
 			WorldPoint location;
 
-			switch (ev.getMenuAction())
+			switch (ev.getMenuOpcode())
 			{
 				case CANCEL:
 					return;
@@ -258,7 +258,7 @@ public class WikiPlugin extends Plugin
 					break;
 				}
 				default:
-					log.info("Unknown menu option: {} {} {}", ev, ev.getMenuAction(), ev.getMenuAction() == MenuAction.CANCEL);
+					log.info("Unknown menu option: {} {} {}", ev, ev.getMenuOpcode(), ev.getMenuOpcode() == MenuOpcode.CANCEL);
 					return;
 			}
 
@@ -283,7 +283,7 @@ public class WikiPlugin extends Plugin
 			return;
 		}
 
-		if (ev.getMenuAction() == MenuAction.RUNELITE)
+		if (ev.getMenuOpcode() == MenuOpcode.RUNELITE)
 		{
 			boolean quickguide = false;
 			switch (ev.getOption())
@@ -349,14 +349,14 @@ public class WikiPlugin extends Plugin
 			menuEntry.setOption(MENUOP_GUIDE);
 			menuEntry.setParam0(widgetIndex);
 			menuEntry.setParam1(widgetID);
-			menuEntry.setType(MenuAction.RUNELITE.getId());
+			menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 
 			menuEntry = menuEntries[menuEntries.length - 2] = new MenuEntry();
 			menuEntry.setTarget(event.getTarget());
 			menuEntry.setOption(MENUOP_QUICKGUIDE);
 			menuEntry.setParam0(widgetIndex);
 			menuEntry.setParam1(widgetID);
-			menuEntry.setType(MenuAction.RUNELITE.getId());
+			menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 
 			client.setMenuEntries(menuEntries);
 		}
@@ -372,7 +372,7 @@ public class WikiPlugin extends Plugin
 			menuEntry.setParam0(widgetIndex);
 			menuEntry.setParam1(widgetID);
 			menuEntry.setIdentifier(event.getIdentifier());
-			menuEntry.setType(MenuAction.RUNELITE.getId());
+			menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 
 			client.setMenuEntries(menuEntries);
 		}

runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java

@@ -31,7 +31,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
 import static net.runelite.client.plugins.wintertodt.WintertodtPlugin.WINTERTODT_KINDLING_MULTIPLIER;
 import static net.runelite.client.plugins.wintertodt.WintertodtPlugin.WINTERTODT_ROOTS_MULTIPLIER;

runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java

@@ -30,7 +30,7 @@ import java.awt.Graphics2D;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
 import net.runelite.client.plugins.xptracker.XpTrackerService;
 import net.runelite.client.ui.overlay.Overlay;

runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java

@@ -56,7 +56,7 @@ import net.runelite.api.ClanMember;
 import net.runelite.api.Client;
 import net.runelite.api.Friend;
 import net.runelite.api.GameState;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Varbits;
 import net.runelite.api.events.ChatMessage;
@@ -426,7 +426,7 @@ public class WorldHopperPlugin extends Plugin
 			final MenuEntry hopTo = new MenuEntry();
 			hopTo.setOption(HOP_TO);
 			hopTo.setTarget(event.getTarget());
-			hopTo.setType(MenuAction.RUNELITE.getId());
+			hopTo.setOpcode(MenuOpcode.RUNELITE.getId());
 			hopTo.setParam0(event.getActionParam0());
 			hopTo.setParam1(event.getActionParam1());
 

runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java

@@ -42,7 +42,7 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Point;
 import net.runelite.client.game.SkillIconManager;
 import net.runelite.client.plugins.xptracker.XpActionType;

runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java

@@ -33,7 +33,7 @@ import java.awt.image.BufferedImage;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Experience;
-import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
+import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.SkillColor;

runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java

@@ -45,7 +45,7 @@ import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.Experience;
 import net.runelite.api.GameState;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
 import net.runelite.api.Player;
@@ -508,14 +508,14 @@ public class XpTrackerPlugin extends Plugin
 		menuEntry.setOption(hasOverlay(skill) ? MENUOP_REMOVE_CANVAS_TRACKER : MENUOP_ADD_CANVAS_TRACKER);
 		menuEntry.setParam0(event.getActionParam0());
 		menuEntry.setParam1(widgetID);
-		menuEntry.setType(MenuAction.RUNELITE.getId());
+		menuEntry.setOpcode(MenuOpcode.RUNELITE.getId());
 
 		client.setMenuEntries(menuEntries);
 	}
 
 	private void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (event.getMenuAction().getId() != MenuAction.RUNELITE.getId()
+		if (event.getMenuOpcode().getId() != MenuOpcode.RUNELITE.getId()
 			|| TO_GROUP(event.getActionParam1()) != WidgetID.SKILLS_GROUP_ID)
 		{
 			return;

runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoUtil.java

@@ -123,7 +123,7 @@ public class ZalcanoUtil
 				{
 					if (client.getLocalPlayer().getLocalLocation().distanceTo(gameObject.getLocalLocation()) <= 2400)
 					{
-						Entity entity = gameObject.getRenderable();
+						Entity entity = gameObject.getEntity();
 						if (entity instanceof DynamicObject)
 						{
 							if (((DynamicObject) entity).getAnimationID() == AnimationID.ZALCANO_ROCK_GLOWING)
@@ -149,7 +149,7 @@ public class ZalcanoUtil
 				{
 					if (client.getLocalPlayer().getLocalLocation().distanceTo(gameObject.getLocalLocation()) <= 2400)
 					{
-						Entity entity = gameObject.getRenderable();
+						Entity entity = gameObject.getEntity();
 						if (entity instanceof DynamicObject)
 						{
 							list.add(gameObject);

runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java

@@ -39,7 +39,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.events.MenuOptionClicked;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.api.widgets.WidgetItem;
@@ -123,7 +123,7 @@ public class OverlayManager
 
 	private void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (event.getMenuAction() != MenuAction.RUNELITE_OVERLAY)
+		if (event.getMenuOpcode() != MenuOpcode.RUNELITE_OVERLAY)
 		{
 			return;
 		}

runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayMenuEntry.java

@@ -25,12 +25,12 @@
 package net.runelite.client.ui.overlay;
 
 import lombok.Value;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 
 @Value
 public class OverlayMenuEntry
 {
-	private MenuAction menuAction;
+	private MenuOpcode menuOpcode;
 	private String option;
 	private String target;
 }

runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java

@@ -47,7 +47,7 @@ import javax.swing.SwingUtilities;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.events.BeforeRender;
 import net.runelite.api.events.ClientTick;
@@ -642,7 +642,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 			final MenuEntry entry = new MenuEntry();
 			entry.setOption(overlayMenuEntry.getOption());
 			entry.setTarget(ColorUtil.wrapWithColorTag(overlayMenuEntry.getTarget(), JagexColors.MENU_TARGET));
-			entry.setType(MenuAction.RUNELITE_OVERLAY.getId());
+			entry.setOpcode(MenuOpcode.RUNELITE_OVERLAY.getId());
 			entry.setIdentifier(overlayManager.getOverlays().indexOf(overlay)); // overlay id
 
 			entries[i] = entry;

runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java

@@ -113,13 +113,13 @@ public class ArrowWorldOverlay extends Overlay
 					}
 					for (GameObject object : objects)
 					{
-						if (object.getRenderable().getModel() == null)
+						if (object.getEntity().getModel() == null)
 						{
 							renderWorldArrow(graphics, arrowPoint, object.getLocalLocation(), 0);
 						}
 						else
 						{
-							renderWorldArrow(graphics, arrowPoint, object.getLocalLocation(), object.getRenderable().getModel().getModelHeight() + Z_OFFSET);
+							renderWorldArrow(graphics, arrowPoint, object.getLocalLocation(), object.getEntity().getModel().getModelHeight() + Z_OFFSET);
 						}
 					}
 				}

runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java

@@ -32,7 +32,7 @@ import javax.inject.Inject;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.ItemID;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.MenuOptionClicked;
@@ -93,7 +93,7 @@ public class ExaminePluginTest
 			"Examine",
 			"Something",
 			ItemID.ABYSSAL_WHIP,
-			MenuAction.EXAMINE_ITEM.getId(),
+			MenuOpcode.EXAMINE_ITEM.getId(),
 			123,
 			456,
 			false
@@ -116,7 +116,7 @@ public class ExaminePluginTest
 			"Examine",
 			"Something",
 			ItemID.ABYSSAL_WHIP,
-			MenuAction.EXAMINE_ITEM.getId(),
+			MenuOpcode.EXAMINE_ITEM.getId(),
 			123,
 			456,
 			false

runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java

@@ -95,12 +95,12 @@ public abstract class EntityHiderMixin implements RSScene
 	private static boolean hideDeadNPCs;
 
 	@Copy("newGameObject")
-	abstract boolean addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSEntity renderable, int var10, boolean var11, long var12, int var13);
+	abstract boolean addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSEntity entity, int var10, boolean var11, long var12, int var13);
 
 	@Replace("newGameObject")
-	boolean rl$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSEntity renderable, int var10, boolean var11, long var12, int var13)
+	boolean rl$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSEntity entity, int var10, boolean var11, long var12, int var13)
 	{
-		final boolean shouldDraw = shouldDraw(renderable, false);
+		final boolean shouldDraw = shouldDraw(entity, false);
 
 		if (!shouldDraw)
 		{
@@ -113,7 +113,7 @@ public abstract class EntityHiderMixin implements RSScene
 			client.getOccupiedTilesTick()[tileX][tileY] = -1;
 		}
 
-		return shouldDraw && addEntityMarker(var1, var2, var3, var4, var5, x, y, var8, renderable, var10, var11, var12, var13);
+		return shouldDraw && addEntityMarker(var1, var2, var3, var4, var5, x, y, var8, entity, var10, var11, var12, var13);
 	}
 
 	@Copy("drawActor2d")
@@ -132,22 +132,22 @@ public abstract class EntityHiderMixin implements RSScene
 	}
 
 	@Inject
-	private static boolean shouldDraw(Object renderable, boolean drawingUI)
+	private static boolean shouldDraw(Object entity, boolean drawingUI)
 	{
 		if (!isHidingEntities)
 		{
 			return true;
 		}
 
-		if (renderable instanceof RSPlayer)
+		if (entity instanceof RSPlayer)
 		{
 			boolean local = drawingUI ? hideLocalPlayer2D : hideLocalPlayer;
 			boolean other = drawingUI ? hidePlayers2D : hidePlayers;
-			boolean isLocalPlayer = renderable == client.getLocalPlayer();
+			boolean isLocalPlayer = entity == client.getLocalPlayer();
 
 			if (isLocalPlayer ? local : other)
 			{
-				RSPlayer player = (RSPlayer) renderable;
+				RSPlayer player = (RSPlayer) entity;
 
 				if (!hideAttackers)
 				{
@@ -166,9 +166,9 @@ public abstract class EntityHiderMixin implements RSScene
 				return (!hideFriends && player.isFriend()) || (!isLocalPlayer && !hideClanMates && player.isClanMember());
 			}
 		}
-		else if (renderable instanceof RSNPC)
+		else if (entity instanceof RSNPC)
 		{
-			RSNPC npc = (RSNPC) renderable;
+			RSNPC npc = (RSNPC) entity;
 
 			if (!hideAttackers)
 			{
@@ -207,7 +207,7 @@ public abstract class EntityHiderMixin implements RSScene
 
 			return drawingUI ? !hideNPCs2D : !hideNPCs;
 		}
-		else if (renderable instanceof RSProjectile)
+		else if (entity instanceof RSProjectile)
 		{
 			return !hideProjectiles;
 		}

runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java

@@ -115,12 +115,12 @@ public abstract class MenuMixin implements RSClient
 	public void sortMenuEntries()
 	{
 		int count = getMenuOptionCount() - 1;
-		int[] menuOpcodes = getMenuTypes();
+		int[] menuOpcodes = getMenuOpcodes();
 		String[] menuTargetNames = getMenuTargets();
 		String[] menuActions = getMenuOptions();
 		int[] menuArguments0 = getMenuIdentifiers();
-		int[] menuArguments1 = getMenuActionParams0();
+		int[] menuArguments1 = getMenuArguments1();
-		int[] menuArguments2 = getMenuActionParams1();
+		int[] menuArguments2 = getMenuArguments2();
 		boolean[] menuShiftClick = getMenuForceLeftClick();
 
 		int tmp;

runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java

@@ -36,7 +36,7 @@ public abstract class ProcessClientErrorMixin implements RSClient
 	@Shadow("client")
 	private static RSClient client;
 
-	@Replace("sendStackTrace")
+	@Replace("RunException_sendStackTrace")
 	static void rl$processClientError(String string, Throwable throwable)
 	{
 		if (throwable != null)

runelite-mixins/src/main/java/net/runelite/mixins/RSBoundaryObjectMixin.java

@@ -36,7 +36,7 @@ public abstract class RSBoundaryObjectMixin implements RSBoundaryObject
 	@Inject
 	public Model getModelA()
 	{
-		Entity entity = getRenderable1();
+		Entity entity = getEntity1();
 		if (entity == null)
 		{
 			return null;
@@ -55,7 +55,7 @@ public abstract class RSBoundaryObjectMixin implements RSBoundaryObject
 	@Inject
 	public Model getModelB()
 	{
-		Entity entity = getRenderable2();
+		Entity entity = getEntity2();
 		if (entity == null)
 		{
 			return null;

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

@@ -50,15 +50,15 @@ import net.runelite.api.Ignore;
 import net.runelite.api.IndexDataBase;
 import net.runelite.api.IndexedSprite;
 import net.runelite.api.InventoryID;
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
-import static net.runelite.api.MenuAction.PLAYER_EIGTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_EIGTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_FIFTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_FIFTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_FIRST_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_FIRST_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_FOURTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_FOURTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_SECOND_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_SECOND_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_SEVENTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_SEVENTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_SIXTH_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_SIXTH_OPTION;
-import static net.runelite.api.MenuAction.PLAYER_THIRD_OPTION;
+import static net.runelite.api.MenuOpcode.PLAYER_THIRD_OPTION;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.MessageNode;
 import net.runelite.api.NPC;
@@ -654,9 +654,9 @@ public abstract class RSClientMixin implements RSClient
 		String[] menuOptions = getMenuOptions();
 		String[] menuTargets = getMenuTargets();
 		int[] menuIdentifiers = getMenuIdentifiers();
-		int[] menuTypes = getMenuTypes();
+		int[] menuTypes = getMenuOpcodes();
-		int[] params0 = getMenuActionParams0();
+		int[] params0 = getMenuArguments1();
-		int[] params1 = getMenuActionParams1();
+		int[] params1 = getMenuArguments2();
 		boolean[] leftClick = getMenuForceLeftClick();
 
 		MenuEntry[] entries = new MenuEntry[count];
@@ -666,7 +666,7 @@ public abstract class RSClientMixin implements RSClient
 			entry.setOption(menuOptions[i]);
 			entry.setTarget(menuTargets[i]);
 			entry.setIdentifier(menuIdentifiers[i]);
-			entry.setType(menuTypes[i]);
+			entry.setOpcode(menuTypes[i]);
 			entry.setParam0(params0[i]);
 			entry.setParam1(params1[i]);
 			entry.setForceLeftClick(leftClick[i]);
@@ -682,9 +682,9 @@ public abstract class RSClientMixin implements RSClient
 		String[] menuOptions = getMenuOptions();
 		String[] menuTargets = getMenuTargets();
 		int[] menuIdentifiers = getMenuIdentifiers();
-		int[] menuTypes = getMenuTypes();
+		int[] menuTypes = getMenuOpcodes();
-		int[] params0 = getMenuActionParams0();
+		int[] params0 = getMenuArguments1();
-		int[] params1 = getMenuActionParams1();
+		int[] params1 = getMenuArguments2();
 		boolean[] leftClick = getMenuForceLeftClick();
 
 		for (MenuEntry entry : entries)
@@ -697,7 +697,7 @@ public abstract class RSClientMixin implements RSClient
 			menuOptions[count] = entry.getOption();
 			menuTargets[count] = entry.getTarget();
 			menuIdentifiers[count] = entry.getIdentifier();
-			menuTypes[count] = entry.getType();
+			menuTypes[count] = entry.getOpcode();
 			params0[count] = entry.getParam0();
 			params1[count] = entry.getParam1();
 			leftClick[count] = entry.isForceLeftClick();
@@ -724,9 +724,9 @@ public abstract class RSClientMixin implements RSClient
 					client.getMenuOptions()[oldCount],
 					client.getMenuTargets()[oldCount],
 					client.getMenuIdentifiers()[oldCount],
-					client.getMenuTypes()[oldCount],
+					client.getMenuOpcodes()[oldCount],
-					client.getMenuActionParams0()[oldCount],
+					client.getMenuArguments1()[oldCount],
-					client.getMenuActionParams1()[oldCount],
+					client.getMenuArguments2()[oldCount],
 					client.getMenuForceLeftClick()[oldCount]
 				)
 			);
@@ -1041,12 +1041,12 @@ public abstract class RSClientMixin implements RSClient
 	@Inject
 	public static void playerOptionsChanged(int idx)
 	{
-		// Reset the menu type
+		// Reset the menu opcode
-		MenuAction[] playerActions = {PLAYER_FIRST_OPTION, PLAYER_SECOND_OPTION, PLAYER_THIRD_OPTION, PLAYER_FOURTH_OPTION,
+		MenuOpcode[] playerActions = {PLAYER_FIRST_OPTION, PLAYER_SECOND_OPTION, PLAYER_THIRD_OPTION, PLAYER_FOURTH_OPTION,
 			PLAYER_FIFTH_OPTION, PLAYER_SIXTH_OPTION, PLAYER_SEVENTH_OPTION, PLAYER_EIGTH_OPTION};
 		if (idx >= 0 && idx < playerActions.length)
 		{
-			MenuAction playerAction = playerActions[idx];
+			MenuOpcode playerAction = playerActions[idx];
 			client.getPlayerMenuTypes()[idx] = playerAction.getId();
 		}
 
@@ -1346,7 +1346,7 @@ public abstract class RSClientMixin implements RSClient
 			return;
 		}
 
-		rs$menuAction(menuOptionClicked.getActionParam0(), menuOptionClicked.getActionParam1(), menuOptionClicked.getType(),
+		rs$menuAction(menuOptionClicked.getActionParam0(), menuOptionClicked.getActionParam1(), menuOptionClicked.getOpcode(),
 			menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), var6, var7);
 	}
 
@@ -1642,8 +1642,8 @@ public abstract class RSClientMixin implements RSClient
 		int len = getMenuOptionCount();
 		if (len > 0)
 		{
-			int type = getMenuTypes()[len - 1];
+			int type = getMenuOpcodes()[len - 1];
-			return type == MenuAction.RUNELITE_OVERLAY.getId();
+			return type == MenuOpcode.RUNELITE_OVERLAY.getId();
 		}
 
 		return false;

runelite-mixins/src/main/java/net/runelite/mixins/RSFloorDecorationMixin.java

@@ -37,7 +37,7 @@ public abstract class RSFloorDecorationMixin implements RSFloorDecoration
 	@Override
 	public Model getModel()
 	{
-		Entity entity = getRenderable();
+		Entity entity = getEntity();
 		if (entity == null)
 		{
 			return null;

runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java

@@ -62,7 +62,7 @@ public abstract class RSGameObjectMixin implements RSGameObject
 	@Override
 	public RSModel getModel()
 	{
-		RSEntity renderable = getRenderable();
+		RSEntity renderable = getEntity();
 		if (renderable == null)
 		{
 			return null;

runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java

@@ -398,13 +398,13 @@ public abstract class RSTileMixin implements RSTile
 		boolean currentInvalid = false, prevInvalid = false;
 		if (current != null)
 		{
-			RSEntity renderable = current.getRenderable();
+			RSEntity renderable = current.getEntity();
 			currentInvalid = renderable instanceof RSActor || renderable instanceof RSProjectile || renderable instanceof RSGraphicsObject;
 		}
 
 		if (previous != null)
 		{
-			RSEntity renderable = previous.getRenderable();
+			RSEntity renderable = previous.getEntity();
 			prevInvalid = renderable instanceof RSActor || renderable instanceof RSProjectile || renderable instanceof RSGraphicsObject;
 		}
 

runelite-mixins/src/main/java/net/runelite/mixins/RSWallDecorationMixin.java

@@ -40,7 +40,7 @@ public abstract class RSWallDecorationMixin implements RSWallDecoration
 	@Override
 	public RSModel getModel1()
 	{
-		RSEntity renderable = getRenderable();
+		RSEntity renderable = getEntity1();
 		if (renderable == null)
 		{
 			return null;
@@ -64,7 +64,7 @@ public abstract class RSWallDecorationMixin implements RSWallDecoration
 	@Override
 	public RSModel getModel2()
 	{
-		RSEntity renderable = getRenderable2();
+		RSEntity renderable = getEntity2();
 		if (renderable == null)
 		{
 			return null;

runelite-mixins/src/main/java/net/runelite/mixins/WorldHoppingMixin.java

@@ -1,6 +1,6 @@
 package net.runelite.mixins;
 
-import net.runelite.api.MenuAction;
+import net.runelite.api.MenuOpcode;
 import net.runelite.api.World;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.api.mixins.Inject;
@@ -15,7 +15,7 @@ public abstract class WorldHoppingMixin implements RSClient
 	public void openWorldHopper()
 	{
 		// The clicked x & y coordinates (the last arguments) are not processed in the game or sent to Jagex, so they don't have to be real.
-		invokeMenuAction(-1, WidgetInfo.WORLD_SWITCHER_BUTTON.getId(), MenuAction.WIDGET_DEFAULT.getId(), 1, "World Switcher", "", 658, 384);
+		invokeMenuAction(-1, WidgetInfo.WORLD_SWITCHER_BUTTON.getId(), MenuOpcode.WIDGET_DEFAULT.getId(), 1, "World Switcher", "", 658, 384);
 	}
 
 	@Inject
@@ -23,6 +23,6 @@ public abstract class WorldHoppingMixin implements RSClient
 	public void hopToWorld(World world)
 	{
 		final int worldId = world.getId();
-		invokeMenuAction(worldId, WidgetInfo.WORLD_SWITCHER_LIST.getId(), MenuAction.WIDGET_DEFAULT.getId(), 1, "Switch", "<col=ff9040>" + (worldId - 300) + "</col>", 683, 244);
+		invokeMenuAction(worldId, WidgetInfo.WORLD_SWITCHER_LIST.getId(), MenuOpcode.WIDGET_DEFAULT.getId(), 1, "Switch", "<col=ff9040>" + (worldId - 300) + "</col>", 683, 244);
 	}
 }