diff --git a/runelite-api/src/main/java/net/runelite/api/HeadIcon.java b/runelite-api/src/main/java/net/runelite/api/HeadIcon.java new file mode 100644 index 0000000000..6391a00b3a --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/HeadIcon.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; + +public enum HeadIcon +{ + MELEE, + RANGED, + MAGIC; +} diff --git a/runelite-api/src/main/java/net/runelite/api/NPCComposition.java b/runelite-api/src/main/java/net/runelite/api/NPCComposition.java index 3601e78030..40be80a61a 100644 --- a/runelite-api/src/main/java/net/runelite/api/NPCComposition.java +++ b/runelite-api/src/main/java/net/runelite/api/NPCComposition.java @@ -48,5 +48,5 @@ public interface NPCComposition int getSize(); - int getOverheadIcon(); + HeadIcon getOverheadIcon(); } diff --git a/runelite-api/src/main/java/net/runelite/api/Player.java b/runelite-api/src/main/java/net/runelite/api/Player.java index f0158e0047..9c3184c2b6 100644 --- a/runelite-api/src/main/java/net/runelite/api/Player.java +++ b/runelite-api/src/main/java/net/runelite/api/Player.java @@ -41,5 +41,5 @@ public interface Player extends Actor boolean isFriend(); - int getOverheadIcon(); + HeadIcon getOverheadIcon(); } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNpcCompositionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNpcCompositionMixin.java index ce3decf2bc..061d6d890e 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNpcCompositionMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSNpcCompositionMixin.java @@ -24,6 +24,10 @@ */ package net.runelite.mixins; +import net.runelite.api.HeadIcon; +import static net.runelite.api.HeadIcon.MAGIC; +import static net.runelite.api.HeadIcon.MELEE; +import static net.runelite.api.HeadIcon.RANGED; import net.runelite.api.events.NpcActionChanged; import net.runelite.api.mixins.FieldHook; import net.runelite.api.mixins.Inject; @@ -34,6 +38,23 @@ import net.runelite.rs.api.RSNPCComposition; @Mixin(RSNPCComposition.class) public abstract class RSNpcCompositionMixin implements RSNPCComposition { + @Inject + @Override + public HeadIcon getOverheadIcon() + { + switch (getRsOverheadIcon()) + { + case 0: + return MELEE; + case 1: + return RANGED; + case 2: + return MAGIC; + default: + return null; + } + } + @FieldHook("actions") @Inject public void actionsHook(int idx) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java index 23b142f784..bc75866702 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java @@ -27,16 +27,20 @@ package net.runelite.mixins; import java.awt.Polygon; import java.util.ArrayList; import java.util.List; +import net.runelite.api.HeadIcon; +import static net.runelite.api.HeadIcon.MAGIC; +import static net.runelite.api.HeadIcon.MELEE; +import static net.runelite.api.HeadIcon.RANGED; import net.runelite.api.Model; import net.runelite.api.Perspective; import net.runelite.api.Point; import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Replace; -import net.runelite.api.model.Triangle; -import net.runelite.api.model.Vertex; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; +import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Shadow; +import net.runelite.api.model.Triangle; +import net.runelite.api.model.Vertex; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSModel; import net.runelite.rs.api.RSName; @@ -72,6 +76,23 @@ public abstract class RSPlayerMixin implements RSPlayer return name.replace('\u00A0', ' '); } + @Inject + @Override + public HeadIcon getOverheadIcon() + { + switch (getRsOverheadIcon()) + { + case 0: + return MELEE; + case 1: + return RANGED; + case 2: + return MAGIC; + default: + return null; + } + } + @Inject @Override public Polygon[] getPolygons() diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java index dbfd50a291..0ed50491f6 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java @@ -74,6 +74,5 @@ public interface RSNPCComposition extends NPCComposition int getSize(); @Import("headIcon") - @Override - int getOverheadIcon(); + int getRsOverheadIcon(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java index ddfa78c75a..f8229afffc 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java @@ -59,6 +59,5 @@ public interface RSPlayer extends RSActor, Player boolean isFriend(); @Import("overheadIcon") - @Override - int getOverheadIcon(); + int getRsOverheadIcon(); }