diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index a71e222efa..e6abda53ba 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -63,7 +63,7 @@ public interface RSClient extends RSGameShell, Client @Override int getCameraZ2(); - @Import("Scene_plane") + @Import("Client_plane") @Override int getPlane(); @@ -904,7 +904,7 @@ public interface RSClient extends RSGameShell, Client @Import("Scene_cameraYTile") void setScreenCenterZ(int screenCenterZ); // <-- This is correct! - @Import("Scene_plane") + @Import("Client_plane") void setScenePlane(int scenePlane); @Import("Scene_cameraXTileMin") diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 1780bdd426..5b2bdcfdb1 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -132,7 +132,7 @@ public class ArchiveLoader { var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); var2.pathY[0] = var6 - HealthBar.baseY * 64; var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - Player.Scene_plane = var2.plane = var4; + Player.Client_plane = var2.plane = var4; if (Players.field1229[var1] != null) { var2.read(Players.field1229[var1]); } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 1c157aff75..944f77e1b1 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -2536,12 +2536,12 @@ public final class Client extends GameShell implements Usernamed { GrandExchangeOfferNameComparator.method172(true); var48 = Tiles.Tiles_minPlane; - if (var48 > Player.Scene_plane) { - var48 = Player.Scene_plane; + if (var48 > Player.Client_plane) { + var48 = Player.Client_plane; } - if (var48 < Player.Scene_plane - 1) { - var48 = Player.Scene_plane - 1; + if (var48 < Player.Client_plane - 1) { + var48 = Player.Client_plane - 1; } if (isLowDetail) { @@ -4181,14 +4181,14 @@ public final class Client extends GameShell implements Usernamed { } if (PendingSpawn.method1854() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var3 = class215.localPlayer.Scene_plane - mouseWheelRotation; + var3 = class215.localPlayer.Client_plane - mouseWheelRotation; if (var3 < 0) { var3 = 0; } else if (var3 > 3) { var3 = 3; } - if (var3 != class215.localPlayer.Scene_plane) { + if (var3 != class215.localPlayer.Client_plane) { var4 = class215.localPlayer.pathX[0] + UserComparator8.baseX * 64; var5 = class215.localPlayer.pathY[0] + HealthBar.baseY * 64; var18 = SoundSystem.getPacketBufferNode(ClientPacket.field2228, packetWriter.isaacCipher); @@ -4360,12 +4360,12 @@ public final class Client extends GameShell implements Usernamed { var5 = IgnoreList.oculusOrbFocalPointX >> 7; var6 = AbstractArchive.oculusOrbFocalPointY >> 7; - var7 = GraphicsObject.getTileHeight(IgnoreList.oculusOrbFocalPointX, AbstractArchive.oculusOrbFocalPointY, Player.Scene_plane); + var7 = GraphicsObject.getTileHeight(IgnoreList.oculusOrbFocalPointX, AbstractArchive.oculusOrbFocalPointY, Player.Client_plane); var8 = 0; if (var5 > 3 && var6 > 3 && var5 < 100 && var6 < 100) { for (var9 = var5 - 4; var9 <= var5 + 4; ++var9) { for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { - var11 = Player.Scene_plane; + var11 = Player.Client_plane; if (var11 < 3 && (Tiles.Tiles_renderFlags[1][var9][var10] & 2) == 2) { ++var11; } @@ -4393,7 +4393,7 @@ public final class Client extends GameShell implements Usernamed { field717 += (var9 - field717) / 80; } - Tiles.field497 = GraphicsObject.getTileHeight(class215.localPlayer.x, class215.localPlayer.y, Player.Scene_plane) - camFollowHeight; + Tiles.field497 = GraphicsObject.getTileHeight(class215.localPlayer.x, class215.localPlayer.y, Player.Client_plane) - camFollowHeight; } else if (oculusOrbState == 1) { FontName.method5443(); short var35 = -1; @@ -4697,7 +4697,7 @@ public final class Client extends GameShell implements Usernamed { } } - var1 = Player.Scene_plane; + var1 = Player.Client_plane; var2 = class215.localPlayer.x; var3 = class215.localPlayer.y; int var4 = field693; @@ -5263,15 +5263,15 @@ public final class Client extends GameShell implements Usernamed { for (var16 = SpriteMask.field2501; var16 < SpriteMask.field2501 + 8; ++var16) { for (var5 = GrandExchangeOffer.field61; var5 < GrandExchangeOffer.field61 + 8; ++var5) { - if (groundItems[Player.Scene_plane][var16][var5] != null) { - groundItems[Player.Scene_plane][var16][var5] = null; + if (groundItems[Player.Client_plane][var16][var5] != null) { + groundItems[Player.Client_plane][var16][var5] = null; class4.updateItemPile(var16, var5); } } } for (PendingSpawn var38 = (PendingSpawn)pendingSpawns.last(); var38 != null; var38 = (PendingSpawn)pendingSpawns.previous()) { - if (var38.x >= SpriteMask.field2501 && var38.x < SpriteMask.field2501 + 8 && var38.y >= GrandExchangeOffer.field61 && var38.y < GrandExchangeOffer.field61 + 8 && var38.plane == Player.Scene_plane) { + if (var38.x >= SpriteMask.field2501 && var38.x < SpriteMask.field2501 + 8 && var38.y >= GrandExchangeOffer.field61 && var38.y < GrandExchangeOffer.field61 + 8 && var38.plane == Player.Client_plane) { var38.hitpoints = 0; } } @@ -5602,7 +5602,7 @@ public final class Client extends GameShell implements Usernamed { if (SecureRandomCallable.field510 >= 100) { var16 = AbstractUserComparator.field3583 * 16384 + 64; var5 = class49.field401 * 128 + 64; - var6 = GraphicsObject.getTileHeight(var16, var5, Player.Scene_plane) - ViewportMouse.field1713; + var6 = GraphicsObject.getTileHeight(var16, var5, Player.Client_plane) - ViewportMouse.field1713; var7 = var16 - UrlRequester.cameraX; var8 = var6 - class16.cameraY; var19 = var5 - GrandExchangeOfferAgeComparator.cameraZ; @@ -5951,7 +5951,7 @@ public final class Client extends GameShell implements Usernamed { if (Interpreter.field1068 >= 100) { UrlRequester.cameraX = class14.field88 * 128 + 64; GrandExchangeOfferAgeComparator.cameraZ = class42.field360 * 128 + 64; - class16.cameraY = GraphicsObject.getTileHeight(UrlRequester.cameraX, GrandExchangeOfferAgeComparator.cameraZ, Player.Scene_plane) - WorldMapLabel.field231; + class16.cameraY = GraphicsObject.getTileHeight(UrlRequester.cameraX, GrandExchangeOfferAgeComparator.cameraZ, Player.Client_plane) - WorldMapLabel.field231; } var1.serverPacket = null; @@ -6292,7 +6292,7 @@ public final class Client extends GameShell implements Usernamed { @Export("openMenu") final void openMenu(int var1, int var2) { Decimator.calculateMenuBounds(var1, var2); - WorldMapArea.scene.menuOpen(Player.Scene_plane, var1, var2, false); + WorldMapArea.scene.menuOpen(Player.Client_plane, var1, var2, false); isMenuOpen = true; } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index a0a44d8393..4dd2bab7f9 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -820,7 +820,7 @@ public class ClientPacket implements class181 { var4.plane = (byte)(var7 + var4.plane & 3); if (Client.localPlayerIndex == var1) { - Player.Scene_plane = var4.Scene_plane; + Player.Client_plane = var4.Client_plane; } } else { @@ -846,7 +846,7 @@ public class ClientPacket implements class181 { var4.plane = (byte)(var7 + var4.plane & 3); if (Client.localPlayerIndex == var1) { - Player.Scene_plane = var4.plane; + Player.Client_plane = var4.plane; } } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index f18d926a37..04694b554c 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -227,7 +227,7 @@ public class DevicePcmPlayerProvider implements class99 { } else { int var5; if (var0 == ScriptOpcodes.COORD) { - var3 = Player.Scene_plane; + var3 = Player.Client_plane; var4 = UserComparator8.baseX * 64 + (class215.localPlayer.x >> 7); var5 = HealthBar.baseY * 64 + (class215.localPlayer.y >> 7); Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 7fb8fa602a..0d19a49f34 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -148,7 +148,7 @@ public class FontName { ) static final void method5442() { for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == Player.Scene_plane && !var0.isFinished) { + if (var0.plane == Player.Client_plane && !var0.isFinished) { if (Client.cycle >= var0.cycleStart) { var0.advance(Client.field693); if (var0.isFinished) { @@ -178,7 +178,7 @@ public class FontName { } IgnoreList.oculusOrbFocalPointX = class215.localPlayer.x; - int var2 = GraphicsObject.getTileHeight(class215.localPlayer.x, class215.localPlayer.y, Player.Scene_plane) - Client.camFollowHeight; + int var2 = GraphicsObject.getTileHeight(class215.localPlayer.x, class215.localPlayer.y, Player.Client_plane) - Client.camFollowHeight; if (var2 < Tiles.field497) { Tiles.field497 = var2; } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 866a238575..8bce6cd693 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -126,7 +126,7 @@ final class GrandExchangeOfferNameComparator implements Comparator { class247.cameraPitch = var3; WorldMapData_1.cameraYaw = var4; if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (IgnoreList.oculusOrbFocalPointX >> 7 != class215.localPlayer.x >> 7 || AbstractArchive.oculusOrbFocalPointY >> 7 != class215.localPlayer.y >> 7)) { - var12 = class215.localPlayer.Scene_plane; + var12 = class215.localPlayer.Client_plane; var13 = UserComparator8.baseX * 64 + (IgnoreList.oculusOrbFocalPointX >> 7); var14 = HealthBar.baseY * 64 + (AbstractArchive.oculusOrbFocalPointY >> 7); PacketBufferNode var15 = SoundSystem.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); @@ -190,7 +190,7 @@ final class GrandExchangeOfferNameComparator implements Comparator { var14 = var14; int var26 = Username.ViewportMouse_unpackX(var8); int var16 = ScriptEvent.method1272(var8); - if (var26 == 2 && WorldMapArea.scene.getObjectFlags(Player.Scene_plane, var24, var14, var9) >= 0) { + if (var26 == 2 && WorldMapArea.scene.getObjectFlags(Player.Client_plane, var24, var14, var9) >= 0) { ObjectDefinition var17 = WorldMapDecorationType.getObjectDefinition(var16); if (var17.transforms != null) { var17 = var17.transform(); @@ -307,7 +307,7 @@ final class GrandExchangeOfferNameComparator implements Comparator { } if (var26 == 3) { - NodeDeque var33 = Client.groundItems[Player.Scene_plane][var24][var14]; + NodeDeque var33 = Client.groundItems[Player.Client_plane][var24][var14]; if (var33 != null) { for (TileItem var37 = (TileItem)var33.first(); var37 != null; var37 = (TileItem)var33.next()) { ItemDefinition var35 = class222.ItemDefinition_get(var37.id); diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index f9da6f17da..a23b30e93f 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -423,7 +423,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { if (Client.isMenuOpen) { WorldMapArea.scene.setViewportWalking(); } else { - WorldMapArea.scene.menuOpen(Player.Scene_plane, var0, var1, true); + WorldMapArea.scene.menuOpen(Player.Client_plane, var0, var1, true); } } else { PacketBufferNode var11; diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 93fd448737..82277e3454 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -47,7 +47,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { @Export("addPendingSpawnToScene") static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != Player.Scene_plane) { + if (Client.isLowDetail && var0 != Player.Client_plane) { return; } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index bbf1f8a5ab..0debb0a49b 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -60,7 +60,7 @@ public class JagexCache { ) static void method3624() { if (Login.worldMap != null) { - Login.worldMap.method6437(Player.Scene_plane, UserComparator8.baseX * 64 + (class215.localPlayer.x >> 7), HealthBar.baseY * 64 + (class215.localPlayer.y >> 7), false); + Login.worldMap.method6437(Player.Client_plane, UserComparator8.baseX * 64 + (class215.localPlayer.x >> 7), HealthBar.baseY * 64 + (class215.localPlayer.y >> 7), false); Login.worldMap.loadCache(); } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 27c72765b8..a03058a45d 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -169,7 +169,7 @@ public class Language implements Enumerated { ) static void method3810(int var0, Coord var1, boolean var2) { WorldMapArea var3 = UserComparator4.getWorldMap().getMapArea(var0); - int var4 = class215.localPlayer.Scene_plane; + int var4 = class215.localPlayer.Client_plane; int var5 = UserComparator8.baseX * 64 + (class215.localPlayer.x >> 7); int var6 = HealthBar.baseY * 64 + (class215.localPlayer.y >> 7); Coord var7 = new Coord(var4, var5, var6); diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 8d8c1c4003..d2053d0fff 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -349,7 +349,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi ) static final void method1172() { for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { - if (var0.plane == Player.Scene_plane && Client.cycle <= var0.cycleEnd) { + if (var0.plane == Player.Client_plane && Client.cycle <= var0.cycleEnd) { if (Client.cycle >= var0.cycleStart) { if (var0.targetIndex > 0) { NPC var1 = Client.npcs[var0.targetIndex - 1]; @@ -373,7 +373,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } var0.advance(Client.field693); - WorldMapArea.scene.drawEntity(Player.Scene_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); + WorldMapArea.scene.drawEntity(Player.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); } } else { var0.remove(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index a01f45b714..92d20e8128 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -11,8 +11,8 @@ public final class Player extends Actor { @ObfuscatedGetter( intValue = 302709599 ) - @Export("Scene_plane") - static int Scene_plane; + @Export("Client_plane") + static int Client_plane; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lju;" @@ -458,7 +458,7 @@ public final class Player extends Actor { int var6 = super.pathY[0]; int var7 = this.transformedSize(); if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { - int var8 = Message.method1311(var5, var6, this.transformedSize(), WorldMapCacheName.method685(var1, var2), Client.collisionMaps[this.Scene_plane], true, Client.field890, Client.field906); + int var8 = Message.method1311(var5, var6, this.transformedSize(), WorldMapCacheName.method685(var1, var2), Client.collisionMaps[this.Client_plane], true, Client.field890, Client.field906); if (var8 >= 1) { for (int var9 = 0; var9 < var8 - 1; ++var9) { var4.method1352(Client.field890[var9], Client.field906[var9], (byte)2); @@ -544,9 +544,9 @@ public final class Player extends Actor { long var4 = class160.calculateTag(0, 0, 0, false, var0.index); if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { var0.isUnanimated = false; - var0.tileHeight = GraphicsObject.getTileHeight(var0.x, var0.y, Scene_plane); + var0.tileHeight = GraphicsObject.getTileHeight(var0.x, var0.y, Client_plane); var0.playerCycle = Client.cycle; - WorldMapArea.scene.addNullableObject(Scene_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field595, var0.field611, var0.field612, var0.field604); + WorldMapArea.scene.addNullableObject(Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field595, var0.field611, var0.field612, var0.field604); } else { if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { @@ -556,9 +556,9 @@ public final class Player extends Actor { Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; } - var0.tileHeight = GraphicsObject.getTileHeight(var0.x, var0.y, Scene_plane); + var0.tileHeight = GraphicsObject.getTileHeight(var0.x, var0.y, Client_plane); var0.playerCycle = Client.cycle; - WorldMapArea.scene.drawEntity(Scene_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + WorldMapArea.scene.drawEntity(Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); } } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 40c2aa6117..c6b300d066 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -88,7 +88,7 @@ public class Script extends DualNode { static final void method2383() { int var0 = class14.field88 * 128 + 64; int var1 = class42.field360 * 128 + 64; - int var2 = GraphicsObject.getTileHeight(var0, var1, Player.Scene_plane) - WorldMapLabel.field231; + int var2 = GraphicsObject.getTileHeight(var0, var1, Player.Client_plane) - WorldMapLabel.field231; if (UrlRequester.cameraX < var0) { UrlRequester.cameraX = (var0 - UrlRequester.cameraX) * Interpreter.field1068 / 1000 + UrlRequester.cameraX + WorldMapAreaData.field323; if (UrlRequester.cameraX > var0) { @@ -133,7 +133,7 @@ public class Script extends DualNode { var0 = AbstractUserComparator.field3583 * 16384 + 64; var1 = class49.field401 * 128 + 64; - var2 = GraphicsObject.getTileHeight(var0, var1, Player.Scene_plane) - ViewportMouse.field1713; + var2 = GraphicsObject.getTileHeight(var0, var1, Player.Client_plane) - ViewportMouse.field1713; int var3 = var0 - UrlRequester.cameraX; int var4 = var2 - class16.cameraY; int var5 = var1 - GrandExchangeOfferAgeComparator.cameraZ; diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 3cc3deab95..a86f6325fe 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -289,9 +289,9 @@ public class ScriptFrame { garbageValue = "256" ) static final void method1219() { - if (Player.Scene_plane != Client.field856) { - Client.field856 = Player.Scene_plane; - int var0 = Player.Scene_plane; + if (Player.Client_plane != Client.field856) { + Client.field856 = Player.Client_plane; + int var0 = Player.Client_plane; int[] var1 = FloorDecoration.sceneMinimapSprite.pixels; int var2 = var1.length; @@ -339,7 +339,7 @@ public class ScriptFrame { for (var5 = 0; var5 < 104; ++var5) { for (var6 = 0; var6 < 104; ++var6) { - long var7 = WorldMapArea.scene.getFloorDecorationTag(Player.Scene_plane, var5, var6); + long var7 = WorldMapArea.scene.getFloorDecorationTag(Player.Client_plane, var5, var6); if (0L != var7) { int var9 = UserComparator8.Entity_unpackID(var7); int var10 = WorldMapDecorationType.getObjectDefinition(var9).mapIconId; diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index c4daf66798..9db0cfef6c 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -185,7 +185,7 @@ public final class WallDecoration { int var14; if (!Client.isCameraLocked) { if (ScriptEvent.clientPreferences.roofsHidden) { - var5 = Player.Scene_plane; + var5 = Player.Client_plane; } else { label525: { var6 = 3; @@ -201,17 +201,17 @@ public final class WallDecoration { var9 = UrlRequester.cameraX >> 7; var10 = GrandExchangeOfferAgeComparator.cameraZ >> 7; if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) { - var5 = Player.Scene_plane; + var5 = Player.Client_plane; break label525; } if (var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) { - var5 = Player.Scene_plane; + var5 = Player.Client_plane; break label525; } - if ((Tiles.Tiles_renderFlags[Player.Scene_plane][var9][var10] & 4) != 0) { - var6 = Player.Scene_plane; + if ((Tiles.Tiles_renderFlags[Player.Client_plane][var9][var10] & 4) != 0) { + var6 = Player.Client_plane; } if (var7 > var9) { @@ -237,8 +237,8 @@ public final class WallDecoration { --var9; } - if ((Tiles.Tiles_renderFlags[Player.Scene_plane][var9][var10] & 4) != 0) { - var6 = Player.Scene_plane; + if ((Tiles.Tiles_renderFlags[Player.Client_plane][var9][var10] & 4) != 0) { + var6 = Player.Client_plane; } var14 += var13; @@ -250,8 +250,8 @@ public final class WallDecoration { --var10; } - if ((Tiles.Tiles_renderFlags[Player.Scene_plane][var9][var10] & 4) != 0) { - var6 = Player.Scene_plane; + if ((Tiles.Tiles_renderFlags[Player.Client_plane][var9][var10] & 4) != 0) { + var6 = Player.Client_plane; } } } @@ -266,8 +266,8 @@ public final class WallDecoration { --var10; } - if ((Tiles.Tiles_renderFlags[Player.Scene_plane][var9][var10] & 4) != 0) { - var6 = Player.Scene_plane; + if ((Tiles.Tiles_renderFlags[Player.Client_plane][var9][var10] & 4) != 0) { + var6 = Player.Client_plane; } var14 += var13; @@ -279,8 +279,8 @@ public final class WallDecoration { --var9; } - if ((Tiles.Tiles_renderFlags[Player.Scene_plane][var9][var10] & 4) != 0) { - var6 = Player.Scene_plane; + if ((Tiles.Tiles_renderFlags[Player.Client_plane][var9][var10] & 4) != 0) { + var6 = Player.Client_plane; } } } @@ -288,13 +288,13 @@ public final class WallDecoration { } if (class215.localPlayer.x >= 0 && class215.localPlayer.y >= 0 && class215.localPlayer.x < 13312 && class215.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[Player.Scene_plane][class215.localPlayer.x >> 7][class215.localPlayer.y >> 7] & 4) != 0) { - var6 = Player.Scene_plane; + if ((Tiles.Tiles_renderFlags[Player.Client_plane][class215.localPlayer.x >> 7][class215.localPlayer.y >> 7] & 4) != 0) { + var6 = Player.Client_plane; } var5 = var6; } else { - var5 = Player.Scene_plane; + var5 = Player.Client_plane; } } } @@ -302,11 +302,11 @@ public final class WallDecoration { var4 = var5; } else { if (ScriptEvent.clientPreferences.roofsHidden) { - var5 = Player.Scene_plane; + var5 = Player.Client_plane; } else { - var6 = GraphicsObject.getTileHeight(UrlRequester.cameraX, GrandExchangeOfferAgeComparator.cameraZ, Player.Scene_plane); - if (var6 - class16.cameraY < 800 && (Tiles.Tiles_renderFlags[Player.Scene_plane][UrlRequester.cameraX >> 7][GrandExchangeOfferAgeComparator.cameraZ >> 7] & 4) != 0) { - var5 = Player.Scene_plane; + var6 = GraphicsObject.getTileHeight(UrlRequester.cameraX, GrandExchangeOfferAgeComparator.cameraZ, Player.Client_plane); + if (var6 - class16.cameraY < 800 && (Tiles.Tiles_renderFlags[Player.Client_plane][UrlRequester.cameraX >> 7][GrandExchangeOfferAgeComparator.cameraZ >> 7] & 4) != 0) { + var5 = Player.Client_plane; } else { var5 = 3; } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 5ddb4abaaf..5fac25787b 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -141,7 +141,7 @@ public class WorldMapCacheName { @Export("worldToScreen") static final void worldToScreen(int var0, int var1, int var2) { if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = GraphicsObject.getTileHeight(var0, var1, Player.Scene_plane) - var2; + int var3 = GraphicsObject.getTileHeight(var0, var1, Player.Client_plane) - var2; var0 -= UrlRequester.cameraX; var3 -= class16.cameraY; var1 -= GrandExchangeOfferAgeComparator.cameraZ; diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 442099a392..eb83273041 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -146,52 +146,52 @@ public final class WorldMapSprite { var37 = Client.field692[var7]; if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) { if (var37 == 0) { - BoundaryObject var10 = WorldMapArea.scene.method3225(Player.Scene_plane, var4, var5); + BoundaryObject var10 = WorldMapArea.scene.method3225(Player.Client_plane, var4, var5); if (var10 != null) { var11 = UserComparator8.Entity_unpackID(var10.tag); if (var7 == 2) { - var10.entity1 = new DynamicObject(var11, 2, var8 + 4, Player.Scene_plane, var4, var5, var2, false, var10.entity1); - var10.entity2 = new DynamicObject(var11, 2, var8 + 1 & 3, Player.Scene_plane, var4, var5, var2, false, var10.entity2); + var10.entity1 = new DynamicObject(var11, 2, var8 + 4, Player.Client_plane, var4, var5, var2, false, var10.entity1); + var10.entity2 = new DynamicObject(var11, 2, var8 + 1 & 3, Player.Client_plane, var4, var5, var2, false, var10.entity2); } else { - var10.entity1 = new DynamicObject(var11, var7, var8, Player.Scene_plane, var4, var5, var2, false, var10.entity1); + var10.entity1 = new DynamicObject(var11, var7, var8, Player.Client_plane, var4, var5, var2, false, var10.entity1); } } } if (var37 == 1) { - WallDecoration var38 = WorldMapArea.scene.method3339(Player.Scene_plane, var4, var5); + WallDecoration var38 = WorldMapArea.scene.method3339(Player.Client_plane, var4, var5); if (var38 != null) { var11 = UserComparator8.Entity_unpackID(var38.tag); if (var7 != 4 && var7 != 5) { if (var7 == 6) { - var38.entity1 = new DynamicObject(var11, 4, var8 + 4, Player.Scene_plane, var4, var5, var2, false, var38.entity1); + var38.entity1 = new DynamicObject(var11, 4, var8 + 4, Player.Client_plane, var4, var5, var2, false, var38.entity1); } else if (var7 == 7) { - var38.entity1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, Player.Scene_plane, var4, var5, var2, false, var38.entity1); + var38.entity1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, Player.Client_plane, var4, var5, var2, false, var38.entity1); } else if (var7 == 8) { - var38.entity1 = new DynamicObject(var11, 4, var8 + 4, Player.Scene_plane, var4, var5, var2, false, var38.entity1); - var38.entity2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, Player.Scene_plane, var4, var5, var2, false, var38.entity2); + var38.entity1 = new DynamicObject(var11, 4, var8 + 4, Player.Client_plane, var4, var5, var2, false, var38.entity1); + var38.entity2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, Player.Client_plane, var4, var5, var2, false, var38.entity2); } } else { - var38.entity1 = new DynamicObject(var11, 4, var8, Player.Scene_plane, var4, var5, var2, false, var38.entity1); + var38.entity1 = new DynamicObject(var11, 4, var8, Player.Client_plane, var4, var5, var2, false, var38.entity1); } } } if (var37 == 2) { - GameObject var39 = WorldMapArea.scene.method3227(Player.Scene_plane, var4, var5); + GameObject var39 = WorldMapArea.scene.method3227(Player.Client_plane, var4, var5); if (var7 == 11) { var7 = 10; } if (var39 != null) { - var39.entity = new DynamicObject(UserComparator8.Entity_unpackID(var39.tag), var7, var8, Player.Scene_plane, var4, var5, var2, false, var39.entity); + var39.entity = new DynamicObject(UserComparator8.Entity_unpackID(var39.tag), var7, var8, Player.Client_plane, var4, var5, var2, false, var39.entity); } } if (var37 == 3) { - FloorDecoration var40 = WorldMapArea.scene.getFloorDecoration(Player.Scene_plane, var4, var5); + FloorDecoration var40 = WorldMapArea.scene.getFloorDecoration(Player.Client_plane, var4, var5); if (var40 != null) { - var40.entity = new DynamicObject(UserComparator8.Entity_unpackID(var40.tag), 22, var8, Player.Scene_plane, var4, var5, var2, false, var40.entity); + var40.entity = new DynamicObject(UserComparator8.Entity_unpackID(var40.tag), 22, var8, Player.Client_plane, var4, var5, var2, false, var40.entity); } } } @@ -206,7 +206,7 @@ public final class WorldMapSprite { if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { var6 = var6 * 128 + 64; var7 = var7 * 128 + 64; - GraphicsObject var44 = new GraphicsObject(var4, Player.Scene_plane, var6, var7, GraphicsObject.getTileHeight(var6, var7, Player.Scene_plane) - var2, var3, Client.cycle); + GraphicsObject var44 = new GraphicsObject(var4, Player.Client_plane, var6, var7, GraphicsObject.getTileHeight(var6, var7, Player.Client_plane) - var2, var3, Client.cycle); Client.graphicsObjects.addFirst(var44); } @@ -235,8 +235,8 @@ public final class WorldMapSprite { var8 = var8 * 128 + 64; var11 = var11 * 128 + 64; var12 = var12 * 128 + 64; - Projectile var15 = new Projectile(var5, Player.Scene_plane, var7, var8, GraphicsObject.getTileHeight(var7, var8, Player.Scene_plane) - var4, var32 + Client.cycle, var43 + Client.cycle, var13, var3, var2, var37); - var15.setDestination(var11, var12, GraphicsObject.getTileHeight(var11, var12, Player.Scene_plane) - var37, var32 + Client.cycle); + Projectile var15 = new Projectile(var5, Player.Client_plane, var7, var8, GraphicsObject.getTileHeight(var7, var8, Player.Client_plane) - var4, var32 + Client.cycle, var43 + Client.cycle, var13, var3, var2, var37); + var15.setDestination(var11, var12, GraphicsObject.getTileHeight(var11, var12, Player.Client_plane) - var37, var32 + Client.cycle); Client.projectiles.addFirst(var15); } @@ -252,11 +252,11 @@ public final class WorldMapSprite { var33 = new TileItem(); var33.id = var3; var33.quantity = var2; - if (Client.groundItems[Player.Scene_plane][var5][var6] == null) { - Client.groundItems[Player.Scene_plane][var5][var6] = new NodeDeque(); + if (Client.groundItems[Player.Client_plane][var5][var6] == null) { + Client.groundItems[Player.Client_plane][var5][var6] = new NodeDeque(); } - Client.groundItems[Player.Scene_plane][var5][var6].addFirst(var33); + Client.groundItems[Player.Client_plane][var5][var6].addFirst(var33); class4.updateItemPile(var5, var6); } @@ -300,13 +300,13 @@ public final class WorldMapSprite { int var22 = var11 + (var19 + 1 >> 1); int var23 = var12 + (var20 >> 1); int var24 = var12 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[Player.Scene_plane]; + int[][] var25 = Tiles.Tiles_heights[Player.Client_plane]; int var26 = var25[var22][var24] + var25[var21][var24] + var25[var22][var23] + var25[var21][var23] >> 2; int var27 = (var11 << 7) + (var19 << 6); int var28 = (var12 << 7) + (var20 << 6); Model var29 = var18.getModel(var5, var6, var25, var27, var26, var28); if (var29 != null) { - GrandExchangeOfferWorldComparator.updatePendingSpawn(Player.Scene_plane, var11, var12, var7, -1, 0, 0, var2 + 1, var8 + 1); + GrandExchangeOfferWorldComparator.updatePendingSpawn(Player.Client_plane, var11, var12, var7, -1, 0, 0, var2 + 1, var8 + 1); var17.animationCycleStart = var2 + Client.cycle; var17.animationCycleEnd = var8 + Client.cycle; var17.model0 = var29; @@ -343,7 +343,7 @@ public final class WorldMapSprite { var7 = (var6 >> 4 & 7) + SpriteMask.field2501; var8 = (var6 & 7) + GrandExchangeOffer.field61; if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - GrandExchangeOfferWorldComparator.updatePendingSpawn(Player.Scene_plane, var7, var8, var5, -1, var3, var4, 0, -1); + GrandExchangeOfferWorldComparator.updatePendingSpawn(Player.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); } } else if (class185.field2296 == var0) { @@ -356,7 +356,7 @@ public final class WorldMapSprite { var8 = var6 & 3; var37 = Client.field692[var7]; if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - GrandExchangeOfferWorldComparator.updatePendingSpawn(Player.Scene_plane, var3, var4, var37, var5, var7, var8, 0, -1); + GrandExchangeOfferWorldComparator.updatePendingSpawn(Player.Client_plane, var3, var4, var37, var5, var7, var8, 0, -1); } } else if (class185.field2297 == var0) { @@ -367,7 +367,7 @@ public final class WorldMapSprite { var6 = (var4 & 7) + GrandExchangeOffer.field61; var7 = var1.method5647(); if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - NodeDeque var31 = Client.groundItems[Player.Scene_plane][var5][var6]; + NodeDeque var31 = Client.groundItems[Player.Client_plane][var5][var6]; if (var31 != null) { for (TileItem var35 = (TileItem)var31.last(); var35 != null; var35 = (TileItem)var31.previous()) { if ((var2 & 32767) == var35.id && var7 == var35.quantity) { @@ -409,7 +409,7 @@ public final class WorldMapSprite { var4 = (var3 >> 4 & 7) + SpriteMask.field2501; var5 = (var3 & 7) + GrandExchangeOffer.field61; if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - NodeDeque var36 = Client.groundItems[Player.Scene_plane][var4][var5]; + NodeDeque var36 = Client.groundItems[Player.Client_plane][var4][var5]; if (var36 != null) { for (var33 = (TileItem)var36.last(); var33 != null; var33 = (TileItem)var36.previous()) { if ((var2 & 32767) == var33.id) { @@ -419,7 +419,7 @@ public final class WorldMapSprite { } if (var36.last() == null) { - Client.groundItems[Player.Scene_plane][var4][var5] = null; + Client.groundItems[Player.Client_plane][var4][var5] = null; } class4.updateItemPile(var4, var5); diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 88e3945ff0..4f708e4a22 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -383,9 +383,9 @@ final class class4 implements class0 { ) @Export("updateItemPile") static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[Player.Scene_plane][var0][var1]; + NodeDeque var2 = Client.groundItems[Player.Client_plane][var0][var1]; if (var2 == null) { - WorldMapArea.scene.removeGroundItemPile(Player.Scene_plane, var0, var1); + WorldMapArea.scene.removeGroundItemPile(Player.Client_plane, var0, var1); } else { long var3 = -99999999L; TileItem var5 = null; @@ -405,7 +405,7 @@ final class class4 implements class0 { } if (var5 == null) { - WorldMapArea.scene.removeGroundItemPile(Player.Scene_plane, var0, var1); + WorldMapArea.scene.removeGroundItemPile(Player.Client_plane, var0, var1); } else { var2.addLast(var5); TileItem var12 = null; @@ -424,7 +424,7 @@ final class class4 implements class0 { } long var9 = class160.calculateTag(var0, var1, 3, false, 0); - WorldMapArea.scene.newGroundItemPile(Player.Scene_plane, var0, var1, GraphicsObject.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, Player.Scene_plane), var5, var9, var12, var11); + WorldMapArea.scene.newGroundItemPile(Player.Client_plane, var0, var1, GraphicsObject.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, Player.Client_plane), var5, var9, var12, var11); } } } @@ -646,7 +646,7 @@ final class class4 implements class0 { int var12; for (var8 = 0; var8 < 104; ++var8) { for (var9 = 0; var9 < 104; ++var9) { - NodeDeque var15 = Client.groundItems[Player.Scene_plane][var8][var9]; + NodeDeque var15 = Client.groundItems[Player.Client_plane][var8][var9]; if (var15 != null) { var11 = var8 * 4 + 2 - class215.localPlayer.x / 32; var12 = var9 * 4 + 2 - class215.localPlayer.y / 32; diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 1157817db6..2e0920fda5 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -944,7 +944,7 @@ public class class40 { long var5 = class160.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); var2.playerCycle = Client.cycle; - WorldMapArea.scene.drawEntity(Player.Scene_plane, var2.x, var2.y, GraphicsObject.getTileHeight(var2.field927 * 64 - 64 + var2.x, var2.field927 * 64 - 64 + var2.y, Player.Scene_plane), var2.field927 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + WorldMapArea.scene.drawEntity(Player.Client_plane, var2.x, var2.y, GraphicsObject.getTileHeight(var2.field927 * 64 - 64 + var2.x, var2.field927 * 64 - 64 + var2.y, Player.Client_plane), var2.field927 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); } } } diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java index 10eb71b83d..1f412b9e33 100644 --- a/runescape-client/src/main/java/class43.java +++ b/runescape-client/src/main/java/class43.java @@ -92,7 +92,7 @@ public final class class43 { static int method877(int var0, Script var1, boolean var2) { int var3; if (var0 == 6600) { - var3 = Player.Scene_plane; + var3 = Player.Client_plane; int var9 = UserComparator8.baseX * 64 + (class215.localPlayer.x >> 7); int var5 = HealthBar.baseY * 64 + (class215.localPlayer.y >> 7); UserComparator4.getWorldMap().method6437(var3, var9, var5, true);