From ee9806573569a651ec5ee208c9d405ac7a9de092 Mon Sep 17 00:00:00 2001 From: Magic fTail Date: Thu, 20 Dec 2018 04:31:59 +0100 Subject: [PATCH] api: add overhead text changed event and setOverheadText --- .../src/main/java/net/runelite/api/Actor.java | 7 ++++ .../api/events/OverheadTextChanged.java | 39 +++++++++++++++++++ .../net/runelite/mixins/RSActorMixin.java | 13 +++++++ .../java/net/runelite/rs/api/RSActor.java | 4 ++ 4 files changed, 63 insertions(+) create mode 100644 runelite-api/src/main/java/net/runelite/api/events/OverheadTextChanged.java diff --git a/runelite-api/src/main/java/net/runelite/api/Actor.java b/runelite-api/src/main/java/net/runelite/api/Actor.java index 70ba1ae85c..6357a91ebc 100644 --- a/runelite-api/src/main/java/net/runelite/api/Actor.java +++ b/runelite-api/src/main/java/net/runelite/api/Actor.java @@ -239,4 +239,11 @@ public interface Actor extends Renderable * @return the overhead text */ String getOverheadText(); + + /** + * Sets the overhead text that is displayed above the actor + * + * @param overheadText the overhead text + */ + void setOverheadText(String overheadText); } diff --git a/runelite-api/src/main/java/net/runelite/api/events/OverheadTextChanged.java b/runelite-api/src/main/java/net/runelite/api/events/OverheadTextChanged.java new file mode 100644 index 0000000000..a366eb297a --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/OverheadTextChanged.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018, Magic fTail + * 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; +import net.runelite.api.Actor; + +/** + * Event fired when an actors overhead text is changed. + */ +@Value +public class OverheadTextChanged +{ + private final Actor actor; + + private final String overheadText; +} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java index 437e2a76d9..cc72387a6d 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java @@ -43,6 +43,7 @@ import net.runelite.api.events.GraphicChanged; import net.runelite.api.events.HitsplatApplied; import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.LocalPlayerDeath; +import net.runelite.api.events.OverheadTextChanged; import net.runelite.api.mixins.FieldHook; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.MethodHook; @@ -208,6 +209,18 @@ public abstract class RSActorMixin implements RSActor client.getCallbacks().post(interactingChanged); } + @FieldHook("overhead") + @Inject + public void overheadTextChanged(int idx) + { + String overheadText = getOverheadText(); + if (overheadText != null) + { + OverheadTextChanged overheadTextChanged = new OverheadTextChanged(this, overheadText); + client.getCallbacks().post(overheadTextChanged); + } + } + @Inject @Override public Polygon getConvexHull() diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java index decded8761..801cf4413a 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java @@ -36,6 +36,10 @@ public interface RSActor extends RSRenderable, Actor @Override String getOverheadText(); + @Import("overhead") + @Override + void setOverheadText(String overheadText); + @Import("x") int getX();