diff --git a/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java b/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java new file mode 100644 index 0000000000..0941dbc1d5 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java @@ -0,0 +1,32 @@ +/* + * 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.Value; + +@Value +public class WidgetPositioned +{ +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java index fd24972e29..c9cb92df68 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java @@ -32,6 +32,7 @@ import net.runelite.api.Node; import net.runelite.api.Point; import net.runelite.api.WidgetNode; import net.runelite.api.events.WidgetHiddenChanged; +import net.runelite.api.events.WidgetPositioned; import net.runelite.api.mixins.FieldHook; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; @@ -40,7 +41,9 @@ import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetInfo.TO_CHILD; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import net.runelite.api.widgets.WidgetItem; +import static net.runelite.client.callback.Hooks.deferredEventBus; import static net.runelite.client.callback.Hooks.eventBus; +import static net.runelite.client.callback.Hooks.log; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSHashTable; import net.runelite.rs.api.RSNode; @@ -54,6 +57,9 @@ public abstract class RSWidgetMixin implements RSWidget @Shadow("clientInstance") private static RSClient client; + @Inject + private static int rl$widgetLastPosChanged; + @Inject @Override public Widget getParent() @@ -418,4 +424,28 @@ public abstract class RSWidgetMixin implements RSWidget broadcastHidden(isSelfHidden()); } + + @FieldHook("relativeY") + @Inject + public void onPositionChanged(int idx) + { + int id = getId(); + if (id == -1) + { + return; + } + + int tick = client.getGameCycle(); + if (tick == rl$widgetLastPosChanged) + { + return; + } + + rl$widgetLastPosChanged = tick; + + log.trace("Posting widget position changed"); + + WidgetPositioned widgetPositioned = new WidgetPositioned(); + deferredEventBus.post(widgetPositioned); + } }