ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

mixins: move widget open event to loadWidget

Browse Source
This commit is contained in:
Adam
2018-03-29 07:57:58 -04:00
parent 8047fac86c
commit 83e38d8140
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-api/src/main/java/net/runelite/api/events/WidgetOpened.java
View File

@@ -29,7 +29,5 @@ import lombok.Data;
@Data @Data
public class WidgetOpened public class WidgetOpened
{ {
private int parentId;
private int groupId; private int groupId;
private int autoClose;
} }

31
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -73,6 +73,8 @@ import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow; import net.runelite.api.mixins.Shadow;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import static net.runelite.api.widgets.WidgetInfo.TO_CHILD;
import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
import static net.runelite.client.callback.Hooks.eventBus; import static net.runelite.client.callback.Hooks.eventBus;
import net.runelite.rs.api.RSClanMemberManager; import net.runelite.rs.api.RSClanMemberManager;
import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSClient;
@@ -507,25 +509,28 @@ public abstract class RSClientMixin implements RSClient
client.setMenuEntries(entries); client.setMenuEntries(entries);
} }
@Copy("openWidget") @Copy("loadWidget")
public static WidgetNode rs$openWidget(int parentId, int groupId, int autoClose) public static boolean rs$loadWidget(int widgetId)
{ {
throw new RuntimeException(); throw new RuntimeException();
} }
@Replace("openWidget") @Replace("loadWidget")
public static WidgetNode rl$openWidget(int parentId, int groupId, int autoClose) public static boolean rl$loadWidget(int widgetId)
{ {
MenuEntry[] entries = client.getMenuEntries(); RSWidget[][] widgets = client.getWidgets();
WidgetNode widgetNode = rs$openWidget(parentId, groupId, autoClose); boolean loadedBefore = widgets != null && widgets[widgetId] != null;
client.setMenuEntries(entries);
WidgetOpened event = new WidgetOpened(); boolean loaded = rs$loadWidget(widgetId);
event.setParentId(parentId);
event.setGroupId(groupId); if (!loadedBefore && loaded)
event.setAutoClose(autoClose); {
eventBus.post(event); WidgetOpened event = new WidgetOpened();
return widgetNode; event.setGroupId(widgetId);
eventBus.post(event);
}
return loaded;
} }
@FieldHook("skillExperiences") @FieldHook("skillExperiences")