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

Move menuOpened to mixins

Browse Source 
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-06-22 10:41:48 +02:00
parent d6e26410c8
commit 8fb285f928
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
View File

@@ -58,7 +58,6 @@ import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.FocusChanged; import net.runelite.api.events.FocusChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.GraphicsObjectCreated; import net.runelite.api.events.GraphicsObjectCreated;
import net.runelite.api.events.MenuOpened;
import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.PostItemComposition; import net.runelite.api.events.PostItemComposition;
import net.runelite.api.events.ProjectileMoved; import net.runelite.api.events.ProjectileMoved;
@@ -457,13 +456,6 @@ public class Hooks
eventBus.post(event); eventBus.post(event);
} }
public static void menuOpened(Client client, int var1, int var2)
{
MenuOpened event = new MenuOpened();
event.setMenuEntries(client.getMenuEntries());
eventBus.post(event);
}
public static void onGraphicsObjectCreated(GraphicsObject go, int var1, int var2, int var3, int var4, int var5, int var6, int var7) public static void onGraphicsObjectCreated(GraphicsObject go, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
{ {
GraphicsObjectCreated event = new GraphicsObjectCreated(go); GraphicsObjectCreated event = new GraphicsObjectCreated(go);

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

@@ -69,6 +69,7 @@ import net.runelite.api.events.ExperienceChanged;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GrandExchangeOfferChanged; import net.runelite.api.events.GrandExchangeOfferChanged;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.MenuOpened;
import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.NpcSpawned;
import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.PlayerDespawned;
import net.runelite.api.events.PlayerMenuOptionsChanged; import net.runelite.api.events.PlayerMenuOptionsChanged;
@@ -80,6 +81,7 @@ import net.runelite.api.events.WidgetLoaded;
import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.FieldHook; import net.runelite.api.mixins.FieldHook;
import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.MethodHook;
import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow; import net.runelite.api.mixins.Shadow;
@@ -1015,4 +1017,13 @@ public abstract class RSClientMixin implements RSClient
int flags = getFlags(); int flags = getFlags();
return WorldType.fromMask(flags); return WorldType.fromMask(flags);
} }
}
@Inject
@MethodHook("openMenu")
public void menuOpened(int var1, int var2)
{
final MenuOpened event = new MenuOpened();
event.setMenuEntries(getMenuEntries());
eventBus.post(event);
}
}