diff --git a/runelite-api/src/main/java/net/runelite/api/events/WidgetOpened.java b/runelite-api/src/main/java/net/runelite/api/events/WidgetOpened.java new file mode 100644 index 0000000000..8ad22dead2 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/WidgetOpened.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018, 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; + +@Data +public class WidgetOpened +{ + private int parentId; + private int groupId; + private int autoClose; +} 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 3527bb3c47..1b5c8dd827 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -63,6 +63,7 @@ import net.runelite.api.events.MapRegionChanged; import net.runelite.api.events.PlayerMenuOptionsChanged; import net.runelite.api.events.ResizeableChanged; import net.runelite.api.events.VarbitChanged; +import net.runelite.api.events.WidgetOpened; import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.FieldHook; import net.runelite.api.mixins.Inject; @@ -505,17 +506,23 @@ public abstract class RSClientMixin implements RSClient } @Copy("openWidget") - public static WidgetNode rs$openWidget(int parentHash, int widgetId, int autoClose) + public static WidgetNode rs$openWidget(int parentId, int groupId, int autoClose) { throw new RuntimeException(); } @Replace("openWidget") - public static WidgetNode rl$openWidget(int parentHash, int widgetId, int autoClose) + public static WidgetNode rl$openWidget(int parentId, int groupId, int autoClose) { MenuEntry[] entries = client.getMenuEntries(); - WidgetNode widgetNode = rs$openWidget(parentHash, widgetId, autoClose); + WidgetNode widgetNode = rs$openWidget(parentId, groupId, autoClose); client.setMenuEntries(entries); + + WidgetOpened event = new WidgetOpened(); + event.setParentId(parentId); + event.setGroupId(groupId); + event.setAutoClose(autoClose); + eventBus.post(event); return widgetNode; }