diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java
index 0e83f9a419..622ec9ada2 100644
--- a/runelite-api/src/main/java/net/runelite/api/Client.java
+++ b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -1905,4 +1905,10 @@ public interface Client extends GameShell
 	 * the "You have been disconnected." message anymore.
 	 */
 	void setHideDisconnect(boolean dontShow);
+
+	/**
+	 * Sets the fields in the temporary menu entry that's saved in the client
+	 * when a inventory item is clicked and dragged.
+	 */
+	void setTempMenuEntry(MenuEntry entry);
 }
\ No newline at end of file
diff --git a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
index 5bd32e33ee..6e92ef27d3 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
@@ -25,7 +25,6 @@
 package net.runelite.api.events;
 
 import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.MenuEntry;
@@ -42,7 +41,6 @@ import net.runelite.api.MenuEntry;
  * it seems that this event still triggers with the "Cancel" action.
  */
 @Getter
-@EqualsAndHashCode(callSuper = true)
 public class MenuOptionClicked extends MenuEntry implements Event
 {
 	public MenuOptionClicked(String option, String target, int identifier, int opcode, int param0, int param1, boolean forceLeftClick)
diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
index 144f84ad5d..0b4bb2fb29 100644
--- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
@@ -52,6 +52,7 @@ import net.runelite.api.MenuOpcode;
 import static net.runelite.api.MenuOpcode.MENU_ACTION_DEPRIORITIZE_OFFSET;
 import net.runelite.api.NPCDefinition;
 import net.runelite.api.events.BeforeRender;
+import net.runelite.api.events.ClientTick;
 import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.api.events.MenuOpened;
 import net.runelite.api.events.MenuOptionClicked;
@@ -89,7 +90,6 @@ public class MenuManager
 	private final Map<AbstractComparableEntry, AbstractComparableEntry> swaps = new HashMap<>();
 
 	private MenuEntry leftClickEntry = null;
-	private MenuEntry firstEntry = null;
 
 	private int playerAttackIdx = -1;
 
@@ -102,11 +102,15 @@ public class MenuManager
 
 		eventBus.subscribe(MenuOpened.class, this, this::onMenuOpened);
 		eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded);
-		eventBus.subscribe(BeforeRender.class, this, this::onBeforeRender);
 		eventBus.subscribe(PlayerMenuOptionsChanged.class, this, this::onPlayerMenuOptionsChanged);
 		eventBus.subscribe(NpcActionChanged.class, this, this::onNpcActionChanged);
 		eventBus.subscribe(WidgetPressed.class, this, this::onWidgetPressed);
 		eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked);
