From 181b6f0c1ceff18d17bb783876cb225407287c87 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 17 Mar 2019 16:07:42 -0400 Subject: [PATCH] api: add event for controlling menu left click behavior --- .../api/events/MenuShouldLeftClick.java | 40 +++++++++++++++++++ .../net/runelite/mixins/RSClientMixin.java | 9 +++++ 2 files changed, 49 insertions(+) create mode 100644 runelite-api/src/main/java/net/runelite/api/events/MenuShouldLeftClick.java diff --git a/runelite-api/src/main/java/net/runelite/api/events/MenuShouldLeftClick.java b/runelite-api/src/main/java/net/runelite/api/events/MenuShouldLeftClick.java new file mode 100644 index 0000000000..c36372ff2c --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/MenuShouldLeftClick.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2019, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. 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 OWNER 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.api.events; + +import lombok.Data; + +/** + * Event called when the client is checking if the menu should be + * opened on left click. + */ +@Data +public class MenuShouldLeftClick +{ + /** + * If set to true, the menu will open on left click. + */ + private boolean forceRightClick; +} 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 430bfb7d35..621eb87a1a 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -85,6 +85,7 @@ import net.runelite.api.events.GrandExchangeOfferChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOpened; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.MenuShouldLeftClick; import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.PlayerMenuOptionsChanged; @@ -1469,6 +1470,14 @@ public abstract class RSClientMixin implements RSClient return true; } + MenuShouldLeftClick menuShouldLeftClick = new MenuShouldLeftClick(); + client.getCallbacks().post(menuShouldLeftClick); + + if (menuShouldLeftClick.isForceRightClick()) + { + return true; + } + int len = getMenuOptionCount(); if (len > 0) {