ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3007 from ReeeMan/master

Browse Source 
api: rename getRsOrientation -> getModelOrientation inline with upstream
This commit is contained in:
ThatGamerBlue
2021-06-30 06:52:03 +01:00
committed by GitHub
parent 6a2548b735 371739976d
commit 0d5fdf82a7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java
View File

@@ -97,7 +97,7 @@ public abstract class RSGameObjectMixin implements RSGameObject
@Override @Override
public Shape getClickbox() public Shape getClickbox()
{ {
return Perspective.getClickbox(client, getModel(), getRsOrientation(), getLocalLocation()); return Perspective.getClickbox(client, getModel(), getModelOrientation(), getLocalLocation());
} }
@Inject @Inject
@@ -113,14 +113,14 @@ public abstract class RSGameObjectMixin implements RSGameObject
int tileHeight = Perspective.getTileHeight(client, new LocalPoint(getX(), getY()), client.getPlane()); 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 @Override
@Inject @Inject
public Angle getOrientation() public Angle getOrientation()
{ {
int orientation = getRsOrientation(); int orientation = getModelOrientation();
int rotation = (getFlags() >> 6) & 3; int rotation = (getFlags() >> 6) & 3;
return new Angle(rotation * 512 + orientation); return new Angle(rotation * 512 + orientation);
} }

2
runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java
View File

@@ -32,7 +32,7 @@ public interface RSGameObject extends GameObject
int getHeight(); int getHeight();
@Import("orientation") @Import("orientation")
int getRsOrientation(); int getModelOrientation();
@Import("tag") @Import("tag")
@Override @Override