+
+		// Make sure last tick's entry gets cleared
+		eventBus.subscribe(ClientTick.class, this, tick -> leftClickEntry = null);
+		// Rebuild left click menu for top left entry
+		eventBus.subscribe(BeforeRender.class, this, br -> rebuildLeftClickMenu());
 	}
 
 	/**
@@ -153,7 +157,7 @@ public class MenuManager
 		// Need to reorder the list to normal, then rebuild with swaps
 		MenuEntry[] oldEntries = event.getMenuEntries();
 
-		firstEntry = null;
+		leftClickEntry = null;
 
 		List<MenuEntry> newEntries = Lists.newArrayList(oldEntries);
 
@@ -281,25 +285,20 @@ public class MenuManager
 		}
 	}
 
-	private void onBeforeRender(BeforeRender event)
-	{
-		rebuildLeftClickMenu();
-	}
-
-	private MenuEntry rebuildLeftClickMenu()
+	private void rebuildLeftClickMenu()
 	{
+		leftClickEntry = null;
 		if (client.isMenuOpen())
 		{
-			return null;
+			return;
 		}
 
 		int menuOptionCount = client.getMenuOptionCount();
 		if (menuOptionCount <= 2)
 		{
-			return null;
+			return;
 		}
 
-		firstEntry = null;
 		MenuEntry[] entries = new MenuEntry[menuOptionCount + priorityEntries.size()];
 		System.arraycopy(client.getMenuEntries(), 0, entries, 0, menuOptionCount);
 
@@ -308,21 +307,19 @@ public class MenuManager
 			indexPriorityEntries(entries, menuOptionCount);
 		}
 
-		if (firstEntry == null && !swaps.isEmpty())
+		if (leftClickEntry == null && !swaps.isEmpty())
 		{
 			indexSwapEntries(entries, menuOptionCount);
 		}
 
 
-		if (firstEntry == null)
+		if (leftClickEntry == null)
 		{
 			// stop being null smh
-			firstEntry = entries[menuOptionCount - 1];
+			leftClickEntry = entries[menuOptionCount - 1];
 		}
 
 		client.setMenuEntries(entries);
-
-		return firstEntry;
 	}
 
 	public void addPlayerMenuItem(String menuText)
@@ -426,16 +423,18 @@ public class MenuManager
 
 	private void onWidgetPressed(WidgetPressed event)
 	{
-		leftClickEntry = rebuildLeftClickMenu();
+		rebuildLeftClickMenu();
+		client.setTempMenuEntry(leftClickEntry);
 	}
 
 	private void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (!client.isMenuOpen() && event.isAuthentic())
+		// option and target will be the same if this one came from "tempMenuAction"
+		if (!client.isMenuOpen() && !event.getOption().equals(event.getTarget()) && event.isAuthentic())
 		{
-			if (event.getMouseButton() != 0)
+			if (!event.equals(leftClickEntry))
 			{
-				leftClickEntry = rebuildLeftClickMenu();
+				rebuildLeftClickMenu();
 			}
 
 			if (leftClickEntry != null)
@@ -879,7 +878,7 @@ public class MenuManager
 			entries[menuOptionCount + i] = prios[i].entry;
 		}
 
-		firstEntry = entries[menuOptionCount + i - 1];
+		leftClickEntry = entries[menuOptionCount + i - 1];
 
 	}
 
@@ -922,7 +921,7 @@ public class MenuManager
 
 				entries[i] = first;
 				entries[menuOptionCount - 1] = entry;
-				firstEntry = entry;
+				leftClickEntry = entry;
 				return;
 			}
 		}
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java
index 4f88ec22cd..b35729e799 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java
@@ -25,10 +25,14 @@
 package net.runelite.mixins;
 
 import net.runelite.api.MenuEntry;
+import net.runelite.api.events.WidgetPressed;
+import net.runelite.api.mixins.FieldHook;
 import net.runelite.api.mixins.Inject;
 import net.runelite.api.mixins.Mixin;
+import net.runelite.api.mixins.Shadow;
 import net.runelite.rs.api.RSClient;
 import net.runelite.rs.api.RSFont;
+import net.runelite.rs.api.RSMenuAction;
 
 @Mixin(RSClient.class)
 public abstract class MenuMixin implements RSClient
@@ -41,6 +45,12 @@ public abstract class MenuMixin implements RSClient
 	private static final int MENU_HEADER_GRADIENT_TOP_2010 = 0x322E22;
 	private static final int MENU_HEADER_GRADIENT_BOTTOM_2010 = 0x090A04;
 
+	@Shadow("client")
+	private static RSClient client;
+
+	@Shadow("tempMenuAction")
+	private static RSMenuAction tempMenuAction;
+
 	@Inject
 	@Override
 	public void draw2010Menu()
@@ -140,4 +150,28 @@ public abstract class MenuMixin implements RSClient
 		getMenuArguments2()[i] = entry.getParam1();
 		getMenuForceLeftClick()[i] = entry.isForceLeftClick();
 	}
+
+	@Inject
+	@FieldHook("tempMenuAction")
+	public static void onTempMenuActionChanged(int idx)
+	{
+		if (tempMenuAction != null)
+		{
+			client.getCallbacks().post(WidgetPressed.class, WidgetPressed.INSTANCE);
+		}
+	}
+
+	@Inject
+	@Override
+	public void setTempMenuEntry(MenuEntry entry)
+	{
+		if (entry == null || tempMenuAction == null)
+			return;
+
+		tempMenuAction.setOption(entry.getOption());
+		tempMenuAction.setOpcode(entry.getOpcode());
+		tempMenuAction.setIdentifier(entry.getIdentifier());
+		tempMenuAction.setParam0(entry.getParam0());
+		tempMenuAction.setParam1(entry.getParam1());
+	}
 }
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
index c2d2bb72cc..3f3a6ad8d5 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
@@ -100,7 +100,6 @@ import net.runelite.api.events.UsernameChanged;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.VolumeChanged;
 import net.runelite.api.events.WidgetLoaded;
-import net.runelite.api.events.WidgetPressed;
 import net.runelite.api.hooks.Callbacks;
 import net.runelite.api.hooks.DrawCallbacks;
 import net.runelite.api.mixins.Copy;
@@ -1403,16 +1402,6 @@ public abstract class RSClientMixin implements RSClient
 		client.sendMenuAction(actionParam, widgetId, menuAction, id, menuOption, "!AUTHENTIC" + menuTarget, var6, var7);
 	}
 
-	@Inject
-	@FieldHook("tempMenuAction")
-	public static void onTempMenuActionChanged(int idx)
-	{
-		if (client.getTempMenuAction() != null)
-		{
-			client.getCallbacks().post(WidgetPressed.class, WidgetPressed.INSTANCE);
-		}
-	}
-
 	@FieldHook("Login_username")
 	@Inject
 	public static void onUsernameChanged(int idx)
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
index baaf96c2da..ef9f3a27d3 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
@@ -1,1148 +1,1144 @@
-/*
- * BSD 2-Clause License
- *
- * Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.runelite.rs.api;
-
-import java.math.BigInteger;
-import java.util.Map;
-import net.runelite.api.Client;
-import net.runelite.api.Sprite;
-import net.runelite.api.World;
-import net.runelite.api.widgets.Widget;
-import net.runelite.mapping.Construct;
-import net.runelite.mapping.Import;
-
-public interface RSClient extends RSGameShell, Client
-{
-	@Import("cameraX")
-	@Override
-	int getCameraX();
-
-	@Import("cameraZ") // <--- This is correct!
-	@Override
-	int getCameraY();
-
-	@Import("cameraY") // <--- This is correct!
-	@Override
-	int getCameraZ();
-
-	@Import("Scene_cameraX")
-	@Override
-	int getCameraX2();
-
-	@Import("Scene_cameraY")
-	@Override
-	int getCameraY2();
-
-	@Import("Scene_cameraZ")
-	@Override
-	int getCameraZ2();
-
-	@Import("Client_plane")
-	@Override
-	int getPlane();
-
-	@Import("cameraPitch")
-	@Override
-	int getCameraPitch();
-
-	@Import("cameraPitch")
-	void setCameraPitch(int cameraPitch);
-
-	@Import("cameraYaw")
-	@Override
-	int getCameraYaw();
-
-	@Import("worldId")
-	int getWorld();
-
-	@Import("fps")
-	@Override
-	int getFPS();
-
-	@Import("camAngleY")
-	@Override
-	int getMapAngle();
-
-	@Import("Tiles_heights")
-	@Override
-	int[][][] getTileHeights();
-
-	@Import("Tiles_renderFlags")
-	@Override
-	byte[][][] getTileSettings();
-
-	@Import("Varps_main")
-	@Override
-	int[] getVarps();
-
-	@Import("varcs")
-	RSVarcs getVarcs();
-
-	@Import("runEnergy")
-	@Override
-	int getEnergy();
-
-	@Import("weight")
-	@Override
-	int getWeight();
-
-	@Import("baseX")
-	@Override
-	int getBaseX();
-
-	@Import("baseY")
-	@Override
-	int getBaseY();
-
-	@Import("currentLevels")
-	@Override
-	int[] getBoostedSkillLevels();
-
-	@Import("levels")
-	@Override
-	int[] getRealSkillLevels();
-
-	@Import("experience")
-	@Override
-	int[] getSkillExperiences();
-
-	@Import("changedSkills")
-	int[] getChangedSkills();
-
-	@Import("changedSkillsCount")
-	int getChangedSkillsCount();
-
-	@Import("changedSkillsCount")
-	void setChangedSkillsCount(int i);
-
-	@Import("gameState")
-	int getRSGameState();
-
-	@Import("updateGameState")
-	void setGameState(int gameState);
-
-	@Import("checkClick")
-	void setCheckClick(boolean checkClick);
-
-	@Import("Scene_selectedScreenX")
-	void setMouseCanvasHoverPositionX(int x);
-
-	@Import("Scene_selectedScreenY")
-	void setMouseCanvasHoverPositionY(int y);
-
-	@Import("MouseHandler_currentButton")
-	@Override
-	int getMouseCurrentButton();
-
-	@Import("Scene_selectedX")
-	int getSelectedSceneTileX();
-
-	@Import("Scene_selectedX")
-	void setSelectedSceneTileX(int selectedSceneTileX);
-
-	@Import("Scene_selectedY")
-	int getSelectedSceneTileY();
-
-	@Import("Scene_selectedY")
-	void setSelectedSceneTileY(int selectedSceneTileY);
-
-	@Import("isDraggingWidget")
-	@Override
-	boolean isDraggingWidget();
-
-	@Import("clickedWidget")
-	@Override
-	RSWidget getDraggedWidget();
-
-	@Import("draggedOnWidget")
-	@Override
-	RSWidget getDraggedOnWidget();
-
-	@Import("draggedOnWidget")
-	@Override
-	void setDraggedOnWidget(Widget widget);
-
-	@Import("Widget_interfaceComponents")
-	RSWidget[][] getWidgets();
-
-	/**
-	 * Gets an array of widgets that correspond to the passed group ID.
-	 *
-	 * @param groupId the group ID
-	 * @return the widget group
-	 * @see net.runelite.api.widgets.WidgetID
-	 */
-	RSWidget[] getGroup(int groupId);
-
-	@Import("scene")
-	@Override
-	RSScene getScene();
-
-	@Import("localPlayer")
-	@Override
-	RSPlayer getLocalPlayer();
-
-	@Import("localPlayerIndex")
-	@Override
-	int getLocalPlayerIndex();
-
-	@Import("npcCount")
-	int getNpcIndexesCount();
-
-	@Import("npcIndices")
-	int[] getNpcIndices();
-
-	@Import("npcs")
-	@Override
-	RSNPC[] getCachedNPCs();
-
-	@Import("collisionMaps")
-	RSCollisionMap[] getCollisionMaps();
-
-	@Import("Players_count")
-	int getPlayerIndexesCount();
-
-	@Import("Players_indices")
-	int[] getPlayerIndices();
-
-	@Import("players")
-	@Override
-	RSPlayer[] getCachedPlayers();
-
-	@Import("combatTargetPlayerIndex")
-	int getLocalInteractingIndex();
-
-	@Import("groundItems")
-	RSNodeDeque[][][] getGroundItemDeque();
-
-	@Import("projectiles")
-	RSNodeDeque getProjectilesDeque();
-
-	@Import("graphicsObjects")
-	RSNodeDeque getGraphicsObjectDeque();
-
-	@Import("Login_username")
-	@Override
-	String getUsername();
-
-	@Import("Login_username")
-	@Override
-	void setUsername(String username);
-
-	@Import("Login_password")
-	@Override
-	void setPassword(String password);
-
-	@Import("otp")
-	@Override
-	void setOtp(String otp);
-
-	@Import("currentLoginField")
-	@Override
-	int getCurrentLoginField();
-
-	@Import("loginIndex")
-	@Override
-	int getLoginIndex();
-
-	@Import("playerMenuActions")
-	@Override
-	String[] getPlayerOptions();
-
-	@Import("playerOptionsPriorities")
-	@Override
-	boolean[] getPlayerOptionsPriorities();
-
-	@Import("playerMenuOpcodes")
-	@Override
-	int[] getPlayerMenuTypes();
-
-	@Import("MouseHandler_xVolatile")
-	int getMouseX();
-
-	@Import("MouseHandler_yVolatile")
-	int getMouseY();
-
-	@Import("Scene_selectedScreenX")
-	int getMouseX2();
-
-	@Import("Scene_selectedScreenY")
-	int getMouseY2();
-
-	@Import("containsBounds")
-	boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7);
-
-	@Import("checkClick")
-	boolean isCheckClick();
-
-	@Import("menuOptionsCount")
-	@Override
-	int getMenuOptionCount();
-
-	@Import("menuOptionsCount")
-	@Override
-	void setMenuOptionCount(int menuOptionCount);
-
-	@Import("menuActions")
-	String[] getMenuOptions();
-
-	@Import("menuTargets")
-	String[] getMenuTargets();
-
-	@Import("menuIdentifiers")
-	int[] getMenuIdentifiers();
-
-	@Import("menuOpcodes")
-	int[] getMenuOpcodes();
-
-	@Import("menuArguments1")
-	int[] getMenuArguments1();
-
-	@Import("menuArguments2")
-	int[] getMenuArguments2();
-
-	@Import("menuShiftClick")
-	boolean[] getMenuForceLeftClick();
-
-	@Import("World_worlds")
-	@Override
-	RSWorld[] getWorldList();
-
-	@Import("addChatMessage")
-	void addChatMessage(int type, String name, String message, String sender);
-
-	@Override
-	@Import("getObjectDefinition")
-	RSObjectDefinition getObjectDefinition(int objectId);
-
-	@Override
-	@Import("getNpcDefinition")
-	RSNPCDefinition getNpcDefinition(int npcId);
-
-	@Import("viewportZoom")
-	@Override
-	int getScale();
-
-	@Import("canvasHeight")
-	@Override
-	int getCanvasHeight();
-
-	@Import("canvasWidth")
-	@Override
-	int getCanvasWidth();
-
-	@Import("viewportHeight")
-	@Override
-	int getViewportHeight();
-
-	@Import("viewportWidth")
-	@Override
-	int getViewportWidth();
-
-	@Import("viewportOffsetX")
-	@Override
-	int getViewportXOffset();
-
-	@Import("viewportOffsetY")
-	@Override
-	int getViewportYOffset();
-
-	@Import("isResizable")
-	@Override
-	boolean isResized();
-
-	@Import("rootWidgetXs")
-	@Override
-	int[] getWidgetPositionsX();
-
-	@Import("rootWidgetYs")
-	@Override
-	int[] getWidgetPositionsY();
-
-	@Import("itemContainers")
-	RSNodeHashTable getItemContainers();
-
-	@Import("ItemDefinition_get")
-	@Override
-	RSItemDefinition getItemDefinition(int itemId);
-
-	@Import("getItemSprite")
-	RSSprite createItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted);
-
-	@Import("menuAction")
-	void sendMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7);
-
-	@Import("tempMenuAction")
-	RSMenuAction getTempMenuAction();
-
-	@Import("SpriteBuffer_decode")
-	void decodeSprite(byte[] data);
-
-	@Import("SpriteBuffer_spriteCount")
-	int getIndexedSpriteCount();
-
-	@Import("SpriteBuffer_spriteWidth")
-	int getIndexedSpriteWidth();
-
-	@Import("SpriteBuffer_spriteHeight")
-	int getIndexedSpriteHeight();
-
-	@Import("SpriteBuffer_xOffsets")
-	int[] getIndexedSpriteOffsetXs();
-
-	@Import("SpriteBuffer_xOffsets")
-	void setIndexedSpriteOffsetXs(int[] indexedSpriteOffsetXs);
-
-	@Import("SpriteBuffer_yOffsets")
-	int[] getIndexedSpriteOffsetYs();
-
-	@Import("SpriteBuffer_yOffsets")
-	void setIndexedSpriteOffsetYs(int[] indexedSpriteOffsetYs);
-
-	@Import("SpriteBuffer_spriteWidths")
-	int[] getIndexedSpriteWidths();
-
-	@Import("SpriteBuffer_spriteWidths")
-	void setIndexedSpriteWidths(int[] indexedSpriteWidths);
-
-	@Import("SpriteBuffer_spriteHeights")
-	int[] getIndexedSpriteHeights();
-
-	@Import("SpriteBuffer_spriteHeights")
-	void setIndexedSpriteHeights(int[] indexedSpriteHeights);
-
-	@Import("SpriteBuffer_pixels")
-	byte[][] getSpritePixels();
-
-	@Import("SpriteBuffer_pixels")
-	void setSpritePixels(byte[][] spritePixels);
-
-	@Import("SpriteBuffer_spritePalette")
-	int[] getIndexedSpritePalette();
-
-	@Import("SpriteBuffer_spritePalette")
-	void setIndexedSpritePalette(int[] indexedSpritePalette);
-
-	@Import("archive6")
-	RSArchive getMusicTracks();
-
-	@Import("archive8")
-	@Override
-	RSArchive getIndexSprites();
-
-	@Import("archive12")
-	@Override
-	RSArchive getIndexScripts();
-
-	@Import("widgetClickMasks")
-	@Override
-	RSNodeHashTable getWidgetFlags();
-
-	@Import("interfaceParents")
-	@Override
-	RSNodeHashTable getComponentTable();
-
-	@Import("grandExchangeOffers")
-	RSGrandExchangeOffer[] getGrandExchangeOffers();
-
-	@Import("isMenuOpen")
-	@Override
-	boolean isMenuOpen();
-
-	@Import("cycle")
-	@Override
-	int getGameCycle();
-
-	// unused
-	//@Import("packetHandler")
-	//void packetHandler();
-
-	@Import("Messages_channels")
-	@Override
-	Map getChatLineMap();
-
-	@Import("Messages_hashTable")
-	@Override
-	RSIterableNodeHashTable getMessages();
-
-	@Import("RunException_revision")
-	@Override
-	int getRevision();
-
-	@Import("regions")
-	@Override
-	int[] getMapRegions();
-
-	@Import("instanceChunkTemplates")
-	@Override
-	int[][][] getInstanceTemplateChunks();
-
-	@Import("xteaKeys")
-	@Override
-	int[][] getXteaKeys();
-
-	@Import("gameDrawingMode")
-	@Override
-	int getGameDrawingMode();
-
-	@Import("gameDrawingMode")
-	@Override
-	void setGameDrawingMode(int gameDrawingMode);
-
-	@Import("cycleCntr")
-	int getCycleCntr();
-
-	@Import("chatCycle")
-	void setChatCycle(int value);
-
-	/**
-	 * Get the widget top group. widgets[topGroup] contains widgets with
-	 * parentId -1, which are the widget roots.
-	 */
-	@Import("rootInterface")
-	int getWidgetRoot();
-
-	@Import("WorldMapElement_cached")
-	@Override
-	RSWorldMapElement[] getMapElementConfigs();
-
-	@Import("mapSceneSprites")
-	@Override
-	RSIndexedSprite[] getMapScene();
-
-	@Import("mapIcons")
-	@Override
-	RSSprite[] getMapIcons();
-
-	@Import("mapDotSprites")
-	RSSprite[] getMapDots();
-
-	@Import("AbstractFont_modIconSprites")
-	@Override
-	RSIndexedSprite[] getModIcons();
-
-	@Import("AbstractFont_modIconSprites")
-	void setRSModIcons(RSIndexedSprite[] modIcons);
-
-	@Construct
-	@Override
-	RSIndexedSprite createIndexedSprite();
-
-	@Construct
-	@Override
-	RSSprite createSprite(int[] pixels, int width, int height);
-
-	@Import("destinationX")
-	int getDestinationX();
-
-	@Import("destinationY")
-	int getDestinationY();
-
-	@Import("soundEffects")
-	RSSoundEffect[] getAudioEffects();
-
-	@Import("soundEffectIds")
-	int[] getQueuedSoundEffectIDs();
-
-	@Import("soundLocations")
-	int[] getSoundLocations();
-
-	@Import("queuedSoundEffectLoops")
-	int[] getQueuedSoundEffectLoops();
-
-	@Import("queuedSoundEffectDelays")
-	int[] getQueuedSoundEffectDelays();
-
-	@Import("soundEffectCount")
-	int getQueuedSoundEffectCount();
-
-	@Import("soundEffectCount")
-	void setQueuedSoundEffectCount(int queuedSoundEffectCount);
-
-	@Import("queueSoundEffect")
-	void queueSoundEffect(int id, int numLoops, int delay);
-
-	@Import("rasterProvider")
-	@Override
-	RSAbstractRasterProvider getBufferProvider();
-
-	@Import("MouseHandler_idleCycles")
-	@Override
-	int getMouseIdleTicks();
-
-	@Import("MouseHandler_lastPressedTimeMillis")
-	@Override
-	long getMouseLastPressedMillis();
-
-	@Import("KeyHandler_idleCycles")
-	@Override
-	int getKeyboardIdleTicks();
-
-	@Import("KeyHandler_pressedKeys")
-	@Override
-	boolean[] getPressedKeys();
-
-	@Import("isLowDetail")
-	void setLowMemory(boolean lowMemory);
-
-	@Import("Scene_isLowDetail")
-	void setSceneLowMemory(boolean lowMemory);
-
-	@Import("PcmPlayer_stereo")
-	void setAudioHighMemory(boolean highMemory);
-
-	@Import("ObjectDefinition_isLowDetail")
-	void setObjectDefinitionLowDetail(boolean lowDetail);
-
-	@Import("Interpreter_intStackSize")
-	@Override
-	int getIntStackSize();
-
-	@Import("Interpreter_intStackSize")
-	@Override
-	void setIntStackSize(int stackSize);
-
-	@Import("Interpreter_intStack")
-	@Override
-	int[] getIntStack();
-
-	@Import("Interpreter_stringStackSize")
-	@Override
-	int getStringStackSize();
-
-	@Import("Interpreter_stringStackSize")
-	@Override
-	void setStringStackSize(int stackSize);
-
-	@Import("Interpreter_stringStack")
-	@Override
-	String[] getStringStack();
-
-	@Import("friendSystem")
-	RSFriendSystem getFriendManager();
-
-	@Import("clanChat")
-	RSClanChat getClanMemberManager();
-
-	@Import("loginType")
-	RSLoginType getLoginType();
-
-	@Construct
-	RSUsername createName(String name, RSLoginType type);
-
-	@Import("getVarbit")
-	int getVarbit(int varbitId);
-
-	@Import("VarbitDefinition_cached")
-	RSEvictingDualNodeHashTable getVarbitCache();
-
-	@Import("clientPreferences")
-	@Override
-	RSClientPreferences getPreferences();
-
-	/**
-	 * This is the pitch the user has set the camera to.
-	 * It should be between 128 and (pitchUnlimiter?512:383) JAUs(1).
-	 * The difference between this and cameraPitch is that cameraPitch has a lower limit, imposed by the surrounding
-	 * terrain.
-	 *
-	 * (1) JAU - Jagex Angle Unit; 1/1024 of a revolution
-	 */
-	@Import("camAngleX")
-	int getCameraPitchTarget();
-
-	@Import("camAngleX")
-	void setCameraPitchTarget(int pitch);
-
-	@Import("Scene_cameraPitchSine")
-	void setPitchSin(int v);
-
-	@Import("Scene_cameraPitchCosine")
-	void setPitchCos(int v);
-
-	@Import("Scene_cameraYawSine")
-	void setYawSin(int v);
-
-	@Import("Scene_cameraYawCosine")
-	void setYawCos(int v);
-
-	@Import("Rasterizer3D_zoom")
-	@Override
-	int get3dZoom();
-
-	@Import("Rasterizer3D_zoom")
-	void set3dZoom(int zoom);
-
-	@Import("Rasterizer3D_clipMidX2")
-	@Override
-	int getRasterizer3D_clipMidX2();
-
-	@Import("Rasterizer3D_clipNegativeMidX")
-	@Override
-	int getRasterizer3D_clipNegativeMidX();
-
-	@Import("Rasterizer3D_clipNegativeMidY")
-	@Override
-	int getRasterizer3D_clipNegativeMidY();
-
-	@Import("Rasterizer3D_clipMidY2")
-	@Override
-	int getRasterizer3D_clipMidY2();
-
-	@Import("Rasterizer3D_clipMidX")
-	@Override
-	int getCenterX();
-
-	@Import("Rasterizer3D_clipMidY")
-	@Override
-	int getCenterY();
-
-	@Import("getWorldMap")
-	RSWorldMap getRenderOverview();
-
-	@Import("changeWorld")
-	@Override
-	void changeWorld(World world);
-
-	@Construct
-	@Override
-	RSWorld createWorld();
-
-	@Import("Model_transformTempX")
-	void setAnimOffsetX(int animOffsetX);
-
-	@Import("Model_transformTempY")
-	void setAnimOffsetY(int animOffsetY);
-
-	@Import("Model_transformTempZ")
-	void setAnimOffsetZ(int animOffsetZ);
-
-	@Import("getFrames")
-	RSFrames getFrames(int frameId);
-
-	@Import("sceneMinimapSprite")
-	RSSprite getMinimapSprite();
-
-	@Import("sceneMinimapSprite")
-	void setMinimapSprite(Sprite spritePixels);
-
-	@Import("drawObject")
-	void drawObject(int z, int x, int y, int randomColor1, int randomColor2);
-
-	@Construct
-	RSScriptEvent createScriptEvent();
-
-	@Import("runScript")
-	void runScript(RSScriptEvent ev, int ex);
-
-	@Import("hintArrowType")
-	void setHintArrowTargetType(int value);
-
-	@Import("hintArrowType")
-	int getHintArrowTargetType();
-
-	@Import("hintArrowX")
-	void setHintArrowX(int value);
-
-	@Import("hintArrowX")
-	int getHintArrowX();
-
-	@Import("hintArrowY")
-	void setHintArrowY(int value);
-
-	@Import("hintArrowY")
-	int getHintArrowY();
-
-	@Import("hintArrowSubX")
-	void setHintArrowOffsetX(int value);
-
-	@Import("hintArrowSubY")
-	void setHintArrowOffsetY(int value);
-
-	@Import("hintArrowNpcIndex")
-	void setHintArrowNpcTargetIdx(int value);
-
-	@Import("hintArrowNpcIndex")
-	int getHintArrowNpcTargetIdx();
-
-	@Import("hintArrowPlayerIndex")
-	void setHintArrowPlayerTargetIdx(int value);
-
-	@Import("hintArrowPlayerIndex")
-	int getHintArrowPlayerTargetIdx();
-
-	@Import("isInInstance")
-	@Override
-	boolean isInInstancedRegion();
-
-	@Import("itemDragDuration")
-	@Override
-	int getItemPressedDuration();
-
-	@Import("itemDragDuration")
-	void setItemPressedDuration(int duration);
-
-	@Import("worldProperties")
-	int getFlags();
-
-	@Import("compass")
-	void setCompass(Sprite spritePixels);
-
-	@Import("Widget_cachedSprites")
-	@Override
-	RSEvictingDualNodeHashTable getWidgetSpriteCache();
-
-	@Import("ItemDefinition_cached")
-	@Override
-	RSEvictingDualNodeHashTable getItemDefinitionCache();
-
-	@Import("oculusOrbState")
-	@Override
-	int getOculusOrbState();
-
-	@Import("oculusOrbState")
-	@Override
-	void setOculusOrbState(int state);
-
-	@Import("oculusOrbNormalSpeed")
-	@Override
-	void setOculusOrbNormalSpeed(int state);
-
-	@Import("oculusOrbFocalPointX")
-	@Override
-	int getOculusOrbFocalPointX();
-
-	@Import("oculusOrbFocalPointY")
-	@Override
-	int getOculusOrbFocalPointY();
-
-	RSTileItem getLastItemDespawn();
-
-	void setLastItemDespawn(RSTileItem lastItemDespawn);
-
-	@Construct
-	RSWidget createWidget();
-
-	@Import("alignWidget")
-	void revalidateWidget(Widget w);
-
-	@Import("revalidateWidgetScroll")
-	void revalidateWidgetScroll(Widget[] group, Widget w, boolean postEvent);
-
-	@Import("ViewportMouse_entityCount")
-	int getEntitiesAtMouseCount();
-
-	@Import("ViewportMouse_entityCount")
-	void setEntitiesAtMouseCount(int i);
-
-	@Import("ViewportMouse_entityTags")
-	long[] getEntitiesAtMouse();
-
-	@Import("ViewportMouse_x")
-	int getViewportMouseX();
-
-	@Import("ViewportMouse_y")
-	int getViewportMouseY();
-
-	@Import("textureProvider")
-	@Override
-	RSTextureProvider getTextureProvider();
-
-	@Import("tileLastDrawnActor")
-	int[][] getOccupiedTilesTick();
-
-	@Import("ObjectDefinition_cachedModels")
-	RSEvictingDualNodeHashTable getCachedModels2();
-
-	@Import("Scene_drawnCount")
-	int getCycle();
-
-	@Import("Scene_drawnCount")
-	void setCycle(int cycle);
-
-	@Import("visibilityMap")
-	boolean[][][][] getVisibilityMaps();
-
-	@Import("visibleTiles")
-	void setRenderArea(boolean[][] renderArea);
-
-	@Import("Scene_cameraX")
-	void setCameraX2(int cameraX2);
-
-	@Import("Scene_cameraY")
-	void setCameraY2(int cameraY2);
-
-	@Import("Scene_cameraZ")
-	void setCameraZ2(int cameraZ2);
-
-	@Import("Scene_cameraXTile")
-	void setScreenCenterX(int screenCenterX);
-
-	@Import("Scene_cameraYTile")
-	void setScreenCenterZ(int screenCenterZ); // <-- This is correct!
-
-	@Import("Scene_plane")
-	void setScenePlane(int scenePlane);
-
-	@Import("Scene_cameraXTileMin")
-	void setMinTileX(int i);
-
-	@Import("Scene_cameraYTileMin")
-	void setMinTileZ(int i); // <-- This is correct!
-
-	@Import("Scene_cameraXTileMax")
-	void setMaxTileX(int i);
-
-	@Import("Scene_cameraYTileMax")
-	void setMaxTileZ(int i); // <-- This is correct!
-
-	@Import("tileUpdateCount")
-	int getTileUpdateCount();
-
-	@Import("tileUpdateCount")
-	void setTileUpdateCount(int tileUpdateCount);
-
-	@Import("ViewportMouse_isInViewport")
-	boolean getViewportContainsMouse();
-
-	@Import("Rasterizer2D_pixels")
-	int[] getGraphicsPixels();
-
-	@Import("Rasterizer2D_width")
-	int getGraphicsPixelsWidth();
-
-	@Import("Rasterizer2D_height")
-	int getGraphicsPixelsHeight();
-
-	@Import("Rasterizer2D_fillRectangle")
-	void rasterizerFillRectangle(int x, int y, int w, int h, int rgb);
-
-	@Import("Rasterizer2D_xClipStart")
-	int getStartX();
-
-	@Import("Rasterizer2D_yClipStart")
-	int getStartY();
-
-	@Import("Rasterizer2D_xClipEnd")
-	int getEndX();
-
-	@Import("Rasterizer2D_yClipEnd")
-	int getEndY();
-
-	@Import("dragInventoryWidget")
-	@Override
-	RSWidget getIf1DraggedWidget();
-
-	@Import("dragItemSlotSource")
-	@Override
-	int getIf1DraggedItemIndex();
-
-	@Import("isSpellSelected")
-	@Override
-	void setSpellSelected(boolean selected);
-
-	@Import("getEnum")
-	RSEnumDefinition getRsEnum(int id);
-
-	@Import("menuX")
-	int getMenuX();
-
-	@Import("menuY")
-	int getMenuY();
-
-	@Import("menuHeight")
-	int getMenuHeight();
-
-	@Import("menuWidth")
-	int getMenuWidth();
-
-	@Import("fontBold12")
-	RSFont getFontBold12();
-
-	@Import("Rasterizer2D_drawHorizontalLine")
-	void rasterizerDrawHorizontalLine(int x, int y, int w, int rgb);
-
-	@Import("Rasterizer2D_drawVerticalLine")
-	void rasterizerDrawVerticalLine(int x, int y, int h, int rgb);
-
-	@Import("Rasterizer2D_fillRectangleGradient")
-	void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom);
-
-	@Import("Rasterizer2D_fillRectangleAlpha")
-	void rasterizerFillRectangleAlpha(int x, int y, int w, int h, int rgb, int a);
-
-	@Import("Rasterizer2D_drawRectangle")
-	void rasterizerDrawRectangle(int x, int y, int w, int h, int rgb);
-
-	@Import("drawCircle")
-	void rasterizerDrawCircle(int x, int y, int r, int rgb);
-
-	@Import("HealthBarDefinition_cached")
-	RSEvictingDualNodeHashTable getHealthBarCache();
-
-	@Import("HealthBarDefinition_cachedSprites")
-	RSEvictingDualNodeHashTable getHealthBarSpriteCache();
-
-	@Import("renderSelf")
-	@Override
-	boolean getRenderSelf();
-
-	@Import("renderSelf")
-	@Override
-	void setRenderSelf(boolean enabled);
-
-	@Import("mouseRecorder")
-	RSMouseRecorder getMouseRecorder();
-
-	@Import("selectedSpellName")
-	String getSelectedSpellName();
-
-	@Import("selectedSpellName")
-	@Override
-	void setSelectedSpellName(String name);
-
-	@Import("isSpellSelected")
-	boolean isSpellSelected();
-
-	@Import("readSoundEffect")
-	RSSoundEffect getTrack(RSAbstractArchive indexData, int id, int var0);
-
-	@Import("createRawPcmStream")
-	RSRawPcmStream createRawPcmStream(RSRawSound audioNode, int var0, int volume);
-
-	@Import("pcmStreamMixer")
-	RSPcmStreamMixer getSoundEffectAudioQueue();
-
-	@Import("archive4")
-	RSArchive getIndexCache4();
-
-	@Import("decimator")
-	RSDecimator getSoundEffectResampler();
-
-	@Import("musicVolume")
-	@Override
-	int getMusicVolume();
-
-	@Import("musicVolume")
-	void setClientMusicVolume(int volume);
-
-	@Import("areaSoundEffectVolume")
-	@Override
-	int getAreaSoundEffectVolume();
-
-	@Import("areaSoundEffectVolume")
-	@Override
-	void setAreaSoundEffectVolume(int volume);
-
-	@Import("soundEffectVolume")
-	@Override
-	int getSoundEffectVolume();
-
-	@Import("soundEffectVolume")
-	@Override
-	void setSoundEffectVolume(int volume);
-
-	@Import("musicTrackVolume")
-	void setMusicTrackVolume(int volume);
-
-	@Import("viewportWalking")
-	void setViewportWalking(boolean viewportWalking);
-
-	@Import("playMusicTrack")
-	void playMusicTrack(RSAbstractArchive var0, int var1, int var2, int var3, boolean var4);
-
-	@Import("midiPcmStream")
-	RSMidiPcmStream getMidiPcmStream();
-
-	@Import("currentTrackGroupId")
-	int getCurrentTrackGroupId();
-
-	@Import("crossSprites")
-	@Override
-	RSSprite[] getCrossSprites();
-
-	void setModulus(BigInteger modulus);
-
-	@Import("ItemDefinition_fileCount")
-	int getItemCount();
-
-	@Import("insertMenuItem")
-	@Override
-	void insertMenuItem(String action, String target, int opcode, int identifier, int argument1, int argument2, boolean forceLeftClick);
-
-	@Import("selectedItemId")
-	@Override
-	void setSelectedItemID(int id);
-
-	@Import("selectedItemSlot")
-	@Override
-	void setSelectedItemSlot(int index);
-
-	@Import("selectedItemWidget")
-	@Override
-	void setSelectedItemWidget(int widgetID);
-
-	@Import("selectedSpellWidget")
-	@Override
-	int getSelectedSpellWidget();
-
-	@Import("selectedSpellChildIndex")
-	@Override
-	int getSelectedSpellChildIndex();
-
-	@Import("selectedSpellWidget")
-	@Override
-	void setSelectedSpellWidget(int widgetID);
-
-	@Import("selectedSpellChildIndex")
-	@Override
-	void setSelectedSpellChildIndex(int index);
-
-	@Import("Sprite_drawScaled")
-	@Override
-	void scaleSprite(int[] canvas, int[] pixels, int color, int pixelX, int pixelY, int canvasIdx, int canvasOffset, int newWidth, int newHeight, int pixelWidth, int pixelHeight, int oldWidth);
-
-	/**
-	 * This sets the login screen to where it asks for username/pass
-	 */
-	@Import("Login_promptCredentials")
-	void promptCredentials(boolean clearPass);
-
-	@Import("VarpDefinition_get")
-	RSVarpDefinition getVarpDefinition(int id);
-
-	@Construct
-	RSTileItem newTileItem();
-
-	@Construct
-	RSNodeDeque newNodeDeque();
-
-	@Import("updateItemPile")
-	void updateItemPile(int localX, int localY);
-}
+/*
+ * BSD 2-Clause License
+ *
+ * Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.rs.api;
+
+import java.math.BigInteger;
+import java.util.Map;
+import net.runelite.api.Client;
+import net.runelite.api.Sprite;
+import net.runelite.api.World;
+import net.runelite.api.widgets.Widget;
+import net.runelite.mapping.Construct;
+import net.runelite.mapping.Import;
+
+public interface RSClient extends RSGameShell, Client
+{
+	@Import("cameraX")
+	@Override
+	int getCameraX();
+
+	@Import("cameraZ") // <--- This is correct!
+	@Override
+	int getCameraY();
+
+	@Import("cameraY") // <--- This is correct!
+	@Override
+	int getCameraZ();
+
+	@Import("Scene_cameraX")
+	@Override
+	int getCameraX2();
+
+	@Import("Scene_cameraY")
+	@Override
+	int getCameraY2();
+
+	@Import("Scene_cameraZ")
+	@Override
+	int getCameraZ2();
+
+	@Import("Client_plane")
+	@Override
+	int getPlane();
+
+	@Import("cameraPitch")
+	@Override
+	int getCameraPitch();
+
+	@Import("cameraPitch")
+	void setCameraPitch(int cameraPitch);
+
+	@Import("cameraYaw")
+	@Override
+	int getCameraYaw();
+
+	@Import("worldId")
+	int getWorld();
+
+	@Import("fps")
+	@Override
+	int getFPS();
+
+	@Import("camAngleY")
+	@Override
+	int getMapAngle();
+
+	@Import("Tiles_heights")
+	@Override
+	int[][][] getTileHeights();
+
+	@Import("Tiles_renderFlags")
+	@Override
+	byte[][][] getTileSettings();
+
+	@Import("Varps_main")
+	@Override
+	int[] getVarps();
+
+	@Import("varcs")
+	RSVarcs getVarcs();
+
+	@Import("runEnergy")
+	@Override
+	int getEnergy();
+
+	@Import("weight")
+	@Override
+	int getWeight();
+
+	@Import("baseX")
+	@Override
+	int getBaseX();
+
+	@Import("baseY")
+	@Override
+	int getBaseY();
+
+	@Import("currentLevels")
+	@Override
+	int[] getBoostedSkillLevels();
+
+	@Import("levels")
+	@Override
+	int[] getRealSkillLevels();
+
+	@Import("experience")
+	@Override
+	int[] getSkillExperiences();
+
+	@Import("changedSkills")
+	int[] getChangedSkills();
+
+	@Import("changedSkillsCount")
+	int getChangedSkillsCount();
+
+	@Import("changedSkillsCount")
+	void setChangedSkillsCount(int i);
+
+	@Import("gameState")
+	int getRSGameState();
+
+	@Import("updateGameState")
+	void setGameState(int gameState);
+
+	@Import("checkClick")
+	void setCheckClick(boolean checkClick);
+
+	@Import("Scene_selectedScreenX")
+	void setMouseCanvasHoverPositionX(int x);
+
+	@Import("Scene_selectedScreenY")
+	void setMouseCanvasHoverPositionY(int y);
+
+	@Import("MouseHandler_currentButton")
+	@Override
+	int getMouseCurrentButton();
+
+	@Import("Scene_selectedX")
+	int getSelectedSceneTileX();
+
+	@Import("Scene_selectedX")
+	void setSelectedSceneTileX(int selectedSceneTileX);
+
+	@Import("Scene_selectedY")
+	int getSelectedSceneTileY();
+
+	@Import("Scene_selectedY")
+	void setSelectedSceneTileY(int selectedSceneTileY);
+
+	@Import("isDraggingWidget")
+	@Override
+	boolean isDraggingWidget();
+
+	@Import("clickedWidget")
+	@Override
+	RSWidget getDraggedWidget();
+
+	@Import("draggedOnWidget")
+	@Override
+	RSWidget getDraggedOnWidget();
+
+	@Import("draggedOnWidget")
+	@Override
+	void setDraggedOnWidget(Widget widget);
+
+	@Import("Widget_interfaceComponents")
+	RSWidget[][] getWidgets();
+
+	/**
+	 * Gets an array of widgets that correspond to the passed group ID.
+	 *
+	 * @param groupId the group ID
+	 * @return the widget group
+	 * @see net.runelite.api.widgets.WidgetID
+	 */
+	RSWidget[] getGroup(int groupId);
+
+	@Import("scene")
+	@Override
+	RSScene getScene();
+
+	@Import("localPlayer")
+	@Override
+	RSPlayer getLocalPlayer();
+
+	@Import("localPlayerIndex")
+	@Override
+	int getLocalPlayerIndex();
+
+	@Import("npcCount")
+	int getNpcIndexesCount();
+
+	@Import("npcIndices")
+	int[] getNpcIndices();
+
+	@Import("npcs")
+	@Override
+	RSNPC[] getCachedNPCs();
+
+	@Import("collisionMaps")
+	RSCollisionMap[] getCollisionMaps();
+
+	@Import("Players_count")
+	int getPlayerIndexesCount();
+
+	@Import("Players_indices")
+	int[] getPlayerIndices();
+
+	@Import("players")
+	@Override
+	RSPlayer[] getCachedPlayers();
+
+	@Import("combatTargetPlayerIndex")
+	int getLocalInteractingIndex();
+
+	@Import("groundItems")
+	RSNodeDeque[][][] getGroundItemDeque();
+
+	@Import("projectiles")
+	RSNodeDeque getProjectilesDeque();
+
+	@Import("graphicsObjects")
+	RSNodeDeque getGraphicsObjectDeque();
+
+	@Import("Login_username")
+	@Override
+	String getUsername();
+
+	@Import("Login_username")
+	@Override
+	void setUsername(String username);
+
+	@Import("Login_password")
+	@Override
+	void setPassword(String password);
+
+	@Import("otp")
+	@Override
+	void setOtp(String otp);
+
+	@Import("currentLoginField")
+	@Override
+	int getCurrentLoginField();
+
+	@Import("loginIndex")
+	@Override
+	int getLoginIndex();
+
+	@Import("playerMenuActions")
+	@Override
+	String[] getPlayerOptions();
+
+	@Import("playerOptionsPriorities")
+	@Override
+	boolean[] getPlayerOptionsPriorities();
+
+	@Import("playerMenuOpcodes")
+	@Override
+	int[] getPlayerMenuTypes();
+
+	@Import("MouseHandler_xVolatile")
+	int getMouseX();
+
+	@Import("MouseHandler_yVolatile")
+	int getMouseY();
+
+	@Import("Scene_selectedScreenX")
+	int getMouseX2();
+
+	@Import("Scene_selectedScreenY")
+	int getMouseY2();
+
+	@Import("containsBounds")
+	boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7);
+
+	@Import("checkClick")
+	boolean isCheckClick();
+
+	@Import("menuOptionsCount")
+	@Override
+	int getMenuOptionCount();
+
+	@Import("menuOptionsCount")
+	@Override
+	void setMenuOptionCount(int menuOptionCount);
+
+	@Import("menuActions")
+	String[] getMenuOptions();
+
+	@Import("menuTargets")
+	String[] getMenuTargets();
+
+	@Import("menuIdentifiers")
+	int[] getMenuIdentifiers();
+
+	@Import("menuOpcodes")
+	int[] getMenuOpcodes();
+
+	@Import("menuArguments1")
+	int[] getMenuArguments1();
+
+	@Import("menuArguments2")
+	int[] getMenuArguments2();
+
+	@Import("menuShiftClick")
+	boolean[] getMenuForceLeftClick();
+
+	@Import("World_worlds")
+	@Override
+	RSWorld[] getWorldList();
+
+	@Import("addChatMessage")
+	void addChatMessage(int type, String name, String message, String sender);
+
+	@Override
+	@Import("getObjectDefinition")
+	RSObjectDefinition getObjectDefinition(int objectId);
+
+	@Override
+	@Import("getNpcDefinition")
+	RSNPCDefinition getNpcDefinition(int npcId);
+
+	@Import("viewportZoom")
+	@Override
+	int getScale();
+
+	@Import("canvasHeight")
+	@Override
+	int getCanvasHeight();
+
+	@Import("canvasWidth")
+	@Override
+	int getCanvasWidth();
+
+	@Import("viewportHeight")
+	@Override
+	int getViewportHeight();
+
+	@Import("viewportWidth")
+	@Override
+	int getViewportWidth();
+
+	@Import("viewportOffsetX")
+	@Override
+	int getViewportXOffset();
+
+	@Import("viewportOffsetY")
+	@Override
+	int getViewportYOffset();
+
+	@Import("isResizable")
+	@Override
+	boolean isResized();
+
+	@Import("rootWidgetXs")
+	@Override
+	int[] getWidgetPositionsX();
+
+	@Import("rootWidgetYs")
+	@Override
+	int[] getWidgetPositionsY();
+
+	@Import("itemContainers")
+	RSNodeHashTable getItemContainers();
+
+	@Import("ItemDefinition_get")
+	@Override
+	RSItemDefinition getItemDefinition(int itemId);
+
+	@Import("getItemSprite")
+	RSSprite createItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted);
+
+	@Import("menuAction")
+	void sendMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7);
+
+	@Import("SpriteBuffer_decode")
+	void decodeSprite(byte[] data);
+
+	@Import("SpriteBuffer_spriteCount")
+	int getIndexedSpriteCount();
+
+	@Import("SpriteBuffer_spriteWidth")
+	int getIndexedSpriteWidth();
+
+	@Import("SpriteBuffer_spriteHeight")
+	int getIndexedSpriteHeight();
+
+	@Import("SpriteBuffer_xOffsets")
+	int[] getIndexedSpriteOffsetXs();
+
+	@Import("SpriteBuffer_xOffsets")
+	void setIndexedSpriteOffsetXs(int[] indexedSpriteOffsetXs);
+
+	@Import("SpriteBuffer_yOffsets")
+	int[] getIndexedSpriteOffsetYs();
+
+	@Import("SpriteBuffer_yOffsets")
+	void setIndexedSpriteOffsetYs(int[] indexedSpriteOffsetYs);
+
+	@Import("SpriteBuffer_spriteWidths")
+	int[] getIndexedSpriteWidths();
+
+	@Import("SpriteBuffer_spriteWidths")
+	void setIndexedSpriteWidths(int[] indexedSpriteWidths);
+
+	@Import("SpriteBuffer_spriteHeights")
+	int[] getIndexedSpriteHeights();
+
+	@Import("SpriteBuffer_spriteHeights")
+	void setIndexedSpriteHeights(int[] indexedSpriteHeights);
+
+	@Import("SpriteBuffer_pixels")
+	byte[][] getSpritePixels();
+
+	@Import("SpriteBuffer_pixels")
+	void setSpritePixels(byte[][] spritePixels);
+
+	@Import("SpriteBuffer_spritePalette")
+	int[] getIndexedSpritePalette();
+
+	@Import("SpriteBuffer_spritePalette")
+	void setIndexedSpritePalette(int[] indexedSpritePalette);
+
+	@Import("archive6")
+	RSArchive getMusicTracks();
+
+	@Import("archive8")
+	@Override
+	RSArchive getIndexSprites();
+
+	@Import("archive12")
+	@Override
+	RSArchive getIndexScripts();
+
+	@Import("widgetClickMasks")
+	@Override
+	RSNodeHashTable getWidgetFlags();
+
+	@Import("interfaceParents")
+	@Override
+	RSNodeHashTable getComponentTable();
+
+	@Import("grandExchangeOffers")
+	RSGrandExchangeOffer[] getGrandExchangeOffers();
+
+	@Import("isMenuOpen")
+	@Override
+	boolean isMenuOpen();
+
+	@Import("cycle")
+	@Override
+	int getGameCycle();
+
+	// unused
+	//@Import("packetHandler")
+	//void packetHandler();
+
+	@Import("Messages_channels")
+	@Override
+	Map getChatLineMap();
+
+	@Import("Messages_hashTable")
+	@Override
+	RSIterableNodeHashTable getMessages();
+
+	@Import("RunException_revision")
+	@Override
+	int getRevision();
+
+	@Import("regions")
+	@Override
+	int[] getMapRegions();
+
+	@Import("instanceChunkTemplates")
+	@Override
+	int[][][] getInstanceTemplateChunks();
+
+	@Import("xteaKeys")
+	@Override
+	int[][] getXteaKeys();
+
+	@Import("gameDrawingMode")
+	@Override
+	int getGameDrawingMode();
+
+	@Import("gameDrawingMode")
+	@Override
+	void setGameDrawingMode(int gameDrawingMode);
+
+	@Import("cycleCntr")
+	int getCycleCntr();
+
+	@Import("chatCycle")
+	void setChatCycle(int value);
+
+	/**
+	 * Get the widget top group. widgets[topGroup] contains widgets with
+	 * parentId -1, which are the widget roots.
+	 */
+	@Import("rootInterface")
+	int getWidgetRoot();
+
+	@Import("WorldMapElement_cached")
+	@Override
+	RSWorldMapElement[] getMapElementConfigs();
+
+	@Import("mapSceneSprites")
+	@Override
+	RSIndexedSprite[] getMapScene();
+
+	@Import("mapIcons")
+	@Override
+	RSSprite[] getMapIcons();
+
+	@Import("mapDotSprites")
+	RSSprite[] getMapDots();
+
+	@Import("AbstractFont_modIconSprites")
+	@Override
+	RSIndexedSprite[] getModIcons();
+
+	@Import("AbstractFont_modIconSprites")
+	void setRSModIcons(RSIndexedSprite[] modIcons);
+
+	@Construct
+	@Override
+	RSIndexedSprite createIndexedSprite();
+
+	@Construct
+	@Override
+	RSSprite createSprite(int[] pixels, int width, int height);
+
+	@Import("destinationX")
+	int getDestinationX();
+
+	@Import("destinationY")
+	int getDestinationY();
+
+	@Import("soundEffects")
+	RSSoundEffect[] getAudioEffects();
+
+	@Import("soundEffectIds")
+	int[] getQueuedSoundEffectIDs();
+
+	@Import("soundLocations")
+	int[] getSoundLocations();
+
+	@Import("queuedSoundEffectLoops")
+	int[] getQueuedSoundEffectLoops();
+
+	@Import("queuedSoundEffectDelays")
+	int[] getQueuedSoundEffectDelays();
+
+	@Import("soundEffectCount")
+	int getQueuedSoundEffectCount();
+
+	@Import("soundEffectCount")
+	void setQueuedSoundEffectCount(int queuedSoundEffectCount);
+
+	@Import("queueSoundEffect")
+	void queueSoundEffect(int id, int numLoops, int delay);
+
+	@Import("rasterProvider")
+	@Override
+	RSAbstractRasterProvider getBufferProvider();
+
+	@Import("MouseHandler_idleCycles")
+	@Override
+	int getMouseIdleTicks();
+
+	@Import("MouseHandler_lastPressedTimeMillis")
+	@Override
+	long getMouseLastPressedMillis();
+
+	@Import("KeyHandler_idleCycles")
+	@Override
+	int getKeyboardIdleTicks();
+
+	@Import("KeyHandler_pressedKeys")
+	@Override
+	boolean[] getPressedKeys();
+
+	@Import("isLowDetail")
+	void setLowMemory(boolean lowMemory);
+
+	@Import("Scene_isLowDetail")
+	void setSceneLowMemory(boolean lowMemory);
+
+	@Import("PcmPlayer_stereo")
+	void setAudioHighMemory(boolean highMemory);
+
+	@Import("ObjectDefinition_isLowDetail")
+	void setObjectDefinitionLowDetail(boolean lowDetail);
+
+	@Import("Interpreter_intStackSize")
+	@Override
+	int getIntStackSize();
+
+	@Import("Interpreter_intStackSize")
+	@Override
+	void setIntStackSize(int stackSize);
+
+	@Import("Interpreter_intStack")
+	@Override
+	int[] getIntStack();
+
+	@Import("Interpreter_stringStackSize")
+	@Override
+	int getStringStackSize();
+
+	@Import("Interpreter_stringStackSize")
+	@Override
+	void setStringStackSize(int stackSize);
+
+	@Import("Interpreter_stringStack")
+	@Override
+	String[] getStringStack();
+
+	@Import("friendSystem")
+	RSFriendSystem getFriendManager();
+
+	@Import("clanChat")
+	RSClanChat getClanMemberManager();
+
+	@Import("loginType")
+	RSLoginType getLoginType();
+
+	@Construct
+	RSUsername createName(String name, RSLoginType type);
+
+	@Import("getVarbit")
+	int getVarbit(int varbitId);
+
+	@Import("VarbitDefinition_cached")
+	RSEvictingDualNodeHashTable getVarbitCache();
+
+	@Import("clientPreferences")
+	@Override
+	RSClientPreferences getPreferences();
+
+	/**
+	 * This is the pitch the user has set the camera to.
+	 * It should be between 128 and (pitchUnlimiter?512:383) JAUs(1).
+	 * The difference between this and cameraPitch is that cameraPitch has a lower limit, imposed by the surrounding
+	 * terrain.
+	 *
+	 * (1) JAU - Jagex Angle Unit; 1/1024 of a revolution
+	 */
+	@Import("camAngleX")
+	int getCameraPitchTarget();
+
+	@Import("camAngleX")
+	void setCameraPitchTarget(int pitch);
+
+	@Import("Scene_cameraPitchSine")
+	void setPitchSin(int v);
+
+	@Import("Scene_cameraPitchCosine")
+	void setPitchCos(int v);
+
+	@Import("Scene_cameraYawSine")
+	void setYawSin(int v);
+
+	@Import("Scene_cameraYawCosine")
+	void setYawCos(int v);
+
+	@Import("Rasterizer3D_zoom")
+	@Override
+	int get3dZoom();
+
+	@Import("Rasterizer3D_zoom")
+	void set3dZoom(int zoom);
+
+	@Import("Rasterizer3D_clipMidX2")
+	@Override
+	int getRasterizer3D_clipMidX2();
+
+	@Import("Rasterizer3D_clipNegativeMidX")
+	@Override
+	int getRasterizer3D_clipNegativeMidX();
+
+	@Import("Rasterizer3D_clipNegativeMidY")
+	@Override
+	int getRasterizer3D_clipNegativeMidY();
+
+	@Import("Rasterizer3D_clipMidY2")
+	@Override
+	int getRasterizer3D_clipMidY2();
+
+	@Import("Rasterizer3D_clipMidX")
+	@Override
+	int getCenterX();
+
+	@Import("Rasterizer3D_clipMidY")
+	@Override
+	int getCenterY();
+
+	@Import("getWorldMap")
+	RSWorldMap getRenderOverview();
+
+	@Import("changeWorld")
+	@Override
+	void changeWorld(World world);
+
+	@Construct
+	@Override
+	RSWorld createWorld();
+
+	@Import("Model_transformTempX")
+	void setAnimOffsetX(int animOffsetX);
+
+	@Import("Model_transformTempY")
+	void setAnimOffsetY(int animOffsetY);
+
+	@Import("Model_transformTempZ")
+	void setAnimOffsetZ(int animOffsetZ);
+
+	@Import("getFrames")
+	RSFrames getFrames(int frameId);
+
+	@Import("sceneMinimapSprite")
+	RSSprite getMinimapSprite();
+
+	@Import("sceneMinimapSprite")
+	void setMinimapSprite(Sprite spritePixels);
+
+	@Import("drawObject")
+	void drawObject(int z, int x, int y, int randomColor1, int randomColor2);
+
+	@Construct
+	RSScriptEvent createScriptEvent();
+
+	@Import("runScript")
+	void runScript(RSScriptEvent ev, int ex);
+
+	@Import("hintArrowType")
+	void setHintArrowTargetType(int value);
+
+	@Import("hintArrowType")
+	int getHintArrowTargetType();
+
+	@Import("hintArrowX")
+	void setHintArrowX(int value);
+
+	@Import("hintArrowX")
+	int getHintArrowX();
+
+	@Import("hintArrowY")
+	void setHintArrowY(int value);
+
+	@Import("hintArrowY")
+	int getHintArrowY();
+
+	@Import("hintArrowSubX")
+	void setHintArrowOffsetX(int value);
+
+	@Import("hintArrowSubY")
+	void setHintArrowOffsetY(int value);
+
+	@Import("hintArrowNpcIndex")
+	void setHintArrowNpcTargetIdx(int value);
+
+	@Import("hintArrowNpcIndex")
+	int getHintArrowNpcTargetIdx();
+
+	@Import("hintArrowPlayerIndex")
+	void setHintArrowPlayerTargetIdx(int value);
+
+	@Import("hintArrowPlayerIndex")
+	int getHintArrowPlayerTargetIdx();
+
+	@Import("isInInstance")
+	@Override
+	boolean isInInstancedRegion();
+
+	@Import("itemDragDuration")
+	@Override
+	int getItemPressedDuration();
+
+	@Import("itemDragDuration")
+	void setItemPressedDuration(int duration);
+
+	@Import("worldProperties")
+	int getFlags();
+
+	@Import("compass")
+	void setCompass(Sprite spritePixels);
+
+	@Import("Widget_cachedSprites")
+	@Override
+	RSEvictingDualNodeHashTable getWidgetSpriteCache();
+
+	@Import("ItemDefinition_cached")
+	@Override
+	RSEvictingDualNodeHashTable getItemDefinitionCache();
+
+	@Import("oculusOrbState")
+	@Override
+	int getOculusOrbState();
+
+	@Import("oculusOrbState")
+	@Override
+	void setOculusOrbState(int state);
+
+	@Import("oculusOrbNormalSpeed")
+	@Override
+	void setOculusOrbNormalSpeed(int state);
+
+	@Import("oculusOrbFocalPointX")
+	@Override
+	int getOculusOrbFocalPointX();
+
+	@Import("oculusOrbFocalPointY")
+	@Override
+	int getOculusOrbFocalPointY();
+
+	RSTileItem getLastItemDespawn();
+
+	void setLastItemDespawn(RSTileItem lastItemDespawn);
+
+	@Construct
+	RSWidget createWidget();
+
+	@Import("alignWidget")
+	void revalidateWidget(Widget w);
+
+	@Import("revalidateWidgetScroll")
+	void revalidateWidgetScroll(Widget[] group, Widget w, boolean postEvent);
+
+	@Import("ViewportMouse_entityCount")
+	int getEntitiesAtMouseCount();
+
+	@Import("ViewportMouse_entityCount")
+	void setEntitiesAtMouseCount(int i);
+
+	@Import("ViewportMouse_entityTags")
+	long[] getEntitiesAtMouse();
+
+	@Import("ViewportMouse_x")
+	int getViewportMouseX();
+
+	@Import("ViewportMouse_y")
+	int getViewportMouseY();
+
+	@Import("textureProvider")
+	@Override
+	RSTextureProvider getTextureProvider();
+
+	@Import("tileLastDrawnActor")
+	int[][] getOccupiedTilesTick();
+
+	@Import("ObjectDefinition_cachedModels")
+	RSEvictingDualNodeHashTable getCachedModels2();
+
+	@Import("Scene_drawnCount")
+	int getCycle();
+
+	@Import("Scene_drawnCount")
+	void setCycle(int cycle);
+
+	@Import("visibilityMap")
+	boolean[][][][] getVisibilityMaps();
+
+	@Import("visibleTiles")
+	void setRenderArea(boolean[][] renderArea);
+
+	@Import("Scene_cameraX")
+	void setCameraX2(int cameraX2);
+
+	@Import("Scene_cameraY")
+	void setCameraY2(int cameraY2);
+
+	@Import("Scene_cameraZ")
+	void setCameraZ2(int cameraZ2);
+
+	@Import("Scene_cameraXTile")
+	void setScreenCenterX(int screenCenterX);
+
+	@Import("Scene_cameraYTile")
+	void setScreenCenterZ(int screenCenterZ); // <-- This is correct!
+
+	@Import("Scene_plane")
+	void setScenePlane(int scenePlane);
+
+	@Import("Scene_cameraXTileMin")
+	void setMinTileX(int i);
+
+	@Import("Scene_cameraYTileMin")
+	void setMinTileZ(int i); // <-- This is correct!
+
+	@Import("Scene_cameraXTileMax")
+	void setMaxTileX(int i);
+
+	@Import("Scene_cameraYTileMax")
+	void setMaxTileZ(int i); // <-- This is correct!
+
+	@Import("tileUpdateCount")
+	int getTileUpdateCount();
+
+	@Import("tileUpdateCount")
+	void setTileUpdateCount(int tileUpdateCount);
+
+	@Import("ViewportMouse_isInViewport")
+	boolean getViewportContainsMouse();
+
+	@Import("Rasterizer2D_pixels")
+	int[] getGraphicsPixels();
+
+	@Import("Rasterizer2D_width")
+	int getGraphicsPixelsWidth();
+
+	@Import("Rasterizer2D_height")
+	int getGraphicsPixelsHeight();
+
+	@Import("Rasterizer2D_fillRectangle")
+	void rasterizerFillRectangle(int x, int y, int w, int h, int rgb);
+
+	@Import("Rasterizer2D_xClipStart")
+	int getStartX();
+
+	@Import("Rasterizer2D_yClipStart")
+	int getStartY();
+
+	@Import("Rasterizer2D_xClipEnd")
+	int getEndX();
+
+	@Import("Rasterizer2D_yClipEnd")
+	int getEndY();
+
+	@Import("dragInventoryWidget")
+	@Override
+	RSWidget getIf1DraggedWidget();
+
+	@Import("dragItemSlotSource")
+	@Override
+	int getIf1DraggedItemIndex();
+
+	@Import("isSpellSelected")
+	@Override
+	void setSpellSelected(boolean selected);
+
+	@Import("getEnum")
+	RSEnumDefinition getRsEnum(int id);
+
+	@Import("menuX")
+	int getMenuX();
+
+	@Import("menuY")
+	int getMenuY();
+
+	@Import("menuHeight")
+	int getMenuHeight();
+
+	@Import("menuWidth")
+	int getMenuWidth();
+
+	@Import("fontBold12")
+	RSFont getFontBold12();
+
+	@Import("Rasterizer2D_drawHorizontalLine")
+	void rasterizerDrawHorizontalLine(int x, int y, int w, int rgb);
+
+	@Import("Rasterizer2D_drawVerticalLine")
+	void rasterizerDrawVerticalLine(int x, int y, int h, int rgb);
+
+	@Import("Rasterizer2D_fillRectangleGradient")
+	void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom);
+
+	@Import("Rasterizer2D_fillRectangleAlpha")
+	void rasterizerFillRectangleAlpha(int x, int y, int w, int h, int rgb, int a);
+
+	@Import("Rasterizer2D_drawRectangle")
+	void rasterizerDrawRectangle(int x, int y, int w, int h, int rgb);
+
+	@Import("drawCircle")
+	void rasterizerDrawCircle(int x, int y, int r, int rgb);
+
+	@Import("HealthBarDefinition_cached")
+	RSEvictingDualNodeHashTable getHealthBarCache();
+
+	@Import("HealthBarDefinition_cachedSprites")
+	RSEvictingDualNodeHashTable getHealthBarSpriteCache();
+
+	@Import("renderSelf")
+	@Override
+	boolean getRenderSelf();
+
+	@Import("renderSelf")
+	@Override
+	void setRenderSelf(boolean enabled);
+
+	@Import("mouseRecorder")
+	RSMouseRecorder getMouseRecorder();
+
+	@Import("selectedSpellName")
+	String getSelectedSpellName();
+
+	@Import("selectedSpellName")
+	@Override
+	void setSelectedSpellName(String name);
+
+	@Import("isSpellSelected")
+	boolean isSpellSelected();
+
+	@Import("readSoundEffect")
+	RSSoundEffect getTrack(RSAbstractArchive indexData, int id, int var0);
+
+	@Import("createRawPcmStream")
+	RSRawPcmStream createRawPcmStream(RSRawSound audioNode, int var0, int volume);
+
+	@Import("pcmStreamMixer")
+	RSPcmStreamMixer getSoundEffectAudioQueue();
+
+	@Import("archive4")
+	RSArchive getIndexCache4();
+
+	@Import("decimator")
+	RSDecimator getSoundEffectResampler();
+
+	@Import("musicVolume")
+	@Override
+	int getMusicVolume();
+
+	@Import("musicVolume")
+	void setClientMusicVolume(int volume);
+
+	@Import("areaSoundEffectVolume")
+	@Override
+	int getAreaSoundEffectVolume();
+
+	@Import("areaSoundEffectVolume")
+	@Override
+	void setAreaSoundEffectVolume(int volume);
+
+	@Import("soundEffectVolume")
+	@Override
+	int getSoundEffectVolume();
+
+	@Import("soundEffectVolume")
+	@Override
+	void setSoundEffectVolume(int volume);
+
+	@Import("musicTrackVolume")
+	void setMusicTrackVolume(int volume);
+
+	@Import("viewportWalking")
+	void setViewportWalking(boolean viewportWalking);
+
+	@Import("playMusicTrack")
+	void playMusicTrack(RSAbstractArchive var0, int var1, int var2, int var3, boolean var4);
+
+	@Import("midiPcmStream")
+	RSMidiPcmStream getMidiPcmStream();
+
+	@Import("currentTrackGroupId")
+	int getCurrentTrackGroupId();
+
+	@Import("crossSprites")
+	@Override
+	RSSprite[] getCrossSprites();
+
+	void setModulus(BigInteger modulus);
+
+	@Import("ItemDefinition_fileCount")
+	int getItemCount();
+
+	@Import("insertMenuItem")
+	@Override
+	void insertMenuItem(String action, String target, int opcode, int identifier, int argument1, int argument2, boolean forceLeftClick);
+
+	@Import("selectedItemId")
+	@Override
+	void setSelectedItemID(int id);
+
+	@Import("selectedItemSlot")
+	@Override
+	void setSelectedItemSlot(int index);
+
+	@Import("selectedItemWidget")
+	@Override
+	void setSelectedItemWidget(int widgetID);
+
+	@Import("selectedSpellWidget")
+	@Override
+	int getSelectedSpellWidget();
+
+	@Import("selectedSpellChildIndex")
+	@Override
+	int getSelectedSpellChildIndex();
+
+	@Import("selectedSpellWidget")
+	@Override
+	void setSelectedSpellWidget(int widgetID);
+
+	@Import("selectedSpellChildIndex")
+	@Override
+	void setSelectedSpellChildIndex(int index);
+
+	@Import("Sprite_drawScaled")
+	@Override
+	void scaleSprite(int[] canvas, int[] pixels, int color, int pixelX, int pixelY, int canvasIdx, int canvasOffset, int newWidth, int newHeight, int pixelWidth, int pixelHeight, int oldWidth);
+
+	/**
+	 * This sets the login screen to where it asks for username/pass
+	 */
+	@Import("Login_promptCredentials")
+	void promptCredentials(boolean clearPass);
+
+	@Import("VarpDefinition_get")
+	RSVarpDefinition getVarpDefinition(int id);
+
+	@Construct
+	RSTileItem newTileItem();
+
+	@Construct
+	RSNodeDeque newNodeDeque();
+
+	@Import("updateItemPile")
+	void updateItemPile(int localX, int localY);
+}
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java
index 0a590af62d..4d8d42da3e 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java
@@ -24,6 +24,22 @@
  */
 package net.runelite.rs.api;
 
