From 371739976d9d98d22566e18fe3d31ea44047f782 Mon Sep 17 00:00:00 2001 From: ReeeMan Date: Tue, 29 Jun 2021 17:42:40 +0100 Subject: [PATCH] rename getRsOrientation -> getModelOrientation inline with upstream --- .../main/java/net/runelite/mixins/RSGameObjectMixin.java | 6 +++--- .../src/main/java/net/runelite/rs/api/RSGameObject.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java index 4e831b6b0b..320682dc7d 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java @@ -97,7 +97,7 @@ public abstract class RSGameObjectMixin implements RSGameObject @Override public Shape getClickbox() { - return Perspective.getClickbox(client, getModel(), getRsOrientation(), getLocalLocation()); + return Perspective.getClickbox(client, getModel(), getModelOrientation(), getLocalLocation()); } @Inject @@ -113,14 +113,14 @@ public abstract class RSGameObjectMixin implements RSGameObject int tileHeight = Perspective.getTileHeight(client, new LocalPoint(getX(), getY()), client.getPlane()); - return model.getConvexHull(getX(), getY(), getRsOrientation(), tileHeight); + return model.getConvexHull(getX(), getY(), getModelOrientation(), tileHeight); } @Override @Inject public Angle getOrientation() { - int orientation = getRsOrientation(); + int orientation = getModelOrientation(); int rotation = (getFlags() >> 6) & 3; return new Angle(rotation * 512 + orientation); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java index e326a89938..616eabb9be 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java @@ -32,7 +32,7 @@ public interface RSGameObject extends GameObject int getHeight(); @Import("orientation") - int getRsOrientation(); + int getModelOrientation(); @Import("tag") @Override