openrune: finish login, questhelper works

buildSrc/src/main/kotlin/Dependencies.kt

@@ -25,7 +25,7 @@
 
 object ProjectVersions {
     const val launcherVersion = "2.2.0"
-    const val rlVersion = "1.6.32"
+    const val rlVersion = "1.6.35"
 
     const val openosrsVersion = "3.5.4"
 

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

@@ -37,14 +37,14 @@ public class MenuEntry implements Cloneable
 	/**
 	 * The option text added to the menu (ie. "Walk here", "Use").
 	 */
-	private String menuOption;
+	private String option;
 	/**
 	 * The target of the action (ie. Item or Actor name).
 	 * <p>
 	 * If the option does not apply to any target, this field
 	 * will be set to empty string.
 	 */
-	private String menuTarget;
+	private String target;
 	/**
 	 * An identifier value for the target of the action.
 	 */
@@ -61,7 +61,7 @@ public class MenuEntry implements Cloneable
 	/**
 	 * A second additional parameter for the action.
 	 */
-	private int widgetId;
+	private int actionParam1;
 	/**
 	 * If this field is true and you have single mouse button on and this entry is
 	 * the top entry the right click menu will not be opened when you left click
@@ -70,14 +70,14 @@ public class MenuEntry implements Cloneable
 	 */
 	private boolean forceLeftClick;
 
-	public MenuEntry(String menuOption, String menuTarget, int type, int opcode, int actionParam0, int widgetId, boolean forceLeftClick)
+	public MenuEntry(String option, String target, int type, int opcode, int actionParam0, int actionParam1, boolean forceLeftClick)
 	{
-		this.menuOption = menuOption;
+		this.option = option;
-		this.menuTarget = menuTarget;
+		this.target = target;
 		this.type = type;
 		this.opcode = opcode;
 		this.actionParam0 = actionParam0;
-		this.widgetId = widgetId;
+		this.actionParam1 = actionParam1;
 		this.forceLeftClick = forceLeftClick;
 	}
 
@@ -94,6 +94,16 @@ public class MenuEntry implements Cloneable
 		}
 	}
 
+	public void setParam0(int i)
+	{
+		this.actionParam0 = i;
+	}
+
+	public void setParam1(int i)
+	{
+		this.actionParam1 = i;
+	}
+
 	/**
 	 * Get opcode, but as it's enum counterpart
 	 */

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

@@ -86,12 +86,12 @@ public class MenuOptionClicked extends MenuEntry implements Event
 
 	public void setMenuEntry(MenuEntry e)
 	{
-		setMenuOption(e.getMenuOption());
+		setOption(e.getOption());
-		setMenuTarget(e.getMenuTarget());
+		setTarget(e.getTarget());
 		setType(e.getType());
 		setOpcode(e.getOpcode());
 		setActionParam0(e.getActionParam0());
-		setWidgetId(e.getWidgetId());
+		setActionParam1(e.getActionParam1());
 		setForceLeftClick(e.isForceLeftClick());
 	}
 }

runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java

@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 import javax.annotation.Nullable;
+import net.runelite.http.api.RuneLiteAPI;
 import okhttp3.HttpUrl;
 
 public class RuneLiteProperties
@@ -144,7 +145,7 @@ public class RuneLiteProperties
 	public static HttpUrl getPluginHubBase()
 	{
 		String version = System.getProperty(PLUGINHUB_VERSION, properties.getProperty(PLUGINHUB_VERSION));
-		return HttpUrl.parse(properties.get(PLUGINHUB_BASE) + "/" + version);
+		return HttpUrl.parse(properties.get(PLUGINHUB_BASE) + "/" + RuneLiteAPI.getVersion());
 	}
 
 	public static String getImgurClientId()

runelite-client/src/main/java/net/runelite/client/callback/Hooks.java

@@ -24,6 +24,7 @@
  */
 package net.runelite.client.callback;
 
+import com.google.inject.Injector;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -39,22 +40,27 @@ import java.awt.image.VolatileImage;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
+import net.runelite.api.BufferProvider;
 import net.runelite.api.Client;
+import net.runelite.api.Entity;
 import net.runelite.api.MainBufferProvider;
 import net.runelite.api.NullItemID;
 import net.runelite.api.RenderOverview;
 import net.runelite.api.Skill;
 import net.runelite.api.WorldMapManager;