+import net.runelite.mapping.Import;
+
 public interface RSMenuAction
 {
+	@Import("action")
+	void setOption(String yes);
+
+	@Import("opcode")
+	void setOpcode(int yes);
+
+	@Import("identifier")
+	void setIdentifier(int yes);
+
+	@Import("param0")
+	void setParam0(int yes);
+
+	@Import("param1")
+	void setParam1(int yes);
 }
diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java
index a718e063bc..90d804474c 100644
--- a/runescape-client/src/main/java/AbstractWorldMapData.java
+++ b/runescape-client/src/main/java/AbstractWorldMapData.java
@@ -361,7 +361,7 @@ public abstract class AbstractWorldMapData {
 	)
 	static void method325(int var0, int var1) {
 		MenuAction var2 = StudioGame.tempMenuAction;
-		GrandExchangeOfferOwnWorldComparator.menuAction(var2.argument1, var2.argument2, var2.opcode, var2.argument0, var2.action, var2.action, var0, var1);
+		GrandExchangeOfferOwnWorldComparator.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1);
 		StudioGame.tempMenuAction = null;
 	}
 
diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java
index 3ac05be930..c0e0c13a4d 100644
--- a/runescape-client/src/main/java/MenuAction.java
+++ b/runescape-client/src/main/java/MenuAction.java
@@ -17,8 +17,8 @@ public class MenuAction {
 	@ObfuscatedGetter(
 		intValue = -1613868885
 	)
-	@Export("argument1")
-	int argument1;
+	@Export("param0")
+	int param0;
 	@ObfuscatedName("t")
 	@Export("action")
 	String action;
@@ -26,8 +26,8 @@ public class MenuAction {
 	@ObfuscatedGetter(
 		intValue = -872703787
 	)
-	@Export("argument2")
-	int argument2;
+	@Export("param1")
+	int param1;
 	@ObfuscatedName("q")
 	@ObfuscatedGetter(
 		intValue = 553279575
@@ -38,8 +38,8 @@ public class MenuAction {
 	@ObfuscatedGetter(
 		intValue = -1804422619
 	)
-	@Export("argument0")
-	int argument0;
+	@Export("identifier")
+	int identifier;
 
 	MenuAction() {
 	}
diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java
index c6b300d066..f22e0abd23 100644
--- a/runescape-client/src/main/java/Script.java
+++ b/runescape-client/src/main/java/Script.java
@@ -203,10 +203,10 @@ public class Script extends DualNode {
 	)
 	static void method2384(int var0) {
 		StudioGame.tempMenuAction = new MenuAction();
-		StudioGame.tempMenuAction.argument1 = Client.menuArguments1[var0];
-		StudioGame.tempMenuAction.argument2 = Client.menuArguments2[var0];
+		StudioGame.tempMenuAction.param0 = Client.menuArguments1[var0];
+		StudioGame.tempMenuAction.param1 = Client.menuArguments2[var0];
 		StudioGame.tempMenuAction.opcode = Client.menuOpcodes[var0];
-		StudioGame.tempMenuAction.argument0 = Client.menuIdentifiers[var0];
+		StudioGame.tempMenuAction.identifier = Client.menuIdentifiers[var0];
 		StudioGame.tempMenuAction.action = Client.menuActions[var0];
 	}
 }