From bac06e5b3a93cf5c19a4268a45fa74ae07694809 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 22 Jun 2018 11:05:33 +0200 Subject: [PATCH] Move graphicsObjectCreated to mixins Signed-off-by: Tomas Slusny --- .../main/java/net/runelite/client/callback/Hooks.java | 8 -------- .../java/net/runelite/mixins/GraphicsObjectMixin.java | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index a7905322f9..e4dc01babe 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -39,7 +39,6 @@ import java.awt.event.MouseWheelEvent; import java.awt.image.BufferedImage; import java.awt.image.VolatileImage; import net.runelite.api.Client; -import net.runelite.api.GraphicsObject; import net.runelite.api.MainBufferProvider; import net.runelite.api.MenuAction; import net.runelite.api.Region; @@ -47,7 +46,6 @@ import net.runelite.api.RenderOverview; import net.runelite.api.TextureProvider; import net.runelite.api.WorldMapManager; import net.runelite.api.events.GameTick; -import net.runelite.api.events.GraphicsObjectCreated; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_VIEW; @@ -373,10 +371,4 @@ public class Hooks // have been processed is typically more useful. shouldProcessGameTick = true; } - - 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); - eventBus.post(event); - } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/GraphicsObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/GraphicsObjectMixin.java index 0819c6301e..d9ab364eae 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/GraphicsObjectMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/GraphicsObjectMixin.java @@ -25,13 +25,22 @@ package net.runelite.mixins; import net.runelite.api.coords.LocalPoint; +import net.runelite.api.events.GraphicsObjectCreated; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; +import static net.runelite.client.callback.Hooks.eventBus; import net.runelite.rs.api.RSGraphicsObject; @Mixin(RSGraphicsObject.class) public abstract class GraphicsObjectMixin implements RSGraphicsObject { + @Inject + GraphicsObjectMixin() + { + final GraphicsObjectCreated event = new GraphicsObjectCreated(this); + eventBus.post(event); + } + @Override @Inject public LocalPoint getLocation()