From 9da28cd64435cf32519f497e381ea047309df841 Mon Sep 17 00:00:00 2001 From: JumpIfZero Date: Wed, 5 Jan 2022 17:23:48 +0200 Subject: [PATCH] project: add missing api changes from #3105 --- .../src/main/java/net/runelite/mixins/RSGameObjectMixin.java | 2 +- .../src/main/java/net/runelite/rs/api/RSFloorDecoration.java | 4 ++++ .../src/main/java/net/runelite/rs/api/RSGameObject.java | 3 ++- .../src/main/java/net/runelite/rs/api/RSScriptEvent.java | 3 +++ .../src/main/java/net/runelite/rs/api/RSWallDecoration.java | 4 ++++ 5 files changed, 14 insertions(+), 2 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 320682dc7d..ff35b491ba 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java @@ -121,7 +121,7 @@ public abstract class RSGameObjectMixin implements RSGameObject public Angle getOrientation() { int orientation = getModelOrientation(); - int rotation = (getFlags() >> 6) & 3; + int rotation = (getConfig() >> 6) & 3; return new Angle(rotation * 512 + orientation); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFloorDecoration.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFloorDecoration.java index 30e5380b5f..131f1451e1 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFloorDecoration.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFloorDecoration.java @@ -19,5 +19,9 @@ public interface RSFloorDecoration extends GroundObject @Override RSRenderable getRenderable(); + @Import("flags") + @Override + int getConfig(); + void setPlane(int plane); } 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 616eabb9be..b2e9c19475 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 @@ -39,7 +39,8 @@ public interface RSGameObject extends GameObject long getHash(); @Import("flags") - int getFlags(); + @Override + int getConfig(); int getPlane(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java index 7c2dfc8e00..929256f9e3 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java @@ -55,6 +55,9 @@ public interface RSScriptEvent extends ScriptEvent @Import("mouseX") int getMouseX(); + @Import("mouseY") + int getMouseY(); + @Import("keyTyped") // shit name int getTypedKeyCode(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java index bfceac72a4..d208253f7d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java @@ -32,5 +32,9 @@ public interface RSWallDecoration extends DecorativeObject @Override RSRenderable getRenderable2(); + @Import("flags") + @Override + int getConfig(); + void setPlane(int plane); }