+import net.runelite.api.events.BeforeMenuRender;
 import net.runelite.api.events.BeforeRender;
 import net.runelite.api.events.FakeXpDrop;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.ScriptCallbackEvent;
 import net.runelite.api.hooks.Callbacks;
+import net.runelite.api.hooks.DrawCallbacks;
 import net.runelite.api.widgets.Widget;
 import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_VIEW;
 import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.Notifier;
+import net.runelite.client.RuneLite;
 import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.eventbus.Subscribe;
@@ -84,8 +90,8 @@ public class Hooks implements Callbacks
 	private static final GameTick GAME_TICK = new GameTick();
 	private static final BeforeRender BEFORE_RENDER = new BeforeRender();
 
-	@Inject
+	private static final Injector injector = RuneLite.getInjector();
-	private Client client;
+	private static final Client client = injector.getInstance(Client.class);
 
 	@Inject
 	private OverlayRenderer renderer;
@@ -535,4 +541,43 @@ public class Hooks implements Callbacks
 		);
 		eventBus.post(fakeXpDrop);
 	}
+
+	public static void clearColorBuffer(int x, int y, int width, int height, int color)
+	{
+		BufferProvider bp = client.getBufferProvider();
+		int canvasWidth = bp.getWidth();
+		int[] pixels = bp.getPixels();
+
+		int pixelPos = y * canvasWidth + x;
+		int pixelJump = canvasWidth - width;
+
+		for (int cy = y; cy < y + height; cy++)
+		{
+			for (int cx = x; cx < x + width; cx++)
+			{
+				pixels[pixelPos++] = 0;
+			}
+			pixelPos += pixelJump;
+		}
+	}
+
+	public static void renderDraw(Entity entity, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash)
+	{
+		DrawCallbacks drawCallbacks = client.getDrawCallbacks();
+		if (drawCallbacks != null)
+		{
+			drawCallbacks.draw(entity, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash);
+		}
+		else
+		{
+			entity.draw(orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash);
+		}
+	}
+
+	public static boolean drawMenu()
+	{
+		BeforeMenuRender event = new BeforeMenuRender();
+		client.getCallbacks().post(event);
+		return event.isConsumed();
+	}
 }

runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginClient.java

