From 1914f7651362253cf39329998e1a781031f12ef6 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 4 Feb 2018 06:37:24 -0700 Subject: [PATCH] change getModelHeight to getLogicalHeight --- runelite-api/src/main/java/net/runelite/api/Actor.java | 5 +++++ .../runelite/client/plugins/implings/ImplingsOverlay.java | 2 +- .../plugins/playerindicators/PlayerIndicatorsOverlay.java | 2 +- .../java/net/runelite/client/ui/overlay/OverlayUtil.java | 6 +++--- .../src/main/java/net/runelite/rs/api/RSActor.java | 4 ++++ 5 files changed, 14 insertions(+), 5 deletions(-) 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 af3b61d30c..3be52c84a4 100644 --- a/runelite-api/src/main/java/net/runelite/api/Actor.java +++ b/runelite-api/src/main/java/net/runelite/api/Actor.java @@ -63,4 +63,9 @@ public interface Actor extends Renderable Point getMinimapLocation(); Point getRegionLocation(); + + /** + * Returns the logical height of the actor's model. This is roughly where the health bar is drawn. + */ + int getLogicalHeight(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java index 649378a616..97584f6f6a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java @@ -173,7 +173,7 @@ public class ImplingsOverlay extends Overlay graphics.drawOval(minimapLocation.getX(), minimapLocation.getY(), 5, 5); } - Point textLocation = actor.getCanvasTextLocation(graphics, text, actor.getModelHeight()); + Point textLocation = actor.getCanvasTextLocation(graphics, text, actor.getLogicalHeight()); if (textLocation != null) { int x = textLocation.getX(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java index af884a6078..03362e9ddc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java @@ -104,7 +104,7 @@ public class PlayerIndicatorsOverlay extends Overlay final String name = actor.getName().replace('\u00A0', ' '); net.runelite.api.Point textLocation = actor - .getCanvasTextLocation(graphics, name, actor.getModelHeight() + 40); + .getCanvasTextLocation(graphics, name, actor.getLogicalHeight() + 40); if (textLocation != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java index 5d92f2f174..7adb223660 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java @@ -250,7 +250,7 @@ public class OverlayUtil renderMinimapLocation(graphics, minimapLocation, color); } - Point textLocation = actor.getCanvasTextLocation(graphics, text, actor.getModelHeight() + 40); + Point textLocation = actor.getCanvasTextLocation(graphics, text, actor.getLogicalHeight() + 40); if (textLocation != null) { renderTextLocation(graphics, textLocation, text, color); @@ -271,7 +271,7 @@ public class OverlayUtil renderMinimapLocation(graphics, minimapLocation, color); } - Point imageLocation = actor.getCanvasImageLocation(graphics, image, actor.getModelHeight()); + Point imageLocation = actor.getCanvasImageLocation(graphics, image, actor.getLogicalHeight()); if (imageLocation != null) { renderImageLocation(graphics, imageLocation, image); @@ -292,7 +292,7 @@ public class OverlayUtil renderMinimapLocation(graphics, minimapLocation, color); } - Point imageLocation = actor.getCanvasSpriteLocation(graphics, sprite, actor.getModelHeight()); + Point imageLocation = actor.getCanvasSpriteLocation(graphics, sprite, actor.getLogicalHeight()); if (imageLocation != null) { renderSpriteLocation(graphics, imageLocation, sprite); 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 c6955f6e90..62551c2ca9 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 @@ -58,4 +58,8 @@ public interface RSActor extends RSRenderable, Actor @Import("orientation") @Override int getOrientation(); + + @Import("logicalHeight") + @Override + int getLogicalHeight(); }