diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 75e56a54aa..c7334cc684 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -25,9 +25,9 @@ object ProjectVersions { const val launcherVersion = "2.2.0" - const val rlVersion = "1.8.13.1" + const val rlVersion = "1.8.14" - const val openosrsVersion = "4.20.4" + const val openosrsVersion = "4.20.5" const val rsversion = 203 const val cacheversion = 165 diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSBoundaryObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSBoundaryObjectMixin.java index fd2e0b058e..8fc032c190 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSBoundaryObjectMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSBoundaryObjectMixin.java @@ -78,8 +78,8 @@ public abstract class RSBoundaryObjectMixin implements RSBoundaryObject @Override public Shape getClickbox() { - Shape clickboxA = Perspective.getClickbox(client, getModelA(), 0, getLocalLocation()); - Shape clickboxB = Perspective.getClickbox(client, getModelB(), 0, getLocalLocation()); + Shape clickboxA = Perspective.getClickbox(client, getModelA(), 0, getX(), getY(), getZ()); + Shape clickboxB = Perspective.getClickbox(client, getModelB(), 0, getX(), getY(), getZ()); if (clickboxA == null && clickboxB == null) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSFloorDecorationMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSFloorDecorationMixin.java index 047bc1ca9f..e3f02d0f1d 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSFloorDecorationMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSFloorDecorationMixin.java @@ -77,6 +77,6 @@ public abstract class RSFloorDecorationMixin implements RSFloorDecoration @Override public Shape getClickbox() { - return Perspective.getClickbox(client, getModel(), 0, getLocalLocation()); + return Perspective.getClickbox(client, getModel(), 0, getX(), getY(), getZ()); } } 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 ff35b491ba..98d0c87fc6 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(), getModelOrientation(), getLocalLocation()); + return Perspective.getClickbox(client, getModel(), getModelOrientation(), getX(), getY(), getZ()); } @Inject diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWallDecorationMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWallDecorationMixin.java index c71d3a8d01..ca1edf956f 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWallDecorationMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWallDecorationMixin.java @@ -86,11 +86,8 @@ public abstract class RSWallDecorationMixin implements RSWallDecoration @Override public Shape getClickbox() { - LocalPoint lp = getLocalLocation(); - - Shape clickboxA = Perspective.getClickbox(client, getModel1(), 0, - new LocalPoint(lp.getX() + getXOffset(), lp.getY() + getYOffset())); - Shape clickboxB = Perspective.getClickbox(client, getModel2(), 0, lp); + Shape clickboxA = Perspective.getClickbox(client, getModel1(), 0, getX() + getXOffset(), getY() + getYOffset(), getZ()); + Shape clickboxB = Perspective.getClickbox(client, getModel2(), 0, getX(), getY(), getZ()); if (clickboxA == null && clickboxB == null) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteObjectMixin.java index 788eeaf7f5..4b47b9cfb3 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteObjectMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteObjectMixin.java @@ -51,7 +51,7 @@ public abstract class RuneLiteObjectMixin implements RSRuneLiteObject setX(localPoint.getX()); setY(localPoint.getY()); setLevel(plane); - setHeight(Perspective.getTileHeight(client, localPoint, plane)); + setZ(Perspective.getTileHeight(client, localPoint, plane)); } @Inject 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 b2e9c19475..b1365ff00c 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 @@ -28,8 +28,8 @@ public interface RSGameObject extends GameObject @Override int getY(); - @Import("height") - int getHeight(); + @Import("z") + int getZ(); @Import("orientation") int getModelOrientation(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java index fe2bb9fb77..22cb59d362 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java @@ -26,9 +26,8 @@ public interface RSGraphicsObject extends GraphicsObject, RSRenderable @Override int getLevel(); - @Import("height") - @Override - int getHeight(); + @Import("z") + int getZ(); @Import("isFinished") @Override @@ -58,8 +57,8 @@ public interface RSGraphicsObject extends GraphicsObject, RSRenderable @Import("y") void setY(int y); - @Import("height") - void setHeight(int height); + @Import("z") + void setZ(int height); @Import("sequenceDefinition") RSSequenceDefinition getSequenceDefinition(); diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 7de565d764..622e11cbdd 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -755,7 +755,7 @@ public class ClientPacket implements class253 { if (var0.isFinished) { var0.remove(); // L: 4711 } else { - Decimator.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 4712 + Decimator.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); // L: 4712 } } } else { diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 45cc3e8a44..f29a430d43 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -22,8 +22,8 @@ public final class GameObject { @ObfuscatedGetter( intValue = 746777845 ) - @Export("height") - int height; + @Export("z") + int z; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1435489625 diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index ebfae3234c..8226507e4e 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -41,8 +41,8 @@ public class GraphicsObject extends Renderable { @ObfuscatedGetter( intValue = 1971033417 ) - @Export("height") - int height; + @Export("z") + int z; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lgm;" @@ -73,7 +73,7 @@ public class GraphicsObject extends Renderable { this.plane = var2; // L: 22 this.x = var3; this.y = var4; - this.height = var5; + this.z = var5; this.cycleStart = var7 + var6; int var8 = Widget.SpotAnimationDefinition_get(this.id).sequence; // L: 27 if (var8 != -1) { diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 7cde2c478f..e9c18a04c0 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -559,7 +559,7 @@ public class Scene { var21.plane = var1; // L: 307 var21.centerX = var6; // L: 308 var21.centerY = var7; // L: 309 - var21.height = var8; // L: 310 + var21.z = var8; // L: 310 var21.renderable = var9; // L: 311 var21.orientation = var10; // L: 312 var21.startX = var2; // L: 313 @@ -1370,7 +1370,7 @@ public class Scene { for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 931 var12 = var9.gameObjects[var11]; // L: 932 if (var12 != null) { // L: 933 - var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); + var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.z - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } @@ -1638,7 +1638,7 @@ public class Scene { GameObject var33 = gameObjects[var25]; // L: 1113 var33.lastDrawn = Scene_drawnCount; // L: 1114 if (!this.method3947(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1115 - var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1116 + var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1116 } for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1118