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

Move postItemComposition to mixins

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

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

@@ -41,7 +41,6 @@ import java.awt.image.VolatileImage;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GraphicsObject; import net.runelite.api.GraphicsObject;
import net.runelite.api.ItemComposition;
import net.runelite.api.MainBufferProvider; import net.runelite.api.MainBufferProvider;
import net.runelite.api.MenuAction; import net.runelite.api.MenuAction;
import net.runelite.api.MessageNode; import net.runelite.api.MessageNode;
@@ -55,7 +54,6 @@ import net.runelite.api.events.ChatMessage;
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.MenuOptionClicked; import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.PostItemComposition;
import net.runelite.api.events.ProjectileMoved; import net.runelite.api.events.ProjectileMoved;
import net.runelite.api.events.SetMessage; import net.runelite.api.events.SetMessage;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
@@ -429,13 +427,6 @@ public class Hooks
shouldProcessGameTick = true; shouldProcessGameTick = true;
} }
public static void postItemComposition(ItemComposition itemComposition)
{
PostItemComposition event = new PostItemComposition();
event.setItemComposition(itemComposition);
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);

12
runelite-mixins/src/main/java/net/runelite/mixins/RSItemCompositionMixin.java
View File

@@ -25,10 +25,13 @@
package net.runelite.mixins; package net.runelite.mixins;
import net.runelite.api.events.PostItemComposition;
import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Copy;
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 static net.runelite.client.callback.Hooks.eventBus;
import net.runelite.rs.api.RSItemComposition; import net.runelite.rs.api.RSItemComposition;
@Mixin(RSItemComposition.class) @Mixin(RSItemComposition.class)
@@ -73,4 +76,13 @@ public abstract class RSItemCompositionMixin implements RSItemComposition
{ {
shiftClickActionIndex = DEFAULT_CUSTOM_SHIFT_CLICK_INDEX; shiftClickActionIndex = DEFAULT_CUSTOM_SHIFT_CLICK_INDEX;
} }
@Inject
@MethodHook(value = "post", end = true)
public void post()
{
final PostItemComposition event = new PostItemComposition();
event.setItemComposition(this);
eventBus.post(event);
}
} }