diff --git a/client/src/main/java/AreaSoundManager.java b/client/src/main/java/AreaSoundManager.java new file mode 100644 index 0000000..f38e2ea --- /dev/null +++ b/client/src/main/java/AreaSoundManager.java @@ -0,0 +1,18 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class AreaSoundManager { + @OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V") + public static void remove(@OriginalArg(0) Player arg0) { + @Pc(10) AreaSound local10 = (AreaSound) Static93.aClass133_7.get(arg0.username.encode37()); + if (local10 == null) { + return; + } + if (local10.primaryStream != null) { + client.soundStream.removeSubStream(local10.primaryStream); + local10.primaryStream = null; + } + local10.unlink(); + } +} diff --git a/client/src/main/java/Camera.java b/client/src/main/java/Camera.java index 06e2138..0ec442b 100644 --- a/client/src/main/java/Camera.java +++ b/client/src/main/java/Camera.java @@ -35,13 +35,13 @@ public class Camera { yawTarget = mod(yawTarget, 2047.0d); @Pc(33) int local33 = Static81.cameraX >> 7; @Pc(37) int local37 = Static111.cameraZ >> 7; - @Pc(43) int local43 = SceneGraph.getTileHeight(Static55.level, Static81.cameraX, Static111.cameraZ); + @Pc(43) int local43 = SceneGraph.getTileHeight(Player.level, Static81.cameraX, Static111.cameraZ); @Pc(45) int local45 = 0; @Pc(64) int local64; if (local33 > 3 && local37 > 3 && local33 < 100 && local37 < 100) { for (local64 = local33 - 4; local64 <= local33 + 4; local64++) { for (@Pc(73) int local73 = local37 - 4; local73 <= local37 + 4; local73++) { - @Pc(80) int local80 = Static55.level; + @Pc(80) int local80 = Player.level; if (local80 < 3 && (Static12.tileSettings[1][local64][local73] & 0x2) == 2) { local80++; } diff --git a/client/src/main/java/Chat.java b/client/src/main/java/Chat.java new file mode 100644 index 0000000..650e7c4 --- /dev/null +++ b/client/src/main/java/Chat.java @@ -0,0 +1,43 @@ +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +public class Chat { + @OriginalMember(owner = "client!ca", name = "eb", descriptor = "[I") + public static final int[] anIntArray67 = new int[100]; + @OriginalMember(owner = "client!fb", name = "l", descriptor = "[Lclient!na;") + public static final JagString[] aClass100Array62 = new JagString[100]; + @OriginalMember(owner = "client!sj", name = "q", descriptor = "[Lclient!na;") + public static final JagString[] aClass100Array158 = new JagString[100]; + @OriginalMember(owner = "client!th", name = "l", descriptor = "[I") + public static final int[] anIntArray521 = new int[100]; + @OriginalMember(owner = "client!mc", name = "Y", descriptor = "[Lclient!na;") + public static final JagString[] aClass100Array112 = new JagString[100]; + @OriginalMember(owner = "client!dm", name = "u", descriptor = "I") + public static int transmitAt = 0; + @OriginalMember(owner = "client!f", name = "Z", descriptor = "I") + public static int anInt1941 = 0; + + @OriginalMember(owner = "client!md", name = "a", descriptor = "(IILclient!na;Lclient!na;BLclient!na;)V") + public static void add(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2, @OriginalArg(3) JagString arg3, @OriginalArg(5) JagString arg4) { + for (@Pc(14) int local14 = 99; local14 > 0; local14--) { + anIntArray67[local14] = anIntArray67[local14 - 1]; + aClass100Array112[local14] = aClass100Array112[local14 - 1]; + aClass100Array158[local14] = aClass100Array158[local14 - 1]; + aClass100Array62[local14] = aClass100Array62[local14 - 1]; + anIntArray521[local14] = anIntArray521[local14 - 1]; + } + anInt1941++; + anIntArray67[0] = arg1; + aClass100Array112[0] = arg4; + transmitAt = InterfaceList.transmitTimer; + anIntArray521[0] = arg0; + aClass100Array158[0] = arg2; + aClass100Array62[0] = arg3; + } + + @OriginalMember(owner = "client!i", name = "a", descriptor = "(Lclient!na;ILclient!na;I)V") + public static void add(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2) { + add(-1, arg1, arg2, null, arg0); + } +} diff --git a/client/src/main/java/Cheat.java b/client/src/main/java/Cheat.java index 485512d..e616767 100644 --- a/client/src/main/java/Cheat.java +++ b/client/src/main/java/Cheat.java @@ -1,4 +1,6 @@ +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public class Cheat { @OriginalMember(owner = "client!p", name = "f", descriptor = "Lclient!na;") @@ -27,4 +29,11 @@ public class Cheat { public static final JagString aClass100_232 = JagString.parse("::rect_debug"); @OriginalMember(owner = "client!dg", name = "f", descriptor = "Z") public static boolean displayFps = false; + + @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V") + public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + @Pc(66) JagString local66 = JagString.concatenate(new JagString[] { Static96.aClass100_521, Static123.parseInt(arg2), Static159.aClass100_760, Static123.parseInt(arg0 >> 6), Static159.aClass100_760, Static123.parseInt(arg1 >> 6), Static159.aClass100_760, Static123.parseInt(arg0 & 0x3F), Static159.aClass100_760, Static123.parseInt(arg1 & 0x3F) }); + local66.method3129(); + Static127.method2470(local66); + } } diff --git a/client/src/main/java/ClanChat.java b/client/src/main/java/ClanChat.java new file mode 100644 index 0000000..86a1447 --- /dev/null +++ b/client/src/main/java/ClanChat.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class ClanChat { + @OriginalMember(owner = "client!wj", name = "l", descriptor = "I") + public static int transmitAt = 0; +} diff --git a/client/src/main/java/Component.java b/client/src/main/java/Component.java index ebf667a..142b1bf 100644 --- a/client/src/main/java/Component.java +++ b/client/src/main/java/Component.java @@ -13,19 +13,19 @@ public final class Component { @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;") - public Object[] anObjectArray1; + public Object[] onFriendTransmit; @OriginalMember(owner = "client!be", name = "d", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray2; + public Object[] onStatTransmit; @OriginalMember(owner = "client!be", name = "e", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray3; @OriginalMember(owner = "client!be", name = "g", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray4; + public Object[] onVarcTransmit; @OriginalMember(owner = "client!be", name = "k", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray5; + public Object[] onClickRepeat; @OriginalMember(owner = "client!be", name = "p", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray6; @@ -37,10 +37,10 @@ public final class Component { public JagString[] aClass100Array19; @OriginalMember(owner = "client!be", name = "t", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray7; + public Object[] onInvTransmit; @OriginalMember(owner = "client!be", name = "u", descriptor = "[I") - public int[] anIntArray34; + public int[] inventoryTriggers; @OriginalMember(owner = "client!be", name = "v", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray8; @@ -49,13 +49,13 @@ public final class Component { public boolean aBoolean21; @OriginalMember(owner = "client!be", name = "z", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray9; + public Object[] onHold; @OriginalMember(owner = "client!be", name = "E", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray10; @OriginalMember(owner = "client!be", name = "G", descriptor = "[I") - public int[] anIntArray35; + public int[] varcstrTriggers; @OriginalMember(owner = "client!be", name = "I", descriptor = "I") public int type; @@ -79,16 +79,16 @@ public final class Component { public int[] anIntArray37; @OriginalMember(owner = "client!be", name = "kb", descriptor = "[I") - public int[] anIntArray38; + public int[] varcTriggers; @OriginalMember(owner = "client!be", name = "qb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray13; + public Object[] onCamFinished; @OriginalMember(owner = "client!be", name = "tb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray14; + public Object[] onKey; @OriginalMember(owner = "client!be", name = "ub", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray15; + public Object[] onVarcstrTransmit; @OriginalMember(owner = "client!be", name = "Db", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray16; @@ -100,10 +100,10 @@ public final class Component { public Object[] anObjectArray17; @OriginalMember(owner = "client!be", name = "Nb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray18; + public Object[] onRelease; @OriginalMember(owner = "client!be", name = "Xb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray19; + public Object[] onMouseOver; @OriginalMember(owner = "client!be", name = "Yb", descriptor = "[I") public int[] anIntArray39; @@ -112,7 +112,7 @@ public final class Component { public int[] objTypes; @OriginalMember(owner = "client!be", name = "fc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray20; + public Object[] onChatTransmit; @OriginalMember(owner = "client!be", name = "lc", descriptor = "[Lclient!be;") public Component[] createdComponents; @@ -121,31 +121,31 @@ public final class Component { public byte[] aByteArray8; @OriginalMember(owner = "client!be", name = "rc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray21; + public Object[] onStockTransmit; @OriginalMember(owner = "client!be", name = "tc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray22; + public Object[] onTimer; @OriginalMember(owner = "client!be", name = "yc", descriptor = "[I") public int[] anIntArray41; @OriginalMember(owner = "client!be", name = "Ac", descriptor = "[I") - public int[] anIntArray42; + public int[] statTriggers; @OriginalMember(owner = "client!be", name = "Bc", descriptor = "[I") public int[] anIntArray43; @OriginalMember(owner = "client!be", name = "Cc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray23; + public Object[] onMouseRepeat; @OriginalMember(owner = "client!be", name = "Ic", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray24; + public Object[] onMouseLeave; @OriginalMember(owner = "client!be", name = "Jc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray25; + public Object[] onVarpTransmit; @OriginalMember(owner = "client!be", name = "Nc", descriptor = "[I") - public int[] anIntArray44; + public int[] varpTriggers; @OriginalMember(owner = "client!be", name = "Tc", descriptor = "[I") public int[] anIntArray45; @@ -172,13 +172,13 @@ public final class Component { public int[] anIntArray49; @OriginalMember(owner = "client!be", name = "qd", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray28; + public Object[] onClanTransmit; @OriginalMember(owner = "client!be", name = "rd", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray29; @OriginalMember(owner = "client!be", name = "sd", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray30; + public Object[] onMiscTransmit; @OriginalMember(owner = "client!be", name = "wd", descriptor = "[I") public int[] objCounts; @@ -334,7 +334,7 @@ public final class Component { public JagString aClass100_88 = Static176.aClass100_800; @OriginalMember(owner = "client!be", name = "Lc", descriptor = "I") - public int anInt511 = 0; + public int updatedVarcsReaderIndex = 0; @OriginalMember(owner = "client!be", name = "w", descriptor = "I") public int baseWidth = 0; @@ -343,7 +343,7 @@ public final class Component { public int anInt512 = 0; @OriginalMember(owner = "client!be", name = "Ib", descriptor = "I") - public int anInt482 = -1; + public int lastTransmitTimer = -1; @OriginalMember(owner = "client!be", name = "c", descriptor = "Z") public boolean aBoolean18 = false; @@ -373,7 +373,7 @@ public final class Component { public int anInt498 = -1; @OriginalMember(owner = "client!be", name = "Rb", descriptor = "I") - public int anInt487 = 0; + public int updatedVarcstrsReaderIndex = 0; @OriginalMember(owner = "client!be", name = "ic", descriptor = "I") public int anInt495 = 0; @@ -403,7 +403,7 @@ public final class Component { public int anInt486 = 0; @OriginalMember(owner = "client!be", name = "ec", descriptor = "I") - public int anInt493 = 0; + public int updatedInventoriesReaderIndex = 0; @OriginalMember(owner = "client!be", name = "Vc", descriptor = "S") public short aShort11 = 0; @@ -436,7 +436,7 @@ public final class Component { public Component aClass13_5 = null; @OriginalMember(owner = "client!be", name = "od", descriptor = "I") - public int anInt525 = 0; + public int updatedStatsReaderIndex = 0; @OriginalMember(owner = "client!be", name = "ab", descriptor = "I") public int modelType = 1; @@ -475,7 +475,7 @@ public final class Component { public int anInt510 = 0; @OriginalMember(owner = "client!be", name = "mb", descriptor = "I") - public int anInt471 = 0; + public int updatedVarpsReaderIndex = 0; @OriginalMember(owner = "client!be", name = "rb", descriptor = "I") public int anInt474 = 0; @@ -1143,30 +1143,30 @@ public final class Component { } this.aClass3_Sub4_1 = new ServerActiveProperties(local175, local567); this.anObjectArray3 = this.method485(arg0); - this.anObjectArray19 = this.method485(arg0); - this.anObjectArray24 = this.method485(arg0); + this.onMouseOver = this.method485(arg0); + this.onMouseLeave = this.method485(arg0); this.anObjectArray27 = this.method485(arg0); this.anObjectArray11 = this.method485(arg0); - this.anObjectArray25 = this.method485(arg0); - this.anObjectArray7 = this.method485(arg0); - this.anObjectArray2 = this.method485(arg0); - this.anObjectArray22 = this.method485(arg0); + this.onVarpTransmit = this.method485(arg0); + this.onInvTransmit = this.method485(arg0); + this.onStatTransmit = this.method485(arg0); + this.onTimer = this.method485(arg0); this.anObjectArray29 = this.method485(arg0); - this.anObjectArray23 = this.method485(arg0); - this.anObjectArray5 = this.method485(arg0); + this.onMouseRepeat = this.method485(arg0); + this.onClickRepeat = this.method485(arg0); this.anObjectArray6 = this.method485(arg0); - this.anObjectArray18 = this.method485(arg0); - this.anObjectArray9 = this.method485(arg0); + this.onRelease = this.method485(arg0); + this.onHold = this.method485(arg0); this.anObjectArray26 = this.method485(arg0); this.anObjectArray16 = this.method485(arg0); this.anObjectArray10 = this.method485(arg0); - this.anObjectArray4 = this.method485(arg0); - this.anObjectArray15 = this.method485(arg0); - this.anIntArray44 = this.method486(arg0); - this.anIntArray34 = this.method486(arg0); - this.anIntArray42 = this.method486(arg0); - this.anIntArray38 = this.method486(arg0); - this.anIntArray35 = this.method486(arg0); + this.onVarcTransmit = this.method485(arg0); + this.onVarcstrTransmit = this.method485(arg0); + this.varpTriggers = this.method486(arg0); + this.inventoryTriggers = this.method486(arg0); + this.statTriggers = this.method486(arg0); + this.varcTriggers = this.method486(arg0); + this.varcstrTriggers = this.method486(arg0); } @OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;") diff --git a/client/src/main/java/FriendsList.java b/client/src/main/java/FriendsList.java new file mode 100644 index 0000000..9fcbfa6 --- /dev/null +++ b/client/src/main/java/FriendsList.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class FriendsList { + @OriginalMember(owner = "client!p", name = "d", descriptor = "I") + public static int transmitAt = 0; +} diff --git a/client/src/main/java/HintArrowManager.java b/client/src/main/java/HintArrowManager.java index eae495c..47f7ce9 100644 --- a/client/src/main/java/HintArrowManager.java +++ b/client/src/main/java/HintArrowManager.java @@ -44,18 +44,18 @@ public class HintArrowManager { @Pc(94) int local94; if (GlRenderer.enabled) { @Pc(68) GlModel local68 = (GlModel) local10; - if (arg5 != SceneGraph.getTileHeight(Static55.level, arg3 + local42, arg1 + local48) || arg5 != SceneGraph.getTileHeight(Static55.level, arg3 + local45, local51 + arg1)) { + if (arg5 != SceneGraph.getTileHeight(Player.level, arg3 + local42, arg1 + local48) || arg5 != SceneGraph.getTileHeight(Player.level, arg3 + local45, local51 + arg1)) { for (local94 = 0; local94 < local68.vertexCount; local94++) { - local68.anIntArray465[local94] += SceneGraph.getTileHeight(Static55.level, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5; + local68.anIntArray465[local94] += SceneGraph.getTileHeight(Player.level, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5; } local68.bounds.valid = false; local68.vertexBuffer.valid = false; } } else { @Pc(142) SoftwareModel local142 = (SoftwareModel) local10; - if (arg5 != SceneGraph.getTileHeight(Static55.level, local42 + arg3, local48 + arg1) || arg5 != SceneGraph.getTileHeight(Static55.level, arg3 + local45, local51 + arg1)) { + if (arg5 != SceneGraph.getTileHeight(Player.level, local42 + arg3, local48 + arg1) || arg5 != SceneGraph.getTileHeight(Player.level, arg3 + local45, local51 + arg1)) { for (local94 = 0; local94 < local142.vertexCount; local94++) { - local142.anIntArray527[local94] += SceneGraph.getTileHeight(Static55.level, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5; + local142.anIntArray527[local94] += SceneGraph.getTileHeight(Player.level, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5; } local142.boundsValid = false; } diff --git a/client/src/main/java/IgnoreList.java b/client/src/main/java/IgnoreList.java new file mode 100644 index 0000000..bccb07a --- /dev/null +++ b/client/src/main/java/IgnoreList.java @@ -0,0 +1,6 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class IgnoreList { + @OriginalMember(owner = "client!pf", name = "h", descriptor = "[J") + public static final long[] encodedUsernames = new long[100]; +} diff --git a/client/src/main/java/InterfaceList.java b/client/src/main/java/InterfaceList.java index dae7b91..eacf469 100644 --- a/client/src/main/java/InterfaceList.java +++ b/client/src/main/java/InterfaceList.java @@ -31,6 +31,8 @@ public class InterfaceList { public static int keyQueueSize = 0; @OriginalMember(owner = "client!je", name = "fb", descriptor = "I") public static int transmitTimer = 1; + @OriginalMember(owner = "client!ra", name = "J", descriptor = "I") + public static int miscTransmitAt = 0; @OriginalMember(owner = "client!ab", name = "a", descriptor = "(ZLclient!ve;Lclient!ve;Lclient!ve;Lclient!ve;)V") public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) { diff --git a/client/src/main/java/JagString.java b/client/src/main/java/JagString.java index 0ee7847..2baa861 100644 --- a/client/src/main/java/JagString.java +++ b/client/src/main/java/JagString.java @@ -262,7 +262,7 @@ public final class JagString implements StringInterface { } @OriginalMember(owner = "client!na", name = "b", descriptor = "(I)Lclient!na;") - public final JagString method3116() { + public final JagString encodeMessage() { @Pc(7) byte local7 = 2; @Pc(11) JagString local11 = new JagString(); local11.length = this.length; @@ -682,7 +682,7 @@ public final class JagString implements StringInterface { } @OriginalMember(owner = "client!na", name = "h", descriptor = "(I)Lclient!na;") - public final JagString method3144() { + public final JagString trim() { @Pc(17) int local17; for (local17 = 0; local17 < this.length && (this.chars[local17] >= 0 && this.chars[local17] <= 32 || (this.chars[local17] & 0xFF) == 160); local17++) { } diff --git a/client/src/main/java/Loc.java b/client/src/main/java/Loc.java index d5bf4f2..ed8f22b 100644 --- a/client/src/main/java/Loc.java +++ b/client/src/main/java/Loc.java @@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!dc") public final class Loc extends Entity { - @OriginalMember(owner = "client!dc", name = "U", descriptor = "Lclient!ga;") + @OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;") + public static SoftwareIndexedSprite aClass36_Sub1_1 = null; + @OriginalMember(owner = "client!dc", name = "U", descriptor = "Lclient!ga;") private ParticleSystem aClass47_Sub1_2; @OriginalMember(owner = "client!dc", name = "x", descriptor = "I") @@ -100,7 +102,7 @@ public final class Loc extends Entity { this.anInt1304 = 1; } this.anInt1317 = 1; - this.anInt1320 = Static83.loop - 1; + this.anInt1320 = client.loop - 1; if (this.aClass144_2.anInt5347 == 0 && arg8 != null && arg8 instanceof Loc) { @Pc(142) Loc local142 = (Loc) arg8; if (this.aClass144_2 == local142.aClass144_2) { @@ -121,7 +123,7 @@ public final class Loc extends Entity { } } this.anInt1317 = (int) (Math.random() * (double) this.aClass144_2.anIntArray474[this.anInt1297]) + 1; - this.anInt1320 = Static83.loop - this.anInt1317; + this.anInt1320 = client.loop - this.anInt1317; } } if (GlRenderer.enabled && arg8 != null) { @@ -174,7 +176,7 @@ public final class Loc extends Entity { if (this.aClass144_2 == null) { return; } - @Pc(10) int local10 = Static83.loop - this.anInt1320; + @Pc(10) int local10 = client.loop - this.anInt1320; if (local10 > 100 && this.aClass144_2.anInt5362 > 0) { @Pc(29) int local29 = this.aClass144_2.frames.length - this.aClass144_2.anInt5362; while (this.anInt1297 < local29 && this.aClass144_2.anIntArray474[this.anInt1297] < local10) { @@ -216,7 +218,7 @@ public final class Loc extends Entity { } } this.anInt1317 = local10; - this.anInt1320 = Static83.loop - local10; + this.anInt1320 = client.loop - local10; } @OriginalMember(owner = "client!dc", name = "a", descriptor = "(ZI)Lclient!th;") @@ -250,7 +252,7 @@ public final class Loc extends Entity { this.anInt1320 -= (int) (Math.random() * (double) this.aClass144_2.anIntArray474[this.anInt1297]); } else { this.anInt1297 = 0; - this.anInt1320 = Static83.loop - 1; + this.anInt1320 = client.loop - 1; } } } @@ -289,16 +291,16 @@ public final class Loc extends Entity { @Pc(356) boolean local356 = this.aClass36_Sub1_2 == null; @Pc(389) Class139 local389; if (this.aClass144_2 == null) { - local389 = local19.method3428(this.anInt1295, local302, local267, this.anInt1307, local293, local314, false, local356 ? Static32.aClass36_Sub1_1 : this.aClass36_Sub1_2, local256, local311); + local389 = local19.method3428(this.anInt1295, local302, local267, this.anInt1307, local293, local314, false, local356 ? aClass36_Sub1_1 : this.aClass36_Sub1_2, local256, local311); } else { - local389 = local19.method3429(local311, local302, local356 ? Static32.aClass36_Sub1_1 : this.aClass36_Sub1_2, local293, this.aClass144_2, this.anInt1295, local267, local256, this.anInt1297, local314, this.anInt1304, this.anInt1307, this.anInt1317); + local389 = local19.method3429(local311, local302, local356 ? aClass36_Sub1_1 : this.aClass36_Sub1_2, local293, this.aClass144_2, this.anInt1295, local267, local256, this.anInt1297, local314, this.anInt1304, this.anInt1307, this.anInt1317); } if (local389 == null) { return null; } if (GlRenderer.enabled && local256) { if (local356) { - Static32.aClass36_Sub1_1 = local389.aClass36_Sub1_3; + aClass36_Sub1_1 = local389.aClass36_Sub1_3; } @Pc(429) int local429 = 0; if (this.anInt1303 != 0) { @@ -314,7 +316,7 @@ public final class Loc extends Entity { this.aClass36_Sub1_2 = local471; this.anInt1319 = local311; if (local356) { - Static32.aClass36_Sub1_1 = null; + aClass36_Sub1_1 = null; } this.anInt1294 = local429; this.anInt1296 = local302; diff --git a/client/src/main/java/LoginManager.java b/client/src/main/java/LoginManager.java index 63ae413..b31bac9 100644 --- a/client/src/main/java/LoginManager.java +++ b/client/src/main/java/LoginManager.java @@ -202,7 +202,7 @@ public class LoginManager { } Protocol.socket = new BufferedSocket((Socket) Protocol.socketRequest.result, GameShell.signLink); Protocol.socketRequest = null; - @Pc(106) long local106 = Static101.aLong98 = Player.username.encode37(); + @Pc(106) long local106 = Static101.aLong98 = Player.usernameInput.encode37(); Protocol.outboundBuffer.offset = 0; Protocol.outboundBuffer.p1(14); @Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL); @@ -248,7 +248,7 @@ public class LoginManager { Protocol.outboundBuffer.p4(key[1]); Protocol.outboundBuffer.p4(key[2]); Protocol.outboundBuffer.p4(key[3]); - Protocol.outboundBuffer.p8(Player.username.encode37()); + Protocol.outboundBuffer.p8(Player.usernameInput.encode37()); Protocol.outboundBuffer.pjstr(Player.password); if (GlobalConfig.LOGIN_EXTRA_INFO) { Protocol.outboundBuffer.pjstr(JagString.parse("")); diff --git a/client/src/main/java/Mouse.java b/client/src/main/java/Mouse.java index 7aae83a..d6e608e 100644 --- a/client/src/main/java/Mouse.java +++ b/client/src/main/java/Mouse.java @@ -14,6 +14,14 @@ import javax.swing.*; @OriginalClass("client!ug") public final class Mouse implements MouseListener, MouseMotionListener, FocusListener { + @OriginalMember(owner = "client!ah", name = "s", descriptor = "I") + public static int clickX = 0; + @OriginalMember(owner = "client!em", name = "y", descriptor = "I") + public static int clickY = 0; + @OriginalMember(owner = "client!sc", name = "v", descriptor = "I") + public static int anInt5032 = 0; + @OriginalMember(owner = "client!rh", name = "o", descriptor = "I") + public static int anInt4873 = 0; public int mouseWheelX; public int mouseWheelY; @@ -40,12 +48,12 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis @Pc(2) Mouse local2 = Static93.instance; synchronized (Static93.instance) { Static22.anInt723 = Static57.anInt1759; - Static215.anInt4873 = Static147.anInt3521; - Static223.anInt5032 = Static165.anInt4039; + anInt4873 = Static147.anInt3521; + anInt5032 = Static165.anInt4039; Static150.clickButton = Static41.anInt1313; - Static7.clickX = Static34.anInt1034; + clickX = Static34.anInt1034; Static93.anInt2467++; - Static60.clickY = Static222.anInt4973; + clickY = Static222.anInt4973; Static133.clickTime = Static209.aLong161; Static41.anInt1313 = 0; } diff --git a/client/src/main/java/MouseRecorder.java b/client/src/main/java/MouseRecorder.java index 2a3b44e..0b459a3 100644 --- a/client/src/main/java/MouseRecorder.java +++ b/client/src/main/java/MouseRecorder.java @@ -31,8 +31,8 @@ public final class MouseRecorder implements Runnable { @Pc(12) Object local12 = this.lock; synchronized (this.lock) { if (this.samples < 500) { - this.x[this.samples] = Static215.anInt4873; - this.y[this.samples] = Static223.anInt5032; + this.x[this.samples] = Mouse.anInt4873; + this.y[this.samples] = Mouse.anInt5032; this.samples++; } } diff --git a/client/src/main/java/Npc.java b/client/src/main/java/Npc.java index 5c7c686..dc052e7 100644 --- a/client/src/main/java/Npc.java +++ b/client/src/main/java/Npc.java @@ -55,11 +55,11 @@ public final class Npc extends PathingEntity { this.method2687(local74); this.method2685(local74, arg0); local140 = null; - if (this.anInt3432 != -1 && this.anInt3399 != -1) { - @Pc(211) SpotAnimType local211 = SpotAnimTypeList.get(this.anInt3432); + if (this.spotAnimId != -1 && this.anInt3399 != -1) { + @Pc(211) SpotAnimType local211 = SpotAnimTypeList.get(this.spotAnimId); local140 = local211.method1319(this.anInt3418, this.anInt3399, this.anInt3361); if (local140 != null) { - local140.method4575(0, -this.anInt3394, 0); + local140.method4575(0, -this.spotAnimY, 0); if (local211.aBoolean100) { if (Static101.anInt2640 != 0) { local140.method4574(Static101.anInt2640); diff --git a/client/src/main/java/Packet.java b/client/src/main/java/Packet.java index b1ec6f7..f645ae0 100644 --- a/client/src/main/java/Packet.java +++ b/client/src/main/java/Packet.java @@ -18,7 +18,7 @@ public final class Packet extends Buffer { } @OriginalMember(owner = "client!i", name = "q", descriptor = "(B)V") - public final void method2233() { + public final void accessBits() { this.anInt2846 = this.offset * 8; } @@ -30,7 +30,7 @@ public final class Packet extends Buffer { } @OriginalMember(owner = "client!i", name = "f", descriptor = "(BI)I") - public final int method2238(@OriginalArg(1) int arg0) { + public final int gBits(@OriginalArg(1) int arg0) { @Pc(6) int local6 = this.anInt2846 >> 3; @Pc(14) int local14 = 8 - (this.anInt2846 & 0x7); @Pc(16) int local16 = 0; @@ -69,7 +69,7 @@ public final class Packet extends Buffer { } @OriginalMember(owner = "client!i", name = "h", descriptor = "(Z)V") - public final void method2244() { + public final void accessBytes() { this.offset = (this.anInt2846 + 7) / 8; } } diff --git a/client/src/main/java/PathingEntity.java b/client/src/main/java/PathingEntity.java index e78fd3d..3b0e76f 100644 --- a/client/src/main/java/PathingEntity.java +++ b/client/src/main/java/PathingEntity.java @@ -7,10 +7,10 @@ import org.openrs2.deob.annotation.Pc; public abstract class PathingEntity extends Entity { @OriginalMember(owner = "client!fe", name = "A", descriptor = "I") - public int anInt3359; + public int spotAnimStart; @OriginalMember(owner = "client!fe", name = "S", descriptor = "I") - public int anInt3372; + public int hitpointsBar; @OriginalMember(owner = "client!fe", name = "U", descriptor = "I") public int anInt3374; @@ -37,7 +37,7 @@ public abstract class PathingEntity extends Entity { public int anInt3392; @OriginalMember(owner = "client!fe", name = "tb", descriptor = "I") - public int anInt3394; + public int spotAnimY; @OriginalMember(owner = "client!fe", name = "ub", descriptor = "I") public int anInt3395; @@ -106,13 +106,13 @@ public abstract class PathingEntity extends Entity { public boolean aBoolean167 = false; @OriginalMember(owner = "client!fe", name = "db", descriptor = "I") - public int anInt3382 = 0; + public int faceX = 0; @OriginalMember(owner = "client!fe", name = "Q", descriptor = "I") public int anInt3371 = 0; @OriginalMember(owner = "client!fe", name = "E", descriptor = "I") - public int anInt3363 = 0; + public int faceY = 0; @OriginalMember(owner = "client!fe", name = "yb", descriptor = "I") private int anInt3398 = 0; @@ -133,7 +133,7 @@ public abstract class PathingEntity extends Entity { public int anInt3376 = 32; @OriginalMember(owner = "client!fe", name = "P", descriptor = "I") - public int anInt3370 = -1; + public int faceEntity = -1; @OriginalMember(owner = "client!fe", name = "Bb", descriptor = "Z") private boolean aBoolean170 = false; @@ -151,13 +151,13 @@ public abstract class PathingEntity extends Entity { public final Class147[] aClass147Array3 = new Class147[12]; @OriginalMember(owner = "client!fe", name = "Lb", descriptor = "I") - public int anInt3408 = 100; + public int chatLoops = 100; @OriginalMember(owner = "client!fe", name = "V", descriptor = "I") public int anInt3375 = 0; @OriginalMember(owner = "client!fe", name = "Y", descriptor = "I") - public int anInt3378 = -1000; + public int hitpointsBarVisibleUntil = -1000; @OriginalMember(owner = "client!fe", name = "Rb", descriptor = "I") protected int anInt3413 = -32768; @@ -193,7 +193,7 @@ public abstract class PathingEntity extends Entity { public int anInt3417 = 0; @OriginalMember(owner = "client!fe", name = "s", descriptor = "I") - public int anInt3352 = 0; + public int chatEffect = 0; @OriginalMember(owner = "client!fe", name = "T", descriptor = "I") public int anInt3373 = -1; @@ -235,19 +235,19 @@ public abstract class PathingEntity extends Entity { public int anInt3396 = 0; @OriginalMember(owner = "client!fe", name = "jc", descriptor = "I") - public int anInt3429 = 0; + public int chatColor = 0; @OriginalMember(owner = "client!fe", name = "kc", descriptor = "I") - public int anInt3430 = 0; + public int lastSeenLoop = 0; @OriginalMember(owner = "client!fe", name = "ec", descriptor = "I") public int anInt3425 = 0; @OriginalMember(owner = "client!fe", name = "Wb", descriptor = "Lclient!na;") - public JagString aClass100_640 = null; + public JagString chatMessage = null; @OriginalMember(owner = "client!fe", name = "oc", descriptor = "I") - public int anInt3432 = -1; + public int spotAnimId = -1; @OriginalMember(owner = "client!fe", name = "Xb", descriptor = "I") public int anInt3418 = -1; @@ -299,7 +299,7 @@ public abstract class PathingEntity extends Entity { } @OriginalMember(owner = "client!fe", name = "a", descriptor = "(IBI)V") - public final void method2684(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { + public final void move(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(10) int local10 = this.movementQueueX[0]; @Pc(15) int local15 = this.movementQueueZ[0]; if (arg1 == 0) { @@ -363,13 +363,13 @@ public abstract class PathingEntity extends Entity { @Pc(53) int local53 = -local27 / 2; @Pc(64) int local64 = local53 * local43 - local48 * local39 >> 16; @Pc(75) int local75 = local39 * local53 + local43 * local48 >> 16; - @Pc(87) int local87 = SceneGraph.getTileHeight(Static55.level, local75 + this.xFine, this.zFine + local64); + @Pc(87) int local87 = SceneGraph.getTileHeight(Player.level, local75 + this.xFine, this.zFine + local64); @Pc(91) int local91 = local24 / 2; @Pc(96) int local96 = -local27 / 2; @Pc(106) int local106 = local91 * local43 + local96 * local39 >> 16; @Pc(110) int local110 = local27 / 2; @Pc(121) int local121 = local96 * local43 - local91 * local39 >> 16; - @Pc(134) int local134 = SceneGraph.getTileHeight(Static55.level, local106 + this.xFine, this.zFine - -local121); + @Pc(134) int local134 = SceneGraph.getTileHeight(Player.level, local106 + this.xFine, this.zFine - -local121); @Pc(139) int local139 = -local24 / 2; @Pc(150) int local150 = local110 * local43 - local39 * local139 >> 16; @Pc(154) int local154 = local27 / 2; @@ -377,9 +377,9 @@ public abstract class PathingEntity extends Entity { @Pc(169) int local169 = local39 * local110 + local43 * local139 >> 16; @Pc(179) int local179 = local154 * local43 - local39 * local158 >> 16; @Pc(189) int local189 = local39 * local154 + local43 * local158 >> 16; - @Pc(201) int local201 = SceneGraph.getTileHeight(Static55.level, this.xFine + local169, local150 + this.zFine); + @Pc(201) int local201 = SceneGraph.getTileHeight(Player.level, this.xFine + local169, local150 + this.zFine); @Pc(212) int local212 = local134 > local87 ? local87 : local134; - @Pc(224) int local224 = SceneGraph.getTileHeight(Static55.level, local189 + this.xFine, local179 + this.zFine); + @Pc(224) int local224 = SceneGraph.getTileHeight(Player.level, local189 + this.xFine, local179 + this.zFine); @Pc(231) int local231 = local224 > local201 ? local201 : local224; @Pc(238) int local238 = local224 > local134 ? local134 : local224; @Pc(245) int local245 = local201 <= local87 ? local201 : local87; @@ -402,7 +402,7 @@ public abstract class PathingEntity extends Entity { } @OriginalMember(owner = "client!fe", name = "a", descriptor = "(IIII)V") - public final void method2686(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + public final void addHit(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { for (@Pc(11) int local11 = 0; local11 < 4; local11++) { if (arg1 >= this.anIntArray319[local11]) { this.anIntArray322[local11] = arg2; diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java index b15f57c..6d2dda2 100644 --- a/client/src/main/java/Player.java +++ b/client/src/main/java/Player.java @@ -9,12 +9,16 @@ public final class Player extends PathingEntity { @OriginalMember(owner = "client!pa", name = "P", descriptor = "Lclient!na;") public static JagString password = JagString.EMPTY; @OriginalMember(owner = "client!pa", name = "S", descriptor = "Lclient!na;") - public static JagString username = JagString.EMPTY; + public static JagString usernameInput = JagString.EMPTY; + @OriginalMember(owner = "client!ba", name = "w", descriptor = "I") + public static int inTutorialIsland = 0; + @OriginalMember(owner = "client!ee", name = "b", descriptor = "I") + public static int level; @OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;") public PlayerAppearance appearance; @OriginalMember(owner = "client!e", name = "Mc", descriptor = "Lclient!na;") - public JagString aClass100_364; + public JagString username; @OriginalMember(owner = "client!e", name = "tc", descriptor = "I") public int anInt1649 = -1; @@ -88,6 +92,57 @@ public final class Player extends PathingEntity { } } + @OriginalMember(owner = "client!ci", name = "a", descriptor = "([I[ILclient!e;B[I)V") + public static void method865(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) Player arg2, @OriginalArg(4) int[] arg3) { + for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) { + @Pc(20) int local20 = arg1[local7]; + @Pc(24) int local24 = arg3[local7]; + @Pc(28) int local28 = arg0[local7]; + @Pc(30) int local30 = 0; + while (local24 != 0 && local30 < arg2.aClass147Array3.length) { + if ((local24 & 0x1) != 0) { + if (local20 == -1) { + arg2.aClass147Array3[local30] = null; + } else { + @Pc(68) SeqType local68 = SeqTypeList.get(local20); + @Pc(71) int local71 = local68.anInt5347; + @Pc(76) Class147 local76 = arg2.aClass147Array3[local30]; + if (local76 != null) { + if (local20 == local76.anInt5396) { + if (local71 == 0) { + local76 = arg2.aClass147Array3[local30] = null; + } else if (local71 == 1) { + local76.anInt5400 = 0; + local76.anInt5398 = 1; + local76.anInt5399 = 0; + local76.anInt5408 = local28; + local76.anInt5404 = 0; + SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0); + } else if (local71 == 2) { + local76.anInt5400 = 0; + } + } else if (local68.anInt5355 >= SeqTypeList.get(local76.anInt5396).anInt5355) { + local76 = arg2.aClass147Array3[local30] = null; + } + } + if (local76 == null) { + local76 = arg2.aClass147Array3[local30] = new Class147(); + local76.anInt5396 = local20; + local76.anInt5398 = 1; + local76.anInt5404 = 0; + local76.anInt5408 = local28; + local76.anInt5399 = 0; + local76.anInt5400 = 0; + SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0); + } + } + } + local30++; + local24 >>>= 0x1; + } + } + } + @OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I") @Override public final int getSize() { @@ -101,7 +156,7 @@ public final class Player extends PathingEntity { } @OriginalMember(owner = "client!e", name = "a", descriptor = "(ILclient!wa;)V") - public final void method1262(@OriginalArg(1) Buffer arg0) { + public final void decodeAppearance(@OriginalArg(1) Buffer arg0) { arg0.offset = 0; @Pc(20) int local20 = arg0.g1(); @Pc(22) int local22 = -1; @@ -154,7 +209,7 @@ public final class Player extends PathingEntity { } this.anInt3365 = arg0.g2(); @Pc(236) long local236 = arg0.g8(); - this.aClass100_364 = Base37.decodeLowerCase(local236).method3125(); + this.username = Base37.decodeLowerCase(local236).method3125(); this.anInt1652 = arg0.g1(); if (local37) { this.anInt1671 = arg0.g2(); @@ -171,7 +226,7 @@ public final class Player extends PathingEntity { local134 = this.soundRadius; this.soundRadius = arg0.g1(); if (this.soundRadius == 0) { - Static271.method4597(this); + AreaSoundManager.remove(this); } else { @Pc(309) int local309 = this.anInt1658; @Pc(312) int local312 = this.anInt1654; @@ -262,8 +317,8 @@ public final class Player extends PathingEntity { local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32; this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6); } - if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && Static159.players.length > local245.anInt4057) { - @Pc(395) Player local395 = Static159.players[local245.anInt4057]; + if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && PlayerList.players.length > local245.anInt4057) { + @Pc(395) Player local395 = PlayerList.players[local245.anInt4057]; if (local395 != null) { local291 = local395.xFine / 32 - PlayerList.self.xFine / 32; local302 = local395.zFine / 32 - PlayerList.self.zFine / 32; @@ -276,11 +331,11 @@ public final class Player extends PathingEntity { this.method2687(local76); this.method2685(local76, arg0); local184 = null; - if (!this.aBoolean98 && this.anInt3432 != -1 && this.anInt3399 != -1) { - @Pc(471) SpotAnimType local471 = SpotAnimTypeList.get(this.anInt3432); + if (!this.aBoolean98 && this.spotAnimId != -1 && this.anInt3399 != -1) { + @Pc(471) SpotAnimType local471 = SpotAnimTypeList.get(this.spotAnimId); local184 = local471.method1319(this.anInt3418, this.anInt3399, this.anInt3361); if (local184 != null) { - local184.method4575(0, -this.anInt3394, 0); + local184.method4575(0, -this.spotAnimY, 0); if (local471.aBoolean100) { if (Static101.anInt2640 != 0) { local184.method4574(Static101.anInt2640); @@ -296,10 +351,10 @@ public final class Player extends PathingEntity { } @Pc(515) Model local515 = null; if (!this.aBoolean98 && this.attachment != null) { - if (Static83.loop >= this.anInt3375) { + if (client.loop >= this.anInt3375) { this.attachment = null; } - if (this.anInt3390 <= Static83.loop && this.anInt3375 > Static83.loop) { + if (this.anInt3390 <= client.loop && this.anInt3375 > client.loop) { if (this.attachment instanceof Loc) { local515 = (Model) ((Loc) this.attachment).method1049(); } else { @@ -376,8 +431,8 @@ public final class Player extends PathingEntity { } @OriginalMember(owner = "client!e", name = "e", descriptor = "(I)Lclient!na;") - public final JagString method1264() { - @Pc(2) JagString local2 = this.aClass100_364; + public final JagString getName() { + @Pc(2) JagString local2 = this.username; if (Static103.aClass100Array88 != null) { local2 = JagString.concatenate(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 }); } @@ -393,7 +448,7 @@ public final class Player extends PathingEntity { } @OriginalMember(owner = "client!e", name = "a", descriptor = "(BIZI)V") - public final void method1265(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2) { + public final void teleport(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2) { super.method2683(this.getSize(), arg0, arg2, arg1); } diff --git a/client/src/main/java/PlayerList.java b/client/src/main/java/PlayerList.java index 42b225e..a188125 100644 --- a/client/src/main/java/PlayerList.java +++ b/client/src/main/java/PlayerList.java @@ -1,8 +1,16 @@ import org.openrs2.deob.annotation.OriginalMember; public class PlayerList { + @OriginalMember(owner = "client!ja", name = "l", descriptor = "[Lclient!wa;") + public static final Buffer[] appearanceCache = new Buffer[2048]; + @OriginalMember(owner = "client!mi", name = "S", descriptor = "[Lclient!e;") + public static final Player[] players = new Player[2048]; + @OriginalMember(owner = "client!ib", name = "f", descriptor = "[I") + public static final int[] ids = new int[2048]; @OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;") public static Player self; @OriginalMember(owner = "client!bf", name = "E", descriptor = "I") public static int selfId = -1; + @OriginalMember(owner = "client!vl", name = "j", descriptor = "I") + public static int size = 0; } diff --git a/client/src/main/java/PlayerSkillXpTable.java b/client/src/main/java/PlayerSkillXpTable.java new file mode 100644 index 0000000..e25d47b --- /dev/null +++ b/client/src/main/java/PlayerSkillXpTable.java @@ -0,0 +1,8 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class PlayerSkillXpTable { + @OriginalMember(owner = "client!ud", name = "T", descriptor = "[I") + public static final int[] updatedStats = new int[32]; + @OriginalMember(owner = "client!ha", name = "m", descriptor = "I") + public static int updatedStatsWriterIndex = 0; +} diff --git a/client/src/main/java/Protocol.java b/client/src/main/java/Protocol.java index b4b1e75..06b2d07 100644 --- a/client/src/main/java/Protocol.java +++ b/client/src/main/java/Protocol.java @@ -2,6 +2,8 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; +import java.io.IOException; + public class Protocol { @OriginalMember(owner = "client!eg", name = "e", descriptor = "Lclient!i;") public static final Packet inboundBuffer = new Packet(65536); @@ -9,6 +11,12 @@ public class Protocol { public static final Buffer chatBuffer = new Buffer(new byte[5000]); @OriginalMember(owner = "client!ag", name = "P", descriptor = "Lclient!i;") public static final Packet outboundBuffer = new Packet(5000); + @OriginalMember(owner = "client!eb", name = "p", descriptor = "[I") + public static final int[] removedIds = new int[1000]; + @OriginalMember(owner = "client!dh", name = "d", descriptor = "[I") + public static final int[] extendedIds = new int[2048]; + @OriginalMember(owner = "client!ta", name = "z", descriptor = "[I") + public static final int[] PACKET_LENGTHS = new int[] { -1, 0, 8, 0, 2, 0, 0, 0, 0, 12, 0, 1, 0, 3, 7, 0, 15, 6, 0, 0, 4, 7, -2, -1, 2, 0, 2, 8, 0, 0, 0, 0, -2, 5, 0, 0, 8, 3, 6, 0, 0, 0, -1, 0, -1, 0, 0, 6, -2, 0, 12, 0, 0, 0, -1, -2, 10, 0, 0, 0, 3, 0, -1, 0, 0, 5, 6, 0, 0, 8, -1, -1, 0, 8, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 6, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, -2, 0, 0, 0, 0, 0, 12, 2, 0, -2, -2, 20, 0, 0, 10, 0, 15, 0, -1, 0, 8, -2, 0, 0, 0, 8, 0, 12, 0, 0, 7, 0, 0, 0, 0, 0, -1, -1, 0, 4, 5, 0, 0, 0, 6, 0, 0, 0, 0, 8, 9, 0, 0, 0, 2, -1, 0, -2, 0, 4, 14, 0, 0, 0, 24, 0, -2, 5, 0, 0, 0, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 2, 1, 0, 0, 2, -1, 1, 0, 0, 0, 0, 14, 0, 0, 0, 0, 10, 5, 0, 0, 0, 0, 0, -2, 0, 0, 9, 0, 0, 8, 0, 0, 0, 0, -2, 6, 0, 0, 0, -2, 0, 3, 0, 1, 7, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 3, 0, 0 }; @OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;") public static BufferedSocket socket; @OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;") @@ -19,6 +27,10 @@ public class Protocol { public static int opcode = 0; @OriginalMember(owner = "client!sc", name = "o", descriptor = "I") public static int length = 0; + @OriginalMember(owner = "client!jb", name = "m", descriptor = "I") + public static int extendedCount = 0; + @OriginalMember(owner = "client!tg", name = "h", descriptor = "I") + public static int removedCount = 0; @OriginalMember(owner = "client!g", name = "a", descriptor = "(IZ)V") public static void readRebuildPacket(@OriginalArg(1) boolean arg0) { @@ -90,21 +102,21 @@ public class Protocol { local20 = inboundBuffer.g2leadd(); local26 = inboundBuffer.g1ssub(); local31 = inboundBuffer.g2leadd(); - inboundBuffer.method2233(); + inboundBuffer.accessBits(); @Pc(391) int local391; for (local60 = 0; local60 < 4; local60++) { for (local64 = 0; local64 < 13; local64++) { for (local391 = 0; local391 < 13; local391++) { - local138 = inboundBuffer.method2238(1); + local138 = inboundBuffer.gBits(1); if (local138 == 1) { - Static187.anIntArrayArrayArray18[local60][local64][local391] = inboundBuffer.method2238(26); + Static187.anIntArrayArrayArray18[local60][local64][local391] = inboundBuffer.gBits(26); } else { Static187.anIntArrayArrayArray18[local60][local64][local391] = -1; } } } } - inboundBuffer.method2244(); + inboundBuffer.accessBytes(); local60 = (length - inboundBuffer.offset) / 16; Static72.regionsXteaKeys = new int[local60][4]; for (local64 = 0; local64 < local60; local64++) { @@ -156,4 +168,1912 @@ public class Protocol { } Static127.method2463(local26, local64, local20, local31, false, local13); } + + @OriginalMember(owner = "client!gk", name = "a", descriptor = "(IIBLclient!e;)V") + public static void readExtendedPlayerInfo(@OriginalArg(0) int flags, @OriginalArg(1) int id, @OriginalArg(3) Player player) { + @Pc(13) int int1; + @Pc(17) int int2; + @Pc(24) int local24; + if ((flags & 0x80) != 0) { + int1 = inboundBuffer.g2le(); + int2 = inboundBuffer.g1(); + @Pc(21) int local21 = inboundBuffer.g1(); + local24 = inboundBuffer.offset; + @Pc(35) boolean local35 = (int1 & 0x8000) != 0; + if (player.username != null && player.appearance != null) { + @Pc(48) long local48 = player.username.encode37(); + @Pc(50) boolean ignore = false; + if (int2 <= 1) { + if (!local35 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) { + ignore = true; + } else { + for (@Pc(69) int local69 = 0; local69 < Static35.anInt1093; local69++) { + if (IgnoreList.encodedUsernames[local69] == local48) { + ignore = true; + break; + } + } + } + } + if (!ignore && Player.inTutorialIsland == 0) { + chatBuffer.offset = 0; + inboundBuffer.gBytesRev(local21, chatBuffer.data); + chatBuffer.offset = 0; + @Pc(106) int local106 = -1; + @Pc(127) JagString message; + if (local35) { + @Pc(112) QuickChatPhrase phrase = Static264.method3568(chatBuffer); + int1 &= 0x7FFF; + local106 = phrase.id; + message = phrase.type.decodeMessage(chatBuffer); + } else { + message = Static218.escape(Static65.formatChatMessage(chatBuffer).encodeMessage()); + } + player.chatMessage = message.trim(); + player.chatEffect = int1 & 0xFF; + player.chatLoops = 150; + player.chatColor = int1 >> 8; + if (int2 == 2) { + Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[] { Static44.aClass100_336, player.getName() })); + } else if (int2 == 1) { + Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[] { Static65.aClass100_435, player.getName() })); + } else { + Chat.add(local106, local35 ? 17 : 2, message, null, player.getName()); + } + } + } + inboundBuffer.offset = local24 + local21; + } + if ((flags & 0x1) != 0) { + int1 = inboundBuffer.gSmart1or2(); + int2 = inboundBuffer.g1add(); + player.addHit(int2, client.loop, int1); + player.hitpointsBarVisibleUntil = client.loop + 300; + player.hitpointsBar = inboundBuffer.g1ssub(); + } + if ((flags & 0x8) != 0) { + int1 = inboundBuffer.g2(); + if (int1 == 65535) { + int1 = -1; + } + int2 = inboundBuffer.g1(); + Player.animate(int2, int1, player); + } + if ((flags & 0x4) != 0) { + int1 = inboundBuffer.g1add(); + @Pc(309) byte[] bytes = new byte[int1]; + @Pc(314) Buffer buffer = new Buffer(bytes); + inboundBuffer.gBytes(int1, bytes); + PlayerList.appearanceCache[id] = buffer; + player.decodeAppearance(buffer); + } + if ((flags & 0x2) != 0) { + player.faceEntity = inboundBuffer.g2sub(); + if (player.faceEntity == 65535) { + player.faceEntity = -1; + } + } + if ((flags & 0x400) != 0) { + player.anInt3380 = inboundBuffer.p1neg(); + player.anInt3428 = inboundBuffer.g1(); + player.anInt3416 = inboundBuffer.g1add(); + player.anInt3392 = inboundBuffer.g1(); + player.anInt3395 = inboundBuffer.g2le() + client.loop; + player.anInt3386 = inboundBuffer.g2le() + client.loop; + player.anInt3431 = inboundBuffer.p1neg(); + player.movementQueueSize = 1; + player.anInt3405 = 0; + } + if ((flags & 0x20) != 0) { + player.chatMessage = inboundBuffer.gjstr(); + if (player.chatMessage.charAt(0) == 126) { + player.chatMessage = player.chatMessage.substring(1); + Chat.add(player.getName(), 2, player.chatMessage); + } else if (player == PlayerList.self) { + Chat.add(player.getName(), 2, player.chatMessage); + } + player.chatEffect = 0; + player.chatColor = 0; + player.chatLoops = 150; + } + if ((flags & 0x200) != 0) { + int1 = inboundBuffer.gSmart1or2(); + int2 = inboundBuffer.g1ssub(); + player.addHit(int2, client.loop, int1); + } + if ((flags & 0x800) != 0) { + int1 = inboundBuffer.p1neg(); + @Pc(502) int[] seqIds = new int[int1]; + @Pc(505) int[] delays = new int[int1]; + @Pc(508) int[] slotMasks = new int[int1]; + for (@Pc(510) int i = 0; i < int1; i++) { + @Pc(521) int seqId = inboundBuffer.g2le(); + if (seqId == 65535) { + seqId = -1; + } + seqIds[i] = seqId; + delays[i] = inboundBuffer.g1add(); + slotMasks[i] = inboundBuffer.g2(); + } + Player.method865(delays, seqIds, player, slotMasks); + } + if ((flags & 0x100) != 0) { + int1 = inboundBuffer.g2le(); + if (int1 == 65535) { + int1 = -1; + } + int2 = inboundBuffer.p4rme(); + @Pc(573) boolean local573 = true; + if (int1 != -1 && player.spotAnimId != -1 && SeqTypeList.get(SpotAnimTypeList.get(int1).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(player.spotAnimId).seqId).anInt5355) { + local573 = false; + } + if (local573) { + player.spotAnimStart = (int2 & 0xFFFF) + client.loop; + player.anInt3361 = 0; + player.anInt3399 = 0; + player.spotAnimId = int1; + if (player.spotAnimStart > client.loop) { + player.anInt3399 = -1; + } + player.spotAnimY = int2 >> 16; + player.anInt3418 = 1; + if (player.spotAnimId != -1 && client.loop == player.spotAnimStart) { + local24 = SpotAnimTypeList.get(player.spotAnimId).seqId; + if (local24 != -1) { + @Pc(663) SeqType local663 = SeqTypeList.get(local24); + if (local663 != null && local663.frames != null) { + SoundPlayer.playSeqSound(player.zFine, local663, player.xFine, player == PlayerList.self, 0); + } + } + } + } + } + if ((flags & 0x40) != 0) { + player.faceX = inboundBuffer.g2(); + player.faceY = inboundBuffer.g2leadd(); + } + } + + @OriginalMember(owner = "client!fb", name = "b", descriptor = "(B)V") + public static void readPlayerInfoPacket() { + extendedCount = 0; + removedCount = 0; + readSelfPlayerInfo(); + readPlayerInfo(); + readNewPlayerInfo(); + readExtendedPlayerInfo(); + @Pc(23) int i; + for (i = 0; i < removedCount; i++) { + @Pc(30) int local30 = removedIds[i]; + if (client.loop != PlayerList.players[local30].lastSeenLoop) { + if (PlayerList.players[local30].soundRadius > 0) { + AreaSoundManager.remove(PlayerList.players[local30]); + } + PlayerList.players[local30] = null; + } + } + if (length != inboundBuffer.offset) { + throw new RuntimeException("gpp1 pos:" + inboundBuffer.offset + " psize:" + length); + } + for (i = 0; i < PlayerList.size; i++) { + if (PlayerList.players[PlayerList.ids[i]] == null) { + throw new RuntimeException("gpp2 pos:" + i + " size:" + PlayerList.size); + } + } + } + + @OriginalMember(owner = "client!bg", name = "a", descriptor = "(B)V") + public static void readSelfPlayerInfo() { + inboundBuffer.accessBits(); + @Pc(11) int upated = inboundBuffer.gBits(1); + if (upated == 0) { + return; + } + @Pc(23) int type = inboundBuffer.gBits(2); + if (type == 0) { + extendedIds[extendedCount++] = 2047; + return; + } + @Pc(54) int local54; + @Pc(64) int local64; + if (type == 1) { + local54 = inboundBuffer.gBits(3); + PlayerList.self.move(1, local54); + local64 = inboundBuffer.gBits(1); + if (local64 == 1) { + extendedIds[extendedCount++] = 2047; + } + } else if (type == 2) { + if (inboundBuffer.gBits(1) == 1) { + local54 = inboundBuffer.gBits(3); + PlayerList.self.move(2, local54); + local64 = inboundBuffer.gBits(3); + PlayerList.self.move(2, local64); + } else { + local54 = inboundBuffer.gBits(3); + PlayerList.self.move(0, local54); + } + local54 = inboundBuffer.gBits(1); + if (local54 == 1) { + extendedIds[extendedCount++] = 2047; + } + } else if (type == 3) { + local54 = inboundBuffer.gBits(7); + local64 = inboundBuffer.gBits(1); + Player.level = inboundBuffer.gBits(2); + @Pc(163) int local163 = inboundBuffer.gBits(1); + if (local163 == 1) { + extendedIds[extendedCount++] = 2047; + } + @Pc(181) int x = inboundBuffer.gBits(7); + PlayerList.self.teleport(x, local64 == 1, local54); + } + } + + @OriginalMember(owner = "client!dc", name = "b", descriptor = "(Z)V") + public static void readPlayerInfo() { + @Pc(6) int local6 = inboundBuffer.gBits(8); + @Pc(20) int local20; + if (PlayerList.size > local6) { + for (local20 = local6; local20 < PlayerList.size; local20++) { + removedIds[removedCount++] = PlayerList.ids[local20]; + } + } + if (local6 > PlayerList.size) { + throw new RuntimeException("gppov1"); + } + PlayerList.size = 0; + for (local20 = 0; local20 < local6; local20++) { + @Pc(75) int local75 = PlayerList.ids[local20]; + @Pc(79) Player local79 = PlayerList.players[local75]; + @Pc(84) int local84 = inboundBuffer.gBits(1); + if (local84 == 0) { + PlayerList.ids[PlayerList.size++] = local75; + local79.lastSeenLoop = client.loop; + } else { + @Pc(107) int local107 = inboundBuffer.gBits(2); + if (local107 == 0) { + PlayerList.ids[PlayerList.size++] = local75; + local79.lastSeenLoop = client.loop; + extendedIds[extendedCount++] = local75; + } else { + @Pc(153) int local153; + @Pc(163) int local163; + if (local107 == 1) { + PlayerList.ids[PlayerList.size++] = local75; + local79.lastSeenLoop = client.loop; + local153 = inboundBuffer.gBits(3); + local79.move(1, local153); + local163 = inboundBuffer.gBits(1); + if (local163 == 1) { + extendedIds[extendedCount++] = local75; + } + } else if (local107 == 2) { + PlayerList.ids[PlayerList.size++] = local75; + local79.lastSeenLoop = client.loop; + if (inboundBuffer.gBits(1) == 1) { + local153 = inboundBuffer.gBits(3); + local79.move(2, local153); + local163 = inboundBuffer.gBits(3); + local79.move(2, local163); + } else { + local153 = inboundBuffer.gBits(3); + local79.move(0, local153); + } + local153 = inboundBuffer.gBits(1); + if (local153 == 1) { + extendedIds[extendedCount++] = local75; + } + } else if (local107 == 3) { + removedIds[removedCount++] = local75; + } + } + } + } + } + + @OriginalMember(owner = "client!se", name = "a", descriptor = "(I)V") + public static void readNewPlayerInfo() { + while (true) { + if (inboundBuffer.method2241(length) >= 11) { + @Pc(20) int local20 = inboundBuffer.gBits(11); + if (local20 != 2047) { + @Pc(27) boolean local27 = false; + if (PlayerList.players[local20] == null) { + PlayerList.players[local20] = new Player(); + local27 = true; + if (PlayerList.appearanceCache[local20] != null) { + PlayerList.players[local20].decodeAppearance(PlayerList.appearanceCache[local20]); + } + } + PlayerList.ids[PlayerList.size++] = local20; + @Pc(65) Player local65 = PlayerList.players[local20]; + local65.lastSeenLoop = client.loop; + @Pc(73) int local73 = inboundBuffer.gBits(1); + if (local73 == 1) { + extendedIds[extendedCount++] = local20; + } + @Pc(92) int local92 = inboundBuffer.gBits(5); + @Pc(99) int local99 = Static56.anIntArray141[inboundBuffer.gBits(3)]; + if (local92 > 15) { + local92 -= 32; + } + if (local27) { + local65.anInt3400 = local65.anInt3381 = local99; + } + @Pc(116) int local116 = inboundBuffer.gBits(1); + @Pc(121) int local121 = inboundBuffer.gBits(5); + if (local121 > 15) { + local121 -= 32; + } + local65.teleport(local92 + PlayerList.self.movementQueueX[0], local116 == 1, PlayerList.self.movementQueueZ[0] + local121); + continue; + } + } + inboundBuffer.accessBytes(); + return; + } + } + + @OriginalMember(owner = "client!tm", name = "a", descriptor = "(I)V") + public static void readExtendedPlayerInfo() { + for (@Pc(7) int i = 0; i < extendedCount; i++) { + @Pc(31) int id = extendedIds[i]; + @Pc(35) Player player = PlayerList.players[id]; + @Pc(39) int flags = inboundBuffer.g1(); + if ((flags & 0x10) != 0) { + flags += inboundBuffer.g1() << 8; + } + readExtendedPlayerInfo(flags, id, player); + } + } + + @OriginalMember(owner = "client!ac", name = "a", descriptor = "(B)Z") + public static boolean readPacketInternal() throws IOException { + if (socket == null) { + return false; + } + @Pc(14) int available = socket.available(); + if (available == 0) { + return false; + } + if (opcode == -1) { + available--; + socket.read(0, 1, inboundBuffer.data); + inboundBuffer.offset = 0; + opcode = inboundBuffer.g1isaac(); + length = PACKET_LENGTHS[opcode]; + } + if (length == -1) { + if (available <= 0) { + return false; + } + socket.read(0, 1, inboundBuffer.data); + available--; + length = inboundBuffer.data[0] & 0xFF; + } + if (length == -2) { + if (available <= 1) { + return false; + } + available -= 2; + socket.read(0, 2, inboundBuffer.data); + inboundBuffer.offset = 0; + length = inboundBuffer.g2(); + } + if (length > available) { + return false; + } + inboundBuffer.offset = 0; + socket.read(0, length, inboundBuffer.data); + Static49.opcode4 = Static5.opcode3; + Static5.opcode3 = Static230.opcode2; + Static230.opcode2 = opcode; + Static201.anInt1862 = 0; + @Pc(133) int local133; + if (opcode == 60) { + local133 = inboundBuffer.g2sub(); + @Pc(137) byte local137 = inboundBuffer.g1neg(); + Static170.method2575(local137, local133); + opcode = -1; + return true; + } + @Pc(171) int local171; + @Pc(156) JagString local156; + if (opcode == 115) { + local133 = inboundBuffer.g2(); + local156 = inboundBuffer.gjstr(); + @Pc(163) Object[] local163 = new Object[local156.length() + 1]; + for (local171 = local156.length() - 1; local171 >= 0; local171--) { + if (local156.charAt(local171) == 115) { + local163[local171 + 1] = inboundBuffer.gjstr(); + } else { + local163[local171 + 1] = Integer.valueOf(inboundBuffer.g4()); + } + } + local163[0] = Integer.valueOf(inboundBuffer.g4()); + if (Static248.method3288(local133)) { + @Pc(226) HookRequest local226 = new HookRequest(); + local226.arguments = local163; + Static82.method1767(local226); + } + opcode = -1; + return true; + } + @Pc(275) long local275; + @Pc(262) boolean local262; + @Pc(277) int local277; + @Pc(506) JagString local506; + if (opcode == 70) { + @Pc(245) JagString local245 = inboundBuffer.gjstr(); + if (local245.method3130(Static196.aClass100_863)) { + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); + local275 = local156.encode37(); + local262 = false; + for (local277 = 0; local277 < Static35.anInt1093; local277++) { + if (IgnoreList.encodedUsernames[local277] == local275) { + local262 = true; + break; + } + } + if (!local262 && Player.inTutorialIsland == 0) { + Chat.add(local156, 4, LocalizedText.TRADEREQ); + } + } else if (local245.method3130(Static61.aClass100_423)) { + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); + local275 = local156.encode37(); + local262 = false; + for (local277 = 0; local277 < Static35.anInt1093; local277++) { + if (IgnoreList.encodedUsernames[local277] == local275) { + local262 = true; + break; + } + } + if (!local262 && Player.inTutorialIsland == 0) { + local506 = local245.substring(local245.length() - 9, local245.indexOf(Static264.aClass100_875) + 1); + Chat.add(local156, 8, local506); + } + } else if (local245.method3130(Static191.aClass100_845)) { + local262 = false; + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); + local275 = local156.encode37(); + for (local277 = 0; local277 < Static35.anInt1093; local277++) { + if (local275 == IgnoreList.encodedUsernames[local277]) { + local262 = true; + break; + } + } + if (!local262 && Player.inTutorialIsland == 0) { + Chat.add(local156, 10, JagString.EMPTY); + } + } else if (local245.method3130(Static141.aClass100_664)) { + local156 = local245.substring(local245.indexOf(Static141.aClass100_664), 0); + Chat.add(JagString.EMPTY, 11, local156); + } else if (local245.method3130(Static138.aClass100_654)) { + local156 = local245.substring(local245.indexOf(Static138.aClass100_654), 0); + if (Player.inTutorialIsland == 0) { + Chat.add(JagString.EMPTY, 12, local156); + } + } else if (local245.method3130(Static244.aClass100_1014)) { + local156 = local245.substring(local245.indexOf(Static244.aClass100_1014), 0); + if (Player.inTutorialIsland == 0) { + Chat.add(JagString.EMPTY, 13, local156); + } + } else if (local245.method3130(Static56.aClass100_379)) { + local262 = false; + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); + local275 = local156.encode37(); + for (local277 = 0; local277 < Static35.anInt1093; local277++) { + if (local275 == IgnoreList.encodedUsernames[local277]) { + local262 = true; + break; + } + } + if (!local262 && Player.inTutorialIsland == 0) { + Chat.add(local156, 14, JagString.EMPTY); + } + } else if (local245.method3130(Static112.aClass100_574)) { + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); + local262 = false; + local275 = local156.encode37(); + for (local277 = 0; local277 < Static35.anInt1093; local277++) { + if (IgnoreList.encodedUsernames[local277] == local275) { + local262 = true; + break; + } + } + if (!local262 && Player.inTutorialIsland == 0) { + Chat.add(local156, 15, JagString.EMPTY); + } + } else if (local245.method3130(Static217.aClass100_916)) { + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); + local275 = local156.encode37(); + local262 = false; + for (local277 = 0; local277 < Static35.anInt1093; local277++) { + if (local275 == IgnoreList.encodedUsernames[local277]) { + local262 = true; + break; + } + } + if (!local262 && Player.inTutorialIsland == 0) { + Chat.add(local156, 16, JagString.EMPTY); + } + } else if (local245.method3130(Static164.aClass100_770)) { + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); + local262 = false; + local275 = local156.encode37(); + for (local277 = 0; local277 < Static35.anInt1093; local277++) { + if (IgnoreList.encodedUsernames[local277] == local275) { + local262 = true; + break; + } + } + if (!local262 && Player.inTutorialIsland == 0) { + local506 = local245.substring(local245.length() - 9, local245.indexOf(Static264.aClass100_875) + 1); + Chat.add(local156, 21, local506); + } + } else { + Chat.add(JagString.EMPTY, 0, local245); + } + opcode = -1; + return true; + } + @Pc(786) int local786; + @Pc(790) JagString local790; + if (opcode == 123) { + local133 = inboundBuffer.g2le(); + local786 = inboundBuffer.g2sub(); + local790 = inboundBuffer.gjstr(); + if (Static248.method3288(local786)) { + Static193.method3498(local790, local133); + } + opcode = -1; + return true; + } else if (opcode == 230) { + Static180.anInt4264 = inboundBuffer.g1add(); + Static115.anInt2940 = inboundBuffer.g1ssub(); + while (length > inboundBuffer.offset) { + opcode = inboundBuffer.g1(); + Static75.method1634(); + } + opcode = -1; + return true; + } else if (opcode == 153) { + opcode = -1; + Static115.anInt2939 = 0; + return true; + } else { + @Pc(864) int local864; + if (opcode == 220) { + local133 = inboundBuffer.p4rme(); + local786 = inboundBuffer.g2le(); + local864 = inboundBuffer.g2(); + if (Static248.method3288(local864)) { + Static229.method3938(local786, local133); + } + opcode = -1; + return true; + } + @Pc(884) long local884; + @Pc(908) int local908; + @Pc(916) int local916; + @Pc(899) long local899; + @Pc(904) long local904; + if (opcode == 81) { + local884 = inboundBuffer.g8(); + inboundBuffer.g1s(); + local275 = inboundBuffer.g8(); + local899 = inboundBuffer.g2(); + local904 = inboundBuffer.g3(); + local908 = inboundBuffer.g1(); + @Pc(910) boolean local910 = false; + local916 = inboundBuffer.g2(); + @Pc(922) long local922 = (local899 << 32) + local904; + @Pc(924) int local924 = 0; + label1320: while (true) { + if (local924 < 100) { + if (local922 != Static233.aLongArray9[local924]) { + local924++; + continue; + } + local910 = true; + break; + } + if (local908 <= 1) { + for (local924 = 0; local924 < Static35.anInt1093; local924++) { + if (IgnoreList.encodedUsernames[local924] == local884) { + local910 = true; + break label1320; + } + } + } + break; + } + if (!local910 && Player.inTutorialIsland == 0) { + Static233.aLongArray9[Static251.anInt5447] = local922; + Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; + @Pc(999) JagString local999 = QuickChatPhraseTypeList.get(local916).decodeMessage(inboundBuffer); + if (local908 == 2 || local908 == 3) { + Chat.add(local916, 20, local999, Base37.decodeLowerCase(local275).method3125(), JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() })); + } else if (local908 == 1) { + Chat.add(local916, 20, local999, Base37.decodeLowerCase(local275).method3125(), JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() })); + } else { + Chat.add(local916, 20, local999, Base37.decodeLowerCase(local275).method3125(), Base37.decodeLowerCase(local884).method3125()); + } + } + opcode = -1; + return true; + } + @Pc(1146) int local1146; + @Pc(1160) int local1160; + @Pc(1245) boolean local1245; + if (opcode == 55) { + ClanChat.transmitAt = InterfaceList.transmitTimer; + local884 = inboundBuffer.g8(); + if (local884 == 0L) { + Static270.aClass100_1094 = null; + opcode = -1; + Static15.aClass100_87 = null; + Static199.aClass3_Sub22Array1 = null; + Static214.anInt5577 = 0; + return true; + } + local275 = inboundBuffer.g8(); + Static15.aClass100_87 = Base37.decodeLowerCase(local275); + Static270.aClass100_1094 = Base37.decodeLowerCase(local884); + Static50.aByte6 = inboundBuffer.g1s(); + local1146 = inboundBuffer.g1(); + if (local1146 == 255) { + opcode = -1; + return true; + } + Static214.anInt5577 = local1146; + @Pc(1158) Class3_Sub22[] local1158 = new Class3_Sub22[100]; + for (local1160 = 0; local1160 < Static214.anInt5577; local1160++) { + local1158[local1160] = new Class3_Sub22(); + local1158[local1160].key = inboundBuffer.g8(); + local1158[local1160].aClass100_636 = Base37.decodeLowerCase(local1158[local1160].key); + local1158[local1160].anInt3340 = inboundBuffer.g2(); + local1158[local1160].aByte9 = inboundBuffer.g1s(); + local1158[local1160].aClass100_635 = inboundBuffer.gjstr(); + if (Static101.aLong98 == local1158[local1160].key) { + Static160.aByte14 = local1158[local1160].aByte9; + } + } + local908 = Static214.anInt5577; + while (local908 > 0) { + local1245 = true; + local908--; + for (local916 = 0; local916 < local908; local916++) { + if (local1158[local916].aClass100_636.method3139(local1158[local916 + 1].aClass100_636) > 0) { + local1245 = false; + @Pc(1279) Class3_Sub22 local1279 = local1158[local916]; + local1158[local916] = local1158[local916 + 1]; + local1158[local916 + 1] = local1279; + } + } + if (local1245) { + break; + } + } + Static199.aClass3_Sub22Array1 = local1158; + opcode = -1; + return true; + } else if (opcode == 164) { + local133 = inboundBuffer.g4rme(); + Static232.aClass212_5 = GameShell.signLink.getReverseDns(local133); + opcode = -1; + return true; + } else if (opcode == 225) { + readPlayerInfoPacket(); + opcode = -1; + return true; + } else if (opcode == 48) { + local133 = inboundBuffer.g2(); + local156 = inboundBuffer.gjstr(); + local864 = inboundBuffer.g2leadd(); + if (Static248.method3288(local133)) { + Static193.method3498(local156, local864); + } + opcode = -1; + return true; + } else if (opcode == 232) { + Static59.anInt1812 = inboundBuffer.g1(); + Static49.anInt1459 = inboundBuffer.g1(); + Static84.anInt2256 = inboundBuffer.g1(); + opcode = -1; + return true; + } else { + @Pc(1409) JagString local1409; + if (opcode == 44) { + local133 = inboundBuffer.g2leadd(); + if (local133 == 65535) { + local133 = -1; + } + local786 = inboundBuffer.g1(); + local864 = inboundBuffer.g1(); + local1409 = inboundBuffer.gjstr(); + if (local864 >= 1 && local864 <= 8) { + if (local1409.equalsIgnoreCase(Static92.aClass100_510)) { + local1409 = null; + } + Static160.aClass100Array121[local864 - 1] = local1409; + Static191.anIntArray388[local864 - 1] = local133; + Static1.aBooleanArray1[local864 - 1] = local786 == 0; + } + opcode = -1; + return true; + } else if (opcode == 226) { + local133 = inboundBuffer.g4(); + local786 = inboundBuffer.g2sub(); + Static170.method2575(local133, local786); + opcode = -1; + return true; + } else if (opcode == 21) { + local133 = inboundBuffer.p1neg(); + local786 = inboundBuffer.g2(); + local864 = inboundBuffer.g4me(); + if (Static248.method3288(local786)) { + Static153.method2905(local864, local133); + } + opcode = -1; + return true; + } else if (opcode == 145) { + local133 = inboundBuffer.g2leadd(); + local786 = inboundBuffer.g1add(); + local864 = inboundBuffer.g2leadd(); + if (Static248.method3288(local864)) { + if (local786 == 2) { + Static5.method34(); + } + InterfaceList.topLevelInterface = local133; + Static81.method1753(local133); + Static210.method3712(false); + Static74.method1626(InterfaceList.topLevelInterface); + for (local171 = 0; local171 < 100; local171++) { + Static186.aBooleanArray100[local171] = true; + } + } + opcode = -1; + return true; + } else if (opcode == 69) { + local133 = inboundBuffer.g2leadd(); + local786 = inboundBuffer.g4(); + local864 = inboundBuffer.g2sub(); + if (Static248.method3288(local133)) { + Static132.method2606(local864, local786); + } + opcode = -1; + return true; + } else if (opcode == 141) { + local884 = inboundBuffer.g8(); + local864 = inboundBuffer.g2(); + local1409 = QuickChatPhraseTypeList.get(local864).decodeMessage(inboundBuffer); + Chat.add(local864, 19, local1409, null, Base37.decodeLowerCase(local884).method3125()); + opcode = -1; + return true; + } else if (opcode == 169) { + Static271.method4598(inboundBuffer); + opcode = -1; + return true; + } else if (opcode == 89) { + Static8.method121(); + InterfaceList.method2245(); + VarpDomain.updatedVarpsWriterIndex += 32; + opcode = -1; + return true; + } else if (opcode == 125) { + local133 = inboundBuffer.g2(); + local786 = inboundBuffer.g1(); + local864 = inboundBuffer.g1(); + local171 = inboundBuffer.g2(); + local1146 = inboundBuffer.g1(); + local277 = inboundBuffer.g1(); + if (Static248.method3288(local133)) { + Static260.method3849(local171, local864, local1146, local786, local277); + } + opcode = -1; + return true; + } else if (opcode == 36) { + local133 = inboundBuffer.p4rme(); + local786 = inboundBuffer.g2les(); + local864 = inboundBuffer.g2sub(); + if (Static248.method3288(local864)) { + Static225.method3893(local133, local786); + } + opcode = -1; + return true; + } else { + @Pc(1814) ServerActiveProperties local1814; + @Pc(1804) ServerActiveProperties local1804; + if (opcode == 9) { + local133 = inboundBuffer.g2leadd(); + local786 = inboundBuffer.g4me(); + local864 = inboundBuffer.g2sub(); + local171 = inboundBuffer.g2le(); + if (local171 == 65535) { + local171 = -1; + } + local1146 = inboundBuffer.g2sub(); + if (local1146 == 65535) { + local1146 = -1; + } + if (Static248.method3288(local864)) { + for (local277 = local1146; local277 <= local171; local277++) { + local904 = (long) local277 + ((long) local786 << 32); + local1804 = (ServerActiveProperties) Static210.aClass133_21.get(local904); + if (local1804 != null) { + local1814 = new ServerActiveProperties(local1804.anInt546, local133); + local1804.unlink(); + } else if (local277 == -1) { + local1814 = new ServerActiveProperties(InterfaceList.getComponent(local786).aClass3_Sub4_1.anInt546, local133); + } else { + local1814 = new ServerActiveProperties(0, local133); + } + Static210.aClass133_21.put(local1814, local904); + } + } + opcode = -1; + return true; + } + @Pc(1986) int local1986; + if (opcode == 56) { + local133 = inboundBuffer.g2(); + local786 = inboundBuffer.g2le(); + local864 = inboundBuffer.g4rme(); + local171 = inboundBuffer.g2leadd(); + if (local864 >> 30 == 0) { + @Pc(1994) SeqType local1994; + if (local864 >> 29 != 0) { + local1146 = local864 & 0xFFFF; + @Pc(1894) Npc local1894 = Static175.npcs[local1146]; + if (local1894 != null) { + if (local171 == 65535) { + local171 = -1; + } + local1245 = true; + if (local171 != -1 && local1894.spotAnimId != -1 && SeqTypeList.get(SpotAnimTypeList.get(local171).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local1894.spotAnimId).seqId).anInt5355) { + local1245 = false; + } + if (local1245) { + local1894.anInt3361 = 0; + local1894.spotAnimId = local171; + local1894.spotAnimStart = client.loop + local133; + local1894.anInt3399 = 0; + if (local1894.spotAnimStart > client.loop) { + local1894.anInt3399 = -1; + } + local1894.spotAnimY = local786; + local1894.anInt3418 = 1; + if (local1894.spotAnimId != -1 && client.loop == local1894.spotAnimStart) { + local1986 = SpotAnimTypeList.get(local1894.spotAnimId).seqId; + if (local1986 != -1) { + local1994 = SeqTypeList.get(local1986); + if (local1994 != null && local1994.frames != null) { + SoundPlayer.playSeqSound(local1894.zFine, local1994, local1894.xFine, false, 0); + } + } + } + } + } + } else if (local864 >> 28 != 0) { + local1146 = local864 & 0xFFFF; + @Pc(2033) Player local2033; + if (PlayerList.selfId == local1146) { + local2033 = PlayerList.self; + } else { + local2033 = PlayerList.players[local1146]; + } + if (local2033 != null) { + if (local171 == 65535) { + local171 = -1; + } + local1245 = true; + if (local171 != -1 && local2033.spotAnimId != -1 && SeqTypeList.get(SpotAnimTypeList.get(local171).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local2033.spotAnimId).seqId).anInt5355) { + local1245 = false; + } + if (local1245) { + local2033.spotAnimStart = local133 + client.loop; + local2033.spotAnimY = local786; + local2033.spotAnimId = local171; + if (local2033.spotAnimId == 65535) { + local2033.spotAnimId = -1; + } + local2033.anInt3418 = 1; + local2033.anInt3361 = 0; + local2033.anInt3399 = 0; + if (local2033.spotAnimStart > client.loop) { + local2033.anInt3399 = -1; + } + if (local2033.spotAnimId != -1 && local2033.spotAnimStart == client.loop) { + local1986 = SpotAnimTypeList.get(local2033.spotAnimId).seqId; + if (local1986 != -1) { + local1994 = SeqTypeList.get(local1986); + if (local1994 != null && local1994.frames != null) { + SoundPlayer.playSeqSound(local2033.zFine, local1994, local2033.xFine, local2033 == PlayerList.self, 0); + } + } + } + } + } + } + } else { + local1146 = local864 >> 28 & 0x3; + local277 = (local864 >> 14 & 0x3FFF) - Static225.originX; + local1160 = (local864 & 0x3FFF) - Static142.originZ; + if (local277 >= 0 && local1160 >= 0 && local277 < 104 && local1160 < 104) { + local1160 = local1160 * 128 + 64; + local277 = local277 * 128 + 64; + @Pc(2241) SpotAnim local2241 = new SpotAnim(local171, local1146, local277, local1160, SceneGraph.getTileHeight(local1146, local277, local1160) - local786, local133, client.loop); + Static99.aClass69_64.addTail(new SpotAnimNode(local2241)); + } + } + opcode = -1; + return true; + } else if (opcode == 207) { + local133 = inboundBuffer.p4rme(); + local786 = inboundBuffer.g2sub(); + local864 = inboundBuffer.g2(); + local171 = inboundBuffer.g2sub(); + if (Static248.method3288(local786)) { + Static190.method3444(local171 + (local864 << 16), local133); + } + opcode = -1; + return true; + } else if (opcode == 38) { + InterfaceList.method2245(); + local133 = inboundBuffer.g1add(); + local786 = inboundBuffer.g4rme(); + local864 = inboundBuffer.g1(); + Static227.anIntArray446[local864] = local786; + Static99.anIntArray240[local864] = local133; + Static141.anIntArray326[local864] = 1; + for (local171 = 0; local171 < 98; local171++) { + if (ObjType.anIntArray213[local171] <= local786) { + Static141.anIntArray326[local864] = local171 + 2; + } + } + PlayerSkillXpTable.updatedStats[PlayerSkillXpTable.updatedStatsWriterIndex++ & 0x1F] = local864; + opcode = -1; + return true; + } else if (opcode == 104 || opcode == 121 || opcode == 97 || opcode == 14 || opcode == 202 || opcode == 135 || opcode == 17 || opcode == 16 || opcode == 240 || opcode == 33 || opcode == 20 || opcode == 195 || opcode == 179) { + Static75.method1634(); + opcode = -1; + return true; + } else if (opcode == 149) { + local133 = inboundBuffer.g2(); + local786 = inboundBuffer.g4(); + if (Static248.method3288(local133)) { + @Pc(2441) Class3_Sub31 local2441 = (Class3_Sub31) Static119.aClass133_9.get((long) local786); + if (local2441 != null) { + Static132.method2605(true, local2441); + } + if (Static39.aClass13_10 != null) { + Static43.redraw(Static39.aClass13_10); + Static39.aClass13_10 = null; + } + } + opcode = -1; + return true; + } else if (opcode == 187) { + local133 = inboundBuffer.g2le(); + local786 = inboundBuffer.g2(); + local864 = inboundBuffer.g2(); + if (Static248.method3288(local786)) { + Camera.yawTarget = local133; + Camera.pitchTarget = local864; + if (Static227.cameraType == 2) { + Static240.cameraPitch = (int)Camera.pitchTarget; + Static184.cameraYaw = (int)Camera.yawTarget; + } + Camera.clampCameraAngle(); + } + opcode = -1; + return true; + } else if (opcode == 132) { + local133 = inboundBuffer.g2(); + local786 = inboundBuffer.g2sub(); + local864 = inboundBuffer.g2leadd(); + local171 = inboundBuffer.g2leadd(); + local1146 = inboundBuffer.g4(); + if (Static248.method3288(local786)) { + Static261.method4505(local864, local1146, local171, local133); + } + opcode = -1; + return true; + } else if (opcode == 112) { + Static115.anInt2940 = inboundBuffer.g1(); + Static180.anInt4264 = inboundBuffer.p1neg(); + for (local133 = Static115.anInt2940; local133 < Static115.anInt2940 + 8; local133++) { + for (local786 = Static180.anInt4264; local786 < Static180.anInt4264 + 8; local786++) { + if (Static159.aClass69ArrayArrayArray1[Player.level][local133][local786] != null) { + Static159.aClass69ArrayArrayArray1[Player.level][local133][local786] = null; + Static220.spawnGroundObject(local786, local133); + } + } + } + for (@Pc(2604) Class3_Sub7 local2604 = (Class3_Sub7) Static26.aClass69_27.method2289(); local2604 != null; local2604 = (Class3_Sub7) Static26.aClass69_27.method2288()) { + if (local2604.anInt928 >= Static115.anInt2940 && Static115.anInt2940 + 8 > local2604.anInt928 && local2604.anInt916 >= Static180.anInt4264 && local2604.anInt916 < Static180.anInt4264 + 8 && local2604.anInt918 == Player.level) { + local2604.anInt924 = 0; + } + } + opcode = -1; + return true; + } else if (opcode == 144) { + local133 = inboundBuffer.p4rme(); + @Pc(2666) Component local2666 = InterfaceList.getComponent(local133); + for (local864 = 0; local864 < local2666.objTypes.length; local864++) { + local2666.objTypes[local864] = -1; + local2666.objTypes[local864] = 0; + } + Static43.redraw(local2666); + opcode = -1; + return true; + } else if (opcode == 130) { + local133 = inboundBuffer.g4me(); + local786 = inboundBuffer.g2leadd(); + local864 = inboundBuffer.g2sub(); + if (local864 == 65535) { + local864 = -1; + } + if (Static248.method3288(local786)) { + Static132.method2607(-1, 1, local133, local864); + } + opcode = -1; + return true; + } else if (opcode == 192) { + Static270.anInt5795 = inboundBuffer.g1(); + opcode = -1; + return true; + } else if (opcode == 13) { + local133 = inboundBuffer.g1ssub(); + local786 = inboundBuffer.g1add(); + local864 = inboundBuffer.g1(); + Player.level = local786 >> 1; + PlayerList.self.teleport(local133, (local786 & 0x1) == 1, local864); + opcode = -1; + return true; + } else { + @Pc(3002) int local3002; + @Pc(3038) JagString local3038; + @Pc(3020) JagString local3020; + if (opcode == 62) { + local884 = inboundBuffer.g8(); + local864 = inboundBuffer.g2(); + local171 = inboundBuffer.g1(); + local262 = true; + if (local884 < 0L) { + local884 &= Long.MAX_VALUE; + local262 = false; + } + local506 = JagString.EMPTY; + if (local864 > 0) { + local506 = inboundBuffer.gjstr(); + } + @Pc(2834) JagString local2834 = Base37.decodeLowerCase(local884).method3125(); + for (local1986 = 0; local1986 < Static9.anInt178; local1986++) { + if (local884 == Static92.aLongArray3[local1986]) { + if (local864 != Static104.anIntArray255[local1986]) { + Static104.anIntArray255[local1986] = local864; + if (local864 > 0) { + Chat.add(JagString.EMPTY, 5, JagString.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGIN})); + } + if (local864 == 0) { + Chat.add(JagString.EMPTY, 5, JagString.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGOUT})); + } + } + Static214.aClass100Array170[local1986] = local506; + Static106.anIntArray258[local1986] = local171; + local2834 = null; + Static3.aBooleanArray135[local1986] = local262; + break; + } + } + if (local2834 != null && Static9.anInt178 < 200) { + Static92.aLongArray3[Static9.anInt178] = local884; + Static122.aClass100Array92[Static9.anInt178] = local2834; + Static104.anIntArray255[Static9.anInt178] = local864; + Static214.aClass100Array170[Static9.anInt178] = local506; + Static106.anIntArray258[Static9.anInt178] = local171; + Static3.aBooleanArray135[Static9.anInt178] = local262; + Static9.anInt178++; + } + FriendsList.transmitAt = InterfaceList.transmitTimer; + local908 = Static9.anInt178; + while (local908 > 0) { + local908--; + @Pc(2961) boolean local2961 = true; + for (local916 = 0; local916 < local908; local916++) { + if (Static104.anIntArray255[local916] != Static125.worldId && Static125.worldId == Static104.anIntArray255[local916 + 1] || Static104.anIntArray255[local916] == 0 && Static104.anIntArray255[local916 + 1] != 0) { + local2961 = false; + local3002 = Static104.anIntArray255[local916]; + Static104.anIntArray255[local916] = Static104.anIntArray255[local916 + 1]; + Static104.anIntArray255[local916 + 1] = local3002; + local3020 = Static214.aClass100Array170[local916]; + Static214.aClass100Array170[local916] = Static214.aClass100Array170[local916 + 1]; + Static214.aClass100Array170[local916 + 1] = local3020; + local3038 = Static122.aClass100Array92[local916]; + Static122.aClass100Array92[local916] = Static122.aClass100Array92[local916 + 1]; + Static122.aClass100Array92[local916 + 1] = local3038; + @Pc(3056) long local3056 = Static92.aLongArray3[local916]; + Static92.aLongArray3[local916] = Static92.aLongArray3[local916 + 1]; + Static92.aLongArray3[local916 + 1] = local3056; + @Pc(3074) int local3074 = Static106.anIntArray258[local916]; + Static106.anIntArray258[local916] = Static106.anIntArray258[local916 + 1]; + Static106.anIntArray258[local916 + 1] = local3074; + @Pc(3092) boolean local3092 = Static3.aBooleanArray135[local916]; + Static3.aBooleanArray135[local916] = Static3.aBooleanArray135[local916 + 1]; + Static3.aBooleanArray135[local916 + 1] = local3092; + } + } + if (local2961) { + break; + } + } + opcode = -1; + return true; + } else if (opcode == 160) { + if (length == 0) { + Static195.aClass100_859 = LocalizedText.WALKHERE; + } else { + Static195.aClass100_859 = inboundBuffer.gjstr(); + } + opcode = -1; + return true; + } else if (opcode == 128) { + for (local133 = 0; local133 < Static7.varps.length; local133++) { + if (Static106.anIntArray257[local133] != Static7.varps[local133]) { + Static7.varps[local133] = Static106.anIntArray257[local133]; + Static85.method1775(local133); + VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = local133; + } + } + opcode = -1; + return true; + } else if (opcode == 154) { + local133 = inboundBuffer.g2(); + local786 = inboundBuffer.g1(); + local864 = inboundBuffer.g1(); + local171 = inboundBuffer.g2(); + local1146 = inboundBuffer.g1(); + local277 = inboundBuffer.g1(); + if (Static248.method3288(local133)) { + Static141.method2722(true, local1146, local171, local277, local864, local786); + } + opcode = -1; + return true; + } else if (opcode == 247) { + local884 = inboundBuffer.g8(); + local275 = inboundBuffer.g2(); + local899 = inboundBuffer.g3(); + local1160 = inboundBuffer.g1(); + local1986 = inboundBuffer.g2(); + @Pc(3263) boolean local3263 = false; + @Pc(3270) long local3270 = (local275 << 32) + local899; + @Pc(3272) int local3272 = 0; + label1402: while (true) { + if (local3272 < 100) { + if (local3270 != Static233.aLongArray9[local3272]) { + local3272++; + continue; + } + local3263 = true; + break; + } + if (local1160 <= 1) { + for (local3272 = 0; local3272 < Static35.anInt1093; local3272++) { + if (local884 == IgnoreList.encodedUsernames[local3272]) { + local3263 = true; + break label1402; + } + } + } + break; + } + if (!local3263 && Player.inTutorialIsland == 0) { + Static233.aLongArray9[Static251.anInt5447] = local3270; + Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; + local3020 = QuickChatPhraseTypeList.get(local1986).decodeMessage(inboundBuffer); + if (local1160 == 2) { + Chat.add(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() })); + } else if (local1160 == 1) { + Chat.add(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() })); + } else { + Chat.add(local1986, 18, local3020, null, Base37.decodeLowerCase(local884).method3125()); + } + } + opcode = -1; + return true; + } else { + @Pc(3456) Class3_Sub31 local3456; + if (opcode == 176) { + local133 = inboundBuffer.g4rme(); + local786 = inboundBuffer.g2sub(); + local864 = inboundBuffer.g4rme(); + if (Static248.method3288(local786)) { + @Pc(3449) Class3_Sub31 local3449 = (Class3_Sub31) Static119.aClass133_9.get((long) local133); + local3456 = (Class3_Sub31) Static119.aClass133_9.get((long) local864); + if (local3456 != null) { + Static132.method2605(local3449 == null || local3456.anInt5878 != local3449.anInt5878, local3456); + } + if (local3449 != null) { + local3449.unlink(); + Static119.aClass133_9.put(local3449, (long) local864); + } + @Pc(3490) Component local3490 = InterfaceList.getComponent(local133); + if (local3490 != null) { + Static43.redraw(local3490); + } + local3490 = InterfaceList.getComponent(local864); + if (local3490 != null) { + Static43.redraw(local3490); + Static17.method531(local3490, true); + } + if (InterfaceList.topLevelInterface != -1) { + Static54.method1304(1, InterfaceList.topLevelInterface); + } + } + opcode = -1; + return true; + } else if (opcode == 27) { + local133 = inboundBuffer.g2(); + local786 = inboundBuffer.g1(); + local864 = inboundBuffer.g1(); + local171 = inboundBuffer.g1(); + local1146 = inboundBuffer.g1(); + local277 = inboundBuffer.g2(); + if (Static248.method3288(local133)) { + Static176.aBooleanArray95[local786] = true; + Static222.anIntArray437[local786] = local864; + Static276.anIntArray564[local786] = local171; + Static202.anIntArray424[local786] = local1146; + Static31.anIntArray76[local786] = local277; + } + opcode = -1; + return true; + } else if (opcode == 2) { + local133 = inboundBuffer.g4rme(); + local786 = inboundBuffer.g2sub(); + local864 = inboundBuffer.g2leadd(); + if (Static248.method3288(local786)) { + Static136.method2649(local864, local133); + } + opcode = -1; + return true; + } else if (opcode == 85) { + Static60.rebootTimer = inboundBuffer.g2() * 30; + opcode = -1; + InterfaceList.miscTransmitAt = InterfaceList.transmitTimer; + return true; + } else if (opcode == 114) { + Static202.method3654(GameShell.signLink, inboundBuffer, length); + opcode = -1; + return true; + } else if (opcode == 65) { + local133 = inboundBuffer.g2le(); + local786 = inboundBuffer.p1neg(); + local864 = inboundBuffer.g2leadd(); + if (Static248.method3288(local133)) { + Static132.method2606(local864, local786); + } + opcode = -1; + return true; + } else if (opcode == 234) { + InterfaceList.method2245(); + Static12.anInt400 = inboundBuffer.g1(); + InterfaceList.miscTransmitAt = InterfaceList.transmitTimer; + opcode = -1; + return true; + } else if (opcode == 209) { + if (InterfaceList.topLevelInterface != -1) { + Static54.method1304(0, InterfaceList.topLevelInterface); + } + opcode = -1; + return true; + } else if (opcode == 191) { + local133 = inboundBuffer.g2le(); + Static13.method472(local133); + Static27.updatedInventories[Static111.updatedInventoriesWriterIndex++ & 0x1F] = local133 & 0x7FFF; + opcode = -1; + return true; + } else if (opcode == 102) { + local133 = inboundBuffer.g2le(); + local786 = inboundBuffer.g1ssub(); + local864 = inboundBuffer.g2(); + @Pc(3766) Npc local3766 = Static175.npcs[local133]; + if (local3766 != null) { + Static223.method3855(local786, local864, local3766); + } + opcode = -1; + return true; + } else if (opcode == 159) { + InterfaceList.method2245(); + Static251.anInt5456 = inboundBuffer.g2s(); + InterfaceList.miscTransmitAt = InterfaceList.transmitTimer; + opcode = -1; + return true; + } else if (opcode == 71) { + local884 = inboundBuffer.g8(); + local790 = Static218.escape(Static65.formatChatMessage(inboundBuffer).encodeMessage()); + Chat.add(Base37.decodeLowerCase(local884).method3125(), 6, local790); + opcode = -1; + return true; + } else if (opcode == 42) { + if (GameShell.fullScreenFrame != null) { + Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); + } + @Pc(3848) byte[] local3848 = new byte[length]; + inboundBuffer.method2237(local3848, length); + local156 = Static10.decodeString(local3848, length, 0); + if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || client.haveIe6)) { + Static169.openUrl(local156, true); + } else { + Static175.url = local156; + Static164.newTab = true; + Static33.openUrlRequest = GameShell.signLink.openUrl(new String(local156.method3148(), "ISO-8859-1")); + } + opcode = -1; + return true; + } else if (opcode == 111) { + local133 = inboundBuffer.g2sub(); + local786 = inboundBuffer.p4rme(); + local864 = inboundBuffer.g2leadd(); + local171 = inboundBuffer.g2le(); + local1146 = inboundBuffer.g2leadd(); + if (Static248.method3288(local133)) { + Static132.method2607(local864, 7, local786, local171 << 16 | local1146); + } + opcode = -1; + return true; + } else if (opcode == 37) { + local133 = inboundBuffer.g1add(); + local786 = inboundBuffer.g2le(); + Static272.method3995(local133, local786); + opcode = -1; + return true; + } else if (opcode == 155) { + local133 = inboundBuffer.g1(); + local786 = inboundBuffer.p4rme(); + local864 = inboundBuffer.g2sub(); + local171 = inboundBuffer.g2(); + if (Static248.method3288(local864)) { + local3456 = (Class3_Sub31) Static119.aClass133_9.get((long) local786); + if (local3456 != null) { + Static132.method2605(local3456.anInt5878 != local171, local3456); + } + Static44.method1148(local171, local786, local133); + } + opcode = -1; + return true; + } else if (opcode == 131) { + for (local133 = 0; local133 < PlayerList.players.length; local133++) { + if (PlayerList.players[local133] != null) { + PlayerList.players[local133].seqId = -1; + } + } + for (local133 = 0; local133 < Static175.npcs.length; local133++) { + if (Static175.npcs[local133] != null) { + Static175.npcs[local133].seqId = -1; + } + } + opcode = -1; + return true; + } else if (opcode == 217) { + local133 = inboundBuffer.g1(); + @Pc(4084) Class102 local4084 = new Class102(); + local786 = local133 >> 6; + local4084.anInt4058 = local133 & 0x3F; + local4084.anInt4048 = inboundBuffer.g1(); + if (local4084.anInt4048 >= 0 && local4084.anInt4048 < Sprites.headhints.length) { + if (local4084.anInt4058 == 1 || local4084.anInt4058 == 10) { + local4084.anInt4057 = inboundBuffer.g2(); + inboundBuffer.offset += 3; + } else if (local4084.anInt4058 >= 2 && local4084.anInt4058 <= 6) { + if (local4084.anInt4058 == 2) { + local4084.anInt4045 = 64; + local4084.anInt4047 = 64; + } + if (local4084.anInt4058 == 3) { + local4084.anInt4045 = 0; + local4084.anInt4047 = 64; + } + if (local4084.anInt4058 == 4) { + local4084.anInt4045 = 128; + local4084.anInt4047 = 64; + } + if (local4084.anInt4058 == 5) { + local4084.anInt4045 = 64; + local4084.anInt4047 = 0; + } + if (local4084.anInt4058 == 6) { + local4084.anInt4045 = 64; + local4084.anInt4047 = 128; + } + local4084.anInt4058 = 2; + local4084.anInt4053 = inboundBuffer.g2(); + local4084.anInt4046 = inboundBuffer.g2(); + local4084.anInt4050 = inboundBuffer.g1(); + } + local4084.anInt4052 = inboundBuffer.g2(); + if (local4084.anInt4052 == 65535) { + local4084.anInt4052 = -1; + } + Static143.aClass102Array1[local786] = local4084; + } + opcode = -1; + return true; + } else if (opcode == 126) { + Static35.anInt1093 = length / 8; + for (local133 = 0; local133 < Static35.anInt1093; local133++) { + IgnoreList.encodedUsernames[local133] = inboundBuffer.g8(); + Static193.aClass100Array134[local133] = Base37.decodeLowerCase(IgnoreList.encodedUsernames[local133]); + } + FriendsList.transmitAt = InterfaceList.transmitTimer; + opcode = -1; + return true; + } else if (opcode == 32) { + Static86.method1800(); + opcode = -1; + return true; + } else if (opcode == 119) { + local133 = inboundBuffer.g2sub(); + local786 = inboundBuffer.g4me(); + local864 = inboundBuffer.g2s(); + local171 = inboundBuffer.g2sadd(); + if (Static248.method3288(local133)) { + Static280.method4666(local864, local786, local171); + } + opcode = -1; + return true; + } else if (opcode == 235) { + local133 = inboundBuffer.g1ssub(); + local786 = local133 >> 2; + local864 = local133 & 0x3; + local171 = Static133.anIntArray453[local786]; + local1146 = inboundBuffer.g2(); + local277 = inboundBuffer.g4(); + if (local1146 == 65535) { + local1146 = -1; + } + local908 = local277 & 0x3FFF; + local1986 = local277 >> 14 & 0x3FFF; + local1986 -= Static225.originX; + local908 -= Static142.originZ; + local1160 = local277 >> 28 & 0x3; + Static92.method1881(local1160, local864, local786, local908, local171, local1986, local1146); + opcode = -1; + return true; + } else if (opcode == 0) { + local884 = inboundBuffer.g8(); + local275 = inboundBuffer.g2(); + local899 = inboundBuffer.g3(); + local1160 = inboundBuffer.g1(); + @Pc(4425) boolean local4425 = false; + @Pc(4431) long local4431 = local899 + (local275 << 32); + local3002 = 0; + label1450: while (true) { + if (local3002 >= 100) { + if (local1160 <= 1) { + if (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat) { + local4425 = true; + } else { + for (local3002 = 0; local3002 < Static35.anInt1093; local3002++) { + if (local884 == IgnoreList.encodedUsernames[local3002]) { + local4425 = true; + break label1450; + } + } + } + } + break; + } + if (local4431 == Static233.aLongArray9[local3002]) { + local4425 = true; + break; + } + local3002++; + } + if (!local4425 && Player.inTutorialIsland == 0) { + Static233.aLongArray9[Static251.anInt5447] = local4431; + Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; + @Pc(4518) JagString local4518 = Static218.escape(Static65.formatChatMessage(inboundBuffer).encodeMessage()); + if (local1160 == 2 || local1160 == 3) { + Chat.add(JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() }), 7, local4518); + } else if (local1160 == 1) { + Chat.add(JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() }), 7, local4518); + } else { + Chat.add(Base37.decodeLowerCase(local884).method3125(), 3, local4518); + } + } + opcode = -1; + return true; + } else if (opcode == 54) { + local884 = inboundBuffer.g8(); + inboundBuffer.g1s(); + local275 = inboundBuffer.g8(); + local899 = inboundBuffer.g2(); + local904 = inboundBuffer.g3(); + @Pc(4626) long local4626 = (local899 << 32) + local904; + local908 = inboundBuffer.g1(); + @Pc(4632) boolean local4632 = false; + @Pc(4634) int local4634 = 0; + label1575: while (true) { + if (local4634 >= 100) { + if (local908 <= 1) { + if (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat) { + local4632 = true; + } else { + for (local4634 = 0; local4634 < Static35.anInt1093; local4634++) { + if (IgnoreList.encodedUsernames[local4634] == local884) { + local4632 = true; + break label1575; + } + } + } + } + break; + } + if (Static233.aLongArray9[local4634] == local4626) { + local4632 = true; + break; + } + local4634++; + } + if (!local4632 && Player.inTutorialIsland == 0) { + Static233.aLongArray9[Static251.anInt5447] = local4626; + Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; + local3038 = Static218.escape(Static65.formatChatMessage(inboundBuffer).encodeMessage()); + if (local908 == 2 || local908 == 3) { + Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() }), Base37.decodeLowerCase(local275).method3125()); + } else if (local908 == 1) { + Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() }), Base37.decodeLowerCase(local275).method3125()); + } else { + Static73.method1598(local3038, Base37.decodeLowerCase(local884).method3125(), Base37.decodeLowerCase(local275).method3125()); + } + } + opcode = -1; + return true; + } else if (opcode == 214) { + readRebuildPacket(true); + opcode = -1; + return true; + } else if (opcode == 172) { + local133 = inboundBuffer.g2(); + local786 = inboundBuffer.g1(); + if (local133 == 65535) { + local133 = -1; + } + local864 = inboundBuffer.g2(); + SoundPlayer.play(local786, local133, local864); + opcode = -1; + return true; + } else if (opcode == 66) { + local133 = inboundBuffer.g2leadd(); + local786 = inboundBuffer.g4rme(); + if (Static248.method3288(local133)) { + local864 = 0; + if (PlayerList.self.appearance != null) { + local864 = PlayerList.self.appearance.method1952(); + } + Static132.method2607(-1, 3, local786, local864); + } + opcode = -1; + return true; + } else if (opcode == 171) { + local133 = inboundBuffer.p4rme(); + local156 = inboundBuffer.gjstr(); + local864 = inboundBuffer.g2sub(); + if (Static248.method3288(local864)) { + Static80.method3617(local156, local133); + } + opcode = -1; + return true; + } else if (opcode == 84) { + local133 = inboundBuffer.g4me(); + local786 = inboundBuffer.g2leadd(); + Static272.method3995(local133, local786); + opcode = -1; + return true; + } else { + @Pc(4956) Component local4956; + if (opcode == 22) { + local133 = inboundBuffer.g4(); + local786 = inboundBuffer.g2(); + if (local133 < -70000) { + local786 += 32768; + } + if (local133 < 0) { + local4956 = null; + } else { + local4956 = InterfaceList.getComponent(local133); + } + while (inboundBuffer.offset < length) { + local171 = inboundBuffer.gSmart1or2(); + local1146 = inboundBuffer.g2(); + local277 = 0; + if (local1146 != 0) { + local277 = inboundBuffer.g1(); + if (local277 == 255) { + local277 = inboundBuffer.g4(); + } + } + if (local4956 != null && local171 >= 0 && local4956.objTypes.length > local171) { + local4956.objTypes[local171] = local1146; + local4956.objCounts[local171] = local277; + } + Static280.method4672(local1146 - 1, local171, local277, local786); + } + if (local4956 != null) { + Static43.redraw(local4956); + } + InterfaceList.method2245(); + Static27.updatedInventories[Static111.updatedInventoriesWriterIndex++ & 0x1F] = local786 & 0x7FFF; + opcode = -1; + return true; + } else if (opcode == 24) { + local133 = inboundBuffer.g2(); + if (Static248.method3288(local133)) { + Static35.resetCameraEffects(); + } + opcode = -1; + return true; + } else if (opcode == 86) { + Static278.processLogout(); + opcode = -1; + return false; + } else if (opcode == 116) { + local133 = inboundBuffer.g1(); + if (inboundBuffer.g1() == 0) { + StockMarketManager.aClass136Array1[local133] = new StockMarketOffer(); + } else { + inboundBuffer.offset--; + StockMarketManager.aClass136Array1[local133] = new StockMarketOffer(inboundBuffer); + } + opcode = -1; + StockMarketManager.transmitAt = InterfaceList.transmitTimer; + return true; + } else if (opcode == 73) { + local133 = inboundBuffer.g2sub(); + local786 = inboundBuffer.g4me(); + if (local133 == 65535) { + local133 = -1; + } + local864 = inboundBuffer.g2le(); + if (Static248.method3288(local864)) { + Static132.method2607(-1, 2, local786, local133); + } + opcode = -1; + return true; + } else if (opcode == 162) { + readRebuildPacket(false); + opcode = -1; + return true; + } else if (opcode == 165) { + local133 = inboundBuffer.g2le(); + local786 = inboundBuffer.g2le(); + if (local786 == 65535) { + local786 = -1; + } + local864 = inboundBuffer.g4(); + local171 = inboundBuffer.g2sub(); + local1146 = inboundBuffer.g4rme(); + if (local171 == 65535) { + local171 = -1; + } + if (Static248.method3288(local133)) { + for (local277 = local171; local277 <= local786; local277++) { + local904 = ((long) local864 << 32) + ((long) local277); + local1804 = (ServerActiveProperties) Static210.aClass133_21.get(local904); + if (local1804 != null) { + local1814 = new ServerActiveProperties(local1146, local1804.anInt540); + local1804.unlink(); + } else if (local277 == -1) { + local1814 = new ServerActiveProperties(local1146, InterfaceList.getComponent(local864).aClass3_Sub4_1.anInt540); + } else { + local1814 = new ServerActiveProperties(local1146, -1); + } + Static210.aClass133_21.put(local1814, local904); + } + } + opcode = -1; + return true; + } else if (opcode == 197) { + Static166.anInt4054 = inboundBuffer.g1(); + FriendsList.transmitAt = InterfaceList.transmitTimer; + opcode = -1; + return true; + } else if (opcode == 196) { + local884 = inboundBuffer.g8(); + local864 = inboundBuffer.g2(); + @Pc(5325) byte local5325 = inboundBuffer.g1s(); + local262 = false; + if ((Long.MIN_VALUE & local884) != 0L) { + local262 = true; + } + if (local262) { + if (Static214.anInt5577 == 0) { + opcode = -1; + return true; + } + local884 &= Long.MAX_VALUE; + for (local277 = 0; Static214.anInt5577 > local277 && (local884 != Static199.aClass3_Sub22Array1[local277].key || local864 != Static199.aClass3_Sub22Array1[local277].anInt3340); local277++) { + } + if (local277 < Static214.anInt5577) { + while (Static214.anInt5577 - 1 > local277) { + Static199.aClass3_Sub22Array1[local277] = Static199.aClass3_Sub22Array1[local277 + 1]; + local277++; + } + Static214.anInt5577--; + Static199.aClass3_Sub22Array1[Static214.anInt5577] = null; + } + } else { + local506 = inboundBuffer.gjstr(); + @Pc(5347) Class3_Sub22 local5347 = new Class3_Sub22(); + local5347.key = local884; + local5347.aClass100_636 = Base37.decodeLowerCase(local5347.key); + local5347.aByte9 = local5325; + local5347.aClass100_635 = local506; + local5347.anInt3340 = local864; + for (local1986 = Static214.anInt5577 - 1; local1986 >= 0; local1986--) { + local908 = Static199.aClass3_Sub22Array1[local1986].aClass100_636.method3139(local5347.aClass100_636); + if (local908 == 0) { + Static199.aClass3_Sub22Array1[local1986].anInt3340 = local864; + Static199.aClass3_Sub22Array1[local1986].aByte9 = local5325; + Static199.aClass3_Sub22Array1[local1986].aClass100_635 = local506; + if (local884 == Static101.aLong98) { + Static160.aByte14 = local5325; + } + ClanChat.transmitAt = InterfaceList.transmitTimer; + opcode = -1; + return true; + } + if (local908 < 0) { + break; + } + } + if (Static199.aClass3_Sub22Array1.length <= Static214.anInt5577) { + opcode = -1; + return true; + } + for (local908 = Static214.anInt5577 - 1; local908 > local1986; local908--) { + Static199.aClass3_Sub22Array1[local908 + 1] = Static199.aClass3_Sub22Array1[local908]; + } + if (Static214.anInt5577 == 0) { + Static199.aClass3_Sub22Array1 = new Class3_Sub22[100]; + } + Static199.aClass3_Sub22Array1[local1986 + 1] = local5347; + if (Static101.aLong98 == local884) { + Static160.aByte14 = local5325; + } + Static214.anInt5577++; + } + opcode = -1; + ClanChat.transmitAt = InterfaceList.transmitTimer; + return true; + } else if (opcode == 50) { + local133 = inboundBuffer.g4(); + local786 = inboundBuffer.p4rme(); + local864 = inboundBuffer.g2leadd(); + if (local864 == 65535) { + local864 = -1; + } + local171 = inboundBuffer.g2le(); + if (Static248.method3288(local171)) { + @Pc(5603) Component local5603 = InterfaceList.getComponent(local786); + @Pc(5615) ObjType local5615; + if (local5603.aBoolean32) { + Static209.method3707(local786, local133, local864); + local5615 = ObjTypeList.get(local864); + Static261.method4505(local5615.zoom2d, local786, local5615.yAngle2d, local5615.xAngle2d); + Static145.method2745(local786, local5615.zAngle2d, local5615.yOffset2d, local5615.xOffset2d); + } else if (local864 == -1) { + local5603.modelType = 0; + opcode = -1; + return true; + } else { + local5615 = ObjTypeList.get(local864); + local5603.modelXAngle = local5615.xAngle2d; + local5603.modelZoom = local5615.zoom2d * 100 / local133; + local5603.modelType = 4; + local5603.modelId = local864; + local5603.modelYAngle = local5615.yAngle2d; + Static43.redraw(local5603); + } + } + opcode = -1; + return true; + } else if (opcode == 105) { + local133 = inboundBuffer.g4(); + local786 = inboundBuffer.g2(); + if (local133 < -70000) { + local786 += 32768; + } + if (local133 >= 0) { + local4956 = InterfaceList.getComponent(local133); + } else { + local4956 = null; + } + if (local4956 != null) { + for (local171 = 0; local171 < local4956.objTypes.length; local171++) { + local4956.objTypes[local171] = 0; + local4956.objCounts[local171] = 0; + } + } + Static14.method475(local786); + local171 = inboundBuffer.g2(); + for (local1146 = 0; local1146 < local171; local1146++) { + local277 = inboundBuffer.g1ssub(); + if (local277 == 255) { + local277 = inboundBuffer.g4(); + } + local1160 = inboundBuffer.g2(); + if (local4956 != null && local1146 < local4956.objTypes.length) { + local4956.objTypes[local1146] = local1160; + local4956.objCounts[local1146] = local277; + } + Static280.method4672(local1160 - 1, local1146, local277, local786); + } + if (local4956 != null) { + Static43.redraw(local4956); + } + InterfaceList.method2245(); + Static27.updatedInventories[Static111.updatedInventoriesWriterIndex++ & 0x1F] = local786 & 0x7FFF; + opcode = -1; + return true; + } else if (opcode == 142) { + Static230.method3954(inboundBuffer.gjstr()); + opcode = -1; + return true; + } else if (opcode == 26) { + Static115.anInt2940 = inboundBuffer.p1neg(); + Static180.anInt4264 = inboundBuffer.g1(); + opcode = -1; + return true; + } else if (opcode == 4) { + local133 = inboundBuffer.g2leadd(); + if (local133 == 65535) { + local133 = -1; + } + Static148.method2765(local133); + opcode = -1; + return true; + } else if (opcode == 208) { + local133 = inboundBuffer.g3le(); + local786 = inboundBuffer.g2le(); + if (local786 == 65535) { + local786 = -1; + } + Static278.method4650(local133, local786); + opcode = -1; + return true; + } else { + TracingException.report("T1 - " + opcode + "," + Static5.opcode3 + "," + Static49.opcode4 + " - " + length, null); + Static278.processLogout(); + return true; + } + } + } + } + } + } + } + } + + @OriginalMember(owner = "client!an", name = "h", descriptor = "(I)Z") + public static boolean readPacket() { + try { + return readPacketInternal(); + } catch (@Pc(14) IOException local14) { + Static175.method3279(); + return true; + } catch (@Pc(19) Exception local19) { + @Pc(61) String local61 = "T2 - " + opcode + "," + Static5.opcode3 + "," + Static49.opcode4 + " - " + length + "," + (Static225.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Static142.originZ) + " - "; + for (@Pc(63) int local63 = 0; local63 < length && local63 < 50; local63++) { + local61 = local61 + inboundBuffer.data[local63] + ","; + } + TracingException.report(local61, local19); + Static278.processLogout(); + return true; + } + } } diff --git a/client/src/main/java/QuickChatPhrase.java b/client/src/main/java/QuickChatPhrase.java index 479ff5e..a51d12c 100644 --- a/client/src/main/java/QuickChatPhrase.java +++ b/client/src/main/java/QuickChatPhrase.java @@ -5,10 +5,10 @@ import org.openrs2.deob.annotation.OriginalMember; public final class QuickChatPhrase { @OriginalMember(owner = "client!bd", name = "c", descriptor = "I") - public int anInt439; + public int id; @OriginalMember(owner = "client!bd", name = "f", descriptor = "Lclient!cb;") - public QuickChatPhraseType aClass3_Sub2_Sub6_1; + public QuickChatPhraseType type; @OriginalMember(owner = "client!bd", name = "h", descriptor = "[I") public int[] anIntArray33; diff --git a/client/src/main/java/QuickChatPhraseType.java b/client/src/main/java/QuickChatPhraseType.java index a9d2152..f9d2241 100644 --- a/client/src/main/java/QuickChatPhraseType.java +++ b/client/src/main/java/QuickChatPhraseType.java @@ -121,7 +121,7 @@ public final class QuickChatPhraseType extends SecondaryNode { } @OriginalMember(owner = "client!cb", name = "a", descriptor = "(ILclient!wa;)Lclient!na;") - public final JagString method770(@OriginalArg(1) Buffer arg0) { + public final JagString decodeMessage(@OriginalArg(1) Buffer arg0) { @Pc(17) JagString local17 = Static87.allocate(80); if (this.anIntArray71 != null) { for (@Pc(22) int local22 = 0; local22 < this.anIntArray71.length; local22++) { diff --git a/client/src/main/java/ShadowModelList.java b/client/src/main/java/ShadowModelList.java index f583d68..cf83bf1 100644 --- a/client/src/main/java/ShadowModelList.java +++ b/client/src/main/java/ShadowModelList.java @@ -125,18 +125,18 @@ public class ShadowModelList { } if (GlRenderer.enabled) { @Pc(650) GlModel local650 = (GlModel) local33; - if (SceneGraph.getTileHeight(Static55.level, arg3 + local384, local126 + arg5) != arg11 || SceneGraph.getTileHeight(Static55.level, local115 + arg3, arg5 - -local130) != arg11) { + if (SceneGraph.getTileHeight(Player.level, arg3 + local384, local126 + arg5) != arg11 || SceneGraph.getTileHeight(Player.level, local115 + arg3, arg5 - -local130) != arg11) { for (local162 = 0; local162 < local650.vertexCount; local162++) { - local650.anIntArray465[local162] += SceneGraph.getTileHeight(Static55.level, local650.anIntArray461[local162] + arg3, arg5 + local650.anIntArray466[local162]) - arg11; + local650.anIntArray465[local162] += SceneGraph.getTileHeight(Player.level, local650.anIntArray461[local162] + arg3, arg5 + local650.anIntArray466[local162]) - arg11; } local650.vertexBuffer.valid = false; local650.bounds.valid = false; } } else { @Pc(574) SoftwareModel local574 = (SoftwareModel) local33; - if (SceneGraph.getTileHeight(Static55.level, arg3 + local384, arg5 - -local126) != arg11 || arg11 != SceneGraph.getTileHeight(Static55.level, arg3 + local115, arg5 - -local130)) { + if (SceneGraph.getTileHeight(Player.level, arg3 + local384, arg5 - -local126) != arg11 || arg11 != SceneGraph.getTileHeight(Player.level, arg3 + local115, arg5 - -local130)) { for (local162 = 0; local162 < local574.vertexCount; local162++) { - local574.anIntArray527[local162] += SceneGraph.getTileHeight(Static55.level, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11; + local574.anIntArray527[local162] += SceneGraph.getTileHeight(Player.level, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11; } local574.boundsValid = false; } diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java index 1657eee..6595488 100644 --- a/client/src/main/java/Static10.java +++ b/client/src/main/java/Static10.java @@ -1,4 +1,3 @@ -import java.io.IOException; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -47,24 +46,6 @@ public final class Static10 { Static141.anInt3473 = arg0 - 1; } - @OriginalMember(owner = "client!an", name = "h", descriptor = "(I)Z") - public static boolean readPacket() { - try { - return Static4.method26(); - } catch (@Pc(14) IOException local14) { - Static175.method3279(); - return true; - } catch (@Pc(19) Exception local19) { - @Pc(61) String local61 = "T2 - " + Protocol.opcode + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Protocol.length + "," + (Static225.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Static142.originZ) + " - "; - for (@Pc(63) int local63 = 0; local63 < Protocol.length && local63 < 50; local63++) { - local61 = local61 + Protocol.inboundBuffer.data[local63] + ","; - } - TracingException.report(local61, local19); - Static278.processLogout(); - return true; - } - } - @OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V") public static void method352(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { @Pc(11) int local11 = Static78.method1690(Static106.anInt2869, arg5, Static267.anInt5773); diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java index 7a82b5b..47f3574 100644 --- a/client/src/main/java/Static103.java +++ b/client/src/main/java/Static103.java @@ -16,11 +16,6 @@ public final class Static103 { @OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;") public static final JagString aClass100_558 = JagString.parse("m"); - @OriginalMember(owner = "client!i", name = "a", descriptor = "(Lclient!na;ILclient!na;I)V") - public static void method2231(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2) { - Static154.method2928(-1, arg1, arg2, null, arg0); - } - @OriginalMember(owner = "client!i", name = "p", descriptor = "(II)V") public static void method2232(@OriginalArg(1) int arg0) { if (arg0 < 0) { @@ -36,13 +31,13 @@ public final class Static103 { @Pc(36) int local36 = (int) Static159.aLongArray5[arg0]; @Pc(43) Player local43; if (local23 == 31) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; Static17.milliseconds = 0; - Static122.x = Static7.clickX; - Static25.y = Static60.clickY; + Static122.x = Mouse.clickX; + Static25.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(71); Protocol.outboundBuffer.p2leadd(local36); } @@ -71,10 +66,10 @@ public final class Static103 { local192 = Static175.npcs[local36]; if (local192 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static70.type = 2; Static17.milliseconds = 0; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(30); Protocol.outboundBuffer.p2(local36); } @@ -83,21 +78,21 @@ public final class Static103 { local192 = Static175.npcs[local36]; if (local192 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static17.milliseconds = 0; Static70.type = 2; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(78); Protocol.outboundBuffer.p2le(local36); } } if (local23 == 44) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static70.type = 2; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static17.milliseconds = 0; Protocol.outboundBuffer.p1isaac(133); Protocol.outboundBuffer.p2le(local36); @@ -126,10 +121,10 @@ public final class Static103 { local192 = Static175.npcs[local36]; if (local192 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static70.type = 2; Static17.milliseconds = 0; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(239); Protocol.outboundBuffer.p4le2(Static98.anInt2512); Protocol.outboundBuffer.p2add(Static15.anInt506); @@ -146,10 +141,10 @@ public final class Static103 { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } } - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static17.milliseconds = 0; Static70.type = 2; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(66); Protocol.outboundBuffer.p2le(Static225.originX + local15); Protocol.outboundBuffer.p2(local36); @@ -164,8 +159,8 @@ public final class Static103 { } if (local23 == 1002) { Static70.type = 2; - Static122.x = Static7.clickX; - Static25.y = Static60.clickY; + Static122.x = Mouse.clickX; + Static25.y = Mouse.clickY; Static17.milliseconds = 0; Protocol.outboundBuffer.p1isaac(92); Protocol.outboundBuffer.p2leadd(local36); @@ -177,7 +172,7 @@ public final class Static103 { Protocol.outboundBuffer.p1isaac(92); Protocol.outboundBuffer.p2leadd(local36); } else { - method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name})); + Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name})); } Static72.anInt2043 = 0; Static257.aClass13_7 = InterfaceList.getComponent(local19); @@ -185,10 +180,10 @@ public final class Static103 { } if (local23 == 60) { if (local36 == 0) { - Static113.method3556(Static55.level, local15, local19); + Static113.method3556(Player.level, local15, local19); } else if (local36 == 1) { if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { - Static61.teleport(Static225.originX + local15, Static142.originZ + local19, Static55.level); + Cheat.teleport(Static225.originX + local15, Static142.originZ + local19, Player.level); } else if (Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) { Protocol.outboundBuffer.p1(Static1.anInt5); Protocol.outboundBuffer.p1(Static107.anInt2878); @@ -207,8 +202,8 @@ public final class Static103 { if (local23 == 1007) { Static17.milliseconds = 0; Static70.type = 2; - Static25.y = Static60.clickY; - Static122.x = Static7.clickX; + Static25.y = Mouse.clickY; + Static122.x = Mouse.clickX; local192 = Static175.npcs[local36]; if (local192 != null) { @Pc(884) NpcType local884 = local192.type; @@ -242,12 +237,12 @@ public final class Static103 { Static250.anInt5444 = local15; } if (local23 == 10) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; - Static25.y = Static60.clickY; - Static122.x = Static7.clickX; + Static25.y = Mouse.clickY; + Static122.x = Mouse.clickX; Static17.milliseconds = 0; Protocol.outboundBuffer.p1isaac(4); Protocol.outboundBuffer.p2le(local36); @@ -284,13 +279,13 @@ public final class Static103 { Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 37) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static17.milliseconds = 0; Static70.type = 2; - Static25.y = Static60.clickY; - Static122.x = Static7.clickX; + Static25.y = Mouse.clickY; + Static122.x = Mouse.clickX; Protocol.outboundBuffer.p1isaac(114); Protocol.outboundBuffer.p2leadd(local36); } @@ -317,9 +312,9 @@ public final class Static103 { } } Static70.type = 2; - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static17.milliseconds = 0; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(228); Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p2le(Static225.originX + local15); @@ -331,8 +326,8 @@ public final class Static103 { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; Static17.milliseconds = 0; - Static25.y = Static60.clickY; - Static122.x = Static7.clickX; + Static25.y = Mouse.clickY; + Static122.x = Mouse.clickX; Protocol.outboundBuffer.p1isaac(148); Protocol.outboundBuffer.p2add(local36); } @@ -357,13 +352,13 @@ public final class Static103 { return; } if (local23 == 29) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static17.milliseconds = 0; Static70.type = 2; - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Protocol.outboundBuffer.p1isaac(180); Protocol.outboundBuffer.p2leadd(local36); } @@ -378,13 +373,13 @@ public final class Static103 { Static250.anInt5444 = local15; } if (local23 == 15) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static17.milliseconds = 0; Static70.type = 2; - Static122.x = Static7.clickX; - Static25.y = Static60.clickY; + Static122.x = Mouse.clickX; + Static25.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(195); Protocol.outboundBuffer.p2add(Static15.anInt506); Protocol.outboundBuffer.p4le2(Static98.anInt2512); @@ -400,9 +395,9 @@ public final class Static103 { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } } - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static70.type = 2; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static17.milliseconds = 0; Protocol.outboundBuffer.p1isaac(109); Protocol.outboundBuffer.p2le(local19 + Static142.originZ); @@ -422,9 +417,9 @@ public final class Static103 { local192 = Static175.npcs[local36]; if (local192 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static70.type = 2; - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static17.milliseconds = 0; Protocol.outboundBuffer.p1isaac(218); Protocol.outboundBuffer.p2le(local36); @@ -449,8 +444,8 @@ public final class Static103 { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; Static17.milliseconds = 0; - Static25.y = Static60.clickY; - Static122.x = Static7.clickX; + Static25.y = Mouse.clickY; + Static122.x = Mouse.clickX; Protocol.outboundBuffer.p1isaac(115); Protocol.outboundBuffer.p4me(Static224.anInt5062); Protocol.outboundBuffer.p2le(Static185.anInt4370); @@ -473,9 +468,9 @@ public final class Static103 { if (!local560) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static17.milliseconds = 0; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static70.type = 2; Protocol.outboundBuffer.p1isaac(101); Protocol.outboundBuffer.p2leadd(local15 + Static225.originX); @@ -487,16 +482,16 @@ public final class Static103 { } if (local23 == 1004) { Static17.milliseconds = 0; - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static70.type = 2; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Protocol.outboundBuffer.p1isaac(94); Protocol.outboundBuffer.p2leadd(local36); } if (local23 == 11) { if (local36 == 0) { Static125.anInt3096 = 1; - Static113.method3556(Static55.level, local15, local19); + Static113.method3556(Player.level, local15, local19); } else if (local36 == 1) { Protocol.outboundBuffer.p1isaac(131); Protocol.outboundBuffer.p4me(Static98.anInt2512); @@ -517,13 +512,13 @@ public final class Static103 { } } if (local23 == 1) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static17.milliseconds = 0; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static70.type = 2; - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Protocol.outboundBuffer.p1isaac(248); Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2(Static274.anInt4997); @@ -550,8 +545,8 @@ public final class Static103 { } } Static70.type = 2; - Static25.y = Static60.clickY; - Static122.x = Static7.clickX; + Static25.y = Mouse.clickY; + Static122.x = Mouse.clickX; Static17.milliseconds = 0; Protocol.outboundBuffer.p1isaac(48); Protocol.outboundBuffer.p2add(local15 + Static225.originX); @@ -576,12 +571,12 @@ public final class Static103 { Static250.anInt5444 = local15; } if (local23 == 57) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static70.type = 2; - Static25.y = Static60.clickY; - Static122.x = Static7.clickX; + Static25.y = Mouse.clickY; + Static122.x = Mouse.clickX; Static17.milliseconds = 0; Protocol.outboundBuffer.p1isaac(175); Protocol.outboundBuffer.p2add(local36); @@ -618,12 +613,12 @@ public final class Static103 { Static250.anInt5444 = local15; } if (local23 == 30) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); Static17.milliseconds = 0; - Static122.x = Static7.clickX; - Static25.y = Static60.clickY; + Static122.x = Mouse.clickX; + Static25.y = Mouse.clickY; Static70.type = 2; Protocol.outboundBuffer.p1isaac(68); Protocol.outboundBuffer.p2leadd(local36); @@ -643,8 +638,8 @@ public final class Static103 { if (!local560) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } - Static25.y = Static60.clickY; - Static122.x = Static7.clickX; + Static25.y = Mouse.clickY; + Static122.x = Mouse.clickX; Static70.type = 2; Static17.milliseconds = 0; Protocol.outboundBuffer.p1isaac(73); @@ -664,9 +659,9 @@ public final class Static103 { if (local23 == 36) { if (local36 == 0) { Static187.anInt4422 = 1; - Static113.method3556(Static55.level, local15, local19); + Static113.method3556(Player.level, local15, local19); } else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { - Static61.teleport(local15 + Static225.originX, Static142.originZ - -local19, Static55.level); + Cheat.teleport(local15 + Static225.originX, Static142.originZ - -local19, Player.level); } else { Protocol.outboundBuffer.p1isaac(179); Protocol.outboundBuffer.p2(local19 + Static142.originZ); @@ -674,13 +669,13 @@ public final class Static103 { } } if (local23 == 6) { - local43 = Static159.players[local36]; + local43 = PlayerList.players[local36]; if (local43 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], PlayerList.self.movementQueueX[0]); - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static17.milliseconds = 0; Static70.type = 2; - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Protocol.outboundBuffer.p1isaac(106); Protocol.outboundBuffer.p2(local36); } @@ -694,9 +689,9 @@ public final class Static103 { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, PlayerList.self.movementQueueX[0]); } } - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static17.milliseconds = 0; - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static70.type = 2; Protocol.outboundBuffer.p1isaac(33); Protocol.outboundBuffer.p2(local36); @@ -707,9 +702,9 @@ public final class Static103 { local192 = Static175.npcs[local36]; if (local192 != null) { Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], PlayerList.self.movementQueueX[0]); - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static17.milliseconds = 0; - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static70.type = 2; Protocol.outboundBuffer.p1isaac(3); Protocol.outboundBuffer.p2leadd(local36); diff --git a/client/src/main/java/Static104.java b/client/src/main/java/Static104.java index 5af704f..6286da8 100644 --- a/client/src/main/java/Static104.java +++ b/client/src/main/java/Static104.java @@ -79,7 +79,7 @@ public final class Static104 { local233 = ((Npc) arg0).type.aBoolean181; } if (local233) { - if (arg0.anInt3381 != arg0.anInt3400 && arg0.anInt3370 == -1 && arg0.anInt3376 != 0) { + if (arg0.anInt3381 != arg0.anInt3400 && arg0.faceEntity == -1 && arg0.anInt3376 != 0) { local273 = 2; } if (arg0.movementQueueSize > 2) { diff --git a/client/src/main/java/Static105.java b/client/src/main/java/Static105.java index 1cd4351..1dcaaac 100644 --- a/client/src/main/java/Static105.java +++ b/client/src/main/java/Static105.java @@ -16,9 +16,6 @@ public final class Static105 { @OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;") public static Component aClass13_14 = null; - @OriginalMember(owner = "client!ib", name = "f", descriptor = "[I") - public static final int[] anIntArray256 = new int[2048]; - @OriginalMember(owner = "client!ib", name = "g", descriptor = "Lclient!na;") public static final JagString aClass100_559 = JagString.parse(""); diff --git a/client/src/main/java/Static11.java b/client/src/main/java/Static11.java index 9fe4643..88d1f81 100644 --- a/client/src/main/java/Static11.java +++ b/client/src/main/java/Static11.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static11 { - @OriginalMember(owner = "client!ba", name = "w", descriptor = "I") - public static int anInt384 = 0; - - @OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V") + @OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V") public static void method443() { NpcTypeList.headModels.clear(); } diff --git a/client/src/main/java/Static111.java b/client/src/main/java/Static111.java index f03fb93..676466a 100644 --- a/client/src/main/java/Static111.java +++ b/client/src/main/java/Static111.java @@ -13,7 +13,7 @@ public final class Static111 { public static int anInt2910; @OriginalMember(owner = "client!ii", name = "c", descriptor = "I") - public static int anInt2901 = 0; + public static int updatedInventoriesWriterIndex = 0; @OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;") public static final JagString aClass100_570 = JagString.parse(")2"); diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java index dc66cd7..1e36b43 100644 --- a/client/src/main/java/Static112.java +++ b/client/src/main/java/Static112.java @@ -51,8 +51,8 @@ public final class Static112 { } else { SoftwareRaster.method2484(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910); } - local114 = Static223.anInt5032; - local112 = Static215.anInt4873; + local114 = Mouse.anInt5032; + local112 = Mouse.anInt4873; @Pc(203) int local203; @Pc(219) int local219; for (local203 = 0; local203 < Static231.anInt5204; local203++) { diff --git a/client/src/main/java/Static115.java b/client/src/main/java/Static115.java index 01eb43c..0f6c7d5 100644 --- a/client/src/main/java/Static115.java +++ b/client/src/main/java/Static115.java @@ -16,9 +16,6 @@ public final class Static115 { @OriginalMember(owner = "client!ja", name = "k", descriptor = "Lclient!na;") public static final JagString aClass100_579 = JagString.parse("Fps:"); - @OriginalMember(owner = "client!ja", name = "l", descriptor = "[Lclient!wa;") - public static final Buffer[] aClass3_Sub15Array1 = new Buffer[2048]; - @OriginalMember(owner = "client!ja", name = "n", descriptor = "I") public static int anInt2939 = 0; diff --git a/client/src/main/java/Static116.java b/client/src/main/java/Static116.java index 160b154..5edfab8 100644 --- a/client/src/main/java/Static116.java +++ b/client/src/main/java/Static116.java @@ -7,10 +7,7 @@ public final class Static116 { @OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;") public static final JagString aClass100_583 = JagString.parse("(Y<)4col>"); - @OriginalMember(owner = "client!jb", name = "m", descriptor = "I") - public static int anInt2951 = 0; - - @OriginalMember(owner = "client!jb", name = "n", descriptor = "I") + @OriginalMember(owner = "client!jb", name = "n", descriptor = "I") public static int anInt2952 = 0; @OriginalMember(owner = "client!jb", name = "p", descriptor = "I") diff --git a/client/src/main/java/Static119.java b/client/src/main/java/Static119.java index b3f6c98..4ec477f 100644 --- a/client/src/main/java/Static119.java +++ b/client/src/main/java/Static119.java @@ -1,4 +1,3 @@ -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -48,12 +47,4 @@ public final class Static119 { } } - @OriginalMember(owner = "client!je", name = "a", descriptor = "(IIIII)V") - public static void method2387(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - WorldMap.anInt435 = WorldMap.width * arg2 / arg0; - WorldMap.anInt919 = WorldMap.length * arg1 / arg3; - WorldMap.anInt3482 = -1; - WorldMap.anInt4901 = -1; - WorldMap.method965(); - } } diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java index 40308fe..45e86a3 100644 --- a/client/src/main/java/Static122.java +++ b/client/src/main/java/Static122.java @@ -79,7 +79,7 @@ public final class Static122 { local13.anInt2028 = (arg6.getSize() + arg0) * 128; local13.sound = Static140.getSound(arg6); local13.radius = arg6.soundRadius * 128; - Static93.aClass133_7.put(local13, arg6.aClass100_364.encode37()); + Static93.aClass133_7.put(local13, arg6.username.encode37()); } } diff --git a/client/src/main/java/Static125.java b/client/src/main/java/Static125.java index c5f5f3d..37e12cb 100644 --- a/client/src/main/java/Static125.java +++ b/client/src/main/java/Static125.java @@ -28,11 +28,11 @@ public final class Static125 { public static void updateLockedCamera() { @Pc(9) int local9 = Static248.anInt4232 * 128 + 64; @Pc(15) int local15 = Static245.anInt5375 * 128 + 64; - @Pc(23) int local23 = SceneGraph.getTileHeight(Static55.level, local15, local9) - Static231.anInt5203; + @Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203; if (Static113.anInt4612 >= 100) { Static138.renderX = Static245.anInt5375 * 128 + 64; Static134.renderZ = Static248.anInt4232 * 128 + 64; - Static5.anInt40 = SceneGraph.getTileHeight(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; + Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; } else { if (Static138.renderX < local15) { Static138.renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.renderX) / 1000; @@ -73,7 +73,7 @@ public final class Static125 { } local9 = Static265.anInt5765 * 128 + 64; local15 = Static251.anInt5449 * 128 + 64; - local23 = SceneGraph.getTileHeight(Static55.level, local15, local9) - Static57.anInt1744; + local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static57.anInt1744; @Pc(236) int local236 = local23 - Static5.anInt40; @Pc(241) int local241 = local9 - Static134.renderZ; @Pc(246) int local246 = local15 - Static138.renderX; diff --git a/client/src/main/java/Static126.java b/client/src/main/java/Static126.java index 6a57e74..f1550b7 100644 --- a/client/src/main/java/Static126.java +++ b/client/src/main/java/Static126.java @@ -23,7 +23,7 @@ public final class Static126 { } Static97.anInt2503 = -1; Static169.aClass13_18 = null; - Static182.anInt4311 = Static83.loop; + Static182.anInt4311 = client.loop; if (GlRenderer.enabled) { Static263.aBoolean299 = true; } diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java index 0f17874..bcb5875 100644 --- a/client/src/main/java/Static127.java +++ b/client/src/main/java/Static127.java @@ -83,7 +83,7 @@ public final class Static127 { } } for (local96 = 0; local96 < 2048; local96++) { - @Pc(265) Player local265 = Static159.players[local96]; + @Pc(265) Player local265 = PlayerList.players[local96]; if (local265 != null) { for (local109 = 0; local109 < 10; local109++) { local265.movementQueueX[local109] -= local86; @@ -93,8 +93,8 @@ public final class Static127 { local265.zFine -= local81 * 128; } } - Static55.level = arg0; - PlayerList.self.method1265(arg5, false, arg3); + Player.level = arg0; + PlayerList.self.teleport(arg5, false, arg3); @Pc(322) byte local322 = 104; @Pc(324) byte local324 = 0; @Pc(326) byte local326 = 0; @@ -244,7 +244,7 @@ public final class Static127 { } local29 = Runtime.getRuntime(); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); - Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 })); + Chat.add(null, 0, JagString.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 })); } @Pc(117) int local117; if (arg0.equalsIgnoreCase(Static154.aClass100_735)) { @@ -254,17 +254,17 @@ public final class Static127 { } local29 = Runtime.getRuntime(); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); - Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 })); + Chat.add(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 })); Static16.method501(); client.method2380(); for (local117 = 0; local117 < 10; local117++) { System.gc(); } local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); - Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Cheat.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 })); + Chat.add(null, 0, JagString.concatenate(new JagString[] { Cheat.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 })); } if (arg0.equalsIgnoreCase(Static240.aClass100_1009)) { - Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) })); + Chat.add(null, 0, JagString.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) })); } if (GlRenderer.enabled && arg0.equalsIgnoreCase(Static201.aClass100_406)) { System.out.println("oncard_geometry:" + GlCleaner.anInt1945); @@ -330,8 +330,8 @@ public final class Static127 { throw new RuntimeException(); } if (arg0.startsWith(Cheat.aClass100_232)) { - Static199.rectDebug = arg0.substring(12).method3144().parseInt(); - Static103.method2231(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) })); + Static199.rectDebug = arg0.substring(12).trim().parseInt(); + Chat.add(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) })); } if (arg0.equalsIgnoreCase(Static181.aClass100_810)) { Static121.aBoolean154 = true; @@ -339,10 +339,10 @@ public final class Static127 { if (arg0.equalsIgnoreCase(Static124.aClass100_596)) { if (Static204.applyTweening) { Static204.applyTweening = false; - Static103.method2231(null, 0, Cheat.aClass100_943); + Chat.add(null, 0, Cheat.aClass100_943); } else { Static204.applyTweening = true; - Static103.method2231(null, 0, Static50.aClass100_362); + Chat.add(null, 0, Static50.aClass100_362); } } if (arg0.equalsIgnoreCase(Static114.aClass100_1099)) { diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java index f3b2554..331a304 100644 --- a/client/src/main/java/Static137.java +++ b/client/src/main/java/Static137.java @@ -47,7 +47,7 @@ public final class Static137 { Static251.anInt5454 = 0; for (local37 = 0; local37 < 104; local37++) { for (local76 = 0; local76 < 104; local76++) { - @Pc(169) long local169 = Static20.method602(Static55.level, local37 + 0, local76); + @Pc(169) long local169 = Static20.method602(Player.level, local37 + 0, local76); if (local169 != 0L) { @Pc(184) LocType local184 = LocTypeList.get((int) (local169 >>> 32) & Integer.MAX_VALUE); @Pc(187) int local187 = local184.mapElement; @@ -67,7 +67,7 @@ public final class Static137 { @Pc(237) int local237 = local76; local194 = local37; if (local187 != 22 && local187 != 29 && local187 != 34 && local187 != 36 && local187 != 46 && local187 != 47 && local187 != 48) { - @Pc(269) int[][] local269 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30; + @Pc(269) int[][] local269 = PathFinder.collisionMaps[Player.level].anIntArrayArray30; for (@Pc(271) int local271 = 0; local271 < 10; local271++) { @Pc(281) int local281 = (int) (Math.random() * 4.0D); if (local281 == 0 && local194 > 0 && local37 - 3 < local194 && (local269[local194 - 1][local237] & 0x12C0108) == 0) { diff --git a/client/src/main/java/Static138.java b/client/src/main/java/Static138.java index 7f6a8c4..071799b 100644 --- a/client/src/main/java/Static138.java +++ b/client/src/main/java/Static138.java @@ -49,10 +49,7 @@ public final class Static138 { @OriginalMember(owner = "client!km", name = "Ac", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array102 = new JagString[] { aClass100_649, aClass100_650, aClass100_646, aClass100_655, aClass100_644, aClass100_656, aClass100_642, aClass100_653, aClass100_657, aClass100_658, aClass100_645, aClass100_641 }; - @OriginalMember(owner = "client!km", name = "Bc", descriptor = "[I") - public static final int[] updatedVarcs = new int[32]; - - @OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;") public static final JagString LOGINSCREEN = JagString.parse("loginscreen"); @OriginalMember(owner = "client!km", name = "Rc", descriptor = "[I") diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java index e5dc3ef..d9f7956 100644 --- a/client/src/main/java/Static140.java +++ b/client/src/main/java/Static140.java @@ -27,30 +27,30 @@ public final class Static140 { return; } if (Static35.anInt1093 >= 100) { - Static103.method2231(JagString.EMPTY, 0, LocalizedText.IGNORELISTFULL); + Chat.add(JagString.EMPTY, 0, LocalizedText.IGNORELISTFULL); return; } @Pc(34) JagString local34 = Base37.decodeLowerCase(arg0).method3125(); @Pc(36) int local36; for (local36 = 0; local36 < Static35.anInt1093; local36++) { - if (Static190.aLongArray6[local36] == arg0) { - Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE})); + if (IgnoreList.encodedUsernames[local36] == arg0) { + Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE})); return; } } for (local36 = 0; local36 < Static9.anInt178; local36++) { if (Static92.aLongArray3[local36] == arg0) { - Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND})); + Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND})); return; } } - if (local34.strEquals(PlayerList.self.aClass100_364)) { - Static103.method2231(JagString.EMPTY, 0, LocalizedText.IGNORECANTADDSELF); + if (local34.strEquals(PlayerList.self.username)) { + Chat.add(JagString.EMPTY, 0, LocalizedText.IGNORECANTADDSELF); return; } - Static190.aLongArray6[Static35.anInt1093] = arg0; + IgnoreList.encodedUsernames[Static35.anInt1093] = arg0; Static193.aClass100Array134[Static35.anInt1093++] = Base37.decodeLowerCase(arg0); - Static185.anInt4369 = InterfaceList.transmitTimer; + FriendsList.transmitAt = InterfaceList.transmitTimer; Protocol.outboundBuffer.p1isaac(34); Protocol.outboundBuffer.p8(arg0); } diff --git a/client/src/main/java/Static141.java b/client/src/main/java/Static141.java index 1cdf2ee..5a5dc95 100644 --- a/client/src/main/java/Static141.java +++ b/client/src/main/java/Static141.java @@ -38,7 +38,7 @@ public final class Static141 { WorldMap.clear(false); TitleScreen.clear(); for (@Pc(39) int local39 = 0; local39 < 2048; local39++) { - @Pc(46) Player player = Static159.players[local39]; + @Pc(46) Player player = PlayerList.players[local39]; if (player != null) { player.attachment = null; } @@ -75,7 +75,7 @@ public final class Static141 { if (arg0 && Static113.anInt4612 >= 100) { Static138.renderX = Static245.anInt5375 * 128 + 64; Static134.renderZ = Static248.anInt4232 * 128 + 64; - Static5.anInt40 = SceneGraph.getTileHeight(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; + Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; } Static227.cameraType = 2; } diff --git a/client/src/main/java/Static142.java b/client/src/main/java/Static142.java index b7fa04c..3eef721 100644 --- a/client/src/main/java/Static142.java +++ b/client/src/main/java/Static142.java @@ -20,14 +20,14 @@ public final class Static142 { @Pc(310) int local310; @Pc(359) int local359; @Pc(639) int local639; - for (local5 = -1; local5 < Static267.anInt5774 + Static272.anInt5214; local5++) { + for (local5 = -1; local5 < PlayerList.size + Static272.anInt5214; local5++) { @Pc(17) PathingEntity local17; if (local5 == -1) { local17 = PlayerList.self; - } else if (Static267.anInt5774 > local5) { - local17 = Static159.players[Static105.anIntArray256[local5]]; + } else if (PlayerList.size > local5) { + local17 = PlayerList.players[PlayerList.ids[local5]]; } else { - local17 = Static175.npcs[Static33.anIntArray79[local5 - Static267.anInt5774]]; + local17 = Static175.npcs[Static33.anIntArray79[local5 - PlayerList.size]]; } if (local17 != null && local17.method2682()) { @Pc(58) NpcType local58; @@ -41,7 +41,7 @@ public final class Static142 { } } @Pc(161) int local161; - if (local5 >= Static267.anInt5774) { + if (local5 >= PlayerList.size) { local58 = ((Npc) local17).type; if (local58.multiNpcs != null) { local58 = local58.getMultiNpc(); @@ -60,7 +60,7 @@ public final class Static142 { @Pc(308) Class102[] local308 = Static143.aClass102Array1; for (local310 = 0; local310 < local308.length; local310++) { @Pc(322) Class102 local322 = local308[local310]; - if (local322 != null && local322.anInt4058 == 1 && local322.anInt4057 == Static33.anIntArray79[local5 - Static267.anInt5774] && Static83.loop % 20 < 10) { + if (local322 != null && local322.anInt4058 == 1 && local322.anInt4057 == Static33.anIntArray79[local5 - PlayerList.size] && client.loop % 20 < 10) { if (local58.anInt3730 == -1) { local359 = local17.method2691() + 15; } else { @@ -92,7 +92,7 @@ public final class Static142 { @Pc(159) Class102[] local159 = Static143.aClass102Array1; for (local161 = 0; local161 < local159.length; local161++) { @Pc(173) Class102 local173 = local159[local161]; - if (local173 != null && local173.anInt4058 == 10 && Static105.anIntArray256[local5] == local173.anInt4057) { + if (local173 != null && local173.anInt4058 == 10 && PlayerList.ids[local5] == local173.anInt4057) { Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1); if (Static65.anInt1951 > -1) { Sprites.headhints[local173.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, arg0 + (Static16.anInt548 - local74)); @@ -101,21 +101,21 @@ public final class Static142 { } } } - if (local17.aClass100_640 != null && (local5 >= Static267.anInt5774 || Static59.anInt1812 == 0 || Static59.anInt1812 == 3 || Static59.anInt1812 == 1 && Static98.method1965(((Player) local17).aClass100_364))) { + if (local17.chatMessage != null && (local5 >= PlayerList.size || Static59.anInt1812 == 0 || Static59.anInt1812 == 3 || Static59.anInt1812 == 1 && Static98.method1965(((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.aClass100_640) / 2; + 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.anInt3429; - Static191.anIntArray391[Static277.anInt5854] = local17.anInt3352; - Static191.anIntArray384[Static277.anInt5854] = local17.anInt3408; - Static191.aClass100Array132[Static277.anInt5854] = local17.aClass100_640; + 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 (local17.anInt3378 > Static83.loop) { + if (local17.hitpointsBarVisibleUntil > client.loop) { @Pc(508) Sprite local508 = Sprites.hitbars[0]; @Pc(512) Sprite local512 = Sprites.hitbars[1]; if (local17 instanceof Npc) { @@ -145,7 +145,7 @@ public final class Static142 { local161 = Static65.anInt1951 + arg2 - (local508.anInt1867 >> 1); local359 = Static16.anInt548 + arg0 - 3; local508.method1423(local161, local359); - local639 = local508.anInt1867 * local17.anInt3372 / 255; + local639 = local508.anInt1867 * local17.hitpointsBar / 255; local642 = local508.anInt1859; if (GlRenderer.enabled) { Static46.method1183(local161, local359, local161 + local639, local359 + local642); @@ -161,7 +161,7 @@ public final class Static142 { } } for (local74 = 0; local74 < 4; local74++) { - if (local17.anIntArray319[local74] > Static83.loop) { + if (local17.anIntArray319[local74] > client.loop) { if (local17 instanceof Npc) { @Pc(725) Npc local725 = (Npc) local17; @Pc(728) NpcType local728 = local725.type; diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java index ff18f66..966e667 100644 --- a/client/src/main/java/Static145.java +++ b/client/src/main/java/Static145.java @@ -72,8 +72,8 @@ public final class Static145 { SoftwareRaster.drawRect(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0); } Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local11 + 3, local3 + 14, 6116423, -1); - @Pc(96) int local96 = Static223.anInt5032; - @Pc(98) int local98 = Static215.anInt4873; + @Pc(96) int local96 = Mouse.anInt5032; + @Pc(98) int local98 = Mouse.anInt4873; for (@Pc(107) int local107 = 0; local107 < Static231.anInt5204; local107++) { @Pc(127) int local127 = (Static231.anInt5204 - local107 - 1) * 15 + local3 + 31; @Pc(129) int local129 = 16777215; diff --git a/client/src/main/java/Static153.java b/client/src/main/java/Static153.java index eb6f7cd..bf6fa39 100644 --- a/client/src/main/java/Static153.java +++ b/client/src/main/java/Static153.java @@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static153 { - @OriginalMember(owner = "client!mc", name = "Y", descriptor = "[Lclient!na;") - public static final JagString[] aClass100Array112 = new JagString[100]; - - @OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I") + @OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I") public static final int[] anIntArray351 = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 }; @OriginalMember(owner = "client!mc", name = "fb", descriptor = "Lclient!na;") diff --git a/client/src/main/java/Static154.java b/client/src/main/java/Static154.java index be05b51..15dbfd6 100644 --- a/client/src/main/java/Static154.java +++ b/client/src/main/java/Static154.java @@ -40,24 +40,6 @@ public final class Static154 { return true; } - @OriginalMember(owner = "client!md", name = "a", descriptor = "(IILclient!na;Lclient!na;BLclient!na;)V") - public static void method2928(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString arg2, @OriginalArg(3) JagString arg3, @OriginalArg(5) JagString arg4) { - for (@Pc(14) int local14 = 99; local14 > 0; local14--) { - Static26.anIntArray67[local14] = Static26.anIntArray67[local14 - 1]; - Static153.aClass100Array112[local14] = Static153.aClass100Array112[local14 - 1]; - Static230.aClass100Array158[local14] = Static230.aClass100Array158[local14 - 1]; - Static64.aClass100Array62[local14] = Static64.aClass100Array62[local14 - 1]; - Static241.anIntArray521[local14] = Static241.anIntArray521[local14 - 1]; - } - Static62.anInt1941++; - Static26.anIntArray67[0] = arg1; - Static153.aClass100Array112[0] = arg4; - Static49.anInt1464 = InterfaceList.transmitTimer; - Static241.anIntArray521[0] = arg0; - Static230.aClass100Array158[0] = arg2; - Static64.aClass100Array62[0] = arg3; - } - @OriginalMember(owner = "client!md", name = "a", descriptor = "(JB)Lclient!na;") public static JagString method2929(@OriginalArg(0) long arg0) { return Static59.method1376(arg0); diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java index 66876eb..2adb858 100644 --- a/client/src/main/java/Static158.java +++ b/client/src/main/java/Static158.java @@ -46,7 +46,7 @@ public final class Static158 { Static175.npcs[local97] = new Npc(); @Pc(198) Npc local198 = Static175.npcs[local97]; Static33.anIntArray79[Static272.anInt5214++] = local97; - local198.anInt3430 = Static83.loop; + local198.lastSeenLoop = client.loop; local198.method2698(local148); local198.method2692(local198.type.soze); local198.anInt3400 = local198.anInt3381 = Static56.anIntArray141[local198.type.aByte11]; diff --git a/client/src/main/java/Static159.java b/client/src/main/java/Static159.java index 693bcab..eb381b0 100644 --- a/client/src/main/java/Static159.java +++ b/client/src/main/java/Static159.java @@ -10,10 +10,7 @@ public final class Static159 { @OriginalMember(owner = "client!mi", name = "R", descriptor = "Lclient!na;") public static final JagString aClass100_760 = JagString.parse(")1"); - @OriginalMember(owner = "client!mi", name = "S", descriptor = "[Lclient!e;") - public static final Player[] players = new Player[2048]; - - @OriginalMember(owner = "client!mi", name = "U", descriptor = "[J") + @OriginalMember(owner = "client!mi", name = "U", descriptor = "[J") public static final long[] aLongArray5 = new long[500]; @OriginalMember(owner = "client!mi", name = "Y", descriptor = "[[[Lclient!ih;") diff --git a/client/src/main/java/Static17.java b/client/src/main/java/Static17.java index e777c47..9e3bdc9 100644 --- a/client/src/main/java/Static17.java +++ b/client/src/main/java/Static17.java @@ -10,54 +10,6 @@ public final class Static17 { @OriginalMember(owner = "client!bg", name = "M", descriptor = "I") public static int milliseconds = 0; - @OriginalMember(owner = "client!bg", name = "a", descriptor = "(B)V") - public static void method527() { - Protocol.inboundBuffer.method2233(); - @Pc(11) int local11 = Protocol.inboundBuffer.method2238(1); - if (local11 == 0) { - return; - } - @Pc(23) int local23 = Protocol.inboundBuffer.method2238(2); - if (local23 == 0) { - Static44.anIntArray106[Static116.anInt2951++] = 2047; - return; - } - @Pc(54) int local54; - @Pc(64) int local64; - if (local23 == 1) { - local54 = Protocol.inboundBuffer.method2238(3); - PlayerList.self.method2684(1, local54); - local64 = Protocol.inboundBuffer.method2238(1); - if (local64 == 1) { - Static44.anIntArray106[Static116.anInt2951++] = 2047; - } - } else if (local23 == 2) { - if (Protocol.inboundBuffer.method2238(1) == 1) { - local54 = Protocol.inboundBuffer.method2238(3); - PlayerList.self.method2684(2, local54); - local64 = Protocol.inboundBuffer.method2238(3); - PlayerList.self.method2684(2, local64); - } else { - local54 = Protocol.inboundBuffer.method2238(3); - PlayerList.self.method2684(0, local54); - } - local54 = Protocol.inboundBuffer.method2238(1); - if (local54 == 1) { - Static44.anIntArray106[Static116.anInt2951++] = 2047; - } - } else if (local23 == 3) { - local54 = Protocol.inboundBuffer.method2238(7); - local64 = Protocol.inboundBuffer.method2238(1); - Static55.level = Protocol.inboundBuffer.method2238(2); - @Pc(163) int local163 = Protocol.inboundBuffer.method2238(1); - if (local163 == 1) { - Static44.anIntArray106[Static116.anInt2951++] = 2047; - } - @Pc(181) int local181 = Protocol.inboundBuffer.method2238(7); - PlayerList.self.method1265(local181, local64 == 1, local54); - } - } - @OriginalMember(owner = "client!bg", name = "d", descriptor = "(II)Z") public static boolean method530(@OriginalArg(0) int arg0) { return arg0 == 198 || arg0 == 230 || arg0 == 156 || arg0 == 140 || arg0 == 223; diff --git a/client/src/main/java/Static173.java b/client/src/main/java/Static173.java index bcd2683..e59f8dc 100644 --- a/client/src/main/java/Static173.java +++ b/client/src/main/java/Static173.java @@ -116,8 +116,8 @@ public final class Static173 { if (!local16.type.aBoolean183) { local262 |= Long.MIN_VALUE; } - local16.anInt3424 = SceneGraph.getTileHeight(Static55.level, local16.xFine, local16.zFine); - Static43.method1141(Static55.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171); + 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); } } } diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java index c76bbed..b1da26b 100644 --- a/client/src/main/java/Static176.java +++ b/client/src/main/java/Static176.java @@ -88,7 +88,7 @@ public final class Static176 { if (local121 != local112) { local112 = local121; @Pc(240) int local240; - if (local133 == 2 && Static257.method523(Static55.level, local47, local147, local121)) { + if (local133 == 2 && Static257.method523(Player.level, local47, local147, local121)) { @Pc(172) LocType local172 = LocTypeList.get(local140); if (local172.multiLocs != null) { local172 = local172.getMultiLoc(); @@ -160,19 +160,19 @@ public final class Static176 { Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147); } } - for (local493 = 0; local493 < Static267.anInt5774; local493++) { - local597 = Static159.players[Static105.anIntArray256[local493]]; + for (local493 = 0; local493 < PlayerList.size; local493++) { + local597 = PlayerList.players[PlayerList.ids[local493]]; local514 = local597.xFine + 64 - local597.getSize() * 64; local526 = local597.zFine + 64 - local597.getSize() * 64; if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.soze - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.soze - (local526 - local240 >> 7)) { - Static217.method3767(Static105.anIntArray256[local493], local147, local597, local47); + Static217.method3767(PlayerList.ids[local493], local147, local597, local47); } } } Static246.method4240(local421.type, local47, local140, local147); } if (local133 == 0) { - @Pc(688) Player local688 = Static159.players[local140]; + @Pc(688) Player local688 = PlayerList.players[local140]; if ((local688.xFine & 0x7F) == 64 && (local688.zFine & 0x7F) == 64) { local479 = local688.xFine - (local688.getSize() - 1) * 64; local240 = local688.zFine + 64 - local688.getSize() * 64; @@ -184,19 +184,19 @@ public final class Static176 { Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147); } } - for (local493 = 0; local493 < Static267.anInt5774; local493++) { - local597 = Static159.players[Static105.anIntArray256[local493]]; + for (local493 = 0; local493 < PlayerList.size; local493++) { + local597 = PlayerList.players[PlayerList.ids[local493]]; local514 = local597.xFine - (local597.getSize() - 1) * 64; local526 = local597.zFine + 64 - local597.getSize() * 64; if (local597 != null && local597 != local688 && local479 <= local514 && local597.getSize() <= local688.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local688.getSize() - (local526 - local240 >> 7)) { - Static217.method3767(Static105.anIntArray256[local493], local147, local597, local47); + Static217.method3767(PlayerList.ids[local493], local147, local597, local47); } } } Static217.method3767(local140, local147, local688, local47); } if (local133 == 3) { - @Pc(931) LinkedList local931 = Static159.aClass69ArrayArrayArray1[Static55.level][local47][local147]; + @Pc(931) LinkedList local931 = Static159.aClass69ArrayArrayArray1[Player.level][local47][local147]; if (local931 != null) { for (@Pc(940) ObjStackNode local940 = (ObjStackNode) local931.method2279(); local940 != null; local940 = (ObjStackNode) local931.method2286()) { local240 = local940.aClass8_Sub7_1.anInt5555; diff --git a/client/src/main/java/Static18.java b/client/src/main/java/Static18.java index 0a78dd9..2f4272e 100644 --- a/client/src/main/java/Static18.java +++ b/client/src/main/java/Static18.java @@ -18,7 +18,7 @@ public final class Static18 { @OriginalMember(owner = "client!bh", name = "a", descriptor = "(Lclient!fe;Z)V") public static void method553(@OriginalArg(0) PathingEntity arg0) { - @Pc(8) int local8 = arg0.anInt3395 - Static83.loop; + @Pc(8) int local8 = arg0.anInt3395 - client.loop; @Pc(20) int local20 = arg0.anInt3380 * 128 + arg0.getSize() * 64; @Pc(36) int local36 = arg0.anInt3428 * 128 + arg0.getSize() * 64; if (arg0.anInt3431 == 0) { diff --git a/client/src/main/java/Static185.java b/client/src/main/java/Static185.java index 81a8998..6e47fc4 100644 --- a/client/src/main/java/Static185.java +++ b/client/src/main/java/Static185.java @@ -10,9 +10,6 @@ public final class Static185 { @OriginalMember(owner = "client!p", name = "g", descriptor = "F") public static float aFloat23; - @OriginalMember(owner = "client!p", name = "d", descriptor = "I") - public static int anInt4369 = 0; - @OriginalMember(owner = "client!p", name = "a", descriptor = "(I)V") public static void method3395() { if (LoginManager.step == 5) { diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java index f6b8b38..ab37f14 100644 --- a/client/src/main/java/Static19.java +++ b/client/src/main/java/Static19.java @@ -34,28 +34,28 @@ public final class Static19 { @OriginalMember(owner = "client!bi", name = "f", descriptor = "(B)V") public static void loop() { @Pc(11) int local11; - for (local11 = -1; local11 < Static267.anInt5774; local11++) { + for (local11 = -1; local11 < PlayerList.size; local11++) { @Pc(22) int local22; if (local11 == -1) { local22 = 2047; } else { - local22 = Static105.anIntArray256[local11]; + local22 = PlayerList.ids[local11]; } - @Pc(30) Player local30 = Static159.players[local22]; - if (local30 != null && local30.anInt3408 > 0) { - local30.anInt3408--; - if (local30.anInt3408 == 0) { - local30.aClass100_640 = null; + @Pc(30) Player local30 = PlayerList.players[local22]; + if (local30 != null && local30.chatLoops > 0) { + local30.chatLoops--; + if (local30.chatLoops == 0) { + local30.chatMessage = null; } } } for (local11 = 0; local11 < Static272.anInt5214; local11++) { @Pc(68) int local68 = Static33.anIntArray79[local11]; @Pc(72) Npc local72 = Static175.npcs[local68]; - if (local72 != null && local72.anInt3408 > 0) { - local72.anInt3408--; - if (local72.anInt3408 == 0) { - local72.aClass100_640 = null; + if (local72 != null && local72.chatLoops > 0) { + local72.chatLoops--; + if (local72.chatLoops == 0) { + local72.chatMessage = null; } } } diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java index d646717..6817feb 100644 --- a/client/src/main/java/Static190.java +++ b/client/src/main/java/Static190.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static190 { - @OriginalMember(owner = "client!pf", name = "h", descriptor = "[J") - public static final long[] aLongArray6 = new long[100]; - @OriginalMember(owner = "client!pf", name = "r", descriptor = "[I") public static final int[] anIntArray382 = new int[500]; diff --git a/client/src/main/java/Static192.java b/client/src/main/java/Static192.java index fc66964..185d35a 100644 --- a/client/src/main/java/Static192.java +++ b/client/src/main/java/Static192.java @@ -20,7 +20,7 @@ public final class Static192 { if (local29 == PlayerList.selfId) { local40 = PlayerList.self; } else { - local40 = Static159.players[local29]; + local40 = PlayerList.players[local29]; } } else { local29 = local17.anInt1192 - 1; @@ -28,7 +28,7 @@ public final class Static192 { } if (local40 != null) { @Pc(63) LocType local63 = LocTypeList.get(local17.anInt1189); - if (Static55.level < 3) { + if (Player.level < 3) { } @Pc(86) int local86; @Pc(83) int local83; @@ -43,40 +43,40 @@ public final class Static192 { @Pc(110) int local110 = (local86 >> 1) + local17.anInt1190; @Pc(117) int local117 = (local83 >> 1) + local17.anInt1204; @Pc(126) int local126 = (local83 + 1 >> 1) + local17.anInt1204; - @Pc(130) int[][] local130 = Static83.activeTileHeightMap[Static55.level]; + @Pc(130) int[][] local130 = Static83.activeTileHeightMap[Player.level]; @Pc(157) int local157 = local130[local103][local126] + local130[local110][local126] + local130[local110][local117] + local130[local103][local117] >> 2; @Pc(159) Entity local159 = null; @Pc(164) int local164 = Static133.anIntArray453[local17.anInt1198]; if (local164 == 0) { - @Pc(176) Wall local176 = Static262.method4509(Static55.level, local17.anInt1190, local17.anInt1204); + @Pc(176) Wall local176 = Static262.method4509(Player.level, local17.anInt1190, local17.anInt1204); if (local176 != null) { local159 = local176.aClass8_5; } } else if (local164 == 1) { - @Pc(231) WallDecor local231 = Static83.method435(Static55.level, local17.anInt1190, local17.anInt1204); + @Pc(231) WallDecor local231 = Static83.method435(Player.level, local17.anInt1190, local17.anInt1204); if (local231 != null) { local159 = local231.aClass8_3; } } else if (local164 == 2) { - @Pc(198) Scenery local198 = Static133.method4008(Static55.level, local17.anInt1190, local17.anInt1204); + @Pc(198) Scenery local198 = Static133.method4008(Player.level, local17.anInt1190, local17.anInt1204); if (local198 != null) { local159 = local198.aClass8_4; } } else if (local164 == 3) { - @Pc(216) GroundDecor local216 = Static269.method2210(Static55.level, local17.anInt1190, local17.anInt1204); + @Pc(216) GroundDecor local216 = Static269.method2210(Player.level, local17.anInt1190, local17.anInt1204); if (local216 != null) { local159 = local216.aClass8_1; } } if (local159 != null) { - Static29.method800(Static55.level, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1); - local40.anInt3375 = local17.anInt1205 + Static83.loop; + Static29.method800(Player.level, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1); + local40.anInt3375 = local17.anInt1205 + client.loop; local40.anInt3426 = local83 * 64 + local17.anInt1204 * 128; local40.anInt3379 = local86 * 64 + local17.anInt1190 * 128; local40.attachment = local159; @Pc(292) int local292 = local17.anInt1188; local40.anInt3406 = local157; - local40.anInt3390 = Static83.loop + local17.anInt1187; + local40.anInt3390 = client.loop + local17.anInt1187; @Pc(304) int local304 = local17.anInt1191; @Pc(307) int local307 = local17.anInt1197; @Pc(310) int local310 = local17.anInt1200; diff --git a/client/src/main/java/Static193.java b/client/src/main/java/Static193.java index c9ec1e7..186fa09 100644 --- a/client/src/main/java/Static193.java +++ b/client/src/main/java/Static193.java @@ -36,7 +36,7 @@ public final class Static193 { Static106.anIntArray258[local41] = Static106.anIntArray258[local41 + 1]; Static3.aBooleanArray135[local41] = Static3.aBooleanArray135[local41 + 1]; } - Static185.anInt4369 = InterfaceList.transmitTimer; + FriendsList.transmitAt = InterfaceList.transmitTimer; Protocol.outboundBuffer.p1isaac(57); Protocol.outboundBuffer.p8(arg0); break; diff --git a/client/src/main/java/Static195.java b/client/src/main/java/Static195.java index c66cb83..3f1f77b 100644 --- a/client/src/main/java/Static195.java +++ b/client/src/main/java/Static195.java @@ -21,13 +21,13 @@ public final class Static195 { public static void method3532() { for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.method2289(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.method2288()) { @Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1; - if (Static55.level != local21.anInt4810 || local21.anInt4800 < Static83.loop) { + if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) { local16.unlink(); - } else if (Static83.loop >= local21.anInt4822) { + } else if (client.loop >= local21.anInt4822) { if (local21.anInt4819 > 0) { @Pc(54) Npc local54 = Static175.npcs[local21.anInt4819 - 1]; if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) { - local21.method3705(local54.zFine, Static83.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine); + local21.method3705(local54.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine); } } if (local21.anInt4819 < 0) { @@ -36,14 +36,14 @@ public final class Static195 { if (PlayerList.selfId == local102) { local107 = PlayerList.self; } else { - local107 = Static159.players[local102]; + local107 = PlayerList.players[local102]; } if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) { - local21.method3705(local107.zFine, Static83.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine); + local21.method3705(local107.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine); } } local21.method3704(Static178.anInt4247); - Static43.method1141(Static55.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false); + 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/Static198.java b/client/src/main/java/Static198.java index 4242726..45b0d72 100644 --- a/client/src/main/java/Static198.java +++ b/client/src/main/java/Static198.java @@ -52,7 +52,7 @@ public final class Static198 { Static65.anInt1951 = -1; return; } - @Pc(38) int local38 = SceneGraph.getTileHeight(Static55.level, arg5, arg2) - arg3; + @Pc(38) int local38 = SceneGraph.getTileHeight(Player.level, arg5, arg2) - arg3; @Pc(42) int local42 = arg2 - Static134.renderZ; @Pc(46) int local46 = local38 - Static5.anInt40; @Pc(50) int local50 = arg5 - Static138.renderX; diff --git a/client/src/main/java/Static2.java b/client/src/main/java/Static2.java index 2cf6cf9..fdb8702 100644 --- a/client/src/main/java/Static2.java +++ b/client/src/main/java/Static2.java @@ -83,7 +83,7 @@ public final class Static2 { @Pc(61) int local61 = 0; @Pc(64) int local64 = local53 + 1; Static84.anIntArray209[0] = arg3; - @Pc(71) int[][] local71 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30; + @Pc(71) int[][] local71 = PathFinder.collisionMaps[Player.level].anIntArrayArray30; @Pc(193) int local193; while (local61 != local64) { local3 = Static259.anIntArray514[local61]; @@ -94,16 +94,16 @@ public final class Static2 { break; } if (arg1 != 0) { - if ((arg1 < 5 || arg1 == 10) && PathFinder.collisionMaps[Static55.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) { + if ((arg1 < 5 || arg1 == 10) && PathFinder.collisionMaps[Player.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) { local59 = true; break; } - if (arg1 < 10 && PathFinder.collisionMaps[Static55.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) { + if (arg1 < 10 && PathFinder.collisionMaps[Player.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) { local59 = true; break; } } - if (arg0 != 0 && arg6 != 0 && PathFinder.collisionMaps[Static55.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) { + if (arg0 != 0 && arg6 != 0 && PathFinder.collisionMaps[Player.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) { local59 = true; break; } @@ -271,17 +271,17 @@ public final class Static2 { } } else if (local16 == 327) { arg0.modelXAngle = 150; - arg0.modelYAngle = (int) (Math.sin((double) Static83.loop / 40.0D) * 256.0D) & 0x7FF; + arg0.modelYAngle = (int) (Math.sin((double) client.loop / 40.0D) * 256.0D) & 0x7FF; arg0.modelType = 5; arg0.modelId = -1; } else if (local16 == 328) { - if (PlayerList.self.aClass100_364 == null) { + if (PlayerList.self.username == null) { arg0.modelId = 0; } else { arg0.modelXAngle = 150; - arg0.modelYAngle = (int) (Math.sin((double) Static83.loop / 40.0D) * 256.0D) & 0x7FF; + arg0.modelYAngle = (int) (Math.sin((double) client.loop / 40.0D) * 256.0D) & 0x7FF; arg0.modelType = 5; - arg0.modelId = ((int) PlayerList.self.aClass100_364.encode37() << 11) + 2047; + arg0.modelId = ((int) PlayerList.self.username.encode37() << 11) + 2047; arg0.anInt496 = PlayerList.self.anInt3388; arg0.anInt500 = 0; arg0.anInt522 = PlayerList.self.anInt3366; diff --git a/client/src/main/java/Static205.java b/client/src/main/java/Static205.java index 6cc8b03..d266f5d 100644 --- a/client/src/main/java/Static205.java +++ b/client/src/main/java/Static205.java @@ -7,7 +7,7 @@ public final class Static205 { public static JagString method3677(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1) { if (!Static36.method940(arg0).method503(arg1) && arg0.anObjectArray29 == null) { return null; - } else if (arg0.aClass100Array18 == null || arg0.aClass100Array18.length <= arg1 || arg0.aClass100Array18[arg1] == null || arg0.aClass100Array18[arg1].method3144().length() == 0) { + } else if (arg0.aClass100Array18 == null || arg0.aClass100Array18.length <= arg1 || arg0.aClass100Array18[arg1] == null || arg0.aClass100Array18[arg1].trim().length() == 0) { return Static121.aBoolean154 ? JagString.concatenate(new JagString[] { Static207.aClass100_903, Static123.parseInt(arg1) }) : null; } else { return arg0.aClass100Array18[arg1]; diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java index 2c6db7a..66b74b2 100644 --- a/client/src/main/java/Static207.java +++ b/client/src/main/java/Static207.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static207 { - @OriginalMember(owner = "client!ql", name = "d", descriptor = "I") - public static int anInt4778 = 0; - @OriginalMember(owner = "client!ql", name = "h", descriptor = "Lclient!na;") public static final JagString aClass100_903 = JagString.parse("Hidden)2"); diff --git a/client/src/main/java/Static209.java b/client/src/main/java/Static209.java index 85c077d..aaab0e0 100644 --- a/client/src/main/java/Static209.java +++ b/client/src/main/java/Static209.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static209 { - @OriginalMember(owner = "client!ra", name = "J", descriptor = "I") - public static int miscTransmitAt = 0; - @OriginalMember(owner = "client!ra", name = "jb", descriptor = "J") public static volatile long aLong161 = 0L; diff --git a/client/src/main/java/Static214.java b/client/src/main/java/Static214.java index 0826019..0e7d011 100644 --- a/client/src/main/java/Static214.java +++ b/client/src/main/java/Static214.java @@ -18,9 +18,9 @@ public final class Static214 { @OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V") public static void method4359(@OriginalArg(0) Player arg0) { - @Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.get(arg0.aClass100_364.encode37()); + @Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.get(arg0.username.encode37()); if (local12 == null) { - Static122.method2411(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Static55.level, arg0); + Static122.method2411(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Player.level, arg0); } else { local12.update(); } diff --git a/client/src/main/java/Static215.java b/client/src/main/java/Static215.java index 2301786..b227039 100644 --- a/client/src/main/java/Static215.java +++ b/client/src/main/java/Static215.java @@ -14,7 +14,4 @@ public final class Static215 { @OriginalMember(owner = "client!rh", name = "k", descriptor = "I") public static int anInt4870 = 0; - @OriginalMember(owner = "client!rh", name = "o", descriptor = "I") - public static int anInt4873 = 0; - } diff --git a/client/src/main/java/Static217.java b/client/src/main/java/Static217.java index 6b003b6..04e3d9b 100644 --- a/client/src/main/java/Static217.java +++ b/client/src/main/java/Static217.java @@ -38,12 +38,12 @@ public final class Static217 { } @Pc(95) JagString local95 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL; if (arg2.anInt1652 < arg2.anInt1656) { - local158 = JagString.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static78.aClass100_465, Static123.parseInt(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 }); + local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static78.aClass100_465, Static123.parseInt(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 }); } else { - local158 = JagString.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static72.aClass100_448 }); + local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? Static123.method2420(arg2.anInt1652, PlayerList.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static72.aClass100_448 }); } } else { - local158 = JagString.concatenate(new JagString[] { arg2.method1264(), Static123.aClass100_593, LocalizedText.SKILL, Static123.parseInt(arg2.anInt1671), Static72.aClass100_448 }); + local158 = JagString.concatenate(new JagString[] { arg2.getName(), Static123.aClass100_593, LocalizedText.SKILL, Static123.parseInt(arg2.anInt1671), Static72.aClass100_448 }); } @Pc(275) int local275; if (Static260.anInt5014 == 1) { diff --git a/client/src/main/java/Static218.java b/client/src/main/java/Static218.java index 291bb69..e80b409 100644 --- a/client/src/main/java/Static218.java +++ b/client/src/main/java/Static218.java @@ -116,7 +116,7 @@ public final class Static218 { public static int spaceWidth = 0; @OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;)Lclient!na;") - public static JagString method2862(@OriginalArg(0) JagString arg0) { + public static JagString escape(@OriginalArg(0) JagString arg0) { @Pc(3) int local3 = arg0.length(); @Pc(5) int local5 = 0; @Pc(15) int local15; diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 1038351..af3cf85 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -12,9 +12,9 @@ public final class Static220 { @OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V") public static void spawnGroundObject(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - @Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Static55.level][arg1][arg0]; + @Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Player.level][arg1][arg0]; if (local9 == null) { - Static187.method3420(Static55.level, arg1, arg0); + Static187.method3420(Player.level, arg1, arg0); return; } @Pc(28) int local28 = -99999999; @@ -32,7 +32,7 @@ public final class Static220 { } } if (local30 == null) { - Static187.method3420(Static55.level, arg1, arg0); + Static187.method3420(Player.level, arg1, arg0); return; } local9.addHead(local30); @@ -50,7 +50,7 @@ public final class Static220 { } } @Pc(152) long local152 = (long) ((arg0 << 7) + arg1 + 1610612736); - Static69.method1543(Static55.level, arg1, arg0, SceneGraph.getTileHeight(Static55.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91); + Static69.method1543(Player.level, arg1, arg0, SceneGraph.getTileHeight(Player.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91); } @OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V") diff --git a/client/src/main/java/Static223.java b/client/src/main/java/Static223.java index 8e0c04c..fce585a 100644 --- a/client/src/main/java/Static223.java +++ b/client/src/main/java/Static223.java @@ -13,10 +13,7 @@ public final class Static223 { @OriginalMember(owner = "client!sc", name = "p", descriptor = "I") public static int anInt5029 = 0; - @OriginalMember(owner = "client!sc", name = "v", descriptor = "I") - public static int anInt5032 = 0; - - @OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z") + @OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z") public static final boolean[] aBooleanArray116 = new boolean[100]; @OriginalMember(owner = "client!sc", name = "D", descriptor = "Lclient!na;") diff --git a/client/src/main/java/Static225.java b/client/src/main/java/Static225.java index 5d4a3f8..b9aa47b 100644 --- a/client/src/main/java/Static225.java +++ b/client/src/main/java/Static225.java @@ -13,49 +13,6 @@ public final class Static225 { @OriginalMember(owner = "client!se", name = "m", descriptor = "Lclient!na;") public static final JagString aClass100_961 = JagString.parse(" )2>"); - @OriginalMember(owner = "client!se", name = "a", descriptor = "(I)V") - public static void method3889() { - while (true) { - if (Protocol.inboundBuffer.method2241(Protocol.length) >= 11) { - @Pc(20) int local20 = Protocol.inboundBuffer.method2238(11); - if (local20 != 2047) { - @Pc(27) boolean local27 = false; - if (Static159.players[local20] == null) { - Static159.players[local20] = new Player(); - local27 = true; - if (Static115.aClass3_Sub15Array1[local20] != null) { - Static159.players[local20].method1262(Static115.aClass3_Sub15Array1[local20]); - } - } - Static105.anIntArray256[Static267.anInt5774++] = local20; - @Pc(65) Player local65 = Static159.players[local20]; - local65.anInt3430 = Static83.loop; - @Pc(73) int local73 = Protocol.inboundBuffer.method2238(1); - if (local73 == 1) { - Static44.anIntArray106[Static116.anInt2951++] = local20; - } - @Pc(92) int local92 = Protocol.inboundBuffer.method2238(5); - @Pc(99) int local99 = Static56.anIntArray141[Protocol.inboundBuffer.method2238(3)]; - if (local92 > 15) { - local92 -= 32; - } - if (local27) { - local65.anInt3400 = local65.anInt3381 = local99; - } - @Pc(116) int local116 = Protocol.inboundBuffer.method2238(1); - @Pc(121) int local121 = Protocol.inboundBuffer.method2238(5); - if (local121 > 15) { - local121 -= 32; - } - local65.method1265(local92 + PlayerList.self.movementQueueX[0], local116 == 1, PlayerList.self.movementQueueZ[0] + local121); - continue; - } - } - Protocol.inboundBuffer.method2244(); - return; - } - } - @OriginalMember(owner = "client!se", name = "a", descriptor = "(IIIIZ)I") public static int method3891(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { @Pc(8) int local8 = arg3 & 0xF; @@ -75,8 +32,8 @@ public final class Static225 { public static void method3896(@OriginalArg(0) JagString arg0, @OriginalArg(1) JagString arg1, @OriginalArg(2) int arg2) { Player.password = arg1; LoginManager.anInt39 = arg2; - Player.username = arg0; - if (Player.username.strEquals(JagString.EMPTY) || Player.password.strEquals(JagString.EMPTY)) { + Player.usernameInput = arg0; + if (Player.usernameInput.strEquals(JagString.EMPTY) || Player.password.strEquals(JagString.EMPTY)) { LoginManager.reply = 3; } else if (Static125.worldId == -1) { LoginManager.anInt673 = 0; @@ -87,7 +44,7 @@ public final class Static225 { local43.p1(10); local43.p2((int) (Math.random() * 99999.0D)); local43.p2(530); - local43.p8(Player.username.encode37()); + local43.p8(Player.usernameInput.encode37()); local43.p4((int) (Math.random() * 9.9999999E7D)); local43.pjstr(Player.password); local43.p4((int) (Math.random() * 9.9999999E7D)); diff --git a/client/src/main/java/Static226.java b/client/src/main/java/Static226.java index 8cd7e92..d55d1b5 100644 --- a/client/src/main/java/Static226.java +++ b/client/src/main/java/Static226.java @@ -85,7 +85,7 @@ public final class Static226 { Static60.aBoolean108 = true; Static24.anInt761 = local16; } - } else if (Static155.anInt3751 == Static7.clickX && Static60.anInt1892 == Static60.clickY) { + } else if (Static155.anInt3751 == Mouse.clickX && Static60.anInt1892 == Mouse.clickY) { Static183.anInt4271 = local27; anInt3953 = 0; Static24.anInt761 = local16; @@ -93,8 +93,8 @@ public final class Static226 { Static13.anInt436 = (Static261.aBoolean298 ? 26 : 22) + Static231.anInt5204 * 15; Static60.aBoolean108 = true; } else { - Static280.anInt5895 = Static60.clickY; - Static277.anInt5850 = Static7.clickX; + Static280.anInt5895 = Mouse.clickY; + Static277.anInt5850 = Mouse.clickX; anInt3953 = 1; } } diff --git a/client/src/main/java/Static229.java b/client/src/main/java/Static229.java index e673bb8..3bcd239 100644 --- a/client/src/main/java/Static229.java +++ b/client/src/main/java/Static229.java @@ -7,9 +7,6 @@ public final class Static229 { @OriginalMember(owner = "client!si", name = "ab", descriptor = "I") public static int anInt5138; - @OriginalMember(owner = "client!si", name = "X", descriptor = "[Lclient!sg;") - public static final StockMarketOffer[] aClass136Array1 = new StockMarketOffer[6]; - @OriginalMember(owner = "client!si", name = "Z", descriptor = "Lclient!na;") public static final JagString aClass100_972 = JagString.parse(""); diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java index 530c244..184a2d6 100644 --- a/client/src/main/java/Static230.java +++ b/client/src/main/java/Static230.java @@ -11,11 +11,8 @@ public final class Static230 { @OriginalMember(owner = "client!sj", name = "p", descriptor = "I") public static int anInt5150 = 1; - @OriginalMember(owner = "client!sj", name = "q", descriptor = "[Lclient!na;") - public static final JagString[] aClass100Array158 = new JagString[100]; - - @OriginalMember(owner = "client!sj", name = "t", descriptor = "I") - public static int anInt5152 = 0; + @OriginalMember(owner = "client!sj", name = "t", descriptor = "I") + public static int opcode2 = 0; @OriginalMember(owner = "client!sj", name = "u", descriptor = "Z") public static boolean dynamicMapRegion = false; diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java index 2d94c3d..2910449 100644 --- a/client/src/main/java/Static233.java +++ b/client/src/main/java/Static233.java @@ -40,10 +40,7 @@ public final class Static233 { @OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;") public static final JagString aClass100_994 = JagString.parse(")3"); - @OriginalMember(owner = "client!t", name = "E", descriptor = "[I") - public static final int[] updatedVarcstrs = new int[32]; - - @OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V") + @OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V") public static void method4000(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { @Pc(3) int local3 = 0; @Pc(5) Class102[] local5 = Static143.aClass102Array1; @@ -51,7 +48,7 @@ public final class Static233 { @Pc(17) Class102 local17 = local5[local3]; if (local17 != null && local17.anInt4058 == 2) { Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.anInt4053 - Static225.originX << 7), arg3); - if (Static65.anInt1951 > -1 && Static83.loop % 20 < 10) { + if (Static65.anInt1951 > -1 && client.loop % 20 < 10) { Sprites.headhints[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548); } } @@ -119,10 +116,10 @@ public final class Static233 { } else { Static102.method2075(PlayerList.self.movementQueueZ[0], local24, 0, true, 0, arg2, 0, local12 + 1, 2, arg1, PlayerList.self.movementQueueX[0]); } - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static17.milliseconds = 0; Static70.type = 2; - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; return true; } diff --git a/client/src/main/java/Static234.java b/client/src/main/java/Static234.java index 47d0098..46245ad 100644 --- a/client/src/main/java/Static234.java +++ b/client/src/main/java/Static234.java @@ -7,16 +7,13 @@ public final class Static234 { @OriginalMember(owner = "client!ta", name = "o", descriptor = "[I") public static int[] anIntArray454; - @OriginalMember(owner = "client!ta", name = "z", descriptor = "[I") - public static final int[] anIntArray456 = new int[] { -1, 0, 8, 0, 2, 0, 0, 0, 0, 12, 0, 1, 0, 3, 7, 0, 15, 6, 0, 0, 4, 7, -2, -1, 2, 0, 2, 8, 0, 0, 0, 0, -2, 5, 0, 0, 8, 3, 6, 0, 0, 0, -1, 0, -1, 0, 0, 6, -2, 0, 12, 0, 0, 0, -1, -2, 10, 0, 0, 0, 3, 0, -1, 0, 0, 5, 6, 0, 0, 8, -1, -1, 0, 8, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 6, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, -2, 0, 0, 0, 0, 0, 12, 2, 0, -2, -2, 20, 0, 0, 10, 0, 15, 0, -1, 0, 8, -2, 0, 0, 0, 8, 0, 12, 0, 0, 7, 0, 0, 0, 0, 0, -1, -1, 0, 4, 5, 0, 0, 0, 6, 0, 0, 0, 0, 8, 9, 0, 0, 0, 2, -1, 0, -2, 0, 4, 14, 0, 0, 0, 24, 0, -2, 5, 0, 0, 0, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 2, 1, 0, 0, 2, -1, 1, 0, 0, 0, 0, 14, 0, 0, 0, 0, 10, 5, 0, 0, 0, 0, 0, -2, 0, 0, 9, 0, 0, 8, 0, 0, 0, 0, -2, 6, 0, 0, 0, -2, 0, 3, 0, 1, 7, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 3, 0, 0 }; - @OriginalMember(owner = "client!ta", name = "B", descriptor = "I") public static int anInt5245 = 0; @OriginalMember(owner = "client!ta", name = "a", descriptor = "(I)V") public static void method4014() { - for (@Pc(3) int local3 = 0; local3 < Static116.anInt2951; local3++) { - @Pc(10) int local10 = Static44.anIntArray106[local3]; + for (@Pc(3) int local3 = 0; local3 < Protocol.extendedCount; local3++) { + @Pc(10) int local10 = Protocol.extendedIds[local3]; @Pc(14) Npc local14 = Static175.npcs[local10]; @Pc(18) int local18 = Protocol.inboundBuffer.g1(); if ((local18 & 0x8) != 0) { @@ -27,14 +24,14 @@ public final class Static234 { if ((local18 & 0x40) != 0) { local43 = Protocol.inboundBuffer.g1(); local47 = Protocol.inboundBuffer.p1neg(); - local14.method2686(local47, Static83.loop, local43); - local14.anInt3378 = Static83.loop + 300; - local14.anInt3372 = Protocol.inboundBuffer.g1ssub(); + local14.addHit(local47, client.loop, local43); + local14.hitpointsBarVisibleUntil = client.loop + 300; + local14.hitpointsBar = Protocol.inboundBuffer.g1ssub(); } if ((local18 & 0x2) != 0) { local43 = Protocol.inboundBuffer.p1neg(); local47 = Protocol.inboundBuffer.g1ssub(); - local14.method2686(local47, Static83.loop, local43); + local14.addHit(local47, client.loop, local43); } if ((local18 & 0x10) != 0) { local43 = Protocol.inboundBuffer.g2(); @@ -45,9 +42,9 @@ public final class Static234 { Static223.method3855(local47, local43, local14); } if ((local18 & 0x4) != 0) { - local14.anInt3370 = Protocol.inboundBuffer.g2sub(); - if (local14.anInt3370 == 65535) { - local14.anInt3370 = -1; + local14.faceEntity = Protocol.inboundBuffer.g2sub(); + if (local14.faceEntity == 65535) { + local14.faceEntity = -1; } } if ((local18 & 0x80) != 0) { @@ -57,21 +54,21 @@ public final class Static234 { } local47 = Protocol.inboundBuffer.g4me(); @Pc(147) boolean local147 = true; - if (local43 != -1 && local14.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local43).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local14.anInt3432).seqId).anInt5355) { + if (local43 != -1 && local14.spotAnimId != -1 && SeqTypeList.get(SpotAnimTypeList.get(local43).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local14.spotAnimId).seqId).anInt5355) { local147 = false; } if (local147) { - local14.anInt3432 = local43; - local14.anInt3359 = (local47 & 0xFFFF) + Static83.loop; + local14.spotAnimId = local43; + local14.spotAnimStart = (local47 & 0xFFFF) + client.loop; local14.anInt3361 = 0; local14.anInt3399 = 0; - local14.anInt3394 = local47 >> 16; + local14.spotAnimY = local47 >> 16; local14.anInt3418 = 1; - if (local14.anInt3359 > Static83.loop) { + if (local14.spotAnimStart > client.loop) { local14.anInt3399 = -1; } - if (local14.anInt3432 != -1 && local14.anInt3359 == Static83.loop) { - @Pc(227) int local227 = SpotAnimTypeList.get(local14.anInt3432).seqId; + if (local14.spotAnimId != -1 && local14.spotAnimStart == client.loop) { + @Pc(227) int local227 = SpotAnimTypeList.get(local14.spotAnimId).seqId; if (local227 != -1) { @Pc(236) SeqType local236 = SeqTypeList.get(local227); if (local236 != null && local236.frames != null) { @@ -89,12 +86,12 @@ public final class Static234 { local14.method2692(local14.type.soze); local14.anInt3365 = local14.type.basId; if (local14.type.hasAreaSound()) { - Static122.method2411(local14.movementQueueZ[0], null, 0, local14, local14.movementQueueX[0], Static55.level, null); + Static122.method2411(local14.movementQueueZ[0], null, 0, local14, local14.movementQueueX[0], Player.level, null); } } if ((local18 & 0x20) != 0) { - local14.aClass100_640 = Protocol.inboundBuffer.gjstr(); - local14.anInt3408 = 100; + local14.chatMessage = Protocol.inboundBuffer.gjstr(); + local14.chatLoops = 100; } if ((local18 & 0x100) != 0) { local43 = Protocol.inboundBuffer.p1neg(); @@ -113,8 +110,8 @@ public final class Static234 { Static159.method3037(local337, local14, local334, local331); } if ((local18 & 0x200) != 0) { - local14.anInt3382 = Protocol.inboundBuffer.g2sub(); - local14.anInt3363 = Protocol.inboundBuffer.g2(); + local14.faceX = Protocol.inboundBuffer.g2sub(); + local14.faceY = Protocol.inboundBuffer.g2(); } } } diff --git a/client/src/main/java/Static240.java b/client/src/main/java/Static240.java index 869b2f9..3bede94 100644 --- a/client/src/main/java/Static240.java +++ b/client/src/main/java/Static240.java @@ -18,9 +18,6 @@ public final class Static240 { @OriginalMember(owner = "client!tg", name = "e", descriptor = "Lclient!na;") public static final JagString aClass100_1008 = JagString.parse(""); - @OriginalMember(owner = "client!tg", name = "h", descriptor = "I") - public static int anInt5335 = 0; - - @OriginalMember(owner = "client!tg", name = "i", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!tg", name = "i", descriptor = "Lclient!na;") public static final JagString aClass100_1009 = JagString.parse("::pcachesize"); } diff --git a/client/src/main/java/Static241.java b/client/src/main/java/Static241.java index 59e5797..3244ee5 100644 --- a/client/src/main/java/Static241.java +++ b/client/src/main/java/Static241.java @@ -13,10 +13,7 @@ public final class Static241 { @OriginalMember(owner = "client!th", name = "i", descriptor = "[I") public static final int[] anIntArray520 = new int[14]; - @OriginalMember(owner = "client!th", name = "l", descriptor = "[I") - public static final int[] anIntArray521 = new int[100]; - - @OriginalMember(owner = "client!th", name = "n", descriptor = "Z") + @OriginalMember(owner = "client!th", name = "n", descriptor = "Z") public static boolean aBoolean302 = false; @OriginalMember(owner = "client!th", name = "a", descriptor = "(DI)V") diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java index 8ffc525..d5173dd 100644 --- a/client/src/main/java/Static243.java +++ b/client/src/main/java/Static243.java @@ -32,13 +32,13 @@ public final class Static243 { MouseRecorder.instance.samples = 0; GameShell.focus = true; Static114.method4625(); - Static49.anInt1462 = -1; - Static5.anInt45 = -1; + Static49.opcode4 = -1; + Static5.opcode3 = -1; Protocol.opcode = -1; Static267.anInt5775 = 0; Static60.rebootTimer = 0; Protocol.outboundBuffer.offset = 0; - Static230.anInt5152 = -1; + Static230.opcode2 = -1; Static201.anInt1862 = 0; Protocol.inboundBuffer.offset = 0; @Pc(3506) int local3506; @@ -49,14 +49,14 @@ public final class Static243 { Static60.aBoolean108 = false; Static48.setIdleLoops(0); for (local3506 = 0; local3506 < 100; local3506++) { - Static230.aClass100Array158[local3506] = null; + Chat.aClass100Array158[local3506] = null; } Static260.anInt5014 = 0; Static132.anInt3291 = (int) (Math.random() * 100.0D) - 50; Static84.anInt2255 = 0; Camera.yawTarget = (int) (Math.random() * 20.0D) - 10 & 0x7FF; Static107.anInt2875 = -1; - Static267.anInt5774 = 0; + PlayerList.size = 0; Static270.anInt5795 = 0; Static206.anInt4774 = (int) (Math.random() * 110.0D) - 55; Static241.aBoolean302 = false; @@ -64,17 +64,17 @@ public final class Static243 { SoundPlayer.anInt4451 = 0; Static115.anInt2939 = 0; Static59.anInt1814 = (int) (Math.random() * 120.0D) - 60; - Static62.anInt1941 = 0; + Chat.anInt1941 = 0; Static230.anInt5161 = (int) (Math.random() * 80.0D) - 40; Static272.anInt5214 = 0; for (local3506 = 0; local3506 < 2048; local3506++) { - Static159.players[local3506] = null; - Static115.aClass3_Sub15Array1[local3506] = null; + PlayerList.players[local3506] = null; + PlayerList.appearanceCache[local3506] = null; } for (local3506 = 0; local3506 < 32768; local3506++) { Static175.npcs[local3506] = null; } - PlayerList.self = Static159.players[2047] = new Player(); + PlayerList.self = PlayerList.players[2047] = new Player(); Static217.aClass69_116.clear(); Static99.aClass69_64.clear(); if (Static159.aClass69ArrayArrayArray1 != null) { @@ -131,7 +131,7 @@ public final class Static243 { Static199.aClass3_Sub22Array1 = null; Static15.aClass100_87 = null; for (local3506 = 0; local3506 < 6; local3506++) { - Static229.aClass136Array1[local3506] = new StockMarketOffer(); + StockMarketManager.aClass136Array1[local3506] = new StockMarketOffer(); } for (local3506 = 0; local3506 < 25; local3506++) { Static99.anIntArray240[local3506] = 0; diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java index d1203fa..e7dfc25 100644 --- a/client/src/main/java/Static245.java +++ b/client/src/main/java/Static245.java @@ -19,19 +19,6 @@ public final class Static245 { local16.pushClient(); } - @OriginalMember(owner = "client!tm", name = "a", descriptor = "(I)V") - public static void method4226() { - for (@Pc(7) int local7 = 0; local7 < Static116.anInt2951; local7++) { - @Pc(31) int local31 = Static44.anIntArray106[local7]; - @Pc(35) Player local35 = Static159.players[local31]; - @Pc(39) int local39 = Protocol.inboundBuffer.g1(); - if ((local39 & 0x10) != 0) { - local39 += Protocol.inboundBuffer.g1() << 8; - } - Static84.method1768(local39, local31, local35); - } - } - @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; diff --git a/client/src/main/java/Static246.java b/client/src/main/java/Static246.java index c8995ef..929a53d 100644 --- a/client/src/main/java/Static246.java +++ b/client/src/main/java/Static246.java @@ -17,9 +17,9 @@ public final class Static246 { public static void method4239() { for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.method2289(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.method2288()) { @Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1; - if (local15.anInt606 != Static55.level || local15.aBoolean41) { + if (local15.anInt606 != Player.level || local15.aBoolean41) { local9.unlink(); - } else if (local15.anInt590 <= Static83.loop) { + } else if (local15.anInt590 <= client.loop) { local15.method558(Static178.anInt4247); if (local15.aBoolean41) { local9.unlink(); diff --git a/client/src/main/java/Static249.java b/client/src/main/java/Static249.java index bf65117..029d9c4 100644 --- a/client/src/main/java/Static249.java +++ b/client/src/main/java/Static249.java @@ -6,9 +6,6 @@ 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 = "T", descriptor = "[I") - public static final int[] anIntArray478 = new int[32]; - @OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z") public static boolean method4265(@OriginalArg(1) Component arg0) { if (arg0.anInt453 == 205) { diff --git a/client/src/main/java/Static252.java b/client/src/main/java/Static252.java index 81753f9..83775d3 100644 --- a/client/src/main/java/Static252.java +++ b/client/src/main/java/Static252.java @@ -26,7 +26,7 @@ public final class Static252 { Static266.aByteArrayArrayArray15[local33][local31][local40] = local27; } } - if (Static55.level == 3) { + if (Player.level == 3) { return; } for (local33 = 0; local33 < 2; local33++) { @@ -37,13 +37,13 @@ public final class Static252 { Static50.anIntArray134[local33] = 0; } if (Static227.cameraType != 1) { - local33 = SceneGraph.getTileHeight(Static55.level, Static138.renderX, Static134.renderZ); - if (local33 - Static5.anInt40 < 800 && (Static12.tileSettings[Static55.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) { + local33 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ); + if (local33 - Static5.anInt40 < 800 && (Static12.tileSettings[Player.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) { Static254.method4348(false, Static138.renderX >> 7, Static134.renderZ >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 1); } return; } - if ((Static12.tileSettings[Static55.level][PlayerList.self.xFine >> 7][PlayerList.self.zFine >> 7] & 0x4) != 0) { + if ((Static12.tileSettings[Player.level][PlayerList.self.xFine >> 7][PlayerList.self.zFine >> 7] & 0x4) != 0) { Static254.method4348(false, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0); } if (Static240.cameraPitch >= 310) { @@ -76,7 +76,7 @@ public final class Static252 { } else if (local40 > local135) { local40--; } - if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) { + if ((Static12.tileSettings[Player.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } @@ -88,7 +88,7 @@ public final class Static252 { local33--; } local186 -= 65536; - if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) { + if ((Static12.tileSettings[Player.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } @@ -104,7 +104,7 @@ public final class Static252 { } else if (local33 > local162) { local33--; } - if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) { + if ((Static12.tileSettings[Player.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } @@ -116,7 +116,7 @@ public final class Static252 { local40--; } local186 -= 65536; - if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) { + if ((Static12.tileSettings[Player.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java index e1bd9b1..5c270d5 100644 --- a/client/src/main/java/Static253.java +++ b/client/src/main/java/Static253.java @@ -51,7 +51,7 @@ public final class Static253 { if (Static176.aBooleanArray95[4] && Static276.anIntArray564[4] + 128 > local59) { local59 = Static276.anIntArray564[4] + 128; } - Static18.method555(Static81.cameraX, arg0, SceneGraph.getTileHeight(Static55.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59); + Static18.method555(Static81.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59); } local57 = Static5.anInt40; local59 = Static138.renderX; @@ -124,11 +124,11 @@ public final class Static253 { } else { local171 = Static103.method2235(Static178.anInt4247, PlayerList.self.movementQueueZ[0] >> 3, Preferences.brightness, PlayerList.self.movementQueueX[0] >> 3); } - Static120.method2394(Static83.loop, !Preferences.flickeringEffectsOn); + Static120.method2394(client.loop, !Preferences.flickeringEffectsOn); GlRenderer.clearColorAndDepthBuffers(local171); Static143.method2731(Static240.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Static184.cameraYaw); - GlRenderer.anInt5323 = Static83.loop; - Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); + GlRenderer.anInt5323 = client.loop; + Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); Static263.aBoolean299 = true; Static120.method2390(); Static143.method2731(0, 0, 0, 0, 0); @@ -138,7 +138,7 @@ public final class Static253 { Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4); } else { SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0); - Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); + Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); client.audioLoop(); Static223.method3858(); Static142.method2726(arg4, arg3, arg2, 256, arg0, 256); diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java index 4f67533..35bc0cb 100644 --- a/client/src/main/java/Static254.java +++ b/client/src/main/java/Static254.java @@ -25,9 +25,9 @@ public final class Static254 { @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); - if (local14 == Static266.aByteArrayArrayArray15[Static55.level][arg1][arg2]) { + if (local14 == Static266.aByteArrayArrayArray15[Player.level][arg1][arg2]) { return false; - } else if ((Static12.tileSettings[Static55.level][arg1][arg2] & 0x4) == 0) { + } else if ((Static12.tileSettings[Player.level][arg1][arg2] & 0x4) == 0) { return false; } else { @Pc(47) int local47 = 0; @@ -35,7 +35,7 @@ public final class Static254 { Static259.anIntArray514[0] = arg1; @Pc(69) int local69 = local49 + 1; Static84.anIntArray209[0] = arg2; - Static266.aByteArrayArrayArray15[Static55.level][arg1][arg2] = local14; + Static266.aByteArrayArrayArray15[Player.level][arg1][arg2] = local14; while (local47 != local69) { @Pc(94) int local94 = Static259.anIntArray514[local47] >> 16 & 0xFF; @Pc(102) int local102 = Static259.anIntArray514[local47] >> 24 & 0xFF; @@ -45,12 +45,12 @@ public final class Static254 { local47 = local47 + 1 & 0xFFF; @Pc(130) boolean local130 = false; @Pc(132) boolean local132 = false; - if ((Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0) { + if ((Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0) { local130 = true; } @Pc(150) int local150; @Pc(191) int local191; - label238: for (local150 = Static55.level + 1; local150 <= 3; local150++) { + label238: for (local150 = Player.level + 1; local150 <= 3; local150++) { if ((Static12.tileSettings[local150][local108][local122] & 0x8) == 0) { @Pc(227) int local227; @Pc(358) int local358; @@ -105,8 +105,8 @@ public final class Static254 { } } if (local132) { - if (Static83.activeTileHeightMap[Static55.level + 1][local108][local122] > Static79.anIntArray205[arg4]) { - Static79.anIntArray205[arg4] = Static83.activeTileHeightMap[Static55.level + 1][local108][local122]; + if (Static83.activeTileHeightMap[Player.level + 1][local108][local122] > Static79.anIntArray205[arg4]) { + Static79.anIntArray205[arg4] = Static83.activeTileHeightMap[Player.level + 1][local108][local122]; } local150 = local108 << 7; if (local150 < Static149.anIntArray338[arg4]) { @@ -122,58 +122,58 @@ public final class Static254 { } } if (!local130) { - if (local108 >= 1 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14) { + if (local108 >= 1 && Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] != local14) { Static259.anIntArray514[local69] = local108 - 1 | 0x120000 | 0xD3000000; Static84.anIntArray209[local69] = local122 | 0x130000; local69 = local69 + 1 & 0xFFF; - Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14; + Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14; } local122++; if (local122 < 104) { - if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 - 1][local122 - 1] & 0x4) == 0) { + if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] && (Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Player.level][local108 - 1][local122 - 1] & 0x4) == 0) { Static259.anIntArray514[local69] = 0x52000000 | 0x120000 | local108 - 1; Static84.anIntArray209[local69] = local122 | 0x130000; - Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14; + Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14; local69 = local69 + 1 & 0xFFF; } - if (local14 != Static266.aByteArrayArrayArray15[Static55.level][local108][local122]) { + if (local14 != Static266.aByteArrayArrayArray15[Player.level][local108][local122]) { Static259.anIntArray514[local69] = local108 | 0x13000000 | 0x520000; Static84.anIntArray209[local69] = local122 | 0x530000; local69 = local69 + 1 & 0xFFF; - Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14; + Static266.aByteArrayArrayArray15[Player.level][local108][local122] = local14; } - if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 + 1][local122 - 1] & 0x4) == 0) { + if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Player.level][local108 + 1][local122 - 1] & 0x4) == 0) { Static259.anIntArray514[local69] = 0x92000000 | 0x520000 | local108 + 1; Static84.anIntArray209[local69] = local122 | 0x530000; - Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14; + Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14; local69 = local69 + 1 & 0xFFF; } } local122--; - if (local108 + 1 < 104 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122]) { + if (local108 + 1 < 104 && local14 != Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122]) { Static259.anIntArray514[local69] = local108 + 1 | 0x920000 | 0x53000000; Static84.anIntArray209[local69] = local122 | 0x930000; - Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14; + Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14; local69 = local69 + 1 & 0xFFF; } local122--; if (local122 >= 0) { - if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 - 1][local122 + 1] & 0x4) == 0) { + if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] != local14 && (Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Player.level][local108 - 1][local122 + 1] & 0x4) == 0) { Static259.anIntArray514[local69] = local108 - 1 | 0xD20000 | 0x12000000; Static84.anIntArray209[local69] = local122 | 0xD30000; - Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14; + Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14; local69 = local69 + 1 & 0xFFF; } - if (local14 != Static266.aByteArrayArrayArray15[Static55.level][local108][local122]) { + if (local14 != Static266.aByteArrayArrayArray15[Player.level][local108][local122]) { Static259.anIntArray514[local69] = local108 | 0xD20000 | 0x93000000; Static84.anIntArray209[local69] = local122 | 0xD30000; local69 = local69 + 1 & 0xFFF; - Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14; + Static266.aByteArrayArrayArray15[Player.level][local108][local122] = local14; } - if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 + 1][local122 + 1] & 0x4) == 0) { + if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Player.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Player.level][local108 + 1][local122 + 1] & 0x4) == 0) { Static259.anIntArray514[local69] = local108 + 1 | 0xD2000000 | 0x920000; Static84.anIntArray209[local69] = local122 | 0x930000; - Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14; + Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14; local69 = local69 + 1 & 0xFFF; } } diff --git a/client/src/main/java/Static256.java b/client/src/main/java/Static256.java index 2a9dab6..3f8060d 100644 --- a/client/src/main/java/Static256.java +++ b/client/src/main/java/Static256.java @@ -6,17 +6,17 @@ public final class Static256 { @OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V") public static void method4392() { - Static11.anInt384 = 0; + Player.inTutorialIsland = 0; @Pc(17) int local17 = Static225.originX + (PlayerList.self.xFine >> 7); @Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Static142.originZ; if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) { - Static11.anInt384 = 1; + Player.inTutorialIsland = 1; } if (local17 >= 3072 && local17 <= 3118 && local25 >= 9492 && local25 <= 9535) { - Static11.anInt384 = 1; + Player.inTutorialIsland = 1; } - if (Static11.anInt384 == 1 && local17 >= 3139 && local17 <= 3199 && local25 >= 3008 && local25 <= 3062) { - Static11.anInt384 = 0; + if (Player.inTutorialIsland == 1 && local17 >= 3139 && local17 <= 3199 && local25 >= 3008 && local25 <= 3062) { + Player.inTutorialIsland = 0; } } diff --git a/client/src/main/java/Static26.java b/client/src/main/java/Static26.java index f768fdd..546ec7a 100644 --- a/client/src/main/java/Static26.java +++ b/client/src/main/java/Static26.java @@ -10,10 +10,7 @@ public final class Static26 { @OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;") public static final JagString aClass100_160 = Static165.method3165(); - @OriginalMember(owner = "client!ca", name = "eb", descriptor = "[I") - public static final int[] anIntArray67 = new int[100]; - - @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V") + @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V") public static void setupLoadingScreenRegion() { @Pc(10) int local10 = (Static138.renderX >> 10) + (Static225.originX >> 3); @Pc(23) int local23 = (Static134.renderZ >> 10) + (Static142.originZ >> 3); diff --git a/client/src/main/java/Static260.java b/client/src/main/java/Static260.java index 251c82b..9cea55b 100644 --- a/client/src/main/java/Static260.java +++ b/client/src/main/java/Static260.java @@ -20,7 +20,7 @@ public final class Static260 { if (Static233.anInt5217 >= 100) { @Pc(30) int local30 = Static251.anInt5449 * 128 + 64; @Pc(36) int local36 = Static265.anInt5765 * 128 + 64; - @Pc(44) int local44 = SceneGraph.getTileHeight(Static55.level, local30, local36) - Static57.anInt1744; + @Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static57.anInt1744; @Pc(49) int local49 = local44 - Static5.anInt40; @Pc(54) int local54 = local30 - Static138.renderX; @Pc(59) int local59 = local36 - Static134.renderZ; diff --git a/client/src/main/java/Static263.java b/client/src/main/java/Static263.java index 422fded..3d31173 100644 --- a/client/src/main/java/Static263.java +++ b/client/src/main/java/Static263.java @@ -111,16 +111,16 @@ public final class Static263 { @OriginalMember(owner = "client!vg", name = "a", descriptor = "(IILclient!fe;)V") public static void method4514(@OriginalArg(0) int arg0, @OriginalArg(2) PathingEntity arg1) { - if (Static83.loop < arg1.anInt3395) { + if (client.loop < arg1.anInt3395) { Static18.method553(arg1); - } else if (arg1.anInt3386 >= Static83.loop) { + } else if (arg1.anInt3386 >= client.loop) { Static280.method4665(arg1); } else { Static104.method2247(arg1); } if (arg1.xFine < 128 || arg1.zFine < 128 || arg1.xFine >= 13184 || arg1.zFine >= 13184) { arg1.seqId = -1; - arg1.anInt3432 = -1; + arg1.spotAnimId = -1; arg1.anInt3395 = 0; arg1.anInt3386 = 0; arg1.xFine = arg1.movementQueueX[0] * 128 + arg1.getSize() * 64; @@ -128,7 +128,7 @@ public final class Static263 { arg1.method2689(); } if (arg1 == PlayerList.self && (arg1.xFine < 1536 || arg1.zFine < 1536 || arg1.xFine >= 11776 || arg1.zFine >= 11776)) { - arg1.anInt3432 = -1; + arg1.spotAnimId = -1; arg1.anInt3395 = 0; arg1.anInt3386 = 0; arg1.seqId = -1; diff --git a/client/src/main/java/Static264.java b/client/src/main/java/Static264.java index 0ae0c26..da0bb7a 100644 --- a/client/src/main/java/Static264.java +++ b/client/src/main/java/Static264.java @@ -22,8 +22,8 @@ public final class Static264 { @OriginalMember(owner = "client!vh", name = "a", descriptor = "(ILclient!wa;)Lclient!bd;") public static QuickChatPhrase method3568(@OriginalArg(1) Buffer arg0) { @Pc(3) QuickChatPhrase local3 = new QuickChatPhrase(); - local3.anInt439 = arg0.g2(); - local3.aClass3_Sub2_Sub6_1 = QuickChatPhraseTypeList.get(local3.anInt439); + local3.id = arg0.g2(); + local3.type = QuickChatPhraseTypeList.get(local3.id); return local3; } diff --git a/client/src/main/java/Static267.java b/client/src/main/java/Static267.java index 3484310..55e44d6 100644 --- a/client/src/main/java/Static267.java +++ b/client/src/main/java/Static267.java @@ -13,9 +13,6 @@ public final class Static267 { @OriginalMember(owner = "client!vl", name = "i", descriptor = "[I") public static int[] anIntArray518 = new int[2]; - @OriginalMember(owner = "client!vl", name = "j", descriptor = "I") - public static int anInt5774 = 0; - @OriginalMember(owner = "client!vl", name = "k", descriptor = "I") public static int anInt5775 = 0; @@ -93,7 +90,7 @@ public final class Static267 { Static1.anInt6++; } Static226.anInt5084 += arg0; - local60 = (arg0 + (Static83.loop & 0x1)) / 2; + local60 = (arg0 + (client.loop & 0x1)) / 2; if (local60 <= 0) { return; } diff --git a/client/src/main/java/Static27.java b/client/src/main/java/Static27.java index 9824b00..5ad7a80 100644 --- a/client/src/main/java/Static27.java +++ b/client/src/main/java/Static27.java @@ -8,7 +8,7 @@ public final class Static27 { public static SoundBank aClass89_1; @OriginalMember(owner = "client!cb", name = "I", descriptor = "[I") - public static final int[] anIntArray70 = new int[32]; + public static final int[] updatedInventories = new int[32]; @OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;") public static final JagString aClass100_164 = JagString.parse(" )2> "); diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java index 490a8e1..86f60a6 100644 --- a/client/src/main/java/Static271.java +++ b/client/src/main/java/Static271.java @@ -10,19 +10,6 @@ public final class Static271 { @OriginalMember(owner = "client!wc", name = "h", descriptor = "[[I") public static final int[][] anIntArrayArray46 = new int[][] { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, { 12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3 }, { 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, { 3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12 } }; - @OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V") - public static void method4597(@OriginalArg(0) Player arg0) { - @Pc(10) AreaSound local10 = (AreaSound) Static93.aClass133_7.get(arg0.aClass100_364.encode37()); - if (local10 == null) { - return; - } - if (local10.primaryStream != null) { - client.soundStream.removeSubStream(local10.primaryStream); - local10.primaryStream = null; - } - local10.unlink(); - } - @OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V") public static void method4598(@OriginalArg(0) Buffer arg0) { if (client.uid != null) { diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java index 80dd163..65ad100 100644 --- a/client/src/main/java/Static276.java +++ b/client/src/main/java/Static276.java @@ -37,32 +37,32 @@ public final class Static276 { public static void method4613(@OriginalArg(0) int arg0, @OriginalArg(2) JagString arg1) { @Pc(7) JagString local7 = arg1.method3159().method3125(); @Pc(13) boolean local13 = false; - for (@Pc(15) int local15 = 0; local15 < Static267.anInt5774; local15++) { - @Pc(28) Player local28 = Static159.players[Static105.anIntArray256[local15]]; - if (local28 != null && local28.aClass100_364 != null && local28.aClass100_364.equalsIgnoreCase(local7)) { + for (@Pc(15) int local15 = 0; local15 < PlayerList.size; local15++) { + @Pc(28) Player local28 = PlayerList.players[PlayerList.ids[local15]]; + if (local28 != null && local28.username != null && local28.username.equalsIgnoreCase(local7)) { local13 = true; Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 1, false, 0, local28.movementQueueX[0], 1, 0, 2, local28.movementQueueZ[0], PlayerList.self.movementQueueX[0]); if (arg0 == 1) { Protocol.outboundBuffer.p1isaac(68); - Protocol.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); + Protocol.outboundBuffer.p2leadd(PlayerList.ids[local15]); } else if (arg0 == 4) { Protocol.outboundBuffer.p1isaac(180); - Protocol.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); + Protocol.outboundBuffer.p2leadd(PlayerList.ids[local15]); } else if (arg0 == 5) { Protocol.outboundBuffer.p1isaac(4); - Protocol.outboundBuffer.p2le(Static105.anIntArray256[local15]); + Protocol.outboundBuffer.p2le(PlayerList.ids[local15]); } else if (arg0 == 6) { Protocol.outboundBuffer.p1isaac(133); - Protocol.outboundBuffer.p2le(Static105.anIntArray256[local15]); + Protocol.outboundBuffer.p2le(PlayerList.ids[local15]); } else if (arg0 == 7) { Protocol.outboundBuffer.p1isaac(114); - Protocol.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); + Protocol.outboundBuffer.p2leadd(PlayerList.ids[local15]); } break; } } if (!local13) { - Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.UNABLETOFIND, local7 })); + Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.UNABLETOFIND, local7 })); } } diff --git a/client/src/main/java/Static277.java b/client/src/main/java/Static277.java index d1beb02..8999cc2 100644 --- a/client/src/main/java/Static277.java +++ b/client/src/main/java/Static277.java @@ -37,11 +37,4 @@ public final class Static277 { return local12 == 1003; } - @OriginalMember(owner = "client!wi", name = "d", descriptor = "(II)V") - public static void method4641(@OriginalArg(1) int arg0) { - WorldMap.anInt4901 = -1; - WorldMap.anInt4901 = -1; - WorldMap.anInt919 = arg0; - WorldMap.method965(); - } } diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java index c7c1845..c604739 100644 --- a/client/src/main/java/Static278.java +++ b/client/src/main/java/Static278.java @@ -13,14 +13,11 @@ 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 = "l", descriptor = "I") - public static int anInt5867 = 0; - @OriginalMember(owner = "client!wj", name = "a", descriptor = "(I)V") public static void method4645() { while (true) { if (Protocol.inboundBuffer.method2241(Protocol.length) >= 27) { - @Pc(14) int local14 = Protocol.inboundBuffer.method2238(15); + @Pc(14) int local14 = Protocol.inboundBuffer.gBits(15); if (local14 != 32767) { @Pc(19) boolean local19 = false; if (Static175.npcs[local14] == null) { @@ -29,25 +26,25 @@ public final class Static278 { } @Pc(37) Npc local37 = Static175.npcs[local14]; Static33.anIntArray79[Static272.anInt5214++] = local14; - local37.anInt3430 = Static83.loop; + local37.lastSeenLoop = client.loop; if (local37.type != null && local37.type.hasAreaSound()) { Static91.method1877(local37); } - @Pc(66) int local66 = Protocol.inboundBuffer.method2238(1); - @Pc(73) int local73 = Static56.anIntArray141[Protocol.inboundBuffer.method2238(3)]; + @Pc(66) int local66 = Protocol.inboundBuffer.gBits(1); + @Pc(73) int local73 = Static56.anIntArray141[Protocol.inboundBuffer.gBits(3)]; if (local19) { local37.anInt3400 = local37.anInt3381 = local73; } - @Pc(86) int local86 = Protocol.inboundBuffer.method2238(1); + @Pc(86) int local86 = Protocol.inboundBuffer.gBits(1); if (local86 == 1) { - Static44.anIntArray106[Static116.anInt2951++] = local14; + Protocol.extendedIds[Protocol.extendedCount++] = local14; } - @Pc(105) int local105 = Protocol.inboundBuffer.method2238(5); - local37.method2698(NpcTypeList.get(Protocol.inboundBuffer.method2238(14))); + @Pc(105) int local105 = Protocol.inboundBuffer.gBits(5); + local37.method2698(NpcTypeList.get(Protocol.inboundBuffer.gBits(14))); if (local105 > 15) { local105 -= 32; } - @Pc(124) int local124 = Protocol.inboundBuffer.method2238(5); + @Pc(124) int local124 = Protocol.inboundBuffer.gBits(5); if (local124 > 15) { local124 -= 32; } @@ -59,12 +56,12 @@ public final class Static278 { } local37.method2683(local37.getSize(), PlayerList.self.movementQueueX[0] + local124, local105 + PlayerList.self.movementQueueZ[0], local66 == 1); if (local37.type.hasAreaSound()) { - Static122.method2411(local37.movementQueueZ[0], null, 0, local37, local37.movementQueueX[0], Static55.level, null); + Static122.method2411(local37.movementQueueZ[0], null, 0, local37, local37.movementQueueX[0], Player.level, null); } continue; } } - Protocol.inboundBuffer.method2244(); + Protocol.inboundBuffer.accessBytes(); return; } } @@ -219,11 +216,11 @@ public final class Static278 { for (local19 = 0; local19 < Static143.aClass102Array1.length; local19++) { Static143.aClass102Array1[local19] = null; } - Static267.anInt5774 = 0; + PlayerList.size = 0; Static272.anInt5214 = 0; for (local19 = 0; local19 < 2048; local19++) { - Static159.players[local19] = null; - Static115.aClass3_Sub15Array1[local19] = null; + PlayerList.players[local19] = null; + PlayerList.appearanceCache[local19] = null; } for (local19 = 0; local19 < 32768; local19++) { Static175.npcs[local19] = null; diff --git a/client/src/main/java/Static280.java b/client/src/main/java/Static280.java index e3c6275..e2ac34b 100644 --- a/client/src/main/java/Static280.java +++ b/client/src/main/java/Static280.java @@ -12,9 +12,9 @@ public final class Static280 { @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!fe;B)V") public static void method4665(@OriginalArg(0) PathingEntity arg0) { - if (Static83.loop == arg0.anInt3386 || arg0.seqId == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > SeqTypeList.get(arg0.seqId).anIntArray474[arg0.anInt3425]) { + if (client.loop == arg0.anInt3386 || arg0.seqId == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > SeqTypeList.get(arg0.seqId).anIntArray474[arg0.anInt3425]) { @Pc(35) int local35 = arg0.anInt3386 - arg0.anInt3395; - @Pc(41) int local41 = Static83.loop - arg0.anInt3395; + @Pc(41) int local41 = client.loop - arg0.anInt3395; @Pc(52) int local52 = arg0.anInt3380 * 128 + arg0.getSize() * 64; @Pc(64) int local64 = arg0.anInt3428 * 128 + arg0.getSize() * 64; @Pc(75) int local75 = arg0.anInt3416 * 128 + arg0.getSize() * 64; diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java index c65795c..97455cc 100644 --- a/client/src/main/java/Static31.java +++ b/client/src/main/java/Static31.java @@ -19,10 +19,10 @@ public final class Static31 { @OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V") public static void method846() { - if (!SceneGraph.allLevelsAreVisible() && Static41.anInt1316 != Static55.level) { - Static127.method2463(Static55.level, Static52.anInt1695, Static80.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]); - } else if (Static55.level != Static107.anInt2875 && Static137.method2665(Static55.level)) { - Static107.anInt2875 = Static55.level; + if (!SceneGraph.allLevelsAreVisible() && Static41.anInt1316 != Player.level) { + Static127.method2463(Player.level, Static52.anInt1695, Static80.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]); + } else if (Player.level != Static107.anInt2875 && Static137.method2665(Player.level)) { + Static107.anInt2875 = Player.level; Static269.method2218(); } } diff --git a/client/src/main/java/Static32.java b/client/src/main/java/Static32.java index fda5f41..c8aa2ce 100644 --- a/client/src/main/java/Static32.java +++ b/client/src/main/java/Static32.java @@ -1,60 +1,3 @@ -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - public final class Static32 { - @OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;") - public static SoftwareIndexedSprite aClass36_Sub1_1 = null; - - @OriginalMember(owner = "client!ci", name = "a", descriptor = "([I[ILclient!e;B[I)V") - public static void method865(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) Player arg2, @OriginalArg(4) int[] arg3) { - for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) { - @Pc(20) int local20 = arg1[local7]; - @Pc(24) int local24 = arg3[local7]; - @Pc(28) int local28 = arg0[local7]; - @Pc(30) int local30 = 0; - while (local24 != 0 && local30 < arg2.aClass147Array3.length) { - if ((local24 & 0x1) != 0) { - if (local20 == -1) { - arg2.aClass147Array3[local30] = null; - } else { - @Pc(68) SeqType local68 = SeqTypeList.get(local20); - @Pc(71) int local71 = local68.anInt5347; - @Pc(76) Class147 local76 = arg2.aClass147Array3[local30]; - if (local76 != null) { - if (local20 == local76.anInt5396) { - if (local71 == 0) { - local76 = arg2.aClass147Array3[local30] = null; - } else if (local71 == 1) { - local76.anInt5400 = 0; - local76.anInt5398 = 1; - local76.anInt5399 = 0; - local76.anInt5408 = local28; - local76.anInt5404 = 0; - SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0); - } else if (local71 == 2) { - local76.anInt5400 = 0; - } - } else if (local68.anInt5355 >= SeqTypeList.get(local76.anInt5396).anInt5355) { - local76 = arg2.aClass147Array3[local30] = null; - } - } - if (local76 == null) { - local76 = arg2.aClass147Array3[local30] = new Class147(); - local76.anInt5396 = local20; - local76.anInt5398 = 1; - local76.anInt5404 = 0; - local76.anInt5408 = local28; - local76.anInt5399 = 0; - local76.anInt5400 = 0; - SoundPlayer.playSeqSound(arg2.zFine, local68, arg2.xFine, arg2 == PlayerList.self, 0); - } - } - } - local30++; - local24 >>>= 0x1; - } - } - } } diff --git a/client/src/main/java/Static34.java b/client/src/main/java/Static34.java index fb68325..8e8feb2 100644 --- a/client/src/main/java/Static34.java +++ b/client/src/main/java/Static34.java @@ -95,14 +95,14 @@ public final class Static34 { } } @Pc(156) int local156; - if (arg0.anInt3432 != -1 && Static83.loop >= arg0.anInt3359) { - local156 = SpotAnimTypeList.get(arg0.anInt3432).seqId; + if (arg0.spotAnimId != -1 && client.loop >= arg0.spotAnimStart) { + local156 = SpotAnimTypeList.get(arg0.spotAnimId).seqId; if (local156 == -1) { - arg0.anInt3432 = -1; + arg0.spotAnimId = -1; } else { @Pc(165) SeqType local165 = SeqTypeList.get(local156); if (local165 == null || local165.frames == null) { - arg0.anInt3432 = -1; + arg0.spotAnimId = -1; } else { if (arg0.anInt3399 < 0) { arg0.anInt3399 = 0; @@ -115,7 +115,7 @@ public final class Static34 { SoundPlayer.playSeqSound(arg0.zFine, local165, arg0.xFine, PlayerList.self == arg0, arg0.anInt3399); } if (arg0.anInt3399 >= local165.frames.length) { - arg0.anInt3432 = -1; + arg0.spotAnimId = -1; } arg0.anInt3418 = arg0.anInt3399 + 1; if (local165.frames.length <= arg0.anInt3418) { @@ -126,7 +126,7 @@ public final class Static34 { } if (arg0.seqId != -1 && arg0.anInt3420 <= 1) { local18 = SeqTypeList.get(arg0.seqId); - if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && Static83.loop >= arg0.anInt3395 && Static83.loop > arg0.anInt3386) { + if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && client.loop >= arg0.anInt3395 && client.loop > arg0.anInt3386) { arg0.anInt3420 = 1; return; } diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index 5ba4b7f..0630537 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -34,23 +34,23 @@ public final class Static36 { @OriginalMember(owner = "client!client", name = "a", descriptor = "([Lclient!be;IIIIIII)V") public static void method946(@OriginalArg(0) Component[] 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) { for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) { - @Pc(9) Component local9 = arg0[local1]; - if (local9 != null && local9.layer == arg1 && (!local9.aBoolean32 || local9.type == 0 || local9.aBoolean25 || method940(local9).anInt546 != 0 || local9 == Static4.aClass13_1 || local9.anInt453 == 1338) && (!local9.aBoolean32 || !method947(local9))) { - @Pc(50) int local50 = local9.x + arg6; - @Pc(55) int local55 = local9.y + arg7; + @Pc(9) Component component = arg0[local1]; + if (component != null && component.layer == arg1 && (!component.aBoolean32 || component.type == 0 || component.aBoolean25 || method940(component).anInt546 != 0 || component == Static4.aClass13_1 || component.anInt453 == 1338) && (!component.aBoolean32 || !method947(component))) { + @Pc(50) int local50 = component.x + arg6; + @Pc(55) int local55 = component.y + arg7; @Pc(61) int local61; @Pc(63) int local63; @Pc(65) int local65; @Pc(67) int local67; - if (local9.type == 2) { + if (component.type == 2) { local61 = arg2; local63 = arg3; local65 = arg4; local67 = arg5; } else { - @Pc(73) int local73 = local50 + local9.anInt445; - @Pc(78) int local78 = local55 + local9.anInt459; - if (local9.type == 9) { + @Pc(73) int local73 = local50 + component.anInt445; + @Pc(78) int local78 = local55 + component.anInt459; + if (component.type == 9) { local73++; local78++; } @@ -59,17 +59,17 @@ public final class Static36 { local65 = local73 < arg4 ? local73 : arg4; local67 = local78 < arg5 ? local78 : arg5; } - if (local9 == Static105.aClass13_14) { + if (component == Static105.aClass13_14) { Static44.aBoolean83 = true; Static124.anInt3075 = local50; Static20.anInt660 = local55; } - if (!local9.aBoolean32 || local61 < local65 && local63 < local67) { - if (local9.type == 0) { - if (!local9.aBoolean32 && method947(local9) && Static180.aClass13_22 != local9) { + if (!component.aBoolean32 || local61 < local65 && local63 < local67) { + if (component.type == 0) { + if (!component.aBoolean32 && method947(component) && Static180.aClass13_22 != component) { continue; } - if (local9.noClickThrough && Static215.anInt4873 >= local61 && Static223.anInt5032 >= local63 && Static215.anInt4873 < local65 && Static223.anInt5032 < local67) { + if (component.noClickThrough && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) { for (@Pc(164) HookRequest local164 = (HookRequest) InterfaceList.lowPriorityRequests.method2289(); local164 != null; local164 = (HookRequest) InterfaceList.lowPriorityRequests.method2288()) { if (local164.aBoolean158) { local164.unlink(); @@ -83,9 +83,9 @@ public final class Static36 { Static137.anInt3337 = 0; } } - if (local9.aBoolean32) { + if (component.aBoolean32) { @Pc(207) boolean local207; - if (Static215.anInt4873 >= local61 && Static223.anInt5032 >= local63 && Static215.anInt4873 < local65 && Static223.anInt5032 < local67) { + if (Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) { local207 = true; } else { local207 = false; @@ -95,383 +95,385 @@ public final class Static36 { local212 = true; } @Pc(221) boolean local221 = false; - if (Static150.clickButton == 1 && Static7.clickX >= local61 && Static60.clickY >= local63 && Static7.clickX < local65 && Static60.clickY < local67) { + if (Static150.clickButton == 1 && Mouse.clickX >= local61 && Mouse.clickY >= local63 && Mouse.clickX < local65 && Mouse.clickY < local67) { local221 = true; } - @Pc(243) int local243; - @Pc(322) int local322; - if (local9.aByteArray8 != null) { - for (local243 = 0; local243 < local9.aByteArray8.length; local243++) { - if (Keyboard.pressedKeys[local9.aByteArray8[local243]]) { - if (local9.anIntArray49 == null || Static83.loop >= local9.anIntArray49[local243]) { - @Pc(279) byte local279 = local9.aByteArray7[local243]; + @Pc(243) int i; + @Pc(322) int k; + if (component.aByteArray8 != null) { + for (i = 0; i < component.aByteArray8.length; i++) { + if (Keyboard.pressedKeys[component.aByteArray8[i]]) { + if (component.anIntArray49 == null || client.loop >= component.anIntArray49[i]) { + @Pc(279) byte local279 = component.aByteArray7[i]; if (local279 == 0 || ((local279 & 0x2) == 0 || Keyboard.pressedKeys[Keyboard.KEY_ALT]) && ((local279 & 0x1) == 0 || Keyboard.pressedKeys[Keyboard.KEY_CTRL]) && ((local279 & 0x4) == 0 || Keyboard.pressedKeys[Keyboard.KEY_SHIFT])) { - Static263.method4512(JagString.EMPTY, -1, local243 + 1, local9.id); - local322 = local9.anIntArray46[local243]; - if (local9.anIntArray49 == null) { - local9.anIntArray49 = new int[local9.aByteArray8.length]; + Static263.method4512(JagString.EMPTY, -1, i + 1, component.id); + k = component.anIntArray46[i]; + if (component.anIntArray49 == null) { + component.anIntArray49 = new int[component.aByteArray8.length]; } - if (local322 == 0) { - local9.anIntArray49[local243] = Integer.MAX_VALUE; + if (k == 0) { + component.anIntArray49[i] = Integer.MAX_VALUE; } else { - local9.anIntArray49[local243] = Static83.loop + local322; + component.anIntArray49[i] = client.loop + k; } } } - } else if (local9.anIntArray49 != null) { - local9.anIntArray49[local243] = 0; + } else if (component.anIntArray49 != null) { + component.anIntArray49[i] = 0; } } } if (local221) { - Static40.method1015(Static60.clickY - local55, Static7.clickX - local50, local9); + Static40.method1015(Mouse.clickY - local55, Mouse.clickX - local50, component); } - if (Static105.aClass13_14 != null && Static105.aClass13_14 != local9 && local207 && method940(local9).method509()) { - Static56.aClass13_12 = local9; + if (Static105.aClass13_14 != null && Static105.aClass13_14 != component && local207 && method940(component).method509()) { + Static56.aClass13_12 = component; } - if (local9 == Static4.aClass13_1) { + if (component == Static4.aClass13_1) { Static146.aBoolean174 = true; Static81.anInt2225 = local50; Static228.anInt5103 = local55; } - if (local9.aBoolean25 || local9.anInt453 != 0) { - @Pc(399) HookRequest local399; - if (local207 && Static58.wheelRotation != 0 && local9.anObjectArray10 != null) { - local399 = new HookRequest(); - local399.aBoolean158 = true; - local399.source = local9; - local399.mouseY = Static58.wheelRotation; - local399.arguments = local9.anObjectArray10; - InterfaceList.lowPriorityRequests.addTail(local399); + if (component.aBoolean25 || component.anInt453 != 0) { + @Pc(399) HookRequest request; + if (local207 && Static58.wheelRotation != 0 && component.anObjectArray10 != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseY = Static58.wheelRotation; + request.arguments = component.anObjectArray10; + InterfaceList.lowPriorityRequests.addTail(request); } - if (Static105.aClass13_14 != null || Static118.aClass13_15 != null || Static60.aBoolean108 || local9.anInt453 != 1400 && Static137.anInt3337 > 0) { + if (Static105.aClass13_14 != null || Static118.aClass13_15 != null || Static60.aBoolean108 || component.anInt453 != 1400 && Static137.anInt3337 > 0) { local221 = false; local212 = false; local207 = false; } - @Pc(508) int local508; - if (local9.anInt453 != 0) { - if (local9.anInt453 == 1337) { - Static280.aClass13_26 = local9; - Static43.redraw(local9); + @Pc(508) int skill; + if (component.anInt453 != 0) { + if (component.anInt453 == 1337) { + Static280.aClass13_26 = component; + Static43.redraw(component); continue; } - if (local9.anInt453 == 1338) { + if (component.anInt453 == 1338) { if (local221) { - Static1.anInt5 = Static7.clickX - local50; - Static107.anInt2878 = Static60.clickY - local55; + Static1.anInt5 = Mouse.clickX - local50; + Static107.anInt2878 = Mouse.clickY - local55; } continue; } - if (local9.anInt453 == 1400) { - WorldMap.component = local9; + if (component.anInt453 == 1400) { + WorldMap.component = component; if (local221) { if (Keyboard.pressedKeys[Keyboard.KEY_CTRL] && LoginManager.staffModLevel > 0) { - local243 = (int) ((double) (Static7.clickX - local50 - local9.anInt445 / 2) * 2.0D / (double) WorldMap.zoom); - local508 = (int) ((double) (Static60.clickY - local55 - local9.anInt459 / 2) * 2.0D / (double) WorldMap.zoom); - local322 = WorldMap.anInt435 + local243; - @Pc(516) int local516 = WorldMap.anInt919 + local508; - @Pc(520) int local520 = local322 + WorldMap.originX; + i = (int) ((double) (Mouse.clickX - local50 - component.anInt445 / 2) * 2.0D / (double) WorldMap.zoom); + skill = (int) ((double) (Mouse.clickY - local55 - component.anInt459 / 2) * 2.0D / (double) WorldMap.zoom); + k = WorldMap.anInt435 + i; + @Pc(516) int local516 = WorldMap.anInt919 + skill; + @Pc(520) int local520 = k + WorldMap.originX; @Pc(528) int local528 = WorldMap.length + WorldMap.originZ - local516 - 1; - Static61.teleport(local520, local528, 0); + Cheat.teleport(local520, local528, 0); Static153.method2909(); continue; } Static137.anInt3337 = 1; - Static246.anInt5388 = Static215.anInt4873; - Static165.anInt4035 = Static223.anInt5032; + Static246.anInt5388 = Mouse.anInt4873; + Static165.anInt4035 = Mouse.anInt5032; continue; } if (local212 && Static137.anInt3337 > 0) { - if (Static137.anInt3337 == 1 && (Static246.anInt5388 != Static215.anInt4873 || Static165.anInt4035 != Static223.anInt5032)) { + if (Static137.anInt3337 == 1 && (Static246.anInt5388 != Mouse.anInt4873 || Static165.anInt4035 != Mouse.anInt5032)) { Static197.anInt4620 = WorldMap.anInt435; Static71.anInt1885 = WorldMap.anInt919; Static137.anInt3337 = 2; } if (Static137.anInt3337 == 2) { - Static98.method1964(Static197.anInt4620 + (int) ((double) (Static246.anInt5388 - Static215.anInt4873) * 2.0D / (double) WorldMap.targetZoom)); - Static277.method4641(Static71.anInt1885 + (int) ((double) (Static165.anInt4035 - Static223.anInt5032) * 2.0D / (double) WorldMap.targetZoom)); + WorldMap.method1964(Static197.anInt4620 + (int) ((double) (Static246.anInt5388 - Mouse.anInt4873) * 2.0D / (double) WorldMap.targetZoom)); + WorldMap.method4641(Static71.anInt1885 + (int) ((double) (Static165.anInt4035 - Mouse.anInt5032) * 2.0D / (double) WorldMap.targetZoom)); } continue; } Static137.anInt3337 = 0; continue; } - if (local9.anInt453 == 1401) { + if (component.anInt453 == 1401) { if (local212) { - Static119.method2387(local9.anInt445, Static223.anInt5032 - local55, Static215.anInt4873 - local50, local9.anInt459); + WorldMap.method2387(component.anInt445, Mouse.anInt5032 - local55, Mouse.anInt4873 - local50, component.anInt459); } continue; } - if (local9.anInt453 == 1402) { + if (component.anInt453 == 1402) { if (!GlRenderer.enabled) { - Static43.redraw(local9); + Static43.redraw(component); } continue; } } - if (!local9.aBoolean24 && local221) { - local9.aBoolean24 = true; - if (local9.anObjectArray5 != null) { - local399 = new HookRequest(); - local399.aBoolean158 = true; - local399.source = local9; - local399.mouseX = Static7.clickX - local50; - local399.mouseY = Static60.clickY - local55; - local399.arguments = local9.anObjectArray5; - InterfaceList.lowPriorityRequests.addTail(local399); + if (!component.aBoolean24 && local221) { + component.aBoolean24 = true; + if (component.onClickRepeat != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.clickX - local50; + request.mouseY = Mouse.clickY - local55; + request.arguments = component.onClickRepeat; + InterfaceList.lowPriorityRequests.addTail(request); } } - if (local9.aBoolean24 && local212 && local9.anObjectArray6 != null) { - local399 = new HookRequest(); - local399.aBoolean158 = true; - local399.source = local9; - local399.mouseX = Static215.anInt4873 - local50; - local399.mouseY = Static223.anInt5032 - local55; - local399.arguments = local9.anObjectArray6; - InterfaceList.lowPriorityRequests.addTail(local399); + if (component.aBoolean24 && local212 && component.anObjectArray6 != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.anInt4873 - local50; + request.mouseY = Mouse.anInt5032 - local55; + request.arguments = component.anObjectArray6; + InterfaceList.lowPriorityRequests.addTail(request); } - if (local9.aBoolean24 && !local212) { - local9.aBoolean24 = false; - if (local9.anObjectArray18 != null) { - local399 = new HookRequest(); - local399.aBoolean158 = true; - local399.source = local9; - local399.mouseX = Static215.anInt4873 - local50; - local399.mouseY = Static223.anInt5032 - local55; - local399.arguments = local9.anObjectArray18; - Static115.mediumPriorityRequests.addTail(local399); + if (component.aBoolean24 && !local212) { + component.aBoolean24 = false; + if (component.onRelease != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.anInt4873 - local50; + request.mouseY = Mouse.anInt5032 - local55; + request.arguments = component.onRelease; + Static115.mediumPriorityRequests.addTail(request); } } - if (local212 && local9.anObjectArray9 != null) { - local399 = new HookRequest(); - local399.aBoolean158 = true; - local399.source = local9; - local399.mouseX = Static215.anInt4873 - local50; - local399.mouseY = Static223.anInt5032 - local55; - local399.arguments = local9.anObjectArray9; - InterfaceList.lowPriorityRequests.addTail(local399); + if (local212 && component.onHold != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.anInt4873 - local50; + request.mouseY = Mouse.anInt5032 - local55; + request.arguments = component.onHold; + InterfaceList.lowPriorityRequests.addTail(request); } - if (!local9.aBoolean19 && local207) { - local9.aBoolean19 = true; - if (local9.anObjectArray19 != null) { - local399 = new HookRequest(); - local399.aBoolean158 = true; - local399.source = local9; - local399.mouseX = Static215.anInt4873 - local50; - local399.mouseY = Static223.anInt5032 - local55; - local399.arguments = local9.anObjectArray19; - InterfaceList.lowPriorityRequests.addTail(local399); + if (!component.aBoolean19 && local207) { + component.aBoolean19 = true; + if (component.onMouseOver != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.anInt4873 - local50; + request.mouseY = Mouse.anInt5032 - local55; + request.arguments = component.onMouseOver; + InterfaceList.lowPriorityRequests.addTail(request); } } - if (local9.aBoolean19 && local207 && local9.anObjectArray23 != null) { - local399 = new HookRequest(); - local399.aBoolean158 = true; - local399.source = local9; - local399.mouseX = Static215.anInt4873 - local50; - local399.mouseY = Static223.anInt5032 - local55; - local399.arguments = local9.anObjectArray23; - InterfaceList.lowPriorityRequests.addTail(local399); + if (component.aBoolean19 && local207 && component.onMouseRepeat != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.anInt4873 - local50; + request.mouseY = Mouse.anInt5032 - local55; + request.arguments = component.onMouseRepeat; + InterfaceList.lowPriorityRequests.addTail(request); } - if (local9.aBoolean19 && !local207) { - local9.aBoolean19 = false; - if (local9.anObjectArray24 != null) { - local399 = new HookRequest(); - local399.aBoolean158 = true; - local399.source = local9; - local399.mouseX = Static215.anInt4873 - local50; - local399.mouseY = Static223.anInt5032 - local55; - local399.arguments = local9.anObjectArray24; - Static115.mediumPriorityRequests.addTail(local399); + if (component.aBoolean19 && !local207) { + component.aBoolean19 = false; + if (component.onMouseLeave != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.anInt4873 - local50; + request.mouseY = Mouse.anInt5032 - local55; + request.arguments = component.onMouseLeave; + Static115.mediumPriorityRequests.addTail(request); } } - if (local9.anObjectArray22 != null) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray22; - Static4.highPriorityRequests.addTail(local399); + if (component.onTimer != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onTimer; + Static4.highPriorityRequests.addTail(request); } - @Pc(966) HookRequest local966; - if (local9.anObjectArray4 != null && Static4.updatedVarcsWriterIndex > local9.anInt511) { - if (local9.anIntArray38 == null || Static4.updatedVarcsWriterIndex - local9.anInt511 > 32) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray4; - InterfaceList.lowPriorityRequests.addTail(local399); + @Pc(966) HookRequest request2; + if (component.onVarcTransmit != null && VarcDomain.updatedVarcsWriterIndex > component.updatedVarcsReaderIndex) { + if (component.varcTriggers == null || VarcDomain.updatedVarcsWriterIndex - component.updatedVarcsReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onVarcTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } else { - label563: for (local243 = local9.anInt511; local243 < Static4.updatedVarcsWriterIndex; local243++) { - local508 = Static138.updatedVarcs[local243 & 0x1F]; - for (local322 = 0; local322 < local9.anIntArray38.length; local322++) { - if (local9.anIntArray38[local322] == local508) { - local966 = new HookRequest(); - local966.source = local9; - local966.arguments = local9.anObjectArray4; - InterfaceList.lowPriorityRequests.addTail(local966); + label563: for (i = component.updatedVarcsReaderIndex; i < VarcDomain.updatedVarcsWriterIndex; i++) { + skill = VarcDomain.updatedVarcs[i & 0x1F]; + for (k = 0; k < component.varcTriggers.length; k++) { + if (component.varcTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onVarcTransmit; + InterfaceList.lowPriorityRequests.addTail(request2); break label563; } } } } - local9.anInt511 = Static4.updatedVarcsWriterIndex; + component.updatedVarcsReaderIndex = VarcDomain.updatedVarcsWriterIndex; } - if (local9.anObjectArray15 != null && Static72.updatedVarcstrsWriterIndex > local9.anInt487) { - if (local9.anIntArray35 == null || Static72.updatedVarcstrsWriterIndex - local9.anInt487 > 32) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray15; - InterfaceList.lowPriorityRequests.addTail(local399); + if (component.onVarcstrTransmit != null && VarcDomain.updatedVarcstrsWriterIndex > component.updatedVarcstrsReaderIndex) { + if (component.varcstrTriggers == null || VarcDomain.updatedVarcstrsWriterIndex - component.updatedVarcstrsReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onVarcstrTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } else { - label539: for (local243 = local9.anInt487; local243 < Static72.updatedVarcstrsWriterIndex; local243++) { - local508 = Static233.updatedVarcstrs[local243 & 0x1F]; - for (local322 = 0; local322 < local9.anIntArray35.length; local322++) { - if (local9.anIntArray35[local322] == local508) { - local966 = new HookRequest(); - local966.source = local9; - local966.arguments = local9.anObjectArray15; - InterfaceList.lowPriorityRequests.addTail(local966); + label539: for (i = component.updatedVarcstrsReaderIndex; i < VarcDomain.updatedVarcstrsWriterIndex; i++) { + skill = VarcDomain.updatedVarcstrs[i & 0x1F]; + for (k = 0; k < component.varcstrTriggers.length; k++) { + if (component.varcstrTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onVarcstrTransmit; + InterfaceList.lowPriorityRequests.addTail(request2); break label539; } } } } - local9.anInt487 = Static72.updatedVarcstrsWriterIndex; + component.updatedVarcstrsReaderIndex = VarcDomain.updatedVarcstrsWriterIndex; } - if (local9.anObjectArray25 != null && Static70.updatedVarpsWriterIndex > local9.anInt471) { - if (local9.anIntArray44 == null || Static70.updatedVarpsWriterIndex - local9.anInt471 > 32) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray25; - InterfaceList.lowPriorityRequests.addTail(local399); + if (component.onVarpTransmit != null && VarpDomain.updatedVarpsWriterIndex > component.updatedVarpsReaderIndex) { + if (component.varpTriggers == null || VarpDomain.updatedVarpsWriterIndex - component.updatedVarpsReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onVarpTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } else { - label515: for (local243 = local9.anInt471; local243 < Static70.updatedVarpsWriterIndex; local243++) { - local508 = Static83.updatedVarps[local243 & 0x1F]; - for (local322 = 0; local322 < local9.anIntArray44.length; local322++) { - if (local9.anIntArray44[local322] == local508) { - local966 = new HookRequest(); - local966.source = local9; - local966.arguments = local9.anObjectArray25; - InterfaceList.lowPriorityRequests.addTail(local966); + label515: for (i = component.updatedVarpsReaderIndex; i < VarpDomain.updatedVarpsWriterIndex; i++) { + skill = VarpDomain.updatedVarps[i & 0x1F]; + for (k = 0; k < component.varpTriggers.length; k++) { + if (component.varpTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onVarpTransmit; + InterfaceList.lowPriorityRequests.addTail(request2); break label515; } } } } - local9.anInt471 = Static70.updatedVarpsWriterIndex; + component.updatedVarpsReaderIndex = VarpDomain.updatedVarpsWriterIndex; } - if (local9.anObjectArray7 != null && Static111.anInt2901 > local9.anInt493) { - if (local9.anIntArray34 == null || Static111.anInt2901 - local9.anInt493 > 32) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray7; - InterfaceList.lowPriorityRequests.addTail(local399); + if (component.onInvTransmit != null && Static111.updatedInventoriesWriterIndex > component.updatedInventoriesReaderIndex) { + if (component.inventoryTriggers == null || Static111.updatedInventoriesWriterIndex - component.updatedInventoriesReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onInvTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } else { - label491: for (local243 = local9.anInt493; local243 < Static111.anInt2901; local243++) { - local508 = Static27.anIntArray70[local243 & 0x1F]; - for (local322 = 0; local322 < local9.anIntArray34.length; local322++) { - if (local9.anIntArray34[local322] == local508) { - local966 = new HookRequest(); - local966.source = local9; - local966.arguments = local9.anObjectArray7; - InterfaceList.lowPriorityRequests.addTail(local966); - break label491; + outer: + for (i = component.updatedInventoriesReaderIndex; i < Static111.updatedInventoriesWriterIndex; i++) { + skill = Static27.updatedInventories[i & 0x1F]; + for (k = 0; k < component.inventoryTriggers.length; k++) { + if (component.inventoryTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onInvTransmit; + InterfaceList.lowPriorityRequests.addTail(request2); + break outer; } } } } - local9.anInt493 = Static111.anInt2901; + component.updatedInventoriesReaderIndex = Static111.updatedInventoriesWriterIndex; } - if (local9.anObjectArray2 != null && Static89.anInt2385 > local9.anInt525) { - if (local9.anIntArray42 == null || Static89.anInt2385 - local9.anInt525 > 32) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray2; - InterfaceList.lowPriorityRequests.addTail(local399); + if (component.onStatTransmit != null && PlayerSkillXpTable.updatedStatsWriterIndex > component.updatedStatsReaderIndex) { + if (component.statTriggers == null || PlayerSkillXpTable.updatedStatsWriterIndex - component.updatedStatsReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onStatTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } else { - label467: for (local243 = local9.anInt525; local243 < Static89.anInt2385; local243++) { - local508 = Static249.anIntArray478[local243 & 0x1F]; - for (local322 = 0; local322 < local9.anIntArray42.length; local322++) { - if (local9.anIntArray42[local322] == local508) { - local966 = new HookRequest(); - local966.source = local9; - local966.arguments = local9.anObjectArray2; - InterfaceList.lowPriorityRequests.addTail(local966); - break label467; + outer: + for (i = component.updatedStatsReaderIndex; i < PlayerSkillXpTable.updatedStatsWriterIndex; i++) { + skill = PlayerSkillXpTable.updatedStats[i & 0x1F]; + for (k = 0; k < component.statTriggers.length; k++) { + if (component.statTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onStatTransmit; + InterfaceList.lowPriorityRequests.addTail(request2); + break outer; } } } } - local9.anInt525 = Static89.anInt2385; + component.updatedStatsReaderIndex = PlayerSkillXpTable.updatedStatsWriterIndex; } - if (Static49.anInt1464 > local9.anInt482 && local9.anObjectArray20 != null) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray20; - InterfaceList.lowPriorityRequests.addTail(local399); + if (Chat.transmitAt > component.lastTransmitTimer && component.onChatTransmit != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onChatTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } - if (Static185.anInt4369 > local9.anInt482 && local9.anObjectArray1 != null) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray1; - InterfaceList.lowPriorityRequests.addTail(local399); + if (FriendsList.transmitAt > component.lastTransmitTimer && component.onFriendTransmit != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onFriendTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } - if (Static278.anInt5867 > local9.anInt482 && local9.anObjectArray28 != null) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray28; - InterfaceList.lowPriorityRequests.addTail(local399); + if (ClanChat.transmitAt > component.lastTransmitTimer && component.onClanTransmit != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onClanTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } - if (Static207.anInt4778 > local9.anInt482 && local9.anObjectArray21 != null) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray21; - InterfaceList.lowPriorityRequests.addTail(local399); + if (StockMarketManager.transmitAt > component.lastTransmitTimer && component.onStockTransmit != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onStockTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } - if (Static209.miscTransmitAt > local9.anInt482 && local9.anObjectArray30 != null) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray30; - InterfaceList.lowPriorityRequests.addTail(local399); + if (InterfaceList.miscTransmitAt > component.lastTransmitTimer && component.onMiscTransmit != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onMiscTransmit; + InterfaceList.lowPriorityRequests.addTail(request); } - local9.anInt482 = InterfaceList.transmitTimer; - if (local9.anObjectArray14 != null) { - for (local243 = 0; local243 < InterfaceList.keyQueueSize; local243++) { + component.lastTransmitTimer = InterfaceList.transmitTimer; + if (component.onKey != null) { + for (i = 0; i < InterfaceList.keyQueueSize; i++) { @Pc(1430) HookRequest local1430 = new HookRequest(); - local1430.source = local9; - local1430.keyCode = InterfaceList.keyCodes[local243]; - local1430.keyChar = InterfaceList.keyChars[local243]; - local1430.arguments = local9.anObjectArray14; + local1430.source = component; + local1430.keyCode = InterfaceList.keyCodes[i]; + local1430.keyChar = InterfaceList.keyChars[i]; + local1430.arguments = component.onKey; InterfaceList.lowPriorityRequests.addTail(local1430); } } - if (Static13.aBoolean16 && local9.anObjectArray13 != null) { - local399 = new HookRequest(); - local399.source = local9; - local399.arguments = local9.anObjectArray13; - InterfaceList.lowPriorityRequests.addTail(local399); + if (Static13.aBoolean16 && component.onCamFinished != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onCamFinished; + InterfaceList.lowPriorityRequests.addTail(request); } } } - if (!local9.aBoolean32 && Static105.aClass13_14 == null && Static118.aClass13_15 == null && !Static60.aBoolean108) { - if ((local9.anInt470 >= 0 || local9.anInt480 != 0) && Static215.anInt4873 >= local61 && Static223.anInt5032 >= local63 && Static215.anInt4873 < local65 && Static223.anInt5032 < local67) { - if (local9.anInt470 >= 0) { - Static180.aClass13_22 = arg0[local9.anInt470]; + if (!component.aBoolean32 && Static105.aClass13_14 == null && Static118.aClass13_15 == null && !Static60.aBoolean108) { + if ((component.anInt470 >= 0 || component.anInt480 != 0) && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) { + if (component.anInt470 >= 0) { + Static180.aClass13_22 = arg0[component.anInt470]; } else { - Static180.aClass13_22 = local9; + Static180.aClass13_22 = component; } } - if (local9.type == 8 && Static215.anInt4873 >= local61 && Static223.anInt5032 >= local63 && Static215.anInt4873 < local65 && Static223.anInt5032 < local67) { - Static43.aClass13_11 = local9; + if (component.type == 8 && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) { + Static43.aClass13_11 = component; } - if (local9.anInt491 > local9.anInt459) { - Static236.method4049(Static223.anInt5032, local9.anInt459, local9, Static215.anInt4873, local50 + local9.anInt445, local55, local9.anInt491); + if (component.anInt491 > component.anInt459) { + Static236.method4049(Mouse.anInt5032, component.anInt459, component, Mouse.anInt4873, local50 + component.anInt445, local55, component.anInt491); } } - if (local9.type == 0) { - method946(arg0, local9.id, local61, local63, local65, local67, local50 - local9.anInt489, local55 - local9.scrollY); - if (local9.createdComponents != null) { - method946(local9.createdComponents, local9.id, local61, local63, local65, local67, local50 - local9.anInt489, local55 - local9.scrollY); + if (component.type == 0) { + method946(arg0, component.id, local61, local63, local65, local67, local50 - component.anInt489, local55 - component.scrollY); + if (component.createdComponents != null) { + method946(component.createdComponents, component.id, local61, local63, local65, local67, local50 - component.anInt489, local55 - component.scrollY); } - @Pc(1595) Class3_Sub31 local1595 = (Class3_Sub31) Static119.aClass133_9.get((long) local9.id); + @Pc(1595) Class3_Sub31 local1595 = (Class3_Sub31) Static119.aClass133_9.get((long) component.id); if (local1595 != null) { Static57.method1320(local50, local63, local55, local65, local1595.anInt5878, local61, local67); } diff --git a/client/src/main/java/Static37.java b/client/src/main/java/Static37.java index 696531a..c2d5e94 100644 --- a/client/src/main/java/Static37.java +++ b/client/src/main/java/Static37.java @@ -18,8 +18,8 @@ public final class Static37 { @Pc(13) BasType local13 = arg0.method2681(); @Pc(43) int local43; @Pc(36) int local36; - if (arg0.anInt3370 != -1 && arg0.anInt3370 < 32768) { - @Pc(26) Npc local26 = Static175.npcs[arg0.anInt3370]; + if (arg0.faceEntity != -1 && arg0.faceEntity < 32768) { + @Pc(26) Npc local26 = Static175.npcs[arg0.faceEntity]; if (local26 != null) { local36 = arg0.zFine - local26.zFine; local43 = arg0.xFine - local26.xFine; @@ -30,12 +30,12 @@ public final class Static37 { } @Pc(94) int local94; @Pc(70) int local70; - if (arg0.anInt3370 >= 32768) { - local70 = arg0.anInt3370 - 32768; + if (arg0.faceEntity >= 32768) { + local70 = arg0.faceEntity - 32768; if (local70 == PlayerList.selfId) { local70 = 2047; } - @Pc(83) Player local83 = Static159.players[local70]; + @Pc(83) Player local83 = PlayerList.players[local70]; if (local83 != null) { local94 = arg0.zFine - local83.zFine; local36 = arg0.xFine - local83.xFine; @@ -44,14 +44,14 @@ public final class Static37 { } } } - if ((arg0.anInt3382 != 0 || arg0.anInt3363 != 0) && (arg0.movementQueueSize == 0 || arg0.anInt3417 > 0)) { - local70 = arg0.xFine - (arg0.anInt3382 - Static225.originX - Static225.originX) * 64; - local43 = arg0.zFine - (arg0.anInt3363 - Static142.originZ - Static142.originZ) * 64; + if ((arg0.faceX != 0 || arg0.faceY != 0) && (arg0.movementQueueSize == 0 || arg0.anInt3417 > 0)) { + local70 = arg0.xFine - (arg0.faceX - Static225.originX - Static225.originX) * 64; + local43 = arg0.zFine - (arg0.faceY - Static142.originZ - Static142.originZ) * 64; if (local70 != 0 || local43 != 0) { arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF; } - arg0.anInt3363 = 0; - arg0.anInt3382 = 0; + arg0.faceY = 0; + arg0.faceX = 0; } local70 = arg0.anInt3400 - arg0.anInt3381 & 0x7FF; if (local70 == 0) { diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java index 4d3bb10..ccf5355 100644 --- a/client/src/main/java/Static38.java +++ b/client/src/main/java/Static38.java @@ -154,7 +154,7 @@ public final class Static38 { @OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V") public static void method964(@OriginalArg(0) boolean arg0) { - @Pc(3) int local3 = Static267.anInt5774; + @Pc(3) int local3 = PlayerList.size; if (Static115.anInt2939 == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == Static84.anInt2255) { Static115.anInt2939 = 0; } @@ -173,7 +173,7 @@ public final class Static38 { if (arg0) { local39 = PlayerList.self; } else { - local39 = Static159.players[Static105.anIntArray256[local28]]; + local39 = PlayerList.players[PlayerList.ids[local28]]; } if (local39 != null && local39.method2682()) { @Pc(55) int local55 = local39.getSize(); @@ -217,12 +217,12 @@ public final class Static38 { local39 = PlayerList.self; local272 = 8791798054912L; } else { - local39 = Static159.players[Static105.anIntArray256[local28]]; - local272 = (long) Static105.anIntArray256[local28] << 32; + local39 = PlayerList.players[PlayerList.ids[local28]]; + local272 = (long) PlayerList.ids[local28] << 32; } if (local39 != null && local39.method2682()) { local39.aBoolean98 = false; - if ((Preferences.manyIdleAnimations && Static267.anInt5774 > 200 || Static267.anInt5774 > 50) && !arg0 && local39.anInt3366 == local39.method2681().idleAnimationId) { + if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.anInt3366 == local39.method2681().idleAnimationId) { local39.aBoolean98 = true; } local82 = local39.getSize(); @@ -279,13 +279,13 @@ public final class Static38 { } } } - if (local39.attachment == null || Static83.loop < local39.anInt3390 || local39.anInt3375 <= Static83.loop) { - local39.anInt3424 = SceneGraph.getTileHeight(Static55.level, local39.xFine, local39.zFine); - Static43.method1141(Static55.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171); + 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(Static55.level, local39.xFine, local39.zFine); - Static184.method3387(Static55.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.anInt3384, local39.anInt3374, local39.anInt3411, local39.anInt3410); + 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.anInt3384, local39.anInt3374, local39.anInt3411, local39.anInt3410); } } } diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index 8899449..7b60c79 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -1,4 +1,3 @@ -import java.io.IOException; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -20,9 +19,6 @@ public final class Static4 { @OriginalMember(owner = "client!ac", name = "n", descriptor = "I") public static int anInt36 = 0; - @OriginalMember(owner = "client!ac", name = "o", descriptor = "I") - public static int updatedVarcsWriterIndex = 0; - @OriginalMember(owner = "client!ac", name = "p", descriptor = "Lclient!be;") public static Component aClass13_1 = null; @@ -59,1548 +55,17 @@ public final class Static4 { return -1; } - @OriginalMember(owner = "client!ac", name = "a", descriptor = "(B)Z") - public static boolean method26() throws IOException { - if (Protocol.socket == null) { - return false; - } - @Pc(14) int local14 = Protocol.socket.available(); - if (local14 == 0) { - return false; - } - if (Protocol.opcode == -1) { - local14--; - Protocol.socket.read(0, 1, Protocol.inboundBuffer.data); - Protocol.inboundBuffer.offset = 0; - Protocol.opcode = Protocol.inboundBuffer.g1isaac(); - Protocol.length = Static234.anIntArray456[Protocol.opcode]; - } - if (Protocol.length == -1) { - if (local14 <= 0) { - return false; - } - Protocol.socket.read(0, 1, Protocol.inboundBuffer.data); - local14--; - Protocol.length = Protocol.inboundBuffer.data[0] & 0xFF; - } - if (Protocol.length == -2) { - if (local14 <= 1) { - return false; - } - local14 -= 2; - Protocol.socket.read(0, 2, Protocol.inboundBuffer.data); - Protocol.inboundBuffer.offset = 0; - Protocol.length = Protocol.inboundBuffer.g2(); - } - if (Protocol.length > local14) { - return false; - } - Protocol.inboundBuffer.offset = 0; - Protocol.socket.read(0, Protocol.length, Protocol.inboundBuffer.data); - Static49.anInt1462 = Static5.anInt45; - Static5.anInt45 = Static230.anInt5152; - Static230.anInt5152 = Protocol.opcode; - Static201.anInt1862 = 0; - @Pc(133) int local133; - if (Protocol.opcode == 60) { - local133 = Protocol.inboundBuffer.g2sub(); - @Pc(137) byte local137 = Protocol.inboundBuffer.g1neg(); - Static170.method2575(local137, local133); - Protocol.opcode = -1; - return true; - } - @Pc(171) int local171; - @Pc(156) JagString local156; - if (Protocol.opcode == 115) { - local133 = Protocol.inboundBuffer.g2(); - local156 = Protocol.inboundBuffer.gjstr(); - @Pc(163) Object[] local163 = new Object[local156.length() + 1]; - for (local171 = local156.length() - 1; local171 >= 0; local171--) { - if (local156.charAt(local171) == 115) { - local163[local171 + 1] = Protocol.inboundBuffer.gjstr(); - } else { - local163[local171 + 1] = Integer.valueOf(Protocol.inboundBuffer.g4()); - } - } - local163[0] = Integer.valueOf(Protocol.inboundBuffer.g4()); - if (Static248.method3288(local133)) { - @Pc(226) HookRequest local226 = new HookRequest(); - local226.arguments = local163; - Static82.method1767(local226); - } - Protocol.opcode = -1; - return true; - } - @Pc(275) long local275; - @Pc(262) boolean local262; - @Pc(277) int local277; - @Pc(506) JagString local506; - if (Protocol.opcode == 70) { - @Pc(245) JagString local245 = Protocol.inboundBuffer.gjstr(); - if (local245.method3130(Static196.aClass100_863)) { - local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); - local275 = local156.encode37(); - local262 = false; - for (local277 = 0; local277 < Static35.anInt1093; local277++) { - if (Static190.aLongArray6[local277] == local275) { - local262 = true; - break; - } - } - if (!local262 && Static11.anInt384 == 0) { - Static103.method2231(local156, 4, LocalizedText.TRADEREQ); - } - } else if (local245.method3130(Static61.aClass100_423)) { - local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); - local275 = local156.encode37(); - local262 = false; - for (local277 = 0; local277 < Static35.anInt1093; local277++) { - if (Static190.aLongArray6[local277] == local275) { - local262 = true; - break; - } - } - if (!local262 && Static11.anInt384 == 0) { - local506 = local245.substring(local245.length() - 9, local245.indexOf(Static264.aClass100_875) + 1); - Static103.method2231(local156, 8, local506); - } - } else if (local245.method3130(Static191.aClass100_845)) { - local262 = false; - local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); - local275 = local156.encode37(); - for (local277 = 0; local277 < Static35.anInt1093; local277++) { - if (local275 == Static190.aLongArray6[local277]) { - local262 = true; - break; - } - } - if (!local262 && Static11.anInt384 == 0) { - Static103.method2231(local156, 10, JagString.EMPTY); - } - } else if (local245.method3130(Static141.aClass100_664)) { - local156 = local245.substring(local245.indexOf(Static141.aClass100_664), 0); - Static103.method2231(JagString.EMPTY, 11, local156); - } else if (local245.method3130(Static138.aClass100_654)) { - local156 = local245.substring(local245.indexOf(Static138.aClass100_654), 0); - if (Static11.anInt384 == 0) { - Static103.method2231(JagString.EMPTY, 12, local156); - } - } else if (local245.method3130(Static244.aClass100_1014)) { - local156 = local245.substring(local245.indexOf(Static244.aClass100_1014), 0); - if (Static11.anInt384 == 0) { - Static103.method2231(JagString.EMPTY, 13, local156); - } - } else if (local245.method3130(Static56.aClass100_379)) { - local262 = false; - local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); - local275 = local156.encode37(); - for (local277 = 0; local277 < Static35.anInt1093; local277++) { - if (local275 == Static190.aLongArray6[local277]) { - local262 = true; - break; - } - } - if (!local262 && Static11.anInt384 == 0) { - Static103.method2231(local156, 14, JagString.EMPTY); - } - } else if (local245.method3130(Static112.aClass100_574)) { - local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); - local262 = false; - local275 = local156.encode37(); - for (local277 = 0; local277 < Static35.anInt1093; local277++) { - if (Static190.aLongArray6[local277] == local275) { - local262 = true; - break; - } - } - if (!local262 && Static11.anInt384 == 0) { - Static103.method2231(local156, 15, JagString.EMPTY); - } - } else if (local245.method3130(Static217.aClass100_916)) { - local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); - local275 = local156.encode37(); - local262 = false; - for (local277 = 0; local277 < Static35.anInt1093; local277++) { - if (local275 == Static190.aLongArray6[local277]) { - local262 = true; - break; - } - } - if (!local262 && Static11.anInt384 == 0) { - Static103.method2231(local156, 16, JagString.EMPTY); - } - } else if (local245.method3130(Static164.aClass100_770)) { - local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); - local262 = false; - local275 = local156.encode37(); - for (local277 = 0; local277 < Static35.anInt1093; local277++) { - if (Static190.aLongArray6[local277] == local275) { - local262 = true; - break; - } - } - if (!local262 && Static11.anInt384 == 0) { - local506 = local245.substring(local245.length() - 9, local245.indexOf(Static264.aClass100_875) + 1); - Static103.method2231(local156, 21, local506); - } - } else { - Static103.method2231(JagString.EMPTY, 0, local245); - } - Protocol.opcode = -1; - return true; - } - @Pc(786) int local786; - @Pc(790) JagString local790; - if (Protocol.opcode == 123) { - local133 = Protocol.inboundBuffer.g2le(); - local786 = Protocol.inboundBuffer.g2sub(); - local790 = Protocol.inboundBuffer.gjstr(); - if (Static248.method3288(local786)) { - Static193.method3498(local790, local133); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 230) { - Static180.anInt4264 = Protocol.inboundBuffer.g1add(); - Static115.anInt2940 = Protocol.inboundBuffer.g1ssub(); - while (Protocol.length > Protocol.inboundBuffer.offset) { - Protocol.opcode = Protocol.inboundBuffer.g1(); - Static75.method1634(); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 153) { - Protocol.opcode = -1; - Static115.anInt2939 = 0; - return true; - } else { - @Pc(864) int local864; - if (Protocol.opcode == 220) { - local133 = Protocol.inboundBuffer.p4rme(); - local786 = Protocol.inboundBuffer.g2le(); - local864 = Protocol.inboundBuffer.g2(); - if (Static248.method3288(local864)) { - Static229.method3938(local786, local133); - } - Protocol.opcode = -1; - return true; - } - @Pc(884) long local884; - @Pc(908) int local908; - @Pc(916) int local916; - @Pc(899) long local899; - @Pc(904) long local904; - if (Protocol.opcode == 81) { - local884 = Protocol.inboundBuffer.g8(); - Protocol.inboundBuffer.g1s(); - local275 = Protocol.inboundBuffer.g8(); - local899 = Protocol.inboundBuffer.g2(); - local904 = Protocol.inboundBuffer.g3(); - local908 = Protocol.inboundBuffer.g1(); - @Pc(910) boolean local910 = false; - local916 = Protocol.inboundBuffer.g2(); - @Pc(922) long local922 = (local899 << 32) + local904; - @Pc(924) int local924 = 0; - label1320: while (true) { - if (local924 < 100) { - if (local922 != Static233.aLongArray9[local924]) { - local924++; - continue; - } - local910 = true; - break; - } - if (local908 <= 1) { - for (local924 = 0; local924 < Static35.anInt1093; local924++) { - if (Static190.aLongArray6[local924] == local884) { - local910 = true; - break label1320; - } - } - } - break; - } - if (!local910 && Static11.anInt384 == 0) { - Static233.aLongArray9[Static251.anInt5447] = local922; - Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; - @Pc(999) JagString local999 = QuickChatPhraseTypeList.get(local916).method770(Protocol.inboundBuffer); - if (local908 == 2 || local908 == 3) { - Static154.method2928(local916, 20, local999, Base37.decodeLowerCase(local275).method3125(), JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() })); - } else if (local908 == 1) { - Static154.method2928(local916, 20, local999, Base37.decodeLowerCase(local275).method3125(), JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() })); - } else { - Static154.method2928(local916, 20, local999, Base37.decodeLowerCase(local275).method3125(), Base37.decodeLowerCase(local884).method3125()); - } - } - Protocol.opcode = -1; - return true; - } - @Pc(1146) int local1146; - @Pc(1160) int local1160; - @Pc(1245) boolean local1245; - if (Protocol.opcode == 55) { - Static278.anInt5867 = InterfaceList.transmitTimer; - local884 = Protocol.inboundBuffer.g8(); - if (local884 == 0L) { - Static270.aClass100_1094 = null; - Protocol.opcode = -1; - Static15.aClass100_87 = null; - Static199.aClass3_Sub22Array1 = null; - Static214.anInt5577 = 0; - return true; - } - local275 = Protocol.inboundBuffer.g8(); - Static15.aClass100_87 = Base37.decodeLowerCase(local275); - Static270.aClass100_1094 = Base37.decodeLowerCase(local884); - Static50.aByte6 = Protocol.inboundBuffer.g1s(); - local1146 = Protocol.inboundBuffer.g1(); - if (local1146 == 255) { - Protocol.opcode = -1; - return true; - } - Static214.anInt5577 = local1146; - @Pc(1158) Class3_Sub22[] local1158 = new Class3_Sub22[100]; - for (local1160 = 0; local1160 < Static214.anInt5577; local1160++) { - local1158[local1160] = new Class3_Sub22(); - local1158[local1160].key = Protocol.inboundBuffer.g8(); - local1158[local1160].aClass100_636 = Base37.decodeLowerCase(local1158[local1160].key); - local1158[local1160].anInt3340 = Protocol.inboundBuffer.g2(); - local1158[local1160].aByte9 = Protocol.inboundBuffer.g1s(); - local1158[local1160].aClass100_635 = Protocol.inboundBuffer.gjstr(); - if (Static101.aLong98 == local1158[local1160].key) { - Static160.aByte14 = local1158[local1160].aByte9; - } - } - local908 = Static214.anInt5577; - while (local908 > 0) { - local1245 = true; - local908--; - for (local916 = 0; local916 < local908; local916++) { - if (local1158[local916].aClass100_636.method3139(local1158[local916 + 1].aClass100_636) > 0) { - local1245 = false; - @Pc(1279) Class3_Sub22 local1279 = local1158[local916]; - local1158[local916] = local1158[local916 + 1]; - local1158[local916 + 1] = local1279; - } - } - if (local1245) { - break; - } - } - Static199.aClass3_Sub22Array1 = local1158; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 164) { - local133 = Protocol.inboundBuffer.g4rme(); - Static232.aClass212_5 = GameShell.signLink.getReverseDns(local133); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 225) { - Static64.method1495(); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 48) { - local133 = Protocol.inboundBuffer.g2(); - local156 = Protocol.inboundBuffer.gjstr(); - local864 = Protocol.inboundBuffer.g2leadd(); - if (Static248.method3288(local133)) { - Static193.method3498(local156, local864); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 232) { - Static59.anInt1812 = Protocol.inboundBuffer.g1(); - Static49.anInt1459 = Protocol.inboundBuffer.g1(); - Static84.anInt2256 = Protocol.inboundBuffer.g1(); - Protocol.opcode = -1; - return true; - } else { - @Pc(1409) JagString local1409; - if (Protocol.opcode == 44) { - local133 = Protocol.inboundBuffer.g2leadd(); - if (local133 == 65535) { - local133 = -1; - } - local786 = Protocol.inboundBuffer.g1(); - local864 = Protocol.inboundBuffer.g1(); - local1409 = Protocol.inboundBuffer.gjstr(); - if (local864 >= 1 && local864 <= 8) { - if (local1409.equalsIgnoreCase(Static92.aClass100_510)) { - local1409 = null; - } - Static160.aClass100Array121[local864 - 1] = local1409; - Static191.anIntArray388[local864 - 1] = local133; - Static1.aBooleanArray1[local864 - 1] = local786 == 0; - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 226) { - local133 = Protocol.inboundBuffer.g4(); - local786 = Protocol.inboundBuffer.g2sub(); - Static170.method2575(local133, local786); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 21) { - local133 = Protocol.inboundBuffer.p1neg(); - local786 = Protocol.inboundBuffer.g2(); - local864 = Protocol.inboundBuffer.g4me(); - if (Static248.method3288(local786)) { - Static153.method2905(local864, local133); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 145) { - local133 = Protocol.inboundBuffer.g2leadd(); - local786 = Protocol.inboundBuffer.g1add(); - local864 = Protocol.inboundBuffer.g2leadd(); - if (Static248.method3288(local864)) { - if (local786 == 2) { - Static5.method34(); - } - InterfaceList.topLevelInterface = local133; - Static81.method1753(local133); - Static210.method3712(false); - Static74.method1626(InterfaceList.topLevelInterface); - for (local171 = 0; local171 < 100; local171++) { - Static186.aBooleanArray100[local171] = true; - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 69) { - local133 = Protocol.inboundBuffer.g2leadd(); - local786 = Protocol.inboundBuffer.g4(); - local864 = Protocol.inboundBuffer.g2sub(); - if (Static248.method3288(local133)) { - Static132.method2606(local864, local786); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 141) { - local884 = Protocol.inboundBuffer.g8(); - local864 = Protocol.inboundBuffer.g2(); - local1409 = QuickChatPhraseTypeList.get(local864).method770(Protocol.inboundBuffer); - Static154.method2928(local864, 19, local1409, null, Base37.decodeLowerCase(local884).method3125()); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 169) { - Static271.method4598(Protocol.inboundBuffer); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 89) { - Static8.method121(); - InterfaceList.method2245(); - Static70.updatedVarpsWriterIndex += 32; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 125) { - local133 = Protocol.inboundBuffer.g2(); - local786 = Protocol.inboundBuffer.g1(); - local864 = Protocol.inboundBuffer.g1(); - local171 = Protocol.inboundBuffer.g2(); - local1146 = Protocol.inboundBuffer.g1(); - local277 = Protocol.inboundBuffer.g1(); - if (Static248.method3288(local133)) { - Static260.method3849(local171, local864, local1146, local786, local277); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 36) { - local133 = Protocol.inboundBuffer.p4rme(); - local786 = Protocol.inboundBuffer.g2les(); - local864 = Protocol.inboundBuffer.g2sub(); - if (Static248.method3288(local864)) { - Static225.method3893(local133, local786); - } - Protocol.opcode = -1; - return true; - } else { - @Pc(1814) ServerActiveProperties local1814; - @Pc(1804) ServerActiveProperties local1804; - if (Protocol.opcode == 9) { - local133 = Protocol.inboundBuffer.g2leadd(); - local786 = Protocol.inboundBuffer.g4me(); - local864 = Protocol.inboundBuffer.g2sub(); - local171 = Protocol.inboundBuffer.g2le(); - if (local171 == 65535) { - local171 = -1; - } - local1146 = Protocol.inboundBuffer.g2sub(); - if (local1146 == 65535) { - local1146 = -1; - } - if (Static248.method3288(local864)) { - for (local277 = local1146; local277 <= local171; local277++) { - local904 = (long) local277 + ((long) local786 << 32); - local1804 = (ServerActiveProperties) Static210.aClass133_21.get(local904); - if (local1804 != null) { - local1814 = new ServerActiveProperties(local1804.anInt546, local133); - local1804.unlink(); - } else if (local277 == -1) { - local1814 = new ServerActiveProperties(InterfaceList.getComponent(local786).aClass3_Sub4_1.anInt546, local133); - } else { - local1814 = new ServerActiveProperties(0, local133); - } - Static210.aClass133_21.put(local1814, local904); - } - } - Protocol.opcode = -1; - return true; - } - @Pc(1986) int local1986; - if (Protocol.opcode == 56) { - local133 = Protocol.inboundBuffer.g2(); - local786 = Protocol.inboundBuffer.g2le(); - local864 = Protocol.inboundBuffer.g4rme(); - local171 = Protocol.inboundBuffer.g2leadd(); - if (local864 >> 30 == 0) { - @Pc(1994) SeqType local1994; - if (local864 >> 29 != 0) { - local1146 = local864 & 0xFFFF; - @Pc(1894) Npc local1894 = Static175.npcs[local1146]; - if (local1894 != null) { - if (local171 == 65535) { - local171 = -1; - } - local1245 = true; - if (local171 != -1 && local1894.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local171).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local1894.anInt3432).seqId).anInt5355) { - local1245 = false; - } - if (local1245) { - local1894.anInt3361 = 0; - local1894.anInt3432 = local171; - local1894.anInt3359 = Static83.loop + local133; - local1894.anInt3399 = 0; - if (local1894.anInt3359 > Static83.loop) { - local1894.anInt3399 = -1; - } - local1894.anInt3394 = local786; - local1894.anInt3418 = 1; - if (local1894.anInt3432 != -1 && Static83.loop == local1894.anInt3359) { - local1986 = SpotAnimTypeList.get(local1894.anInt3432).seqId; - if (local1986 != -1) { - local1994 = SeqTypeList.get(local1986); - if (local1994 != null && local1994.frames != null) { - SoundPlayer.playSeqSound(local1894.zFine, local1994, local1894.xFine, false, 0); - } - } - } - } - } - } else if (local864 >> 28 != 0) { - local1146 = local864 & 0xFFFF; - @Pc(2033) Player local2033; - if (PlayerList.selfId == local1146) { - local2033 = PlayerList.self; - } else { - local2033 = Static159.players[local1146]; - } - if (local2033 != null) { - if (local171 == 65535) { - local171 = -1; - } - local1245 = true; - if (local171 != -1 && local2033.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local171).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(local2033.anInt3432).seqId).anInt5355) { - local1245 = false; - } - if (local1245) { - local2033.anInt3359 = local133 + Static83.loop; - local2033.anInt3394 = local786; - local2033.anInt3432 = local171; - if (local2033.anInt3432 == 65535) { - local2033.anInt3432 = -1; - } - local2033.anInt3418 = 1; - local2033.anInt3361 = 0; - local2033.anInt3399 = 0; - if (local2033.anInt3359 > Static83.loop) { - local2033.anInt3399 = -1; - } - if (local2033.anInt3432 != -1 && local2033.anInt3359 == Static83.loop) { - local1986 = SpotAnimTypeList.get(local2033.anInt3432).seqId; - if (local1986 != -1) { - local1994 = SeqTypeList.get(local1986); - if (local1994 != null && local1994.frames != null) { - SoundPlayer.playSeqSound(local2033.zFine, local1994, local2033.xFine, local2033 == PlayerList.self, 0); - } - } - } - } - } - } - } else { - local1146 = local864 >> 28 & 0x3; - local277 = (local864 >> 14 & 0x3FFF) - Static225.originX; - local1160 = (local864 & 0x3FFF) - Static142.originZ; - if (local277 >= 0 && local1160 >= 0 && local277 < 104 && local1160 < 104) { - local1160 = local1160 * 128 + 64; - local277 = local277 * 128 + 64; - @Pc(2241) SpotAnim local2241 = new SpotAnim(local171, local1146, local277, local1160, SceneGraph.getTileHeight(local1146, local277, local1160) - local786, local133, Static83.loop); - Static99.aClass69_64.addTail(new SpotAnimNode(local2241)); - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 207) { - local133 = Protocol.inboundBuffer.p4rme(); - local786 = Protocol.inboundBuffer.g2sub(); - local864 = Protocol.inboundBuffer.g2(); - local171 = Protocol.inboundBuffer.g2sub(); - if (Static248.method3288(local786)) { - Static190.method3444(local171 + (local864 << 16), local133); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 38) { - InterfaceList.method2245(); - local133 = Protocol.inboundBuffer.g1add(); - local786 = Protocol.inboundBuffer.g4rme(); - local864 = Protocol.inboundBuffer.g1(); - Static227.anIntArray446[local864] = local786; - Static99.anIntArray240[local864] = local133; - Static141.anIntArray326[local864] = 1; - for (local171 = 0; local171 < 98; local171++) { - if (ObjType.anIntArray213[local171] <= local786) { - Static141.anIntArray326[local864] = local171 + 2; - } - } - Static249.anIntArray478[Static89.anInt2385++ & 0x1F] = local864; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 104 || Protocol.opcode == 121 || Protocol.opcode == 97 || Protocol.opcode == 14 || Protocol.opcode == 202 || Protocol.opcode == 135 || Protocol.opcode == 17 || Protocol.opcode == 16 || Protocol.opcode == 240 || Protocol.opcode == 33 || Protocol.opcode == 20 || Protocol.opcode == 195 || Protocol.opcode == 179) { - Static75.method1634(); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 149) { - local133 = Protocol.inboundBuffer.g2(); - local786 = Protocol.inboundBuffer.g4(); - if (Static248.method3288(local133)) { - @Pc(2441) Class3_Sub31 local2441 = (Class3_Sub31) Static119.aClass133_9.get((long) local786); - if (local2441 != null) { - Static132.method2605(true, local2441); - } - if (Static39.aClass13_10 != null) { - Static43.redraw(Static39.aClass13_10); - Static39.aClass13_10 = null; - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 187) { - local133 = Protocol.inboundBuffer.g2le(); - local786 = Protocol.inboundBuffer.g2(); - local864 = Protocol.inboundBuffer.g2(); - if (Static248.method3288(local786)) { - Camera.yawTarget = local133; - Camera.pitchTarget = local864; - if (Static227.cameraType == 2) { - Static240.cameraPitch = (int)Camera.pitchTarget; - Static184.cameraYaw = (int)Camera.yawTarget; - } - Camera.clampCameraAngle(); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 132) { - local133 = Protocol.inboundBuffer.g2(); - local786 = Protocol.inboundBuffer.g2sub(); - local864 = Protocol.inboundBuffer.g2leadd(); - local171 = Protocol.inboundBuffer.g2leadd(); - local1146 = Protocol.inboundBuffer.g4(); - if (Static248.method3288(local786)) { - Static261.method4505(local864, local1146, local171, local133); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 112) { - Static115.anInt2940 = Protocol.inboundBuffer.g1(); - Static180.anInt4264 = Protocol.inboundBuffer.p1neg(); - for (local133 = Static115.anInt2940; local133 < Static115.anInt2940 + 8; local133++) { - for (local786 = Static180.anInt4264; local786 < Static180.anInt4264 + 8; local786++) { - if (Static159.aClass69ArrayArrayArray1[Static55.level][local133][local786] != null) { - Static159.aClass69ArrayArrayArray1[Static55.level][local133][local786] = null; - Static220.spawnGroundObject(local786, local133); - } - } - } - for (@Pc(2604) Class3_Sub7 local2604 = (Class3_Sub7) Static26.aClass69_27.method2289(); local2604 != null; local2604 = (Class3_Sub7) Static26.aClass69_27.method2288()) { - if (local2604.anInt928 >= Static115.anInt2940 && Static115.anInt2940 + 8 > local2604.anInt928 && local2604.anInt916 >= Static180.anInt4264 && local2604.anInt916 < Static180.anInt4264 + 8 && local2604.anInt918 == Static55.level) { - local2604.anInt924 = 0; - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 144) { - local133 = Protocol.inboundBuffer.p4rme(); - @Pc(2666) Component local2666 = InterfaceList.getComponent(local133); - for (local864 = 0; local864 < local2666.objTypes.length; local864++) { - local2666.objTypes[local864] = -1; - local2666.objTypes[local864] = 0; - } - Static43.redraw(local2666); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 130) { - local133 = Protocol.inboundBuffer.g4me(); - local786 = Protocol.inboundBuffer.g2leadd(); - local864 = Protocol.inboundBuffer.g2sub(); - if (local864 == 65535) { - local864 = -1; - } - if (Static248.method3288(local786)) { - Static132.method2607(-1, 1, local133, local864); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 192) { - Static270.anInt5795 = Protocol.inboundBuffer.g1(); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 13) { - local133 = Protocol.inboundBuffer.g1ssub(); - local786 = Protocol.inboundBuffer.g1add(); - local864 = Protocol.inboundBuffer.g1(); - Static55.level = local786 >> 1; - PlayerList.self.method1265(local133, (local786 & 0x1) == 1, local864); - Protocol.opcode = -1; - return true; - } else { - @Pc(3002) int local3002; - @Pc(3038) JagString local3038; - @Pc(3020) JagString local3020; - if (Protocol.opcode == 62) { - local884 = Protocol.inboundBuffer.g8(); - local864 = Protocol.inboundBuffer.g2(); - local171 = Protocol.inboundBuffer.g1(); - local262 = true; - if (local884 < 0L) { - local884 &= Long.MAX_VALUE; - local262 = false; - } - local506 = JagString.EMPTY; - if (local864 > 0) { - local506 = Protocol.inboundBuffer.gjstr(); - } - @Pc(2834) JagString local2834 = Base37.decodeLowerCase(local884).method3125(); - for (local1986 = 0; local1986 < Static9.anInt178; local1986++) { - if (local884 == Static92.aLongArray3[local1986]) { - if (local864 != Static104.anIntArray255[local1986]) { - Static104.anIntArray255[local1986] = local864; - if (local864 > 0) { - Static103.method2231(JagString.EMPTY, 5, JagString.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGIN})); - } - if (local864 == 0) { - Static103.method2231(JagString.EMPTY, 5, JagString.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGOUT})); - } - } - Static214.aClass100Array170[local1986] = local506; - Static106.anIntArray258[local1986] = local171; - local2834 = null; - Static3.aBooleanArray135[local1986] = local262; - break; - } - } - if (local2834 != null && Static9.anInt178 < 200) { - Static92.aLongArray3[Static9.anInt178] = local884; - Static122.aClass100Array92[Static9.anInt178] = local2834; - Static104.anIntArray255[Static9.anInt178] = local864; - Static214.aClass100Array170[Static9.anInt178] = local506; - Static106.anIntArray258[Static9.anInt178] = local171; - Static3.aBooleanArray135[Static9.anInt178] = local262; - Static9.anInt178++; - } - Static185.anInt4369 = InterfaceList.transmitTimer; - local908 = Static9.anInt178; - while (local908 > 0) { - local908--; - @Pc(2961) boolean local2961 = true; - for (local916 = 0; local916 < local908; local916++) { - if (Static104.anIntArray255[local916] != Static125.worldId && Static125.worldId == Static104.anIntArray255[local916 + 1] || Static104.anIntArray255[local916] == 0 && Static104.anIntArray255[local916 + 1] != 0) { - local2961 = false; - local3002 = Static104.anIntArray255[local916]; - Static104.anIntArray255[local916] = Static104.anIntArray255[local916 + 1]; - Static104.anIntArray255[local916 + 1] = local3002; - local3020 = Static214.aClass100Array170[local916]; - Static214.aClass100Array170[local916] = Static214.aClass100Array170[local916 + 1]; - Static214.aClass100Array170[local916 + 1] = local3020; - local3038 = Static122.aClass100Array92[local916]; - Static122.aClass100Array92[local916] = Static122.aClass100Array92[local916 + 1]; - Static122.aClass100Array92[local916 + 1] = local3038; - @Pc(3056) long local3056 = Static92.aLongArray3[local916]; - Static92.aLongArray3[local916] = Static92.aLongArray3[local916 + 1]; - Static92.aLongArray3[local916 + 1] = local3056; - @Pc(3074) int local3074 = Static106.anIntArray258[local916]; - Static106.anIntArray258[local916] = Static106.anIntArray258[local916 + 1]; - Static106.anIntArray258[local916 + 1] = local3074; - @Pc(3092) boolean local3092 = Static3.aBooleanArray135[local916]; - Static3.aBooleanArray135[local916] = Static3.aBooleanArray135[local916 + 1]; - Static3.aBooleanArray135[local916 + 1] = local3092; - } - } - if (local2961) { - break; - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 160) { - if (Protocol.length == 0) { - Static195.aClass100_859 = LocalizedText.WALKHERE; - } else { - Static195.aClass100_859 = Protocol.inboundBuffer.gjstr(); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 128) { - for (local133 = 0; local133 < Static7.varps.length; local133++) { - if (Static106.anIntArray257[local133] != Static7.varps[local133]) { - Static7.varps[local133] = Static106.anIntArray257[local133]; - Static85.method1775(local133); - Static83.updatedVarps[Static70.updatedVarpsWriterIndex++ & 0x1F] = local133; - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 154) { - local133 = Protocol.inboundBuffer.g2(); - local786 = Protocol.inboundBuffer.g1(); - local864 = Protocol.inboundBuffer.g1(); - local171 = Protocol.inboundBuffer.g2(); - local1146 = Protocol.inboundBuffer.g1(); - local277 = Protocol.inboundBuffer.g1(); - if (Static248.method3288(local133)) { - Static141.method2722(true, local1146, local171, local277, local864, local786); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 247) { - local884 = Protocol.inboundBuffer.g8(); - local275 = Protocol.inboundBuffer.g2(); - local899 = Protocol.inboundBuffer.g3(); - local1160 = Protocol.inboundBuffer.g1(); - local1986 = Protocol.inboundBuffer.g2(); - @Pc(3263) boolean local3263 = false; - @Pc(3270) long local3270 = (local275 << 32) + local899; - @Pc(3272) int local3272 = 0; - label1402: while (true) { - if (local3272 < 100) { - if (local3270 != Static233.aLongArray9[local3272]) { - local3272++; - continue; - } - local3263 = true; - break; - } - if (local1160 <= 1) { - for (local3272 = 0; local3272 < Static35.anInt1093; local3272++) { - if (local884 == Static190.aLongArray6[local3272]) { - local3263 = true; - break label1402; - } - } - } - break; - } - if (!local3263 && Static11.anInt384 == 0) { - Static233.aLongArray9[Static251.anInt5447] = local3270; - Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; - local3020 = QuickChatPhraseTypeList.get(local1986).method770(Protocol.inboundBuffer); - if (local1160 == 2) { - Static154.method2928(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() })); - } else if (local1160 == 1) { - Static154.method2928(local1986, 18, local3020, null, JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() })); - } else { - Static154.method2928(local1986, 18, local3020, null, Base37.decodeLowerCase(local884).method3125()); - } - } - Protocol.opcode = -1; - return true; - } else { - @Pc(3456) Class3_Sub31 local3456; - if (Protocol.opcode == 176) { - local133 = Protocol.inboundBuffer.g4rme(); - local786 = Protocol.inboundBuffer.g2sub(); - local864 = Protocol.inboundBuffer.g4rme(); - if (Static248.method3288(local786)) { - @Pc(3449) Class3_Sub31 local3449 = (Class3_Sub31) Static119.aClass133_9.get((long) local133); - local3456 = (Class3_Sub31) Static119.aClass133_9.get((long) local864); - if (local3456 != null) { - Static132.method2605(local3449 == null || local3456.anInt5878 != local3449.anInt5878, local3456); - } - if (local3449 != null) { - local3449.unlink(); - Static119.aClass133_9.put(local3449, (long) local864); - } - @Pc(3490) Component local3490 = InterfaceList.getComponent(local133); - if (local3490 != null) { - Static43.redraw(local3490); - } - local3490 = InterfaceList.getComponent(local864); - if (local3490 != null) { - Static43.redraw(local3490); - Static17.method531(local3490, true); - } - if (InterfaceList.topLevelInterface != -1) { - Static54.method1304(1, InterfaceList.topLevelInterface); - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 27) { - local133 = Protocol.inboundBuffer.g2(); - local786 = Protocol.inboundBuffer.g1(); - local864 = Protocol.inboundBuffer.g1(); - local171 = Protocol.inboundBuffer.g1(); - local1146 = Protocol.inboundBuffer.g1(); - local277 = Protocol.inboundBuffer.g2(); - if (Static248.method3288(local133)) { - Static176.aBooleanArray95[local786] = true; - Static222.anIntArray437[local786] = local864; - Static276.anIntArray564[local786] = local171; - Static202.anIntArray424[local786] = local1146; - Static31.anIntArray76[local786] = local277; - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 2) { - local133 = Protocol.inboundBuffer.g4rme(); - local786 = Protocol.inboundBuffer.g2sub(); - local864 = Protocol.inboundBuffer.g2leadd(); - if (Static248.method3288(local786)) { - Static136.method2649(local864, local133); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 85) { - Static60.rebootTimer = Protocol.inboundBuffer.g2() * 30; - Protocol.opcode = -1; - Static209.miscTransmitAt = InterfaceList.transmitTimer; - return true; - } else if (Protocol.opcode == 114) { - Static202.method3654(GameShell.signLink, Protocol.inboundBuffer, Protocol.length); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 65) { - local133 = Protocol.inboundBuffer.g2le(); - local786 = Protocol.inboundBuffer.p1neg(); - local864 = Protocol.inboundBuffer.g2leadd(); - if (Static248.method3288(local133)) { - Static132.method2606(local864, local786); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 234) { - InterfaceList.method2245(); - Static12.anInt400 = Protocol.inboundBuffer.g1(); - Static209.miscTransmitAt = InterfaceList.transmitTimer; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 209) { - if (InterfaceList.topLevelInterface != -1) { - Static54.method1304(0, InterfaceList.topLevelInterface); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 191) { - local133 = Protocol.inboundBuffer.g2le(); - Static13.method472(local133); - Static27.anIntArray70[Static111.anInt2901++ & 0x1F] = local133 & 0x7FFF; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 102) { - local133 = Protocol.inboundBuffer.g2le(); - local786 = Protocol.inboundBuffer.g1ssub(); - local864 = Protocol.inboundBuffer.g2(); - @Pc(3766) Npc local3766 = Static175.npcs[local133]; - if (local3766 != null) { - Static223.method3855(local786, local864, local3766); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 159) { - InterfaceList.method2245(); - Static251.anInt5456 = Protocol.inboundBuffer.g2s(); - Static209.miscTransmitAt = InterfaceList.transmitTimer; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 71) { - local884 = Protocol.inboundBuffer.g8(); - local790 = Static218.method2862(Static65.method1497(Protocol.inboundBuffer).method3116()); - Static103.method2231(Base37.decodeLowerCase(local884).method3125(), 6, local790); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 42) { - if (GameShell.fullScreenFrame != null) { - Static241.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); - } - @Pc(3848) byte[] local3848 = new byte[Protocol.length]; - Protocol.inboundBuffer.method2237(local3848, Protocol.length); - local156 = Static10.decodeString(local3848, Protocol.length, 0); - if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || client.haveIe6)) { - Static169.openUrl(local156, true); - } else { - Static175.url = local156; - Static164.newTab = true; - Static33.openUrlRequest = GameShell.signLink.openUrl(new String(local156.method3148(), "ISO-8859-1")); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 111) { - local133 = Protocol.inboundBuffer.g2sub(); - local786 = Protocol.inboundBuffer.p4rme(); - local864 = Protocol.inboundBuffer.g2leadd(); - local171 = Protocol.inboundBuffer.g2le(); - local1146 = Protocol.inboundBuffer.g2leadd(); - if (Static248.method3288(local133)) { - Static132.method2607(local864, 7, local786, local171 << 16 | local1146); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 37) { - local133 = Protocol.inboundBuffer.g1add(); - local786 = Protocol.inboundBuffer.g2le(); - Static272.method3995(local133, local786); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 155) { - local133 = Protocol.inboundBuffer.g1(); - local786 = Protocol.inboundBuffer.p4rme(); - local864 = Protocol.inboundBuffer.g2sub(); - local171 = Protocol.inboundBuffer.g2(); - if (Static248.method3288(local864)) { - local3456 = (Class3_Sub31) Static119.aClass133_9.get((long) local786); - if (local3456 != null) { - Static132.method2605(local3456.anInt5878 != local171, local3456); - } - Static44.method1148(local171, local786, local133); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 131) { - for (local133 = 0; local133 < Static159.players.length; local133++) { - if (Static159.players[local133] != null) { - Static159.players[local133].seqId = -1; - } - } - for (local133 = 0; local133 < Static175.npcs.length; local133++) { - if (Static175.npcs[local133] != null) { - Static175.npcs[local133].seqId = -1; - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 217) { - local133 = Protocol.inboundBuffer.g1(); - @Pc(4084) Class102 local4084 = new Class102(); - local786 = local133 >> 6; - local4084.anInt4058 = local133 & 0x3F; - local4084.anInt4048 = Protocol.inboundBuffer.g1(); - if (local4084.anInt4048 >= 0 && local4084.anInt4048 < Sprites.headhints.length) { - if (local4084.anInt4058 == 1 || local4084.anInt4058 == 10) { - local4084.anInt4057 = Protocol.inboundBuffer.g2(); - Protocol.inboundBuffer.offset += 3; - } else if (local4084.anInt4058 >= 2 && local4084.anInt4058 <= 6) { - if (local4084.anInt4058 == 2) { - local4084.anInt4045 = 64; - local4084.anInt4047 = 64; - } - if (local4084.anInt4058 == 3) { - local4084.anInt4045 = 0; - local4084.anInt4047 = 64; - } - if (local4084.anInt4058 == 4) { - local4084.anInt4045 = 128; - local4084.anInt4047 = 64; - } - if (local4084.anInt4058 == 5) { - local4084.anInt4045 = 64; - local4084.anInt4047 = 0; - } - if (local4084.anInt4058 == 6) { - local4084.anInt4045 = 64; - local4084.anInt4047 = 128; - } - local4084.anInt4058 = 2; - local4084.anInt4053 = Protocol.inboundBuffer.g2(); - local4084.anInt4046 = Protocol.inboundBuffer.g2(); - local4084.anInt4050 = Protocol.inboundBuffer.g1(); - } - local4084.anInt4052 = Protocol.inboundBuffer.g2(); - if (local4084.anInt4052 == 65535) { - local4084.anInt4052 = -1; - } - Static143.aClass102Array1[local786] = local4084; - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 126) { - Static35.anInt1093 = Protocol.length / 8; - for (local133 = 0; local133 < Static35.anInt1093; local133++) { - Static190.aLongArray6[local133] = Protocol.inboundBuffer.g8(); - Static193.aClass100Array134[local133] = Base37.decodeLowerCase(Static190.aLongArray6[local133]); - } - Static185.anInt4369 = InterfaceList.transmitTimer; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 32) { - Static86.method1800(); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 119) { - local133 = Protocol.inboundBuffer.g2sub(); - local786 = Protocol.inboundBuffer.g4me(); - local864 = Protocol.inboundBuffer.g2s(); - local171 = Protocol.inboundBuffer.g2sadd(); - if (Static248.method3288(local133)) { - Static280.method4666(local864, local786, local171); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 235) { - local133 = Protocol.inboundBuffer.g1ssub(); - local786 = local133 >> 2; - local864 = local133 & 0x3; - local171 = Static133.anIntArray453[local786]; - local1146 = Protocol.inboundBuffer.g2(); - local277 = Protocol.inboundBuffer.g4(); - if (local1146 == 65535) { - local1146 = -1; - } - local908 = local277 & 0x3FFF; - local1986 = local277 >> 14 & 0x3FFF; - local1986 -= Static225.originX; - local908 -= Static142.originZ; - local1160 = local277 >> 28 & 0x3; - Static92.method1881(local1160, local864, local786, local908, local171, local1986, local1146); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 0) { - local884 = Protocol.inboundBuffer.g8(); - local275 = Protocol.inboundBuffer.g2(); - local899 = Protocol.inboundBuffer.g3(); - local1160 = Protocol.inboundBuffer.g1(); - @Pc(4425) boolean local4425 = false; - @Pc(4431) long local4431 = local899 + (local275 << 32); - local3002 = 0; - label1450: while (true) { - if (local3002 >= 100) { - if (local1160 <= 1) { - if (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat) { - local4425 = true; - } else { - for (local3002 = 0; local3002 < Static35.anInt1093; local3002++) { - if (local884 == Static190.aLongArray6[local3002]) { - local4425 = true; - break label1450; - } - } - } - } - break; - } - if (local4431 == Static233.aLongArray9[local3002]) { - local4425 = true; - break; - } - local3002++; - } - if (!local4425 && Static11.anInt384 == 0) { - Static233.aLongArray9[Static251.anInt5447] = local4431; - Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; - @Pc(4518) JagString local4518 = Static218.method2862(Static65.method1497(Protocol.inboundBuffer).method3116()); - if (local1160 == 2 || local1160 == 3) { - Static103.method2231(JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() }), 7, local4518); - } else if (local1160 == 1) { - Static103.method2231(JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() }), 7, local4518); - } else { - Static103.method2231(Base37.decodeLowerCase(local884).method3125(), 3, local4518); - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 54) { - local884 = Protocol.inboundBuffer.g8(); - Protocol.inboundBuffer.g1s(); - local275 = Protocol.inboundBuffer.g8(); - local899 = Protocol.inboundBuffer.g2(); - local904 = Protocol.inboundBuffer.g3(); - @Pc(4626) long local4626 = (local899 << 32) + local904; - local908 = Protocol.inboundBuffer.g1(); - @Pc(4632) boolean local4632 = false; - @Pc(4634) int local4634 = 0; - label1575: while (true) { - if (local4634 >= 100) { - if (local908 <= 1) { - if (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat) { - local4632 = true; - } else { - for (local4634 = 0; local4634 < Static35.anInt1093; local4634++) { - if (Static190.aLongArray6[local4634] == local884) { - local4632 = true; - break label1575; - } - } - } - } - break; - } - if (Static233.aLongArray9[local4634] == local4626) { - local4632 = true; - break; - } - local4634++; - } - if (!local4632 && Static11.anInt384 == 0) { - Static233.aLongArray9[Static251.anInt5447] = local4626; - Static251.anInt5447 = (Static251.anInt5447 + 1) % 100; - local3038 = Static218.method2862(Static65.method1497(Protocol.inboundBuffer).method3116()); - if (local908 == 2 || local908 == 3) { - Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static44.aClass100_336, Base37.decodeLowerCase(local884).method3125() }), Base37.decodeLowerCase(local275).method3125()); - } else if (local908 == 1) { - Static73.method1598(local3038, JagString.concatenate(new JagString[] { Static65.aClass100_435, Base37.decodeLowerCase(local884).method3125() }), Base37.decodeLowerCase(local275).method3125()); - } else { - Static73.method1598(local3038, Base37.decodeLowerCase(local884).method3125(), Base37.decodeLowerCase(local275).method3125()); - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 214) { - Protocol.readRebuildPacket(true); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 172) { - local133 = Protocol.inboundBuffer.g2(); - local786 = Protocol.inboundBuffer.g1(); - if (local133 == 65535) { - local133 = -1; - } - local864 = Protocol.inboundBuffer.g2(); - SoundPlayer.play(local786, local133, local864); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 66) { - local133 = Protocol.inboundBuffer.g2leadd(); - local786 = Protocol.inboundBuffer.g4rme(); - if (Static248.method3288(local133)) { - local864 = 0; - if (PlayerList.self.appearance != null) { - local864 = PlayerList.self.appearance.method1952(); - } - Static132.method2607(-1, 3, local786, local864); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 171) { - local133 = Protocol.inboundBuffer.p4rme(); - local156 = Protocol.inboundBuffer.gjstr(); - local864 = Protocol.inboundBuffer.g2sub(); - if (Static248.method3288(local864)) { - Static80.method3617(local156, local133); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 84) { - local133 = Protocol.inboundBuffer.g4me(); - local786 = Protocol.inboundBuffer.g2leadd(); - Static272.method3995(local133, local786); - Protocol.opcode = -1; - return true; - } else { - @Pc(4956) Component local4956; - if (Protocol.opcode == 22) { - local133 = Protocol.inboundBuffer.g4(); - local786 = Protocol.inboundBuffer.g2(); - if (local133 < -70000) { - local786 += 32768; - } - if (local133 < 0) { - local4956 = null; - } else { - local4956 = InterfaceList.getComponent(local133); - } - while (Protocol.inboundBuffer.offset < Protocol.length) { - local171 = Protocol.inboundBuffer.gSmart1or2(); - local1146 = Protocol.inboundBuffer.g2(); - local277 = 0; - if (local1146 != 0) { - local277 = Protocol.inboundBuffer.g1(); - if (local277 == 255) { - local277 = Protocol.inboundBuffer.g4(); - } - } - if (local4956 != null && local171 >= 0 && local4956.objTypes.length > local171) { - local4956.objTypes[local171] = local1146; - local4956.objCounts[local171] = local277; - } - Static280.method4672(local1146 - 1, local171, local277, local786); - } - if (local4956 != null) { - Static43.redraw(local4956); - } - InterfaceList.method2245(); - Static27.anIntArray70[Static111.anInt2901++ & 0x1F] = local786 & 0x7FFF; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 24) { - local133 = Protocol.inboundBuffer.g2(); - if (Static248.method3288(local133)) { - Static35.resetCameraEffects(); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 86) { - Static278.processLogout(); - Protocol.opcode = -1; - return false; - } else if (Protocol.opcode == 116) { - local133 = Protocol.inboundBuffer.g1(); - if (Protocol.inboundBuffer.g1() == 0) { - Static229.aClass136Array1[local133] = new StockMarketOffer(); - } else { - Protocol.inboundBuffer.offset--; - Static229.aClass136Array1[local133] = new StockMarketOffer(Protocol.inboundBuffer); - } - Protocol.opcode = -1; - Static207.anInt4778 = InterfaceList.transmitTimer; - return true; - } else if (Protocol.opcode == 73) { - local133 = Protocol.inboundBuffer.g2sub(); - local786 = Protocol.inboundBuffer.g4me(); - if (local133 == 65535) { - local133 = -1; - } - local864 = Protocol.inboundBuffer.g2le(); - if (Static248.method3288(local864)) { - Static132.method2607(-1, 2, local786, local133); - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 162) { - Protocol.readRebuildPacket(false); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 165) { - local133 = Protocol.inboundBuffer.g2le(); - local786 = Protocol.inboundBuffer.g2le(); - if (local786 == 65535) { - local786 = -1; - } - local864 = Protocol.inboundBuffer.g4(); - local171 = Protocol.inboundBuffer.g2sub(); - local1146 = Protocol.inboundBuffer.g4rme(); - if (local171 == 65535) { - local171 = -1; - } - if (Static248.method3288(local133)) { - for (local277 = local171; local277 <= local786; local277++) { - local904 = ((long) local864 << 32) + ((long) local277); - local1804 = (ServerActiveProperties) Static210.aClass133_21.get(local904); - if (local1804 != null) { - local1814 = new ServerActiveProperties(local1146, local1804.anInt540); - local1804.unlink(); - } else if (local277 == -1) { - local1814 = new ServerActiveProperties(local1146, InterfaceList.getComponent(local864).aClass3_Sub4_1.anInt540); - } else { - local1814 = new ServerActiveProperties(local1146, -1); - } - Static210.aClass133_21.put(local1814, local904); - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 197) { - Static166.anInt4054 = Protocol.inboundBuffer.g1(); - Static185.anInt4369 = InterfaceList.transmitTimer; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 196) { - local884 = Protocol.inboundBuffer.g8(); - local864 = Protocol.inboundBuffer.g2(); - @Pc(5325) byte local5325 = Protocol.inboundBuffer.g1s(); - local262 = false; - if ((Long.MIN_VALUE & local884) != 0L) { - local262 = true; - } - if (local262) { - if (Static214.anInt5577 == 0) { - Protocol.opcode = -1; - return true; - } - local884 &= Long.MAX_VALUE; - for (local277 = 0; Static214.anInt5577 > local277 && (local884 != Static199.aClass3_Sub22Array1[local277].key || local864 != Static199.aClass3_Sub22Array1[local277].anInt3340); local277++) { - } - if (local277 < Static214.anInt5577) { - while (Static214.anInt5577 - 1 > local277) { - Static199.aClass3_Sub22Array1[local277] = Static199.aClass3_Sub22Array1[local277 + 1]; - local277++; - } - Static214.anInt5577--; - Static199.aClass3_Sub22Array1[Static214.anInt5577] = null; - } - } else { - local506 = Protocol.inboundBuffer.gjstr(); - @Pc(5347) Class3_Sub22 local5347 = new Class3_Sub22(); - local5347.key = local884; - local5347.aClass100_636 = Base37.decodeLowerCase(local5347.key); - local5347.aByte9 = local5325; - local5347.aClass100_635 = local506; - local5347.anInt3340 = local864; - for (local1986 = Static214.anInt5577 - 1; local1986 >= 0; local1986--) { - local908 = Static199.aClass3_Sub22Array1[local1986].aClass100_636.method3139(local5347.aClass100_636); - if (local908 == 0) { - Static199.aClass3_Sub22Array1[local1986].anInt3340 = local864; - Static199.aClass3_Sub22Array1[local1986].aByte9 = local5325; - Static199.aClass3_Sub22Array1[local1986].aClass100_635 = local506; - if (local884 == Static101.aLong98) { - Static160.aByte14 = local5325; - } - Static278.anInt5867 = InterfaceList.transmitTimer; - Protocol.opcode = -1; - return true; - } - if (local908 < 0) { - break; - } - } - if (Static199.aClass3_Sub22Array1.length <= Static214.anInt5577) { - Protocol.opcode = -1; - return true; - } - for (local908 = Static214.anInt5577 - 1; local908 > local1986; local908--) { - Static199.aClass3_Sub22Array1[local908 + 1] = Static199.aClass3_Sub22Array1[local908]; - } - if (Static214.anInt5577 == 0) { - Static199.aClass3_Sub22Array1 = new Class3_Sub22[100]; - } - Static199.aClass3_Sub22Array1[local1986 + 1] = local5347; - if (Static101.aLong98 == local884) { - Static160.aByte14 = local5325; - } - Static214.anInt5577++; - } - Protocol.opcode = -1; - Static278.anInt5867 = InterfaceList.transmitTimer; - return true; - } else if (Protocol.opcode == 50) { - local133 = Protocol.inboundBuffer.g4(); - local786 = Protocol.inboundBuffer.p4rme(); - local864 = Protocol.inboundBuffer.g2leadd(); - if (local864 == 65535) { - local864 = -1; - } - local171 = Protocol.inboundBuffer.g2le(); - if (Static248.method3288(local171)) { - @Pc(5603) Component local5603 = InterfaceList.getComponent(local786); - @Pc(5615) ObjType local5615; - if (local5603.aBoolean32) { - Static209.method3707(local786, local133, local864); - local5615 = ObjTypeList.get(local864); - Static261.method4505(local5615.zoom2d, local786, local5615.yAngle2d, local5615.xAngle2d); - Static145.method2745(local786, local5615.zAngle2d, local5615.yOffset2d, local5615.xOffset2d); - } else if (local864 == -1) { - local5603.modelType = 0; - Protocol.opcode = -1; - return true; - } else { - local5615 = ObjTypeList.get(local864); - local5603.modelXAngle = local5615.xAngle2d; - local5603.modelZoom = local5615.zoom2d * 100 / local133; - local5603.modelType = 4; - local5603.modelId = local864; - local5603.modelYAngle = local5615.yAngle2d; - Static43.redraw(local5603); - } - } - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 105) { - local133 = Protocol.inboundBuffer.g4(); - local786 = Protocol.inboundBuffer.g2(); - if (local133 < -70000) { - local786 += 32768; - } - if (local133 >= 0) { - local4956 = InterfaceList.getComponent(local133); - } else { - local4956 = null; - } - if (local4956 != null) { - for (local171 = 0; local171 < local4956.objTypes.length; local171++) { - local4956.objTypes[local171] = 0; - local4956.objCounts[local171] = 0; - } - } - Static14.method475(local786); - local171 = Protocol.inboundBuffer.g2(); - for (local1146 = 0; local1146 < local171; local1146++) { - local277 = Protocol.inboundBuffer.g1ssub(); - if (local277 == 255) { - local277 = Protocol.inboundBuffer.g4(); - } - local1160 = Protocol.inboundBuffer.g2(); - if (local4956 != null && local1146 < local4956.objTypes.length) { - local4956.objTypes[local1146] = local1160; - local4956.objCounts[local1146] = local277; - } - Static280.method4672(local1160 - 1, local1146, local277, local786); - } - if (local4956 != null) { - Static43.redraw(local4956); - } - InterfaceList.method2245(); - Static27.anIntArray70[Static111.anInt2901++ & 0x1F] = local786 & 0x7FFF; - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 142) { - Static230.method3954(Protocol.inboundBuffer.gjstr()); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 26) { - Static115.anInt2940 = Protocol.inboundBuffer.p1neg(); - Static180.anInt4264 = Protocol.inboundBuffer.g1(); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 4) { - local133 = Protocol.inboundBuffer.g2leadd(); - if (local133 == 65535) { - local133 = -1; - } - Static148.method2765(local133); - Protocol.opcode = -1; - return true; - } else if (Protocol.opcode == 208) { - local133 = Protocol.inboundBuffer.g3le(); - local786 = Protocol.inboundBuffer.g2le(); - if (local786 == 65535) { - local786 = -1; - } - Static278.method4650(local133, local786); - Protocol.opcode = -1; - return true; - } else { - TracingException.report("T1 - " + Protocol.opcode + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Protocol.length, null); - Static278.processLogout(); - return true; - } - } - } - } - } - } - } - } - @OriginalMember(owner = "client!ac", name = "b", descriptor = "(I)V") public static void method28() { Static43.redraw(Static105.aClass13_14); Static213.anInt4851++; if (Static44.aBoolean83 && Static146.aBoolean174) { - @Pc(30) int local30 = Static215.anInt4873; + @Pc(30) int local30 = Mouse.anInt4873; local30 -= Static246.anInt5388; if (Static81.anInt2225 > local30) { local30 = Static81.anInt2225; } - @Pc(41) int local41 = Static223.anInt5032; + @Pc(41) int local41 = Mouse.anInt5032; if (Static81.anInt2225 + aClass13_1.anInt445 < local30 - -Static105.aClass13_14.anInt445) { local30 = Static81.anInt2225 + aClass13_1.anInt445 - Static105.aClass13_14.anInt445; } diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java index a4931e0..b470215 100644 --- a/client/src/main/java/Static41.java +++ b/client/src/main/java/Static41.java @@ -1,5 +1,4 @@ import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static41 { @@ -24,65 +23,4 @@ public final class Static41 { @OriginalMember(owner = "client!dc", name = "db", descriptor = "[[B") public static final byte[][] aByteArrayArray6 = new byte[50][]; - @OriginalMember(owner = "client!dc", name = "b", descriptor = "(Z)V") - public static void method1050() { - @Pc(6) int local6 = Protocol.inboundBuffer.method2238(8); - @Pc(20) int local20; - if (Static267.anInt5774 > local6) { - for (local20 = local6; local20 < Static267.anInt5774; local20++) { - Static52.anIntArray136[Static240.anInt5335++] = Static105.anIntArray256[local20]; - } - } - if (local6 > Static267.anInt5774) { - throw new RuntimeException("gppov1"); - } - Static267.anInt5774 = 0; - for (local20 = 0; local20 < local6; local20++) { - @Pc(75) int local75 = Static105.anIntArray256[local20]; - @Pc(79) Player local79 = Static159.players[local75]; - @Pc(84) int local84 = Protocol.inboundBuffer.method2238(1); - if (local84 == 0) { - Static105.anIntArray256[Static267.anInt5774++] = local75; - local79.anInt3430 = Static83.loop; - } else { - @Pc(107) int local107 = Protocol.inboundBuffer.method2238(2); - if (local107 == 0) { - Static105.anIntArray256[Static267.anInt5774++] = local75; - local79.anInt3430 = Static83.loop; - Static44.anIntArray106[Static116.anInt2951++] = local75; - } else { - @Pc(153) int local153; - @Pc(163) int local163; - if (local107 == 1) { - Static105.anIntArray256[Static267.anInt5774++] = local75; - local79.anInt3430 = Static83.loop; - local153 = Protocol.inboundBuffer.method2238(3); - local79.method2684(1, local153); - local163 = Protocol.inboundBuffer.method2238(1); - if (local163 == 1) { - Static44.anIntArray106[Static116.anInt2951++] = local75; - } - } else if (local107 == 2) { - Static105.anIntArray256[Static267.anInt5774++] = local75; - local79.anInt3430 = Static83.loop; - if (Protocol.inboundBuffer.method2238(1) == 1) { - local153 = Protocol.inboundBuffer.method2238(3); - local79.method2684(2, local153); - local163 = Protocol.inboundBuffer.method2238(3); - local79.method2684(2, local163); - } else { - local153 = Protocol.inboundBuffer.method2238(3); - local79.method2684(0, local153); - } - local153 = Protocol.inboundBuffer.method2238(1); - if (local153 == 1) { - Static44.anIntArray106[Static116.anInt2951++] = local75; - } - } else if (local107 == 3) { - Static52.anIntArray136[Static240.anInt5335++] = local75; - } - } - } - } - } } diff --git a/client/src/main/java/Static44.java b/client/src/main/java/Static44.java index 295f27a..956e53e 100644 --- a/client/src/main/java/Static44.java +++ b/client/src/main/java/Static44.java @@ -10,9 +10,6 @@ public final class Static44 { @OriginalMember(owner = "client!dh", name = "a", descriptor = "Z") public static boolean aBoolean83 = false; - @OriginalMember(owner = "client!dh", name = "d", descriptor = "[I") - public static final int[] anIntArray106 = new int[2048]; - @OriginalMember(owner = "client!dh", name = "e", descriptor = "Lclient!na;") public static final JagString aClass100_335 = JagString.parse("Number of player models in cache:"); @@ -22,27 +19,27 @@ public final class Static44 { @OriginalMember(owner = "client!dh", name = "a", descriptor = "(Z)V") public static void method1146() { Protocol.outboundBuffer.offset = 0; - Static5.anInt45 = -1; + Static5.opcode3 = -1; Static60.aBoolean108 = false; Protocol.length = 0; Static115.anInt2939 = 0; Static231.anInt5204 = 0; - Static230.anInt5152 = -1; + Static230.opcode2 = -1; Static270.anInt5795 = 0; Static60.rebootTimer = 0; - Static49.anInt1462 = -1; + Static49.opcode4 = -1; Protocol.inboundBuffer.offset = 0; Static201.anInt1862 = 0; Protocol.opcode = -1; @Pc(35) int local35; - for (local35 = 0; local35 < Static159.players.length; local35++) { - if (Static159.players[local35] != null) { - Static159.players[local35].anInt3370 = -1; + for (local35 = 0; local35 < PlayerList.players.length; local35++) { + if (PlayerList.players[local35] != null) { + PlayerList.players[local35].faceEntity = -1; } } for (local35 = 0; local35 < Static175.npcs.length; local35++) { if (Static175.npcs[local35] != null) { - Static175.npcs[local35].anInt3370 = -1; + Static175.npcs[local35].faceEntity = -1; } } Static102.method2073(); diff --git a/client/src/main/java/Static45.java b/client/src/main/java/Static45.java index 397ac65..eea9d1d 100644 --- a/client/src/main/java/Static45.java +++ b/client/src/main/java/Static45.java @@ -504,7 +504,7 @@ public final class Static45 { Static259.anIntArray514[0] = arg2; @Pc(71) int local71 = local51 + 1; Static84.anIntArray209[0] = arg9; - @Pc(78) int[][] local78 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30; + @Pc(78) int[][] local78 = PathFinder.collisionMaps[Player.level].anIntArrayArray30; @Pc(198) int local198; while (local71 != local64) { local10 = Static84.anIntArray209[local64]; @@ -515,16 +515,16 @@ public final class Static45 { break; } if (arg8 != 0) { - if ((arg8 < 5 || arg8 == 10) && PathFinder.collisionMaps[Static55.level].method3042(arg3, local3, local10, arg0, arg8 - 1, 1, arg6)) { + if ((arg8 < 5 || arg8 == 10) && PathFinder.collisionMaps[Player.level].method3042(arg3, local3, local10, arg0, arg8 - 1, 1, arg6)) { local53 = true; break; } - if (arg8 < 10 && PathFinder.collisionMaps[Static55.level].method3046(arg3, arg8 - 1, arg0, local10, 1, arg6, local3)) { + if (arg8 < 10 && PathFinder.collisionMaps[Player.level].method3046(arg3, arg8 - 1, arg0, local10, 1, arg6, local3)) { local53 = true; break; } } - if (arg10 != 0 && arg5 != 0 && PathFinder.collisionMaps[Static55.level].method3052(arg0, local10, local3, 1, arg10, arg1, arg3, arg5)) { + if (arg10 != 0 && arg5 != 0 && PathFinder.collisionMaps[Player.level].method3052(arg0, local10, local3, 1, arg10, arg1, arg3, arg5)) { local53 = true; break; } diff --git a/client/src/main/java/Static49.java b/client/src/main/java/Static49.java index fb5e5d4..ee3abce 100644 --- a/client/src/main/java/Static49.java +++ b/client/src/main/java/Static49.java @@ -14,10 +14,7 @@ public final class Static49 { public static final JagString PERCENT_SIGN = JagString.parse("(U"); @OriginalMember(owner = "client!dm", name = "q", descriptor = "I") - public static int anInt1462 = 0; - - @OriginalMember(owner = "client!dm", name = "u", descriptor = "I") - public static int anInt1464 = 0; + public static int opcode4 = 0; @OriginalMember(owner = "client!dm", name = "a", descriptor = "(BII[B)Z") public static boolean method1201(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) byte[] arg2) { @@ -77,12 +74,12 @@ public final class Static49 { @OriginalMember(owner = "client!dm", name = "a", descriptor = "(B)V") public static void method1202() { - Protocol.inboundBuffer.method2233(); - @Pc(13) int local13 = Protocol.inboundBuffer.method2238(8); + Protocol.inboundBuffer.accessBits(); + @Pc(13) int local13 = Protocol.inboundBuffer.gBits(8); @Pc(22) int local22; if (Static272.anInt5214 > local13) { for (local22 = local13; local22 < Static272.anInt5214; local22++) { - Static52.anIntArray136[Static240.anInt5335++] = Static33.anIntArray79[local22]; + Protocol.removedIds[Protocol.removedCount++] = Static33.anIntArray79[local22]; } } if (Static272.anInt5214 < local13) { @@ -92,46 +89,46 @@ public final class Static49 { for (local22 = 0; local22 < local13; local22++) { @Pc(61) int local61 = Static33.anIntArray79[local22]; @Pc(65) Npc local65 = Static175.npcs[local61]; - @Pc(70) int local70 = Protocol.inboundBuffer.method2238(1); + @Pc(70) int local70 = Protocol.inboundBuffer.gBits(1); if (local70 == 0) { Static33.anIntArray79[Static272.anInt5214++] = local61; - local65.anInt3430 = Static83.loop; + local65.lastSeenLoop = client.loop; } else { - @Pc(92) int local92 = Protocol.inboundBuffer.method2238(2); + @Pc(92) int local92 = Protocol.inboundBuffer.gBits(2); if (local92 == 0) { Static33.anIntArray79[Static272.anInt5214++] = local61; - local65.anInt3430 = Static83.loop; - Static44.anIntArray106[Static116.anInt2951++] = local61; + local65.lastSeenLoop = client.loop; + Protocol.extendedIds[Protocol.extendedCount++] = local61; } else { @Pc(139) int local139; @Pc(149) int local149; if (local92 == 1) { Static33.anIntArray79[Static272.anInt5214++] = local61; - local65.anInt3430 = Static83.loop; - local139 = Protocol.inboundBuffer.method2238(3); - local65.method2684(1, local139); - local149 = Protocol.inboundBuffer.method2238(1); + local65.lastSeenLoop = client.loop; + local139 = Protocol.inboundBuffer.gBits(3); + local65.move(1, local139); + local149 = Protocol.inboundBuffer.gBits(1); if (local149 == 1) { - Static44.anIntArray106[Static116.anInt2951++] = local61; + Protocol.extendedIds[Protocol.extendedCount++] = local61; } } else if (local92 == 2) { Static33.anIntArray79[Static272.anInt5214++] = local61; - local65.anInt3430 = Static83.loop; - if (Protocol.inboundBuffer.method2238(1) == 1) { - local139 = Protocol.inboundBuffer.method2238(3); - local65.method2684(2, local139); - local149 = Protocol.inboundBuffer.method2238(3); - local65.method2684(2, local149); + local65.lastSeenLoop = client.loop; + if (Protocol.inboundBuffer.gBits(1) == 1) { + local139 = Protocol.inboundBuffer.gBits(3); + local65.move(2, local139); + local149 = Protocol.inboundBuffer.gBits(3); + local65.move(2, local149); } else { - local139 = Protocol.inboundBuffer.method2238(3); - local65.method2684(0, local139); + local139 = Protocol.inboundBuffer.gBits(3); + local65.move(0, local139); } - local139 = Protocol.inboundBuffer.method2238(1); + local139 = Protocol.inboundBuffer.gBits(1); if (local139 == 1) { - Static44.anIntArray106[Static116.anInt2951++] = local61; + Protocol.extendedIds[Protocol.extendedCount++] = local61; } } else if (local92 == 3) { - Static52.anIntArray136[Static240.anInt5335++] = local61; + Protocol.removedIds[Protocol.removedCount++] = local61; } } } diff --git a/client/src/main/java/Static5.java b/client/src/main/java/Static5.java index 4f7ec06..a199189 100644 --- a/client/src/main/java/Static5.java +++ b/client/src/main/java/Static5.java @@ -8,7 +8,7 @@ public final class Static5 { public static int anInt40; @OriginalMember(owner = "client!af", name = "k", descriptor = "I") - public static int anInt45 = 0; + public static int opcode3 = 0; @OriginalMember(owner = "client!af", name = "l", descriptor = "[S") public static final short[] aShortArray2 = new short[] { 30, 6, 31, 29, 10, 44, 37, 57 }; diff --git a/client/src/main/java/Static52.java b/client/src/main/java/Static52.java index 92bfa5f..9ee3ec8 100644 --- a/client/src/main/java/Static52.java +++ b/client/src/main/java/Static52.java @@ -7,9 +7,6 @@ public final class Static52 { @OriginalMember(owner = "client!eb", name = "u", descriptor = "I") public static int anInt1695; - @OriginalMember(owner = "client!eb", name = "p", descriptor = "[I") - public static final int[] anIntArray136 = new int[1000]; - @OriginalMember(owner = "client!eb", name = "t", descriptor = "I") public static int anInt1694 = -1; diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index 00f3f54..837f460 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -96,7 +96,7 @@ public final class Static54 { } for (local146 = 0; local146 < 104; local146++) { for (local181 = 0; local181 < 104; local181++) { - @Pc(439) LinkedList local439 = Static159.aClass69ArrayArrayArray1[Static55.level][local146][local181]; + @Pc(439) LinkedList local439 = Static159.aClass69ArrayArrayArray1[Player.level][local146][local181]; if (local439 != null) { local154 = local146 * 4 + 2 - PlayerList.self.xFine / 32; local231 = local181 * 4 + 2 - PlayerList.self.zFine / 32; @@ -122,12 +122,12 @@ public final class Static54 { } } } - for (local146 = 0; local146 < Static267.anInt5774; local146++) { - @Pc(591) Player local591 = Static159.players[Static105.anIntArray256[local146]]; + for (local146 = 0; local146 < PlayerList.size; local146++) { + @Pc(591) Player local591 = PlayerList.players[PlayerList.ids[local146]]; if (local591 != null && local591.method2682()) { local154 = local591.zFine / 32 - PlayerList.self.zFine / 32; local150 = local591.xFine / 32 - PlayerList.self.xFine / 32; - @Pc(624) long local624 = local591.aClass100_364.encode37(); + @Pc(624) long local624 = local591.username.encode37(); @Pc(626) boolean local626 = false; for (local239 = 0; local239 < Static9.anInt178; local239++) { if (local624 == Static92.aLongArray3[local239] && Static104.anIntArray255[local239] != 0) { @@ -160,7 +160,7 @@ public final class Static54 { @Pc(756) Class102[] local756 = Static143.aClass102Array1; for (local181 = 0; local181 < local756.length; local181++) { @Pc(770) Class102 local770 = local756[local181]; - if (local770 != null && local770.anInt4058 != 0 && Static83.loop % 20 < 10) { + if (local770 != null && local770.anInt4058 != 0 && client.loop % 20 < 10) { if (local770.anInt4058 == 1 && local770.anInt4057 >= 0 && local770.anInt4057 < Static175.npcs.length) { @Pc(804) Npc local804 = Static175.npcs[local770.anInt4057]; if (local804 != null) { @@ -174,8 +174,8 @@ public final class Static54 { local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32; Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3); } - if (local770.anInt4058 == 10 && local770.anInt4057 >= 0 && Static159.players.length > local770.anInt4057) { - @Pc(905) Player local905 = Static159.players[local770.anInt4057]; + if (local770.anInt4058 == 10 && local770.anInt4057 >= 0 && PlayerList.players.length > local770.anInt4057) { + @Pc(905) Player local905 = PlayerList.players[local770.anInt4057]; if (local905 != null) { local200 = local905.zFine / 32 - PlayerList.self.zFine / 32; local231 = local905.xFine / 32 - PlayerList.self.xFine / 32; diff --git a/client/src/main/java/Static55.java b/client/src/main/java/Static55.java index 49adef9..1e24293 100644 --- a/client/src/main/java/Static55.java +++ b/client/src/main/java/Static55.java @@ -2,10 +2,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static55 { - @OriginalMember(owner = "client!ee", name = "b", descriptor = "I") - public static int level; - - @OriginalMember(owner = "client!ee", name = "c", descriptor = "I") + @OriginalMember(owner = "client!ee", name = "c", descriptor = "I") public static int anInt1736; @OriginalMember(owner = "client!ee", name = "a", descriptor = "Lclient!na;") diff --git a/client/src/main/java/Static59.java b/client/src/main/java/Static59.java index 92cb5d3..e43d270 100644 --- a/client/src/main/java/Static59.java +++ b/client/src/main/java/Static59.java @@ -27,7 +27,7 @@ public final class Static59 { Static103.method2232(Static231.anInt5204 - 1); } } - } else if (Static155.anInt3751 == Static7.clickX && Static60.anInt1892 == Static60.clickY) { + } else if (Static155.anInt3751 == Mouse.clickX && Static60.anInt1892 == Mouse.clickY) { Static226.anInt3953 = 0; if (Static172.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static231.anInt5204 > 2) { Static103.method2232(Static231.anInt5204 - 2); @@ -35,9 +35,9 @@ public final class Static59 { Static103.method2232(Static231.anInt5204 - 1); } } else { - Static280.anInt5895 = Static60.clickY; + Static280.anInt5895 = Mouse.clickY; Static226.anInt3953 = 2; - Static277.anInt5850 = Static7.clickX; + Static277.anInt5850 = Mouse.clickX; } } diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java index ac23649..127cf1a 100644 --- a/client/src/main/java/Static60.java +++ b/client/src/main/java/Static60.java @@ -19,10 +19,7 @@ public final class Static60 { @OriginalMember(owner = "client!em", name = "u", descriptor = "Lclient!na;") public static final JagString aClass100_420 = JagString.parse(")1o"); - @OriginalMember(owner = "client!em", name = "y", descriptor = "I") - public static int clickY = 0; - - @OriginalMember(owner = "client!em", name = "z", descriptor = "Z") + @OriginalMember(owner = "client!em", name = "z", descriptor = "Z") public static boolean aBoolean108 = false; @OriginalMember(owner = "client!em", name = "B", descriptor = "I") diff --git a/client/src/main/java/Static61.java b/client/src/main/java/Static61.java index bb41899..26adf4e 100644 --- a/client/src/main/java/Static61.java +++ b/client/src/main/java/Static61.java @@ -1,6 +1,4 @@ -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static61 { @@ -19,10 +17,4 @@ public final class Static61 { @OriginalMember(owner = "client!en", name = "x", descriptor = "Lclient!na;") public static final JagString aClass100_424 = JagString.parse("http:)4)4"); - @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V") - public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(66) JagString local66 = JagString.concatenate(new JagString[] { Static96.aClass100_521, Static123.parseInt(arg2), Static159.aClass100_760, Static123.parseInt(arg0 >> 6), Static159.aClass100_760, Static123.parseInt(arg1 >> 6), Static159.aClass100_760, Static123.parseInt(arg0 & 0x3F), Static159.aClass100_760, Static123.parseInt(arg1 & 0x3F) }); - local66.method3129(); - Static127.method2470(local66); - } } diff --git a/client/src/main/java/Static62.java b/client/src/main/java/Static62.java index 0c0cc0d..ed586cc 100644 --- a/client/src/main/java/Static62.java +++ b/client/src/main/java/Static62.java @@ -11,7 +11,4 @@ public final class Static62 { @OriginalMember(owner = "client!f", name = "V", descriptor = "I") public static int anInt1938 = 0; - @OriginalMember(owner = "client!f", name = "Z", descriptor = "I") - public static int anInt1941 = 0; - } diff --git a/client/src/main/java/Static64.java b/client/src/main/java/Static64.java index 58874da..acc8084 100644 --- a/client/src/main/java/Static64.java +++ b/client/src/main/java/Static64.java @@ -10,68 +10,37 @@ public final class Static64 { @OriginalMember(owner = "client!fb", name = "i", descriptor = "Lclient!na;") public static final JagString aClass100_431 = JagString.parse("; Max)2Age="); - @OriginalMember(owner = "client!fb", name = "l", descriptor = "[Lclient!na;") - public static final JagString[] aClass100Array62 = new JagString[100]; - @OriginalMember(owner = "client!fb", name = "p", descriptor = "Lclient!na;") public static final JagString aClass100_433 = JagString.parse(""); @OriginalMember(owner = "client!fb", name = "q", descriptor = "[I") public static final int[] anIntArray154 = new int[] { -1, -1, 1, 1 }; - @OriginalMember(owner = "client!fb", name = "b", descriptor = "(B)V") - public static void method1495() { - Static116.anInt2951 = 0; - Static240.anInt5335 = 0; - Static17.method527(); - Static41.method1050(); - Static225.method3889(); - Static245.method4226(); - @Pc(23) int local23; - for (local23 = 0; local23 < Static240.anInt5335; local23++) { - @Pc(30) int local30 = Static52.anIntArray136[local23]; - if (Static83.loop != Static159.players[local30].anInt3430) { - if (Static159.players[local30].soundRadius > 0) { - Static271.method4597(Static159.players[local30]); - } - Static159.players[local30] = null; - } - } - if (Protocol.length != Protocol.inboundBuffer.offset) { - throw new RuntimeException("gpp1 pos:" + Protocol.inboundBuffer.offset + " psize:" + Protocol.length); - } - for (local23 = 0; local23 < Static267.anInt5774; local23++) { - if (Static159.players[Static105.anIntArray256[local23]] == null) { - throw new RuntimeException("gpp2 pos:" + local23 + " size:" + Static267.anInt5774); - } - } - } - @OriginalMember(owner = "client!fb", name = "a", descriptor = "(JB)V") public static void method1496(@OriginalArg(0) long arg0) { if (arg0 == 0L) { return; } if (Static9.anInt178 >= 100 && !LoginManager.playerMember || Static9.anInt178 >= 200) { - Static103.method2231(JagString.EMPTY, 0, LocalizedText.FRIENDLISTFULL); + Chat.add(JagString.EMPTY, 0, LocalizedText.FRIENDLISTFULL); return; } @Pc(35) JagString local35 = Base37.decodeLowerCase(arg0).method3125(); @Pc(42) int local42; for (local42 = 0; local42 < Static9.anInt178; local42++) { if (Static92.aLongArray3[local42] == arg0) { - Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local35, LocalizedText.FRIENDLISTDUPE})); + Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local35, LocalizedText.FRIENDLISTDUPE})); return; } } for (local42 = 0; local42 < Static35.anInt1093; local42++) { - if (arg0 == Static190.aLongArray6[local42]) { - Static103.method2231(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL1, local35, LocalizedText.REMOVEIGNORE})); + if (arg0 == IgnoreList.encodedUsernames[local42]) { + Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL1, local35, LocalizedText.REMOVEIGNORE})); return; } } - if (local35.strEquals(PlayerList.self.aClass100_364)) { - Static103.method2231(JagString.EMPTY, 0, LocalizedText.FRIENDCANTADDSELF); + if (local35.strEquals(PlayerList.self.username)) { + Chat.add(JagString.EMPTY, 0, LocalizedText.FRIENDCANTADDSELF); return; } Static122.aClass100Array92[Static9.anInt178] = local35; @@ -81,7 +50,7 @@ public final class Static64 { Static106.anIntArray258[Static9.anInt178] = 0; Static3.aBooleanArray135[Static9.anInt178] = false; Static9.anInt178++; - Static185.anInt4369 = InterfaceList.transmitTimer; + FriendsList.transmitAt = InterfaceList.transmitTimer; Protocol.outboundBuffer.p1isaac(120); Protocol.outboundBuffer.p8(arg0); } diff --git a/client/src/main/java/Static65.java b/client/src/main/java/Static65.java index f874df2..b2d5d96 100644 --- a/client/src/main/java/Static65.java +++ b/client/src/main/java/Static65.java @@ -11,7 +11,7 @@ public final class Static65 { public static final JagString aClass100_435 = JagString.parse(""); @OriginalMember(owner = "client!fc", name = "a", descriptor = "(Lclient!wa;I)Lclient!na;") - public static JagString method1497(@OriginalArg(0) Buffer arg0) { + public static JagString formatChatMessage(@OriginalArg(0) Buffer arg0) { return Static254.method4350(arg0); } diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java index 3be72f7..460ccc9 100644 --- a/client/src/main/java/Static69.java +++ b/client/src/main/java/Static69.java @@ -31,13 +31,13 @@ public final class Static69 { return; } for (@Pc(12) int local12 = 0; local12 < Static35.anInt1093; local12++) { - if (Static190.aLongArray6[local12] == arg0) { + if (IgnoreList.encodedUsernames[local12] == arg0) { Static35.anInt1093--; for (@Pc(36) int local36 = local12; local36 < Static35.anInt1093; local36++) { - Static190.aLongArray6[local36] = Static190.aLongArray6[local36 + 1]; + IgnoreList.encodedUsernames[local36] = IgnoreList.encodedUsernames[local36 + 1]; Static193.aClass100Array134[local36] = Static193.aClass100Array134[local36 + 1]; } - Static185.anInt4369 = InterfaceList.transmitTimer; + FriendsList.transmitAt = InterfaceList.transmitTimer; Protocol.outboundBuffer.p1isaac(213); Protocol.outboundBuffer.p8(arg0); break; diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java index 911e55d..25282c6 100644 --- a/client/src/main/java/Static7.java +++ b/client/src/main/java/Static7.java @@ -17,10 +17,7 @@ public final class Static7 { @OriginalMember(owner = "client!ah", name = "p", descriptor = "Lclient!ih;") public static final LinkedList aClass69_32 = new LinkedList(); - @OriginalMember(owner = "client!ah", name = "s", descriptor = "I") - public static int clickX = 0; - - @OriginalMember(owner = "client!ah", name = "a", descriptor = "(BZ)V") + @OriginalMember(owner = "client!ah", name = "a", descriptor = "(BZ)V") public static void ping(@OriginalArg(1) boolean arg0) { client.audioLoop(); if (client.gameState != 30 && client.gameState != 25) { @@ -66,8 +63,8 @@ public final class Static7 { Static43.redraw(Static118.aClass13_15); } Static118.aClass13_15 = InterfaceList.getComponent(local99); - Static149.anInt3554 = clickX; - Static206.anInt4773 = Static60.clickY; + Static149.anInt3554 = Mouse.clickX; + Static206.anInt4773 = Mouse.clickY; Static4.anInt36 = local93; Static43.redraw(Static118.aClass13_15); return; @@ -87,8 +84,8 @@ public final class Static7 { } @Pc(204) int local204; if (local20 != 1) { - local93 = Static223.anInt5032; - local204 = Static215.anInt4873; + local93 = Mouse.anInt5032; + local204 = Mouse.anInt4873; if (local204 < Static183.anInt4271 - 10 || local204 > Static24.anInt761 + Static183.anInt4271 + 10 || Static229.anInt5138 - 10 > local93 || local93 > Static13.anInt436 + Static229.anInt5138 + 10) { Static60.aBoolean108 = false; Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); @@ -100,8 +97,8 @@ public final class Static7 { local204 = Static183.anInt4271; local93 = Static229.anInt5138; local99 = Static24.anInt761; - @Pc(265) int local265 = clickX; - @Pc(267) int local267 = Static60.clickY; + @Pc(265) int local265 = Mouse.clickX; + @Pc(267) int local267 = Mouse.clickY; @Pc(269) int local269 = -1; for (@Pc(271) int local271 = 0; local271 < Static231.anInt5204; local271++) { @Pc(289) int local289; diff --git a/client/src/main/java/Static70.java b/client/src/main/java/Static70.java index 26a3d63..bdb6651 100644 --- a/client/src/main/java/Static70.java +++ b/client/src/main/java/Static70.java @@ -7,10 +7,7 @@ public final class Static70 { @OriginalMember(owner = "client!fi", name = "k", descriptor = "I") public static int type = 0; - @OriginalMember(owner = "client!fi", name = "n", descriptor = "I") - public static int updatedVarpsWriterIndex = 0; - - @OriginalMember(owner = "client!fi", name = "a", descriptor = "(BI)Lclient!na;") + @OriginalMember(owner = "client!fi", name = "a", descriptor = "(BI)Lclient!na;") public static JagString method1548(@OriginalArg(1) int arg0) { @Pc(9) JagString local9 = Static123.parseInt(arg0); for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) { diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java index 2ad43cb..87f120f 100644 --- a/client/src/main/java/Static71.java +++ b/client/src/main/java/Static71.java @@ -20,14 +20,14 @@ public final class Static71 { @OriginalMember(owner = "client!fk", name = "b", descriptor = "(I)V") public static void method1444() { - for (@Pc(7) int local7 = -1; local7 < Static267.anInt5774; local7++) { + for (@Pc(7) int local7 = -1; local7 < PlayerList.size; local7++) { @Pc(21) int local21; if (local7 == -1) { local21 = 2047; } else { - local21 = Static105.anIntArray256[local7]; + local21 = PlayerList.ids[local7]; } - @Pc(31) Player local31 = Static159.players[local21]; + @Pc(31) Player local31 = PlayerList.players[local21]; if (local31 != null) { Static263.method4514(local31.getSize(), local31); } diff --git a/client/src/main/java/Static72.java b/client/src/main/java/Static72.java index ad76f7d..7c22ada 100644 --- a/client/src/main/java/Static72.java +++ b/client/src/main/java/Static72.java @@ -10,10 +10,7 @@ public final class Static72 { @OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I") public static int[][] regionsXteaKeys; - @OriginalMember(owner = "client!fl", name = "B", descriptor = "I") - public static int updatedVarcstrsWriterIndex = 0; - - @OriginalMember(owner = "client!fl", name = "H", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!fl", name = "H", descriptor = "Lclient!na;") public static final JagString aClass100_446 = JagString.parse(""); @OriginalMember(owner = "client!fl", name = "P", descriptor = "I") diff --git a/client/src/main/java/Static73.java b/client/src/main/java/Static73.java index cf93865..a297153 100644 --- a/client/src/main/java/Static73.java +++ b/client/src/main/java/Static73.java @@ -58,7 +58,7 @@ public final class Static73 { @OriginalMember(owner = "client!fm", name = "a", descriptor = "(ILclient!na;Lclient!na;Lclient!na;I)V") public static void method1598(@OriginalArg(1) JagString arg0, @OriginalArg(2) JagString arg1, @OriginalArg(3) JagString arg2) { - Static154.method2928(-1, 9, arg0, arg2, arg1); + Chat.add(-1, 9, arg0, arg2, arg1); } @OriginalMember(owner = "client!fm", name = "a", descriptor = "(IIIIII)Z") diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java index 7a893e3..c6aaa45 100644 --- a/client/src/main/java/Static75.java +++ b/client/src/main/java/Static75.java @@ -47,7 +47,7 @@ public final class Static75 { local39 = (local31 >> 4 & 0x7) + Static115.anInt2940; local45 = (local31 & 0x7) + Static180.anInt4264; if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) { - Static29.method800(Static55.level, local45, local19, local39, -1, -1, local27, local23, 0); + Static29.method800(Player.level, local45, local19, local39, -1, -1, local27, local23, 0); } } else if (Protocol.opcode == 33) { local15 = Protocol.inboundBuffer.g2le(); @@ -59,10 +59,10 @@ public final class Static75 { @Pc(122) ObjStack local122 = new ObjStack(); local122.anInt5550 = local31; local122.anInt5555 = local15; - if (Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] == null) { - Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] = new LinkedList(); + if (Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] == null) { + Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] = new LinkedList(); } - Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].addTail(new ObjStackNode(local122)); + Static159.aClass69ArrayArrayArray1[Player.level][local19][local27].addTail(new ObjStackNode(local122)); Static220.spawnGroundObject(local27, local19); } } else { @@ -95,8 +95,8 @@ public final class Static75 { local27 = local27 * 64; local19 = local19 * 64; local23 = local23 * 64; - local317 = new ProjAnim(local45, Static55.level, local23, local19, SceneGraph.getTileHeight(Static55.level, local23, local19) - local218, Static83.loop + local228, local232 + Static83.loop, local236, local247, local39, local224); - local317.method3705(local31, Static83.loop + local228, -local224 + SceneGraph.getTileHeight(Static55.level, local27, local31), local27); + local317 = new ProjAnim(local45, Player.level, local23, local19, SceneGraph.getTileHeight(Player.level, local23, local19) - local218, client.loop + local228, local232 + client.loop, local236, local247, local39, local224); + local317.method3705(local31, client.loop + local228, -local224 + SceneGraph.getTileHeight(Player.level, local27, local31), local27); Static217.aClass69_116.addTail(new ProjAnimNode(local317)); } } else if (Protocol.opcode == 17) { @@ -109,7 +109,7 @@ public final class Static75 { if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { local23 = local23 * 128 + 64; local19 = local19 * 128 + 64; - @Pc(427) SpotAnim local427 = new SpotAnim(local27, Static55.level, local23, local19, SceneGraph.getTileHeight(Static55.level, local23, local19) - local31, local39, Static83.loop); + @Pc(427) SpotAnim local427 = new SpotAnim(local27, Player.level, local23, local19, SceneGraph.getTileHeight(Player.level, local23, local19) - local31, local39, client.loop); Static99.aClass69_64.addTail(new SpotAnimNode(local427)); } } else if (Protocol.opcode == 179) { @@ -122,7 +122,7 @@ public final class Static75 { local45 = (local31 & 0x7) + Static180.anInt4264; local218 = Protocol.inboundBuffer.g2sub(); if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) { - Static29.method800(Static55.level, local45, local19, local39, -1, local218, local27, local23, 0); + Static29.method800(Player.level, local45, local19, local39, -1, local218, local27, local23, 0); } } else if (Protocol.opcode == 20) { local15 = Protocol.inboundBuffer.g1ssub(); @@ -136,7 +136,7 @@ public final class Static75 { if (local218 == 65535) { local218 = -1; } - Static92.method1881(Static55.level, local39, local31, local19, local45, local23, local218); + Static92.method1881(Player.level, local39, local31, local19, local45, local23, local218); } else { @Pc(633) int local633; if (Protocol.opcode == 202) { @@ -166,7 +166,7 @@ public final class Static75 { local31 = Protocol.inboundBuffer.g2(); local39 = Protocol.inboundBuffer.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { - @Pc(710) LinkedList local710 = Static159.aClass69ArrayArrayArray1[Static55.level][local23][local19]; + @Pc(710) LinkedList local710 = Static159.aClass69ArrayArrayArray1[Player.level][local23][local19]; if (local710 != null) { for (@Pc(718) ObjStackNode local718 = (ObjStackNode) local710.method2289(); local718 != null; local718 = (ObjStackNode) local710.method2288()) { @Pc(723) ObjStack local723 = local718.aClass8_Sub7_1; @@ -189,10 +189,10 @@ public final class Static75 { @Pc(812) ObjStack local812 = new ObjStack(); local812.anInt5550 = local31; local812.anInt5555 = local39; - if (Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] == null) { - Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] = new LinkedList(); + if (Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] == null) { + Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] = new LinkedList(); } - Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].addTail(new ObjStackNode(local812)); + Static159.aClass69ArrayArrayArray1[Player.level][local19][local27].addTail(new ObjStackNode(local812)); Static220.spawnGroundObject(local27, local19); } } else if (Protocol.opcode == 16) { @@ -217,8 +217,8 @@ public final class Static75 { local19 = local19 * 128 + 64; local23 = local23 * 128 + 64; local27 = local27 * 128 + 64; - local317 = new ProjAnim(local45, Static55.level, local23, local19, SceneGraph.getTileHeight(Static55.level, local23, local19) - local218, local228 + Static83.loop, local232 + Static83.loop, local236, local247, local39, local224); - local317.method3705(local31, Static83.loop + local228, SceneGraph.getTileHeight(Static55.level, local27, local31) - local224, local27); + local317 = new ProjAnim(local45, Player.level, local23, local19, SceneGraph.getTileHeight(Player.level, local23, local19) - local218, local228 + client.loop, local232 + client.loop, local236, local247, local39, local224); + local317.method3705(local31, client.loop + local228, SceneGraph.getTileHeight(Player.level, local27, local31) - local224, local27); Static217.aClass69_116.addTail(new ProjAnimNode(local317)); } } else if (Protocol.opcode == 104) { @@ -261,7 +261,7 @@ public final class Static75 { if (PlayerList.selfId == local1188) { local1198 = PlayerList.self; } else { - local1198 = Static159.players[local1188]; + local1198 = PlayerList.players[local1188]; } } if (local1198 != null) { @@ -279,8 +279,8 @@ public final class Static75 { } } } - @Pc(1331) ProjAnim local1331 = new ProjAnim(local218, Static55.level, local23, local19, SceneGraph.getTileHeight(Static55.level, local23, local19) - local224, local232 + Static83.loop, local236 + Static83.loop, local247, local633, local45, local228); - local1331.method3705(local31, local232 + Static83.loop, -local228 + SceneGraph.getTileHeight(Static55.level, local27, local31), local27); + @Pc(1331) ProjAnim local1331 = new ProjAnim(local218, Player.level, local23, local19, SceneGraph.getTileHeight(Player.level, local23, local19) - local224, local232 + client.loop, local236 + client.loop, local247, local633, local45, local228); + local1331.method3705(local31, local232 + client.loop, -local228 + SceneGraph.getTileHeight(Player.level, local27, local31), local27); Static217.aClass69_116.addTail(new ProjAnimNode(local1331)); } } else if (Protocol.opcode == 97) { @@ -312,7 +312,7 @@ public final class Static75 { local23 = (local15 >> 4 & 0x7) + Static115.anInt2940; local27 = Protocol.inboundBuffer.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { - @Pc(1565) LinkedList local1565 = Static159.aClass69ArrayArrayArray1[Static55.level][local23][local19]; + @Pc(1565) LinkedList local1565 = Static159.aClass69ArrayArrayArray1[Player.level][local23][local19]; if (local1565 != null) { for (@Pc(1572) ObjStackNode local1572 = (ObjStackNode) local1565.method2289(); local1572 != null; local1572 = (ObjStackNode) local1565.method2288()) { if (local1572.aClass8_Sub7_1.anInt5555 == (local27 & 0x7FFF)) { @@ -321,7 +321,7 @@ public final class Static75 { } } if (local1565.method2289() == null) { - Static159.aClass69ArrayArrayArray1[Static55.level][local23][local19] = null; + Static159.aClass69ArrayArrayArray1[Player.level][local23][local19] = null; } Static220.spawnGroundObject(local19, local23); } diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java index aeb4831..9c9ade1 100644 --- a/client/src/main/java/Static78.java +++ b/client/src/main/java/Static78.java @@ -219,10 +219,10 @@ public final class Static78 { } Static7.ping(true); i = Static146.anInt3508; - if (i > Static55.level) { - i = Static55.level; + if (i > Player.level) { + i = Player.level; } - if (i < Static55.level - 1) { + if (i < Player.level - 1) { } if (SceneGraph.allLevelsAreVisible()) { Static146.method2750(0); diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index bf63ca2..01e432c 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -74,14 +74,14 @@ public final class Static81 { } if (Static60.rebootTimer > 1) { Static60.rebootTimer--; - Static209.miscTransmitAt = InterfaceList.transmitTimer; + InterfaceList.miscTransmitAt = InterfaceList.transmitTimer; } if (LoginManager.aBoolean247) { LoginManager.aBoolean247 = false; Static175.method3279(); return; } - for (@Pc(34) int i = 0; i < 100 && Static10.readPacket(); i++) { + for (@Pc(34) int i = 0; i < 100 && Protocol.readPacket(); i++) { } if (client.gameState != 30) { return; @@ -174,7 +174,7 @@ public final class Static81 { } if (Static150.clickButton != 0) { @Pc(411) long loops = (Static133.clickTime - Static183.prevClickTime) / 50L; - samples = Static60.clickY; + samples = Mouse.clickY; if (samples < 0) { samples = 0; } else if (samples > 65535) { @@ -183,7 +183,7 @@ public final class Static81 { if (loops > 32767L) { loops = 32767L; } - i = Static7.clickX; + i = Mouse.clickX; Static183.prevClickTime = Static133.clickTime; @Pc(437) byte button = 0; if (i < 0) { @@ -256,7 +256,7 @@ public final class Static81 { // VarpDomain for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) { Static85.method1775(i); - Static83.updatedVarps[Static70.updatedVarpsWriterIndex++ & 0x1F] = i; + VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i; } @Pc(782) int modelId; // DelayedStateChange @@ -265,10 +265,10 @@ public final class Static81 { i = change.getId(); if (samples == 1) { Static155.varcs[i] = change.intArg1; - Static138.updatedVarcs[Static4.updatedVarcsWriterIndex++ & 0x1F] = i; + VarcDomain.updatedVarcs[VarcDomain.updatedVarcsWriterIndex++ & 0x1F] = i; } else if (samples == 2) { Static226.varcstrs[i] = change.stringArg; - Static233.updatedVarcstrs[Static72.updatedVarcstrsWriterIndex++ & 0x1F] = i; + VarcDomain.updatedVarcstrs[VarcDomain.updatedVarcstrsWriterIndex++ & 0x1F] = i; } else { @Pc(773) Component component; if (samples == 3) { @@ -394,7 +394,7 @@ public final class Static81 { @Pc(1361) Component local1361; if (Static118.aClass13_15 != null) { Static43.redraw(Static118.aClass13_15); - if (Static149.anInt3554 + 5 < Static215.anInt4873 || Static215.anInt4873 < Static149.anInt3554 - 5 || Static206.anInt4773 + 5 < Static223.anInt5032 || Static206.anInt4773 - 5 > Static223.anInt5032) { + if (Static149.anInt3554 + 5 < Mouse.anInt4873 || Mouse.anInt4873 < Static149.anInt3554 - 5 || Static206.anInt4773 + 5 < Mouse.anInt5032 || Static206.anInt4773 - 5 > Mouse.anInt5032) { Static123.aBoolean155 = true; } Static78.anInt2145++; @@ -488,18 +488,18 @@ public final class Static81 { Static4.method28(); } if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && Static58.wheelRotation != 0) { - y = Static55.level - Static58.wheelRotation; + y = Player.level - Static58.wheelRotation; if (y < 0) { y = 0; } else if (y > 3) { y = 3; } // Cheat - Static61.teleport(PlayerList.self.movementQueueX[0] + Static225.originX, PlayerList.self.movementQueueZ[0] + Static142.originZ, y); + Cheat.teleport(PlayerList.self.movementQueueX[0] + Static225.originX, PlayerList.self.movementQueueZ[0] + Static142.originZ, y); } if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { if (Static56.anInt1742 != -1) { - Static61.teleport(Static225.originX + Static56.anInt1742, Static142.originZ - -Static116.anInt2954, Static55.level); + Cheat.teleport(Static225.originX + Static56.anInt1742, Static142.originZ - -Static116.anInt2954, Player.level); } Static187.anInt4422 = 0; Static125.anInt3096 = 0; @@ -512,8 +512,8 @@ public final class Static81 { Protocol.outboundBuffer.p2add(Static116.anInt2954 + Static142.originZ); Static70.type = 1; Static17.milliseconds = 0; - Static25.y = Static60.clickY; - Static122.x = Static7.clickX; + Static25.y = Mouse.clickY; + Static122.x = Mouse.clickX; } Static125.anInt3096 = 0; } else if (Static187.anInt4422 == 2) { @@ -523,16 +523,16 @@ public final class Static81 { Protocol.outboundBuffer.p2(Static56.anInt1742 + Static225.originX); Static17.milliseconds = 0; Static70.type = 1; - Static122.x = Static7.clickX; - Static25.y = Static60.clickY; + Static122.x = Mouse.clickX; + Static25.y = Mouse.clickY; } Static187.anInt4422 = 0; } else if (Static56.anInt1742 != -1 && Static125.anInt3096 == 0 && Static187.anInt4422 == 0) { @Pc(1871) boolean local1871 = Static102.method2075(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, Static56.anInt1742, 0, 0, 0, Static116.anInt2954, PlayerList.self.movementQueueX[0]); if (local1871) { - Static25.y = Static60.clickY; + Static25.y = Mouse.clickY; Static17.milliseconds = 0; - Static122.x = Static7.clickX; + Static122.x = Mouse.clickX; Static70.type = 1; } } diff --git a/client/src/main/java/Static83.java b/client/src/main/java/Static83.java index cb1a634..b3c8393 100644 --- a/client/src/main/java/Static83.java +++ b/client/src/main/java/Static83.java @@ -7,12 +7,6 @@ public final class Static83 { @OriginalMember(owner = "client!gj", name = "m", descriptor = "[[[I") public static int[][][] activeTileHeightMap; - @OriginalMember(owner = "client!gj", name = "d", descriptor = "I") - public static int loop = 0; - - @OriginalMember(owner = "client!gj", name = "q", descriptor = "[I") - public static final int[] updatedVarps = new int[32]; - @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z") public static boolean method433(@OriginalArg(0) int arg0) { if (arg0 >= 97 && arg0 <= 122) { diff --git a/client/src/main/java/Static84.java b/client/src/main/java/Static84.java index de5d17d..dded082 100644 --- a/client/src/main/java/Static84.java +++ b/client/src/main/java/Static84.java @@ -1,6 +1,5 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static84 { @@ -19,171 +18,6 @@ public final class Static84 { @OriginalMember(owner = "client!gk", name = "i", descriptor = "I") public static int anInt2256 = 0; - @OriginalMember(owner = "client!gk", name = "a", descriptor = "(IIBLclient!e;)V") - public static void method1768(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Player arg2) { - @Pc(13) int local13; - @Pc(17) int local17; - @Pc(24) int local24; - if ((arg0 & 0x80) != 0) { - local13 = Protocol.inboundBuffer.g2le(); - local17 = Protocol.inboundBuffer.g1(); - @Pc(21) int local21 = Protocol.inboundBuffer.g1(); - local24 = Protocol.inboundBuffer.offset; - @Pc(35) boolean local35 = (local13 & 0x8000) != 0; - if (arg2.aClass100_364 != null && arg2.appearance != null) { - @Pc(48) long local48 = arg2.aClass100_364.encode37(); - @Pc(50) boolean local50 = false; - if (local17 <= 1) { - if (!local35 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) { - local50 = true; - } else { - for (@Pc(69) int local69 = 0; local69 < Static35.anInt1093; local69++) { - if (Static190.aLongArray6[local69] == local48) { - local50 = true; - break; - } - } - } - } - if (!local50 && Static11.anInt384 == 0) { - Protocol.chatBuffer.offset = 0; - Protocol.inboundBuffer.gBytesRev(local21, Protocol.chatBuffer.data); - Protocol.chatBuffer.offset = 0; - @Pc(106) int local106 = -1; - @Pc(127) JagString local127; - if (local35) { - @Pc(112) QuickChatPhrase local112 = Static264.method3568(Protocol.chatBuffer); - local13 &= 0x7FFF; - local106 = local112.anInt439; - local127 = local112.aClass3_Sub2_Sub6_1.method770(Protocol.chatBuffer); - } else { - local127 = Static218.method2862(Static65.method1497(Protocol.chatBuffer).method3116()); - } - arg2.aClass100_640 = local127.method3144(); - arg2.anInt3352 = local13 & 0xFF; - arg2.anInt3408 = 150; - arg2.anInt3429 = local13 >> 8; - if (local17 == 2) { - Static154.method2928(local106, local35 ? 17 : 1, local127, null, JagString.concatenate(new JagString[] { Static44.aClass100_336, arg2.method1264() })); - } else if (local17 == 1) { - Static154.method2928(local106, local35 ? 17 : 1, local127, null, JagString.concatenate(new JagString[] { Static65.aClass100_435, arg2.method1264() })); - } else { - Static154.method2928(local106, local35 ? 17 : 2, local127, null, arg2.method1264()); - } - } - } - Protocol.inboundBuffer.offset = local24 + local21; - } - if ((arg0 & 0x1) != 0) { - local13 = Protocol.inboundBuffer.gSmart1or2(); - local17 = Protocol.inboundBuffer.g1add(); - arg2.method2686(local17, Static83.loop, local13); - arg2.anInt3378 = Static83.loop + 300; - arg2.anInt3372 = Protocol.inboundBuffer.g1ssub(); - } - if ((arg0 & 0x8) != 0) { - local13 = Protocol.inboundBuffer.g2(); - if (local13 == 65535) { - local13 = -1; - } - local17 = Protocol.inboundBuffer.g1(); - Player.animate(local17, local13, arg2); - } - if ((arg0 & 0x4) != 0) { - local13 = Protocol.inboundBuffer.g1add(); - @Pc(309) byte[] local309 = new byte[local13]; - @Pc(314) Buffer local314 = new Buffer(local309); - Protocol.inboundBuffer.gBytes(local13, local309); - Static115.aClass3_Sub15Array1[arg1] = local314; - arg2.method1262(local314); - } - if ((arg0 & 0x2) != 0) { - arg2.anInt3370 = Protocol.inboundBuffer.g2sub(); - if (arg2.anInt3370 == 65535) { - arg2.anInt3370 = -1; - } - } - if ((arg0 & 0x400) != 0) { - arg2.anInt3380 = Protocol.inboundBuffer.p1neg(); - arg2.anInt3428 = Protocol.inboundBuffer.g1(); - arg2.anInt3416 = Protocol.inboundBuffer.g1add(); - arg2.anInt3392 = Protocol.inboundBuffer.g1(); - arg2.anInt3395 = Protocol.inboundBuffer.g2le() + Static83.loop; - arg2.anInt3386 = Protocol.inboundBuffer.g2le() + Static83.loop; - arg2.anInt3431 = Protocol.inboundBuffer.p1neg(); - arg2.movementQueueSize = 1; - arg2.anInt3405 = 0; - } - if ((arg0 & 0x20) != 0) { - arg2.aClass100_640 = Protocol.inboundBuffer.gjstr(); - if (arg2.aClass100_640.charAt(0) == 126) { - arg2.aClass100_640 = arg2.aClass100_640.substring(1); - Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640); - } else if (arg2 == PlayerList.self) { - Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640); - } - arg2.anInt3352 = 0; - arg2.anInt3429 = 0; - arg2.anInt3408 = 150; - } - if ((arg0 & 0x200) != 0) { - local13 = Protocol.inboundBuffer.gSmart1or2(); - local17 = Protocol.inboundBuffer.g1ssub(); - arg2.method2686(local17, Static83.loop, local13); - } - if ((arg0 & 0x800) != 0) { - local13 = Protocol.inboundBuffer.p1neg(); - @Pc(502) int[] local502 = new int[local13]; - @Pc(505) int[] local505 = new int[local13]; - @Pc(508) int[] local508 = new int[local13]; - for (@Pc(510) int local510 = 0; local510 < local13; local510++) { - @Pc(521) int local521 = Protocol.inboundBuffer.g2le(); - if (local521 == 65535) { - local521 = -1; - } - local502[local510] = local521; - local505[local510] = Protocol.inboundBuffer.g1add(); - local508[local510] = Protocol.inboundBuffer.g2(); - } - Static32.method865(local505, local502, arg2, local508); - } - if ((arg0 & 0x100) != 0) { - local13 = Protocol.inboundBuffer.g2le(); - if (local13 == 65535) { - local13 = -1; - } - local17 = Protocol.inboundBuffer.p4rme(); - @Pc(573) boolean local573 = true; - if (local13 != -1 && arg2.anInt3432 != -1 && SeqTypeList.get(SpotAnimTypeList.get(local13).seqId).anInt5355 < SeqTypeList.get(SpotAnimTypeList.get(arg2.anInt3432).seqId).anInt5355) { - local573 = false; - } - if (local573) { - arg2.anInt3359 = (local17 & 0xFFFF) + Static83.loop; - arg2.anInt3361 = 0; - arg2.anInt3399 = 0; - arg2.anInt3432 = local13; - if (arg2.anInt3359 > Static83.loop) { - arg2.anInt3399 = -1; - } - arg2.anInt3394 = local17 >> 16; - arg2.anInt3418 = 1; - if (arg2.anInt3432 != -1 && Static83.loop == arg2.anInt3359) { - local24 = SpotAnimTypeList.get(arg2.anInt3432).seqId; - if (local24 != -1) { - @Pc(663) SeqType local663 = SeqTypeList.get(local24); - if (local663 != null && local663.frames != null) { - SoundPlayer.playSeqSound(arg2.zFine, local663, arg2.xFine, arg2 == PlayerList.self, 0); - } - } - } - } - } - if ((arg0 & 0x40) != 0) { - arg2.anInt3382 = Protocol.inboundBuffer.g2(); - arg2.anInt3363 = Protocol.inboundBuffer.g2leadd(); - } - } - @OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V") public static void method1771() { Static62.anIntArray150 = Static206.method3679(0.4F); diff --git a/client/src/main/java/Static86.java b/client/src/main/java/Static86.java index 0149cf2..165c814 100644 --- a/client/src/main/java/Static86.java +++ b/client/src/main/java/Static86.java @@ -19,15 +19,15 @@ public final class Static86 { @OriginalMember(owner = "client!gm", name = "h", descriptor = "(I)V") public static void method1800() { - Static116.anInt2951 = 0; - Static240.anInt5335 = 0; + Protocol.extendedCount = 0; + Protocol.removedCount = 0; Static49.method1202(); Static278.method4645(); Static234.method4014(); @Pc(19) int local19; - for (local19 = 0; local19 < Static240.anInt5335; local19++) { - @Pc(30) int local30 = Static52.anIntArray136[local19]; - if (Static175.npcs[local30].anInt3430 != Static83.loop) { + for (local19 = 0; local19 < Protocol.removedCount; local19++) { + @Pc(30) int local30 = Protocol.removedIds[local19]; + if (Static175.npcs[local30].lastSeenLoop != client.loop) { if (Static175.npcs[local30].type.hasAreaSound()) { Static91.method1877(Static175.npcs[local30]); } diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index fbf59bd..b37f9c5 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -122,7 +122,7 @@ public final class Static87 { } else { local57 = arg8; } - local30.anInt465 = Static83.loop; + local30.anInt465 = client.loop; local30.anInt517 = local57; if (!local30.aBoolean32 || !Static36.method947(local30)) { if (local30.anInt453 > 0) { @@ -144,8 +144,8 @@ public final class Static87 { continue; } if (Static138.aBoolean172 && Static146.aBoolean174) { - local164 = Static223.anInt5032; - local166 = Static215.anInt4873; + local164 = Mouse.anInt5032; + local166 = Mouse.anInt4873; local164 -= Static165.anInt4035; if (local164 < Static228.anInt5103) { local164 = Static228.anInt5103; @@ -421,8 +421,8 @@ public final class Static87 { if (local1476 == null) { Static43.redraw(local30); } else if (Static118.aClass13_15 == local30 && local270 == Static4.anInt36) { - local518 = Static215.anInt4873 - Static149.anInt3554; - local556 = Static223.anInt5032 - Static206.anInt4773; + local518 = Mouse.anInt4873 - Static149.anInt3554; + local556 = Mouse.anInt5032 - Static206.anInt4773; if (local556 < 5 && local556 > -5) { local556 = 0; } @@ -686,9 +686,9 @@ public final class Static87 { if (local514 == PlayerList.selfId) { local514 = 2047; } - @Pc(2751) Player local2751 = Static159.players[local514]; + @Pc(2751) Player local2751 = PlayerList.players[local514]; @Pc(2760) SeqType local2760 = local276 == -1 ? null : SeqTypeList.get(local276); - if (local2751 != null && (int) local2751.aClass100_364.encode37() << 11 == (local30.modelId & 0xFFFFF800)) { + if (local2751 != null && (int) local2751.username.encode37() << 11 == (local30.modelId & 0xFFFFF800)) { local2589 = local2751.appearance.method1954(null, -1, null, local2760, 0, -1, 0, local30.anInt510, 0); } } diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index 68ede68..3cb4763 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -863,24 +863,24 @@ public final class Static88 { } component.aBoolean25 = true; if (opcode == 1400) { - component.anObjectArray5 = local13000; + component.onClickRepeat = local13000; } else if (opcode == 1401) { - component.anObjectArray9 = local13000; + component.onHold = local13000; } else if (opcode == 1402) { - component.anObjectArray18 = local13000; + component.onRelease = local13000; } else if (opcode == 1403) { - component.anObjectArray19 = local13000; + component.onMouseOver = local13000; } else if (opcode == 1404) { - component.anObjectArray24 = local13000; + component.onMouseLeave = local13000; } else if (opcode == 1405) { component.anObjectArray26 = local13000; } else if (opcode == 1406) { component.anObjectArray27 = local13000; } else if (opcode == 1407) { - component.anIntArray44 = local12937; - component.anObjectArray25 = local13000; + component.varpTriggers = local12937; + component.onVarpTransmit = local13000; } else if (opcode == 1408) { - component.anObjectArray22 = local13000; + component.onTimer = local13000; } else if (opcode == 1409) { component.anObjectArray29 = local13000; } else if (opcode == 1410) { @@ -888,43 +888,43 @@ public final class Static88 { } else if (opcode == 1411) { component.anObjectArray6 = local13000; } else if (opcode == 1412) { - component.anObjectArray23 = local13000; + component.onMouseRepeat = local13000; } else if (opcode == 1414) { - component.anIntArray34 = local12937; - component.anObjectArray7 = local13000; + component.inventoryTriggers = local12937; + component.onInvTransmit = local13000; } else if (opcode == 1415) { - component.anIntArray42 = local12937; - component.anObjectArray2 = local13000; + component.statTriggers = local12937; + component.onStatTransmit = local13000; } else if (opcode == 1416) { component.anObjectArray11 = local13000; } else if (opcode == 1417) { component.anObjectArray10 = local13000; } else if (opcode == 1418) { - component.anObjectArray20 = local13000; + component.onChatTransmit = local13000; } else if (opcode == 1419) { - component.anObjectArray14 = local13000; + component.onKey = local13000; } else if (opcode == 1420) { - component.anObjectArray1 = local13000; + component.onFriendTransmit = local13000; } else if (opcode == 1421) { - component.anObjectArray28 = local13000; + component.onClanTransmit = local13000; } else if (opcode == 1422) { - component.anObjectArray30 = local13000; + component.onMiscTransmit = local13000; } else if (opcode == 1423) { component.anObjectArray12 = local13000; } else if (opcode == 1424) { component.anObjectArray8 = local13000; } else if (opcode == 1425) { - component.anObjectArray21 = local13000; + component.onStockTransmit = local13000; } else if (opcode == 1426) { - component.anObjectArray13 = local13000; + component.onCamFinished = local13000; } else if (opcode == 1427) { component.anObjectArray17 = local13000; } else if (opcode == 1428) { - component.anObjectArray4 = local13000; - component.anIntArray38 = local12937; + component.onVarcTransmit = local13000; + component.varcTriggers = local12937; } else if (opcode == 1429) { - component.anIntArray35 = local12937; - component.anObjectArray15 = local13000; + component.varcstrTriggers = local12937; + component.onVarcstrTransmit = local13000; } continue; } @@ -1220,7 +1220,7 @@ public final class Static88 { if (opcode == 3100) { ssp--; string = Static3.stringStack[ssp]; - Static103.method2231(Static72.EMPTY_STRING, 0, string); + Chat.add(Static72.EMPTY_STRING, 0, string); continue; } if (opcode == 3101) { @@ -1308,7 +1308,7 @@ public final class Static88 { } } else if (opcode < 3400) { if (opcode == 3300) { - Static254.intStack[isp++] = Static83.loop; + Static254.intStack[isp++] = client.loop; continue; } if (opcode == 3301) { @@ -1357,7 +1357,7 @@ public final class Static88 { continue; } if (opcode == 3308) { - type = Static55.level; + type = Player.level; local803 = Static225.originX + (PlayerList.self.xFine >> 7); local1052 = (PlayerList.self.zFine >> 7) + Static142.originZ; Static254.intStack[isp++] = (type << 28) - (-(local803 << 14) - local1052); @@ -1750,7 +1750,7 @@ public final class Static88 { isp--; type = Static254.intStack[isp]; if (Static166.anInt4054 != 0 && Static35.anInt1093 > type) { - Static3.stringStack[ssp++] = Base37.decodeLowerCase(Static190.aLongArray6[type]).method3125(); + Static3.stringStack[ssp++] = Base37.decodeLowerCase(IgnoreList.encodedUsernames[type]).method3125(); continue; } Static3.stringStack[ssp++] = Static72.EMPTY_STRING; @@ -1768,7 +1768,7 @@ public final class Static88 { if (opcode == 3624) { isp--; type = Static254.intStack[isp]; - if (Static199.aClass3_Sub22Array1 != null && Static214.anInt5577 > type && Static199.aClass3_Sub22Array1[type].aClass100_636.equalsIgnoreCase(PlayerList.self.aClass100_364)) { + if (Static199.aClass3_Sub22Array1 != null && Static214.anInt5577 > type && Static199.aClass3_Sub22Array1[type].aClass100_636.equalsIgnoreCase(PlayerList.self.username)) { Static254.intStack[isp++] = 1; continue; } @@ -1820,64 +1820,64 @@ public final class Static88 { if (opcode == 3903) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static229.aClass136Array1[type].method3905(); + Static254.intStack[isp++] = StockMarketManager.aClass136Array1[type].method3905(); continue; } if (opcode == 3904) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static229.aClass136Array1[type].anInt5094; + Static254.intStack[isp++] = StockMarketManager.aClass136Array1[type].anInt5094; continue; } if (opcode == 3905) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static229.aClass136Array1[type].anInt5099; + Static254.intStack[isp++] = StockMarketManager.aClass136Array1[type].anInt5099; continue; } if (opcode == 3906) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static229.aClass136Array1[type].anInt5090; + Static254.intStack[isp++] = StockMarketManager.aClass136Array1[type].anInt5090; continue; } if (opcode == 3907) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static229.aClass136Array1[type].anInt5089; + Static254.intStack[isp++] = StockMarketManager.aClass136Array1[type].anInt5089; continue; } if (opcode == 3908) { isp--; type = Static254.intStack[isp]; - Static254.intStack[isp++] = Static229.aClass136Array1[type].anInt5092; + Static254.intStack[isp++] = StockMarketManager.aClass136Array1[type].anInt5092; continue; } if (opcode == 3910) { isp--; type = Static254.intStack[isp]; - local803 = Static229.aClass136Array1[type].method3904(); + local803 = StockMarketManager.aClass136Array1[type].method3904(); Static254.intStack[isp++] = local803 == 0 ? 1 : 0; continue; } if (opcode == 3911) { isp--; type = Static254.intStack[isp]; - local803 = Static229.aClass136Array1[type].method3904(); + local803 = StockMarketManager.aClass136Array1[type].method3904(); Static254.intStack[isp++] = local803 == 2 ? 1 : 0; continue; } if (opcode == 3912) { isp--; type = Static254.intStack[isp]; - local803 = Static229.aClass136Array1[type].method3904(); + local803 = StockMarketManager.aClass136Array1[type].method3904(); Static254.intStack[isp++] = local803 == 5 ? 1 : 0; continue; } if (opcode == 3913) { isp--; type = Static254.intStack[isp]; - local803 = Static229.aClass136Array1[type].method3904(); + local803 = StockMarketManager.aClass136Array1[type].method3904(); Static254.intStack[isp++] = local803 == 1 ? 1 : 0; continue; } @@ -2185,7 +2185,7 @@ public final class Static88 { isp--; type = Static254.intStack[isp]; if (type < 100) { - local2522 = Static230.aClass100Array158[type]; + local2522 = Chat.aClass100Array158[type]; } if (local2522 == null) { local2522 = Static72.EMPTY_STRING; @@ -2197,8 +2197,8 @@ public final class Static88 { isp--; type = Static254.intStack[isp]; local803 = -1; - if (type < 100 && Static230.aClass100Array158[type] != null) { - local803 = Static26.anIntArray67[type]; + if (type < 100 && Chat.aClass100Array158[type] != null) { + local803 = Chat.anIntArray67[type]; } Static254.intStack[isp++] = local803; continue; @@ -2357,7 +2357,7 @@ public final class Static88 { type = Static254.intStack[isp]; local2522 = null; if (type < 100) { - local2522 = Static153.aClass100Array112[type]; + local2522 = Chat.aClass100Array112[type]; } if (local2522 == null) { local2522 = Static72.EMPTY_STRING; @@ -2370,7 +2370,7 @@ public final class Static88 { type = Static254.intStack[isp]; local2522 = null; if (type < 100) { - local2522 = Static64.aClass100Array62[type]; + local2522 = Chat.aClass100Array62[type]; } if (local2522 == null) { local2522 = Static72.EMPTY_STRING; @@ -2383,16 +2383,16 @@ public final class Static88 { type = Static254.intStack[isp]; local803 = -1; if (type < 100) { - local803 = Static241.anIntArray521[type]; + local803 = Chat.anIntArray521[type]; } Static254.intStack[isp++] = local803; continue; } if (opcode == 5015) { - if (PlayerList.self == null || PlayerList.self.aClass100_364 == null) { - string = Player.username; + if (PlayerList.self == null || PlayerList.self.username == null) { + string = Player.usernameInput; } else { - string = PlayerList.self.method1264(); + string = PlayerList.self.getName(); } Static3.stringStack[ssp++] = string; continue; @@ -2402,7 +2402,7 @@ public final class Static88 { continue; } if (opcode == 5017) { - Static254.intStack[isp++] = Static62.anInt1941; + Static254.intStack[isp++] = Chat.anInt1941; continue; } if (opcode == 5050) { @@ -2477,9 +2477,9 @@ public final class Static88 { if (opcode == 5058) { Static122.aClass12_1 = new QuickChatPhrase(); isp--; - Static122.aClass12_1.anInt439 = Static254.intStack[isp]; - Static122.aClass12_1.aClass3_Sub2_Sub6_1 = QuickChatPhraseTypeList.get(Static122.aClass12_1.anInt439); - Static122.aClass12_1.anIntArray33 = new int[Static122.aClass12_1.aClass3_Sub2_Sub6_1.method767()]; + Static122.aClass12_1.id = Static254.intStack[isp]; + Static122.aClass12_1.type = QuickChatPhraseTypeList.get(Static122.aClass12_1.id); + Static122.aClass12_1.anIntArray33 = new int[Static122.aClass12_1.type.method767()]; continue; } if (opcode == 5059) { @@ -2487,8 +2487,8 @@ public final class Static88 { Protocol.outboundBuffer.p1(0); type = Protocol.outboundBuffer.offset; Protocol.outboundBuffer.p1(0); - Protocol.outboundBuffer.p2(Static122.aClass12_1.anInt439); - Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Protocol.outboundBuffer, Static122.aClass12_1.anIntArray33); + Protocol.outboundBuffer.p2(Static122.aClass12_1.id); + Static122.aClass12_1.type.method760(Protocol.outboundBuffer, Static122.aClass12_1.anIntArray33); Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - type); continue; } @@ -2499,8 +2499,8 @@ public final class Static88 { Protocol.outboundBuffer.p1(0); local803 = Protocol.outboundBuffer.offset; Protocol.outboundBuffer.p8(string.encode37()); - Protocol.outboundBuffer.p2(Static122.aClass12_1.anInt439); - Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Protocol.outboundBuffer, Static122.aClass12_1.anIntArray33); + Protocol.outboundBuffer.p2(Static122.aClass12_1.id); + Static122.aClass12_1.type.method760(Protocol.outboundBuffer, Static122.aClass12_1.anIntArray33); Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - local803); continue; } @@ -2509,8 +2509,8 @@ public final class Static88 { Protocol.outboundBuffer.p1(0); type = Protocol.outboundBuffer.offset; Protocol.outboundBuffer.p1(1); - Protocol.outboundBuffer.p2(Static122.aClass12_1.anInt439); - Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Protocol.outboundBuffer, Static122.aClass12_1.anIntArray33); + Protocol.outboundBuffer.p2(Static122.aClass12_1.id); + Static122.aClass12_1.type.method760(Protocol.outboundBuffer, Static122.aClass12_1.anIntArray33); Protocol.outboundBuffer.p1len(Protocol.outboundBuffer.offset - type); continue; } @@ -3901,7 +3901,7 @@ public final class Static88 { if (opcode == 4111) { ssp--; string = Static3.stringStack[ssp]; - Static3.stringStack[ssp++] = Static218.method2862(string); + Static3.stringStack[ssp++] = Static218.escape(string); continue; } if (opcode == 4112) { @@ -4113,7 +4113,7 @@ public final class Static88 { } catch (@Pc(14378) Exception ex) { if (script.name == null) { if (client.modeWhere != 0) { - Static103.method2231(Static72.EMPTY_STRING, 0, Static136.CS_ERROR); + Chat.add(Static72.EMPTY_STRING, 0, Static136.CS_ERROR); } TracingException.report("CS2 - scr:" + script.key + " op:" + op, ex); } else { @@ -4127,7 +4127,7 @@ public final class Static88 { str.method3113(Static176.aClass100_802).method3113(Static123.parseInt(cycles)); } if (client.modeWhere != 0) { - Static103.method2231(Static72.EMPTY_STRING, 0, JagString.concatenate(new JagString[] { Static167.aClass100_780, script.name})); + Chat.add(Static72.EMPTY_STRING, 0, JagString.concatenate(new JagString[] { Static167.aClass100_780, script.name})); } TracingException.report("CS2 - scr:" + script.key + " op:" + op + new String(str.method3148()), ex); } diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java index 48982d2..110cda6 100644 --- a/client/src/main/java/Static89.java +++ b/client/src/main/java/Static89.java @@ -14,9 +14,6 @@ public final class Static89 { @OriginalMember(owner = "client!ha", name = "o", descriptor = "I") public static int anInt2387; - @OriginalMember(owner = "client!ha", name = "m", descriptor = "I") - public static int anInt2385 = 0; - @OriginalMember(owner = "client!ha", name = "q", descriptor = "I") public static int anInt2388 = 0; @@ -117,11 +114,11 @@ public final class Static89 { Static155.anInt3751 = Static277.anInt5850; Static60.anInt1892 = Static280.anInt5895; } else if (Static150.clickButton == 0) { - Static155.anInt3751 = Static215.anInt4873; - Static60.anInt1892 = Static223.anInt5032; + Static155.anInt3751 = Mouse.anInt4873; + Static60.anInt1892 = Mouse.anInt5032; } else { - Static155.anInt3751 = Static7.clickX; - Static60.anInt1892 = Static60.clickY; + Static155.anInt3751 = Mouse.clickX; + Static60.anInt1892 = Mouse.clickY; } Static231.anInt5204 = 1; Static254.aClass100Array168[0] = LocalizedText.CANCEL; @@ -147,7 +144,7 @@ public final class Static89 { if (GlRenderer.enabled) { Static263.aBoolean299 = true; } - Static182.anInt4311 = Static83.loop; + Static182.anInt4311 = client.loop; if (InterfaceList.topLevelInterface != -1) { InterfaceList.anInt766 = 0; Static9.method182(); @@ -197,7 +194,7 @@ public final class Static89 { } } } - Static110.method2281(Static178.anInt4247, PlayerList.self.xFine, PlayerList.self.zFine, Static55.level); + Static110.method2281(Static178.anInt4247, PlayerList.self.xFine, PlayerList.self.zFine, Player.level); Static178.anInt4247 = 0; } diff --git a/client/src/main/java/Static96.java b/client/src/main/java/Static96.java index d2369fe..34158dc 100644 --- a/client/src/main/java/Static96.java +++ b/client/src/main/java/Static96.java @@ -46,7 +46,7 @@ public final class Static96 { Static84.anIntArray209[0] = arg11; @Pc(69) int local69 = 0; @Pc(71) boolean local71 = false; - @Pc(76) int[][] local76 = PathFinder.collisionMaps[Static55.level].anIntArrayArray30; + @Pc(76) int[][] local76 = PathFinder.collisionMaps[Player.level].anIntArrayArray30; @Pc(201) int local201; @Pc(242) int local242; label397: while (local69 != local65) { @@ -58,16 +58,16 @@ public final class Static96 { break; } if (arg6 != 0) { - if ((arg6 < 5 || arg6 == 10) && PathFinder.collisionMaps[Static55.level].method3042(arg0, local3, local10, arg5, arg6 - 1, arg4, arg3)) { + if ((arg6 < 5 || arg6 == 10) && PathFinder.collisionMaps[Player.level].method3042(arg0, local3, local10, arg5, arg6 - 1, arg4, arg3)) { local71 = true; break; } - if (arg6 < 10 && PathFinder.collisionMaps[Static55.level].method3046(arg0, arg6 - 1, arg5, local10, arg4, arg3, local3)) { + if (arg6 < 10 && PathFinder.collisionMaps[Player.level].method3046(arg0, arg6 - 1, arg5, local10, arg4, arg3, local3)) { local71 = true; break; } } - if (arg1 != 0 && arg9 != 0 && PathFinder.collisionMaps[Static55.level].method3052(arg5, local10, local3, arg4, arg1, arg7, arg0, arg9)) { + if (arg1 != 0 && arg9 != 0 && PathFinder.collisionMaps[Player.level].method3052(arg5, local10, local3, arg4, arg1, arg7, arg0, arg9)) { local71 = true; break; } diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java index 5f5ed58..9bc07be 100644 --- a/client/src/main/java/Static97.java +++ b/client/src/main/java/Static97.java @@ -97,7 +97,7 @@ public final class Static97 { public static JagString method1963(@OriginalArg(0) Component arg0) { if (Static36.method940(arg0).method512() == 0) { return null; - } else if (arg0.aClass100_86 == null || arg0.aClass100_86.method3144().length() == 0) { + } else if (arg0.aClass100_86 == null || arg0.aClass100_86.trim().length() == 0) { return Static121.aBoolean154 ? Static143.aClass100_668 : null; } else { return arg0.aClass100_86; diff --git a/client/src/main/java/Static98.java b/client/src/main/java/Static98.java index 1a41f21..5031cff 100644 --- a/client/src/main/java/Static98.java +++ b/client/src/main/java/Static98.java @@ -7,15 +7,7 @@ public final class Static98 { @OriginalMember(owner = "client!hj", name = "e", descriptor = "I") public static int anInt2512; - @OriginalMember(owner = "client!hj", name = "a", descriptor = "(II)V") - public static void method1964(@OriginalArg(0) int arg0) { - WorldMap.anInt4901 = -1; - WorldMap.anInt3482 = -1; - WorldMap.anInt435 = arg0; - WorldMap.method965(); - } - - @OriginalMember(owner = "client!hj", name = "a", descriptor = "(Lclient!na;B)Z") + @OriginalMember(owner = "client!hj", name = "a", descriptor = "(Lclient!na;B)Z") public static boolean method1965(@OriginalArg(0) JagString arg0) { if (arg0 == null) { return false; @@ -25,7 +17,7 @@ public final class Static98 { return true; } } - if (arg0.equalsIgnoreCase(PlayerList.self.aClass100_364)) { + if (arg0.equalsIgnoreCase(PlayerList.self.username)) { return true; } else { return false; diff --git a/client/src/main/java/StockMarketManager.java b/client/src/main/java/StockMarketManager.java new file mode 100644 index 0000000..c3e20a0 --- /dev/null +++ b/client/src/main/java/StockMarketManager.java @@ -0,0 +1,8 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class StockMarketManager { + @OriginalMember(owner = "client!si", name = "X", descriptor = "[Lclient!sg;") + public static final StockMarketOffer[] aClass136Array1 = new StockMarketOffer[6]; + @OriginalMember(owner = "client!ql", name = "d", descriptor = "I") + public static int transmitAt = 0; +} diff --git a/client/src/main/java/StringUtils.java b/client/src/main/java/StringUtils.java new file mode 100644 index 0000000..036635c --- /dev/null +++ b/client/src/main/java/StringUtils.java @@ -0,0 +1,2 @@ +public class StringUtils { +} diff --git a/client/src/main/java/VarcDomain.java b/client/src/main/java/VarcDomain.java new file mode 100644 index 0000000..0efd276 --- /dev/null +++ b/client/src/main/java/VarcDomain.java @@ -0,0 +1,12 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class VarcDomain { + @OriginalMember(owner = "client!t", name = "E", descriptor = "[I") + public static final int[] updatedVarcstrs = new int[32]; + @OriginalMember(owner = "client!km", name = "Bc", descriptor = "[I") + public static final int[] updatedVarcs = new int[32]; + @OriginalMember(owner = "client!fl", name = "B", descriptor = "I") + public static int updatedVarcstrsWriterIndex = 0; + @OriginalMember(owner = "client!ac", name = "o", descriptor = "I") + public static int updatedVarcsWriterIndex = 0; +} diff --git a/client/src/main/java/VarpDomain.java b/client/src/main/java/VarpDomain.java new file mode 100644 index 0000000..a7423cd --- /dev/null +++ b/client/src/main/java/VarpDomain.java @@ -0,0 +1,8 @@ +import org.openrs2.deob.annotation.OriginalMember; + +public class VarpDomain { + @OriginalMember(owner = "client!gj", name = "q", descriptor = "[I") + public static final int[] updatedVarps = new int[32]; + @OriginalMember(owner = "client!fi", name = "n", descriptor = "I") + public static int updatedVarpsWriterIndex = 0; +} diff --git a/client/src/main/java/WorldMap.java b/client/src/main/java/WorldMap.java index 7ad0f15..3c89221 100644 --- a/client/src/main/java/WorldMap.java +++ b/client/src/main/java/WorldMap.java @@ -873,4 +873,29 @@ public class WorldMap { anInt3482 = -1; aClass3_Sub2_Sub1_Sub1_2 = null; } + + @OriginalMember(owner = "client!je", name = "a", descriptor = "(IIIII)V") + public static void method2387(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { + anInt435 = width * arg2 / arg0; + anInt919 = length * arg1 / arg3; + anInt3482 = -1; + anInt4901 = -1; + method965(); + } + + @OriginalMember(owner = "client!wi", name = "d", descriptor = "(II)V") + public static void method4641(@OriginalArg(1) int arg0) { + anInt4901 = -1; + anInt4901 = -1; + anInt919 = arg0; + method965(); + } + + @OriginalMember(owner = "client!hj", name = "a", descriptor = "(II)V") + public static void method1964(@OriginalArg(0) int arg0) { + anInt4901 = -1; + anInt3482 = -1; + anInt435 = arg0; + method965(); + } } diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index dc8f221..214e682 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -180,8 +180,10 @@ public final class client extends GameShell { public static long firstGc = 0L; @OriginalMember(owner = "client!mj", name = "A", descriptor = "J") public static long prevGc = 0L; + @OriginalMember(owner = "client!gj", name = "d", descriptor = "I") + public static int loop = 0; - @OriginalMember(owner = "client!client", name = "main", descriptor = "([Ljava/lang/String;)V") + @OriginalMember(owner = "client!client", name = "main", descriptor = "([Ljava/lang/String;)V") public static void main(@OriginalArg(0) String[] arg0) { try { if (arg0.length != 4) { @@ -806,12 +808,12 @@ public final class client extends GameShell { local66.movementQueueSpeed[0] = 1; local66.movementQueueX[0] = local98 + (local66.xFine >> 7); local66.movementQueueZ[0] = local106 + (local66.zFine >> 7); - PathFinder.collisionMaps[Static55.level].unflagScenery(local66.xFine >> 7, local66.getSize(), false, 0, local66.getSize(), local66.zFine >> 7); - if (local66.movementQueueX[0] >= 0 && local66.movementQueueX[0] <= 104 - local66.getSize() && local66.movementQueueZ[0] >= 0 && local66.movementQueueZ[0] <= 104 - local66.getSize() && PathFinder.collisionMaps[Static55.level].method3054(local66.zFine >> 7, local66.movementQueueZ[0], local66.movementQueueX[0], local66.xFine >> 7)) { + PathFinder.collisionMaps[Player.level].unflagScenery(local66.xFine >> 7, local66.getSize(), false, 0, local66.getSize(), local66.zFine >> 7); + if (local66.movementQueueX[0] >= 0 && local66.movementQueueX[0] <= 104 - local66.getSize() && local66.movementQueueZ[0] >= 0 && local66.movementQueueZ[0] <= 104 - local66.getSize() && PathFinder.collisionMaps[Player.level].method3054(local66.zFine >> 7, local66.movementQueueZ[0], local66.movementQueueX[0], local66.xFine >> 7)) { if (local66.getSize() > 1) { for (@Pc(226) int local226 = local66.movementQueueX[0]; local66.movementQueueX[0] + local66.getSize() > local226; local226++) { for (@Pc(246) int local246 = local66.movementQueueZ[0]; local66.movementQueueZ[0] + local66.getSize() > local246; local246++) { - if ((PathFinder.collisionMaps[Static55.level].anIntArrayArray30[local226][local246] & 0x12401FF) != 0) { + if ((PathFinder.collisionMaps[Player.level].anIntArrayArray30[local226][local246] & 0x12401FF) != 0) { continue nextNpc; } } @@ -824,7 +826,7 @@ public final class client extends GameShell { Static104.method2247(local66); Static37.method949(local66); Static34.method879(local66); - PathFinder.collisionMaps[Static55.level].flagScenery(local66.xFine >> 7, false, local66.zFine >> 7, local66.getSize(), local66.getSize()); + PathFinder.collisionMaps[Player.level].flagScenery(local66.xFine >> 7, false, local66.zFine >> 7, local66.getSize(), local66.getSize()); } } } @@ -866,7 +868,7 @@ public final class client extends GameShell { Static175.url = null; Static33.openUrlRequest = null; } - if (Static83.loop % 1500 == 0) { + if (loop % 1500 == 0) { Static123.topBannerRefresh(); } return; @@ -1320,8 +1322,8 @@ public final class client extends GameShell { if (gameState == 1000) { return; } - Static83.loop++; - if (Static83.loop % 1000 == 1) { + loop++; + if (loop % 1000 == 1) { @Pc(24) GregorianCalendar gregorianCalendar = new GregorianCalendar(); Static60.gregorianDateSeed = gregorianCalendar.get(Calendar.HOUR_OF_DAY) * 600 + gregorianCalendar.get(Calendar.MINUTE) * 10 + gregorianCalendar.get(Calendar.SECOND) / 6; Static39.aRandom1.setSeed(Static60.gregorianDateSeed);