@@ -67,12 +67,13 @@ public class ExternalPluginClient
 	{
 		HttpUrl manifest = RuneLiteProperties.getPluginHubBase()
 			.newBuilder()
-			.addPathSegments("manifest.js")
+			.addPathSegment("manifest.js")
 			.build();
 		try (Response res = okHttpClient.newCall(new Request.Builder().url(manifest).build()).execute())
 		{
 			if (res.code() != 200)
 			{
+				System.out.println(manifest.url().toString());
 				throw new IOException("Non-OK response code: " + res.code());
 			}
 

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

@@ -109,8 +109,8 @@ public class MenuManager
 	{
 		for (MenuEntry menuEntry : client.getMenuEntries())
 		{
-			String option = menuEntry.getMenuOption();
+			String option = menuEntry.getOption();
-			String target = menuEntry.getMenuTarget();
+			String target = menuEntry.getTarget();
 
 			if (option.equals(customMenuOption.getMenuOption()) && target.equals(customMenuOption.getMenuTarget()))
 			{
@@ -128,7 +128,7 @@ public class MenuManager
 			return;
 		}
 
-		int widgetId = event.getWidgetId();
+		int widgetId = event.getActionParam1();
 		Collection<WidgetMenuOption> options = managedMenuOptions.get(widgetId);
 
 		for (WidgetMenuOption currentMenu : options)
@@ -139,9 +139,9 @@ public class MenuManager
 				menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1);
 
 				MenuEntry menuEntry = menuEntries[menuEntries.length - 1] = new MenuEntry();
-				menuEntry.setMenuOption(currentMenu.getMenuOption());
+				menuEntry.setOption(currentMenu.getMenuOption());
-				menuEntry.setWidgetId(widgetId);
+				menuEntry.setActionParam1(widgetId);
-				menuEntry.setMenuTarget(currentMenu.getMenuTarget());
+				menuEntry.setTarget(currentMenu.getMenuTarget());
 				menuEntry.setType(MenuAction.RUNELITE.getId());
 
 				client.setMenuEntries(menuEntries);
@@ -241,17 +241,17 @@ public class MenuManager
 			return; // not a managed widget option or custom player option
 		}
 
-		int widgetId = event.getWidgetId();
+		int widgetId = event.getActionParam1();
 		Collection<WidgetMenuOption> options = managedMenuOptions.get(widgetId);
 
 		for (WidgetMenuOption curMenuOption : options)
 		{
-			if (curMenuOption.getMenuTarget().equals(event.getMenuTarget())
+			if (curMenuOption.getMenuTarget().equals(event.getTarget())
-				&& curMenuOption.getMenuOption().equals(event.getMenuOption()))
+				&& curMenuOption.getMenuOption().equals(event.getOption()))
 			{
 				WidgetMenuOptionClicked customMenu = new WidgetMenuOptionClicked();
-				customMenu.setMenuOption(event.getMenuOption());
+				customMenu.setMenuOption(event.getOption());
-				customMenu.setMenuTarget(event.getMenuTarget());
+				customMenu.setMenuTarget(event.getTarget());
 				customMenu.setWidget(curMenuOption.getWidget());
 				eventBus.post(customMenu);
 				return; // don't continue because it's not a player option
@@ -260,14 +260,14 @@ public class MenuManager
 
 		// removes bounty hunter emblem tag and tier from player name, e.g:
 		// "username<img=20>5<col=40ff00>  (level-42)" -> "username<col=40ff00>  (level-42)"
-		String target = BOUNTY_EMBLEM_TAG_AND_TIER_REGEXP.matcher(event.getMenuTarget()).replaceAll("");
+		String target = BOUNTY_EMBLEM_TAG_AND_TIER_REGEXP.matcher(event.getTarget()).replaceAll("");
 
 		// removes tags and level from player names for example:
 		// <col=ffffff>username<col=40ff00>  (level-42) or <col=ffffff><img=2>username</col>
 		String username = Text.removeTags(target).split("[(]")[0].trim();
 
 		PlayerMenuOptionClicked playerMenuOptionClicked = new PlayerMenuOptionClicked();
-		playerMenuOptionClicked.setMenuOption(event.getMenuOption());
+		playerMenuOptionClicked.setMenuOption(event.getOption());
 		playerMenuOptionClicked.setMenuTarget(username);
 
 		eventBus.post(playerMenuOptionClicked);

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

@@ -148,7 +148,7 @@ public class OverlayManager
 		{
 			List<OverlayMenuEntry> menuEntries = overlay.getMenuEntries();
 			OverlayMenuEntry overlayMenuEntry = menuEntries.stream()
-				.filter(me -> me.getOption().equals(event.getMenuOption()))
+				.filter(me -> me.getOption().equals(event.getOption()))
 				.findAny()
 				.orElse(null);
 			if (overlayMenuEntry != null)

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

@@ -877,8 +877,8 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 			OverlayMenuEntry overlayMenuEntry = menuEntries.get(i);
 
 			final MenuEntry entry = new MenuEntry();
-			entry.setMenuOption(overlayMenuEntry.getOption());
+			entry.setOption(overlayMenuEntry.getOption());
-			entry.setMenuTarget(ColorUtil.wrapWithColorTag(overlayMenuEntry.getTarget(), JagexColors.MENU_TARGET));
+			entry.setTarget(ColorUtil.wrapWithColorTag(overlayMenuEntry.getTarget(), JagexColors.MENU_TARGET));
 			entry.setType(overlayMenuEntry.getMenuAction().getId());
 			entry.setType(overlayManager.getOverlays().indexOf(overlay)); // overlay id
 

runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxOverlay.java

@@ -197,7 +197,7 @@ public class InfoBoxOverlay extends OverlayPanel
 
 		InfoBox infoBox = hoveredComponent.getInfoBox();
 		OverlayMenuEntry overlayMenuEntry = infoBox.getMenuEntries().stream()
-			.filter(me -> me.getOption().equals(menuOptionClicked.getMenuOption()))
+			.filter(me -> me.getOption().equals(menuOptionClicked.getOption()))
 			.findAny()
 			.orElse(null);
 		if (overlayMenuEntry != null)

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

@@ -184,12 +184,12 @@ public abstract class MenuMixin implements RSClient
 	public void setLeftClickMenuEntry(final MenuEntry entry)
 	{
 		final int i = getMenuOptionCount() - 1;
-		getMenuOptions()[i] = entry.getMenuOption();
+		getMenuOptions()[i] = entry.getOption();
-		getMenuTargets()[i] = entry.getMenuTarget();
+		getMenuTargets()[i] = entry.getTarget();
 		getMenuIdentifiers()[i] = entry.getType();
 		getMenuOpcodes()[i] = entry.getOpcode();
 		getMenuArguments1()[i] = entry.getActionParam0();
-		getMenuArguments2()[i] = entry.getWidgetId();
+		getMenuArguments2()[i] = entry.getActionParam1();
 		getMenuForceLeftClick()[i] = entry.isForceLeftClick();
 	}
 
@@ -212,10 +212,10 @@ public abstract class MenuMixin implements RSClient
 			return;
 		}
 
-		tempMenuAction.setOption(entry.getMenuOption());
+		tempMenuAction.setOption(entry.getOption());
 		tempMenuAction.setOpcode(entry.getOpcode());
 		tempMenuAction.setIdentifier(entry.getType());
 		tempMenuAction.setParam0(entry.getActionParam0());
-		tempMenuAction.setParam1(entry.getWidgetId());
+		tempMenuAction.setParam1(entry.getActionParam1());
 	}
 }

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

@@ -750,12 +750,12 @@ public abstract class RSClientMixin implements RSClient
 		for (int i = 0; i < count; ++i)
 		{
 			MenuEntry entry = entries[i] = new MenuEntry();
-			entry.setMenuOption(menuOptions[i]);
+			entry.setOption(menuOptions[i]);
-			entry.setMenuTarget(menuTargets[i]);
+			entry.setTarget(menuTargets[i]);
 			entry.setType(menuIdentifiers[i]);
 			entry.setOpcode(menuTypes[i]);
 			entry.setActionParam0(params0[i]);
-			entry.setWidgetId(params1[i]);
+			entry.setActionParam1(params1[i]);
 			entry.setForceLeftClick(leftClick[i]);
 		}
 		return entries;
@@ -781,12 +781,12 @@ public abstract class RSClientMixin implements RSClient
 				continue;
 			}
 
-			menuOptions[count] = entry.getMenuOption();
+			menuOptions[count] = entry.getOption();
-			menuTargets[count] = entry.getMenuTarget();
+			menuTargets[count] = entry.getTarget();
 			menuIdentifiers[count] = entry.getType();
 			menuTypes[count] = entry.getOpcode();
 			params0[count] = entry.getActionParam0();
-			params1[count] = entry.getWidgetId();
+			params1[count] = entry.getActionParam1();
 			leftClick[count] = entry.isForceLeftClick();
 			++count;
 		}
