From ba4debb0d3b3da281d24c96955341228e22299c2 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Mon, 16 May 2022 01:13:34 -0400 Subject: [PATCH] Moved around more static methods, nothing final Some of these are "incorrect" - I wanted to decrease the # of static classes first by grouping them if they're slightly related. Then I'll do a second pass in each class to reorganize later. --- client/src/main/java/rt4/Camera.java | 73 ++- client/src/main/java/rt4/ClientProt.java | 91 +-- client/src/main/java/rt4/Component.java | 34 +- .../rt4/{Static255.java => DeadClass.java} | 4 +- client/src/main/java/rt4/DisplayMode.java | 10 +- client/src/main/java/rt4/FogManager.java | 8 + client/src/main/java/rt4/Font.java | 7 +- client/src/main/java/rt4/Fonts.java | 6 +- client/src/main/java/rt4/GameShell.java | 45 ++ client/src/main/java/rt4/GlModel.java | 4 +- client/src/main/java/rt4/JagString.java | 54 +- client/src/main/java/rt4/Light.java | 7 +- client/src/main/java/rt4/LoginManager.java | 292 ++++++++- client/src/main/java/rt4/MiniMap.java | 40 +- client/src/main/java/rt4/MiniMenu.java | 40 +- client/src/main/java/rt4/Model.java | 4 +- client/src/main/java/rt4/Mouse.java | 4 +- client/src/main/java/rt4/MsiType.java | 2 +- client/src/main/java/rt4/Npc.java | 4 +- client/src/main/java/rt4/PathingEntity.java | 12 +- client/src/main/java/rt4/Player.java | 4 +- .../src/main/java/rt4/PlayerAppearance.java | 22 +- client/src/main/java/rt4/Protocol.java | 158 ++--- client/src/main/java/rt4/SceneGraph.java | 225 +++++++ client/src/main/java/rt4/ScriptRunner.java | 20 +- .../src/main/java/rt4/SoftLruHashTable.java | 13 +- client/src/main/java/rt4/SoftwareModel.java | 4 +- client/src/main/java/rt4/SpriteLoader.java | 24 +- client/src/main/java/rt4/Static1.java | 86 +-- client/src/main/java/rt4/Static102.java | 10 - client/src/main/java/rt4/Static103.java | 2 - client/src/main/java/rt4/Static104.java | 43 -- client/src/main/java/rt4/Static110.java | 2 +- client/src/main/java/rt4/Static112.java | 23 +- client/src/main/java/rt4/Static115.java | 3 - client/src/main/java/rt4/Static12.java | 3 - client/src/main/java/rt4/Static123.java | 44 +- client/src/main/java/rt4/Static126.java | 3 - client/src/main/java/rt4/Static127.java | 322 ++++----- client/src/main/java/rt4/Static128.java | 5 - client/src/main/java/rt4/Static130.java | 3 - client/src/main/java/rt4/Static131.java | 3 - client/src/main/java/rt4/Static132.java | 11 +- client/src/main/java/rt4/Static136.java | 5 +- client/src/main/java/rt4/Static137.java | 16 - client/src/main/java/rt4/Static145.java | 8 +- client/src/main/java/rt4/Static147.java | 2 +- client/src/main/java/rt4/Static152.java | 121 +++- client/src/main/java/rt4/Static154.java | 2 +- client/src/main/java/rt4/Static156.java | 31 +- client/src/main/java/rt4/Static158.java | 21 +- client/src/main/java/rt4/Static164.java | 10 - client/src/main/java/rt4/Static165.java | 3 - client/src/main/java/rt4/Static167.java | 3 - client/src/main/java/rt4/Static170.java | 51 -- client/src/main/java/rt4/Static172.java | 3 - client/src/main/java/rt4/Static173.java | 117 +--- client/src/main/java/rt4/Static174.java | 26 - client/src/main/java/rt4/Static175.java | 7 +- client/src/main/java/rt4/Static176.java | 8 +- client/src/main/java/rt4/Static179.java | 6 - client/src/main/java/rt4/Static182.java | 3 - client/src/main/java/rt4/Static184.java | 2 +- client/src/main/java/rt4/Static185.java | 12 +- client/src/main/java/rt4/Static186.java | 5 +- client/src/main/java/rt4/Static19.java | 5 +- client/src/main/java/rt4/Static191.java | 5 +- client/src/main/java/rt4/Static195.java | 31 - client/src/main/java/rt4/Static202.java | 3 - client/src/main/java/rt4/Static203.java | 56 -- client/src/main/java/rt4/Static210.java | 10 - client/src/main/java/rt4/Static211.java | 25 - client/src/main/java/rt4/Static220.java | 2 +- client/src/main/java/rt4/Static221.java | 16 +- client/src/main/java/rt4/Static226.java | 4 +- client/src/main/java/rt4/Static228.java | 14 +- client/src/main/java/rt4/Static229.java | 12 - client/src/main/java/rt4/Static231.java | 127 +--- client/src/main/java/rt4/Static232.java | 5 +- client/src/main/java/rt4/Static233.java | 8 +- client/src/main/java/rt4/Static235.java | 3 - client/src/main/java/rt4/Static238.java | 5 +- client/src/main/java/rt4/Static24.java | 4 - client/src/main/java/rt4/Static245.java | 13 +- client/src/main/java/rt4/Static246.java | 18 - client/src/main/java/rt4/Static247.java | 38 +- client/src/main/java/rt4/Static248.java | 31 +- client/src/main/java/rt4/Static249.java | 21 - client/src/main/java/rt4/Static250.java | 31 - client/src/main/java/rt4/Static251.java | 3 - client/src/main/java/rt4/Static252.java | 4 +- client/src/main/java/rt4/Static253.java | 375 ++++++++++- client/src/main/java/rt4/Static254.java | 11 +- client/src/main/java/rt4/Static258.java | 8 - client/src/main/java/rt4/Static259.java | 10 - client/src/main/java/rt4/Static26.java | 10 +- client/src/main/java/rt4/Static262.java | 38 -- client/src/main/java/rt4/Static263.java | 5 +- client/src/main/java/rt4/Static265.java | 5 +- client/src/main/java/rt4/Static269.java | 12 +- client/src/main/java/rt4/Static270.java | 105 --- client/src/main/java/rt4/Static271.java | 24 - client/src/main/java/rt4/Static272.java | 22 - client/src/main/java/rt4/Static273.java | 152 ----- client/src/main/java/rt4/Static276.java | 38 -- client/src/main/java/rt4/Static277.java | 36 - client/src/main/java/rt4/Static278.java | 152 ----- client/src/main/java/rt4/Static28.java | 10 +- client/src/main/java/rt4/Static280.java | 617 ------------------ client/src/main/java/rt4/Static31.java | 4 +- client/src/main/java/rt4/Static35.java | 5 +- client/src/main/java/rt4/Static36.java | 24 +- client/src/main/java/rt4/Static38.java | 139 ---- client/src/main/java/rt4/Static40.java | 2 +- client/src/main/java/rt4/Static41.java | 10 - client/src/main/java/rt4/Static44.java | 2 +- client/src/main/java/rt4/Static45.java | 24 +- client/src/main/java/rt4/Static49.java | 2 +- client/src/main/java/rt4/Static52.java | 2 - client/src/main/java/rt4/Static59.java | 9 +- client/src/main/java/rt4/Static69.java | 2 +- client/src/main/java/rt4/Static7.java | 2 +- client/src/main/java/rt4/Static72.java | 5 +- client/src/main/java/rt4/Static73.java | 4 +- client/src/main/java/rt4/Static74.java | 292 +++++++-- client/src/main/java/rt4/Static79.java | 2 +- client/src/main/java/rt4/Static80.java | 5 +- client/src/main/java/rt4/Static82.java | 3 - client/src/main/java/rt4/Static83.java | 11 - client/src/main/java/rt4/Static84.java | 19 - client/src/main/java/rt4/Static85.java | 21 - client/src/main/java/rt4/Static86.java | 13 - client/src/main/java/rt4/Static87.java | 78 ++- client/src/main/java/rt4/Static89.java | 10 +- client/src/main/java/rt4/Static90.java | 10 - client/src/main/java/rt4/Static92.java | 66 -- client/src/main/java/rt4/Static96.java | 5 +- client/src/main/java/rt4/Static97.java | 2 +- client/src/main/java/rt4/Static99.java | 5 +- client/src/main/java/rt4/StringUtils.java | 43 ++ client/src/main/java/rt4/SynthFilter.java | 38 +- client/src/main/java/rt4/SynthInstrument.java | 16 +- client/src/main/java/rt4/TextureOp29.java | 2 +- .../src/main/java/rt4/TextureOp29SubOp2.java | 5 + client/src/main/java/rt4/TextureOpSprite.java | 2 +- .../java/rt4/UnderwaterMaterialRenderer.java | 6 +- client/src/main/java/rt4/VarpDomain.java | 34 + client/src/main/java/rt4/WorldMap.java | 492 +++++++++++++- client/src/main/java/rt4/client.java | 61 +- .../java/com/itspazaz/rt4/Playground.java | 2 +- 150 files changed, 2805 insertions(+), 3034 deletions(-) rename client/src/main/java/rt4/{Static255.java => DeadClass.java} (80%) delete mode 100644 client/src/main/java/rt4/Static102.java delete mode 100644 client/src/main/java/rt4/Static104.java delete mode 100644 client/src/main/java/rt4/Static137.java delete mode 100644 client/src/main/java/rt4/Static170.java delete mode 100644 client/src/main/java/rt4/Static174.java delete mode 100644 client/src/main/java/rt4/Static203.java delete mode 100644 client/src/main/java/rt4/Static249.java delete mode 100644 client/src/main/java/rt4/Static259.java delete mode 100644 client/src/main/java/rt4/Static262.java delete mode 100644 client/src/main/java/rt4/Static271.java delete mode 100644 client/src/main/java/rt4/Static272.java delete mode 100644 client/src/main/java/rt4/Static273.java delete mode 100644 client/src/main/java/rt4/Static276.java delete mode 100644 client/src/main/java/rt4/Static277.java delete mode 100644 client/src/main/java/rt4/Static278.java delete mode 100644 client/src/main/java/rt4/Static41.java delete mode 100644 client/src/main/java/rt4/Static86.java delete mode 100644 client/src/main/java/rt4/Static90.java delete mode 100644 client/src/main/java/rt4/Static92.java create mode 100644 client/src/main/java/rt4/StringUtils.java diff --git a/client/src/main/java/rt4/Camera.java b/client/src/main/java/rt4/Camera.java index 43d8861..1477bf7 100644 --- a/client/src/main/java/rt4/Camera.java +++ b/client/src/main/java/rt4/Camera.java @@ -9,6 +9,10 @@ public class Camera { public static final int[][][] anIntArrayArrayArray9 = new int[2][][]; @OriginalMember(owner = "client!sa", name = "Q", descriptor = "[I") public static final int[] cameraJitter = new int[5]; + @OriginalMember(owner = "client!wh", name = "m", descriptor = "[I") + public static final int[] cameraAmplitude = new int[5]; + @OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I") + public static final int[] cameraFrequency = new int[5]; @OriginalMember(owner = "client!fl", name = "s", descriptor = "I") public static double pitchTarget = 128; @@ -52,6 +56,14 @@ public class Camera { public static int renderX; @OriginalMember(owner = "client!kh", name = "f", descriptor = "I") public static int renderZ; + @OriginalMember(owner = "client!uc", name = "f", descriptor = "I") + public static int anInt4232; + @OriginalMember(owner = "client!ug", name = "h", descriptor = "I") + public static int anInt5449; + @OriginalMember(owner = "client!vj", name = "d", descriptor = "I") + public static int anInt5765; + @OriginalMember(owner = "client!tm", name = "g", descriptor = "I") + public static int anInt5375; public static double mod(double a, double b) { return ((a % b) + b) % b; @@ -78,7 +90,7 @@ public class Camera { if (local80 < 3 && (SceneGraph.tileFlags[1][local64][local73] & 0x2) == 2) { local80++; } - @Pc(117) int local117 = (Static232.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - SceneGraph.tileHeights[local80][local64][local73]; + @Pc(117) int local117 = (SceneGraph.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - SceneGraph.tileHeights[local80][local64][local73]; if (local117 > local45) { local45 = local117; } @@ -101,12 +113,12 @@ public class Camera { @OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V") public static void updateLockedCamera() { - @Pc(9) int local9 = Static248.anInt4232 * 128 + 64; - @Pc(15) int local15 = Static245.anInt5375 * 128 + 64; + @Pc(9) int local9 = anInt4232 * 128 + 64; + @Pc(15) int local15 = anInt5375 * 128 + 64; @Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203; if (Static113.anInt4612 >= 100) { - renderX = Static245.anInt5375 * 128 + 64; - renderZ = Static248.anInt4232 * 128 + 64; + renderX = anInt5375 * 128 + 64; + renderZ = anInt4232 * 128 + 64; Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203; } else { if (renderX < local15) { @@ -146,8 +158,8 @@ public class Camera { } } } - local9 = Static265.anInt5765 * 128 + 64; - local15 = Static251.anInt5449 * 128 + 64; + local9 = anInt5765 * 128 + 64; + local15 = anInt5449 * 128 + 64; local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744; @Pc(236) int local236 = local23 - Static5.anInt40; @Pc(241) int local241 = local9 - renderZ; @@ -267,13 +279,13 @@ public class Camera { @OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V") public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { Static133.anInt5230 = arg2; - Static265.anInt5765 = arg1; + anInt5765 = arg1; Static233.anInt5217 = arg4; - Static251.anInt5449 = arg3; + anInt5449 = arg3; Static260.anInt1744 = arg0; if (Static233.anInt5217 >= 100) { - @Pc(30) int local30 = Static251.anInt5449 * 128 + 64; - @Pc(36) int local36 = Static265.anInt5765 * 128 + 64; + @Pc(30) int local30 = anInt5449 * 128 + 64; + @Pc(36) int local36 = anInt5765 * 128 + 64; @Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static260.anInt1744; @Pc(49) int local49 = local44 - Static5.anInt40; @Pc(54) int local54 = local30 - renderX; @@ -295,12 +307,12 @@ public class Camera { public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { Static113.anInt4612 = arg3; Static231.anInt5203 = arg2; - Static245.anInt5375 = arg5; + anInt5375 = arg5; Static233.anInt5225 = arg1; - Static248.anInt4232 = arg4; + anInt4232 = arg4; if (arg0 && Static113.anInt4612 >= 100) { - renderX = Static245.anInt5375 * 128 + 64; - renderZ = Static248.anInt4232 * 128 + 64; + renderX = anInt5375 * 128 + 64; + renderZ = anInt4232 * 128 + 64; Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203; } cameraType = 2; @@ -317,4 +329,35 @@ public class Camera { anInt1694 = -1; cameraType = 1; } + + @OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V") + public static void method4273() { + @Pc(14) int playerX = PlayerList.self.xFine + Static132.anInt3291; + @Pc(20) int playerZ = PlayerList.self.zFine + Static206.anInt4774; + if (cameraX - playerX < -500 || cameraX - playerX > 500 || cameraZ - playerZ < -500 || cameraZ - playerZ > 500) { + cameraX = playerX; + cameraZ = playerZ; + } + if (cameraZ != playerZ) { + cameraZ += (playerZ - cameraZ) / 16; + } + if (cameraX != playerX) { + cameraX += (playerX - cameraX) / 16; + } + if (Preferences.aBoolean63) { + for (@Pc(93) int local93 = 0; local93 < InterfaceList.keyQueueSize; local93++) { + @Pc(104) int code = InterfaceList.keyCodes[local93]; + if (code == Keyboard.KEY_UP) { + pitchTarget += 47; + } else if (code == Keyboard.KEY_DOWN) { + pitchTarget -= 17; + } else if (code == Keyboard.KEY_LEFT) { + yawTarget -= 65; + } else if (code == Keyboard.KEY_RIGHT) { + yawTarget += 191; + } + } + clampCameraAngle(); + } + } } diff --git a/client/src/main/java/rt4/ClientProt.java b/client/src/main/java/rt4/ClientProt.java index 5324a62..6449a14 100644 --- a/client/src/main/java/rt4/ClientProt.java +++ b/client/src/main/java/rt4/ClientProt.java @@ -7,6 +7,9 @@ import org.openrs2.deob.annotation.Pc; import java.io.IOException; public class ClientProt { + @OriginalMember(owner = "client!wc", name = "g", descriptor = "I") + public static int anInt5804 = 0; + @OriginalMember(owner = "client!vg", name = "a", descriptor = "(Lclient!na;IIBI)V") public static void method4512(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { @Pc(8) Component local8 = InterfaceList.method1418(arg3, arg1); @@ -23,7 +26,7 @@ public class ClientProt { } @Pc(37) boolean local37 = true; if (local8.anInt453 > 0) { - local37 = Static249.method4265(local8); + local37 = MiniMenu.method4265(local8); } if (!local37 || !InterfaceList.getServerActiveProperties(local8).method503(arg2 - 1)) { return; @@ -104,8 +107,8 @@ public class ClientProt { Protocol.outboundBuffer.p1a(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? 1 : 0); Protocol.outboundBuffer.p2(Camera.originX + local23); Protocol.outboundBuffer.p2add(Camera.originZ + local27); - Static84.anInt2255 = PathFinder.queueZ[0]; - Static115.mapFlagX = PathFinder.queueX[0]; + LoginManager.mapFlagZ = PathFinder.queueZ[0]; + LoginManager.mapFlagX = PathFinder.queueX[0]; for (@Pc(126) int local126 = 1; local126 < local13; local126++) { arg0--; Protocol.outboundBuffer.p1a(PathFinder.queueX[arg0] - local23); @@ -166,53 +169,53 @@ public class ClientProt { Static175.mapFilesMissingCount = 0; @Pc(12) boolean fileExists = true; @Pc(14) int id; - for (id = 0; id < Static273.mapFilesBuffer.length; id++) { - if (Static36.mapFileIds[id] != -1 && Static273.mapFilesBuffer[id] == null) { - Static273.mapFilesBuffer[id] = client.js5Archive5.getFile(Static36.mapFileIds[id], 0); - if (Static273.mapFilesBuffer[id] == null) { + for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) { + if (LoginManager.mapFileIds[id] != -1 && LoginManager.mapFilesBuffer[id] == null) { + LoginManager.mapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.mapFileIds[id], 0); + if (LoginManager.mapFilesBuffer[id] == null) { Static175.mapFilesMissingCount++; fileExists = false; } } - if (Static172.locationsMapFileIds[id] != -1 && Static156.locationMapFilesBuffer[id] == null) { - Static156.locationMapFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static172.locationsMapFileIds[id], Static72.regionsXteaKeys[id], 0); - if (Static156.locationMapFilesBuffer[id] == null) { + if (LoginManager.locationsMapFileIds[id] != -1 && LoginManager.locationMapFilesBuffer[id] == null) { + LoginManager.locationMapFilesBuffer[id] = client.js5Archive5.getFileXTEA(LoginManager.locationsMapFileIds[id], LoginManager.regionsXteaKeys[id], 0); + if (LoginManager.locationMapFilesBuffer[id] == null) { fileExists = false; Static175.mapFilesMissingCount++; } } if (GlRenderer.enabled) { - if (Static99.underWaterMapFileIds[id] != -1 && Static186.underWaterMapFilesBuffer[id] == null) { - Static186.underWaterMapFilesBuffer[id] = client.js5Archive5.getFile(Static99.underWaterMapFileIds[id], 0); - if (Static186.underWaterMapFilesBuffer[id] == null) { + if (LoginManager.underWaterMapFileIds[id] != -1 && LoginManager.underWaterMapFilesBuffer[id] == null) { + LoginManager.underWaterMapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.underWaterMapFileIds[id], 0); + if (LoginManager.underWaterMapFilesBuffer[id] == null) { fileExists = false; Static175.mapFilesMissingCount++; } } - if (Static35.underWaterLocationsMapFileIds[id] != -1 && Static19.underWaterLocationsMapFilesBuffer[id] == null) { - Static19.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.getFile(Static35.underWaterLocationsMapFileIds[id], 0); - if (Static19.underWaterLocationsMapFilesBuffer[id] == null) { + if (LoginManager.underWaterLocationsMapFileIds[id] != -1 && LoginManager.underWaterLocationsMapFilesBuffer[id] == null) { + LoginManager.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.underWaterLocationsMapFileIds[id], 0); + if (LoginManager.underWaterLocationsMapFilesBuffer[id] == null) { Static175.mapFilesMissingCount++; fileExists = false; } } } - if (Static175.npcSpawnsFileIds != null && Static191.npcSpawnsFilesBuffer[id] == null && Static175.npcSpawnsFileIds[id] != -1) { - Static191.npcSpawnsFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static175.npcSpawnsFileIds[id], Static72.regionsXteaKeys[id], 0); - if (Static191.npcSpawnsFilesBuffer[id] == null) { + if (LoginManager.npcSpawnsFileIds != null && LoginManager.npcSpawnsFilesBuffer[id] == null && LoginManager.npcSpawnsFileIds[id] != -1) { + LoginManager.npcSpawnsFilesBuffer[id] = client.js5Archive5.getFileXTEA(LoginManager.npcSpawnsFileIds[id], LoginManager.regionsXteaKeys[id], 0); + if (LoginManager.npcSpawnsFilesBuffer[id] == null) { Static175.mapFilesMissingCount++; fileExists = false; } } } - if (Static235.mapElementList == null) { - if (Static158.aClass3_Sub2_Sub4_3 == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) { - Static235.mapElementList = new MapElementList(0); - } else if (client.js5Archive23.allFilesComplete(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) { - Static235.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }), client.js5Archive23); + if (LoginManager.mapElementList == null) { + if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) { + LoginManager.mapElementList = new MapElementList(0); + } else if (client.js5Archive23.allFilesComplete(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) { + LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }), client.js5Archive23); } else { fileExists = false; Static175.mapFilesMissingCount++; @@ -224,15 +227,15 @@ public class ClientProt { return; } - Static271.anInt5804 = 0; + anInt5804 = 0; fileExists = true; @Pc(320) int chunkX; @Pc(309) int chunkZ; - for (id = 0; id < Static273.mapFilesBuffer.length; id++) { - @Pc(294) byte[] local294 = Static156.locationMapFilesBuffer[id]; + for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) { + @Pc(294) byte[] local294 = LoginManager.locationMapFilesBuffer[id]; if (local294 != null) { - chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; - chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Camera.originX; + chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; + chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX; if (Static230.dynamicMapRegion) { chunkZ = 10; chunkX = 10; @@ -240,10 +243,10 @@ public class ClientProt { fileExists &= Static49.method1201(chunkX, chunkZ, local294); } if (GlRenderer.enabled) { - local294 = Static19.underWaterLocationsMapFilesBuffer[id]; + local294 = LoginManager.underWaterLocationsMapFilesBuffer[id]; if (local294 != null) { - chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Camera.originX; - chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; + chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX; + chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; if (Static230.dynamicMapRegion) { chunkZ = 10; chunkX = 10; @@ -266,8 +269,8 @@ public class ClientProt { @Pc(420) boolean hasUnderWaterMap = false; @Pc(427) int i; if (GlRenderer.enabled && Preferences.highWaterDetail) { - for (i = 0; i < Static273.mapFilesBuffer.length; i++) { - if (Static19.underWaterLocationsMapFilesBuffer[i] != null || Static186.underWaterMapFilesBuffer[i] != null) { + for (i = 0; i < LoginManager.mapFilesBuffer.length; i++) { + if (LoginManager.underWaterLocationsMapFilesBuffer[i] != null || LoginManager.underWaterMapFilesBuffer[i] != null) { hasUnderWaterMap = true; break; } @@ -312,7 +315,7 @@ public class ClientProt { Static73.setLightPosition(chunkX, i); } Static26.method743(false); - if (Static191.npcSpawnsFilesBuffer != null) { + if (LoginManager.npcSpawnsFilesBuffer != null) { Static158.decodeNpcFiles(); } } @@ -346,7 +349,7 @@ public class ClientProt { } SceneGraph.method2255(); if (GlRenderer.enabled && hasUnderWaterMap) { - Static278.setRenderTiles(true); + SceneGraph.setRenderTiles(true); SceneGraph.method3535(true); if (!Static230.dynamicMapRegion) { Static87.method1805(true); @@ -363,7 +366,7 @@ public class ClientProt { Static45.method1169(PathFinder.collisionMaps, true); ping(true); SceneGraph.method2255(); - Static278.setRenderTiles(false); + SceneGraph.setRenderTiles(false); } if (GlRenderer.enabled) { for (chunkX = 0; chunkX < 13; chunkX++) { @@ -387,15 +390,15 @@ public class ClientProt { Protocol.outboundBuffer.p4(1057001181); } if (!Static230.dynamicMapRegion) { - @Pc(815) int local815 = (Static52.anInt1695 + 6) / 8; - @Pc(821) int local821 = (Static52.anInt1695 - 6) / 8; - chunkX = (Static80.centralZoneX - 6) / 8; - chunkZ = (Static80.centralZoneX + 6) / 8; + @Pc(815) int local815 = (LoginManager.centralZoneZ + 6) / 8; + @Pc(821) int local821 = (LoginManager.centralZoneZ - 6) / 8; + chunkX = (LoginManager.centralZoneX - 6) / 8; + chunkZ = (LoginManager.centralZoneX + 6) / 8; for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) { for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) { if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) { - client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local837), Static86.UNDERSCORE, JagString.parseInt(local850) })); - client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local837), Static86.UNDERSCORE, JagString.parseInt(local850) })); + client.js5Archive5.method4486(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850) })); + client.js5Archive5.method4486(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850) })); } } } @@ -501,7 +504,7 @@ public class ClientProt { Protocol.outboundBuffer.p4(Static56.aClass13_12.id); Protocol.outboundBuffer.p2le(Static40.aClass13_14.createdComponentId); } - } else if ((Static116.anInt2952 == 1 || Static277.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { + } else if ((Static116.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { Static226.method3901(); } else if (MiniMenu.size > 0) { Static59.method1372(); diff --git a/client/src/main/java/rt4/Component.java b/client/src/main/java/rt4/Component.java index 283bb54..7f41929 100644 --- a/client/src/main/java/rt4/Component.java +++ b/client/src/main/java/rt4/Component.java @@ -14,7 +14,9 @@ public final class Component { public static final SoftLruHashTable models = new SoftLruHashTable(50); @OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;") public static final SoftLruHashTable fonts = new SoftLruHashTable(20); - @OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;") + @OriginalMember(owner = "client!rc", name = "C", descriptor = "Z") + public static boolean aBoolean72 = false; + @OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;") public Object[] onFriendTransmit; @OriginalMember(owner = "client!be", name = "d", descriptor = "[Ljava/lang/Object;") @@ -518,7 +520,7 @@ public final class Component { if (this.anIntArray37 != null) { return true; } - @Pc(18) SoftwareIndexedSprite local18 = Static164.loadSoftwareIndexedSprite(this.spriteId, InterfaceList.aClass153_12); + @Pc(18) SoftwareIndexedSprite local18 = SpriteLoader.loadSoftwareIndexedSprite(this.spriteId, InterfaceList.aClass153_12); if (local18 == null) { return false; } @@ -784,7 +786,7 @@ public final class Component { @OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;") public final Sprite method482(@OriginalArg(1) int arg0) { - Static211.aBoolean72 = false; + aBoolean72 = false; if (arg0 < 0 || arg0 >= this.anIntArray36.length) { return null; } @@ -798,7 +800,7 @@ public final class Component { } local43 = SpriteLoader.loadSprites(local29, InterfaceList.aClass153_12); if (local43 == null) { - Static211.aBoolean72 = true; + aBoolean72 = true; } else { sprites.put(local43, (long) local29); } @@ -849,7 +851,7 @@ public final class Component { @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;") public final Model method488(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) PlayerAppearance arg5) { - Static211.aBoolean72 = false; + aBoolean72 = false; @Pc(10) int local10; @Pc(13) int local13; if (arg4) { @@ -870,7 +872,7 @@ public final class Component { if (local61 == null) { @Pc(69) RawModel local69 = Static77.create(InterfaceList.aClass153_85, local13); if (local69 == null) { - Static211.aBoolean72 = true; + aBoolean72 = true; return null; } local61 = local69.createModel(64, 768, -50, -10, -50); @@ -883,7 +885,7 @@ public final class Component { } else if (local10 == 2) { local61 = NpcTypeList.get(local13).getHeadModel(arg1, arg3, arg0, arg2); if (local61 == null) { - Static211.aBoolean72 = true; + aBoolean72 = true; return null; } else { return local61; @@ -894,7 +896,7 @@ public final class Component { } local61 = arg5.method1956(arg3, arg1, arg2, arg0); if (local61 == null) { - Static211.aBoolean72 = true; + aBoolean72 = true; return null; } else { return local61; @@ -903,7 +905,7 @@ public final class Component { @Pc(164) ObjType local164 = ObjTypeList.get(local13); @Pc(173) Model local173 = local164.getModel(arg0, arg3, arg1, 10, arg2); if (local173 == null) { - Static211.aBoolean72 = true; + aBoolean72 = true; return null; } else { return local173; @@ -911,7 +913,7 @@ public final class Component { } else if (local10 == 6) { local61 = NpcTypeList.get(local13).getBodyModel(null, 0, 0, arg0, arg3, arg2, null, 0, arg1); if (local61 == null) { - Static211.aBoolean72 = true; + aBoolean72 = true; return null; } else { return local61; @@ -926,7 +928,7 @@ public final class Component { @Pc(235) int local235 = this.anInt498; @Pc(246) Model local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232); if (local246 == null) { - Static211.aBoolean72 = true; + aBoolean72 = true; return null; } else { return local246; @@ -937,7 +939,7 @@ public final class Component { @OriginalMember(owner = "client!be", name = "a", descriptor = "(BZ)Lclient!qf;") public final Sprite method489(@OriginalArg(1) boolean arg0) { - Static211.aBoolean72 = false; + aBoolean72 = false; @Pc(12) int local12; if (arg0) { local12 = this.anInt519; @@ -959,7 +961,7 @@ public final class Component { local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12); } if (local85 == null) { - Static211.aBoolean72 = true; + aBoolean72 = true; return null; } if (this.vFlip) { @@ -1176,7 +1178,7 @@ public final class Component { @OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;") public final Font method491(@OriginalArg(0) IndexedSprite[] arg0) { - Static211.aBoolean72 = false; + aBoolean72 = false; if (this.font == -1) { return null; } @@ -1184,9 +1186,9 @@ public final class Component { if (local21 != null) { return local21; } - local21 = Static127.method2462(this.font, InterfaceList.aClass153_12, InterfaceList.aClass153_64); + local21 = Font.method2462(this.font, InterfaceList.aClass153_12, InterfaceList.aClass153_64); if (local21 == null) { - Static211.aBoolean72 = true; + aBoolean72 = true; } else { local21.setNameIcons(arg0, null); fonts.put(local21, (long) this.font); diff --git a/client/src/main/java/rt4/Static255.java b/client/src/main/java/rt4/DeadClass.java similarity index 80% rename from client/src/main/java/rt4/Static255.java rename to client/src/main/java/rt4/DeadClass.java index cad9439..68fcda6 100644 --- a/client/src/main/java/rt4/Static255.java +++ b/client/src/main/java/rt4/DeadClass.java @@ -2,7 +2,9 @@ package rt4; import org.openrs2.deob.annotation.OriginalMember; -public final class Static255 { +// Has no usages. + +public final class DeadClass { @OriginalMember(owner = "client!ul", name = "I", descriptor = "Lclient!gn;") public static final LruHashTable cache = new LruHashTable(4); diff --git a/client/src/main/java/rt4/DisplayMode.java b/client/src/main/java/rt4/DisplayMode.java index fb90788..7910282 100644 --- a/client/src/main/java/rt4/DisplayMode.java +++ b/client/src/main/java/rt4/DisplayMode.java @@ -12,8 +12,10 @@ public final class DisplayMode { @OriginalMember(owner = "client!ib", name = "i", descriptor = "[Lclient!od;") public static DisplayMode[] aClass114Array1; + @OriginalMember(owner = "client!rc", name = "M", descriptor = "Z") + public static boolean aBoolean73 = false; - @OriginalMember(owner = "client!od", name = "j", descriptor = "I") + @OriginalMember(owner = "client!od", name = "j", descriptor = "I") public int width; @OriginalMember(owner = "client!od", name = "k", descriptor = "I") @@ -148,7 +150,7 @@ public final class DisplayMode { } if (arg2 && arg1 > 0) { GameShell.canvas.setIgnoreRepaint(true); - if (!Static211.aBoolean73) { + if (!aBoolean73) { SceneGraph.clear(); SoftwareRaster.frameBuffer = null; SoftwareRaster.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas); @@ -174,10 +176,10 @@ public final class DisplayMode { ThreadUtils.sleep(100L); } if (local300.status == 1) { - Static211.aBoolean73 = true; + aBoolean73 = true; } } - if (Static211.aBoolean73) { + if (aBoolean73) { GlRenderer.init(GameShell.canvas, Preferences.antiAliasingMode * 2); } } diff --git a/client/src/main/java/rt4/FogManager.java b/client/src/main/java/rt4/FogManager.java index dcd7ddf..2eb7c9a 100644 --- a/client/src/main/java/rt4/FogManager.java +++ b/client/src/main/java/rt4/FogManager.java @@ -159,4 +159,12 @@ public final class FogManager { public static float method3068() { return aFloat21; } + + @OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V") + public static void method3935(@OriginalArg(0) int arg0) { + method3060(anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F); + method3063(-50.0F, -60.0F, -50.0F); + method3062(anInt3922, 0); + method3058(); + } } diff --git a/client/src/main/java/rt4/Font.java b/client/src/main/java/rt4/Font.java index 4480a8b..f5e5ecb 100644 --- a/client/src/main/java/rt4/Font.java +++ b/client/src/main/java/rt4/Font.java @@ -213,7 +213,12 @@ public abstract class Font extends SecondaryNode { return local27; } - @OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I") + @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;") + public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) { + return SpriteLoader.decode(arg1, 0, arg0) ? method799(arg2.getFile(arg0, 0)) : null; + } + + @OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I") public final int method2852(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) { return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); } diff --git a/client/src/main/java/rt4/Fonts.java b/client/src/main/java/rt4/Fonts.java index c3d8e82..638bb17 100644 --- a/client/src/main/java/rt4/Fonts.java +++ b/client/src/main/java/rt4/Fonts.java @@ -45,13 +45,13 @@ public class Fonts { @OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V") public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) { - p11Full = Static127.method2462(Sprites.p11FullId, arg1, arg0); + p11Full = Font.method2462(Sprites.p11FullId, arg1, arg0); if (GlRenderer.enabled) { p11FullSoftware = SoftwareFont.method2412(Sprites.p11FullId, arg0, arg1); } else { p11FullSoftware = (SoftwareFont) p11Full; } - p12Full = Static127.method2462(Sprites.p12FullId, arg1, arg0); - b12Full = Static127.method2462(Sprites.b12FullId, arg1, arg0); + p12Full = Font.method2462(Sprites.p12FullId, arg1, arg0); + b12Full = Font.method2462(Sprites.b12FullId, arg1, arg0); } } diff --git a/client/src/main/java/rt4/GameShell.java b/client/src/main/java/rt4/GameShell.java index b4814f1..6f17926 100644 --- a/client/src/main/java/rt4/GameShell.java +++ b/client/src/main/java/rt4/GameShell.java @@ -177,6 +177,51 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene VARIABLE_RENDER_RATE_NS = (int)(VARIABLE_RENDER_RATE * 1_000_000.0d); } + @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V") + public static void method3662() { + @Pc(8) Container local8; + if (fullScreenFrame != null) { + local8 = fullScreenFrame; + } else if (frame == null) { + local8 = signLink.applet; + } else { + local8 = frame; + } + frameWidth = local8.getSize().width; + frameHeight = local8.getSize().height; + @Pc(35) Insets local35; + if (local8 == frame) { + local35 = frame.getInsets(); + frameHeight -= local35.bottom + local35.top; + frameWidth -= local35.right + local35.left; + } + if (DisplayMode.getWindowMode() >= 2) { + canvasWidth = frameWidth; + leftMargin = 0; + topMargin = 0; + canvasHeight = frameHeight; + } else { + topMargin = 0; + leftMargin = (frameWidth - 765) / 2; + canvasHeight = 503; + canvasWidth = 765; + } + if (GlRenderer.enabled) { + GlRenderer.setCanvasSize(canvasWidth, canvasHeight); + } + canvas.setSize(canvasWidth, canvasHeight); + if (local8 == frame) { + local35 = frame.getInsets(); + canvas.setLocation(local35.left + leftMargin, topMargin + local35.top); + } else { + canvas.setLocation(leftMargin, topMargin); + } + if (InterfaceList.topLevelInterface != -1) { + Static210.method3712(true); + } + Static139.method2704(); + } + @OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V") @Override public final void focusLost(@OriginalArg(0) FocusEvent event) { diff --git a/client/src/main/java/rt4/GlModel.java b/client/src/main/java/rt4/GlModel.java index e1b6185..fdb894c 100644 --- a/client/src/main/java/rt4/GlModel.java +++ b/client/src/main/java/rt4/GlModel.java @@ -1035,7 +1035,7 @@ public final class GlModel extends Model { } if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) { if (this.aBoolean303) { - Static259.aLongArray11[Static2.anInt7++] = arg8; + Model.aLongArray11[Static2.anInt7++] = arg8; } else { if (anIntArray468.length < this.anInt5296) { anIntArray468 = new int[this.anInt5296]; @@ -1053,7 +1053,7 @@ public final class GlModel extends Model { @Pc(703) short local703 = this.aShortArray82[local362]; @Pc(708) short local708 = this.aShortArray83[local362]; if (this.method4118(Static150.anInt3582, Static34.anInt1053, anIntArray467[local698], anIntArray467[local703], anIntArray467[local708], anIntArray468[local698], anIntArray468[local703], anIntArray468[local708])) { - Static259.aLongArray11[Static2.anInt7++] = arg8; + Model.aLongArray11[Static2.anInt7++] = arg8; break label118; } local362++; diff --git a/client/src/main/java/rt4/JagString.java b/client/src/main/java/rt4/JagString.java index f6099fc..e4f26a3 100644 --- a/client/src/main/java/rt4/JagString.java +++ b/client/src/main/java/rt4/JagString.java @@ -199,7 +199,59 @@ public final class JagString implements StringInterface { return concatenate(new JagString[] { parseInt(arg0 >> 24 & 0xFF), aClass100_994, parseInt(arg0 >> 16 & 0xFF), aClass100_994, parseInt(arg0 >> 8 & 0xFF), aClass100_994, parseInt(arg0 & 0xFF) }); } - @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;") + @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;") + public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) { + if (arg1.indexOf(Static127.PERCENT_SIGN) == -1) { + return arg1; + } + while (true) { + @Pc(14) int local14 = arg1.indexOf(Static127.aClass100_133); + if (local14 == -1) { + while (true) { + local14 = arg1.indexOf(Static127.aClass100_1097); + if (local14 == -1) { + while (true) { + local14 = arg1.indexOf(Static127.aClass100_761); + if (local14 == -1) { + while (true) { + local14 = arg1.indexOf(Static127.aClass100_520); + if (local14 == -1) { + while (true) { + local14 = arg1.indexOf(Static127.aClass100_1002); + if (local14 == -1) { + while (true) { + local14 = arg1.indexOf(Static127.aClass100_591); + if (local14 == -1) { + return arg1; + } + @Pc(246) JagString local246 = EMPTY; + if (Player.lastLogAddress != null) { + local246 = formatIp(Player.lastLogAddress.intArg2); + if (Player.lastLogAddress.result != null) { + @Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1); + local246 = decodeString(local265, local265.length, 0); + } + } + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) }); + } + } + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(4, arg0)), arg1.substring(local14 + 2) }); + } + } + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(3, arg0)), arg1.substring(local14 + 2) }); + } + } + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(2, arg0)), arg1.substring(local14 + 2) }); + } + } + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(1, arg0)), arg1.substring(local14 + 2) }); + } + } + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(0, arg0)), arg1.substring(local14 + 2) }); + } + } + + @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;") public final URL method3107() throws MalformedURLException { return new URL(new String(this.chars, 0, this.length)); } diff --git a/client/src/main/java/rt4/Light.java b/client/src/main/java/rt4/Light.java index 188c430..ce8fc75 100644 --- a/client/src/main/java/rt4/Light.java +++ b/client/src/main/java/rt4/Light.java @@ -73,7 +73,7 @@ public final class Light { @OriginalMember(owner = "client!gi", name = "", descriptor = "(Lclient!wa;)V") public Light(@OriginalArg(0) Buffer arg0) { if (anIntArray150 == null) { - Static84.method1771(); + method1771(); } this.anInt2241 = arg0.g1(); this.aBoolean124 = (this.anInt2241 & 0x10) != 0; @@ -98,6 +98,11 @@ public final class Light { } } + @OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V") + public static void method1771() { + anIntArray150 = Static206.method3679(0.4F); + } + @OriginalMember(owner = "client!gi", name = "a", descriptor = "(BIIII)V") public final void method1762(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { this.anInt2233 = arg0; diff --git a/client/src/main/java/rt4/LoginManager.java b/client/src/main/java/rt4/LoginManager.java index dae60e7..7316ac9 100644 --- a/client/src/main/java/rt4/LoginManager.java +++ b/client/src/main/java/rt4/LoginManager.java @@ -14,6 +14,18 @@ public class LoginManager { public static final JagString ZAP = JagString.parse("zap"); @OriginalMember(owner = "client!ef", name = "h", descriptor = "Lclient!na;") public static final JagString UNZAP = JagString.parse("unzap"); + @OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;") + public static final JagString aClass100_1103 = JagString.parse("ul"); + @OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;") + public static final JagString aClass100_558 = JagString.parse("m"); + @OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;") + public static final JagString aClass100_1090 = JagString.parse("l"); + @OriginalMember(owner = "client!oe", name = "o", descriptor = "Lclient!na;") + public static final JagString aClass100_807 = JagString.parse("n"); + @OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;") + public static final JagString aClass100_772 = JagString.parse("um"); + @OriginalMember(owner = "client!gm", name = "W", descriptor = "Lclient!na;") + public static final JagString UNDERSCORE = JagString.parse("_"); @OriginalMember(owner = "client!rl", name = "X", descriptor = "I") public static int anInt4937 = 0; @OriginalMember(owner = "client!sd", name = "X", descriptor = "Z") @@ -54,6 +66,44 @@ public class LoginManager { public static boolean mapQuickChat = false; @OriginalMember(owner = "client!c", name = "hb", descriptor = "Z") public static boolean parentalAdvertConsent = false; + @OriginalMember(owner = "client!we", name = "H", descriptor = "[[B") + public static byte[][] mapFilesBuffer; + @OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B") + public static byte[][] locationMapFilesBuffer; + @OriginalMember(owner = "client!cl", name = "V", descriptor = "[I") + public static int[] underWaterLocationsMapFileIds; + @OriginalMember(owner = "client!pg", name = "jb", descriptor = "[[B") + public static byte[][] npcSpawnsFilesBuffer; + @OriginalMember(owner = "client!client", name = "lb", descriptor = "[I") + public static int[] mapFileIds; + @OriginalMember(owner = "client!pa", name = "L", descriptor = "[[B") + public static byte[][] underWaterMapFilesBuffer; + @OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I") + public static int[][] regionsXteaKeys; + @OriginalMember(owner = "client!te", name = "H", descriptor = "[I") + public static int[] regionBitPacked; + @OriginalMember(owner = "client!nm", name = "P", descriptor = "[I") + public static int[] npcSpawnsFileIds; + @OriginalMember(owner = "client!hk", name = "bb", descriptor = "[I") + public static int[] underWaterMapFileIds; + @OriginalMember(owner = "client!nj", name = "j", descriptor = "[I") + public static int[] locationsMapFileIds; + @OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B") + public static byte[][] underWaterLocationsMapFilesBuffer; + @OriginalMember(owner = "client!gf", name = "R", descriptor = "I") + public static int centralZoneX; + @OriginalMember(owner = "client!eb", name = "u", descriptor = "I") + public static int centralZoneZ; + @OriginalMember(owner = "client!dc", name = "ab", descriptor = "I") + public static int centralPlane = 0; + @OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;") + public static Map map; + @OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;") + public static MapElementList mapElementList; + @OriginalMember(owner = "client!ja", name = "n", descriptor = "I") + public static int mapFlagX = 0; + @OriginalMember(owner = "client!gk", name = "h", descriptor = "I") + public static int mapFlagZ = 0; @OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V") public static void clear() { @@ -432,7 +482,7 @@ public class LoginManager { reply = 2; step = 0; client.method4221(); - Static80.centralZoneX = -1; + centralZoneX = -1; Protocol.readRebuildPacket(false); Protocol.opcode = -1; return; @@ -499,45 +549,225 @@ public class LoginManager { public static void setupLoadingScreenRegion() { @Pc(10) int local10 = (Camera.renderX >> 10) + (Camera.originX >> 3); @Pc(23) int local23 = (Camera.renderZ >> 10) + (Camera.originZ >> 3); - Static156.locationMapFilesBuffer = new byte[18][]; - Static35.underWaterLocationsMapFileIds = new int[18]; - Static191.npcSpawnsFilesBuffer = new byte[18][]; - Static36.mapFileIds = new int[18]; - Static72.regionsXteaKeys = new int[18][4]; - Static186.underWaterMapFilesBuffer = new byte[18][]; - Static238.regionBitPacked = new int[18]; - Static273.mapFilesBuffer = new byte[18][]; - Static175.npcSpawnsFileIds = new int[18]; - Static99.underWaterMapFileIds = new int[18]; - Static172.locationsMapFileIds = new int[18]; - Static19.underWaterLocationsMapFilesBuffer = new byte[18][]; + locationMapFilesBuffer = new byte[18][]; + underWaterLocationsMapFileIds = new int[18]; + npcSpawnsFilesBuffer = new byte[18][]; + mapFileIds = new int[18]; + regionsXteaKeys = new int[18][4]; + underWaterMapFilesBuffer = new byte[18][]; + regionBitPacked = new int[18]; + mapFilesBuffer = new byte[18][]; + npcSpawnsFileIds = new int[18]; + underWaterMapFileIds = new int[18]; + locationsMapFileIds = new int[18]; + underWaterLocationsMapFilesBuffer = new byte[18][]; @Pc(74) int local74 = 0; @Pc(80) int local80; for (local80 = (local10 - 6) / 8; local80 <= (local10 + 6) / 8; local80++) { for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) { @Pc(115) int local115 = (local80 << 8) + local97; - Static238.regionBitPacked[local74] = local115; - Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); - Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); - Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); - Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); - Static35.underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); - if (Static175.npcSpawnsFileIds[local74] == -1) { - Static36.mapFileIds[local74] = -1; - Static172.locationsMapFileIds[local74] = -1; - Static99.underWaterMapFileIds[local74] = -1; - Static35.underWaterLocationsMapFileIds[local74] = -1; + regionBitPacked[local74] = local115; + mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_558, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) })); + locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1090, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) })); + npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_807, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) })); + underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_772, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) })); + underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1103, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) })); + if (npcSpawnsFileIds[local74] == -1) { + mapFileIds[local74] = -1; + locationsMapFileIds[local74] = -1; + underWaterMapFileIds[local74] = -1; + underWaterLocationsMapFileIds[local74] = -1; } local74++; } } - for (local80 = local74; local80 < Static175.npcSpawnsFileIds.length; local80++) { - Static175.npcSpawnsFileIds[local80] = -1; - Static36.mapFileIds[local80] = -1; - Static172.locationsMapFileIds[local80] = -1; - Static99.underWaterMapFileIds[local80] = -1; - Static35.underWaterLocationsMapFileIds[local80] = -1; + for (local80 = local74; local80 < npcSpawnsFileIds.length; local80++) { + npcSpawnsFileIds[local80] = -1; + mapFileIds[local80] = -1; + locationsMapFileIds[local80] = -1; + underWaterMapFileIds[local80] = -1; + underWaterLocationsMapFileIds[local80] = -1; } - Static127.method2463(0, local23, local10, 8, true, 8); + method2463(0, local23, local10, 8, true, 8); } + + @OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V") + public static void processLogout() { + if (Protocol.socket != null) { + Protocol.socket.close(); + Protocol.socket = null; + } + client.method3768(); + SceneGraph.clear(); + @Pc(19) int local19; + for (local19 = 0; local19 < 4; local19++) { + PathFinder.collisionMaps[local19].resetFlags(); + } + WorldMap.clear(false); + System.gc(); + MidiPlayer.method801(); + MidiPlayer.jingle = false; + MusicPlayer.groupId = -1; + AreaSoundManager.clear(true); + Static230.dynamicMapRegion = false; + Camera.originZ = 0; + centralZoneX = 0; + centralZoneZ = 0; + Camera.originX = 0; + for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) { + Static143.hintMapMarkers[local19] = null; + } + PlayerList.size = 0; + NpcList.size = 0; + for (local19 = 0; local19 < 2048; local19++) { + PlayerList.players[local19] = null; + PlayerList.appearanceCache[local19] = null; + } + for (local19 = 0; local19 < 32768; local19++) { + NpcList.npcs[local19] = null; + } + for (local19 = 0; local19 < 4; local19++) { + for (@Pc(115) int local115 = 0; local115 < 104; local115++) { + for (@Pc(122) int local122 = 0; local122 < 104; local122++) { + SceneGraph.objStacks[local19][local115][local122] = null; + } + } + } + Camera.resetCameraEffects(); + Protocol.verifyId = 0; + VarpDomain.reset(); + Static73.method1596(true); + } + + @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V") + public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) { + if (centralZoneX == arg2 && arg1 == centralZoneZ && (centralPlane == arg0 || SceneGraph.allLevelsAreVisible())) { + return; + } + centralZoneX = arg2; + centralZoneZ = arg1; + centralPlane = arg0; + if (SceneGraph.allLevelsAreVisible()) { + centralPlane = 0; + } + if (arg4) { + client.setGameState(28); + } else { + client.setGameState(25); + } + Static114.drawTextOnScreen(true, LocalizedText.LOADING); + @Pc(53) int local53 = Camera.originZ; + @Pc(55) int local55 = Camera.originX; + Camera.originZ = arg1 * 8 - 48; + Camera.originX = (arg2 - 6) * 8; + map = MapList.getContainingSource(centralZoneX * 8, centralZoneZ * 8); + @Pc(81) int local81 = Camera.originZ - local53; + @Pc(86) int local86 = Camera.originX - local55; + mapElementList = null; + @Pc(96) int local96; + @Pc(103) Npc local103; + @Pc(109) int local109; + if (arg4) { + NpcList.size = 0; + for (local96 = 0; local96 < 32768; local96++) { + local103 = NpcList.npcs[local96]; + if (local103 != null) { + local103.xFine -= local86 * 128; + local103.zFine -= local81 * 128; + if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) { + for (local109 = 0; local109 < 10; local109++) { + local103.movementQueueX[local109] -= local86; + local103.movementQueueZ[local109] -= local81; + } + NpcList.ids[NpcList.size++] = local96; + } else { + NpcList.npcs[local96].setNpcType(null); + NpcList.npcs[local96] = null; + } + } + } + } else { + for (local96 = 0; local96 < 32768; local96++) { + local103 = NpcList.npcs[local96]; + if (local103 != null) { + for (local109 = 0; local109 < 10; local109++) { + local103.movementQueueX[local109] -= local86; + local103.movementQueueZ[local109] -= local81; + } + local103.xFine -= local86 * 128; + local103.zFine -= local81 * 128; + } + } + } + for (local96 = 0; local96 < 2048; local96++) { + @Pc(265) Player local265 = PlayerList.players[local96]; + if (local265 != null) { + for (local109 = 0; local109 < 10; local109++) { + local265.movementQueueX[local109] -= local86; + local265.movementQueueZ[local109] -= local81; + } + local265.xFine -= local86 * 128; + local265.zFine -= local81 * 128; + } + } + Player.level = arg0; + PlayerList.self.teleport(arg5, false, arg3); + @Pc(322) byte local322 = 104; + @Pc(324) byte local324 = 0; + @Pc(326) byte local326 = 0; + @Pc(328) byte local328 = 1; + @Pc(330) byte local330 = 104; + @Pc(332) byte local332 = 1; + if (local81 < 0) { + local328 = -1; + local330 = -1; + local326 = 103; + } + if (local86 < 0) { + local332 = -1; + local324 = 103; + local322 = -1; + } + for (@Pc(358) int local358 = local324; local358 != local322; local358 += local332) { + for (@Pc(367) int local367 = local326; local367 != local330; local367 += local328) { + @Pc(378) int local378 = local86 + local358; + @Pc(382) int local382 = local367 + local81; + for (@Pc(384) int local384 = 0; local384 < 4; local384++) { + if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) { + SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382]; + } else { + SceneGraph.objStacks[local384][local358][local367] = null; + } + } + } + } + for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) { + local451.z -= local81; + local451.x -= local86; + if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) { + local451.unlink(); + } + } + if (arg4) { + Camera.renderX -= local86 * 128; + Camera.renderZ -= local81 * 128; + Camera.anInt4232 -= local81; + Camera.anInt5449 -= local86; + Camera.anInt5765 -= local81; + Camera.anInt5375 -= local86; + } else { + Camera.cameraType = 1; + } + SoundPlayer.anInt4451 = 0; + if (mapFlagX != 0) { + mapFlagZ -= local81; + mapFlagX -= local86; + } + if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) { + Static103.setInstantFade(); + } + Static107.anInt2875 = -1; + Static99.aClass69_64.clear(); + Static217.aClass69_116.clear(); + } } diff --git a/client/src/main/java/rt4/MiniMap.java b/client/src/main/java/rt4/MiniMap.java index a30963c..1341de0 100644 --- a/client/src/main/java/rt4/MiniMap.java +++ b/client/src/main/java/rt4/MiniMap.java @@ -25,6 +25,14 @@ public class MiniMap { public static int state = 0; @OriginalMember(owner = "client!we", name = "w", descriptor = "I") public static int anInt4130 = 0; + @OriginalMember(owner = "client!ej", name = "W", descriptor = "I") + public static int anInt1814 = 0; + @OriginalMember(owner = "client!vg", name = "d", descriptor = "I") + public static int anInt5755 = 2; + @OriginalMember(owner = "client!oe", name = "n", descriptor = "I") + public static int anInt4262 = 1; + @OriginalMember(owner = "client!gi", name = "H", descriptor = "I") + public static int anInt2252 = 0; @OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V") public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @@ -217,7 +225,7 @@ public class MiniMap { SoftwareRaster.setClip(arg2, arg1, arg2 + arg3.width, arg1 + arg3.height); } if (state != 2 && state != 5 && sprite != null) { - @Pc(48) int local48 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; + @Pc(48) int local48 = anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(57) int local57 = PlayerList.self.xFine / 32 + 48; @Pc(67) int local67 = 464 - PlayerList.self.zFine / 32; if (GlRenderer.enabled) { @@ -233,37 +241,37 @@ public class MiniMap { @Pc(200) int local200; @Pc(239) int local239; @Pc(271) int local271; - if (Static235.mapElementList != null) { - for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) { - if (Static235.mapElementList.method3892(local117)) { - local146 = (Static235.mapElementList.aShortArray73[local117] - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32; + if (LoginManager.mapElementList != null) { + for (@Pc(117) int local117 = 0; local117 < LoginManager.mapElementList.anInt5074; local117++) { + if (LoginManager.mapElementList.method3892(local117)) { + local146 = (LoginManager.mapElementList.aShortArray73[local117] - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32; local150 = MathUtils.sin[local48]; local154 = MathUtils.cos[local48]; @Pc(156) Font local156 = Fonts.p11Full; @Pc(164) int local164 = local150 * 256 / (anInt4130 + 256); - local181 = (Static235.mapElementList.aShortArray72[local117] - Camera.originZ) * 4 + 2 - PlayerList.self.zFine / 32; + local181 = (LoginManager.mapElementList.aShortArray72[local117] - Camera.originZ) * 4 + 2 - PlayerList.self.zFine / 32; @Pc(189) int local189 = local154 * 256 / (anInt4130 + 256); local200 = local181 * local189 - local146 * local164 >> 16; - if (Static235.mapElementList.method3894(local117) == 1) { + if (LoginManager.mapElementList.method3894(local117) == 1) { local156 = Fonts.p12Full; } - if (Static235.mapElementList.method3894(local117) == 2) { + if (LoginManager.mapElementList.method3894(local117) == 2) { local156 = Fonts.b12Full; } local231 = local164 * local181 + local189 * local146 >> 16; - local239 = local156.getMaxLineWidth(Static235.mapElementList.aClass100Array153[local117], 100); + local239 = local156.getMaxLineWidth(LoginManager.mapElementList.aClass100Array153[local117], 100); @Pc(245) int local245 = local231 - local239 / 2; if (local245 >= -arg3.width && local245 <= arg3.width && local200 >= -arg3.height && local200 <= arg3.height) { local271 = 16777215; - if (Static235.mapElementList.anIntArray444[local117] != -1) { - local271 = Static235.mapElementList.anIntArray444[local117]; + if (LoginManager.mapElementList.anIntArray444[local117] != -1) { + local271 = LoginManager.mapElementList.anIntArray444[local117]; } if (GlRenderer.enabled) { GlFont.method1188((GlSprite) arg3.method489(false)); } else { SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45); } - local156.renderParagraphAlpha(Static235.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.width / 2, arg1 + arg3.height / 2 + -local200, local239, 50, local271, 0, 1, 0, 0); + local156.renderParagraphAlpha(LoginManager.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.width / 2, arg1 + arg3.height / 2 + -local200, local239, 50, local271, 0, 1, 0, 0); if (GlRenderer.enabled) { GlFont.method1173(); } else { @@ -375,9 +383,9 @@ public class MiniMap { } } } - if (Static115.mapFlagX != 0) { - local146 = Static115.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32; - local181 = Static84.anInt2255 * 4 + 2 - PlayerList.self.zFine / 32; + if (LoginManager.mapFlagX != 0) { + local146 = LoginManager.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32; + local181 = LoginManager.mapFlagZ * 4 + 2 - PlayerList.self.zFine / 32; method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2); } if (GlRenderer.enabled) { @@ -402,7 +410,7 @@ public class MiniMap { return; } @Pc(21) int local21 = arg3 * arg3 + arg2 * arg2; - @Pc(27) int local27 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; + @Pc(27) int local27 = anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(39) int local39 = Math.max(arg0.width / 2, arg0.height / 2) + 10; if (local39 * local39 < local21) { return; diff --git a/client/src/main/java/rt4/MiniMenu.java b/client/src/main/java/rt4/MiniMenu.java index 7c72f18..c685025 100644 --- a/client/src/main/java/rt4/MiniMenu.java +++ b/client/src/main/java/rt4/MiniMenu.java @@ -63,6 +63,10 @@ public class MiniMenu { public static final JagString COLOR_WHITE = JagString.parse(""); @OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;") public static final JagString aClass100_164 = JagString.parse(" )2> "); + @OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;") + public static final JagString aClass100_1039 = JagString.parse(" x "); + @OriginalMember(owner = "client!hd", name = "l", descriptor = "Lclient!na;") + public static final JagString NULL = JagString.parse("null"); @OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;") public static JagString aClass100_203 = null; @OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;") @@ -476,7 +480,7 @@ public class MiniMenu { Protocol.outboundBuffer.p1isaac(92); Protocol.outboundBuffer.p2leadd(local36); } else { - Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name})); + Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), aClass100_1039, ObjTypeList.get(local36).name})); } anInt2043 = 0; aClass13_7 = InterfaceList.getComponent(local19); @@ -493,7 +497,7 @@ public class MiniMenu { Protocol.outboundBuffer.p1(Static107.anInt2878); Protocol.outboundBuffer.p2((int)Camera.yawTarget); Protocol.outboundBuffer.p1(57); - Protocol.outboundBuffer.p1(Static59.anInt1814); + Protocol.outboundBuffer.p1(MiniMap.anInt1814); Protocol.outboundBuffer.p1(MiniMap.anInt4130); Protocol.outboundBuffer.p1(89); Protocol.outboundBuffer.p2(PlayerList.self.xFine); @@ -738,7 +742,7 @@ public class MiniMenu { local1955 = local693.anIntArrayArray4[0][1]; if (VarpDomain.activeVarps[local1955] != local693.anIntArray48[0]) { VarpDomain.activeVarps[local1955] = local693.anIntArray48[0]; - Static85.refreshMagicVarp(local1955); + VarpDomain.refreshMagicVarp(local1955); } } } @@ -764,7 +768,7 @@ public class MiniMenu { if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { local1955 = local693.anIntArrayArray4[0][1]; VarpDomain.activeVarps[local1955] = 1 - VarpDomain.activeVarps[local1955]; - Static85.refreshMagicVarp(local1955); + VarpDomain.refreshMagicVarp(local1955); } } if (local23 == 33) { @@ -808,7 +812,7 @@ public class MiniMenu { local693 = InterfaceList.getComponent(local19); @Pc(2287) boolean local2287 = true; if (local693.anInt453 > 0) { - local2287 = Static249.method4265(local693); + local2287 = method4265(local693); } if (local2287) { Protocol.outboundBuffer.p1isaac(10); @@ -896,7 +900,7 @@ public class MiniMenu { InterfaceList.redraw(local693); aClass100_203 = JagString.concatenate(new JagString[] { aClass100_32, ObjTypeList.get(local36).name, COLOR_WHITE}); if (aClass100_203 == null) { - aClass100_203 = Static92.NULL; + aClass100_203 = NULL; } return; } @@ -1075,7 +1079,7 @@ public class MiniMenu { } @Pc(112) long local112 = -1L; for (local15 = 0; local15 < Static2.anInt7; local15++) { - @Pc(121) long local121 = Static259.aLongArray11[local15]; + @Pc(121) long local121 = Model.aLongArray11[local15]; x = (int) local121 & 0x7F; @Pc(133) int local133 = (int) local121 >> 29 & 0x3; @Pc(140) int local140 = (int) (local121 >>> 32) & Integer.MAX_VALUE; @@ -1454,4 +1458,26 @@ public class MiniMenu { anInt1742 = -1; anInt2954 = -1; } + + @OriginalMember(owner = "client!wi", name = "c", descriptor = "(II)Z") + public static boolean method4640(@OriginalArg(0) int arg0) { + if (arg0 < 0) { + return false; + } + @Pc(12) int local12 = actions[arg0]; + if (local12 >= 2000) { + local12 -= 2000; + } + return local12 == 1003; + } + + @OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z") + public static boolean method4265(@OriginalArg(1) Component arg0) { + if (arg0.anInt453 == 205) { + Static267.anInt5775 = 250; + return true; + } else { + return false; + } + } } diff --git a/client/src/main/java/rt4/Model.java b/client/src/main/java/rt4/Model.java index 3d3838b..2f46d75 100644 --- a/client/src/main/java/rt4/Model.java +++ b/client/src/main/java/rt4/Model.java @@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!ak") public abstract class Model extends Entity { - @OriginalMember(owner = "client!ak", name = "s", descriptor = "Z") + @OriginalMember(owner = "client!vc", name = "V", descriptor = "[J") + public static final long[] aLongArray11 = new long[1000]; + @OriginalMember(owner = "client!ak", name = "s", descriptor = "Z") public boolean aBoolean303 = false; @OriginalMember(owner = "client!ak", name = "a", descriptor = "([[III)I") diff --git a/client/src/main/java/rt4/Mouse.java b/client/src/main/java/rt4/Mouse.java index 310aff5..2d77ef4 100644 --- a/client/src/main/java/rt4/Mouse.java +++ b/client/src/main/java/rt4/Mouse.java @@ -48,7 +48,9 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis public static volatile int anInt3521 = -1; @OriginalMember(owner = "client!sa", name = "Y", descriptor = "I") public static volatile int anInt4973 = 0; - public int mouseWheelX; + @OriginalMember(owner = "client!wi", name = "W", descriptor = "I") + public static int anInt5850 = 0; + public int mouseWheelX; public int mouseWheelY; @OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V") diff --git a/client/src/main/java/rt4/MsiType.java b/client/src/main/java/rt4/MsiType.java index 7c6ee49..98a3bbd 100644 --- a/client/src/main/java/rt4/MsiType.java +++ b/client/src/main/java/rt4/MsiType.java @@ -35,7 +35,7 @@ public final class MsiType { return local17; } MsiTypeList.spritesArchive.isFileReady(this.spriteId); - local17 = Static164.loadSoftwareIndexedSprite(this.spriteId, MsiTypeList.spritesArchive); + local17 = SpriteLoader.loadSoftwareIndexedSprite(this.spriteId, MsiTypeList.spritesArchive); if (local17 != null) { local17.adjustPalette(MsiTypeList.redDelta, MsiTypeList.greenDelta, MsiTypeList.blueDelta); local17.innerWidth = local17.width; diff --git a/client/src/main/java/rt4/Npc.java b/client/src/main/java/rt4/Npc.java index 0277839..51083c5 100644 --- a/client/src/main/java/rt4/Npc.java +++ b/client/src/main/java/rt4/Npc.java @@ -93,8 +93,8 @@ public final class Npc extends PathingEntity { if (Static101.anInt2640 != 0) { model.rotateX(Static101.anInt2640); } - if (Static102.anInt2680 != 0) { - model.rotateZ(Static102.anInt2680); + if (PathingEntity.anInt2680 != 0) { + model.rotateZ(PathingEntity.anInt2680); } if (Static62.anInt1938 != 0) { model.translate(0, Static62.anInt1938, 0); diff --git a/client/src/main/java/rt4/PathingEntity.java b/client/src/main/java/rt4/PathingEntity.java index bcbfa6a..898b66d 100644 --- a/client/src/main/java/rt4/PathingEntity.java +++ b/client/src/main/java/rt4/PathingEntity.java @@ -12,7 +12,9 @@ public abstract class PathingEntity extends Entity { public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 }; @OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;") public static final BasType aClass20_1 = new BasType(); - @OriginalMember(owner = "client!fe", name = "A", descriptor = "I") + @OriginalMember(owner = "client!hn", name = "Y", descriptor = "I") + public static int anInt2680 = 0; + @OriginalMember(owner = "client!fe", name = "A", descriptor = "I") public int spotAnimStart; @OriginalMember(owner = "client!fe", name = "S", descriptor = "I") @@ -354,7 +356,7 @@ public abstract class PathingEntity extends Entity { @OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V") protected final void method2685(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg1) { - Static102.anInt2680 = 0; + anInt2680 = 0; Static101.anInt2640 = 0; Static62.anInt1938 = 0; @Pc(21) BasType local21 = this.getBasType(); @@ -393,9 +395,9 @@ public abstract class PathingEntity extends Entity { if (Static101.anInt2640 != 0) { arg0.rotateX(Static101.anInt2640); } - Static102.anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF; - if (Static102.anInt2680 != 0) { - arg0.rotateZ(Static102.anInt2680); + anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF; + if (anInt2680 != 0) { + arg0.rotateZ(anInt2680); } Static62.anInt1938 = local224 + local87; if (local201 + local134 < Static62.anInt1938) { diff --git a/client/src/main/java/rt4/Player.java b/client/src/main/java/rt4/Player.java index f08f2a4..a597c41 100644 --- a/client/src/main/java/rt4/Player.java +++ b/client/src/main/java/rt4/Player.java @@ -390,8 +390,8 @@ public final class Player extends PathingEntity { if (Static101.anInt2640 != 0) { local184.rotateX(Static101.anInt2640); } - if (Static102.anInt2680 != 0) { - local184.rotateZ(Static102.anInt2680); + if (PathingEntity.anInt2680 != 0) { + local184.rotateZ(PathingEntity.anInt2680); } if (Static62.anInt1938 != 0) { local184.translate(0, Static62.anInt1938, 0); diff --git a/client/src/main/java/rt4/PlayerAppearance.java b/client/src/main/java/rt4/PlayerAppearance.java index 0c86cbf..1cd2c4f 100644 --- a/client/src/main/java/rt4/PlayerAppearance.java +++ b/client/src/main/java/rt4/PlayerAppearance.java @@ -40,6 +40,10 @@ public final class PlayerAppearance { public static final PlayerAppearance DEFAULT = new PlayerAppearance(); @OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I") public static final int[] FEMALE_FEATURES = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 }; + @OriginalMember(owner = "client!wh", name = "j", descriptor = "[Lclient!cl;") + public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14]; + @OriginalMember(owner = "client!vf", name = "g", descriptor = "[I") + public static final int[] anIntArray515 = new int[14]; @OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S") public static short[][] aShortArrayArray2; @OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S") @@ -366,16 +370,16 @@ public final class PlayerAppearance { local374 = arg0[local353].anInt5399; local367 = arg0[local353].anInt5398; local381 = local858.frames[local374]; - Static276.aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16); + aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16); local381 &= 0xFFFF; Static241.anIntArray520[local353] = local381; - if (Static276.aClass3_Sub2_Sub7Array8[local353] != null) { - local836 |= Static276.aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381); - local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381); + if (aClass3_Sub2_Sub7Array8[local353] != null) { + local836 |= aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381); + local827 |= aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381); local838 |= local858.aBoolean278; } if ((local858.tween || SeqType.applyTweening) && local367 != -1 && local367 < local858.frames.length) { - Static262.anIntArray515[local353] = local858.anIntArray474[local374]; + anIntArray515[local353] = local858.anIntArray474[local374]; Static73.anIntArray183[local353] = arg0[local353].anInt5404; local979 = local858.frames[local367]; Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16); @@ -386,7 +390,7 @@ public final class PlayerAppearance { local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991); } } else { - Static262.anIntArray515[local353] = 0; + anIntArray515[local353] = 0; Static73.anIntArray183[local353] = 0; Static133.aClass3_Sub2_Sub7Array7[local353] = null; anIntArray187[local353] = -1; @@ -463,8 +467,8 @@ public final class PlayerAppearance { local481 = 0; local598 = 1; while (local481 < local346) { - if (Static276.aClass3_Sub2_Sub7Array8[local481] != null) { - local1284.method4565(Static276.aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, Static262.anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]); + if (aClass3_Sub2_Sub7Array8[local481] != null) { + local1284.method4565(aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]); } local481++; local598 <<= 0x1; @@ -477,7 +481,7 @@ public final class PlayerAppearance { local1284.method4558(local1154, local979, local1156, local451, arg4 - 1, local457, arg2.aBoolean278); } for (local481 = 0; local481 < local346; local481++) { - Static276.aClass3_Sub2_Sub7Array8[local481] = null; + aClass3_Sub2_Sub7Array8[local481] = null; Static133.aClass3_Sub2_Sub7Array7[local481] = null; aClass144Array2[local481] = null; } diff --git a/client/src/main/java/rt4/Protocol.java b/client/src/main/java/rt4/Protocol.java index 8ea7a05..6762f2e 100644 --- a/client/src/main/java/rt4/Protocol.java +++ b/client/src/main/java/rt4/Protocol.java @@ -147,7 +147,7 @@ public class Protocol { if (local218 == 65535) { local218 = -1; } - Static92.method1881(Player.level, local39, local31, local19, local45, local23, local218); + SceneGraph.method1881(Player.level, local39, local31, local19, local45, local23, local218); } else if (opcode == ServerProt.LOCATION_PACKET_202) { int local15 = inboundBuffer.g1(); int local23 = local15 >> 2; @@ -164,7 +164,7 @@ public class Protocol { int local247 = inboundBuffer.g2(); int local633 = inboundBuffer.g2lesadd(); if (!GlRenderer.enabled) { - Static170.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228); + SceneGraph.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228); } } else if (opcode == ServerProt.LOCATION_PACKET_14) { int local15 = inboundBuffer.g1(); @@ -352,27 +352,27 @@ public class Protocol { if (!Static230.dynamicMapRegion) { local13 = inboundBuffer.g2sub(); local20 = (length - inboundBuffer.offset) / 16; - Static72.regionsXteaKeys = new int[local20][4]; + LoginManager.regionsXteaKeys = new int[local20][4]; for (local26 = 0; local26 < local20; local26++) { for (local31 = 0; local31 < 4; local31++) { - Static72.regionsXteaKeys[local26][local31] = inboundBuffer.g4me(); + LoginManager.regionsXteaKeys[local26][local31] = inboundBuffer.g4me(); } } local26 = inboundBuffer.g1ssub(); local31 = inboundBuffer.g2(); local60 = inboundBuffer.g2sub(); local64 = inboundBuffer.g2sub(); - Static238.regionBitPacked = new int[local20]; - Static273.mapFilesBuffer = new byte[local20][]; - Static191.npcSpawnsFilesBuffer = null; - Static99.underWaterMapFileIds = new int[local20]; - Static156.locationMapFilesBuffer = new byte[local20][]; - Static19.underWaterLocationsMapFilesBuffer = new byte[local20][]; - Static175.npcSpawnsFileIds = null; - Static36.mapFileIds = new int[local20]; - Static186.underWaterMapFilesBuffer = new byte[local20][]; - Static172.locationsMapFileIds = new int[local20]; - Static35.underWaterLocationsMapFileIds = new int[local20]; + LoginManager.regionBitPacked = new int[local20]; + LoginManager.mapFilesBuffer = new byte[local20][]; + LoginManager.npcSpawnsFilesBuffer = null; + LoginManager.underWaterMapFileIds = new int[local20]; + LoginManager.locationMapFilesBuffer = new byte[local20][]; + LoginManager.underWaterLocationsMapFilesBuffer = new byte[local20][]; + LoginManager.npcSpawnsFileIds = null; + LoginManager.mapFileIds = new int[local20]; + LoginManager.underWaterMapFilesBuffer = new byte[local20][]; + LoginManager.locationsMapFileIds = new int[local20]; + LoginManager.underWaterLocationsMapFileIds = new int[local20]; local20 = 0; @Pc(100) boolean local100 = false; if ((local31 / 8 == 48 || local31 / 8 == 49) && local60 / 8 == 48) { @@ -385,22 +385,22 @@ public class Protocol { for (local151 = (local60 - 6) / 8; local151 <= (local60 + 6) / 8; local151++) { local169 = (local138 << 8) + local151; if (local100 && (local151 == 49 || local151 == 149 || local151 == 147 || local138 == 50 || local138 == 49 && local151 == 47)) { - Static238.regionBitPacked[local20] = local169; - Static36.mapFileIds[local20] = -1; - Static172.locationsMapFileIds[local20] = -1; - Static99.underWaterMapFileIds[local20] = -1; - Static35.underWaterLocationsMapFileIds[local20] = -1; + LoginManager.regionBitPacked[local20] = local169; + LoginManager.mapFileIds[local20] = -1; + LoginManager.locationsMapFileIds[local20] = -1; + LoginManager.underWaterMapFileIds[local20] = -1; + LoginManager.underWaterLocationsMapFileIds[local20] = -1; } else { - Static238.regionBitPacked[local20] = local169; - Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) })); - Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) })); - Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) })); - Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) })); + LoginManager.regionBitPacked[local20] = local169; + LoginManager.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) })); + LoginManager.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) })); + LoginManager.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_772, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) })); + LoginManager.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1103, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) })); } local20++; } } - Static127.method2463(local26, local60, local31, local64, false, local13); + LoginManager.method2463(local26, local60, local31, local64, false, local13); return; } local13 = inboundBuffer.g2leadd(); @@ -423,24 +423,24 @@ public class Protocol { } inboundBuffer.accessBytes(); local60 = (length - inboundBuffer.offset) / 16; - Static72.regionsXteaKeys = new int[local60][4]; + LoginManager.regionsXteaKeys = new int[local60][4]; for (local64 = 0; local64 < local60; local64++) { for (local391 = 0; local391 < 4; local391++) { - Static72.regionsXteaKeys[local64][local391] = inboundBuffer.g4me(); + LoginManager.regionsXteaKeys[local64][local391] = inboundBuffer.g4me(); } } local64 = inboundBuffer.g2(); - Static35.underWaterLocationsMapFileIds = new int[local60]; - Static172.locationsMapFileIds = new int[local60]; - Static36.mapFileIds = new int[local60]; - Static19.underWaterLocationsMapFilesBuffer = new byte[local60][]; - Static175.npcSpawnsFileIds = null; - Static99.underWaterMapFileIds = new int[local60]; - Static156.locationMapFilesBuffer = new byte[local60][]; - Static273.mapFilesBuffer = new byte[local60][]; - Static238.regionBitPacked = new int[local60]; - Static191.npcSpawnsFilesBuffer = null; - Static186.underWaterMapFilesBuffer = new byte[local60][]; + LoginManager.underWaterLocationsMapFileIds = new int[local60]; + LoginManager.locationsMapFileIds = new int[local60]; + LoginManager.mapFileIds = new int[local60]; + LoginManager.underWaterLocationsMapFilesBuffer = new byte[local60][]; + LoginManager.npcSpawnsFileIds = null; + LoginManager.underWaterMapFileIds = new int[local60]; + LoginManager.locationMapFilesBuffer = new byte[local60][]; + LoginManager.mapFilesBuffer = new byte[local60][]; + LoginManager.regionBitPacked = new int[local60]; + LoginManager.npcSpawnsFilesBuffer = null; + LoginManager.underWaterMapFilesBuffer = new byte[local60][]; local60 = 0; for (local391 = 0; local391 < 4; local391++) { for (local138 = 0; local138 < 13; local138++) { @@ -452,26 +452,26 @@ public class Protocol { @Pc(571) int local571 = local561 / 8 + (local555 / 8 << 8); @Pc(573) int local573; for (local573 = 0; local573 < local60; local573++) { - if (local571 == Static238.regionBitPacked[local573]) { + if (local571 == LoginManager.regionBitPacked[local573]) { local571 = -1; break; } } if (local571 != -1) { - Static238.regionBitPacked[local60] = local571; + LoginManager.regionBitPacked[local60] = local571; @Pc(609) int local609 = local571 & 0xFF; local573 = local571 >> 8 & 0xFF; - Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) })); - Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) })); - Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) })); - Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) })); + LoginManager.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) })); + LoginManager.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) })); + LoginManager.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_772, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) })); + LoginManager.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1103, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) })); local60++; } } } } } - Static127.method2463(local26, local64, local20, local31, false, local13); + LoginManager.method2463(local26, local64, local20, local31, false, local13); } @OriginalMember(owner = "client!gk", name = "a", descriptor = "(IIBLclient!e;)V") @@ -1036,7 +1036,7 @@ public class Protocol { return true; } else if (opcode == ServerProt.CLEAR_MINIMAP_FLAG) { opcode = -1; - Static115.mapFlagX = 0; + LoginManager.mapFlagX = 0; return true; } else if (opcode == ServerProt.IF_SETSCROLLPOS) { int id = inboundBuffer.g4me(); @@ -1180,7 +1180,7 @@ public class Protocol { int optId = inboundBuffer.g1(); JagString option = inboundBuffer.gjstr(); if (optId >= 1 && optId <= 8) { - if (option.equalsIgnoreCase(Static92.NULL)) { + if (option.equalsIgnoreCase(MiniMenu.NULL)) { option = null; } Player.options[optId - 1] = option; @@ -1236,7 +1236,7 @@ public class Protocol { opcode = -1; return true; } else if (opcode == ServerProt.UPDATE_UID192) { - Static271.writeRandom(inboundBuffer); + writeRandom(inboundBuffer); opcode = -1; return true; } else if (opcode == ServerProt.RESET_CLIENT_VARCACHE) { @@ -1582,7 +1582,7 @@ public class Protocol { for (int i = 0; i < VarpDomain.activeVarps.length; i++) { if (VarpDomain.varp[i] != VarpDomain.activeVarps[i]) { VarpDomain.activeVarps[i] = VarpDomain.varp[i]; - Static85.refreshMagicVarp(i); + VarpDomain.refreshMagicVarp(i); VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i; } } @@ -1682,8 +1682,8 @@ public class Protocol { setVerifyId(tracknum); Static176.customCameraActive[cameraId] = true; Camera.cameraJitter[cameraId] = jitter; - Static276.cameraAmplitude[cameraId] = amplitude; - Static202.cameraFrequency[cameraId] = frequency; + Camera.cameraAmplitude[cameraId] = amplitude; + Camera.cameraFrequency[cameraId] = frequency; Static31.anIntArray76[cameraId] = shake4; opcode = -1; return true; @@ -1781,7 +1781,7 @@ public class Protocol { } else if (opcode == ServerProt.VARBIT_SMALL) { int value = inboundBuffer.g1add(); int id = inboundBuffer.g2le(); - Static272.setVarbit(value, id); + VarpDomain.setVarbit(value, id); opcode = -1; return true; } else if (opcode == ServerProt.IF_OPENTOP) { @@ -1891,7 +1891,7 @@ public class Protocol { x -= Camera.originX; z -= Camera.originZ; int plane = pos >> 28 & 0x3; - Static92.method1881(plane, rotation, type, z, type2, x, seqId); + SceneGraph.method1881(plane, rotation, type, z, type2, x, seqId); opcode = -1; return true; } else if (opcode == ServerProt.MESSAGE_PRIVATE) { @@ -2020,7 +2020,7 @@ public class Protocol { } else if (opcode == ServerProt.VARBIT_LARGE) { int value = inboundBuffer.g4le(); int id = inboundBuffer.g2leadd(); - Static272.setVarbit(value, id); + VarpDomain.setVarbit(value, id); opcode = -1; return true; } else if (opcode == ServerProt.UPDATE_INV_PARTIAL) { @@ -2065,7 +2065,7 @@ public class Protocol { opcode = -1; return true; } else if (opcode == ServerProt.LOGOUT) { - Static278.processLogout(); + LoginManager.processLogout(); opcode = -1; return false; } else if (opcode == ServerProt.GRAND_EXCHANGE_OFFERS) { @@ -2296,7 +2296,7 @@ public class Protocol { return true; } else { TracingException.report("T1 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length, null); - Static278.processLogout(); + LoginManager.processLogout(); return true; } } @@ -2314,7 +2314,7 @@ public class Protocol { local61 = local61 + inboundBuffer.data[local63] + ","; } TracingException.report(local61, local19); - Static278.processLogout(); + LoginManager.processLogout(); return true; } } @@ -2508,7 +2508,7 @@ public class Protocol { } // VarpDomain for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) { - Static85.refreshMagicVarp(i); + VarpDomain.refreshMagicVarp(i); VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i; } @Pc(782) int modelId; @@ -2686,7 +2686,7 @@ public class Protocol { outboundBuffer.p2add(Static18.anInt588); outboundBuffer.p1sub(local1363); } - } else if ((Static116.anInt2952 == 1 || Static277.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { + } else if ((Static116.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { Static226.method3901(); } else if (MiniMenu.size > 0) { Static59.method1372(); @@ -2730,7 +2730,7 @@ public class Protocol { priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead(); if (priorityRequest == null) { if (WorldMap.component == null) { - Static137.anInt3337 = 0; + Static36.anInt3337 = 0; } if (Static40.aClass13_14 != null) { ClientProt.method28(); @@ -2813,7 +2813,7 @@ public class Protocol { } } if (Camera.cameraType == 1) { - Static250.method4273(); + Camera.method4273(); } else if (Camera.cameraType == 2) { Camera.updateLockedCamera(); } else { @@ -2838,7 +2838,7 @@ public class Protocol { Static164.newTab = false; } Static131.anInt3251++; - Static82.anInt2252++; + MiniMap.anInt2252++; Static143.anInt3486++; if (Static143.anInt3486 > 500) { Static143.anInt3486 = 0; @@ -2853,24 +2853,24 @@ public class Protocol { Static132.anInt3291 += Static248.anInt4229; } } - if (Static82.anInt2252 > 500) { - Static82.anInt2252 = 0; + if (MiniMap.anInt2252 > 500) { + MiniMap.anInt2252 = 0; modelId = (int) (Math.random() * 8.0D); if ((modelId & 0x1) == 1) { - Static59.anInt1814 += Static263.anInt5755; + MiniMap.anInt1814 += MiniMap.anInt5755; } if ((modelId & 0x2) == 2) { - MiniMap.anInt4130 += Static179.anInt4262; + MiniMap.anInt4130 += MiniMap.anInt4262; } } if (Static132.anInt3291 < -50) { Static248.anInt4229 = 2; } - if (Static59.anInt1814 < -60) { - Static263.anInt5755 = 2; + if (MiniMap.anInt1814 < -60) { + MiniMap.anInt5755 = 2; } if (MiniMap.anInt4130 < -20) { - Static179.anInt4262 = 1; + MiniMap.anInt4262 = 1; } if (Static206.anInt4774 < -55) { anInt659 = 2; @@ -2888,10 +2888,10 @@ public class Protocol { Static220.anInt4941 = -1; } if (MiniMap.anInt4130 > 10) { - Static179.anInt4262 = -1; + MiniMap.anInt4262 = -1; } - if (Static59.anInt1814 > 60) { - Static263.anInt5755 = -2; + if (MiniMap.anInt1814 > 60) { + MiniMap.anInt5755 = -2; } if (Static131.anInt3251 > 50) { outboundBuffer.p1isaac(93); @@ -3201,4 +3201,16 @@ public class Protocol { outboundBuffer.p1isaac(177); outboundBuffer.p2(verifyId); } + + @OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V") + public static void writeRandom(@OriginalArg(0) Buffer arg0) { + if (client.uid != null) { + try { + client.uid.seek(0L); + client.uid.write(arg0.data, arg0.offset, 24); + } catch (@Pc(16) Exception local16) { + } + } + arg0.offset += 24; + } } diff --git a/client/src/main/java/rt4/SceneGraph.java b/client/src/main/java/rt4/SceneGraph.java index 151ba45..e354ffa 100644 --- a/client/src/main/java/rt4/SceneGraph.java +++ b/client/src/main/java/rt4/SceneGraph.java @@ -68,6 +68,12 @@ public class SceneGraph { public static Scenery[] aClass31Array2; @OriginalMember(owner = "client!gf", name = "O", descriptor = "[[[I") public static int[][][] underwaterTileHeights; + @OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;") + public static GlTile[][] underwaterHdTiles; + @OriginalMember(owner = "client!jm", name = "r", descriptor = "I") + public static int anInt3114; + @OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B") + public static byte[][][] aByteArrayArrayArray13; @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") public static boolean allLevelsAreVisible() { @@ -316,4 +322,223 @@ public class SceneGraph { @Pc(7) Tile local7 = tiles[arg0][arg1][arg2]; return local7 == null || local7.groundDecor == null ? 0L : local7.groundDecor.key; } + + @OriginalMember(owner = "client!wj", name = "a", descriptor = "(Z)V") + public static void setRenderTiles(@OriginalArg(0) boolean arg0) { + if (arg0) { + tiles = underWaterGroundTiles; + tileHeights = underwaterTileHeights; + underwaterHdTiles = underWaterHdTiles; + } else { + tiles = surfaceGroundTiles; + tileHeights = surfaceTileHeights; + underwaterHdTiles = surfaceHdTiles; + } + anInt3114 = tiles.length; + } + + @OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIZLclient!wa;IIBII)V") + public static void readTile(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) Buffer arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { + @Pc(32) int local32; + if (arg5 < 0 || arg5 >= 104 || arg4 < 0 || arg4 >= 104) { + while (true) { + local32 = arg3.g1(); + if (local32 == 0) { + break; + } + if (local32 == 1) { + arg3.g1(); + break; + } + if (local32 <= 49) { + arg3.g1(); + } + } + return; + } + if (!arg2) { + tileFlags[arg7][arg5][arg4] = 0; + } + while (true) { + local32 = arg3.g1(); + if (local32 == 0) { + if (arg2) { + tileHeights[0][arg5][arg4] = surfaceTileHeights[0][arg5][arg4]; + } else if (arg7 == 0) { + tileHeights[0][arg5][arg4] = -PerlinNoise.getTileHeight(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8; + } else { + tileHeights[arg7][arg5][arg4] = tileHeights[arg7 - 1][arg5][arg4] - 240; + } + break; + } + if (local32 == 1) { + @Pc(111) int local111 = arg3.g1(); + if (arg2) { + tileHeights[0][arg5][arg4] = surfaceTileHeights[0][arg5][arg4] + local111 * 8; + } else { + if (local111 == 1) { + local111 = 0; + } + if (arg7 == 0) { + tileHeights[0][arg5][arg4] = -local111 * 8; + } else { + tileHeights[arg7][arg5][arg4] = tileHeights[arg7 - 1][arg5][arg4] - local111 * 8; + } + } + break; + } + if (local32 <= 49) { + tileOverlays[arg7][arg5][arg4] = arg3.g1s(); + tileShapes[arg7][arg5][arg4] = (byte) ((local32 - 2) / 4); + tileAngles[arg7][arg5][arg4] = (byte) (local32 + arg6 - 2 & 0x3); + } else if (local32 > 81) { + tileUnderlays[arg7][arg5][arg4] = (byte) (local32 - 81); + } else if (!arg2) { + tileFlags[arg7][arg5][arg4] = (byte) (local32 - 49); + } + } + } + + @OriginalMember(owner = "client!hd", name = "a", descriptor = "(IIIIIIII)V") + public static void method1881(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { + if (arg5 < 0 || arg3 < 0 || arg5 >= 103 || arg3 >= 103) { + return; + } + @Pc(38) int local38; + if (arg4 == 0) { + @Pc(28) Wall local28 = getWall(arg0, arg5, arg3); + if (local28 != null) { + local38 = Integer.MAX_VALUE & (int) (local28.key >>> 32); + if (arg2 == 2) { + local28.primary = new Loc(local38, 2, arg1 + 4, arg0, arg5, arg3, arg6, false, local28.primary); + local28.aClass8_6 = new Loc(local38, 2, arg1 + 1 & 0x3, arg0, arg5, arg3, arg6, false, local28.aClass8_6); + } else { + local28.primary = new Loc(local38, arg2, arg1, arg0, arg5, arg3, arg6, false, local28.primary); + } + } + } + if (arg4 == 1) { + @Pc(106) WallDecor local106 = getWallDecor(arg0, arg5, arg3); + if (local106 != null) { + local38 = (int) (local106.key >>> 32) & Integer.MAX_VALUE; + if (arg2 == 4 || arg2 == 5) { + local106.primary = new Loc(local38, 4, arg1, arg0, arg5, arg3, arg6, false, local106.primary); + } else if (arg2 == 6) { + local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary); + } else if (arg2 == 7) { + local106.primary = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.primary); + } else if (arg2 == 8) { + local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary); + local106.aClass8_2 = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_2); + } + } + } + if (arg4 == 2) { + if (arg2 == 11) { + arg2 = 10; + } + @Pc(255) Scenery local255 = getScenery(arg0, arg5, arg3); + if (local255 != null) { + local255.primary = new Loc((int) (local255.key >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.primary); + } + } + if (arg4 == 3) { + @Pc(290) GroundDecor local290 = getGroundDecor(arg0, arg5, arg3); + if (local290 != null) { + local290.primary = new Loc(Integer.MAX_VALUE & (int) (local290.key >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.primary); + } + } + } + + @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIILclient!th;JZ)V") + public static void method2570(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) long arg5, @OriginalArg(6) boolean arg6) { + if (arg4 == null) { + return; + } + @Pc(6) GroundDecor local6 = new GroundDecor(); + local6.primary = arg4; + local6.anInt732 = arg1 * 128 + 64; + local6.anInt736 = arg2 * 128 + 64; + local6.anInt733 = arg3; + local6.key = arg5; + local6.aBoolean49 = arg6; + if (tiles[arg0][arg1][arg2] == null) { + tiles[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2); + } + tiles[arg0][arg1][arg2].groundDecor = local6; + } + + @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V") + public static void method2574(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) { + @Pc(7) AttachLocRequest local7 = new AttachLocRequest(); + local7.angle = arg6; + local7.anInt1205 = arg3; + local7.anInt1187 = arg1; + local7.anInt1200 = arg5; + local7.entityId = arg2; + local7.x = arg8; + local7.anInt1197 = arg10; + local7.z = arg4; + local7.locId = arg11; + local7.anInt1188 = arg7; + local7.anInt1191 = arg0; + local7.shape = arg9; + AttachLocRequest.queue.addTail(local7); + } + + @OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I") + public static int method2251(@OriginalArg(0) int arg0) { + @Pc(11) int local11 = arg0 & 0x3F; + @Pc(17) int local17 = arg0 >> 6 & 0x3; + if (local11 == 18) { + if (local17 == 0) { + return 1; + } + if (local17 == 1) { + return 2; + } + if (local17 == 2) { + return 4; + } + if (local17 == 3) { + return 8; + } + } else if (local11 == 19 || local11 == 21) { + if (local17 == 0) { + return 16; + } + if (local17 == 1) { + return 32; + } + if (local17 == 2) { + return 64; + } + if (local17 == 3) { + return 128; + } + } + return 0; + } + + @OriginalMember(owner = "client!vf", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIJ)V") + public static void method4508(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8) { + if (arg4 == null && arg5 == null) { + return; + } + @Pc(8) Wall local8 = new Wall(); + local8.key = arg8; + local8.anInt3048 = arg1 * 128 + 64; + local8.anInt3044 = arg2 * 128 + 64; + local8.anInt3051 = arg3; + local8.primary = arg4; + local8.aClass8_6 = arg5; + local8.anInt3049 = arg6; + local8.anInt3052 = arg7; + for (@Pc(42) int local42 = arg0; local42 >= 0; local42--) { + if (tiles[local42][arg1][arg2] == null) { + tiles[local42][arg1][arg2] = new Tile(local42, arg1, arg2); + } + } + tiles[arg0][arg1][arg2].wall = local8; + } } diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java index a5065f9..773f0d8 100644 --- a/client/src/main/java/rt4/ScriptRunner.java +++ b/client/src/main/java/rt4/ScriptRunner.java @@ -3716,7 +3716,7 @@ public final class ScriptRunner { if (opcode == 6017) { isp--; Preferences.stereo = intStack[isp] == 1; - Static211.method930(); + client.method930(); Preferences.write(GameShell.signLink); Preferences.sentToServer = false; continue; @@ -4277,25 +4277,25 @@ public final class ScriptRunner { if (opcode == Cs2Opcodes.isValidChar) { isp--; int1 = intStack[isp]; - intStack[isp++] = isValidChar(int1) ? 1 : 0; + intStack[isp++] = StringUtils.isValidChar(int1) ? 1 : 0; continue; } if (opcode == Cs2Opcodes.isAlphaNumeric) { isp--; int1 = intStack[isp]; - intStack[isp++] = Static83.isAlphaNumeric(int1) ? 1 : 0; + intStack[isp++] = StringUtils.isAlphaNumeric(int1) ? 1 : 0; continue; } if (opcode == Cs2Opcodes.isLetter) { isp--; int1 = intStack[isp]; - intStack[isp++] = Static258.isLetter(int1) ? 1 : 0; + intStack[isp++] = StringUtils.isLetter(int1) ? 1 : 0; continue; } if (opcode == Cs2Opcodes.isDigit) { isp--; int1 = intStack[isp]; - intStack[isp++] = Static24.isDigit(int1) ? 1 : 0; + intStack[isp++] = StringUtils.isDigit(int1) ? 1 : 0; continue; } if (opcode == Cs2Opcodes.length) { @@ -4498,14 +4498,4 @@ public final class ScriptRunner { run(200000, request); } - @OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z") - public static boolean isValidChar(@OriginalArg(1) int arg0) { - if (arg0 >= 32 && arg0 <= 126) { - return true; - } else if (arg0 >= 160 && arg0 <= 255) { - return true; - } else { - return arg0 == 128 || arg0 == 140 || arg0 == 151 || arg0 == 156 || arg0 == 159; - } - } } diff --git a/client/src/main/java/rt4/SoftLruHashTable.java b/client/src/main/java/rt4/SoftLruHashTable.java index 713c034..4b59062 100644 --- a/client/src/main/java/rt4/SoftLruHashTable.java +++ b/client/src/main/java/rt4/SoftLruHashTable.java @@ -30,6 +30,17 @@ public final class SoftLruHashTable { this.aClass133_18 = new HashTable(local11); } + @OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V") + public static void method1772(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) SecondaryNode arg1) { + if (arg1.aClass3_Sub2_66 != null) { + arg1.method4365(); + } + arg1.aClass3_Sub2_66 = arg0; + arg1.aClass3_Sub2_67 = arg0.aClass3_Sub2_67; + arg1.aClass3_Sub2_66.aClass3_Sub2_67 = arg1; + arg1.aClass3_Sub2_67.aClass3_Sub2_66 = arg1; + } + @OriginalMember(owner = "client!n", name = "a", descriptor = "(BLjava/lang/Object;J)V") public final void put(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) { this.method3098(arg1); @@ -82,7 +93,7 @@ public final class SoftLruHashTable { } else if (++local9.secondaryKey > (long) arg0) { @Pc(33) ReferenceNode local33 = ReferenceNodeFactory.SOFT_REFERENCE_NODE_FACTORY.create(local9); this.aClass133_18.put(local33, local9.key); - Static84.method1772(local9, local33); + method1772(local9, local33); local9.unlink(); local9.method4365(); } diff --git a/client/src/main/java/rt4/SoftwareModel.java b/client/src/main/java/rt4/SoftwareModel.java index afbd1d9..fc0b3e9 100644 --- a/client/src/main/java/rt4/SoftwareModel.java +++ b/client/src/main/java/rt4/SoftwareModel.java @@ -862,7 +862,7 @@ public final class SoftwareModel extends Model { } if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) { if (this.aBoolean303) { - Static259.aLongArray11[Static2.anInt7++] = arg8; + Model.aLongArray11[Static2.anInt7++] = arg8; } else { local190 = true; } @@ -1628,7 +1628,7 @@ public final class SoftwareModel extends Model { } } else { if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) { - Static259.aLongArray11[Static2.anInt7++] = arg2; + Model.aLongArray11[Static2.anInt7++] = arg2; arg1 = false; } if ((local65 - local69) * (anIntArray551[local61] - anIntArray551[local56]) - (anIntArray551[local51] - anIntArray551[local56]) * (local73 - local69) > 0) { diff --git a/client/src/main/java/rt4/SpriteLoader.java b/client/src/main/java/rt4/SpriteLoader.java index 192304a..5f8801e 100644 --- a/client/src/main/java/rt4/SpriteLoader.java +++ b/client/src/main/java/rt4/SpriteLoader.java @@ -315,11 +315,33 @@ public class SpriteLoader { @OriginalMember(owner = "client!da", name = "a", descriptor = "(ILclient!ve;Z)Lclient!ok;") public static IndexedSprite loadIndexedSpriteAutoDetect(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1) { - return decode(arg1, arg0) ? Static276.method4614() : null; + return decode(arg1, arg0) ? method4614() : null; } @OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;") public static Sprite loadSpriteAutoDetect(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) { return decode(arg0, arg1) ? method1764() : null; } + + @OriginalMember(owner = "client!wh", name = "b", descriptor = "(B)Lclient!ok;") + public static IndexedSprite method4614() { + @Pc(27) IndexedSprite local27; + if (GlRenderer.enabled) { + local27 = new GlIndexedSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], pixels[0], palette); + } else { + local27 = new SoftwareIndexedSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], pixels[0], palette); + } + clear(); + return local27; + } + + @OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;") + public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) { + return decode(arg1, 0, arg0) ? Static134.method2619() : null; + } + + @OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;") + public static SoftwareSprite method3117(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) { + return decode(arg0, arg1) ? method3537() : null; + } } diff --git a/client/src/main/java/rt4/Static1.java b/client/src/main/java/rt4/Static1.java index 6f54c94..443ad0a 100644 --- a/client/src/main/java/rt4/Static1.java +++ b/client/src/main/java/rt4/Static1.java @@ -6,7 +6,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static1 { - @OriginalMember(owner = "client!a", name = "h", descriptor = "I") + @OriginalMember(owner = "client!wi", name = "hb", descriptor = "[[Z") + public static final boolean[][] aBooleanArrayArray4 = new boolean[][] { { true, true, true }, { false, false }, { false, true }, { true, false }, { false, true, true }, { true, false, true }, { false, true, false }, { true, false, false } }; + @OriginalMember(owner = "client!kc", name = "s", descriptor = "[I") + public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 }; + @OriginalMember(owner = "client!a", name = "h", descriptor = "I") public static int anInt5; @OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;") @@ -83,9 +87,9 @@ public final class Static1 { if (local242.aBoolean310 && local242.anInt5899 != -1) { local264 = arg5[local12 - 1][local17 + 1]; local274 = arg7[local12 - 1][local17 + 1]; - local287 = Static130.anIntArray300[local274 * 4 + (local264 + 2 & 0x3)]; - local299 = Static130.anIntArray300[(local264 + 3 & 0x3) + local274 * 4]; - if (!Static277.aBooleanArrayArray4[local299][1] || !Static277.aBooleanArrayArray4[local287][0]) { + local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)]; + local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4]; + if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) { for (local317 = 0; local317 < 8; local317++) { if (local317 == 0) { local127++; @@ -104,9 +108,9 @@ public final class Static1 { if (local242.aBoolean310 && local242.anInt5899 != -1) { local264 = arg5[local12 - 1][local17 - 1]; local274 = arg7[local12 - 1][local17 - 1]; - local287 = Static130.anIntArray300[local274 * 4 + (local264 & 0x3)]; - local299 = Static130.anIntArray300[(local264 + 3 & 0x3) + local274 * 4]; - if (!Static277.aBooleanArrayArray4[local287][1] || !Static277.aBooleanArrayArray4[local299][0]) { + local287 = anIntArray300[local274 * 4 + (local264 & 0x3)]; + local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4]; + if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) { for (local317 = 0; local317 < 8; local317++) { if (local127 == local317) { local166[local127++] = local214; @@ -124,9 +128,9 @@ public final class Static1 { if (local242.aBoolean310 && local242.anInt5899 != -1) { local264 = arg5[local12 + 1][local17 - 1]; local274 = arg7[local12 + 1][local17 - 1]; - local299 = Static130.anIntArray300[local274 * 4 + (local264 + 1 & 0x3)]; - local287 = Static130.anIntArray300[local274 * 4 + (local264 & 0x3)]; - if (!Static277.aBooleanArrayArray4[local299][1] || !Static277.aBooleanArrayArray4[local287][0]) { + local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)]; + local287 = anIntArray300[local274 * 4 + (local264 & 0x3)]; + if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) { for (local317 = 0; local317 < 8; local317++) { if (local127 == local317) { local166[local127++] = local202; @@ -144,9 +148,9 @@ public final class Static1 { if (local242.aBoolean310 && local242.anInt5899 != -1) { local264 = arg5[local12 + 1][local17 + 1]; local274 = arg7[local12 + 1][local17 + 1]; - local299 = Static130.anIntArray300[local274 * 4 + (local264 + 1 & 0x3)]; - local287 = Static130.anIntArray300[local274 * 4 + (local264 + 2 & 0x3)]; - if (!Static277.aBooleanArrayArray4[local287][1] || !Static277.aBooleanArrayArray4[local299][0]) { + local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)]; + local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)]; + if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) { for (local317 = 0; local317 < 8; local317++) { if (local127 == local317) { local166[local127++] = local226; @@ -162,7 +166,7 @@ public final class Static1 { if (local143 != 0 && local38 != local143) { local242 = FloTypeList.method4395(local143 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { - local129 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; + local129 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; for (local777 = 0; local777 < 8; local777++) { if (local127 == local777) { local166[local127++] = local143; @@ -177,7 +181,7 @@ public final class Static1 { if (local163 != 0 && local38 != local163) { local242 = FloTypeList.method4395(local163 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { - local133 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; + local133 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; for (local777 = 0; local777 < 8; local777++) { if (local127 == local777) { local166[local127++] = local163; @@ -192,7 +196,7 @@ public final class Static1 { if (local153 != 0 && local38 != local153) { local242 = FloTypeList.method4395(local153 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { - local131 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; + local131 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; for (local777 = 0; local777 < 8; local777++) { if (local777 == local127) { local166[local127++] = local153; @@ -207,7 +211,7 @@ public final class Static1 { if (local190 != 0 && local38 != local190) { local242 = FloTypeList.method4395(local190 - 1); if (local242.aBoolean310 && local242.anInt5899 != -1) { - local168 = Static130.anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4]; + local168 = anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4]; for (local777 = 0; local777 < 8; local777++) { if (local127 == local777) { local166[local127++] = local190; @@ -221,10 +225,10 @@ public final class Static1 { } for (local1035 = 0; local1035 < local127; local1035++) { local777 = local166[local1035]; - local1055 = Static277.aBooleanArrayArray4[local163 == local777 ? local133 : 0]; - local1068 = Static277.aBooleanArrayArray4[local777 == local153 ? local131 : 0]; - @Pc(1077) boolean[] local1077 = Static277.aBooleanArrayArray4[local143 == local777 ? local129 : 0]; - local1086 = Static277.aBooleanArrayArray4[local190 == local777 ? local168 : 0]; + local1055 = aBooleanArrayArray4[local163 == local777 ? local133 : 0]; + local1068 = aBooleanArrayArray4[local777 == local153 ? local131 : 0]; + @Pc(1077) boolean[] local1077 = aBooleanArrayArray4[local143 == local777 ? local129 : 0]; + local1086 = aBooleanArrayArray4[local190 == local777 ? local168 : 0]; @Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1); @Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092); local1097.anInt2482 += 5; @@ -291,9 +295,9 @@ public final class Static1 { if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local274 = arg5[local12 - 1][local17 + 1]; local1527 = arg7[local12 - 1][local17 + 1]; - local299 = Static130.anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)]; - local317 = Static130.anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)]; - if (Static277.aBooleanArrayArray4[local317][1] && Static277.aBooleanArrayArray4[local299][0]) { + local299 = anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)]; + local317 = anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)]; + if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) { local214 = 0; } else { for (local1571 = 0; local1571 < 8; local1571++) { @@ -318,9 +322,9 @@ public final class Static1 { if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local274 = arg5[local12 - 1][local17 - 1]; local1527 = arg7[local12 - 1][local17 - 1]; - local299 = Static130.anIntArray300[(local274 & 0x3) + local1527 * 4]; - local317 = Static130.anIntArray300[(local274 + 3 & 0x3) + local1527 * 4]; - if (Static277.aBooleanArrayArray4[local299][1] && Static277.aBooleanArrayArray4[local317][0]) { + local299 = anIntArray300[(local274 & 0x3) + local1527 * 4]; + local317 = anIntArray300[(local274 + 3 & 0x3) + local1527 * 4]; + if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) { local202 = 0; } else { for (local1571 = 0; local1571 < 8; local1571++) { @@ -344,9 +348,9 @@ public final class Static1 { if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local274 = arg5[local12 + 1][local17 - 1]; local1527 = arg7[local12 + 1][local17 - 1]; - local317 = Static130.anIntArray300[(local274 + 1 & 0x3) + local1527 * 4]; - local299 = Static130.anIntArray300[local1527 * 4 + (local274 & 0x3)]; - if (Static277.aBooleanArrayArray4[local317][1] && Static277.aBooleanArrayArray4[local299][0]) { + local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4]; + local299 = anIntArray300[local1527 * 4 + (local274 & 0x3)]; + if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) { local226 = 0; } else { for (local1571 = 0; local1571 < 8; local1571++) { @@ -370,9 +374,9 @@ public final class Static1 { if (local1496.aBoolean310 && local1496.anInt5899 != -1) { local1527 = arg7[local12 + 1][local17 + 1]; local274 = arg5[local12 + 1][local17 + 1]; - local299 = Static130.anIntArray300[(local274 + 2 & 0x3) + local1527 * 4]; - local317 = Static130.anIntArray300[(local274 + 1 & 0x3) + local1527 * 4]; - if (Static277.aBooleanArrayArray4[local299][1] && Static277.aBooleanArrayArray4[local317][0]) { + local299 = anIntArray300[(local274 + 2 & 0x3) + local1527 * 4]; + local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4]; + if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) { local1035 = 0; } else { for (local1571 = 0; local1571 < 8; local1571++) { @@ -393,7 +397,7 @@ public final class Static1 { if (local163 != 0 && local163 != local127) { local1496 = FloTypeList.method4395(local163 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { - local133 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; + local133 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; for (local2003 = 0; local2003 < 8; local2003++) { if (local2003 == local1386) { local1382[local1386++] = local163; @@ -408,7 +412,7 @@ public final class Static1 { if (local153 != 0 && local127 != local153) { local1496 = FloTypeList.method4395(local153 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { - local131 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; + local131 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; for (local2003 = 0; local2003 < 8; local2003++) { if (local1386 == local2003) { local1382[local1386++] = local153; @@ -423,7 +427,7 @@ public final class Static1 { if (local190 != 0 && local190 != local127) { local1496 = FloTypeList.method4395(local190 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { - local168 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; + local168 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; for (local2003 = 0; local2003 < 8; local2003++) { if (local1386 == local2003) { local1382[local1386++] = local190; @@ -438,7 +442,7 @@ public final class Static1 { if (local180 != 0 && local180 != local127) { local1496 = FloTypeList.method4395(local180 - 1); if (local1496.aBoolean310 && local1496.anInt5899 != -1) { - local143 = Static130.anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)]; + local143 = anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)]; for (local2003 = 0; local2003 < 8; local2003++) { if (local2003 == local1386) { local1382[local1386++] = local180; @@ -452,10 +456,10 @@ public final class Static1 { } for (local777 = 0; local777 < local1386; local777++) { local2003 = local1382[local777]; - local1055 = Static277.aBooleanArrayArray4[local2003 == local163 ? local133 : 0]; - local1068 = Static277.aBooleanArrayArray4[local153 == local2003 ? local131 : 0]; - local1086 = Static277.aBooleanArrayArray4[local2003 == local190 ? local168 : 0]; - @Pc(2318) boolean[] local2318 = Static277.aBooleanArrayArray4[local2003 == local180 ? local143 : 0]; + local1055 = aBooleanArrayArray4[local2003 == local163 ? local133 : 0]; + local1068 = aBooleanArrayArray4[local153 == local2003 ? local131 : 0]; + local1086 = aBooleanArrayArray4[local2003 == local190 ? local168 : 0]; + @Pc(2318) boolean[] local2318 = aBooleanArrayArray4[local2003 == local180 ? local143 : 0]; @Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1); @Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324); @Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF; diff --git a/client/src/main/java/rt4/Static102.java b/client/src/main/java/rt4/Static102.java deleted file mode 100644 index 1c4dcac..0000000 --- a/client/src/main/java/rt4/Static102.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static102 { - - @OriginalMember(owner = "client!hn", name = "Y", descriptor = "I") - public static int anInt2680 = 0; - -} diff --git a/client/src/main/java/rt4/Static103.java b/client/src/main/java/rt4/Static103.java index 8f05850..35d804d 100644 --- a/client/src/main/java/rt4/Static103.java +++ b/client/src/main/java/rt4/Static103.java @@ -11,8 +11,6 @@ public final class Static103 { @OriginalMember(owner = "client!i", name = "ec", descriptor = "[I") public static int[] anIntArray254; - @OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;") - public static final JagString aClass100_558 = JagString.parse("m"); @OriginalMember(owner = "client!ig", name = "d", descriptor = "I") public static int anInt2883; @OriginalMember(owner = "client!jm", name = "s", descriptor = "F") diff --git a/client/src/main/java/rt4/Static104.java b/client/src/main/java/rt4/Static104.java deleted file mode 100644 index 653d1fc..0000000 --- a/client/src/main/java/rt4/Static104.java +++ /dev/null @@ -1,43 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static104 { - - @OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I") - public static int method2251(@OriginalArg(0) int arg0) { - @Pc(11) int local11 = arg0 & 0x3F; - @Pc(17) int local17 = arg0 >> 6 & 0x3; - if (local11 == 18) { - if (local17 == 0) { - return 1; - } - if (local17 == 1) { - return 2; - } - if (local17 == 2) { - return 4; - } - if (local17 == 3) { - return 8; - } - } else if (local11 == 19 || local11 == 21) { - if (local17 == 0) { - return 16; - } - if (local17 == 1) { - return 32; - } - if (local17 == 2) { - return 64; - } - if (local17 == 3) { - return 128; - } - } - return 0; - } - -} diff --git a/client/src/main/java/rt4/Static110.java b/client/src/main/java/rt4/Static110.java index b8b89e7..67a1e77 100644 --- a/client/src/main/java/rt4/Static110.java +++ b/client/src/main/java/rt4/Static110.java @@ -7,7 +7,7 @@ public final class Static110 { @OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V") public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) { - Static182.aClass3_Sub14ArrayArray2[arg0] = arg1; + SceneGraph.underwaterHdTiles[arg0] = arg1; } } diff --git a/client/src/main/java/rt4/Static112.java b/client/src/main/java/rt4/Static112.java index 3cbdddf..3cb5335 100644 --- a/client/src/main/java/rt4/Static112.java +++ b/client/src/main/java/rt4/Static112.java @@ -5,7 +5,10 @@ import org.openrs2.deob.annotation.Pc; public final class Static112 { - @OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V") + @OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;") + public static Sprite aClass3_Sub2_Sub1_6; + + @OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V") public static void method2297() { @Pc(3) int local3 = Static183.anInt4271; @Pc(9) int local9 = Static229.anInt5138; @@ -63,9 +66,9 @@ public final class Static112 { } } } - if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static40.anInt2261) && client.js5Archive8.isFileReady(Static40.anInt3324) && client.js5Archive8.isFileReady(Static40.anInt5556)) { + if ((Static165.aClass3_Sub2_Sub1_8 == null || aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static40.anInt2261) && client.js5Archive8.isFileReady(Static40.anInt3324) && client.js5Archive8.isFileReady(Static40.anInt5556)) { Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt2261); - Static92.aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt3324); + aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt3324); Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt5556); if (GlRenderer.enabled) { if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) { @@ -73,10 +76,10 @@ public final class Static112 { } else { Static165.aClass3_Sub2_Sub1_8 = new GlSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8); } - if (Static92.aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) { - Static92.aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6); + if (aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) { + aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_6); } else { - Static92.aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6); + aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_6); } if (Static204.aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) { Static204.aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10); @@ -86,15 +89,15 @@ public final class Static112 { } } @Pc(418) int local418; - if (Static165.aClass3_Sub2_Sub1_8 != null && Static92.aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) { + if (Static165.aClass3_Sub2_Sub1_8 != null && aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) { local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width; for (local219 = 0; local219 < local203; local219++) { Static165.aClass3_Sub2_Sub1_8.render(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height); } - local219 = (local11 - 20) / Static92.aClass3_Sub2_Sub1_6.height; + local219 = (local11 - 20) / aClass3_Sub2_Sub1_6.height; for (local418 = 0; local418 < local219; local418++) { - Static92.aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * Static92.aClass3_Sub2_Sub1_6.height + 20); - Static92.aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - Static92.aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * Static92.aClass3_Sub2_Sub1_6.height); + aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * aClass3_Sub2_Sub1_6.height + 20); + aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * aClass3_Sub2_Sub1_6.height); } Static204.aClass3_Sub2_Sub1_10.render(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height); Static204.aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height); diff --git a/client/src/main/java/rt4/Static115.java b/client/src/main/java/rt4/Static115.java index 5e0bf3d..a47e794 100644 --- a/client/src/main/java/rt4/Static115.java +++ b/client/src/main/java/rt4/Static115.java @@ -15,9 +15,6 @@ public final class Static115 { @OriginalMember(owner = "client!ja", name = "j", descriptor = "I") public static int anInt2937 = 0; - @OriginalMember(owner = "client!ja", name = "n", descriptor = "I") - public static int mapFlagX = 0; - @OriginalMember(owner = "client!ja", name = "r", descriptor = "I") public static int anInt2941 = -1; diff --git a/client/src/main/java/rt4/Static12.java b/client/src/main/java/rt4/Static12.java index 98655ec..ec19519 100644 --- a/client/src/main/java/rt4/Static12.java +++ b/client/src/main/java/rt4/Static12.java @@ -7,7 +7,4 @@ public final class Static12 { @OriginalMember(owner = "client!bb", name = "M", descriptor = "I") public static int anInt406; - @OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B") - public static final byte[][] aByteArrayArray2 = new byte[250][]; - } diff --git a/client/src/main/java/rt4/Static123.java b/client/src/main/java/rt4/Static123.java index c043c93..e505c7b 100644 --- a/client/src/main/java/rt4/Static123.java +++ b/client/src/main/java/rt4/Static123.java @@ -13,8 +13,10 @@ public final class Static123 { @OriginalMember(owner = "client!ml", name = "K", descriptor = "I") public static int anInt3947; + @OriginalMember(owner = "client!wi", name = "db", descriptor = "I") + public static int tileVisibilityDistance; - @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V") + @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V") public static void topBannerRefresh() { if (!client.advertSuppressed && client.modeWhere != 2) { try { @@ -42,15 +44,15 @@ public final class Static123 { @Pc(158) int local158; @Pc(137) boolean local137; if (local10.anInt4453 == 1) { - local14 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; - if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { - local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; + local14 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069; + if (local14 >= 0 && local14 <= tileVisibilityDistance + tileVisibilityDistance) { + local115 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539; if (local115 < 0) { local115 = 0; } - local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539; - if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { - local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; + local126 = local10.anInt4464 + tileVisibilityDistance - Static193.anInt4539; + if (local126 > tileVisibilityDistance + tileVisibilityDistance) { + local126 = tileVisibilityDistance + tileVisibilityDistance; } local137 = false; while (local115 <= local126) { @@ -78,15 +80,15 @@ public final class Static123 { } } } else if (local10.anInt4453 == 2) { - local14 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; - if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { - local115 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; + local14 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539; + if (local14 >= 0 && local14 <= tileVisibilityDistance + tileVisibilityDistance) { + local115 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069; if (local115 < 0) { local115 = 0; } - local126 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069; - if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { - local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; + local126 = local10.anInt4446 + tileVisibilityDistance - Static167.anInt4069; + if (local126 > tileVisibilityDistance + tileVisibilityDistance) { + local126 = tileVisibilityDistance + tileVisibilityDistance; } local137 = false; while (local115 <= local126) { @@ -116,22 +118,22 @@ public final class Static123 { } else if (local10.anInt4453 == 4) { local14 = local10.anInt4444 - anInt3947; if (local14 > 128) { - local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; + local115 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539; if (local115 < 0) { local115 = 0; } - local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539; - if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { - local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; + local126 = local10.anInt4464 + tileVisibilityDistance - Static193.anInt4539; + if (local126 > tileVisibilityDistance + tileVisibilityDistance) { + local126 = tileVisibilityDistance + tileVisibilityDistance; } if (local115 <= local126) { - @Pc(408) int local408 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; + @Pc(408) int local408 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069; if (local408 < 0) { local408 = 0; } - local158 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069; - if (local158 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { - local158 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; + local158 = local10.anInt4446 + tileVisibilityDistance - Static167.anInt4069; + if (local158 > tileVisibilityDistance + tileVisibilityDistance) { + local158 = tileVisibilityDistance + tileVisibilityDistance; } @Pc(430) boolean local430 = false; label166: for (@Pc(432) int local432 = local408; local432 <= local158; local432++) { diff --git a/client/src/main/java/rt4/Static126.java b/client/src/main/java/rt4/Static126.java index 8fd0dfb..ec49164 100644 --- a/client/src/main/java/rt4/Static126.java +++ b/client/src/main/java/rt4/Static126.java @@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static126 { - @OriginalMember(owner = "client!jm", name = "r", descriptor = "I") - public static int anInt3114; - @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V") public static void method2460() { if (InterfaceList.topLevelInterface != -1) { diff --git a/client/src/main/java/rt4/Static127.java b/client/src/main/java/rt4/Static127.java index c1ec46b..dbfa5f6 100644 --- a/client/src/main/java/rt4/Static127.java +++ b/client/src/main/java/rt4/Static127.java @@ -1,7 +1,5 @@ package rt4; -import java.nio.charset.StandardCharsets; - import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -31,193 +29,135 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "m", descriptor = "Z") public static boolean neverRemoveRoofs = false; - @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;") - public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) { - return SpriteLoader.decode(arg1, 0, arg0) ? Font.method799(arg2.getFile(arg0, 0)) : null; - } - - @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V") - public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) { - if (Static80.centralZoneX == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || SceneGraph.allLevelsAreVisible())) { - return; - } - Static80.centralZoneX = arg2; - Static52.anInt1695 = arg1; - Static41.anInt1316 = arg0; - if (SceneGraph.allLevelsAreVisible()) { - Static41.anInt1316 = 0; - } - if (arg4) { - client.setGameState(28); - } else { - client.setGameState(25); - } - Static114.drawTextOnScreen(true, LocalizedText.LOADING); - @Pc(53) int local53 = Camera.originZ; - @Pc(55) int local55 = Camera.originX; - Camera.originZ = arg1 * 8 - 48; - Camera.originX = (arg2 - 6) * 8; - Static158.aClass3_Sub2_Sub4_3 = MapList.getContainingSource(Static80.centralZoneX * 8, Static52.anInt1695 * 8); - @Pc(81) int local81 = Camera.originZ - local53; - @Pc(86) int local86 = Camera.originX - local55; - Static235.mapElementList = null; - @Pc(96) int local96; - @Pc(103) Npc local103; - @Pc(109) int local109; - if (arg4) { - NpcList.size = 0; - for (local96 = 0; local96 < 32768; local96++) { - local103 = NpcList.npcs[local96]; - if (local103 != null) { - local103.xFine -= local86 * 128; - local103.zFine -= local81 * 128; - if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) { - for (local109 = 0; local109 < 10; local109++) { - local103.movementQueueX[local109] -= local86; - local103.movementQueueZ[local109] -= local81; - } - NpcList.ids[NpcList.size++] = local96; - } else { - NpcList.npcs[local96].setNpcType(null); - NpcList.npcs[local96] = null; - } - } - } - } else { - for (local96 = 0; local96 < 32768; local96++) { - local103 = NpcList.npcs[local96]; - if (local103 != null) { - for (local109 = 0; local109 < 10; local109++) { - local103.movementQueueX[local109] -= local86; - local103.movementQueueZ[local109] -= local81; - } - local103.xFine -= local86 * 128; - local103.zFine -= local81 * 128; - } - } - } - for (local96 = 0; local96 < 2048; local96++) { - @Pc(265) Player local265 = PlayerList.players[local96]; - if (local265 != null) { - for (local109 = 0; local109 < 10; local109++) { - local265.movementQueueX[local109] -= local86; - local265.movementQueueZ[local109] -= local81; - } - local265.xFine -= local86 * 128; - local265.zFine -= local81 * 128; - } - } - Player.level = arg0; - PlayerList.self.teleport(arg5, false, arg3); - @Pc(322) byte local322 = 104; - @Pc(324) byte local324 = 0; - @Pc(326) byte local326 = 0; - @Pc(328) byte local328 = 1; - @Pc(330) byte local330 = 104; - @Pc(332) byte local332 = 1; - if (local81 < 0) { - local328 = -1; - local330 = -1; - local326 = 103; - } - if (local86 < 0) { - local332 = -1; - local324 = 103; - local322 = -1; - } - for (@Pc(358) int local358 = local324; local358 != local322; local358 += local332) { - for (@Pc(367) int local367 = local326; local367 != local330; local367 += local328) { - @Pc(378) int local378 = local86 + local358; - @Pc(382) int local382 = local367 + local81; - for (@Pc(384) int local384 = 0; local384 < 4; local384++) { - if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) { - SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382]; - } else { - SceneGraph.objStacks[local384][local358][local367] = null; - } - } - } - } - for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) { - local451.z -= local81; - local451.x -= local86; - if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) { - local451.unlink(); - } - } - if (arg4) { - Camera.renderX -= local86 * 128; - Camera.renderZ -= local81 * 128; - Static248.anInt4232 -= local81; - Static251.anInt5449 -= local86; - Static265.anInt5765 -= local81; - Static245.anInt5375 -= local86; - } else { - Camera.cameraType = 1; - } - SoundPlayer.anInt4451 = 0; - if (Static115.mapFlagX != 0) { - Static84.anInt2255 -= local81; - Static115.mapFlagX -= local86; - } - if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) { - Static103.setInstantFade(); - } - Static107.anInt2875 = -1; - Static99.aClass69_64.clear(); - Static217.aClass69_116.clear(); - } - - @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;") - public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) { - if (arg1.indexOf(PERCENT_SIGN) == -1) { - return arg1; - } - while (true) { - @Pc(14) int local14 = arg1.indexOf(aClass100_133); - if (local14 == -1) { - while (true) { - local14 = arg1.indexOf(aClass100_1097); - if (local14 == -1) { - while (true) { - local14 = arg1.indexOf(aClass100_761); - if (local14 == -1) { - while (true) { - local14 = arg1.indexOf(aClass100_520); - if (local14 == -1) { - while (true) { - local14 = arg1.indexOf(aClass100_1002); - if (local14 == -1) { - while (true) { - local14 = arg1.indexOf(aClass100_591); - if (local14 == -1) { - return arg1; - } - @Pc(246) JagString local246 = JagString.EMPTY; - if (Player.lastLogAddress != null) { - local246 = JagString.formatIp(Player.lastLogAddress.intArg2); - if (Player.lastLogAddress.result != null) { - @Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1); - local246 = JagString.decodeString(local265, local265.length, 0); - } - } - arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) }); - } - } - arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) }); - } - } - arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) }); - } - } - arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) }); - } - } - arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) }); - } - } - arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) }); - } - } - + @OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I") + public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) { + if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) { + return -2; + } + try { + @Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0]; + @Pc(35) byte local35 = 0; + @Pc(37) int local37 = 0; + @Pc(39) int local39 = 0; + while (true) { + @Pc(41) int local41 = 0; + @Pc(46) int local46 = local33[local39++]; + @Pc(48) byte local48 = 0; + if (local46 == 0) { + return local37; + } + if (local46 == 15) { + local48 = 1; + } + if (local46 == 16) { + local48 = 2; + } + if (local46 == 1) { + local41 = PlayerSkillXpTable.boostedLevels[local33[local39++]]; + } + if (local46 == 17) { + local48 = 3; + } + if (local46 == 2) { + local41 = PlayerSkillXpTable.baseLevels[local33[local39++]]; + } + if (local46 == 3) { + local41 = PlayerSkillXpTable.experience[local33[local39++]]; + } + @Pc(124) int local124; + @Pc(135) Component local135; + @Pc(140) int local140; + @Pc(152) int local152; + if (local46 == 4) { + local124 = local33[local39++] << 16; + @Pc(131) int local131 = local124 + local33[local39++]; + local135 = InterfaceList.getComponent(local131); + local140 = local33[local39++]; + if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { + for (local152 = 0; local152 < local135.objTypes.length; local152++) { + if (local140 + 1 == local135.objTypes[local152]) { + local41 += local135.objCounts[local152]; + } + } + } + } + if (local46 == 5) { + local41 = VarpDomain.activeVarps[local33[local39++]]; + } + if (local46 == 6) { + local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1]; + } + if (local46 == 7) { + local41 = VarpDomain.activeVarps[local33[local39++]] * 100 / 46875; + } + if (local46 == 8) { + local41 = PlayerList.self.combatLevel; + } + if (local46 == 9) { + for (local124 = 0; local124 < 25; local124++) { + if (Static182.aBooleanArray97[local124]) { + local41 += PlayerSkillXpTable.baseLevels[local124]; + } + } + } + if (local46 == 10) { + local124 = local33[local39++] << 16; + local124 += local33[local39++]; + local135 = InterfaceList.getComponent(local124); + local140 = local33[local39++]; + if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { + for (local152 = 0; local152 < local135.objTypes.length; local152++) { + if (local135.objTypes[local152] == local140 + 1) { + local41 = 999999999; + break; + } + } + } + } + if (local46 == 11) { + local41 = Player.runEnergy; + } + if (local46 == 12) { + local41 = Player.weight; + } + if (local46 == 13) { + local124 = VarpDomain.activeVarps[local33[local39++]]; + @Pc(353) int local353 = local33[local39++]; + local41 = (0x1 << local353 & local124) == 0 ? 0 : 1; + } + if (local46 == 14) { + local124 = local33[local39++]; + local41 = VarpDomain.getVarbit(local124); + } + if (local46 == 18) { + local41 = (PlayerList.self.xFine >> 7) + Camera.originX; + } + if (local46 == 19) { + local41 = (PlayerList.self.zFine >> 7) + Camera.originZ; + } + if (local46 == 20) { + local41 = local33[local39++]; + } + if (local48 == 0) { + if (local35 == 0) { + local37 += local41; + } + if (local35 == 1) { + local37 -= local41; + } + if (local35 == 2 && local41 != 0) { + local37 /= local41; + } + if (local35 == 3) { + local37 *= local41; + } + local35 = 0; + } else { + local35 = local48; + } + } + } catch (@Pc(464) Exception local464) { + return -1; + } + } } diff --git a/client/src/main/java/rt4/Static128.java b/client/src/main/java/rt4/Static128.java index 13b89fd..09a7fea 100644 --- a/client/src/main/java/rt4/Static128.java +++ b/client/src/main/java/rt4/Static128.java @@ -1,10 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalMember; - public final class Static128 { - @OriginalMember(owner = "client!ka", name = "t", descriptor = "[I") - public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 }; - } diff --git a/client/src/main/java/rt4/Static130.java b/client/src/main/java/rt4/Static130.java index f9ffe9b..8299c32 100644 --- a/client/src/main/java/rt4/Static130.java +++ b/client/src/main/java/rt4/Static130.java @@ -7,7 +7,4 @@ public final class Static130 { @OriginalMember(owner = "client!kc", name = "p", descriptor = "[I") public static int[] anIntArray299; - @OriginalMember(owner = "client!kc", name = "s", descriptor = "[I") - public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 }; - } diff --git a/client/src/main/java/rt4/Static131.java b/client/src/main/java/rt4/Static131.java index 5c6d810..eb76d9c 100644 --- a/client/src/main/java/rt4/Static131.java +++ b/client/src/main/java/rt4/Static131.java @@ -10,9 +10,6 @@ public final class Static131 { @OriginalMember(owner = "client!kd", name = "ob", descriptor = "I") public static int anInt3251 = 0; - @OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I") - public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 }; - @OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I") public static int anInt3260 = -1; diff --git a/client/src/main/java/rt4/Static132.java b/client/src/main/java/rt4/Static132.java index 4a132f0..12a4c0d 100644 --- a/client/src/main/java/rt4/Static132.java +++ b/client/src/main/java/rt4/Static132.java @@ -17,7 +17,7 @@ public final class Static132 { if (arg0) { InterfaceList.method2275(local16); } - Static273.method3214(local16); + method3214(local16); @Pc(32) Component local32 = InterfaceList.getComponent(local9); if (local32 != null) { InterfaceList.redraw(local32); @@ -172,4 +172,13 @@ public final class Static132 { Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864)); } } + + @OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V") + public static void method3214(@OriginalArg(1) int arg0) { + for (@Pc(11) Node local11 = InterfaceList.properties.head(); local11 != null; local11 = InterfaceList.properties.next()) { + if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) { + local11.unlink(); + } + } + } } diff --git a/client/src/main/java/rt4/Static136.java b/client/src/main/java/rt4/Static136.java index 7963845..73ae139 100644 --- a/client/src/main/java/rt4/Static136.java +++ b/client/src/main/java/rt4/Static136.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static136 { - @OriginalMember(owner = "client!kk", name = "j", descriptor = "I") - public static int anInt3325 = 0; - - @OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z") + @OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z") public static boolean method2655() { return MidiPlayer.anInt441 != 0 || Static172.midiPcmStream.method4414(); } diff --git a/client/src/main/java/rt4/Static137.java b/client/src/main/java/rt4/Static137.java deleted file mode 100644 index 957771b..0000000 --- a/client/src/main/java/rt4/Static137.java +++ /dev/null @@ -1,16 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static137 { - - @OriginalMember(owner = "client!kl", name = "s", descriptor = "I") - public static int anInt3337 = 0; - - @OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;") - public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) { - return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1()); - } - -} diff --git a/client/src/main/java/rt4/Static145.java b/client/src/main/java/rt4/Static145.java index 9ec5d78..0dcf164 100644 --- a/client/src/main/java/rt4/Static145.java +++ b/client/src/main/java/rt4/Static145.java @@ -22,7 +22,7 @@ public final class Static145 { @OriginalMember(owner = "client!lf", name = "a", descriptor = "(ILclient!ve;)V") public static void method2743(@OriginalArg(1) Js5 arg0) { Static233.aClass36_Sub1Array1 = SpriteLoader.method3088(Flames.anInt3443, arg0); - Static96.anIntArray235 = new int[256]; + Static221.anIntArray235 = new int[256]; @Pc(15) int local15; for (local15 = 0; local15 < 3; local15++) { @Pc(30) int local30 = Flames.anIntArray445[local15 + 1] >> 16 & 0xFF; @@ -35,21 +35,21 @@ public final class Static145 { @Pc(88) int local88 = Flames.anIntArray445[local15 + 1] & 0xFF; @Pc(95) float local95 = ((float) local88 - local55) / 64.0F; for (@Pc(97) int local97 = 0; local97 < 64; local97++) { - Static96.anIntArray235[local97 + local15 * 64] = (int) local55 | (int) local48 << 8 | (int) local39 << 16; + Static221.anIntArray235[local97 + local15 * 64] = (int) local55 | (int) local48 << 8 | (int) local39 << 16; local48 += local80; local55 += local95; local39 += local62; } } for (local15 = 192; local15 < 255; local15++) { - Static96.anIntArray235[local15] = Flames.anIntArray445[3]; + Static221.anIntArray235[local15] = Flames.anIntArray445[3]; } Static270.anIntArray562 = new int[32768]; Static263.anIntArray516 = new int[32768]; Static69.method1545(null); Static103.anIntArray254 = new int[32768]; Static216.anIntArray188 = new int[32768]; - Static167.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254); + Static221.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254); } @OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V") diff --git a/client/src/main/java/rt4/Static147.java b/client/src/main/java/rt4/Static147.java index 99cfe8a..8747359 100644 --- a/client/src/main/java/rt4/Static147.java +++ b/client/src/main/java/rt4/Static147.java @@ -11,7 +11,7 @@ public final class Static147 { @OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V") public static void method2761(@OriginalArg(0) int arg0) { - Static170.anInt3241 = arg0; + UnderwaterMaterialRenderer.anInt3241 = arg0; MaterialManager.resetArgument(3); MaterialManager.resetArgument(4); } diff --git a/client/src/main/java/rt4/Static152.java b/client/src/main/java/rt4/Static152.java index 52af51f..213bc9c 100644 --- a/client/src/main/java/rt4/Static152.java +++ b/client/src/main/java/rt4/Static152.java @@ -2,19 +2,126 @@ package rt4; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public final class Static152 { @OriginalMember(owner = "client!ma", name = "z", descriptor = "I") public static int anInt3604 = -1; - @OriginalMember(owner = "client!ma", name = "a", descriptor = "(IIBIIII)V") - public static void method2826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { - if (arg4 - arg3 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg4 + arg3 && TextureOp29.anInt5773 <= arg1 - arg3 && TextureOp29.anInt2869 >= arg3 + arg1) { - Static8.method120(arg5, arg0, arg1, arg2, arg3, arg4); - } else { - Static280.method4670(arg2, arg1, arg3, arg5, arg0, arg4); + @OriginalMember(owner = "client!wl", name = "a", descriptor = "(IBIIIII)V") + public static void method4670(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { + @Pc(18) int local18 = arg2 - arg4; + Static251.method4278(arg2); + @Pc(23) int local23 = 0; + if (local18 < 0) { + local18 = 0; + } + @Pc(32) int local32 = arg2; + @Pc(35) int local35 = -arg2; + @Pc(38) int local38 = -local18; + @Pc(40) int local40 = local18; + @Pc(42) int local42 = -1; + @Pc(61) int local61; + @Pc(69) int local69; + @Pc(78) int local78; + @Pc(87) int local87; + if (arg1 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg1) { + @Pc(52) int[] local52 = Static71.anIntArrayArray10[arg1]; + local61 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg2, TextureOp29.anInt4164); + local69 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg5, TextureOp29.anInt4164); + local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local18, TextureOp29.anInt4164); + local87 = Static78.method1690(TextureOp29.anInt5063, arg5 + local18, TextureOp29.anInt4164); + Static131.method2576(local52, local61, local78, arg3); + Static131.method2576(local52, local78, local87, arg0); + Static131.method2576(local52, local87, local69, arg3); + } + @Pc(107) int local107 = -1; + while (local23 < local32) { + local42 += 2; + local107 += 2; + local38 += local107; + local35 += local42; + if (local38 >= 0 && local40 >= 1) { + local40--; + Static241.anIntArray522[local40] = local23; + local38 -= local40 << 1; + } + local23++; + @Pc(264) int local264; + @Pc(273) int local273; + @Pc(280) int[] local280; + @Pc(161) int local161; + if (local35 >= 0) { + local32--; + local35 -= local32 << 1; + local161 = arg1 - local32; + local61 = arg1 + local32; + if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) { + if (local32 >= local18) { + local69 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164); + local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164); + if (TextureOp29.anInt2869 >= local61) { + Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3); + } + if (local161 >= TextureOp29.anInt5773) { + Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3); + } + } else { + local69 = Static241.anIntArray522[local32]; + local78 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164); + local87 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164); + local264 = Static78.method1690(TextureOp29.anInt5063, arg5 + local69, TextureOp29.anInt4164); + local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local69, TextureOp29.anInt4164); + if (TextureOp29.anInt2869 >= local61) { + local280 = Static71.anIntArrayArray10[local61]; + Static131.method2576(local280, local87, local273, arg3); + Static131.method2576(local280, local273, local264, arg0); + Static131.method2576(local280, local264, local78, arg3); + } + if (local161 >= TextureOp29.anInt5773) { + local280 = Static71.anIntArrayArray10[local161]; + Static131.method2576(local280, local87, local273, arg3); + Static131.method2576(local280, local273, local264, arg0); + Static131.method2576(local280, local264, local78, arg3); + } + } + } + } + local161 = arg1 - local23; + local61 = arg1 + local23; + if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) { + local69 = arg5 + local32; + local78 = arg5 - local32; + if (local69 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= local78) { + local69 = Static78.method1690(TextureOp29.anInt5063, local69, TextureOp29.anInt4164); + local78 = Static78.method1690(TextureOp29.anInt5063, local78, TextureOp29.anInt4164); + if (local23 < local18) { + local87 = local40 >= local23 ? local40 : Static241.anIntArray522[local23]; + local264 = Static78.method1690(TextureOp29.anInt5063, local87 + arg5, TextureOp29.anInt4164); + local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local87, TextureOp29.anInt4164); + if (TextureOp29.anInt2869 >= local61) { + local280 = Static71.anIntArrayArray10[local61]; + Static131.method2576(local280, local78, local273, arg3); + Static131.method2576(local280, local273, local264, arg0); + Static131.method2576(local280, local264, local69, arg3); + } + if (local161 >= TextureOp29.anInt5773) { + local280 = Static71.anIntArrayArray10[local161]; + Static131.method2576(local280, local78, local273, arg3); + Static131.method2576(local280, local273, local264, arg0); + Static131.method2576(local280, local264, local69, arg3); + } + } else { + if (TextureOp29.anInt2869 >= local61) { + Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3); + } + if (local161 >= TextureOp29.anInt5773) { + Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3); + } + } + } + } } } - } diff --git a/client/src/main/java/rt4/Static154.java b/client/src/main/java/rt4/Static154.java index f52c200..f03bd64 100644 --- a/client/src/main/java/rt4/Static154.java +++ b/client/src/main/java/rt4/Static154.java @@ -12,7 +12,7 @@ public final class Static154 { return false; } for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) { - @Pc(34) int local34 = Static273.method3212(local14, arg0); + @Pc(34) int local34 = Static127.method3212(local14, arg0); @Pc(39) int local39 = arg0.anIntArray48[local14]; if (arg0.anIntArray43[local14] == 2) { if (local39 <= local34) { diff --git a/client/src/main/java/rt4/Static156.java b/client/src/main/java/rt4/Static156.java index 11e0eb0..1d09969 100644 --- a/client/src/main/java/rt4/Static156.java +++ b/client/src/main/java/rt4/Static156.java @@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static156 { - @OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B") - public static byte[][] locationMapFilesBuffer; - @OriginalMember(owner = "client!mf", name = "X", descriptor = "I") public static int loginScreenId; @@ -33,19 +30,19 @@ public final class Static156 { Static217.anInt4903 = arg2; Static167.anInt4069 = arg0 / 128; Static193.anInt4539 = arg2 / 128; - Static31.anInt987 = Static167.anInt4069 - Static277.tileVisibilityDistance; + Static31.anInt987 = Static167.anInt4069 - Static123.tileVisibilityDistance; if (Static31.anInt987 < 0) { Static31.anInt987 = 0; } - Static80.anInt4698 = Static193.anInt4539 - Static277.tileVisibilityDistance; + Static80.anInt4698 = Static193.anInt4539 - Static123.tileVisibilityDistance; if (Static80.anInt4698 < 0) { Static80.anInt4698 = 0; } - Static2.anInt15 = Static167.anInt4069 + Static277.tileVisibilityDistance; + Static2.anInt15 = Static167.anInt4069 + Static123.tileVisibilityDistance; if (Static2.anInt15 > SceneGraph.mapSizeX) { Static2.anInt15 = SceneGraph.mapSizeX; } - Static215.anInt4866 = Static193.anInt4539 + Static277.tileVisibilityDistance; + Static215.anInt4866 = Static193.anInt4539 + Static123.tileVisibilityDistance; if (Static215.anInt4866 > SceneGraph.mapSizeZ) { Static215.anInt4866 = SceneGraph.mapSizeZ; } @@ -57,12 +54,12 @@ public final class Static156 { } @Pc(104) int local104; @Pc(113) int local113; - for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local104++) { - for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local113++) { - @Pc(130) int local130 = (local104 - Static277.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F); - @Pc(140) int local140 = (local113 - Static277.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F); - @Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.tileVisibilityDistance; - @Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.tileVisibilityDistance; + for (local104 = 0; local104 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2; local104++) { + for (local113 = 0; local113 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2; local113++) { + @Pc(130) int local130 = (local104 - Static123.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F); + @Pc(140) int local140 = (local113 - Static123.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F); + @Pc(146) int local146 = Static167.anInt4069 + local104 - Static123.tileVisibilityDistance; + @Pc(152) int local152 = Static193.anInt4539 + local113 - Static123.tileVisibilityDistance; if (local146 >= 0 && local152 >= 0 && local146 < SceneGraph.mapSizeX && local152 < SceneGraph.mapSizeZ) { @Pc(176) int local176; if (SceneGraph.underwaterTileHeights == null) { @@ -77,8 +74,8 @@ public final class Static156 { } } } - for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local104++) { - for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local113++) { + for (local104 = 0; local104 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1; local104++) { + for (local113 = 0; local113 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1; local113++) { Static48.aBooleanArrayArray1[local104][local113] = Static89.aBooleanArrayArray3[local104][local113] || Static89.aBooleanArrayArray3[local104 + 1][local113] || Static89.aBooleanArrayArray3[local104][local113 + 1] || Static89.aBooleanArrayArray3[local104 + 1][local113 + 1]; } } @@ -89,7 +86,7 @@ public final class Static156 { Static206.anIntArray427 = arg10; Static123.method2419(); if (SceneGraph.underWaterGroundTiles != null) { - Static278.setRenderTiles(true); + SceneGraph.setRenderTiles(true); Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14); if (GlRenderer.enabled) { MaterialManager.renderingUnderwater = false; @@ -97,7 +94,7 @@ public final class Static156 { FogManager.method3066(null); LightingManager.method2390(); } - Static278.setRenderTiles(false); + SceneGraph.setRenderTiles(false); } Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14); } diff --git a/client/src/main/java/rt4/Static158.java b/client/src/main/java/rt4/Static158.java index 5ee850b..e123de9 100644 --- a/client/src/main/java/rt4/Static158.java +++ b/client/src/main/java/rt4/Static158.java @@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static158 { - @OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;") - public static Map aClass3_Sub2_Sub4_3; - @OriginalMember(owner = "client!mh", name = "X", descriptor = "I") public static int anInt3851 = -1; @OriginalMember(owner = "client!mg", name = "Q", descriptor = "I") @@ -15,32 +12,32 @@ public final class Static158 { @OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V") public static void decodeNpcFiles() { - @Pc(10) int local10 = Static191.npcSpawnsFilesBuffer.length; + @Pc(10) int local10 = LoginManager.npcSpawnsFilesBuffer.length; for (@Pc(16) int local16 = 0; local16 < local10; local16++) { - if (Static191.npcSpawnsFilesBuffer[local16] != null) { + if (LoginManager.npcSpawnsFilesBuffer[local16] != null) { @Pc(25) int local25 = -1; for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) { - if (Static217.anIntArray434[local27] == Static238.regionBitPacked[local16]) { + if (Static217.anIntArray434[local27] == LoginManager.regionBitPacked[local16]) { local25 = local27; break; } } if (local25 == -1) { - Static217.anIntArray434[anInt3811] = Static238.regionBitPacked[local16]; + Static217.anIntArray434[anInt3811] = LoginManager.regionBitPacked[local16]; local25 = anInt3811++; } @Pc(67) int local67 = 0; - @Pc(74) Buffer local74 = new Buffer(Static191.npcSpawnsFilesBuffer[local16]); - while (local74.offset < Static191.npcSpawnsFilesBuffer[local16].length && local67 < 511) { + @Pc(74) Buffer local74 = new Buffer(LoginManager.npcSpawnsFilesBuffer[local16]); + while (local74.offset < LoginManager.npcSpawnsFilesBuffer[local16].length && local67 < 511) { @Pc(97) int local97 = local67++ << 6 | local25; @Pc(103) int local103 = local74.g2(); @Pc(107) int local107 = local103 >> 14; @Pc(113) int local113 = local103 >> 7 & 0x3F; - @Pc(125) int local125 = local113 + (Static238.regionBitPacked[local16] >> 8) * 64 - Camera.originX; + @Pc(125) int local125 = local113 + (LoginManager.regionBitPacked[local16] >> 8) * 64 - Camera.originX; @Pc(129) int local129 = local103 & 0x3F; - @Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ; + @Pc(142) int local142 = local129 + (LoginManager.regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ; @Pc(148) NpcType local148 = NpcTypeList.get(local74.g2()); - if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) { + if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == LoginManager.centralPlane && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) { NpcList.npcs[local97] = new Npc(); @Pc(198) Npc local198 = NpcList.npcs[local97]; NpcList.ids[NpcList.size++] = local97; diff --git a/client/src/main/java/rt4/Static164.java b/client/src/main/java/rt4/Static164.java index f3ee21d..045dbc0 100644 --- a/client/src/main/java/rt4/Static164.java +++ b/client/src/main/java/rt4/Static164.java @@ -150,14 +150,4 @@ public final class Static164 { } } - @OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;") - public static SoftwareSprite method3117(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) { - return SpriteLoader.decode(arg0, arg1) ? SpriteLoader.method3537() : null; - } - - @OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;") - public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) { - return SpriteLoader.decode(arg1, 0, arg0) ? Static134.method2619() : null; - } - } diff --git a/client/src/main/java/rt4/Static165.java b/client/src/main/java/rt4/Static165.java index 414b3aa..0f95016 100644 --- a/client/src/main/java/rt4/Static165.java +++ b/client/src/main/java/rt4/Static165.java @@ -12,9 +12,6 @@ public final class Static165 { @OriginalMember(owner = "client!nb", name = "o", descriptor = "I") public static int anInt4042; - @OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_772 = JagString.parse("um"); - @OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;") public static final JagString DETAILS = JagString.parse("details"); diff --git a/client/src/main/java/rt4/Static167.java b/client/src/main/java/rt4/Static167.java index dd42ef2..4474e63 100644 --- a/client/src/main/java/rt4/Static167.java +++ b/client/src/main/java/rt4/Static167.java @@ -7,7 +7,4 @@ public final class Static167 { @OriginalMember(owner = "client!nd", name = "s", descriptor = "I") public static int anInt4069; - @OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;") - public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3; - } diff --git a/client/src/main/java/rt4/Static170.java b/client/src/main/java/rt4/Static170.java deleted file mode 100644 index 74966f0..0000000 --- a/client/src/main/java/rt4/Static170.java +++ /dev/null @@ -1,51 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static170 { - - @OriginalMember(owner = "client!nh", name = "Z", descriptor = "I") - public static int anInt3241 = 128; - - @OriginalMember(owner = "client!nh", name = "fb", descriptor = "[I") - public static final int[] JS5_ARCHIVE_WEIGHTS = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - - @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIILclient!th;JZ)V") - public static void method2570(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) long arg5, @OriginalArg(6) boolean arg6) { - if (arg4 == null) { - return; - } - @Pc(6) GroundDecor local6 = new GroundDecor(); - local6.primary = arg4; - local6.anInt732 = arg1 * 128 + 64; - local6.anInt736 = arg2 * 128 + 64; - local6.anInt733 = arg3; - local6.key = arg5; - local6.aBoolean49 = arg6; - if (SceneGraph.tiles[arg0][arg1][arg2] == null) { - SceneGraph.tiles[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2); - } - SceneGraph.tiles[arg0][arg1][arg2].groundDecor = local6; - } - - @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V") - public static void method2574(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) { - @Pc(7) AttachLocRequest local7 = new AttachLocRequest(); - local7.angle = arg6; - local7.anInt1205 = arg3; - local7.anInt1187 = arg1; - local7.anInt1200 = arg5; - local7.entityId = arg2; - local7.x = arg8; - local7.anInt1197 = arg10; - local7.z = arg4; - local7.locId = arg11; - local7.anInt1188 = arg7; - local7.anInt1191 = arg0; - local7.shape = arg9; - AttachLocRequest.queue.addTail(local7); - } - -} diff --git a/client/src/main/java/rt4/Static172.java b/client/src/main/java/rt4/Static172.java index b12b3fc..11d8935 100644 --- a/client/src/main/java/rt4/Static172.java +++ b/client/src/main/java/rt4/Static172.java @@ -12,9 +12,6 @@ public final class Static172 { @OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;") public static Js5 aClass153_70; - @OriginalMember(owner = "client!nj", name = "j", descriptor = "[I") - public static int[] locationsMapFileIds; - @OriginalMember(owner = "client!nj", name = "k", descriptor = "I") public static int anInt4165; diff --git a/client/src/main/java/rt4/Static173.java b/client/src/main/java/rt4/Static173.java index 6c92150..c4ce08d 100644 --- a/client/src/main/java/rt4/Static173.java +++ b/client/src/main/java/rt4/Static173.java @@ -9,122 +9,7 @@ public final class Static173 { @OriginalMember(owner = "client!nk", name = "d", descriptor = "[I") public static int[] anIntArray367; - @OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V") - public static void method3240(@OriginalArg(1) boolean arg0) { - @Pc(7) int local7; - @Pc(16) Npc local16; - @Pc(107) int local107; - @Pc(113) int local113; - @Pc(133) int local133; - @Pc(149) int local149; - @Pc(158) int local158; - @Pc(171) int local171; - for (local7 = 0; local7 < NpcList.size; local7++) { - local16 = NpcList.npcs[NpcList.ids[local7]]; - if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) { - @Pc(42) int local42 = local16.getSize(); - @Pc(97) int local97; - if (local42 == 1) { - if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) { - local97 = local16.xFine >> 7; - local107 = local16.zFine >> 7; - if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) { - local171 = Static31.anIntArrayArray6[local97][local107]++; - } - } - } else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) { - local97 = local16.xFine - local42 * 64 >> 7; - local107 = local16.zFine - local42 * 64 >> 7; - local113 = local16.getSize() + local97; - if (local97 < 0) { - local97 = 0; - } - if (local113 > 104) { - local113 = 104; - } - local133 = local107 + local16.getSize(); - if (local107 < 0) { - local107 = 0; - } - if (local133 > 104) { - local133 = 104; - } - for (local149 = local97; local149 < local113; local149++) { - for (local158 = local107; local158 < local133; local158++) { - local171 = Static31.anIntArrayArray6[local149][local158]++; - } - } - } - } - } - label200: for (local7 = 0; local7 < NpcList.size; local7++) { - local16 = NpcList.npcs[NpcList.ids[local7]]; - @Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L; - if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) { - local107 = local16.getSize(); - if (local107 == 1) { - if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) { - local113 = local16.xFine >> 7; - local133 = local16.zFine >> 7; - if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) { - continue; - } - if (Static31.anIntArrayArray6[local113][local133] > 1) { - local171 = Static31.anIntArrayArray6[local113][local133]--; - continue; - } - } - } else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) { - local113 = local16.xFine - local107 * 64 >> 7; - local133 = local16.zFine - local107 * 64 >> 7; - local158 = local133 + local107; - if (local133 < 0) { - local133 = 0; - } - @Pc(368) boolean local368 = true; - local149 = local113 + local107; - if (local158 > 104) { - local158 = 104; - } - if (local113 < 0) { - local113 = 0; - } - if (local149 > 104) { - local149 = 104; - } - @Pc(396) int local396; - @Pc(401) int local401; - for (local396 = local113; local396 < local149; local396++) { - for (local401 = local133; local401 < local158; local401++) { - if (Static31.anIntArrayArray6[local396][local401] <= 1) { - local368 = false; - break; - } - } - } - if (local368) { - local396 = local113; - while (true) { - if (local396 >= local149) { - continue label200; - } - for (local401 = local133; local401 < local158; local401++) { - local171 = Static31.anIntArrayArray6[local396][local401]--; - } - local396++; - } - } - } - if (!local16.type.aBoolean183) { - local262 |= Long.MIN_VALUE; - } - local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine); - Static43.method1141(Player.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171); - } - } - } - - @OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V") + @OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V") public static void method3243(@OriginalArg(1) long[] arg0, @OriginalArg(2) int[] arg1) { Static83.method436(arg0, 0, arg0.length - 1, arg1); } diff --git a/client/src/main/java/rt4/Static174.java b/client/src/main/java/rt4/Static174.java deleted file mode 100644 index f0e17d4..0000000 --- a/client/src/main/java/rt4/Static174.java +++ /dev/null @@ -1,26 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static174 { - - @OriginalMember(owner = "client!nl", name = "d", descriptor = "F") - public static float aFloat22; - - @OriginalMember(owner = "client!nl", name = "g", descriptor = "I") - public static int anInt4191; - - @OriginalMember(owner = "client!nl", name = "b", descriptor = "[[F") - public static final float[][] aFloatArrayArray2 = new float[2][8]; - - @OriginalMember(owner = "client!nl", name = "f", descriptor = "[[I") - public static final int[][] anIntArrayArray32 = new int[2][8]; - - @OriginalMember(owner = "client!nl", name = "a", descriptor = "(F)F") - public static float method3250(@OriginalArg(0) float arg0) { - @Pc(7) float local7 = (float) Math.pow(2.0D, (double) arg0) * 32.703197F; - return local7 * 3.1415927F / 11025.0F; - } -} diff --git a/client/src/main/java/rt4/Static175.java b/client/src/main/java/rt4/Static175.java index f296525..8d212dd 100644 --- a/client/src/main/java/rt4/Static175.java +++ b/client/src/main/java/rt4/Static175.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static175 { - @OriginalMember(owner = "client!nm", name = "P", descriptor = "[I") - public static int[] npcSpawnsFileIds; - - @OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;") public static JagString url; @OriginalMember(owner = "client!nm", name = "U", descriptor = "I") @@ -16,7 +13,7 @@ public final class Static175 { @OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V") public static void method3279() { if (Static267.anInt5775 > 0) { - Static278.processLogout(); + LoginManager.processLogout(); } else { Static233.aClass95_4 = Protocol.socket; Protocol.socket = null; diff --git a/client/src/main/java/rt4/Static176.java b/client/src/main/java/rt4/Static176.java index 492f13a..8f858ed 100644 --- a/client/src/main/java/rt4/Static176.java +++ b/client/src/main/java/rt4/Static176.java @@ -16,7 +16,9 @@ public final class Static176 { public static final JagString aClass100_420 = JagString.parse(")1o"); @OriginalMember(owner = "client!nd", name = "x", descriptor = "Lclient!na;") public static final JagString aClass100_783 = JagString.parse(")4p="); - @OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;") + @OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;") + public static final JagString aClass100_230 = JagString.parse(""); + @OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;") public static Js5 aClass153_76; @OriginalMember(owner = "client!ob", name = "a", descriptor = "[Z") @@ -47,11 +49,11 @@ public final class Static176 { } return true; } else { - @Pc(62) JagString local62 = Static211.aClass100_230; + @Pc(62) JagString local62 = aClass100_230; if (client.modeWhere != 0) { local62 = JagString.concatenate(new JagString[] { aClass100_193, JagString.parseInt(local3.id + 7000) }); } - @Pc(89) JagString local89 = Static211.aClass100_230; + @Pc(89) JagString local89 = aClass100_230; if (client.settings != null) { local89 = JagString.concatenate(new JagString[] { aClass100_783, client.settings}); } diff --git a/client/src/main/java/rt4/Static179.java b/client/src/main/java/rt4/Static179.java index 3b72ca0..308419f 100644 --- a/client/src/main/java/rt4/Static179.java +++ b/client/src/main/java/rt4/Static179.java @@ -7,10 +7,4 @@ public final class Static179 { @OriginalMember(owner = "client!oe", name = "b", descriptor = "I") public static int anInt4254 = 0; - @OriginalMember(owner = "client!oe", name = "n", descriptor = "I") - public static int anInt4262 = 1; - - @OriginalMember(owner = "client!oe", name = "o", descriptor = "Lclient!na;") - public static final JagString aClass100_807 = JagString.parse("n"); - } diff --git a/client/src/main/java/rt4/Static182.java b/client/src/main/java/rt4/Static182.java index ef49602..b131e12 100644 --- a/client/src/main/java/rt4/Static182.java +++ b/client/src/main/java/rt4/Static182.java @@ -13,9 +13,6 @@ public final class Static182 { @OriginalMember(owner = "client!oj", name = "t", descriptor = "[I") public static int[] anIntArray372; - @OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;") - public static GlTile[][] aClass3_Sub14ArrayArray2; - @OriginalMember(owner = "client!oj", name = "p", descriptor = "I") public static final int anInt4306 = 2301979; diff --git a/client/src/main/java/rt4/Static184.java b/client/src/main/java/rt4/Static184.java index bc51994..2bef8b4 100644 --- a/client/src/main/java/rt4/Static184.java +++ b/client/src/main/java/rt4/Static184.java @@ -8,7 +8,7 @@ public final class Static184 { @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z") public static boolean method3387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) int arg5, @OriginalArg(6) long arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) { - return arg4 == null ? true : Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6); + return arg4 == null || Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6); } @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIZI)I") diff --git a/client/src/main/java/rt4/Static185.java b/client/src/main/java/rt4/Static185.java index 090cbb7..9cbb231 100644 --- a/client/src/main/java/rt4/Static185.java +++ b/client/src/main/java/rt4/Static185.java @@ -15,7 +15,7 @@ public final class Static185 { if ((SceneGraph.tileFlags[arg2][arg7][arg8] & 0x10) != 0) { return; } - if (Static4.method22(arg8, arg7, arg2) != Static41.anInt1316) { + if (Static4.method22(arg8, arg7, arg2) != LoginManager.centralPlane) { return; } } @@ -97,7 +97,7 @@ public final class Static185 { } else { local387 = new Loc(arg5, 22, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); } - Static170.method2570(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211); + SceneGraph.method2570(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211); if (local62.anInt4435 == 1 && arg4 != null) { arg4.method3057(arg7, arg8); } @@ -161,7 +161,7 @@ public final class Static185 { } else { local387 = new Loc(arg5, 0, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); } - Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261); + SceneGraph.method4508(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261); if (arg1) { if (arg9 == 0) { if (local62.aBoolean215) { @@ -213,7 +213,7 @@ public final class Static185 { } else { local387 = new Loc(arg5, 1, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); } - Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261); + SceneGraph.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261); if (local62.aBoolean215 && arg1) { if (arg9 == 0) { SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; @@ -249,7 +249,7 @@ public final class Static185 { local1254 = new Loc(arg5, 2, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); local1269 = new Loc(arg5, 2, local1226, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); } - Static262.method4508(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261); + SceneGraph.method4508(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261); if (local62.aBoolean220 && arg1) { if (arg9 == 0) { SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1; @@ -281,7 +281,7 @@ public final class Static185 { } else { local387 = new Loc(arg5, 3, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); } - Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261); + SceneGraph.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261); if (local62.aBoolean215 && arg1) { if (arg9 == 0) { SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; diff --git a/client/src/main/java/rt4/Static186.java b/client/src/main/java/rt4/Static186.java index cf53586..4d1e01f 100644 --- a/client/src/main/java/rt4/Static186.java +++ b/client/src/main/java/rt4/Static186.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static186 { - @OriginalMember(owner = "client!pa", name = "L", descriptor = "[[B") - public static byte[][] underWaterMapFilesBuffer; - - @OriginalMember(owner = "client!pa", name = "K", descriptor = "Z") + @OriginalMember(owner = "client!pa", name = "K", descriptor = "Z") public static boolean aBoolean205 = false; @OriginalMember(owner = "client!pa", name = "R", descriptor = "[Z") diff --git a/client/src/main/java/rt4/Static19.java b/client/src/main/java/rt4/Static19.java index b90d6c1..bffe24e 100644 --- a/client/src/main/java/rt4/Static19.java +++ b/client/src/main/java/rt4/Static19.java @@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static19 { - @OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B") - public static byte[][] underWaterLocationsMapFilesBuffer; - - @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z") + @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z") public static boolean method583(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { if (arg1 < arg2 && arg1 < arg3 && arg1 < arg4) { return false; diff --git a/client/src/main/java/rt4/Static191.java b/client/src/main/java/rt4/Static191.java index 9e67364..439fb17 100644 --- a/client/src/main/java/rt4/Static191.java +++ b/client/src/main/java/rt4/Static191.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static191 { - @OriginalMember(owner = "client!pg", name = "jb", descriptor = "[[B") - public static byte[][] npcSpawnsFilesBuffer; - - @OriginalMember(owner = "client!pg", name = "fb", descriptor = "I") + @OriginalMember(owner = "client!pg", name = "fb", descriptor = "I") public static final int anInt4506 = 50; @OriginalMember(owner = "client!pg", name = "P", descriptor = "[Lclient!na;") diff --git a/client/src/main/java/rt4/Static195.java b/client/src/main/java/rt4/Static195.java index c3b8133..4ac6b47 100644 --- a/client/src/main/java/rt4/Static195.java +++ b/client/src/main/java/rt4/Static195.java @@ -1,41 +1,10 @@ package rt4; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static195 { @OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;") public static JagString walkText; - @OriginalMember(owner = "client!pk", name = "i", descriptor = "(I)V") - public static void method3532() { - for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.head(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.next()) { - @Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1; - if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) { - local16.unlink(); - } else if (client.loop >= local21.anInt4822) { - if (local21.anInt4819 > 0) { - @Pc(54) Npc local54 = NpcList.npcs[local21.anInt4819 - 1]; - if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) { - local21.method3705(local54.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine); - } - } - if (local21.anInt4819 < 0) { - @Pc(102) int local102 = -local21.anInt4819 - 1; - @Pc(107) Player local107; - if (PlayerList.selfId == local102) { - local107 = PlayerList.self; - } else { - local107 = PlayerList.players[local102]; - } - if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) { - local21.method3705(local107.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine); - } - } - local21.method3704(Static178.anInt4247); - Static43.method1141(Player.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false); - } - } - } } diff --git a/client/src/main/java/rt4/Static202.java b/client/src/main/java/rt4/Static202.java index d2c6e6a..f3c95d6 100644 --- a/client/src/main/java/rt4/Static202.java +++ b/client/src/main/java/rt4/Static202.java @@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static202 { - @OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I") - public static final int[] cameraFrequency = new int[5]; - @OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V") public static void method3656(@OriginalArg(0) JagString[] arg0, @OriginalArg(1) short[] arg1) { Static54.method1307(arg1, arg0.length - 1, arg0, 0); diff --git a/client/src/main/java/rt4/Static203.java b/client/src/main/java/rt4/Static203.java deleted file mode 100644 index 6d3b070..0000000 --- a/client/src/main/java/rt4/Static203.java +++ /dev/null @@ -1,56 +0,0 @@ -package rt4; - -import java.awt.Container; -import java.awt.Insets; - -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static203 { - - @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V") - public static void method3662() { - @Pc(8) Container local8; - if (GameShell.fullScreenFrame != null) { - local8 = GameShell.fullScreenFrame; - } else if (GameShell.frame == null) { - local8 = GameShell.signLink.applet; - } else { - local8 = GameShell.frame; - } - GameShell.frameWidth = local8.getSize().width; - GameShell.frameHeight = local8.getSize().height; - @Pc(35) Insets local35; - if (local8 == GameShell.frame) { - local35 = GameShell.frame.getInsets(); - GameShell.frameHeight -= local35.bottom + local35.top; - GameShell.frameWidth -= local35.right + local35.left; - } - if (DisplayMode.getWindowMode() >= 2) { - GameShell.canvasWidth = GameShell.frameWidth; - GameShell.leftMargin = 0; - GameShell.topMargin = 0; - GameShell.canvasHeight = GameShell.frameHeight; - } else { - GameShell.topMargin = 0; - GameShell.leftMargin = (GameShell.frameWidth - 765) / 2; - GameShell.canvasHeight = 503; - GameShell.canvasWidth = 765; - } - if (GlRenderer.enabled) { - GlRenderer.setCanvasSize(GameShell.canvasWidth, GameShell.canvasHeight); - } - GameShell.canvas.setSize(GameShell.canvasWidth, GameShell.canvasHeight); - if (local8 == GameShell.frame) { - local35 = GameShell.frame.getInsets(); - GameShell.canvas.setLocation(local35.left + GameShell.leftMargin, GameShell.topMargin + local35.top); - } else { - GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin); - } - if (InterfaceList.topLevelInterface != -1) { - Static210.method3712(true); - } - Static139.method2704(); - } - -} diff --git a/client/src/main/java/rt4/Static210.java b/client/src/main/java/rt4/Static210.java index 203915e..dbfc756 100644 --- a/client/src/main/java/rt4/Static210.java +++ b/client/src/main/java/rt4/Static210.java @@ -2,19 +2,9 @@ package rt4; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static210 { - @OriginalMember(owner = "client!rb", name = "a", descriptor = "(I)V") - public static void method3711() { - for (@Pc(7) int local7 = 0; local7 < 104; local7++) { - for (@Pc(14) int local14 = 0; local14 < 104; local14++) { - Static31.anIntArrayArray6[local7][local14] = 0; - } - } - } - @OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V") public static void method3712(@OriginalArg(0) boolean arg0) { Static234.method4017(GameShell.canvasHeight, arg0, InterfaceList.topLevelInterface, GameShell.canvasWidth); diff --git a/client/src/main/java/rt4/Static211.java b/client/src/main/java/rt4/Static211.java index 33229a1..2c0206c 100644 --- a/client/src/main/java/rt4/Static211.java +++ b/client/src/main/java/rt4/Static211.java @@ -4,35 +4,10 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static211 { - @OriginalMember(owner = "client!he", name = "db", descriptor = "Lclient!na;") - public static final JagString aClass100_517 = JagString.parse(""); @OriginalMember(owner = "client!rc", name = "R", descriptor = "Z") private static boolean aBoolean74; @OriginalMember(owner = "client!rc", name = "p", descriptor = "I") public static int anInt1142 = 0; - @OriginalMember(owner = "client!rc", name = "C", descriptor = "Z") - public static boolean aBoolean72 = false; - - @OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;") - public static final JagString aClass100_230 = JagString.parse(""); - - @OriginalMember(owner = "client!rc", name = "M", descriptor = "Z") - public static boolean aBoolean73 = false; - - @OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V") - public static void method930() { - if (client.musicChannel != null) { - client.musicChannel.quit(); - } - if (client.soundChannel != null) { - client.soundChannel.quit(); - } - AudioChannel.init(Preferences.stereo); - client.musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0); - client.musicChannel.setStream(client.musicStream); - client.soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1); - client.soundChannel.setStream(client.soundStream); - } } diff --git a/client/src/main/java/rt4/Static220.java b/client/src/main/java/rt4/Static220.java index 48c63ae..b5df847 100644 --- a/client/src/main/java/rt4/Static220.java +++ b/client/src/main/java/rt4/Static220.java @@ -57,7 +57,7 @@ public final class Static220 { @OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V") public static void method3801() { - for (@Pc(1) int local1 = 0; local1 < Static126.anInt3114; local1++) { + for (@Pc(1) int local1 = 0; local1 < SceneGraph.anInt3114; local1++) { for (@Pc(6) int local6 = 0; local6 < SceneGraph.mapSizeX; local6++) { for (@Pc(11) int local11 = 0; local11 < SceneGraph.mapSizeZ; local11++) { @Pc(22) Tile local22 = SceneGraph.tiles[local1][local6][local11]; diff --git a/client/src/main/java/rt4/Static221.java b/client/src/main/java/rt4/Static221.java index bb1d524..175beb4 100644 --- a/client/src/main/java/rt4/Static221.java +++ b/client/src/main/java/rt4/Static221.java @@ -8,6 +8,10 @@ public final class Static221 { @OriginalMember(owner = "client!s", name = "a", descriptor = "[I") public static int[] tt; + @OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;") + public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3; + @OriginalMember(owner = "client!hh", name = "r", descriptor = "[I") + public static int[] anIntArray235; @OriginalMember(owner = "client!s", name = "b", descriptor = "(III)V") public static void method3392(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @@ -29,7 +33,7 @@ public final class Static221 { @Pc(65) int local65 = SoftwareRaster.pixels[local24++ + arg0]; @Pc(70) int local70 = Static216.anIntArray188[local20++]; if (local70 == 0) { - Static167.aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = local65; + aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = local65; } else { @Pc(76) int local76 = local70 + 18; if (local76 > 255) { @@ -39,19 +43,19 @@ public final class Static221 { if (local89 > 255) { local89 = 255; } - local70 = Static96.anIntArray235[local70]; - Static167.aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = (local89 * (local65 & 0xFF00FF) + (local70 & 0xFF00FF) * local76 & 0xFF00FF00) + ((local70 & 0xFF00) * local76 + ((local65 & 0xFF00) * local89) & 0xFF0000) >> 8; + local70 = anIntArray235[local70]; + aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = (local89 * (local65 & 0xFF00FF) + (local70 & 0xFF00FF) * local76 & 0xFF00FF00) + ((local70 & 0xFF00) * local76 + ((local65 & 0xFF00) * local89) & 0xFF0000) >> 8; } } for (local55 = 0; local55 < local43; local55++) { - Static167.aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = SoftwareRaster.pixels[arg0 + local24++]; + aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = SoftwareRaster.pixels[arg0 + local24++]; } local24 += SoftwareRaster.width - 128; } if (GlRenderer.enabled) { - GlRaster.method1178(Static167.aClass3_Sub2_Sub1_Sub1_3.pixels, arg0, arg1, Static167.aClass3_Sub2_Sub1_Sub1_3.width, Static167.aClass3_Sub2_Sub1_Sub1_3.height); + GlRaster.method1178(aClass3_Sub2_Sub1_Sub1_3.pixels, arg0, arg1, aClass3_Sub2_Sub1_Sub1_3.width, aClass3_Sub2_Sub1_Sub1_3.height); } else { - Static167.aClass3_Sub2_Sub1_Sub1_3.method1415(arg0, arg1); + aClass3_Sub2_Sub1_Sub1_3.method1415(arg0, arg1); } } diff --git a/client/src/main/java/rt4/Static226.java b/client/src/main/java/rt4/Static226.java index 9635fcc..94e9d1b 100644 --- a/client/src/main/java/rt4/Static226.java +++ b/client/src/main/java/rt4/Static226.java @@ -70,7 +70,7 @@ public final class Static226 { local43 = 0; } if (anInt3953 == 1) { - if (Static155.anInt3751 == Static277.anInt5850 && Static280.anInt5895 == Static60.anInt1892) { + if (Static155.anInt3751 == Mouse.anInt5850 && Static280.anInt5895 == Static60.anInt1892) { Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22); anInt3953 = 0; Static229.anInt5138 = local43; @@ -87,7 +87,7 @@ public final class Static226 { Static40.aBoolean108 = true; } else { Static280.anInt5895 = Mouse.clickY; - Static277.anInt5850 = Mouse.clickX; + Mouse.anInt5850 = Mouse.clickX; anInt3953 = 1; } } diff --git a/client/src/main/java/rt4/Static228.java b/client/src/main/java/rt4/Static228.java index 15f5d16..2e9bb0e 100644 --- a/client/src/main/java/rt4/Static228.java +++ b/client/src/main/java/rt4/Static228.java @@ -11,8 +11,12 @@ public final class Static228 { @OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;") public static final JagString aClass100_967 = JagString.parse(""); + @OriginalMember(owner = "client!wi", name = "X", descriptor = "[[B") + public static final byte[][] aByteArrayArray16 = new byte[1000][]; + @OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B") + public static final byte[][] aByteArrayArray2 = new byte[250][]; - @OriginalMember(owner = "client!sh", name = "f", descriptor = "I") + @OriginalMember(owner = "client!sh", name = "f", descriptor = "I") public static int anInt5103 = -1; @OriginalMember(owner = "client!sh", name = "i", descriptor = "[[I") @@ -25,12 +29,12 @@ public final class Static228 { public static synchronized byte[] allocate(@OriginalArg(1) int arg0) { @Pc(22) byte[] local22; if (arg0 == 100 && Static115.anInt2937 > 0) { - local22 = Static277.aByteArrayArray16[--Static115.anInt2937]; - Static277.aByteArrayArray16[Static115.anInt2937] = null; + local22 = aByteArrayArray16[--Static115.anInt2937]; + aByteArrayArray16[Static115.anInt2937] = null; return local22; } else if (arg0 == 5000 && Static251.anInt5459 > 0) { - local22 = Static12.aByteArrayArray2[--Static251.anInt5459]; - Static12.aByteArrayArray2[Static251.anInt5459] = null; + local22 = aByteArrayArray2[--Static251.anInt5459]; + aByteArrayArray2[Static251.anInt5459] = null; return local22; } else if (arg0 == 30000 && Static224.anInt5064 > 0) { local22 = aByteArrayArray6[--Static224.anInt5064]; diff --git a/client/src/main/java/rt4/Static229.java b/client/src/main/java/rt4/Static229.java index d1e2ff2..63c1bea 100644 --- a/client/src/main/java/rt4/Static229.java +++ b/client/src/main/java/rt4/Static229.java @@ -1,6 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; public final class Static229 { @@ -8,15 +7,4 @@ public final class Static229 { @OriginalMember(owner = "client!si", name = "ab", descriptor = "I") public static int anInt5138; - @OriginalMember(owner = "client!si", name = "gb", descriptor = "Lclient!na;") - public static final JagString aClass100_974 = JagString.parse("
(X"); - - @OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V") - public static void method3935(@OriginalArg(0) int arg0) { - FogManager.method3060(FogManager.anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F); - FogManager.method3063(-50.0F, -60.0F, -50.0F); - FogManager.method3062(FogManager.anInt3922, 0); - FogManager.method3058(); - } - } diff --git a/client/src/main/java/rt4/Static231.java b/client/src/main/java/rt4/Static231.java index 7594677..2237538 100644 --- a/client/src/main/java/rt4/Static231.java +++ b/client/src/main/java/rt4/Static231.java @@ -15,132 +15,7 @@ public final class Static231 { @OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z") public static boolean aBoolean252 = false; - @OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIBIII)V") - public static void method3981(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { - @Pc(7) int local7 = 0; - @Pc(12) int local12 = arg0 - arg3; - @Pc(14) int local14 = 0; - @Pc(16) int local16 = arg6; - @Pc(20) int local20 = arg6 * arg6; - @Pc(25) int local25 = arg6 - arg3; - @Pc(29) int local29 = arg0 * arg0; - @Pc(33) int local33 = local20 << 1; - @Pc(37) int local37 = local25 * local25; - @Pc(41) int local41 = local12 * local12; - @Pc(45) int local45 = local29 << 1; - @Pc(49) int local49 = local37 << 1; - @Pc(53) int local53 = local41 << 1; - @Pc(57) int local57 = local25 << 1; - @Pc(61) int local61 = arg6 << 1; - @Pc(70) int local70 = local33 + local29 * (1 - local61); - @Pc(79) int local79 = local20 - (local61 - 1) * local45; - @Pc(88) int local88 = local49 + local41 * (1 - local57); - @Pc(96) int local96 = local37 - local53 * (local57 - 1); - @Pc(100) int local100 = local20 << 2; - @Pc(104) int local104 = local29 << 2; - @Pc(108) int local108 = local37 << 2; - @Pc(112) int local112 = local33 * 3; - @Pc(118) int local118 = (local61 - 3) * local45; - @Pc(130) int local130 = local41 << 2; - @Pc(134) int local134 = local49 * 3; - @Pc(140) int local140 = (local57 - 3) * local53; - @Pc(146) int local146 = (arg6 - 1) * local104; - @Pc(148) int local148 = local108; - @Pc(150) int local150 = local100; - @Pc(156) int local156 = (local25 - 1) * local130; - @Pc(174) int local174; - @Pc(183) int local183; - @Pc(192) int local192; - @Pc(201) int local201; - if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) { - @Pc(166) int[] local166 = Static71.anIntArrayArray10[arg4]; - local174 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg0, TextureOp29.anInt4164); - local183 = Static78.method1690(TextureOp29.anInt5063, arg5 + arg0, TextureOp29.anInt4164); - local192 = Static78.method1690(TextureOp29.anInt5063, arg5 - local12, TextureOp29.anInt4164); - local201 = Static78.method1690(TextureOp29.anInt5063, arg5 + local12, TextureOp29.anInt4164); - Static131.method2576(local166, local174, local192, arg2); - Static131.method2576(local166, local192, local201, arg1); - Static131.method2576(local166, local201, local183, arg2); - } - while (local16 > 0) { - if (local70 < 0) { - while (local70 < 0) { - local70 += local112; - local112 += local100; - local7++; - local79 += local150; - local150 += local100; - } - } - @Pc(255) boolean local255 = local16 <= local25; - if (local79 < 0) { - local79 += local150; - local70 += local112; - local7++; - local150 += local100; - local112 += local100; - } - if (local255) { - if (local88 < 0) { - while (local88 < 0) { - local14++; - local96 += local148; - local148 += local108; - local88 += local134; - local134 += local108; - } - } - if (local96 < 0) { - local14++; - local96 += local148; - local88 += local134; - local148 += local108; - local134 += local108; - } - local88 += -local156; - local156 -= local130; - local96 += -local140; - local140 -= local130; - } - local79 += -local118; - local70 += -local146; - local146 -= local104; - local118 -= local104; - local16--; - local183 = arg4 + local16; - local174 = arg4 - local16; - if (TextureOp29.anInt5773 <= local183 && TextureOp29.anInt2869 >= local174) { - local192 = Static78.method1690(TextureOp29.anInt5063, arg5 + local7, TextureOp29.anInt4164); - local201 = Static78.method1690(TextureOp29.anInt5063, arg5 - local7, TextureOp29.anInt4164); - if (local255) { - @Pc(404) int local404 = Static78.method1690(TextureOp29.anInt5063, arg5 + local14, TextureOp29.anInt4164); - @Pc(412) int local412 = Static78.method1690(TextureOp29.anInt5063, arg5 - local14, TextureOp29.anInt4164); - @Pc(420) int[] local420; - if (TextureOp29.anInt5773 <= local174) { - local420 = Static71.anIntArrayArray10[local174]; - Static131.method2576(local420, local201, local412, arg2); - Static131.method2576(local420, local412, local404, arg1); - Static131.method2576(local420, local404, local192, arg2); - } - if (local183 <= TextureOp29.anInt2869) { - local420 = Static71.anIntArrayArray10[local183]; - Static131.method2576(local420, local201, local412, arg2); - Static131.method2576(local420, local412, local404, arg1); - Static131.method2576(local420, local404, local192, arg2); - } - } else { - if (TextureOp29.anInt5773 <= local174) { - Static131.method2576(Static71.anIntArrayArray10[local174], local201, local192, arg2); - } - if (TextureOp29.anInt2869 >= local183) { - Static131.method2576(Static71.anIntArrayArray10[local183], local201, local192, arg2); - } - } - } - } - } - - @OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIII)V") + @OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIII)V") public static void method3982(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @Pc(15) int local15 = arg4 - arg2; @Pc(19) int local19 = arg1 - arg3; diff --git a/client/src/main/java/rt4/Static232.java b/client/src/main/java/rt4/Static232.java index 3a20b8a..1ab9138 100644 --- a/client/src/main/java/rt4/Static232.java +++ b/client/src/main/java/rt4/Static232.java @@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static232 { - @OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B") - public static byte[][][] aByteArrayArrayArray13; - - @OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V") + @OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V") public static void method3991(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(8) int arg5, @OriginalArg(9) int arg6, @OriginalArg(10) int arg7) { @Pc(9) int local9 = arg2 - arg4; @Pc(11) int local11 = -1; diff --git a/client/src/main/java/rt4/Static233.java b/client/src/main/java/rt4/Static233.java index d8f51af..0873c56 100644 --- a/client/src/main/java/rt4/Static233.java +++ b/client/src/main/java/rt4/Static233.java @@ -42,11 +42,11 @@ public final class Static233 { @Pc(19) byte local19; @Pc(21) byte[][] local21; if (GlRenderer.enabled && arg0) { - local21 = Static19.underWaterLocationsMapFilesBuffer; + local21 = LoginManager.underWaterLocationsMapFilesBuffer; local19 = 1; } else { local19 = 4; - local21 = Static156.locationMapFilesBuffer; + local21 = LoginManager.locationMapFilesBuffer; } for (@Pc(29) int local29 = 0; local29 < local19; local29++) { client.audioLoop(); @@ -60,8 +60,8 @@ public final class Static233 { @Pc(83) int local83 = local56 >> 14 & 0x3FF; @Pc(89) int local89 = local56 >> 3 & 0x7FF; @Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8); - for (@Pc(101) int local101 = 0; local101 < Static238.regionBitPacked.length; local101++) { - if (Static238.regionBitPacked[local101] == local99 && local21[local101] != null) { + for (@Pc(101) int local101 = 0; local101 < LoginManager.regionBitPacked.length; local101++) { + if (LoginManager.regionBitPacked[local101] == local99 && local21[local101] != null) { Static217.method3771(PathFinder.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8); break; } diff --git a/client/src/main/java/rt4/Static235.java b/client/src/main/java/rt4/Static235.java index b3db69e..dbc6df8 100644 --- a/client/src/main/java/rt4/Static235.java +++ b/client/src/main/java/rt4/Static235.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static235 { - @OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;") - public static MapElementList mapElementList; - @OriginalMember(owner = "client!tb", name = "Q", descriptor = "I") public static int anInt5276 = 0; diff --git a/client/src/main/java/rt4/Static238.java b/client/src/main/java/rt4/Static238.java index b8240b7..03f9efa 100644 --- a/client/src/main/java/rt4/Static238.java +++ b/client/src/main/java/rt4/Static238.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static238 { - @OriginalMember(owner = "client!te", name = "H", descriptor = "[I") - public static int[] regionBitPacked; - - @OriginalMember(owner = "client!te", name = "B", descriptor = "[I") + @OriginalMember(owner = "client!te", name = "B", descriptor = "[I") public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 }; } diff --git a/client/src/main/java/rt4/Static24.java b/client/src/main/java/rt4/Static24.java index 23a051a..a5c3953 100644 --- a/client/src/main/java/rt4/Static24.java +++ b/client/src/main/java/rt4/Static24.java @@ -20,8 +20,4 @@ public final class Static24 { return local8; } - @OriginalMember(owner = "client!bn", name = "d", descriptor = "(II)Z") - public static boolean isDigit(@OriginalArg(1) int arg0) { - return arg0 >= 48 && arg0 <= 57; - } } diff --git a/client/src/main/java/rt4/Static245.java b/client/src/main/java/rt4/Static245.java index b783099..468c4ed 100644 --- a/client/src/main/java/rt4/Static245.java +++ b/client/src/main/java/rt4/Static245.java @@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static245 { - @OriginalMember(owner = "client!tm", name = "g", descriptor = "I") - public static int anInt5375; - @OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V") public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) { @Pc(17) int local17; @@ -34,9 +31,9 @@ public final class Static245 { for (local103 = 0; local103 < 64; local103++) { for (local108 = 0; local108 < 64; local108++) { if (arg6 == local17 && arg8 <= local103 && arg8 + 8 > local103 && arg7 <= local108 && local108 < arg7 + 8) { - Static278.readTile(0, 0, arg9, local96, Static202.method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, Static214.method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2); + SceneGraph.readTile(0, 0, arg9, local96, Static202.method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, Static214.method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2); } else { - Static278.readTile(0, 0, arg9, local96, -1, -1, 0, 0); + SceneGraph.readTile(0, 0, arg9, local96, -1, -1, 0, 0); } } } @@ -83,7 +80,7 @@ public final class Static245 { } while (local237 > local232) { while (local417 < local255) { - Static232.aByteArrayArrayArray13[arg2][local232][local417] = 0; + SceneGraph.aByteArrayArrayArray13[arg2][local232][local417] = 0; local417++; } local232++; @@ -100,7 +97,7 @@ public final class Static245 { local316 = arg1 + Static214.method4360(arg0, local266 & 0x7, local255 & 0x7); @Pc(328) int local328 = Static202.method3659(arg0, local255 & 0x7, local266 & 0x7) + arg4; if (local316 >= 0 && local316 < 104 && local328 >= 0 && local328 < 104) { - Static232.aByteArrayArrayArray13[arg2][local316][local328] = local246; + SceneGraph.aByteArrayArrayArray13[arg2][local316][local328] = local246; } } } @@ -162,7 +159,7 @@ public final class Static245 { local108 = arg4 + 7; for (local497 = arg1; local497 < local103; local497++) { for (local232 = arg4; local232 < local108; local232++) { - Static232.aByteArrayArrayArray13[arg2][local497][local232] = 0; + SceneGraph.aByteArrayArrayArray13[arg2][local497][local232] = 0; } } } diff --git a/client/src/main/java/rt4/Static246.java b/client/src/main/java/rt4/Static246.java index 23deccc..d5ee9f8 100644 --- a/client/src/main/java/rt4/Static246.java +++ b/client/src/main/java/rt4/Static246.java @@ -1,28 +1,10 @@ package rt4; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static246 { @OriginalMember(owner = "client!u", name = "i", descriptor = "I") public static int anInt5393; - @OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V") - public static void method4239() { - for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) { - @Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1; - if (local15.anInt606 != Player.level || local15.aBoolean41) { - local9.unlink(); - } else if (local15.anInt590 <= client.loop) { - local15.method558(Static178.anInt4247); - if (local15.aBoolean41) { - local9.unlink(); - } else { - Static43.method1141(local15.anInt606, local15.anInt604, local15.anInt598, local15.anInt599, 60, local15, 0, -1L, false); - } - } - } - } - } diff --git a/client/src/main/java/rt4/Static247.java b/client/src/main/java/rt4/Static247.java index b112364..978413e 100644 --- a/client/src/main/java/rt4/Static247.java +++ b/client/src/main/java/rt4/Static247.java @@ -6,7 +6,17 @@ import org.openrs2.deob.annotation.Pc; public final class Static247 { - @OriginalMember(owner = "client!bl", name = "X", descriptor = "I") + @OriginalMember(owner = "client!ka", name = "t", descriptor = "[I") + public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 }; + @OriginalMember(owner = "client!uj", name = "A", descriptor = "[I") + public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 }; + @OriginalMember(owner = "client!gm", name = "gb", descriptor = "[I") + public static final int[] anIntArray211 = new int[] { 0, 4, 4, 8, 0, 0, 8, 0, 0 }; + @OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I") + public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 }; + @OriginalMember(owner = "client!hb", name = "t", descriptor = "[I") + public static final int[] anIntArray215 = new int[] { 160, 192, 80, 96, 0, 144, 80, 48, 160 }; + @OriginalMember(owner = "client!bl", name = "X", descriptor = "I") public static int anInt730 = -1; @OriginalMember(owner = "client!ub", name = "a", descriptor = "(IIIIIII)V") @@ -224,23 +234,23 @@ public final class Static247 { local8.anInt670 = Static191.anIntArray386[var10]; } if (local616 != null) { - if ((local616.anInt3049 & Static90.anIntArray215[var10]) == 0) { + if ((local616.anInt3049 & anIntArray215[var10]) == 0) { local8.anInt663 = 0; } else if (local616.anInt3049 == 16) { local8.anInt663 = 3; - local8.anInt665 = Static128.anIntArray294[var10]; + local8.anInt665 = anIntArray294[var10]; local8.anInt667 = 3 - local8.anInt665; } else if (local616.anInt3049 == 32) { local8.anInt663 = 6; - local8.anInt665 = Static254.anIntArray489[var10]; + local8.anInt665 = anIntArray489[var10]; local8.anInt667 = 6 - local8.anInt665; } else if (local616.anInt3049 == 64) { local8.anInt663 = 12; - local8.anInt665 = Static86.anIntArray211[var10]; + local8.anInt665 = anIntArray211[var10]; local8.anInt667 = 12 - local8.anInt665; } else { local8.anInt663 = 9; - local8.anInt665 = Static131.anIntArray307[var10]; + local8.anInt665 = anIntArray307[var10]; local8.anInt667 = 9 - local8.anInt665; } if ((local616.anInt3049 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3049)) { @@ -256,7 +266,7 @@ public final class Static247 { local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null); } } - if (local619 != null && !Static276.method4611(local27, local18, local21, local619.primary.getMaxY())) { + if (local619 != null && !method4611(local27, local18, local21, local619.primary.getMaxY())) { if (GlRenderer.enabled) { GlRenderer.method4159(local33 - 0.5F); } @@ -573,7 +583,7 @@ public final class Static247 { } if (local8.anInt670 != 0) { @Pc(2109) WallDecor local2109 = local8.wallDecor; - if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.primary.getMaxY())) { + if (local2109 != null && !method4611(local27, local18, local21, local2109.primary.getMaxY())) { if ((local2109.anInt1395 & local8.anInt670) != 0) { if (GlRenderer.enabled) { LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); @@ -624,7 +634,7 @@ public final class Static247 { } } @Pc(2388) Tile local2388; - if (local24 < Static126.anInt3114 - 1) { + if (local24 < SceneGraph.anInt3114 - 1) { local2388 = SceneGraph.tiles[local24 + 1][local18][local21]; if (local2388 != null && local2388.aBoolean46) { Static7.aClass69_32.addTail(local2388); @@ -681,4 +691,14 @@ public final class Static247 { return arg0 & 0xFF; } + @OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z") + public static boolean method4611(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { + if (Static9.method187(arg0, arg1, arg2)) { + @Pc(10) int local10 = arg1 << 7; + @Pc(14) int local14 = arg2 << 7; + return SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1); + } else { + return false; + } + } } diff --git a/client/src/main/java/rt4/Static248.java b/client/src/main/java/rt4/Static248.java index 05b270f..d744a96 100644 --- a/client/src/main/java/rt4/Static248.java +++ b/client/src/main/java/rt4/Static248.java @@ -7,9 +7,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static248 { - @OriginalMember(owner = "client!uc", name = "f", descriptor = "I") - public static int anInt4232; - @OriginalMember(owner = "client!uc", name = "a", descriptor = "I") public static int anInt4229 = 2; @@ -24,13 +21,13 @@ public final class Static248 { @Pc(32) int local32; @Pc(37) int local37; @Pc(183) int local183; - for (@Pc(23) int local23 = Static235.anInt5276; local23 < Static126.anInt3114; local23++) { + for (@Pc(23) int local23 = Static235.anInt5276; local23 < SceneGraph.anInt3114; local23++) { @Pc(30) Tile[][] local30 = SceneGraph.tiles[local23]; for (local32 = Static31.anInt987; local32 < Static2.anInt15; local32++) { for (local37 = Static80.anInt4698; local37 < Static215.anInt4866; local37++) { @Pc(46) Tile local46 = local30[local32][local37]; if (local46 != null) { - if (Static48.aBooleanArrayArray1[local32 + Static277.tileVisibilityDistance - Static167.anInt4069][local37 + Static277.tileVisibilityDistance - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) { + if (Static48.aBooleanArrayArray1[local32 + Static123.tileVisibilityDistance - Static167.anInt4069][local37 + Static123.tileVisibilityDistance - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) { local46.aBoolean45 = true; local46.aBoolean46 = true; if (local46.sceneryLen > 0) { @@ -86,8 +83,8 @@ public final class Static248 { UnderwaterMaterialRenderer.method4609(); Static152.anInt3604 = -1; Static247.anInt730 = -1; - for (local32 = 0; local32 < Static182.aClass3_Sub14ArrayArray2[0].length; local32++) { - @Pc(285) GlTile local285 = Static182.aClass3_Sub14ArrayArray2[0][local32]; + for (local32 = 0; local32 < SceneGraph.underwaterHdTiles[0].length; local32++) { + @Pc(285) GlTile local285 = SceneGraph.underwaterHdTiles[0][local32]; @Pc(294) float local294 = 251.5F - (local285.blend ? 1.0F : 0.5F); if (local285.underwaterColor != Static152.anInt3604) { Static152.anInt3604 = local285.underwaterColor; @@ -100,12 +97,12 @@ public final class Static248 { } else { local32 = Static235.anInt5276; while (true) { - if (local32 >= Static126.anInt3114) { + if (local32 >= SceneGraph.anInt3114) { LightingManager.method2402(Static167.anInt4069, Static193.anInt4539, SceneGraph.tiles); break; } - for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) { - @Pc(336) GlTile local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37]; + for (local37 = 0; local37 < SceneGraph.underwaterHdTiles[local32].length; local37++) { + @Pc(336) GlTile local336 = SceneGraph.underwaterHdTiles[local32][local37]; @Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.blend ? 1.0F : 0.5F); if (local336.texture != -1 && Rasteriser.textureProvider.getMaterialType(local336.texture) == MaterialManager.WATER && Preferences.highWaterDetail) { WaterMaterialRenderer.method619(local336.underwaterColor); @@ -114,7 +111,7 @@ public final class Static248 { } if (local32 == 0 && Preferences.sceneryShadowsType > 0) { GlRenderer.method4159(101.5F); - Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, SceneGraph.tileHeights[0]); + Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static123.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, SceneGraph.tileHeights[0]); } local32++; } @@ -128,13 +125,13 @@ public final class Static248 { @Pc(406) Tile[][] local406; @Pc(415) int local415; @Pc(428) int local428; - for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) { + for (local399 = Static235.anInt5276; local399 < SceneGraph.anInt3114; local399++) { local406 = SceneGraph.tiles[local399]; - for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) { + for (local37 = -Static123.tileVisibilityDistance; local37 <= 0; local37++) { local415 = Static167.anInt4069 + local37; local183 = Static167.anInt4069 - local37; if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) { - for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) { + for (local428 = -Static123.tileVisibilityDistance; local428 <= 0; local428++) { local434 = Static193.anInt4539 + local428; local438 = Static193.anInt4539 - local428; if (local415 >= Static31.anInt987) { @@ -175,13 +172,13 @@ public final class Static248 { } } } - for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) { + for (local399 = Static235.anInt5276; local399 < SceneGraph.anInt3114; local399++) { local406 = SceneGraph.tiles[local399]; - for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) { + for (local37 = -Static123.tileVisibilityDistance; local37 <= 0; local37++) { local415 = Static167.anInt4069 + local37; local183 = Static167.anInt4069 - local37; if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) { - for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) { + for (local428 = -Static123.tileVisibilityDistance; local428 <= 0; local428++) { local434 = Static193.anInt4539 + local428; local438 = Static193.anInt4539 - local428; if (local415 >= Static31.anInt987) { diff --git a/client/src/main/java/rt4/Static249.java b/client/src/main/java/rt4/Static249.java deleted file mode 100644 index 5589f61..0000000 --- a/client/src/main/java/rt4/Static249.java +++ /dev/null @@ -1,21 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static249 { - - @OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;") - public static final JagString aClass100_1039 = JagString.parse(" x "); - - @OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z") - public static boolean method4265(@OriginalArg(1) Component arg0) { - if (arg0.anInt453 == 205) { - Static267.anInt5775 = 250; - return true; - } else { - return false; - } - } - -} diff --git a/client/src/main/java/rt4/Static250.java b/client/src/main/java/rt4/Static250.java index ce099a2..c0c2297 100644 --- a/client/src/main/java/rt4/Static250.java +++ b/client/src/main/java/rt4/Static250.java @@ -1,7 +1,6 @@ package rt4; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static250 { @@ -17,34 +16,4 @@ public final class Static250 { @OriginalMember(owner = "client!uf", name = "t", descriptor = "I") public static int anInt5444 = 0; - @OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V") - public static void method4273() { - @Pc(14) int playerX = PlayerList.self.xFine + Static132.anInt3291; - @Pc(20) int playerZ = PlayerList.self.zFine + Static206.anInt4774; - if (Camera.cameraX - playerX < -500 || Camera.cameraX - playerX > 500 || Camera.cameraZ - playerZ < -500 || Camera.cameraZ - playerZ > 500) { - Camera.cameraX = playerX; - Camera.cameraZ = playerZ; - } - if (Camera.cameraZ != playerZ) { - Camera.cameraZ += (playerZ - Camera.cameraZ) / 16; - } - if (Camera.cameraX != playerX) { - Camera.cameraX += (playerX - Camera.cameraX) / 16; - } - if (Preferences.aBoolean63) { - for (@Pc(93) int local93 = 0; local93 < InterfaceList.keyQueueSize; local93++) { - @Pc(104) int code = InterfaceList.keyCodes[local93]; - if (code == Keyboard.KEY_UP) { - Camera.pitchTarget += 47; - } else if (code == Keyboard.KEY_DOWN) { - Camera.pitchTarget -= 17; - } else if (code == Keyboard.KEY_LEFT) { - Camera.yawTarget -= 65; - } else if (code == Keyboard.KEY_RIGHT) { - Camera.yawTarget += 191; - } - } - Camera.clampCameraAngle(); - } - } } diff --git a/client/src/main/java/rt4/Static251.java b/client/src/main/java/rt4/Static251.java index cd6e69f..de8ee8c 100644 --- a/client/src/main/java/rt4/Static251.java +++ b/client/src/main/java/rt4/Static251.java @@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static251 { - @OriginalMember(owner = "client!ug", name = "h", descriptor = "I") - public static int anInt5449; - @OriginalMember(owner = "client!ug", name = "b", descriptor = "[F") public static final float[] aFloatArray28 = new float[4]; diff --git a/client/src/main/java/rt4/Static252.java b/client/src/main/java/rt4/Static252.java index 9b72202..a80a205 100644 --- a/client/src/main/java/rt4/Static252.java +++ b/client/src/main/java/rt4/Static252.java @@ -13,8 +13,8 @@ public final class Static252 { if (Static236.method4047() != 2) { return; } - @Pc(27) byte local27 = (byte) (Static136.anInt3325 - 4 & 0xFF); - @Pc(31) int local31 = Static136.anInt3325 % 104; + @Pc(27) byte local27 = (byte) (Static253.anInt3325 - 4 & 0xFF); + @Pc(31) int local31 = Static253.anInt3325 % 104; @Pc(33) int local33; @Pc(40) int local40; for (local33 = 0; local33 < 4; local33++) { diff --git a/client/src/main/java/rt4/Static253.java b/client/src/main/java/rt4/Static253.java index 709a7ca..e389725 100644 --- a/client/src/main/java/rt4/Static253.java +++ b/client/src/main/java/rt4/Static253.java @@ -8,21 +8,25 @@ public final class Static253 { @OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z") public static boolean aBoolean43 = true; + @OriginalMember(owner = "client!wi", name = "bb", descriptor = "I") + public static int anInt5854 = 0; + @OriginalMember(owner = "client!kk", name = "j", descriptor = "I") + public static int anInt3325 = 0; @OriginalMember(owner = "client!ui", name = "a", descriptor = "(IIZIII)V") public static void method4326(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { - Static136.anInt3325++; - Static210.method3711(); + anInt3325++; + method3711(); if (!arg1) { - Static38.method964(true); - Static173.method3240(true); - Static38.method964(false); + method964(true); + method3240(true); + method964(false); } - Static173.method3240(false); + method3240(false); if (!arg1) { - Static195.method3532(); + method3532(); } - Static246.method4239(); + method4239(); if (GlRenderer.enabled) { Static115.method2314(arg3, arg4, arg0, arg2, true); arg2 = Static115.anInt983; @@ -38,8 +42,8 @@ public final class Static253 { if (local59 < Static234.anInt5245 / 256) { local59 = Static234.anInt5245 / 256; } - if (Static176.customCameraActive[4] && Static276.cameraAmplitude[4] + 128 > local59) { - local59 = Static276.cameraAmplitude[4] + 128; + if (Static176.customCameraActive[4] && Camera.cameraAmplitude[4] + 128 > local59) { + local59 = Camera.cameraAmplitude[4] + 128; } Static18.method555(Camera.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Camera.cameraZ, local59); } @@ -52,7 +56,7 @@ public final class Static253 { @Pc(171) int local171; for (local127 = 0; local127 < 5; local127++) { if (Static176.customCameraActive[local127]) { - local171 = (int) ((double) -Camera.cameraJitter[local127] + (double) (Camera.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.cameraFrequency[local127] / 100.0D)) * (double) Static276.cameraAmplitude[local127]); + local171 = (int) ((double) -Camera.cameraJitter[local127] + (double) (Camera.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Camera.cameraFrequency[local127] / 100.0D)) * (double) Camera.cameraAmplitude[local127]); if (local127 == 3) { Camera.cameraYaw = local171 + Camera.cameraYaw & 0x7FF; } @@ -104,7 +108,7 @@ public final class Static253 { Static34.anInt1053 = (local361 - local344) * (Static60.anInt1892 - arg4) / arg0 + local344; } client.audioLoop(); - @Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) Static136.anInt3325 : 1; + @Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) anInt3325 : 1; if (GlRenderer.enabled) { GlRenderer.restoreLighting(); GlRenderer.setDepthTestEnabled(true); @@ -159,7 +163,7 @@ public final class Static253 { @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V") public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { - Static277.anInt5854 = 0; + anInt5854 = 0; @Pc(5) int local5; @Pc(642) int local642; @Pc(74) int local74; @@ -250,16 +254,16 @@ public final class Static253 { } if (local17.chatMessage != null && (local5 >= PlayerList.size || Chat.publicFilter == 0 || Chat.publicFilter == 3 || Chat.publicFilter == 1 && FriendsList.contains(((Player) local17).username))) { Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1); - if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) { - Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2; - Static191.anIntArray387[Static277.anInt5854] = Fonts.b12Full.lineHeight; - Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951; - Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548; - Static191.anIntArray390[Static277.anInt5854] = local17.chatColor; - Static191.anIntArray391[Static277.anInt5854] = local17.chatEffect; - Static191.anIntArray384[Static277.anInt5854] = local17.chatLoops; - Static191.aClass100Array132[Static277.anInt5854] = local17.chatMessage; - Static277.anInt5854++; + if (Static65.anInt1951 > -1 && anInt5854 < Static191.anInt4506) { + Static191.anIntArray389[anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2; + Static191.anIntArray387[anInt5854] = Fonts.b12Full.lineHeight; + Static191.anIntArray385[anInt5854] = Static65.anInt1951; + Static191.anIntArray392[anInt5854] = Static16.anInt548; + Static191.anIntArray390[anInt5854] = local17.chatColor; + Static191.anIntArray391[anInt5854] = local17.chatEffect; + Static191.anIntArray384[anInt5854] = local17.chatLoops; + Static191.aClass100Array132[anInt5854] = local17.chatMessage; + anInt5854++; } } if (local17.hitpointsBarVisibleUntil > client.loop) { @@ -340,7 +344,7 @@ public final class Static253 { } } } - for (local5 = 0; local5 < Static277.anInt5854; local5++) { + for (local5 = 0; local5 < anInt5854; local5++) { local74 = Static191.anIntArray392[local5]; @Pc(859) int local859 = Static191.anIntArray385[local5]; local310 = Static191.anIntArray387[local5]; @@ -364,13 +368,13 @@ public final class Static253 { local639 = Static16.anIntArray52[Static191.anIntArray390[local5]]; } if (Static191.anIntArray390[local5] == 6) { - local639 = Static136.anInt3325 % 20 >= 10 ? 16776960 : 16711680; + local639 = anInt3325 % 20 >= 10 ? 16776960 : 16711680; } if (Static191.anIntArray390[local5] == 7) { - local639 = Static136.anInt3325 % 20 < 10 ? 255 : 65535; + local639 = anInt3325 % 20 < 10 ? 255 : 65535; } if (Static191.anIntArray390[local5] == 8) { - local639 = Static136.anInt3325 % 20 >= 10 ? 8454016 : 45056; + local639 = anInt3325 % 20 >= 10 ? 8454016 : 45056; } if (Static191.anIntArray390[local5] == 9) { local642 = 150 - Static191.anIntArray384[local5]; @@ -406,13 +410,13 @@ public final class Static253 { Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0); } if (Static191.anIntArray391[local5] == 1) { - Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325); + Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, anInt3325); } if (Static191.anIntArray391[local5] == 2) { - Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325); + Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, anInt3325); } if (Static191.anIntArray391[local5] == 3) { - Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]); + Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, anInt3325, 150 - Static191.anIntArray384[local5]); } if (Static191.anIntArray391[local5] == 4) { local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150; @@ -453,4 +457,315 @@ public final class Static253 { } } } + + @OriginalMember(owner = "client!rb", name = "a", descriptor = "(I)V") + public static void method3711() { + for (@Pc(7) int local7 = 0; local7 < 104; local7++) { + for (@Pc(14) int local14 = 0; local14 < 104; local14++) { + Static31.anIntArrayArray6[local7][local14] = 0; + } + } + } + + @OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V") + public static void method964(@OriginalArg(0) boolean arg0) { + @Pc(3) int local3 = PlayerList.size; + if (LoginManager.mapFlagX == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == LoginManager.mapFlagZ) { + LoginManager.mapFlagX = 0; + } + if (arg0) { + local3 = 1; + } + @Pc(28) int local28; + @Pc(39) Player local39; + @Pc(82) int local82; + @Pc(182) int local182; + @Pc(200) int local200; + @Pc(214) int local214; + @Pc(223) int local223; + @Pc(106) int local106; + for (local28 = 0; local28 < local3; local28++) { + if (arg0) { + local39 = PlayerList.self; + } else { + local39 = PlayerList.players[PlayerList.ids[local28]]; + } + if (local39 != null && local39.method2682()) { + @Pc(55) int local55 = local39.getSize(); + @Pc(77) int local77; + if (local55 == 1) { + if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) { + local77 = local39.xFine >> 7; + local82 = local39.zFine >> 7; + if (local77 >= 0 && local77 < 104 && local82 >= 0 && local82 < 104) { + local106 = Static31.anIntArrayArray6[local77][local82]++; + } + } + } else if (((local55 & 0x1) != 0 || (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0) && ((local55 & 0x1) != 1 || (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64)) { + local77 = local39.xFine - local55 * 64 >> 7; + local82 = local39.zFine - local55 * 64 >> 7; + local182 = local39.getSize() + local77; + if (local182 > 104) { + local182 = 104; + } + if (local77 < 0) { + local77 = 0; + } + local200 = local82 + local39.getSize(); + if (local82 < 0) { + local82 = 0; + } + if (local200 > 104) { + local200 = 104; + } + for (local214 = local77; local214 < local182; local214++) { + for (local223 = local82; local223 < local200; local223++) { + local106 = Static31.anIntArrayArray6[local214][local223]++; + } + } + } + } + } + label220: for (local28 = 0; local28 < local3; local28++) { + @Pc(272) long local272; + if (arg0) { + local39 = PlayerList.self; + local272 = 8791798054912L; + } else { + local39 = PlayerList.players[PlayerList.ids[local28]]; + local272 = (long) PlayerList.ids[local28] << 32; + } + if (local39 != null && local39.method2682()) { + local39.aBoolean98 = false; + if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.movementSeqId == local39.getBasType().idleAnimationId) { + local39.aBoolean98 = true; + } + local82 = local39.getSize(); + if (local82 == 1) { + if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) { + local182 = local39.xFine >> 7; + local200 = local39.zFine >> 7; + if (local182 < 0 || local182 >= 104 || local200 < 0 || local200 >= 104) { + continue; + } + if (Static31.anIntArrayArray6[local182][local200] > 1) { + local106 = Static31.anIntArrayArray6[local182][local200]--; + continue; + } + } + } else if ((local82 & 0x1) == 0 && (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0 || (local82 & 0x1) == 1 && (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 0) { + local182 = local39.xFine - local82 * 64 >> 7; + local214 = local82 + local182; + local200 = local39.zFine - local82 * 64 >> 7; + if (local214 > 104) { + local214 = 104; + } + if (local182 < 0) { + local182 = 0; + } + local223 = local82 + local200; + if (local200 < 0) { + local200 = 0; + } + @Pc(468) boolean local468 = true; + if (local223 > 104) { + local223 = 104; + } + @Pc(476) int local476; + @Pc(485) int local485; + for (local476 = local182; local476 < local214; local476++) { + for (local485 = local200; local485 < local223; local485++) { + if (Static31.anIntArrayArray6[local476][local485] <= 1) { + local468 = false; + break; + } + } + } + if (local468) { + local476 = local182; + while (true) { + if (local476 >= local214) { + continue label220; + } + for (local485 = local200; local485 < local223; local485++) { + local106 = Static31.anIntArrayArray6[local476][local485]--; + } + local476++; + } + } + } + if (local39.attachment == null || client.loop < local39.anInt3390 || local39.anInt3375 <= client.loop) { + local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine); + Static43.method1141(Player.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171); + } else { + local39.aBoolean98 = false; + local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine); + Static184.method3387(Player.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.atachmentX0, local39.attachmentZ0, local39.attachmentX1, local39.attachmentZ1); + } + } + } + } + + @OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V") + public static void method3240(@OriginalArg(1) boolean arg0) { + @Pc(7) int local7; + @Pc(16) Npc local16; + @Pc(107) int local107; + @Pc(113) int local113; + @Pc(133) int local133; + @Pc(149) int local149; + @Pc(158) int local158; + @Pc(171) int local171; + for (local7 = 0; local7 < NpcList.size; local7++) { + local16 = NpcList.npcs[NpcList.ids[local7]]; + if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) { + @Pc(42) int local42 = local16.getSize(); + @Pc(97) int local97; + if (local42 == 1) { + if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) { + local97 = local16.xFine >> 7; + local107 = local16.zFine >> 7; + if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) { + local171 = Static31.anIntArrayArray6[local97][local107]++; + } + } + } else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) { + local97 = local16.xFine - local42 * 64 >> 7; + local107 = local16.zFine - local42 * 64 >> 7; + local113 = local16.getSize() + local97; + if (local97 < 0) { + local97 = 0; + } + if (local113 > 104) { + local113 = 104; + } + local133 = local107 + local16.getSize(); + if (local107 < 0) { + local107 = 0; + } + if (local133 > 104) { + local133 = 104; + } + for (local149 = local97; local149 < local113; local149++) { + for (local158 = local107; local158 < local133; local158++) { + local171 = Static31.anIntArrayArray6[local149][local158]++; + } + } + } + } + } + label200: for (local7 = 0; local7 < NpcList.size; local7++) { + local16 = NpcList.npcs[NpcList.ids[local7]]; + @Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L; + if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) { + local107 = local16.getSize(); + if (local107 == 1) { + if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) { + local113 = local16.xFine >> 7; + local133 = local16.zFine >> 7; + if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) { + continue; + } + if (Static31.anIntArrayArray6[local113][local133] > 1) { + local171 = Static31.anIntArrayArray6[local113][local133]--; + continue; + } + } + } else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) { + local113 = local16.xFine - local107 * 64 >> 7; + local133 = local16.zFine - local107 * 64 >> 7; + local158 = local133 + local107; + if (local133 < 0) { + local133 = 0; + } + @Pc(368) boolean local368 = true; + local149 = local113 + local107; + if (local158 > 104) { + local158 = 104; + } + if (local113 < 0) { + local113 = 0; + } + if (local149 > 104) { + local149 = 104; + } + @Pc(396) int local396; + @Pc(401) int local401; + for (local396 = local113; local396 < local149; local396++) { + for (local401 = local133; local401 < local158; local401++) { + if (Static31.anIntArrayArray6[local396][local401] <= 1) { + local368 = false; + break; + } + } + } + if (local368) { + local396 = local113; + while (true) { + if (local396 >= local149) { + continue label200; + } + for (local401 = local133; local401 < local158; local401++) { + local171 = Static31.anIntArrayArray6[local396][local401]--; + } + local396++; + } + } + } + if (!local16.type.aBoolean183) { + local262 |= Long.MIN_VALUE; + } + local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine); + Static43.method1141(Player.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171); + } + } + } + + @OriginalMember(owner = "client!pk", name = "i", descriptor = "(I)V") + public static void method3532() { + for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.head(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.next()) { + @Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1; + if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) { + local16.unlink(); + } else if (client.loop >= local21.anInt4822) { + if (local21.anInt4819 > 0) { + @Pc(54) Npc local54 = NpcList.npcs[local21.anInt4819 - 1]; + if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) { + local21.method3705(local54.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine); + } + } + if (local21.anInt4819 < 0) { + @Pc(102) int local102 = -local21.anInt4819 - 1; + @Pc(107) Player local107; + if (PlayerList.selfId == local102) { + local107 = PlayerList.self; + } else { + local107 = PlayerList.players[local102]; + } + if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) { + local21.method3705(local107.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine); + } + } + local21.method3704(Static178.anInt4247); + Static43.method1141(Player.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false); + } + } + } + + @OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V") + public static void method4239() { + for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) { + @Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1; + if (local15.anInt606 != Player.level || local15.aBoolean41) { + local9.unlink(); + } else if (local15.anInt590 <= client.loop) { + local15.method558(Static178.anInt4247); + if (local15.aBoolean41) { + local9.unlink(); + } else { + Static43.method1141(local15.anInt606, local15.anInt604, local15.anInt598, local15.anInt599, 60, local15, 0, -1L, false); + } + } + } + } } diff --git a/client/src/main/java/rt4/Static254.java b/client/src/main/java/rt4/Static254.java index f09bd27..e7939ae 100644 --- a/client/src/main/java/rt4/Static254.java +++ b/client/src/main/java/rt4/Static254.java @@ -9,12 +9,9 @@ public final class Static254 { @OriginalMember(owner = "client!uj", name = "H", descriptor = "I") public static int anInt5559; - @OriginalMember(owner = "client!uj", name = "A", descriptor = "[I") - public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 }; - @OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z") public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Tile[][][] arg3, @OriginalArg(5) int arg4) { - @Pc(14) byte local14 = arg0 ? 1 : (byte) (Static136.anInt3325 & 0xFF); + @Pc(14) byte local14 = arg0 ? 1 : (byte) (Static253.anInt3325 & 0xFF); if (local14 == Static266.aByteArrayArrayArray15[Player.level][arg1][arg2]) { return false; } else if ((SceneGraph.tileFlags[Player.level][arg1][arg2] & 0x4) == 0) { @@ -46,18 +43,18 @@ public final class Static254 { @Pc(358) int local358; if (local130 && arg3[local150][local108][local122] != null) { if (arg3[local150][local108][local122].wall != null) { - local191 = Static104.method2251(local94); + local191 = SceneGraph.method2251(local94); if (arg3[local150][local108][local122].wall.anInt3049 == local191 || arg3[local150][local108][local122].wall.anInt3052 == local191) { continue; } if (local102 != 0) { - local227 = Static104.method2251(local102); + local227 = SceneGraph.method2251(local102); if (local227 == arg3[local150][local108][local122].wall.anInt3049 || arg3[local150][local108][local122].wall.anInt3052 == local227) { continue; } } if (local116 != 0) { - local227 = Static104.method2251(local116); + local227 = SceneGraph.method2251(local116); if (local227 == arg3[local150][local108][local122].wall.anInt3049 || local227 == arg3[local150][local108][local122].wall.anInt3052) { continue; } diff --git a/client/src/main/java/rt4/Static258.java b/client/src/main/java/rt4/Static258.java index c07471e..f681692 100644 --- a/client/src/main/java/rt4/Static258.java +++ b/client/src/main/java/rt4/Static258.java @@ -1,13 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - public final class Static258 { - @OriginalMember(owner = "client!va", name = "a", descriptor = "(IB)Z") - public static boolean isLetter(@OriginalArg(0) int arg0) { - return arg0 >= 97 && arg0 <= 122 || arg0 >= 65 && arg0 <= 90; - } - } diff --git a/client/src/main/java/rt4/Static259.java b/client/src/main/java/rt4/Static259.java deleted file mode 100644 index 8c3f6e7..0000000 --- a/client/src/main/java/rt4/Static259.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static259 { - - @OriginalMember(owner = "client!vc", name = "V", descriptor = "[J") - public static final long[] aLongArray11 = new long[1000]; - -} diff --git a/client/src/main/java/rt4/Static26.java b/client/src/main/java/rt4/Static26.java index 795cf7d..b47aba9 100644 --- a/client/src/main/java/rt4/Static26.java +++ b/client/src/main/java/rt4/Static26.java @@ -14,18 +14,18 @@ public final class Static26 { @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V") public static void method743(@OriginalArg(0) boolean arg0) { - @Pc(13) int local13 = Static273.mapFilesBuffer.length; + @Pc(13) int local13 = LoginManager.mapFilesBuffer.length; @Pc(19) byte[][] local19; if (GlRenderer.enabled && arg0) { - local19 = Static19.underWaterLocationsMapFilesBuffer; + local19 = LoginManager.underWaterLocationsMapFilesBuffer; } else { - local19 = Static156.locationMapFilesBuffer; + local19 = LoginManager.locationMapFilesBuffer; } for (@Pc(25) int local25 = 0; local25 < local13; local25++) { @Pc(32) byte[] local32 = local19[local25]; if (local32 != null) { - @Pc(45) int local45 = (Static238.regionBitPacked[local25] >> 8) * 64 - Camera.originX; - @Pc(56) int local56 = (Static238.regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ; + @Pc(45) int local45 = (LoginManager.regionBitPacked[local25] >> 8) * 64 - Camera.originX; + @Pc(56) int local56 = (LoginManager.regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ; client.audioLoop(); Static124.method2437(local45, arg0, local32, local56, PathFinder.collisionMaps); } diff --git a/client/src/main/java/rt4/Static262.java b/client/src/main/java/rt4/Static262.java deleted file mode 100644 index 71241db..0000000 --- a/client/src/main/java/rt4/Static262.java +++ /dev/null @@ -1,38 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static262 { - - @OriginalMember(owner = "client!vf", name = "g", descriptor = "[I") - public static final int[] anIntArray515 = new int[14]; - - @OriginalMember(owner = "client!vf", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIJ)V") - public static void method4508(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8) { - if (arg4 == null && arg5 == null) { - return; - } - @Pc(8) Wall local8 = new Wall(); - local8.key = arg8; - local8.anInt3048 = arg1 * 128 + 64; - local8.anInt3044 = arg2 * 128 + 64; - local8.anInt3051 = arg3; - local8.primary = arg4; - local8.aClass8_6 = arg5; - local8.anInt3049 = arg6; - local8.anInt3052 = arg7; - for (@Pc(42) int local42 = arg0; local42 >= 0; local42--) { - if (SceneGraph.tiles[local42][arg1][arg2] == null) { - SceneGraph.tiles[local42][arg1][arg2] = new Tile(local42, arg1, arg2); - } - } - SceneGraph.tiles[arg0][arg1][arg2].wall = local8; - } - - @OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;") - public static JagString method4510(@OriginalArg(0) int arg0) { - return arg0 >= 999999999 ? Static220.aClass100_930 : JagString.parseInt(arg0); - } -} diff --git a/client/src/main/java/rt4/Static263.java b/client/src/main/java/rt4/Static263.java index a47b340..db191da 100644 --- a/client/src/main/java/rt4/Static263.java +++ b/client/src/main/java/rt4/Static263.java @@ -15,10 +15,7 @@ public final class Static263 { @OriginalMember(owner = "client!vg", name = "c", descriptor = "Z") public static boolean aBoolean299 = false; - @OriginalMember(owner = "client!vg", name = "d", descriptor = "I") - public static int anInt5755 = 2; - - @OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S") + @OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S") public static short[] method4511(@OriginalArg(1) short[] arg0) { if (arg0 == null) { return null; diff --git a/client/src/main/java/rt4/Static265.java b/client/src/main/java/rt4/Static265.java index 0d21364..87cc50c 100644 --- a/client/src/main/java/rt4/Static265.java +++ b/client/src/main/java/rt4/Static265.java @@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static265 { - @OriginalMember(owner = "client!vj", name = "d", descriptor = "I") - public static int anInt5765; - - @OriginalMember(owner = "client!vj", name = "a", descriptor = "(III)J") + @OriginalMember(owner = "client!vj", name = "a", descriptor = "(III)J") public static long method4521(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2]; return local7 == null || local7.wall == null ? 0L : local7.wall.key; diff --git a/client/src/main/java/rt4/Static269.java b/client/src/main/java/rt4/Static269.java index fd560dc..6d2e72c 100644 --- a/client/src/main/java/rt4/Static269.java +++ b/client/src/main/java/rt4/Static269.java @@ -35,7 +35,7 @@ public final class Static269 { for (local14 = 0; local14 < local99; local14++) { for (local21 = 0; local21 < 64; local21++) { for (local117 = 0; local117 < 64; local117++) { - Static278.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14); + SceneGraph.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14); } } } @@ -79,7 +79,7 @@ public final class Static269 { } while (local243 < local188) { while (local190 < local194) { - Static232.aByteArrayArrayArray13[local117][local243][local190] = 0; + SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = 0; local190++; } local243++; @@ -91,7 +91,7 @@ public final class Static269 { for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) { for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) { if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) { - Static232.aByteArrayArrayArray13[local117][local194][local320] = local305; + SceneGraph.aByteArrayArrayArray13[local117][local194][local320] = local305; } } } @@ -124,7 +124,7 @@ public final class Static269 { } while (local188 > local243) { while (local190 < local194) { - Static232.aByteArrayArrayArray13[local117][local243][local190] = Static232.aByteArrayArrayArray13[local117 - 1][local243][local190]; + SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = SceneGraph.aByteArrayArrayArray13[local117 - 1][local243][local190]; local190++; } local243++; @@ -190,7 +190,7 @@ public final class Static269 { local243 = (arg4 >> 2) + local117; local188 = local515 + (arg3 >> 2); if (local243 >= 0 && local243 < 26 && local188 >= 0 && local188 < 26) { - Static232.aByteArrayArrayArray13[local21][local243][local188] = 0; + SceneGraph.aByteArrayArrayArray13[local21][local243][local188] = 0; } } } @@ -208,7 +208,7 @@ public final class Static269 { Static232.method3993(512); Static132.method2608(); } else { - Static38.method960((byte) (Static136.anInt3325 - 4 & 0xFF)); + Static38.method960((byte) (Static253.anInt3325 - 4 & 0xFF)); Static232.method3993(2); } } diff --git a/client/src/main/java/rt4/Static270.java b/client/src/main/java/rt4/Static270.java index 81d2bfe..fbae261 100644 --- a/client/src/main/java/rt4/Static270.java +++ b/client/src/main/java/rt4/Static270.java @@ -17,111 +17,6 @@ public final class Static270 { @OriginalMember(owner = "client!wb", name = "c", descriptor = "I") public static int anInt5794 = -1; - @OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_1090 = JagString.parse("l"); - - @OriginalMember(owner = "client!wb", name = "a", descriptor = "(IIIIIIII)V") - public static void method4594(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { - @Pc(7) int local7 = 0; - @Pc(9) int local9 = arg5; - @Pc(11) int local11 = 0; - @Pc(16) int local16 = arg4 - arg6; - @Pc(20) int local20 = arg4 * arg4; - @Pc(25) int local25 = arg5 - arg6; - @Pc(29) int local29 = arg5 * arg5; - @Pc(33) int local33 = local25 * local25; - @Pc(37) int local37 = local29 << 1; - @Pc(41) int local41 = local20 << 1; - @Pc(45) int local45 = local33 << 1; - @Pc(49) int local49 = local16 * local16; - @Pc(53) int local53 = local49 << 1; - @Pc(57) int local57 = arg5 << 1; - @Pc(61) int local61 = local25 << 1; - @Pc(70) int local70 = local29 - (local57 - 1) * local41; - @Pc(80) int local80 = local49 * (1 - local61) + local45; - @Pc(89) int local89 = (1 - local57) * local20 + local37; - @Pc(93) int local93 = local20 << 2; - @Pc(102) int local102 = local33 - local53 * (local61 - 1); - @Pc(106) int local106 = local49 << 2; - @Pc(110) int local110 = local29 << 2; - @Pc(114) int local114 = local33 << 2; - @Pc(120) int local120 = (local57 - 3) * local41; - @Pc(124) int local124 = local37 * 3; - @Pc(130) int local130 = (local61 - 3) * local53; - @Pc(134) int local134 = local45 * 3; - @Pc(136) int local136 = local110; - @Pc(138) int local138 = local114; - @Pc(144) int local144 = (local25 - 1) * local106; - @Pc(162) int local162 = (arg5 - 1) * local93; - @Pc(166) int[] local166 = Static71.anIntArrayArray10[arg2]; - Static131.method2576(local166, arg1 - arg4, -local16 + arg1, arg3); - Static131.method2576(local166, arg1 - local16, arg1 - -local16, arg0); - Static131.method2576(local166, arg1 + local16, arg4 + arg1, arg3); - while (local9 > 0) { - if (local89 < 0) { - while (local89 < 0) { - local70 += local136; - local89 += local124; - local7++; - local136 += local110; - local124 += local110; - } - } - if (local70 < 0) { - local89 += local124; - local7++; - local124 += local110; - local70 += local136; - local136 += local110; - } - @Pc(258) boolean local258 = local9 <= local25; - if (local258) { - if (local80 < 0) { - while (local80 < 0) { - local80 += local134; - local134 += local114; - local11++; - local102 += local138; - local138 += local114; - } - } - if (local102 < 0) { - local80 += local134; - local11++; - local134 += local114; - local102 += local138; - local138 += local114; - } - local102 += -local130; - local130 -= local106; - local80 += -local144; - local144 -= local106; - } - local89 += -local162; - local70 += -local120; - local120 -= local93; - local9--; - @Pc(348) int local348 = arg2 - local9; - @Pc(352) int local352 = local7 + arg1; - local162 -= local93; - @Pc(360) int local360 = local9 + arg2; - @Pc(365) int local365 = arg1 - local7; - if (local258) { - @Pc(371) int local371 = arg1 + local11; - @Pc(376) int local376 = arg1 - local11; - Static131.method2576(Static71.anIntArrayArray10[local348], local365, local376, arg3); - Static131.method2576(Static71.anIntArrayArray10[local348], local376, local371, arg0); - Static131.method2576(Static71.anIntArrayArray10[local348], local371, local352, arg3); - Static131.method2576(Static71.anIntArrayArray10[local360], local365, local376, arg3); - Static131.method2576(Static71.anIntArrayArray10[local360], local376, local371, arg0); - Static131.method2576(Static71.anIntArrayArray10[local360], local371, local352, arg3); - } else { - Static131.method2576(Static71.anIntArrayArray10[local348], local365, local352, arg3); - Static131.method2576(Static71.anIntArrayArray10[local360], local365, local352, arg3); - } - } - } - @OriginalMember(owner = "client!wb", name = "a", descriptor = "(Lclient!ba;IILclient!ba;Z)I") public static int method4595(@OriginalArg(0) World arg0, @OriginalArg(1) int arg1, @OriginalArg(3) World arg2, @OriginalArg(4) boolean arg3) { if (arg1 == 1) { diff --git a/client/src/main/java/rt4/Static271.java b/client/src/main/java/rt4/Static271.java deleted file mode 100644 index 6a8846b..0000000 --- a/client/src/main/java/rt4/Static271.java +++ /dev/null @@ -1,24 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static271 { - - @OriginalMember(owner = "client!wc", name = "g", descriptor = "I") - public static int anInt5804 = 0; - - @OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V") - public static void writeRandom(@OriginalArg(0) Buffer arg0) { - if (client.uid != null) { - try { - client.uid.seek(0L); - client.uid.write(arg0.data, arg0.offset, 24); - } catch (@Pc(16) Exception local16) { - } - } - arg0.offset += 24; - } - -} diff --git a/client/src/main/java/rt4/Static272.java b/client/src/main/java/rt4/Static272.java deleted file mode 100644 index 7c5ee58..0000000 --- a/client/src/main/java/rt4/Static272.java +++ /dev/null @@ -1,22 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static272 { - - @OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V") - public static void setVarbit(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(14) VarbitType local14 = VarbitTypeList.get(arg1); - @Pc(17) int local17 = local14.baseVar; - @Pc(20) int local20 = local14.endBit; - @Pc(23) int local23 = local14.startBit; - @Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local20 - local23]; - if (arg0 < 0 || local29 < arg0) { - arg0 = 0; - } - local29 <<= local23; - VarpDomain.set(arg0 << local23 & local29 | ~local29 & VarpDomain.varp[local17], local17); - } -} diff --git a/client/src/main/java/rt4/Static273.java b/client/src/main/java/rt4/Static273.java deleted file mode 100644 index 86320de..0000000 --- a/client/src/main/java/rt4/Static273.java +++ /dev/null @@ -1,152 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static273 { - - @OriginalMember(owner = "client!we", name = "H", descriptor = "[[B") - public static byte[][] mapFilesBuffer; - - @OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I") - public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) { - if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) { - return -2; - } - try { - @Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0]; - @Pc(35) byte local35 = 0; - @Pc(37) int local37 = 0; - @Pc(39) int local39 = 0; - while (true) { - @Pc(41) int local41 = 0; - @Pc(46) int local46 = local33[local39++]; - @Pc(48) byte local48 = 0; - if (local46 == 0) { - return local37; - } - if (local46 == 15) { - local48 = 1; - } - if (local46 == 16) { - local48 = 2; - } - if (local46 == 1) { - local41 = PlayerSkillXpTable.boostedLevels[local33[local39++]]; - } - if (local46 == 17) { - local48 = 3; - } - if (local46 == 2) { - local41 = PlayerSkillXpTable.baseLevels[local33[local39++]]; - } - if (local46 == 3) { - local41 = PlayerSkillXpTable.experience[local33[local39++]]; - } - @Pc(124) int local124; - @Pc(135) Component local135; - @Pc(140) int local140; - @Pc(152) int local152; - if (local46 == 4) { - local124 = local33[local39++] << 16; - @Pc(131) int local131 = local124 + local33[local39++]; - local135 = InterfaceList.getComponent(local131); - local140 = local33[local39++]; - if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { - for (local152 = 0; local152 < local135.objTypes.length; local152++) { - if (local140 + 1 == local135.objTypes[local152]) { - local41 += local135.objCounts[local152]; - } - } - } - } - if (local46 == 5) { - local41 = VarpDomain.activeVarps[local33[local39++]]; - } - if (local46 == 6) { - local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1]; - } - if (local46 == 7) { - local41 = VarpDomain.activeVarps[local33[local39++]] * 100 / 46875; - } - if (local46 == 8) { - local41 = PlayerList.self.combatLevel; - } - if (local46 == 9) { - for (local124 = 0; local124 < 25; local124++) { - if (Static182.aBooleanArray97[local124]) { - local41 += PlayerSkillXpTable.baseLevels[local124]; - } - } - } - if (local46 == 10) { - local124 = local33[local39++] << 16; - local124 += local33[local39++]; - local135 = InterfaceList.getComponent(local124); - local140 = local33[local39++]; - if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { - for (local152 = 0; local152 < local135.objTypes.length; local152++) { - if (local135.objTypes[local152] == local140 + 1) { - local41 = 999999999; - break; - } - } - } - } - if (local46 == 11) { - local41 = Player.runEnergy; - } - if (local46 == 12) { - local41 = Player.weight; - } - if (local46 == 13) { - local124 = VarpDomain.activeVarps[local33[local39++]]; - @Pc(353) int local353 = local33[local39++]; - local41 = (0x1 << local353 & local124) == 0 ? 0 : 1; - } - if (local46 == 14) { - local124 = local33[local39++]; - local41 = VarpDomain.getVarbit(local124); - } - if (local46 == 18) { - local41 = (PlayerList.self.xFine >> 7) + Camera.originX; - } - if (local46 == 19) { - local41 = (PlayerList.self.zFine >> 7) + Camera.originZ; - } - if (local46 == 20) { - local41 = local33[local39++]; - } - if (local48 == 0) { - if (local35 == 0) { - local37 += local41; - } - if (local35 == 1) { - local37 -= local41; - } - if (local35 == 2 && local41 != 0) { - local37 /= local41; - } - if (local35 == 3) { - local37 *= local41; - } - local35 = 0; - } else { - local35 = local48; - } - } - } catch (@Pc(464) Exception local464) { - return -1; - } - } - - @OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V") - public static void method3214(@OriginalArg(1) int arg0) { - for (@Pc(11) Node local11 = InterfaceList.properties.head(); local11 != null; local11 = InterfaceList.properties.next()) { - if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) { - local11.unlink(); - } - } - } -} diff --git a/client/src/main/java/rt4/Static276.java b/client/src/main/java/rt4/Static276.java deleted file mode 100644 index e9b1f1b..0000000 --- a/client/src/main/java/rt4/Static276.java +++ /dev/null @@ -1,38 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static276 { - - @OriginalMember(owner = "client!wh", name = "j", descriptor = "[Lclient!cl;") - public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14]; - - @OriginalMember(owner = "client!wh", name = "m", descriptor = "[I") - public static final int[] cameraAmplitude = new int[5]; - - @OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z") - public static boolean method4611(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - if (Static9.method187(arg0, arg1, arg2)) { - @Pc(10) int local10 = arg1 << 7; - @Pc(14) int local14 = arg2 << 7; - return SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1); - } else { - return false; - } - } - - @OriginalMember(owner = "client!wh", name = "b", descriptor = "(B)Lclient!ok;") - public static IndexedSprite method4614() { - @Pc(27) IndexedSprite local27; - if (GlRenderer.enabled) { - local27 = new GlIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette); - } else { - local27 = new SoftwareIndexedSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], SpriteLoader.pixels[0], SpriteLoader.palette); - } - SpriteLoader.clear(); - return local27; - } - -} diff --git a/client/src/main/java/rt4/Static277.java b/client/src/main/java/rt4/Static277.java deleted file mode 100644 index 224231d..0000000 --- a/client/src/main/java/rt4/Static277.java +++ /dev/null @@ -1,36 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static277 { - - @OriginalMember(owner = "client!wi", name = "db", descriptor = "I") - public static int tileVisibilityDistance; - - @OriginalMember(owner = "client!wi", name = "W", descriptor = "I") - public static int anInt5850 = 0; - - @OriginalMember(owner = "client!wi", name = "X", descriptor = "[[B") - public static final byte[][] aByteArrayArray16 = new byte[1000][]; - - @OriginalMember(owner = "client!wi", name = "bb", descriptor = "I") - public static int anInt5854 = 0; - - @OriginalMember(owner = "client!wi", name = "hb", descriptor = "[[Z") - public static final boolean[][] aBooleanArrayArray4 = new boolean[][] { { true, true, true }, { false, false }, { false, true }, { true, false }, { false, true, true }, { true, false, true }, { false, true, false }, { true, false, false } }; - - @OriginalMember(owner = "client!wi", name = "c", descriptor = "(II)Z") - public static boolean method4640(@OriginalArg(0) int arg0) { - if (arg0 < 0) { - return false; - } - @Pc(12) int local12 = MiniMenu.actions[arg0]; - if (local12 >= 2000) { - local12 -= 2000; - } - return local12 == 1003; - } - -} diff --git a/client/src/main/java/rt4/Static278.java b/client/src/main/java/rt4/Static278.java deleted file mode 100644 index 23aaca0..0000000 --- a/client/src/main/java/rt4/Static278.java +++ /dev/null @@ -1,152 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static278 { - - @OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_1103 = JagString.parse("ul"); - - @OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIIIIII)V") - public static void method4647(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { - @Pc(3) Class120 local3 = new Class120(); - local3.anInt4452 = arg1 / 128; - local3.anInt4446 = arg2 / 128; - local3.anInt4461 = arg3 / 128; - local3.anInt4464 = arg4 / 128; - local3.anInt4453 = arg0; - local3.anInt4460 = arg1; - local3.anInt4445 = arg2; - local3.anInt4458 = arg3; - local3.anInt4449 = arg4; - local3.anInt4444 = arg5; - local3.anInt4447 = arg6; - SceneGraph.aClass120Array1[SceneGraph.anInt917++] = local3; - } - - @OriginalMember(owner = "client!wj", name = "a", descriptor = "(Z)V") - public static void setRenderTiles(@OriginalArg(0) boolean arg0) { - if (arg0) { - SceneGraph.tiles = SceneGraph.underWaterGroundTiles; - SceneGraph.tileHeights = SceneGraph.underwaterTileHeights; - Static182.aClass3_Sub14ArrayArray2 = SceneGraph.underWaterHdTiles; - } else { - SceneGraph.tiles = SceneGraph.surfaceGroundTiles; - SceneGraph.tileHeights = SceneGraph.surfaceTileHeights; - Static182.aClass3_Sub14ArrayArray2 = SceneGraph.surfaceHdTiles; - } - Static126.anInt3114 = SceneGraph.tiles.length; - } - - @OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIZLclient!wa;IIBII)V") - public static void readTile(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) Buffer arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { - @Pc(32) int local32; - if (arg5 < 0 || arg5 >= 104 || arg4 < 0 || arg4 >= 104) { - while (true) { - local32 = arg3.g1(); - if (local32 == 0) { - break; - } - if (local32 == 1) { - arg3.g1(); - break; - } - if (local32 <= 49) { - arg3.g1(); - } - } - return; - } - if (!arg2) { - SceneGraph.tileFlags[arg7][arg5][arg4] = 0; - } - while (true) { - local32 = arg3.g1(); - if (local32 == 0) { - if (arg2) { - SceneGraph.tileHeights[0][arg5][arg4] = SceneGraph.surfaceTileHeights[0][arg5][arg4]; - } else if (arg7 == 0) { - SceneGraph.tileHeights[0][arg5][arg4] = -PerlinNoise.getTileHeight(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8; - } else { - SceneGraph.tileHeights[arg7][arg5][arg4] = SceneGraph.tileHeights[arg7 - 1][arg5][arg4] - 240; - } - break; - } - if (local32 == 1) { - @Pc(111) int local111 = arg3.g1(); - if (arg2) { - SceneGraph.tileHeights[0][arg5][arg4] = SceneGraph.surfaceTileHeights[0][arg5][arg4] + local111 * 8; - } else { - if (local111 == 1) { - local111 = 0; - } - if (arg7 == 0) { - SceneGraph.tileHeights[0][arg5][arg4] = -local111 * 8; - } else { - SceneGraph.tileHeights[arg7][arg5][arg4] = SceneGraph.tileHeights[arg7 - 1][arg5][arg4] - local111 * 8; - } - } - break; - } - if (local32 <= 49) { - SceneGraph.tileOverlays[arg7][arg5][arg4] = arg3.g1s(); - SceneGraph.tileShapes[arg7][arg5][arg4] = (byte) ((local32 - 2) / 4); - SceneGraph.tileAngles[arg7][arg5][arg4] = (byte) (local32 + arg6 - 2 & 0x3); - } else if (local32 > 81) { - SceneGraph.tileUnderlays[arg7][arg5][arg4] = (byte) (local32 - 81); - } else if (!arg2) { - SceneGraph.tileFlags[arg7][arg5][arg4] = (byte) (local32 - 49); - } - } - } - - @OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V") - public static void processLogout() { - if (Protocol.socket != null) { - Protocol.socket.close(); - Protocol.socket = null; - } - client.method3768(); - SceneGraph.clear(); - @Pc(19) int local19; - for (local19 = 0; local19 < 4; local19++) { - PathFinder.collisionMaps[local19].resetFlags(); - } - WorldMap.clear(false); - System.gc(); - MidiPlayer.method801(); - MidiPlayer.jingle = false; - MusicPlayer.groupId = -1; - AreaSoundManager.clear(true); - Static230.dynamicMapRegion = false; - Camera.originZ = 0; - Static80.centralZoneX = 0; - Static52.anInt1695 = 0; - Camera.originX = 0; - for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) { - Static143.hintMapMarkers[local19] = null; - } - PlayerList.size = 0; - NpcList.size = 0; - for (local19 = 0; local19 < 2048; local19++) { - PlayerList.players[local19] = null; - PlayerList.appearanceCache[local19] = null; - } - for (local19 = 0; local19 < 32768; local19++) { - NpcList.npcs[local19] = null; - } - for (local19 = 0; local19 < 4; local19++) { - for (@Pc(115) int local115 = 0; local115 < 104; local115++) { - for (@Pc(122) int local122 = 0; local122 < 104; local122++) { - SceneGraph.objStacks[local19][local115][local122] = null; - } - } - } - Camera.resetCameraEffects(); - Protocol.verifyId = 0; - VarpDomain.reset(); - Static73.method1596(true); - } -} diff --git a/client/src/main/java/rt4/Static28.java b/client/src/main/java/rt4/Static28.java index 416e53a..85538e6 100644 --- a/client/src/main/java/rt4/Static28.java +++ b/client/src/main/java/rt4/Static28.java @@ -9,7 +9,7 @@ public final class Static28 { public static void method792(@OriginalArg(3) int tileVisibility, @OriginalArg(4) boolean hasUnderWaterMap) { SceneGraph.mapSizeX = 104; SceneGraph.mapSizeZ = 104; - Static277.tileVisibilityDistance = tileVisibility; + Static123.tileVisibilityDistance = tileVisibility; SceneGraph.surfaceGroundTiles = new Tile[4][SceneGraph.mapSizeX][SceneGraph.mapSizeZ]; SceneGraph.surfaceTileHeights = new int[4][SceneGraph.mapSizeX + 1][SceneGraph.mapSizeZ + 1]; if (GlRenderer.enabled) { @@ -28,7 +28,7 @@ public final class Static28 { SceneGraph.underwaterTileHeights = null; SceneGraph.underWaterHdTiles = null; } - Static278.setRenderTiles(false); + SceneGraph.setRenderTiles(false); SceneGraph.aClass120Array1 = new Class120[500]; SceneGraph.anInt917 = 0; SceneGraph.aClass120Array2 = new Class120[500]; @@ -37,8 +37,8 @@ public final class Static28 { SceneGraph.aClass31Array3 = new Scenery[5000]; SceneGraph.anInt726 = 0; SceneGraph.aClass31Array2 = new Scenery[100]; - Static48.aBooleanArrayArray1 = new boolean[Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1][Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1]; - Static89.aBooleanArrayArray3 = new boolean[Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2][Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2]; - Static232.aByteArrayArrayArray13 = new byte[4][SceneGraph.mapSizeX][SceneGraph.mapSizeZ]; + Static48.aBooleanArrayArray1 = new boolean[Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1][Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1]; + Static89.aBooleanArrayArray3 = new boolean[Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2][Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2]; + SceneGraph.aByteArrayArrayArray13 = new byte[4][SceneGraph.mapSizeX][SceneGraph.mapSizeZ]; } } diff --git a/client/src/main/java/rt4/Static280.java b/client/src/main/java/rt4/Static280.java index 53ae118..c34cd7d 100644 --- a/client/src/main/java/rt4/Static280.java +++ b/client/src/main/java/rt4/Static280.java @@ -1,8 +1,6 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static280 { @@ -12,619 +10,4 @@ public final class Static280 { @OriginalMember(owner = "client!wl", name = "u", descriptor = "I") public static int anInt5895 = 0; - @OriginalMember(owner = "client!wl", name = "a", descriptor = "([IIIIIIIIIZB)V") - public static void method4667(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) boolean arg9) { - @Pc(7) int local7 = arg2; - if (SoftwareRaster.clipRight <= arg2) { - return; - } - if (arg2 < SoftwareRaster.clipLeft) { - local7 = SoftwareRaster.clipLeft; - } - @Pc(30) int local30 = arg7 + arg2; - if (SoftwareRaster.clipLeft >= local30) { - return; - } - if (SoftwareRaster.clipRight < local30) { - local30 = SoftwareRaster.clipRight; - } - @Pc(43) int local43 = arg8; - if (SoftwareRaster.clipBottom <= arg8) { - return; - } - @Pc(56) int local56 = arg8 + arg6; - if (arg8 < SoftwareRaster.clipTop) { - local43 = SoftwareRaster.clipTop; - } - if (local56 <= SoftwareRaster.clipTop) { - return; - } - @Pc(79) int local79 = local7 + SoftwareRaster.width * local43; - if (arg5 == 9) { - arg3 = arg3 + 1 & 0x3; - arg5 = 1; - } - @Pc(99) int local99 = local7 + SoftwareRaster.width - local30; - local43 -= arg8; - @Pc(108) int local108 = arg6 - local43; - if (SoftwareRaster.clipBottom < local56) { - local56 = SoftwareRaster.clipBottom; - } - if (arg5 == 10) { - arg3 = arg3 + 3 & 0x3; - arg5 = 1; - } - local7 -= arg2; - @Pc(136) int local136 = arg7 - local7; - if (arg5 == 11) { - arg3 = arg3 + 3 & 0x3; - arg5 = 8; - } - local30 -= arg2; - @Pc(157) int local157 = arg7 - local30; - local56 -= arg8; - @Pc(165) int local165 = arg6 - local56; - @Pc(175) int local175; - @Pc(184) int local184; - if (arg5 == 1) { - if (arg3 == 0) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 <= local175) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 1) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local7; local184 < local30; local184++) { - if (local175 >= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 2) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 >= local175) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 3) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 >= local175) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } - } else if (arg5 == 2) { - if (arg3 == 0) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local7; local184 < local30; local184++) { - if (local175 >> 1 >= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 1) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local79 >= 0 && local79 < arg0.length) { - if (local175 << 1 <= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } else { - local79++; - } - } - local79 += local99; - } - } else if (arg3 == 2) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local175 >> 1 >= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 3) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local175 << 1 <= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } - } else if (arg5 == 3) { - if (arg3 == 0) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local175 >> 1 >= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 1) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 >= local175 << 1) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 2) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 <= local175 >> 1) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 3) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local175 << 1 <= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } - } else if (arg5 == 4) { - if (arg3 == 0) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local7; local184 < local30; local184++) { - if (local175 >> 1 <= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 1) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local175 << 1 >= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 2) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local184 >= local175 >> 1) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 3) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local184 <= local175 << 1) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } - } else if (arg5 != 5) { - if (arg5 == 6) { - if (arg3 == 0) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 <= arg7 / 2) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - if (arg3 == 1) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local175 <= arg6 / 2) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - if (arg3 == 2) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 >= arg7 / 2) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - if (arg3 == 3) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local175 >= arg6 / 2) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - } - if (arg5 == 7) { - if (arg3 == 0) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 <= local175 - arg6 / 2) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - if (arg3 == 1) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local7; local184 < local30; local184++) { - if (local175 - arg6 / 2 >= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - if (arg3 == 2) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local184 <= local175 - arg6 / 2) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - if (arg3 == 3) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local175 - arg6 / 2 >= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - } - if (arg5 == 8) { - if (arg3 == 0) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local175 - arg6 / 2 <= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - if (arg3 == 1) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local7; local184 < local30; local184++) { - if (local175 - arg6 / 2 <= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - if (arg3 == 2) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local184 >= local175 - arg6 / 2) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - if (arg3 == 3) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local175 - arg6 / 2 <= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - return; - } - } - } else if (arg3 == 0) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local175 >> 1 <= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 1) { - for (local175 = local108 - 1; local175 >= local165; local175--) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 <= local175 << 1) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 2) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local7; local184 < local30; local184++) { - if (local184 >= local175 >> 1) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } else if (arg3 == 3) { - for (local175 = local43; local175 < local56; local175++) { - for (local184 = local136 - 1; local184 >= local157; local184--) { - if (local175 << 1 >= local184) { - arg0[local79] = arg1; - } else if (arg9) { - arg0[local79] = arg4; - } - local79++; - } - local79 += local99; - } - } - } - - @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;") - public static Component method4668(@OriginalArg(0) Component arg0) { - if (arg0.layer != -1) { - return InterfaceList.getComponent(arg0.layer); - } - @Pc(28) int local28 = arg0.id >>> 16; - @Pc(33) HashTableIterator local33 = new HashTableIterator(InterfaceList.openInterfaces); - for (@Pc(38) ComponentPointer local38 = (ComponentPointer) local33.method2701(); local38 != null; local38 = (ComponentPointer) local33.method2700()) { - if (local28 == local38.anInt5878) { - return InterfaceList.getComponent((int) local38.key); - } - } - return null; - } - - @OriginalMember(owner = "client!wl", name = "a", descriptor = "(IBIIIII)V") - public static void method4670(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { - @Pc(18) int local18 = arg2 - arg4; - Static251.method4278(arg2); - @Pc(23) int local23 = 0; - if (local18 < 0) { - local18 = 0; - } - @Pc(32) int local32 = arg2; - @Pc(35) int local35 = -arg2; - @Pc(38) int local38 = -local18; - @Pc(40) int local40 = local18; - @Pc(42) int local42 = -1; - @Pc(61) int local61; - @Pc(69) int local69; - @Pc(78) int local78; - @Pc(87) int local87; - if (arg1 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg1) { - @Pc(52) int[] local52 = Static71.anIntArrayArray10[arg1]; - local61 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg2, TextureOp29.anInt4164); - local69 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg5, TextureOp29.anInt4164); - local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local18, TextureOp29.anInt4164); - local87 = Static78.method1690(TextureOp29.anInt5063, arg5 + local18, TextureOp29.anInt4164); - Static131.method2576(local52, local61, local78, arg3); - Static131.method2576(local52, local78, local87, arg0); - Static131.method2576(local52, local87, local69, arg3); - } - @Pc(107) int local107 = -1; - while (local23 < local32) { - local42 += 2; - local107 += 2; - local38 += local107; - local35 += local42; - if (local38 >= 0 && local40 >= 1) { - local40--; - Static241.anIntArray522[local40] = local23; - local38 -= local40 << 1; - } - local23++; - @Pc(264) int local264; - @Pc(273) int local273; - @Pc(280) int[] local280; - @Pc(161) int local161; - if (local35 >= 0) { - local32--; - local35 -= local32 << 1; - local161 = arg1 - local32; - local61 = arg1 + local32; - if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) { - if (local32 >= local18) { - local69 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164); - local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164); - if (TextureOp29.anInt2869 >= local61) { - Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3); - } - if (local161 >= TextureOp29.anInt5773) { - Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3); - } - } else { - local69 = Static241.anIntArray522[local32]; - local78 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164); - local87 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164); - local264 = Static78.method1690(TextureOp29.anInt5063, arg5 + local69, TextureOp29.anInt4164); - local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local69, TextureOp29.anInt4164); - if (TextureOp29.anInt2869 >= local61) { - local280 = Static71.anIntArrayArray10[local61]; - Static131.method2576(local280, local87, local273, arg3); - Static131.method2576(local280, local273, local264, arg0); - Static131.method2576(local280, local264, local78, arg3); - } - if (local161 >= TextureOp29.anInt5773) { - local280 = Static71.anIntArrayArray10[local161]; - Static131.method2576(local280, local87, local273, arg3); - Static131.method2576(local280, local273, local264, arg0); - Static131.method2576(local280, local264, local78, arg3); - } - } - } - } - local161 = arg1 - local23; - local61 = arg1 + local23; - if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) { - local69 = arg5 + local32; - local78 = arg5 - local32; - if (local69 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= local78) { - local69 = Static78.method1690(TextureOp29.anInt5063, local69, TextureOp29.anInt4164); - local78 = Static78.method1690(TextureOp29.anInt5063, local78, TextureOp29.anInt4164); - if (local23 < local18) { - local87 = local40 >= local23 ? local40 : Static241.anIntArray522[local23]; - local264 = Static78.method1690(TextureOp29.anInt5063, local87 + arg5, TextureOp29.anInt4164); - local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local87, TextureOp29.anInt4164); - if (TextureOp29.anInt2869 >= local61) { - local280 = Static71.anIntArrayArray10[local61]; - Static131.method2576(local280, local78, local273, arg3); - Static131.method2576(local280, local273, local264, arg0); - Static131.method2576(local280, local264, local69, arg3); - } - if (local161 >= TextureOp29.anInt5773) { - local280 = Static71.anIntArrayArray10[local161]; - Static131.method2576(local280, local78, local273, arg3); - Static131.method2576(local280, local273, local264, arg0); - Static131.method2576(local280, local264, local69, arg3); - } - } else { - if (TextureOp29.anInt2869 >= local61) { - Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3); - } - if (local161 >= TextureOp29.anInt5773) { - Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3); - } - } - } - } - } - } - } diff --git a/client/src/main/java/rt4/Static31.java b/client/src/main/java/rt4/Static31.java index b141e28..2d5687f 100644 --- a/client/src/main/java/rt4/Static31.java +++ b/client/src/main/java/rt4/Static31.java @@ -15,8 +15,8 @@ public final class Static31 { @OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V") public static void method846() { - if (!SceneGraph.allLevelsAreVisible() && Static41.anInt1316 != Player.level) { - Static127.method2463(Player.level, Static52.anInt1695, Static80.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]); + if (!SceneGraph.allLevelsAreVisible() && LoginManager.centralPlane != Player.level) { + LoginManager.method2463(Player.level, LoginManager.centralZoneZ, LoginManager.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]); } else if (Player.level != Static107.anInt2875 && MiniMap.renderMap(Player.level)) { Static107.anInt2875 = Player.level; Static269.method2218(); diff --git a/client/src/main/java/rt4/Static35.java b/client/src/main/java/rt4/Static35.java index be801d9..3102b0e 100644 --- a/client/src/main/java/rt4/Static35.java +++ b/client/src/main/java/rt4/Static35.java @@ -8,10 +8,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static35 { - @OriginalMember(owner = "client!cl", name = "V", descriptor = "[I") - public static int[] underWaterLocationsMapFileIds; - - @OriginalMember(owner = "client!cl", name = "X", descriptor = "I") + @OriginalMember(owner = "client!cl", name = "X", descriptor = "I") public static int anInt1091; @OriginalMember(owner = "client!cl", name = "K", descriptor = "Ljava/util/Calendar;") diff --git a/client/src/main/java/rt4/Static36.java b/client/src/main/java/rt4/Static36.java index 61bb4ce..9584668 100644 --- a/client/src/main/java/rt4/Static36.java +++ b/client/src/main/java/rt4/Static36.java @@ -6,14 +6,14 @@ import org.openrs2.deob.annotation.Pc; public final class Static36 { - @OriginalMember(owner = "client!client", name = "lb", descriptor = "[I") - public static int[] mapFileIds; - @OriginalMember(owner = "client!fk", name = "e", descriptor = "I") + @OriginalMember(owner = "client!fk", name = "e", descriptor = "I") public static int anInt1885; @OriginalMember(owner = "client!bj", name = "s", descriptor = "I") public static int anInt660 = -1; + @OriginalMember(owner = "client!kl", name = "s", descriptor = "I") + public static int anInt3337 = 0; - @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;") + @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;") public static Component method938(@OriginalArg(0) Component arg0) { @Pc(4) int local4 = InterfaceList.getServerActiveProperties(arg0).method505(); if (local4 == 0) { @@ -77,7 +77,7 @@ public final class Static36 { Static40.aClass13_14 = null; Static40.aClass13_1 = null; } - Static137.anInt3337 = 0; + anInt3337 = 0; } } if (component.usingScripts) { @@ -141,7 +141,7 @@ public final class Static36 { request.arguments = component.onScroll; InterfaceList.lowPriorityRequests.addTail(request); } - if (Static40.aClass13_14 != null || Static118.aClass13_15 != null || Static40.aBoolean108 || component.anInt453 != 1400 && Static137.anInt3337 > 0) { + if (Static40.aClass13_14 != null || Static118.aClass13_15 != null || Static40.aBoolean108 || component.anInt453 != 1400 && anInt3337 > 0) { local221 = false; local212 = false; local207 = false; @@ -174,24 +174,24 @@ public final class Static36 { ClientProt.closeWidget(); continue; } - Static137.anInt3337 = 1; + anInt3337 = 1; Static40.anInt5388 = Mouse.anInt4873; Static40.anInt4035 = Mouse.anInt5032; continue; } - if (local212 && Static137.anInt3337 > 0) { - if (Static137.anInt3337 == 1 && (Static40.anInt5388 != Mouse.anInt4873 || Static40.anInt4035 != Mouse.anInt5032)) { + if (local212 && anInt3337 > 0) { + if (anInt3337 == 1 && (Static40.anInt5388 != Mouse.anInt4873 || Static40.anInt4035 != Mouse.anInt5032)) { Static197.anInt4620 = WorldMap.anInt435; anInt1885 = WorldMap.anInt919; - Static137.anInt3337 = 2; + anInt3337 = 2; } - if (Static137.anInt3337 == 2) { + if (anInt3337 == 2) { WorldMap.method1964(Static197.anInt4620 + (int) ((double) (Static40.anInt5388 - Mouse.anInt4873) * 2.0D / (double) WorldMap.targetZoom)); WorldMap.method4641(anInt1885 + (int) ((double) (Static40.anInt4035 - Mouse.anInt5032) * 2.0D / (double) WorldMap.targetZoom)); } continue; } - Static137.anInt3337 = 0; + anInt3337 = 0; continue; } if (component.anInt453 == 1401) { diff --git a/client/src/main/java/rt4/Static38.java b/client/src/main/java/rt4/Static38.java index 5eea936..0c70b3b 100644 --- a/client/src/main/java/rt4/Static38.java +++ b/client/src/main/java/rt4/Static38.java @@ -156,143 +156,4 @@ public final class Static38 { return -1; } - @OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V") - public static void method964(@OriginalArg(0) boolean arg0) { - @Pc(3) int local3 = PlayerList.size; - if (Static115.mapFlagX == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == Static84.anInt2255) { - Static115.mapFlagX = 0; - } - if (arg0) { - local3 = 1; - } - @Pc(28) int local28; - @Pc(39) Player local39; - @Pc(82) int local82; - @Pc(182) int local182; - @Pc(200) int local200; - @Pc(214) int local214; - @Pc(223) int local223; - @Pc(106) int local106; - for (local28 = 0; local28 < local3; local28++) { - if (arg0) { - local39 = PlayerList.self; - } else { - local39 = PlayerList.players[PlayerList.ids[local28]]; - } - if (local39 != null && local39.method2682()) { - @Pc(55) int local55 = local39.getSize(); - @Pc(77) int local77; - if (local55 == 1) { - if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) { - local77 = local39.xFine >> 7; - local82 = local39.zFine >> 7; - if (local77 >= 0 && local77 < 104 && local82 >= 0 && local82 < 104) { - local106 = Static31.anIntArrayArray6[local77][local82]++; - } - } - } else if (((local55 & 0x1) != 0 || (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0) && ((local55 & 0x1) != 1 || (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64)) { - local77 = local39.xFine - local55 * 64 >> 7; - local82 = local39.zFine - local55 * 64 >> 7; - local182 = local39.getSize() + local77; - if (local182 > 104) { - local182 = 104; - } - if (local77 < 0) { - local77 = 0; - } - local200 = local82 + local39.getSize(); - if (local82 < 0) { - local82 = 0; - } - if (local200 > 104) { - local200 = 104; - } - for (local214 = local77; local214 < local182; local214++) { - for (local223 = local82; local223 < local200; local223++) { - local106 = Static31.anIntArrayArray6[local214][local223]++; - } - } - } - } - } - label220: for (local28 = 0; local28 < local3; local28++) { - @Pc(272) long local272; - if (arg0) { - local39 = PlayerList.self; - local272 = 8791798054912L; - } else { - local39 = PlayerList.players[PlayerList.ids[local28]]; - local272 = (long) PlayerList.ids[local28] << 32; - } - if (local39 != null && local39.method2682()) { - local39.aBoolean98 = false; - if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.movementSeqId == local39.getBasType().idleAnimationId) { - local39.aBoolean98 = true; - } - local82 = local39.getSize(); - if (local82 == 1) { - if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) { - local182 = local39.xFine >> 7; - local200 = local39.zFine >> 7; - if (local182 < 0 || local182 >= 104 || local200 < 0 || local200 >= 104) { - continue; - } - if (Static31.anIntArrayArray6[local182][local200] > 1) { - local106 = Static31.anIntArrayArray6[local182][local200]--; - continue; - } - } - } else if ((local82 & 0x1) == 0 && (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0 || (local82 & 0x1) == 1 && (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 0) { - local182 = local39.xFine - local82 * 64 >> 7; - local214 = local82 + local182; - local200 = local39.zFine - local82 * 64 >> 7; - if (local214 > 104) { - local214 = 104; - } - if (local182 < 0) { - local182 = 0; - } - local223 = local82 + local200; - if (local200 < 0) { - local200 = 0; - } - @Pc(468) boolean local468 = true; - if (local223 > 104) { - local223 = 104; - } - @Pc(476) int local476; - @Pc(485) int local485; - for (local476 = local182; local476 < local214; local476++) { - for (local485 = local200; local485 < local223; local485++) { - if (Static31.anIntArrayArray6[local476][local485] <= 1) { - local468 = false; - break; - } - } - } - if (local468) { - local476 = local182; - while (true) { - if (local476 >= local214) { - continue label220; - } - for (local485 = local200; local485 < local223; local485++) { - local106 = Static31.anIntArrayArray6[local476][local485]--; - } - local476++; - } - } - } - if (local39.attachment == null || client.loop < local39.anInt3390 || local39.anInt3375 <= client.loop) { - local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine); - Static43.method1141(Player.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171); - } else { - local39.aBoolean98 = false; - local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine); - Static184.method3387(Player.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.atachmentX0, local39.attachmentZ0, local39.attachmentX1, local39.attachmentZ1); - } - } - } - } - } diff --git a/client/src/main/java/rt4/Static40.java b/client/src/main/java/rt4/Static40.java index a3f12fc..031c6c6 100644 --- a/client/src/main/java/rt4/Static40.java +++ b/client/src/main/java/rt4/Static40.java @@ -86,7 +86,7 @@ public final class Static40 { public static void method4637() { Static165.aClass3_Sub2_Sub1_8 = null; Static39.aClass3_Sub2_Sub1_1 = null; - Static92.aClass3_Sub2_Sub1_6 = null; + Static112.aClass3_Sub2_Sub1_6 = null; Static181.aClass3_Sub2_Sub1_9 = null; Static204.aClass3_Sub2_Sub1_10 = null; } diff --git a/client/src/main/java/rt4/Static41.java b/client/src/main/java/rt4/Static41.java deleted file mode 100644 index 26dff64..0000000 --- a/client/src/main/java/rt4/Static41.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static41 { - - @OriginalMember(owner = "client!dc", name = "ab", descriptor = "I") - public static int anInt1316 = 0; - -} diff --git a/client/src/main/java/rt4/Static44.java b/client/src/main/java/rt4/Static44.java index 7dfc5cb..47528d5 100644 --- a/client/src/main/java/rt4/Static44.java +++ b/client/src/main/java/rt4/Static44.java @@ -18,7 +18,7 @@ public final class Static44 { Protocol.opcode3 = -1; Static40.aBoolean108 = false; Protocol.length = 0; - Static115.mapFlagX = 0; + LoginManager.mapFlagX = 0; MiniMenu.size = 0; Protocol.opcode2 = -1; MiniMap.state = 0; diff --git a/client/src/main/java/rt4/Static45.java b/client/src/main/java/rt4/Static45.java index 72ac158..c92914a 100644 --- a/client/src/main/java/rt4/Static45.java +++ b/client/src/main/java/rt4/Static45.java @@ -181,7 +181,7 @@ public final class Static45 { } for (local168 = 1; local168 < 103; local168++) { label771: for (local173 = 1; local173 < 103; local173++) { - if (underwater || SceneGraph.allLevelsAreVisible() || (SceneGraph.tileFlags[0][local168][local173] & 0x2) != 0 || (SceneGraph.tileFlags[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == Static41.anInt1316) { + if (underwater || SceneGraph.allLevelsAreVisible() || (SceneGraph.tileFlags[0][local168][local173] & 0x2) != 0 || (SceneGraph.tileFlags[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == LoginManager.centralPlane) { if (SceneGraph.firstVisibleLevel > local152) { SceneGraph.firstVisibleLevel = local152; } @@ -399,7 +399,7 @@ public final class Static45 { if (local202 >= 8) { local349 = SceneGraph.tileHeights[local200][local168][local173] - 240; local234 = SceneGraph.tileHeights[local194][local168][local173]; - Static278.method4647(1, local168 * 128, local168 * 128, local173 * 128, local178 * 128 + 128, local349, local234); + method4647(1, local168 * 128, local168 * 128, local173 * 128, local178 * 128 + 128, local349, local234); for (local254 = local194; local254 <= local200; local254++) { for (local267 = local173; local267 <= local178; local267++) { SceneGraph.anIntArrayArrayArray6[local254][local168][local267] &= 0xFFFFFFFE; @@ -434,7 +434,7 @@ public final class Static45 { if (local202 >= 8) { local349 = SceneGraph.tileHeights[local200][local173][local2204] - 240; local234 = SceneGraph.tileHeights[local194][local173][local2204]; - Static278.method4647(2, local173 * 128, local178 * 128 + 128, local2204 * 128, local2204 * 128, local349, local234); + method4647(2, local173 * 128, local178 * 128 + 128, local2204 * 128, local2204 * 128, local349, local234); for (local254 = local194; local254 <= local200; local254++) { for (local267 = local173; local267 <= local178; local267++) { SceneGraph.anIntArrayArrayArray6[local254][local267][local2204] &= 0xFFFFFFFD; @@ -467,7 +467,7 @@ public final class Static45 { } if ((local178 + 1 - local173) * (local200 - (local194 - 1)) >= 4) { local202 = SceneGraph.tileHeights[local152][local173][local194]; - Static278.method4647(4, local173 * 128, local178 * 128 + 128, local194 * 128, local200 * 128 + 128, local202, local202); + method4647(4, local173 * 128, local178 * 128 + 128, local194 * 128, local200 * 128 + 128, local202, local202); for (local209 = local173; local209 <= local178; local209++) { for (local349 = local194; local349 <= local200; local349++) { SceneGraph.anIntArrayArrayArray6[local152][local209][local349] &= 0xFFFFFFFB; @@ -480,4 +480,20 @@ public final class Static45 { } } + @OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIIIIII)V") + public static void method4647(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { + @Pc(3) Class120 local3 = new Class120(); + local3.anInt4452 = arg1 / 128; + local3.anInt4446 = arg2 / 128; + local3.anInt4461 = arg3 / 128; + local3.anInt4464 = arg4 / 128; + local3.anInt4453 = arg0; + local3.anInt4460 = arg1; + local3.anInt4445 = arg2; + local3.anInt4458 = arg3; + local3.anInt4449 = arg4; + local3.anInt4444 = arg5; + local3.anInt4447 = arg6; + SceneGraph.aClass120Array1[SceneGraph.anInt917++] = local3; + } } diff --git a/client/src/main/java/rt4/Static49.java b/client/src/main/java/rt4/Static49.java index 5768dc9..641cb15 100644 --- a/client/src/main/java/rt4/Static49.java +++ b/client/src/main/java/rt4/Static49.java @@ -56,7 +56,7 @@ public final class Static49 { local39 = true; if (!local95.isReady()) { local15 = false; - Static271.anInt5804++; + ClientProt.anInt5804++; } } } diff --git a/client/src/main/java/rt4/Static52.java b/client/src/main/java/rt4/Static52.java index 7cf090d..7b89f99 100644 --- a/client/src/main/java/rt4/Static52.java +++ b/client/src/main/java/rt4/Static52.java @@ -14,8 +14,6 @@ public final class Static52 { public static final JagString aClass100_559 = JagString.parse(""); @OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;") public static final JagString aClass100_594 = JagString.parse("<)4col>"); - @OriginalMember(owner = "client!eb", name = "u", descriptor = "I") - public static int anInt1695; @OriginalMember(owner = "client!eb", name = "a", descriptor = "(IIIIIII)I") public static int method1286(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) { diff --git a/client/src/main/java/rt4/Static59.java b/client/src/main/java/rt4/Static59.java index bf1695c..90b917c 100644 --- a/client/src/main/java/rt4/Static59.java +++ b/client/src/main/java/rt4/Static59.java @@ -9,13 +9,10 @@ public final class Static59 { @OriginalMember(owner = "client!ej", name = "X", descriptor = "I") public static int anInt1815; - @OriginalMember(owner = "client!ej", name = "W", descriptor = "I") - public static int anInt1814 = 0; - - @OriginalMember(owner = "client!ej", name = "h", descriptor = "(I)V") + @OriginalMember(owner = "client!ej", name = "h", descriptor = "(I)V") public static void method1372() { if (Static226.anInt3953 == 2) { - if (Static155.anInt3751 == Static277.anInt5850 && Static60.anInt1892 == Static280.anInt5895) { + if (Static155.anInt3751 == Mouse.anInt5850 && Static60.anInt1892 == Static280.anInt5895) { Static226.anInt3953 = 0; if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2) { MiniMenu.doAction(MiniMenu.size - 2); @@ -33,7 +30,7 @@ public final class Static59 { } else { Static280.anInt5895 = Mouse.clickY; Static226.anInt3953 = 2; - Static277.anInt5850 = Mouse.clickX; + Mouse.anInt5850 = Mouse.clickX; } } diff --git a/client/src/main/java/rt4/Static69.java b/client/src/main/java/rt4/Static69.java index 61a363f..10d62ec 100644 --- a/client/src/main/java/rt4/Static69.java +++ b/client/src/main/java/rt4/Static69.java @@ -62,7 +62,7 @@ public final class Static69 { @Pc(11) int local11 = arg3 - 1; @Pc(15) int local15 = arg3 + arg5; for (@Pc(17) int local17 = arg1; local17 <= arg1 + 1; local17++) { - if (local17 != Static126.anInt3114) { + if (local17 != SceneGraph.anInt3114) { for (@Pc(28) int local28 = local3; local28 <= local7; local28++) { if (local28 >= 0 && local28 < SceneGraph.mapSizeX) { for (@Pc(39) int local39 = local11; local39 <= local15; local39++) { diff --git a/client/src/main/java/rt4/Static7.java b/client/src/main/java/rt4/Static7.java index 7b4dc02..98d7629 100644 --- a/client/src/main/java/rt4/Static7.java +++ b/client/src/main/java/rt4/Static7.java @@ -42,7 +42,7 @@ public final class Static7 { } } } - if (local20 == 1 && (Static116.anInt2952 == 1 && MiniMenu.size > 2 || Static277.method4640(MiniMenu.size - 1))) { + if (local20 == 1 && (Static116.anInt2952 == 1 && MiniMenu.size > 2 || MiniMenu.method4640(MiniMenu.size - 1))) { local20 = 2; } if (local20 == 2 && MiniMenu.size > 0 || Static226.anInt3953 == 1) { diff --git a/client/src/main/java/rt4/Static72.java b/client/src/main/java/rt4/Static72.java index 9f47908..d4c0e79 100644 --- a/client/src/main/java/rt4/Static72.java +++ b/client/src/main/java/rt4/Static72.java @@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static72 { - @OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I") - public static int[][] regionsXteaKeys; - - @OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V") + @OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V") public static void method1568(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { Static131.method2576(Static71.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4); @Pc(17) int local17 = 0; diff --git a/client/src/main/java/rt4/Static73.java b/client/src/main/java/rt4/Static73.java index d6cbc5d..ade5003 100644 --- a/client/src/main/java/rt4/Static73.java +++ b/client/src/main/java/rt4/Static73.java @@ -40,8 +40,8 @@ public final class Static73 { return; } if (Camera.cameraType == 2) { - Camera.renderX = Static245.anInt5375 << 7; - Camera.renderZ = Static248.anInt4232 << 7; + Camera.renderX = Camera.anInt5375 << 7; + Camera.renderZ = Camera.anInt4232 << 7; } else { Camera.updateLoginScreenCamera(); } diff --git a/client/src/main/java/rt4/Static74.java b/client/src/main/java/rt4/Static74.java index f3e4748..bafaf31 100644 --- a/client/src/main/java/rt4/Static74.java +++ b/client/src/main/java/rt4/Static74.java @@ -12,51 +12,17 @@ public final class Static74 { @OriginalMember(owner = "client!fn", name = "a", descriptor = "(ZIIIIIII)V") public static void method1623(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { if (arg3 == arg6) { - Static152.method2826(arg0, arg2, arg5, arg6, arg1, arg4); + method2826(arg0, arg2, arg5, arg6, arg1, arg4); } else if (arg1 - arg6 >= TextureOp29.anInt4164 && arg6 + arg1 <= TextureOp29.anInt5063 && TextureOp29.anInt5773 <= arg2 - arg3 && TextureOp29.anInt2869 >= arg2 + arg3) { - Static270.method4594(arg5, arg1, arg2, arg4, arg6, arg3, arg0); + method4594(arg5, arg1, arg2, arg4, arg6, arg3, arg0); } else { - Static231.method3981(arg6, arg5, arg4, arg0, arg2, arg1, arg3); + method3981(arg6, arg5, arg4, arg0, arg2, arg1, arg3); } } - @OriginalMember(owner = "client!fn", name = "a", descriptor = "(BIIIII)V") - public static void method1624(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { - Sprites.scrollbars[0].renderTransparent(arg2, arg3); - Sprites.scrollbars[1].renderTransparent(arg2, arg4 + arg3 - 16); - @Pc(35) int local35 = arg4 * (arg4 - 32) / arg1; - if (local35 < 8) { - local35 = 8; - } - @Pc(54) int local54 = arg0 * (arg4 - local35 - 32) / (arg1 - arg4); - if (!GlRenderer.enabled) { - SoftwareRaster.fillRect(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); - SoftwareRaster.fillRect(arg2, local54 + arg3 + 16, 16, local35, Static53.anInt1704); - SoftwareRaster.drawVerticalLine(arg2, local54 + arg3 + 16, local35, Static219.anInt4938); - SoftwareRaster.drawVerticalLine(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938); - SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 16, 16, Static219.anInt4938); - SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 17, 16, Static219.anInt4938); - SoftwareRaster.drawVerticalLine(arg2 + 15, local54 + 16 + arg3, local35, anInt671); - SoftwareRaster.drawVerticalLine(arg2 + 14, arg3 - -17 - -local54, local35 - 1, anInt671); - SoftwareRaster.drawHorizontalLine(arg2, local35 + arg3 + local54 + 15, 16, anInt671); - SoftwareRaster.drawHorizontalLine(arg2 + 1, local35 + arg3 - (-local54 + -14), 15, anInt671); - return; - } - GlRaster.method1186(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); - GlRaster.method1186(arg2, arg3 + local54 + 16, 16, local35, Static53.anInt1704); - GlRaster.method1176(arg2, local54 + arg3 + 16, local35, Static219.anInt4938); - GlRaster.method1176(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938); - GlRaster.method1174(arg2, local54 + arg3 + 16, 16, Static219.anInt4938); - GlRaster.method1174(arg2, local54 + arg3 + 17, 16, Static219.anInt4938); - GlRaster.method1176(arg2 + 15, arg3 + (16 - -local54), local35, anInt671); - GlRaster.method1176(arg2 + 14, arg3 - -local54 + 17, local35 - 1, anInt671); - GlRaster.method1174(arg2, local35 + arg3 + local54 + 15, 16, anInt671); - GlRaster.method1174(arg2 + 1, arg3 + 14 - -local54 + local35, 15, anInt671); - } - @OriginalMember(owner = "client!fn", name = "a", descriptor = "(ILclient!be;)V") public static void update(@OriginalArg(1) Component arg0) { - @Pc(7) Component local7 = Static280.method4668(arg0); + @Pc(7) Component local7 = method4668(arg0); @Pc(19) int local19; @Pc(17) int local17; if (local7 == null) { @@ -87,4 +53,254 @@ public final class Static74 { } } + @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;") + public static Component method4668(@OriginalArg(0) Component arg0) { + if (arg0.layer != -1) { + return InterfaceList.getComponent(arg0.layer); + } + @Pc(28) int local28 = arg0.id >>> 16; + @Pc(33) HashTableIterator local33 = new HashTableIterator(InterfaceList.openInterfaces); + for (@Pc(38) ComponentPointer local38 = (ComponentPointer) local33.method2701(); local38 != null; local38 = (ComponentPointer) local33.method2700()) { + if (local28 == local38.anInt5878) { + return InterfaceList.getComponent((int) local38.key); + } + } + return null; + } + + @OriginalMember(owner = "client!wb", name = "a", descriptor = "(IIIIIIII)V") + public static void method4594(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { + @Pc(7) int local7 = 0; + @Pc(9) int local9 = arg5; + @Pc(11) int local11 = 0; + @Pc(16) int local16 = arg4 - arg6; + @Pc(20) int local20 = arg4 * arg4; + @Pc(25) int local25 = arg5 - arg6; + @Pc(29) int local29 = arg5 * arg5; + @Pc(33) int local33 = local25 * local25; + @Pc(37) int local37 = local29 << 1; + @Pc(41) int local41 = local20 << 1; + @Pc(45) int local45 = local33 << 1; + @Pc(49) int local49 = local16 * local16; + @Pc(53) int local53 = local49 << 1; + @Pc(57) int local57 = arg5 << 1; + @Pc(61) int local61 = local25 << 1; + @Pc(70) int local70 = local29 - (local57 - 1) * local41; + @Pc(80) int local80 = local49 * (1 - local61) + local45; + @Pc(89) int local89 = (1 - local57) * local20 + local37; + @Pc(93) int local93 = local20 << 2; + @Pc(102) int local102 = local33 - local53 * (local61 - 1); + @Pc(106) int local106 = local49 << 2; + @Pc(110) int local110 = local29 << 2; + @Pc(114) int local114 = local33 << 2; + @Pc(120) int local120 = (local57 - 3) * local41; + @Pc(124) int local124 = local37 * 3; + @Pc(130) int local130 = (local61 - 3) * local53; + @Pc(134) int local134 = local45 * 3; + @Pc(136) int local136 = local110; + @Pc(138) int local138 = local114; + @Pc(144) int local144 = (local25 - 1) * local106; + @Pc(162) int local162 = (arg5 - 1) * local93; + @Pc(166) int[] local166 = Static71.anIntArrayArray10[arg2]; + Static131.method2576(local166, arg1 - arg4, -local16 + arg1, arg3); + Static131.method2576(local166, arg1 - local16, arg1 - -local16, arg0); + Static131.method2576(local166, arg1 + local16, arg4 + arg1, arg3); + while (local9 > 0) { + if (local89 < 0) { + while (local89 < 0) { + local70 += local136; + local89 += local124; + local7++; + local136 += local110; + local124 += local110; + } + } + if (local70 < 0) { + local89 += local124; + local7++; + local124 += local110; + local70 += local136; + local136 += local110; + } + @Pc(258) boolean local258 = local9 <= local25; + if (local258) { + if (local80 < 0) { + while (local80 < 0) { + local80 += local134; + local134 += local114; + local11++; + local102 += local138; + local138 += local114; + } + } + if (local102 < 0) { + local80 += local134; + local11++; + local134 += local114; + local102 += local138; + local138 += local114; + } + local102 += -local130; + local130 -= local106; + local80 += -local144; + local144 -= local106; + } + local89 += -local162; + local70 += -local120; + local120 -= local93; + local9--; + @Pc(348) int local348 = arg2 - local9; + @Pc(352) int local352 = local7 + arg1; + local162 -= local93; + @Pc(360) int local360 = local9 + arg2; + @Pc(365) int local365 = arg1 - local7; + if (local258) { + @Pc(371) int local371 = arg1 + local11; + @Pc(376) int local376 = arg1 - local11; + Static131.method2576(Static71.anIntArrayArray10[local348], local365, local376, arg3); + Static131.method2576(Static71.anIntArrayArray10[local348], local376, local371, arg0); + Static131.method2576(Static71.anIntArrayArray10[local348], local371, local352, arg3); + Static131.method2576(Static71.anIntArrayArray10[local360], local365, local376, arg3); + Static131.method2576(Static71.anIntArrayArray10[local360], local376, local371, arg0); + Static131.method2576(Static71.anIntArrayArray10[local360], local371, local352, arg3); + } else { + Static131.method2576(Static71.anIntArrayArray10[local348], local365, local352, arg3); + Static131.method2576(Static71.anIntArrayArray10[local360], local365, local352, arg3); + } + } + } + + @OriginalMember(owner = "client!ma", name = "a", descriptor = "(IIBIIII)V") + public static void method2826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { + if (arg4 - arg3 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg4 + arg3 && TextureOp29.anInt5773 <= arg1 - arg3 && TextureOp29.anInt2869 >= arg3 + arg1) { + Static8.method120(arg5, arg0, arg1, arg2, arg3, arg4); + } else { + Static152.method4670(arg2, arg1, arg3, arg5, arg0, arg4); + } + } + + @OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIBIII)V") + public static void method3981(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { + @Pc(7) int local7 = 0; + @Pc(12) int local12 = arg0 - arg3; + @Pc(14) int local14 = 0; + @Pc(16) int local16 = arg6; + @Pc(20) int local20 = arg6 * arg6; + @Pc(25) int local25 = arg6 - arg3; + @Pc(29) int local29 = arg0 * arg0; + @Pc(33) int local33 = local20 << 1; + @Pc(37) int local37 = local25 * local25; + @Pc(41) int local41 = local12 * local12; + @Pc(45) int local45 = local29 << 1; + @Pc(49) int local49 = local37 << 1; + @Pc(53) int local53 = local41 << 1; + @Pc(57) int local57 = local25 << 1; + @Pc(61) int local61 = arg6 << 1; + @Pc(70) int local70 = local33 + local29 * (1 - local61); + @Pc(79) int local79 = local20 - (local61 - 1) * local45; + @Pc(88) int local88 = local49 + local41 * (1 - local57); + @Pc(96) int local96 = local37 - local53 * (local57 - 1); + @Pc(100) int local100 = local20 << 2; + @Pc(104) int local104 = local29 << 2; + @Pc(108) int local108 = local37 << 2; + @Pc(112) int local112 = local33 * 3; + @Pc(118) int local118 = (local61 - 3) * local45; + @Pc(130) int local130 = local41 << 2; + @Pc(134) int local134 = local49 * 3; + @Pc(140) int local140 = (local57 - 3) * local53; + @Pc(146) int local146 = (arg6 - 1) * local104; + @Pc(148) int local148 = local108; + @Pc(150) int local150 = local100; + @Pc(156) int local156 = (local25 - 1) * local130; + @Pc(174) int local174; + @Pc(183) int local183; + @Pc(192) int local192; + @Pc(201) int local201; + if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) { + @Pc(166) int[] local166 = Static71.anIntArrayArray10[arg4]; + local174 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg0, TextureOp29.anInt4164); + local183 = Static78.method1690(TextureOp29.anInt5063, arg5 + arg0, TextureOp29.anInt4164); + local192 = Static78.method1690(TextureOp29.anInt5063, arg5 - local12, TextureOp29.anInt4164); + local201 = Static78.method1690(TextureOp29.anInt5063, arg5 + local12, TextureOp29.anInt4164); + Static131.method2576(local166, local174, local192, arg2); + Static131.method2576(local166, local192, local201, arg1); + Static131.method2576(local166, local201, local183, arg2); + } + while (local16 > 0) { + if (local70 < 0) { + while (local70 < 0) { + local70 += local112; + local112 += local100; + local7++; + local79 += local150; + local150 += local100; + } + } + @Pc(255) boolean local255 = local16 <= local25; + if (local79 < 0) { + local79 += local150; + local70 += local112; + local7++; + local150 += local100; + local112 += local100; + } + if (local255) { + if (local88 < 0) { + while (local88 < 0) { + local14++; + local96 += local148; + local148 += local108; + local88 += local134; + local134 += local108; + } + } + if (local96 < 0) { + local14++; + local96 += local148; + local88 += local134; + local148 += local108; + local134 += local108; + } + local88 += -local156; + local156 -= local130; + local96 += -local140; + local140 -= local130; + } + local79 += -local118; + local70 += -local146; + local146 -= local104; + local118 -= local104; + local16--; + local183 = arg4 + local16; + local174 = arg4 - local16; + if (TextureOp29.anInt5773 <= local183 && TextureOp29.anInt2869 >= local174) { + local192 = Static78.method1690(TextureOp29.anInt5063, arg5 + local7, TextureOp29.anInt4164); + local201 = Static78.method1690(TextureOp29.anInt5063, arg5 - local7, TextureOp29.anInt4164); + if (local255) { + @Pc(404) int local404 = Static78.method1690(TextureOp29.anInt5063, arg5 + local14, TextureOp29.anInt4164); + @Pc(412) int local412 = Static78.method1690(TextureOp29.anInt5063, arg5 - local14, TextureOp29.anInt4164); + @Pc(420) int[] local420; + if (TextureOp29.anInt5773 <= local174) { + local420 = Static71.anIntArrayArray10[local174]; + Static131.method2576(local420, local201, local412, arg2); + Static131.method2576(local420, local412, local404, arg1); + Static131.method2576(local420, local404, local192, arg2); + } + if (local183 <= TextureOp29.anInt2869) { + local420 = Static71.anIntArrayArray10[local183]; + Static131.method2576(local420, local201, local412, arg2); + Static131.method2576(local420, local412, local404, arg1); + Static131.method2576(local420, local404, local192, arg2); + } + } else { + if (TextureOp29.anInt5773 <= local174) { + Static131.method2576(Static71.anIntArrayArray10[local174], local201, local192, arg2); + } + if (TextureOp29.anInt2869 >= local183) { + Static131.method2576(Static71.anIntArrayArray10[local183], local201, local192, arg2); + } + } + } + } + } } diff --git a/client/src/main/java/rt4/Static79.java b/client/src/main/java/rt4/Static79.java index 7c176de..1a3f3eb 100644 --- a/client/src/main/java/rt4/Static79.java +++ b/client/src/main/java/rt4/Static79.java @@ -46,7 +46,7 @@ public final class Static79 { if ((SceneGraph.tileFlags[arg2][arg1][arg4] & 0x8) != 0) { local39 = 0; } - if (local39 != Static41.anInt1316) { + if (local39 != LoginManager.centralPlane) { return; } } diff --git a/client/src/main/java/rt4/Static80.java b/client/src/main/java/rt4/Static80.java index 167369c..304a06d 100644 --- a/client/src/main/java/rt4/Static80.java +++ b/client/src/main/java/rt4/Static80.java @@ -10,10 +10,7 @@ public final class Static80 { @OriginalMember(owner = "client!gf", name = "M", descriptor = "I") public static int anInt4698; - @OriginalMember(owner = "client!gf", name = "R", descriptor = "I") - public static int centralZoneX; - - @OriginalMember(owner = "client!gf", name = "S", descriptor = "[I") + @OriginalMember(owner = "client!gf", name = "S", descriptor = "[I") public static final int[] anIntArray419 = new int[] { 0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1 }; } diff --git a/client/src/main/java/rt4/Static82.java b/client/src/main/java/rt4/Static82.java index da25654..e9edc79 100644 --- a/client/src/main/java/rt4/Static82.java +++ b/client/src/main/java/rt4/Static82.java @@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static82 { - @OriginalMember(owner = "client!gi", name = "H", descriptor = "I") - public static int anInt2252 = 0; - @OriginalMember(owner = "client!gi", name = "a", descriptor = "(IIIIB)V") public static void method1760(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { if (arg1 - arg0 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg0 + arg1 && arg3 - arg0 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg0 + arg3) { diff --git a/client/src/main/java/rt4/Static83.java b/client/src/main/java/rt4/Static83.java index 2a316d2..f79e5d7 100644 --- a/client/src/main/java/rt4/Static83.java +++ b/client/src/main/java/rt4/Static83.java @@ -6,17 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static83 { - @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z") - public static boolean isAlphaNumeric(@OriginalArg(0) int arg0) { - if (arg0 >= 97 && arg0 <= 122) { - return true; - } else if (arg0 >= 65 && arg0 <= 90) { - return true; - } else { - return arg0 >= 48 && arg0 <= 57; - } - } - @OriginalMember(owner = "client!gj", name = "a", descriptor = "([JII[II)V") public static void method436(@OriginalArg(0) long[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3) { if (arg1 >= arg2) { diff --git a/client/src/main/java/rt4/Static84.java b/client/src/main/java/rt4/Static84.java index 8688938..aa8e53b 100644 --- a/client/src/main/java/rt4/Static84.java +++ b/client/src/main/java/rt4/Static84.java @@ -1,6 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; public final class Static84 { @@ -11,22 +10,4 @@ public final class Static84 { @OriginalMember(owner = "client!gk", name = "g", descriptor = "Z") public static boolean aBoolean127 = false; - @OriginalMember(owner = "client!gk", name = "h", descriptor = "I") - public static int anInt2255 = 0; - - @OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V") - public static void method1771() { - Light.anIntArray150 = Static206.method3679(0.4F); - } - - @OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V") - public static void method1772(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) SecondaryNode arg1) { - if (arg1.aClass3_Sub2_66 != null) { - arg1.method4365(); - } - arg1.aClass3_Sub2_66 = arg0; - arg1.aClass3_Sub2_67 = arg0.aClass3_Sub2_67; - arg1.aClass3_Sub2_66.aClass3_Sub2_67 = arg1; - arg1.aClass3_Sub2_67.aClass3_Sub2_66 = arg1; - } } diff --git a/client/src/main/java/rt4/Static85.java b/client/src/main/java/rt4/Static85.java index 1e33aae..b065ff7 100644 --- a/client/src/main/java/rt4/Static85.java +++ b/client/src/main/java/rt4/Static85.java @@ -1,31 +1,10 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static85 { @OriginalMember(owner = "client!gl", name = "f", descriptor = "I") public static int anInt2263; - @OriginalMember(owner = "client!gl", name = "a", descriptor = "(II)V") - public static void refreshMagicVarp(@OriginalArg(1) int arg0) { - InterfaceList.redrawActiveInterfaces(); - AreaSoundManager.updateMulti(); - @Pc(17) int local17 = VarpTypeList.get(arg0).clientCode; - if (local17 == 0) { - return; - } - @Pc(25) int local25 = VarpDomain.activeVarps[arg0]; - if (local17 == 6) { - Static79.anInt2157 = local25; - } - if (local17 == 5) { - Static116.anInt2952 = local25; - } - if (local17 == 9) { - Static179.anInt4254 = local25; - } - } } diff --git a/client/src/main/java/rt4/Static86.java b/client/src/main/java/rt4/Static86.java deleted file mode 100644 index 433093c..0000000 --- a/client/src/main/java/rt4/Static86.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static86 { - - @OriginalMember(owner = "client!gm", name = "W", descriptor = "Lclient!na;") - public static final JagString UNDERSCORE = JagString.parse("_"); - - @OriginalMember(owner = "client!gm", name = "gb", descriptor = "[I") - public static final int[] anIntArray211 = new int[] { 0, 4, 4, 8, 0, 0, 8, 0, 0 }; - -} diff --git a/client/src/main/java/rt4/Static87.java b/client/src/main/java/rt4/Static87.java index afa6736..bf8bb6e 100644 --- a/client/src/main/java/rt4/Static87.java +++ b/client/src/main/java/rt4/Static87.java @@ -38,10 +38,10 @@ public final class Static87 { @Pc(9) byte[][] local9; if (GlRenderer.enabled && arg0) { local7 = 1; - local9 = Static186.underWaterMapFilesBuffer; + local9 = LoginManager.underWaterMapFilesBuffer; } else { local7 = 4; - local9 = Static273.mapFilesBuffer; + local9 = LoginManager.mapFilesBuffer; } @Pc(18) int local18 = local9.length; @Pc(20) int local20; @@ -49,19 +49,19 @@ public final class Static87 { @Pc(49) int local49; @Pc(53) byte[] local53; for (local20 = 0; local20 < local18; local20++) { - local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Camera.originX; - local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ; + local38 = (LoginManager.regionBitPacked[local20] >> 8) * 64 - Camera.originX; + local49 = (LoginManager.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ; local53 = local9[local20]; if (local53 != null) { client.audioLoop(); - Static269.method2203(PathFinder.collisionMaps, arg0, Static80.centralZoneX * 8 - 48, local49, local38, (Static52.anInt1695 - 6) * 8, local53); + Static269.method2203(PathFinder.collisionMaps, arg0, LoginManager.centralZoneX * 8 - 48, local49, local38, (LoginManager.centralZoneZ - 6) * 8, local53); } } for (local20 = 0; local20 < local18; local20++) { - local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Camera.originX; - local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ; + local38 = (LoginManager.regionBitPacked[local20] >> 8) * 64 - Camera.originX; + local49 = (LoginManager.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ; local53 = local9[local20]; - if (local53 == null && Static52.anInt1695 < 800) { + if (local53 == null && LoginManager.centralZoneZ < 800) { client.audioLoop(); for (@Pc(130) int local130 = 0; local130 < local7; local130++) { Static23.method645(local130, local49, local38, 64, 64); @@ -206,7 +206,7 @@ public final class Static87 { continue; } local276 -= local30.height / 2; - memory = (int)Camera.yawTarget + Static59.anInt1814 & 0x7FF; + memory = (int)Camera.yawTarget + MiniMap.anInt1814 & 0x7FF; local270 -= local30.width / 2; color = MathUtils.sin[memory]; cardMemory = MathUtils.cos[memory]; @@ -369,7 +369,7 @@ public final class Static87 { } if (Static223.aBooleanArray116[local57] || Cheat.rectDebug > 1) { if (local30.type == 0 && !local30.usingScripts && local30.scrollMaxV > local30.height) { - Static74.method1624(local30.scrollY, local30.scrollMaxV, local30.width + local123, local114, local30.height); + method1624(local30.scrollY, local30.scrollMaxV, local30.width + local123, local114, local30.height); } if (local30.type != 1) { @@ -475,7 +475,7 @@ public final class Static87 { @Pc(1381) Sprite local1381 = local30.method482(local270); if (local1381 != null) { local1381.render(x, y); - } else if (Static211.aBoolean72) { + } else if (Component.aBoolean72) { InterfaceList.redraw(local30); } } @@ -542,7 +542,7 @@ public final class Static87 { @Pc(1989) ObjType local1989 = ObjTypeList.get(local30.objId); local1934 = local1989.name; if (local1934 == null) { - local1934 = Static92.NULL; + local1934 = MiniMenu.NULL; } if ((local1989.stackable == 1 || local30.objCount != 1) && local30.objCount != -1) { local1934 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(local30.objCount) }); @@ -553,10 +553,10 @@ public final class Static87 { local1934 = LocalizedText.PLEASEWAIT; } if (!local30.usingScripts) { - local1934 = Static127.method2465(local30, local1934); + local1934 = JagString.method2465(local30, local1934); } local1921.method2852(local1934, local123, local114, local30.width, local30.height, local276, local30.textAntiMacro ? 0 : -1, local30.anInt460, local30.anInt478, local30.anInt467); - } else if (Static211.aBoolean72) { + } else if (Component.aBoolean72) { InterfaceList.redraw(local30); } } else if (local30.type == 5) { @@ -646,14 +646,14 @@ public final class Static87 { sprite.renderResized(local123, local114, local30.width, local30.height); } } - } else if (Static211.aBoolean72) { + } else if (Component.aBoolean72) { InterfaceList.redraw(local30); } } else { sprite = local30.method489(Static154.method2926(local30)); if (sprite != null) { sprite.render(local123, local114); - } else if (Static211.aBoolean72) { + } else if (Component.aBoolean72) { InterfaceList.redraw(local30); } } @@ -696,13 +696,13 @@ public final class Static87 { } } else if (local276 == -1) { local2589 = local30.method488(-1, null, -1, 0, local2587, PlayerList.self.appearance); - if (local2589 == null && Static211.aBoolean72) { + if (local2589 == null && Component.aBoolean72) { InterfaceList.redraw(local30); } } else { @Pc(2689) SeqType local2689 = SeqTypeList.get(local276); local2589 = local30.method488(local30.anInt496, local2689, local30.anInt510, local30.anInt500, local2587, PlayerList.self.appearance); - if (local2589 == null && Static211.aBoolean72) { + if (local2589 == null && Component.aBoolean72) { InterfaceList.redraw(local30); } } @@ -729,7 +729,7 @@ public final class Static87 { GlRenderer.restoreLighting(); GlRenderer.setDepthTestEnabled(true); GlRenderer.setFogEnabled(false); - Static229.method3935(Preferences.brightness); + FogManager.method3935(Preferences.brightness); if (Static263.aBoolean299) { GlRaster.method1177(); GlRenderer.clearDepthBuffer(); @@ -767,7 +767,7 @@ public final class Static87 { if (local30.type == 7) { local1921 = local30.method491(Sprites.nameIcons); if (local1921 == null) { - if (Static211.aBoolean72) { + if (Component.aBoolean72) { InterfaceList.redraw(local30); } continue; @@ -802,7 +802,7 @@ public final class Static87 { local270 = 0; @Pc(3297) JagString local3297 = local30.text; @Pc(3299) Font local3299 = Fonts.p12Full; - local3297 = Static127.method2465(local30, local3297); + local3297 = JagString.method2465(local30, local3297); @Pc(3325) JagString local3325; while (local3297.length() > 0) { cardMemory = local3297.indexOf(Static269.aClass100_556); @@ -841,7 +841,7 @@ public final class Static87 { } local3297 = local30.text; objId = local556 + local3299.lineHeight + 2; - local3297 = Static127.method2465(local30, local3297); + local3297 = JagString.method2465(local30, local3297); while (local3297.length() > 0) { local563 = local3297.indexOf(Static269.aClass100_556); if (local563 == -1) { @@ -901,4 +901,38 @@ public final class Static87 { } return arg0 + (arg1 & 0xFF80); } + + @OriginalMember(owner = "client!fn", name = "a", descriptor = "(BIIIII)V") + public static void method1624(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { + Sprites.scrollbars[0].renderTransparent(arg2, arg3); + Sprites.scrollbars[1].renderTransparent(arg2, arg4 + arg3 - 16); + @Pc(35) int local35 = arg4 * (arg4 - 32) / arg1; + if (local35 < 8) { + local35 = 8; + } + @Pc(54) int local54 = arg0 * (arg4 - local35 - 32) / (arg1 - arg4); + if (!GlRenderer.enabled) { + SoftwareRaster.fillRect(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); + SoftwareRaster.fillRect(arg2, local54 + arg3 + 16, 16, local35, Static53.anInt1704); + SoftwareRaster.drawVerticalLine(arg2, local54 + arg3 + 16, local35, Static219.anInt4938); + SoftwareRaster.drawVerticalLine(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938); + SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 16, 16, Static219.anInt4938); + SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 17, 16, Static219.anInt4938); + SoftwareRaster.drawVerticalLine(arg2 + 15, local54 + 16 + arg3, local35, Static74.anInt671); + SoftwareRaster.drawVerticalLine(arg2 + 14, arg3 - -17 - -local54, local35 - 1, Static74.anInt671); + SoftwareRaster.drawHorizontalLine(arg2, local35 + arg3 + local54 + 15, 16, Static74.anInt671); + SoftwareRaster.drawHorizontalLine(arg2 + 1, local35 + arg3 - (-local54 + -14), 15, Static74.anInt671); + return; + } + GlRaster.method1186(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); + GlRaster.method1186(arg2, arg3 + local54 + 16, 16, local35, Static53.anInt1704); + GlRaster.method1176(arg2, local54 + arg3 + 16, local35, Static219.anInt4938); + GlRaster.method1176(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938); + GlRaster.method1174(arg2, local54 + arg3 + 16, 16, Static219.anInt4938); + GlRaster.method1174(arg2, local54 + arg3 + 17, 16, Static219.anInt4938); + GlRaster.method1176(arg2 + 15, arg3 + (16 - -local54), local35, Static74.anInt671); + GlRaster.method1176(arg2 + 14, arg3 - -local54 + 17, local35 - 1, Static74.anInt671); + GlRaster.method1174(arg2, local35 + arg3 + local54 + 15, 16, Static74.anInt671); + GlRaster.method1174(arg2 + 1, arg3 + 14 - -local54 + local35, 15, Static74.anInt671); + } } diff --git a/client/src/main/java/rt4/Static89.java b/client/src/main/java/rt4/Static89.java index 4a4609d..2abbab5 100644 --- a/client/src/main/java/rt4/Static89.java +++ b/client/src/main/java/rt4/Static89.java @@ -16,9 +16,9 @@ public final class Static89 { @Pc(13) byte[][] local13; if (GlRenderer.enabled && arg0) { local11 = 1; - local13 = Static186.underWaterMapFilesBuffer; + local13 = LoginManager.underWaterMapFilesBuffer; } else { - local13 = Static273.mapFilesBuffer; + local13 = LoginManager.mapFilesBuffer; local11 = 4; } for (@Pc(21) int local21 = 0; local21 < local11; local21++) { @@ -34,8 +34,8 @@ public final class Static89 { @Pc(82) int local82 = local52 >> 1 & 0x3; @Pc(88) int local88 = local52 >> 14 & 0x3FF; @Pc(98) int local98 = (local88 / 8 << 8) + local76 / 8; - for (@Pc(100) int local100 = 0; local100 < Static238.regionBitPacked.length; local100++) { - if (Static238.regionBitPacked[local100] == local98 && local13[local100] != null) { + for (@Pc(100) int local100 = 0; local100 < LoginManager.regionBitPacked.length; local100++) { + if (LoginManager.regionBitPacked[local100] == local98 && local13[local100] != null) { Static245.method4228(local82, local32 * 8, local21, PathFinder.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0); local54 = true; break; @@ -89,7 +89,7 @@ public final class Static89 { public static void method1841() { if (!Static40.aBoolean108) { if (Static226.anInt3953 != 0) { - Static155.anInt3751 = Static277.anInt5850; + Static155.anInt3751 = Mouse.anInt5850; Static60.anInt1892 = Static280.anInt5895; } else if (Mouse.clickButton == 0) { Static155.anInt3751 = Mouse.anInt4873; diff --git a/client/src/main/java/rt4/Static90.java b/client/src/main/java/rt4/Static90.java deleted file mode 100644 index 7335555..0000000 --- a/client/src/main/java/rt4/Static90.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static90 { - - @OriginalMember(owner = "client!hb", name = "t", descriptor = "[I") - public static final int[] anIntArray215 = new int[] { 160, 192, 80, 96, 0, 144, 80, 48, 160 }; - -} diff --git a/client/src/main/java/rt4/Static92.java b/client/src/main/java/rt4/Static92.java deleted file mode 100644 index b0bdf36..0000000 --- a/client/src/main/java/rt4/Static92.java +++ /dev/null @@ -1,66 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static92 { - - @OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;") - public static Sprite aClass3_Sub2_Sub1_6; - - @OriginalMember(owner = "client!hd", name = "l", descriptor = "Lclient!na;") - public static final JagString NULL = JagString.parse("null"); - - @OriginalMember(owner = "client!hd", name = "a", descriptor = "(IIIIIIII)V") - public static void method1881(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { - if (arg5 < 0 || arg3 < 0 || arg5 >= 103 || arg3 >= 103) { - return; - } - @Pc(38) int local38; - if (arg4 == 0) { - @Pc(28) Wall local28 = SceneGraph.getWall(arg0, arg5, arg3); - if (local28 != null) { - local38 = Integer.MAX_VALUE & (int) (local28.key >>> 32); - if (arg2 == 2) { - local28.primary = new Loc(local38, 2, arg1 + 4, arg0, arg5, arg3, arg6, false, local28.primary); - local28.aClass8_6 = new Loc(local38, 2, arg1 + 1 & 0x3, arg0, arg5, arg3, arg6, false, local28.aClass8_6); - } else { - local28.primary = new Loc(local38, arg2, arg1, arg0, arg5, arg3, arg6, false, local28.primary); - } - } - } - if (arg4 == 1) { - @Pc(106) WallDecor local106 = SceneGraph.getWallDecor(arg0, arg5, arg3); - if (local106 != null) { - local38 = (int) (local106.key >>> 32) & Integer.MAX_VALUE; - if (arg2 == 4 || arg2 == 5) { - local106.primary = new Loc(local38, 4, arg1, arg0, arg5, arg3, arg6, false, local106.primary); - } else if (arg2 == 6) { - local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary); - } else if (arg2 == 7) { - local106.primary = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.primary); - } else if (arg2 == 8) { - local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary); - local106.aClass8_2 = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_2); - } - } - } - if (arg4 == 2) { - if (arg2 == 11) { - arg2 = 10; - } - @Pc(255) Scenery local255 = SceneGraph.getScenery(arg0, arg5, arg3); - if (local255 != null) { - local255.primary = new Loc((int) (local255.key >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.primary); - } - } - if (arg4 == 3) { - @Pc(290) GroundDecor local290 = SceneGraph.getGroundDecor(arg0, arg5, arg3); - if (local290 != null) { - local290.primary = new Loc(Integer.MAX_VALUE & (int) (local290.key >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.primary); - } - } - } - -} diff --git a/client/src/main/java/rt4/Static96.java b/client/src/main/java/rt4/Static96.java index 6373691..1b6d9db 100644 --- a/client/src/main/java/rt4/Static96.java +++ b/client/src/main/java/rt4/Static96.java @@ -8,10 +8,7 @@ public final class Static96 { @OriginalMember(owner = "client!hh", name = "p", descriptor = "[I") public static int[] anIntArray234; - @OriginalMember(owner = "client!hh", name = "r", descriptor = "[I") - public static int[] anIntArray235; - - @OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V") + @OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V") public static void method1949(@OriginalArg(1) int arg0) { if (InterfaceList.load(arg0)) { Static118.method2354(-1, InterfaceList.components[arg0]); diff --git a/client/src/main/java/rt4/Static97.java b/client/src/main/java/rt4/Static97.java index fd685d4..0487558 100644 --- a/client/src/main/java/rt4/Static97.java +++ b/client/src/main/java/rt4/Static97.java @@ -34,7 +34,7 @@ public final class Static97 { return; } local30 -= 10; - @Pc(58) int local58 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; + @Pc(58) int local58 = MiniMap.anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(62) int local62 = MathUtils.cos[local58]; @Pc(66) int local66 = MathUtils.sin[local58]; @Pc(74) int local74 = local66 * 256 / (MiniMap.anInt4130 + 256); diff --git a/client/src/main/java/rt4/Static99.java b/client/src/main/java/rt4/Static99.java index ac63e05..e6e1223 100644 --- a/client/src/main/java/rt4/Static99.java +++ b/client/src/main/java/rt4/Static99.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static99 { - @OriginalMember(owner = "client!hk", name = "bb", descriptor = "[I") - public static int[] underWaterMapFileIds; - - @OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;") + @OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;") public static final LinkedList aClass69_64 = new LinkedList(); } diff --git a/client/src/main/java/rt4/StringUtils.java b/client/src/main/java/rt4/StringUtils.java new file mode 100644 index 0000000..77b4a18 --- /dev/null +++ b/client/src/main/java/rt4/StringUtils.java @@ -0,0 +1,43 @@ +package rt4; + +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; + +public class StringUtils { + @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z") + public static boolean isAlphaNumeric(@OriginalArg(0) int arg0) { + if (arg0 >= 97 && arg0 <= 122) { + return true; + } else if (arg0 >= 65 && arg0 <= 90) { + return true; + } else { + return arg0 >= 48 && arg0 <= 57; + } + } + + @OriginalMember(owner = "client!va", name = "a", descriptor = "(IB)Z") + public static boolean isLetter(@OriginalArg(0) int arg0) { + return arg0 >= 97 && arg0 <= 122 || arg0 >= 65 && arg0 <= 90; + } + + @OriginalMember(owner = "client!bn", name = "d", descriptor = "(II)Z") + public static boolean isDigit(@OriginalArg(1) int arg0) { + return arg0 >= 48 && arg0 <= 57; + } + + @OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z") + public static boolean isValidChar(@OriginalArg(1) int arg0) { + if (arg0 >= 32 && arg0 <= 126) { + return true; + } else if (arg0 >= 160 && arg0 <= 255) { + return true; + } else { + return arg0 == 128 || arg0 == 140 || arg0 == 151 || arg0 == 156 || arg0 == 159; + } + } + + @OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;") + public static JagString method4510(@OriginalArg(0) int arg0) { + return arg0 >= 999999999 ? Static220.aClass100_930 : JagString.parseInt(arg0); + } +} diff --git a/client/src/main/java/rt4/SynthFilter.java b/client/src/main/java/rt4/SynthFilter.java index 5f8f5cd..7226849 100644 --- a/client/src/main/java/rt4/SynthFilter.java +++ b/client/src/main/java/rt4/SynthFilter.java @@ -8,6 +8,14 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!nl") public final class SynthFilter { + @OriginalMember(owner = "client!nl", name = "f", descriptor = "[[I") + public static final int[][] anIntArrayArray32 = new int[2][8]; + @OriginalMember(owner = "client!nl", name = "b", descriptor = "[[F") + public static final float[][] aFloatArrayArray2 = new float[2][8]; + @OriginalMember(owner = "client!nl", name = "d", descriptor = "F") + public static float aFloat22; + @OriginalMember(owner = "client!nl", name = "g", descriptor = "I") + public static int anInt4191; @OriginalMember(owner = "client!nl", name = "e", descriptor = "[I") public final int[] anIntArray368 = new int[2]; @@ -20,6 +28,12 @@ public final class SynthFilter { @OriginalMember(owner = "client!nl", name = "h", descriptor = "[I") private final int[] anIntArray369 = new int[2]; + @OriginalMember(owner = "client!nl", name = "a", descriptor = "(F)F") + public static float method3250(@OriginalArg(0) float arg0) { + @Pc(7) float local7 = (float) Math.pow(2.0D, (double) arg0) * 32.703197F; + return local7 * 3.1415927F / 11025.0F; + } + @OriginalMember(owner = "client!nl", name = "a", descriptor = "(Lclient!wa;Lclient!ff;)V") public final void method3249(@OriginalArg(0) Buffer arg0, @OriginalArg(1) SynthEnvelope arg1) { @Pc(3) int local3 = arg0.g1(); @@ -62,35 +76,35 @@ public final class SynthFilter { if (arg0 == 0) { local20 = (float) this.anIntArray369[0] + (float) (this.anIntArray369[1] - this.anIntArray369[0]) * arg1; @Pc(24) float local24 = local20 * 0.0030517578F; - Static174.aFloat22 = (float) Math.pow(0.1D, (double) (local24 / 20.0F)); - Static174.anInt4191 = (int) (Static174.aFloat22 * 65536.0F); + aFloat22 = (float) Math.pow(0.1D, (double) (local24 / 20.0F)); + anInt4191 = (int) (aFloat22 * 65536.0F); } if (this.anIntArray368[arg0] == 0) { return 0; } local20 = this.method3253(arg0, 0, arg1); - Static174.aFloatArrayArray2[arg0][0] = -2.0F * local20 * (float) Math.cos((double) this.method3254(arg0, 0, arg1)); - Static174.aFloatArrayArray2[arg0][1] = local20 * local20; + aFloatArrayArray2[arg0][0] = -2.0F * local20 * (float) Math.cos((double) this.method3254(arg0, 0, arg1)); + aFloatArrayArray2[arg0][1] = local20 * local20; @Pc(77) int local77; for (local77 = 1; local77 < this.anIntArray368[arg0]; local77++) { local20 = this.method3253(arg0, local77, arg1); @Pc(102) float local102 = -2.0F * local20 * (float) Math.cos((double) this.method3254(arg0, local77, arg1)); @Pc(106) float local106 = local20 * local20; - Static174.aFloatArrayArray2[arg0][local77 * 2 + 1] = Static174.aFloatArrayArray2[arg0][local77 * 2 - 1] * local106; - Static174.aFloatArrayArray2[arg0][local77 * 2] = Static174.aFloatArrayArray2[arg0][local77 * 2 - 1] * local102 + Static174.aFloatArrayArray2[arg0][local77 * 2 - 2] * local106; + aFloatArrayArray2[arg0][local77 * 2 + 1] = aFloatArrayArray2[arg0][local77 * 2 - 1] * local106; + aFloatArrayArray2[arg0][local77 * 2] = aFloatArrayArray2[arg0][local77 * 2 - 1] * local102 + aFloatArrayArray2[arg0][local77 * 2 - 2] * local106; for (@Pc(162) int local162 = local77 * 2 - 1; local162 >= 2; local162--) { - Static174.aFloatArrayArray2[arg0][local162] += Static174.aFloatArrayArray2[arg0][local162 - 1] * local102 + Static174.aFloatArrayArray2[arg0][local162 - 2] * local106; + aFloatArrayArray2[arg0][local162] += aFloatArrayArray2[arg0][local162 - 1] * local102 + aFloatArrayArray2[arg0][local162 - 2] * local106; } - Static174.aFloatArrayArray2[arg0][1] += Static174.aFloatArrayArray2[arg0][0] * local102 + local106; - Static174.aFloatArrayArray2[arg0][0] += local102; + aFloatArrayArray2[arg0][1] += aFloatArrayArray2[arg0][0] * local102 + local106; + aFloatArrayArray2[arg0][0] += local102; } if (arg0 == 0) { for (local77 = 0; local77 < this.anIntArray368[0] * 2; local77++) { - Static174.aFloatArrayArray2[0][local77] *= Static174.aFloat22; + aFloatArrayArray2[0][local77] *= aFloat22; } } for (local77 = 0; local77 < this.anIntArray368[arg0] * 2; local77++) { - Static174.anIntArrayArray32[arg0][local77] = (int) (Static174.aFloatArrayArray2[arg0][local77] * 65536.0F); + anIntArrayArray32[arg0][local77] = (int) (aFloatArrayArray2[arg0][local77] * 65536.0F); } return this.anIntArray368[arg0] * 2; } @@ -106,6 +120,6 @@ public final class SynthFilter { private float method3254(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) float arg2) { @Pc(30) float local30 = (float) this.anIntArrayArrayArray14[arg0][0][arg1] + arg2 * (float) (this.anIntArrayArrayArray14[arg0][1][arg1] - this.anIntArrayArrayArray14[arg0][0][arg1]); @Pc(34) float local34 = local30 * 1.2207031E-4F; - return Static174.method3250(local34); + return method3250(local34); } } diff --git a/client/src/main/java/rt4/SynthInstrument.java b/client/src/main/java/rt4/SynthInstrument.java index 6533a99..492f15d 100644 --- a/client/src/main/java/rt4/SynthInstrument.java +++ b/client/src/main/java/rt4/SynthInstrument.java @@ -214,12 +214,12 @@ public final class SynthInstrument { } @Pc(523) int local523; while (local198 < local203) { - local356 = (int) ((long) anIntArray398[local198 + local185] * (long) Static174.anInt4191 >> 16); + local356 = (int) ((long) anIntArray398[local198 + local185] * (long) SynthFilter.anInt4191 >> 16); for (local523 = 0; local523 < local185; local523++) { - local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16); + local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[0][local523] >> 16); } for (local523 = 0; local523 < local198; local523++) { - local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16); + local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[1][local523] >> 16); } anIntArray398[local198] = local356; local102 = this.aClass42_6.method1512(arg0 + 1); @@ -231,12 +231,12 @@ public final class SynthInstrument { local203 = arg0 - local185; } while (local198 < local203) { - local356 = (int) ((long) anIntArray398[local198 + local185] * (long) Static174.anInt4191 >> 16); + local356 = (int) ((long) anIntArray398[local198 + local185] * (long) SynthFilter.anInt4191 >> 16); for (local523 = 0; local523 < local185; local523++) { - local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16); + local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[0][local523] >> 16); } for (local523 = 0; local523 < local190; local523++) { - local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16); + local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[1][local523] >> 16); } anIntArray398[local198] = local356; local102 = this.aClass42_6.method1512(arg0 + 1); @@ -246,10 +246,10 @@ public final class SynthInstrument { while (local198 < arg0) { local356 = 0; for (local523 = local198 + local185 - arg0; local523 < local185; local523++) { - local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16); + local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[0][local523] >> 16); } for (local523 = 0; local523 < local190; local523++) { - local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16); + local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) SynthFilter.anIntArrayArray32[1][local523] >> 16); } anIntArray398[local198] = local356; this.aClass42_6.method1512(arg0 + 1); diff --git a/client/src/main/java/rt4/TextureOp29.java b/client/src/main/java/rt4/TextureOp29.java index aae1f39..f7c7ef7 100644 --- a/client/src/main/java/rt4/TextureOp29.java +++ b/client/src/main/java/rt4/TextureOp29.java @@ -81,7 +81,7 @@ public final class TextureOp29 extends TextureOp { } else if (local24 == 2) { this.aClass18Array1[local11] = Static156.method2960(arg1); } else if (local24 == 3) { - this.aClass18Array1[local11] = Static137.method2664(arg1); + this.aClass18Array1[local11] = TextureOp29SubOp2.method2664(arg1); } } } else if (arg0 == 1) { diff --git a/client/src/main/java/rt4/TextureOp29SubOp2.java b/client/src/main/java/rt4/TextureOp29SubOp2.java index aad2984..71943bf 100644 --- a/client/src/main/java/rt4/TextureOp29SubOp2.java +++ b/client/src/main/java/rt4/TextureOp29SubOp2.java @@ -29,6 +29,11 @@ public final class TextureOp29SubOp2 extends TextureOp29SubOp { this.anInt3159 = arg2; } + @OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;") + public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) { + return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1()); + } + @OriginalMember(owner = "client!kc", name = "c", descriptor = "(III)V") @Override public final void method4013(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { diff --git a/client/src/main/java/rt4/TextureOpSprite.java b/client/src/main/java/rt4/TextureOpSprite.java index 9d1acd1..eaed5b2 100644 --- a/client/src/main/java/rt4/TextureOpSprite.java +++ b/client/src/main/java/rt4/TextureOpSprite.java @@ -32,7 +32,7 @@ public class TextureOpSprite extends TextureOp { } else if (this.anInt3235 < 0) { return false; } else { - @Pc(43) SoftwareSprite local43 = Static215.anInt4868 < 0 ? Static164.method3117(Static176.aClass153_76, this.anInt3235) : SpriteLoader.loadSoftwareSprite(this.anInt3235, Static176.aClass153_76, Static215.anInt4868); + @Pc(43) SoftwareSprite local43 = Static215.anInt4868 < 0 ? SpriteLoader.method3117(Static176.aClass153_76, this.anInt3235) : SpriteLoader.loadSoftwareSprite(this.anInt3235, Static176.aClass153_76, Static215.anInt4868); local43.trim(); this.anInt3240 = local43.height; this.anInt3239 = local43.width; diff --git a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java index bdceaef..4219a51 100644 --- a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java +++ b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java @@ -12,6 +12,8 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!wg", name = "b", descriptor = "Z") public static boolean aBoolean308 = false; + @OriginalMember(owner = "client!nh", name = "Z", descriptor = "I") + public static int anInt3241 = 128; @OriginalMember(owner = "client!wg", name = "c", descriptor = "I") private int anInt5805 = -1; @@ -206,9 +208,9 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, WaterMaterialRenderer.method2422(), 0); if (arg0 >= 0) { this.aFloatArray29[0] = 0.0F; - this.aFloatArray29[1] = 1.0F / (float) Static170.anInt3241; + this.aFloatArray29[1] = 1.0F / (float) anInt3241; this.aFloatArray29[2] = 0.0F; - this.aFloatArray29[3] = (float) arg0 * 1.0F / (float) Static170.anInt3241; + this.aFloatArray29[3] = (float) arg0 * 1.0F / (float) anInt3241; local1.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); local1.glEnable(GL2.GL_TEXTURE_GEN_S); } else { diff --git a/client/src/main/java/rt4/VarpDomain.java b/client/src/main/java/rt4/VarpDomain.java index 4835d33..ab15b51 100644 --- a/client/src/main/java/rt4/VarpDomain.java +++ b/client/src/main/java/rt4/VarpDomain.java @@ -77,4 +77,38 @@ public class VarpDomain { local25 <<= local16; method2766(local19, local25 & arg1 << local16 | activeVarps[local19] & ~local25); } + + @OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V") + public static void setVarbit(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { + @Pc(14) VarbitType local14 = VarbitTypeList.get(arg1); + @Pc(17) int local17 = local14.baseVar; + @Pc(20) int local20 = local14.endBit; + @Pc(23) int local23 = local14.startBit; + @Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local20 - local23]; + if (arg0 < 0 || local29 < arg0) { + arg0 = 0; + } + local29 <<= local23; + set(arg0 << local23 & local29 | ~local29 & varp[local17], local17); + } + + @OriginalMember(owner = "client!gl", name = "a", descriptor = "(II)V") + public static void refreshMagicVarp(@OriginalArg(1) int arg0) { + InterfaceList.redrawActiveInterfaces(); + AreaSoundManager.updateMulti(); + @Pc(17) int local17 = VarpTypeList.get(arg0).clientCode; + if (local17 == 0) { + return; + } + @Pc(25) int local25 = activeVarps[arg0]; + if (local17 == 6) { + Static79.anInt2157 = local25; + } + if (local17 == 5) { + Static116.anInt2952 = local25; + } + if (local17 == 9) { + Static179.anInt4254 = local25; + } + } } diff --git a/client/src/main/java/rt4/WorldMap.java b/client/src/main/java/rt4/WorldMap.java index 95c6d2e..3d75942 100644 --- a/client/src/main/java/rt4/WorldMap.java +++ b/client/src/main/java/rt4/WorldMap.java @@ -21,6 +21,8 @@ public class WorldMap { public static final int anInt3254 = (int) (Math.random() * 17.0D) - 8; @OriginalMember(owner = "client!lf", name = "c", descriptor = "Lclient!ih;") public static final LinkedList mapElements = new LinkedList(); + @OriginalMember(owner = "client!he", name = "db", descriptor = "Lclient!na;") + public static final JagString aClass100_517 = JagString.parse(""); @OriginalMember(owner = "client!wa", name = "ub", descriptor = "Lclient!bn;") public static Map currentMap; @OriginalMember(owner = "client!dc", name = "O", descriptor = "I") @@ -691,7 +693,7 @@ public class WorldMap { if (local437 == 0 || local62 <= 1 || local238 <= 1) { SoftwareRaster.fillRect(local47, mapScene, local62, local238, local372); } else { - Static280.method4667(SoftwareRaster.pixels, local372, local47, local433 & 0x3, local312, local437 >> 2, local238, local62, mapScene, true); + method4667(SoftwareRaster.pixels, local372, local47, local433 & 0x3, local312, local437 >> 2, local238, local62, mapScene, true); } } if (local395 != 0) { @@ -703,7 +705,7 @@ public class WorldMap { if (local437 == 0 || local62 <= 1 || local238 <= 1) { SoftwareRaster.fillRect(local47, mapScene, local62, local238, local395); } - Static280.method4667(SoftwareRaster.pixels, local395, local47, local433 & 0x3, 0, local437 >> 2, local238, local62, mapScene, local372 == 0); + method4667(SoftwareRaster.pixels, local395, local47, local433 & 0x3, 0, local437 >> 2, local238, local62, mapScene, local372 == 0); } } if (local197[angle] != null) { @@ -1023,7 +1025,7 @@ public class WorldMap { @OriginalMember(owner = "client!rc", name = "a", descriptor = "(Lclient!na;Z)Lclient!na;") public static JagString method923(@OriginalArg(0) JagString arg0) { @Pc(12) int local12 = Static171.method3218(arg0); - return local12 == -1 ? Static211.aClass100_517 : labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872); + return local12 == -1 ? aClass100_517 : labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872); } @OriginalMember(owner = "client!rg", name = "d", descriptor = "(B)Lclient!bn;") @@ -1093,4 +1095,488 @@ public class WorldMap { } return -1; } + + @OriginalMember(owner = "client!wl", name = "a", descriptor = "([IIIIIIIIIZB)V") + public static void method4667(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) boolean arg9) { + @Pc(7) int local7 = arg2; + if (SoftwareRaster.clipRight <= arg2) { + return; + } + if (arg2 < SoftwareRaster.clipLeft) { + local7 = SoftwareRaster.clipLeft; + } + @Pc(30) int local30 = arg7 + arg2; + if (SoftwareRaster.clipLeft >= local30) { + return; + } + if (SoftwareRaster.clipRight < local30) { + local30 = SoftwareRaster.clipRight; + } + @Pc(43) int local43 = arg8; + if (SoftwareRaster.clipBottom <= arg8) { + return; + } + @Pc(56) int local56 = arg8 + arg6; + if (arg8 < SoftwareRaster.clipTop) { + local43 = SoftwareRaster.clipTop; + } + if (local56 <= SoftwareRaster.clipTop) { + return; + } + @Pc(79) int local79 = local7 + SoftwareRaster.width * local43; + if (arg5 == 9) { + arg3 = arg3 + 1 & 0x3; + arg5 = 1; + } + @Pc(99) int local99 = local7 + SoftwareRaster.width - local30; + local43 -= arg8; + @Pc(108) int local108 = arg6 - local43; + if (SoftwareRaster.clipBottom < local56) { + local56 = SoftwareRaster.clipBottom; + } + if (arg5 == 10) { + arg3 = arg3 + 3 & 0x3; + arg5 = 1; + } + local7 -= arg2; + @Pc(136) int local136 = arg7 - local7; + if (arg5 == 11) { + arg3 = arg3 + 3 & 0x3; + arg5 = 8; + } + local30 -= arg2; + @Pc(157) int local157 = arg7 - local30; + local56 -= arg8; + @Pc(165) int local165 = arg6 - local56; + @Pc(175) int local175; + @Pc(184) int local184; + if (arg5 == 1) { + if (arg3 == 0) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 <= local175) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 1) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local7; local184 < local30; local184++) { + if (local175 >= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 2) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 >= local175) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 3) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 >= local175) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } + } else if (arg5 == 2) { + if (arg3 == 0) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local7; local184 < local30; local184++) { + if (local175 >> 1 >= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 1) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local79 >= 0 && local79 < arg0.length) { + if (local175 << 1 <= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } else { + local79++; + } + } + local79 += local99; + } + } else if (arg3 == 2) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local175 >> 1 >= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 3) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local175 << 1 <= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } + } else if (arg5 == 3) { + if (arg3 == 0) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local175 >> 1 >= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 1) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 >= local175 << 1) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 2) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 <= local175 >> 1) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 3) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local175 << 1 <= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } + } else if (arg5 == 4) { + if (arg3 == 0) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local7; local184 < local30; local184++) { + if (local175 >> 1 <= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 1) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local175 << 1 >= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 2) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local184 >= local175 >> 1) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 3) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local184 <= local175 << 1) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } + } else if (arg5 != 5) { + if (arg5 == 6) { + if (arg3 == 0) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 <= arg7 / 2) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + if (arg3 == 1) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local175 <= arg6 / 2) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + if (arg3 == 2) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 >= arg7 / 2) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + if (arg3 == 3) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local175 >= arg6 / 2) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + } + if (arg5 == 7) { + if (arg3 == 0) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 <= local175 - arg6 / 2) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + if (arg3 == 1) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local7; local184 < local30; local184++) { + if (local175 - arg6 / 2 >= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + if (arg3 == 2) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local184 <= local175 - arg6 / 2) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + if (arg3 == 3) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local175 - arg6 / 2 >= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + } + if (arg5 == 8) { + if (arg3 == 0) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local175 - arg6 / 2 <= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + if (arg3 == 1) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local7; local184 < local30; local184++) { + if (local175 - arg6 / 2 <= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + if (arg3 == 2) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local184 >= local175 - arg6 / 2) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + if (arg3 == 3) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local175 - arg6 / 2 <= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + return; + } + } + } else if (arg3 == 0) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local175 >> 1 <= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 1) { + for (local175 = local108 - 1; local175 >= local165; local175--) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 <= local175 << 1) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 2) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local7; local184 < local30; local184++) { + if (local184 >= local175 >> 1) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } else if (arg3 == 3) { + for (local175 = local43; local175 < local56; local175++) { + for (local184 = local136 - 1; local184 >= local157; local184--) { + if (local175 << 1 >= local184) { + arg0[local79] = arg1; + } else if (arg9) { + arg0[local79] = arg4; + } + local79++; + } + local79 += local99; + } + } + } } diff --git a/client/src/main/java/rt4/client.java b/client/src/main/java/rt4/client.java index b143ff3..da853a1 100644 --- a/client/src/main/java/rt4/client.java +++ b/client/src/main/java/rt4/client.java @@ -24,7 +24,11 @@ public final class client extends GameShell { public static final Js5CachedResourceProvider[] js5Providers = new Js5CachedResourceProvider[28]; @OriginalMember(owner = "client!d", name = "S", descriptor = "Ljava/util/Random;") public static final Random aRandom1 = new Random(); - @OriginalMember(owner = "client!jm", name = "A", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!nh", name = "fb", descriptor = "[I") + public static final int[] JS5_ARCHIVE_WEIGHTS = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; + @OriginalMember(owner = "client!si", name = "gb", descriptor = "Lclient!na;") + public static final JagString aClass100_974 = JagString.parse("
(X"); + @OriginalMember(owner = "client!jm", name = "A", descriptor = "Lclient!na;") static final JagString aClass100_603 = JagString.parse(""); @OriginalMember(owner = "client!jm", name = "z", descriptor = "Lclient!na;") public static JagString mainLoadSecondaryText = aClass100_603; @@ -297,7 +301,7 @@ public final class client extends GameShell { Static233.aClass95_4 = null; } if (arg0 == 25 || arg0 == 28) { - Static271.anInt5804 = 0; + ClientProt.anInt5804 = 0; Static230.anInt5150 = 1; Static233.loadingScreenState = 0; Static38.anInt1196 = 1; @@ -453,7 +457,7 @@ public final class client extends GameShell { MiniMap.sprite = null; Static107.anInt2875 = -1; method3768(); - Static255.cache.clear(); + DeadClass.cache.clear(); LocType.aClass139_1 = new Loc_Class139(); ((Js5GlTextureProvider) Rasteriser.textureProvider).clear(); LightingManager.lightCount = 0; @@ -477,7 +481,7 @@ public final class client extends GameShell { Sprites.load(js5Archive8); Static204.aClass3_Sub2_Sub1_10 = null; Static39.aClass3_Sub2_Sub1_1 = null; - Static92.aClass3_Sub2_Sub1_6 = null; + Static112.aClass3_Sub2_Sub1_6 = null; Static165.aClass3_Sub2_Sub1_8 = null; Static181.aClass3_Sub2_Sub1_9 = null; if (gameState == 5) { @@ -520,7 +524,7 @@ public final class client extends GameShell { } MiniMenu.anInt5014 = 0; Static132.anInt3291 = (int) (Math.random() * 100.0D) - 50; - Static84.anInt2255 = 0; + LoginManager.mapFlagZ = 0; Camera.yawTarget = (int) (Math.random() * 20.0D) - 10 & 0x7FF; Static107.anInt2875 = -1; PlayerList.size = 0; @@ -529,8 +533,8 @@ public final class client extends GameShell { Static241.aBoolean302 = false; MiniMap.anInt4130 = (int) (Math.random() * 30.0D) - 20; SoundPlayer.anInt4451 = 0; - Static115.mapFlagX = 0; - Static59.anInt1814 = (int) (Math.random() * 120.0D) - 60; + LoginManager.mapFlagX = 0; + MiniMap.anInt1814 = (int) (Math.random() * 120.0D) - 60; Chat.size = 0; Static230.anInt5161 = (int) (Math.random() * 80.0D) - 40; NpcList.size = 0; @@ -560,12 +564,12 @@ public final class client extends GameShell { DelayedStateChange.clear(); Static133.anInt5230 = 0; Static233.anInt5217 = 0; - Static265.anInt5765 = 0; + Camera.anInt5765 = 0; Static231.anInt5203 = 0; - Static248.anInt4232 = 0; - Static245.anInt5375 = 0; + Camera.anInt4232 = 0; + Camera.anInt5375 = 0; Static260.anInt1744 = 0; - Static251.anInt5449 = 0; + Camera.anInt5449 = 0; Static113.anInt4612 = 0; Static233.anInt5225 = 0; for (local3506 = 0; local3506 < VarcDomain.varcs.length; local3506++) { @@ -618,7 +622,22 @@ public final class client extends GameShell { ClientProt.method1373(); } - @OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V") + @OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V") + public static void method930() { + if (musicChannel != null) { + musicChannel.quit(); + } + if (soundChannel != null) { + soundChannel.quit(); + } + AudioChannel.init(Preferences.stereo); + musicChannel = AudioChannel.create(22050, signLink, canvas, 0); + musicChannel.setStream(musicStream); + soundChannel = AudioChannel.create(2048, signLink, canvas, 1); + soundChannel.setStream(soundStream); + } + + @OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V") @Override protected final void mainRedraw() { if (gameState == 1000) { @@ -650,7 +669,7 @@ public final class client extends GameShell { local84 -= local90.top + local90.bottom; } if (local80 != GameShell.frameWidth || local84 != GameShell.frameHeight) { - Static203.method3662(); + GameShell.method3662(); Static97.aLong89 = MonotonicClock.currentTimeMillis() + 500L; } } @@ -682,13 +701,13 @@ public final class client extends GameShell { Static230.anInt5150 = Static175.mapFilesMissingCount; } local80 = (Static230.anInt5150 - Static175.mapFilesMissingCount) * 50 / Static230.anInt5150; - Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 })); + Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 })); } else if (Static233.loadingScreenState == 2) { - if (Static38.anInt1196 < Static271.anInt5804) { - Static38.anInt1196 = Static271.anInt5804; + if (Static38.anInt1196 < ClientProt.anInt5804) { + Static38.anInt1196 = ClientProt.anInt5804; } - local80 = (Static38.anInt1196 - Static271.anInt5804) * 50 / Static38.anInt1196 + 50; - Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 })); + local80 = (Static38.anInt1196 - ClientProt.anInt5804) * 50 / Static38.anInt1196 + 50; + Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 })); } else { Static114.drawTextOnScreen(false, LocalizedText.LOADING); } @@ -870,7 +889,7 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "g", descriptor = "(I)V") @Override protected final void mainInit() { - Static203.method3662(); + GameShell.method3662(); js5CacheQueue = new Js5CacheQueue(); js5NetQueue = new Js5NetQueue(); if (modeWhat != 0) { @@ -1260,7 +1279,7 @@ public final class client extends GameShell { } else if (mainLoadState == 40) { percentage = 0; for (i = 0; i < 28; i++) { - percentage += js5Providers[i].getIndexPercentageComplete() * Static170.JS5_ARCHIVE_WEIGHTS[i] / 100; + percentage += js5Providers[i].getIndexPercentageComplete() * JS5_ARCHIVE_WEIGHTS[i] / 100; } if (percentage == 100) { mainLoadPercentage = 20; @@ -1542,7 +1561,7 @@ public final class client extends GameShell { if (LoginManager.reply == 15) { Static44.method1146(); } else if (LoginManager.reply != 2) { - Static278.processLogout(); + LoginManager.processLogout(); } } } diff --git a/playground/src/main/java/com/itspazaz/rt4/Playground.java b/playground/src/main/java/com/itspazaz/rt4/Playground.java index 284f7a4..08b1a80 100644 --- a/playground/src/main/java/com/itspazaz/rt4/Playground.java +++ b/playground/src/main/java/com/itspazaz/rt4/Playground.java @@ -107,7 +107,7 @@ public class Playground extends GameShell { LoadingBarAwt.render(null, true, JagString.parse("Initializing sprites"), 1); percentage = 0; for (int i = 0; i < 28; i++) { - percentage += js5Providers[i].getIndexPercentageComplete() * Static170.JS5_ARCHIVE_WEIGHTS[i] / 100; + percentage += js5Providers[i].getIndexPercentageComplete() * client.JS5_ARCHIVE_WEIGHTS[i] / 100; } if (percentage == 100) { Sprites.init(archives[8]);