@@ -828,12 +828,12 @@ public abstract class RSClientMixin implements RSClient
 
 			if (event.isModified() && client.getMenuOptionCount() == newCount)
 			{
-				options[oldCount] = event.getMenuOption();
+				options[oldCount] = event.getOption();
-				targets[oldCount] = event.getMenuTarget();
+				targets[oldCount] = event.getTarget();
 				identifiers[oldCount] = event.getType();
 				opcodes[oldCount] = event.getOpcode();
 				arguments1[oldCount] = event.getActionParam0();
-				arguments2[oldCount] = event.getWidgetId();
+				arguments2[oldCount] = event.getActionParam1();
 				forceLeftClick[oldCount] = event.isForceLeftClick();
 			}
 		}
@@ -1425,14 +1425,14 @@ public abstract class RSClientMixin implements RSClient
 		{
 			client.getLogger().info(
 				"|MenuAction|: MenuOption={} MenuTarget={} Id={} Opcode={} Param0={} Param1={} CanvasX={} CanvasY={} Authentic={}",
-				menuOptionClicked.getMenuOption(), menuOptionClicked.getMenuTarget(), menuOptionClicked.getType(),
+				menuOptionClicked.getOption(), menuOptionClicked.getTarget(), menuOptionClicked.getType(),
-				menuOptionClicked.getOpcode(), menuOptionClicked.getActionParam0(), menuOptionClicked.getWidgetId(),
+				menuOptionClicked.getOpcode(), menuOptionClicked.getActionParam0(), menuOptionClicked.getActionParam1(),
 				canvasX, canvasY, authentic
 			);
 		}
 
-		copy$menuAction(menuOptionClicked.getActionParam0(), menuOptionClicked.getWidgetId(), menuOptionClicked.getOpcode(),
+		copy$menuAction(menuOptionClicked.getActionParam0(), menuOptionClicked.getActionParam1(), menuOptionClicked.getOpcode(),
-			menuOptionClicked.getType(), menuOptionClicked.getMenuOption(), menuOptionClicked.getMenuTarget(), canvasX, canvasY);
+			menuOptionClicked.getType(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), canvasX, canvasY);
 	}
 
 	@Override