From f462316fceba9327d0167f29ff210d614551aad9 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Wed, 20 Apr 2022 13:54:03 -0400 Subject: [PATCH] Refactor part of the connection loop --- client/src/main/java/BufferedSocket.java | 2 +- client/src/main/java/Component.java | 150 ++-- client/src/main/java/DelayedStateChange.java | 8 +- client/src/main/java/GameShell.java | 8 +- client/src/main/java/HookRequest.java | 2 +- client/src/main/java/Js5CacheQueue.java | 2 +- client/src/main/java/MouseRecorder.java | 20 +- client/src/main/java/Packet.java | 2 +- client/src/main/java/PathingEntity.java | 46 +- client/src/main/java/Player.java | 18 +- client/src/main/java/Static10.java | 10 +- client/src/main/java/Static102.java | 8 +- client/src/main/java/Static103.java | 754 +++++++++--------- client/src/main/java/Static104.java | 4 +- client/src/main/java/Static109.java | 12 +- client/src/main/java/Static111.java | 68 +- client/src/main/java/Static115.java | 8 +- client/src/main/java/Static116.java | 2 +- client/src/main/java/Static118.java | 16 +- client/src/main/java/Static119.java | 2 +- client/src/main/java/Static122.java | 2 +- client/src/main/java/Static124.java | 2 +- client/src/main/java/Static125.java | 18 +- client/src/main/java/Static126.java | 6 +- client/src/main/java/Static127.java | 46 +- client/src/main/java/Static13.java | 2 +- client/src/main/java/Static132.java | 14 +- client/src/main/java/Static133.java | 2 +- client/src/main/java/Static134.java | 4 +- client/src/main/java/Static136.java | 2 +- client/src/main/java/Static137.java | 4 +- client/src/main/java/Static138.java | 2 +- client/src/main/java/Static140.java | 8 +- client/src/main/java/Static141.java | 2 +- client/src/main/java/Static142.java | 6 +- client/src/main/java/Static145.java | 6 +- client/src/main/java/Static150.java | 14 +- client/src/main/java/Static153.java | 4 +- client/src/main/java/Static154.java | 4 +- client/src/main/java/Static155.java | 2 +- client/src/main/java/Static156.java | 4 +- client/src/main/java/Static158.java | 38 +- client/src/main/java/Static164.java | 2 +- client/src/main/java/Static169.java | 4 +- client/src/main/java/Static17.java | 20 +- client/src/main/java/Static171.java | 6 +- client/src/main/java/Static173.java | 6 +- client/src/main/java/Static175.java | 6 +- client/src/main/java/Static176.java | 4 +- client/src/main/java/Static178.java | 6 +- client/src/main/java/Static179.java | 2 +- client/src/main/java/Static18.java | 2 +- client/src/main/java/Static182.java | 2 +- client/src/main/java/Static183.java | 2 +- client/src/main/java/Static186.java | 8 +- client/src/main/java/Static187.java | 2 +- client/src/main/java/Static19.java | 2 +- client/src/main/java/Static190.java | 2 +- client/src/main/java/Static191.java | 2 +- client/src/main/java/Static192.java | 18 +- client/src/main/java/Static193.java | 32 +- client/src/main/java/Static195.java | 8 +- client/src/main/java/Static197.java | 6 +- client/src/main/java/Static198.java | 2 +- client/src/main/java/Static2.java | 54 +- client/src/main/java/Static201.java | 6 +- client/src/main/java/Static203.java | 4 +- client/src/main/java/Static205.java | 2 +- client/src/main/java/Static207.java | 26 +- client/src/main/java/Static209.java | 6 +- client/src/main/java/Static210.java | 2 +- client/src/main/java/Static214.java | 2 +- client/src/main/java/Static216.java | 106 +-- client/src/main/java/Static217.java | 20 +- client/src/main/java/Static220.java | 16 +- client/src/main/java/Static225.java | 14 +- client/src/main/java/Static226.java | 8 +- client/src/main/java/Static227.java | 2 +- client/src/main/java/Static229.java | 2 +- client/src/main/java/Static233.java | 30 +- client/src/main/java/Static234.java | 6 +- client/src/main/java/Static235.java | 2 +- client/src/main/java/Static236.java | 10 +- client/src/main/java/Static24.java | 2 +- client/src/main/java/Static241.java | 2 +- client/src/main/java/Static243.java | 26 +- client/src/main/java/Static245.java | 12 +- client/src/main/java/Static246.java | 6 +- client/src/main/java/Static247.java | 2 +- client/src/main/java/Static248.java | 2 +- client/src/main/java/Static25.java | 8 +- client/src/main/java/Static250.java | 16 +- client/src/main/java/Static251.java | 2 +- client/src/main/java/Static252.java | 22 +- client/src/main/java/Static253.java | 8 +- client/src/main/java/Static254.java | 46 +- client/src/main/java/Static256.java | 4 +- client/src/main/java/Static258.java | 16 +- client/src/main/java/Static26.java | 10 +- client/src/main/java/Static260.java | 2 +- client/src/main/java/Static261.java | 6 +- client/src/main/java/Static263.java | 72 +- client/src/main/java/Static264.java | 2 +- client/src/main/java/Static266.java | 10 +- client/src/main/java/Static273.java | 20 +- client/src/main/java/Static276.java | 22 +- client/src/main/java/Static278.java | 14 +- client/src/main/java/Static280.java | 10 +- client/src/main/java/Static3.java | 2 +- client/src/main/java/Static31.java | 42 +- client/src/main/java/Static32.java | 4 +- client/src/main/java/Static33.java | 2 +- client/src/main/java/Static34.java | 18 +- client/src/main/java/Static36.java | 142 ++-- client/src/main/java/Static37.java | 4 +- client/src/main/java/Static38.java | 16 +- client/src/main/java/Static4.java | 154 ++-- client/src/main/java/Static40.java | 12 +- client/src/main/java/Static41.java | 8 +- client/src/main/java/Static44.java | 10 +- client/src/main/java/Static45.java | 8 +- client/src/main/java/Static48.java | 2 +- client/src/main/java/Static5.java | 18 +- client/src/main/java/Static52.java | 2 +- client/src/main/java/Static53.java | 2 +- client/src/main/java/Static54.java | 58 +- client/src/main/java/Static55.java | 2 +- client/src/main/java/Static57.java | 4 +- client/src/main/java/Static58.java | 2 +- client/src/main/java/Static59.java | 20 +- client/src/main/java/Static6.java | 6 +- client/src/main/java/Static60.java | 4 +- client/src/main/java/Static61.java | 2 +- client/src/main/java/Static64.java | 8 +- client/src/main/java/Static65.java | 6 +- client/src/main/java/Static67.java | 2 +- client/src/main/java/Static69.java | 6 +- client/src/main/java/Static7.java | 24 +- client/src/main/java/Static70.java | 4 +- client/src/main/java/Static71.java | 6 +- client/src/main/java/Static72.java | 2 +- client/src/main/java/Static73.java | 16 +- client/src/main/java/Static74.java | 6 +- client/src/main/java/Static75.java | 42 +- client/src/main/java/Static78.java | 38 +- client/src/main/java/Static80.java | 20 +- client/src/main/java/Static81.java | 674 ++++++++-------- client/src/main/java/Static83.java | 2 +- client/src/main/java/Static84.java | 4 +- client/src/main/java/Static87.java | 128 +-- client/src/main/java/Static88.java | 462 +++++------ client/src/main/java/Static89.java | 16 +- client/src/main/java/Static9.java | 2 +- client/src/main/java/Static96.java | 12 +- client/src/main/java/Static98.java | 2 +- client/src/main/java/client.java | 92 +-- signlink/src/main/java/PrivilegedRequest.java | 2 +- signlink/src/main/java/SignLink.java | 22 +- 158 files changed, 2147 insertions(+), 2133 deletions(-) diff --git a/client/src/main/java/BufferedSocket.java b/client/src/main/java/BufferedSocket.java index 4e3ddda..78a7cb2 100644 --- a/client/src/main/java/BufferedSocket.java +++ b/client/src/main/java/BufferedSocket.java @@ -204,7 +204,7 @@ public final class BufferedSocket implements Runnable { } if (this.aClass212_4.status == 1) { try { - ((Thread) this.aClass212_4.anObject6).join(); + ((Thread) this.aClass212_4.result).join(); } catch (@Pc(59) InterruptedException local59) { } } diff --git a/client/src/main/java/Component.java b/client/src/main/java/Component.java index 8446604..2a60956 100644 --- a/client/src/main/java/Component.java +++ b/client/src/main/java/Component.java @@ -61,7 +61,7 @@ public final class Component { public boolean aBoolean26; @OriginalMember(owner = "client!be", name = "Z", descriptor = "I") - public int anInt463; + public int modelId; @OriginalMember(owner = "client!be", name = "bb", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray11; @@ -103,13 +103,13 @@ public final class Component { public int[] anIntArray39; @OriginalMember(owner = "client!be", name = "dc", descriptor = "[I") - public int[] anIntArray40; + public int[] objTypes; @OriginalMember(owner = "client!be", name = "fc", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray20; @OriginalMember(owner = "client!be", name = "lc", descriptor = "[Lclient!be;") - public Component[] aClass13Array3; + public Component[] createdComponents; @OriginalMember(owner = "client!be", name = "mc", descriptor = "[B") public byte[] aByteArray8; @@ -175,7 +175,7 @@ public final class Component { public Object[] anObjectArray30; @OriginalMember(owner = "client!be", name = "wd", descriptor = "[I") - public int[] anIntArray50; + public int[] objCounts; @OriginalMember(owner = "client!be", name = "H", descriptor = "Z") public boolean aBoolean23 = false; @@ -190,13 +190,13 @@ public final class Component { public int anInt460 = 0; @OriginalMember(owner = "client!be", name = "j", descriptor = "I") - public int anInt443 = 100; + public int modelZoom = 100; @OriginalMember(owner = "client!be", name = "h", descriptor = "B") - public byte aByte2 = 0; + public byte xMode = 0; @OriginalMember(owner = "client!be", name = "jb", descriptor = "I") - public int anInt469 = 0; + public int y = 0; @OriginalMember(owner = "client!be", name = "nb", descriptor = "I") public int anInt472 = 0; @@ -208,7 +208,7 @@ public final class Component { public short aShort10 = 3000; @OriginalMember(owner = "client!be", name = "D", descriptor = "I") - public int anInt450 = 0; + public int modelXAngle = 0; @OriginalMember(owner = "client!be", name = "Eb", descriptor = "I") public int anInt481 = 0; @@ -223,7 +223,7 @@ public final class Component { public int anInt447 = 0; @OriginalMember(owner = "client!be", name = "hb", descriptor = "I") - public int anInt468 = 0; + public int scrollY = 0; @OriginalMember(owner = "client!be", name = "xb", descriptor = "I") public int anInt477 = -1; @@ -232,7 +232,7 @@ public final class Component { public int anInt467 = 0; @OriginalMember(owner = "client!be", name = "a", descriptor = "Z") - public boolean aBoolean17 = false; + public boolean hidden = false; @OriginalMember(owner = "client!be", name = "Zb", descriptor = "I") public int anInt490 = 1; @@ -241,7 +241,7 @@ public final class Component { public int anInt484 = -1; @OriginalMember(owner = "client!be", name = "O", descriptor = "I") - public int anInt457 = -1; + public int componentId = -1; @OriginalMember(owner = "client!be", name = "J", descriptor = "Z") public boolean aBoolean24 = false; @@ -310,19 +310,19 @@ public final class Component { private int anInt461 = -1; @OriginalMember(owner = "client!be", name = "N", descriptor = "I") - public int anInt456 = -1; + public int layer = -1; @OriginalMember(owner = "client!be", name = "pb", descriptor = "I") public int anInt473 = 1; @OriginalMember(owner = "client!be", name = "Q", descriptor = "I") - public int anInt458 = -1; + public int objId = -1; @OriginalMember(owner = "client!be", name = "vb", descriptor = "I") public int anInt475 = 0; @OriginalMember(owner = "client!be", name = "nc", descriptor = "I") - public int anInt497 = 0; + public int modelZOffset = 0; @OriginalMember(owner = "client!be", name = "Dc", descriptor = "Lclient!na;") public JagString aClass100_88 = Static176.aClass100_800; @@ -331,7 +331,7 @@ public final class Component { public int anInt511 = 0; @OriginalMember(owner = "client!be", name = "w", descriptor = "I") - public int anInt446 = 0; + public int baseWidth = 0; @OriginalMember(owner = "client!be", name = "Mc", descriptor = "I") public int anInt512 = 0; @@ -349,13 +349,13 @@ public final class Component { public int anInt476 = 0; @OriginalMember(owner = "client!be", name = "hc", descriptor = "I") - public int anInt494 = 0; + public int modelXOffset = 0; @OriginalMember(owner = "client!be", name = "Ub", descriptor = "Lclient!na;") public JagString aClass100_86 = Static176.aClass100_800; @OriginalMember(owner = "client!be", name = "Lb", descriptor = "I") - public int anInt483 = 0; + public int modelRotationSpeed = 0; @OriginalMember(owner = "client!be", name = "r", descriptor = "Lclient!na;") public JagString aClass100_82 = Static176.aClass100_800; @@ -385,7 +385,7 @@ public final class Component { public int anInt519 = -1; @OriginalMember(owner = "client!be", name = "zc", descriptor = "B") - public byte aByte4 = 0; + public byte yMode = 0; @OriginalMember(owner = "client!be", name = "qc", descriptor = "I") public int anInt500 = 0; @@ -412,10 +412,10 @@ public final class Component { public JagString aClass100_89 = LocalizedText.OK; @OriginalMember(owner = "client!be", name = "Gc", descriptor = "I") - public int anInt508 = 0; + public int modelYOffset = 0; @OriginalMember(owner = "client!be", name = "vc", descriptor = "I") - public int anInt503 = 0; + public int objCount = 0; @OriginalMember(owner = "client!be", name = "Uc", descriptor = "I") public int anInt517 = -1; @@ -433,7 +433,7 @@ public final class Component { public int anInt525 = 0; @OriginalMember(owner = "client!be", name = "ab", descriptor = "I") - public int anInt464 = 1; + public int modelType = 1; @OriginalMember(owner = "client!be", name = "md", descriptor = "Z") public boolean aBoolean34 = false; @@ -448,19 +448,19 @@ public final class Component { public int anInt526 = 0; @OriginalMember(owner = "client!be", name = "ld", descriptor = "I") - public int anInt524 = 0; + public int modelYAngle = 0; @OriginalMember(owner = "client!be", name = "T", descriptor = "Z") public boolean aBoolean25 = false; @OriginalMember(owner = "client!be", name = "vd", descriptor = "I") - public int anInt529 = 0; + public int baseX = 0; @OriginalMember(owner = "client!be", name = "jd", descriptor = "I") - public int anInt523 = 0; + public int x = 0; @OriginalMember(owner = "client!be", name = "l", descriptor = "I") - public int anInt444 = 0; + public int baseY = 0; @OriginalMember(owner = "client!be", name = "Bb", descriptor = "Z") public boolean aBoolean31 = true; @@ -549,20 +549,20 @@ public final class Component { this.anInt452 = arg0.g1(); this.anInt530 = arg0.g1(); this.anInt453 = arg0.g2(); - this.anInt529 = arg0.g2s(); - this.anInt444 = arg0.g2s(); - this.anInt446 = arg0.g2(); + this.baseX = arg0.g2s(); + this.baseY = arg0.g2s(); + this.baseWidth = arg0.g2(); this.anInt488 = arg0.g2(); this.aByte5 = 0; this.aByte3 = 0; - this.aByte4 = 0; - this.aByte2 = 0; + this.yMode = 0; + this.xMode = 0; this.anInt476 = arg0.g1(); - this.anInt456 = arg0.g2(); - if (this.anInt456 == 65535) { - this.anInt456 = -1; + this.layer = arg0.g2(); + if (this.layer == 65535) { + this.layer = -1; } else { - this.anInt456 += this.anInt507 & 0xFFFF0000; + this.layer += this.anInt507 & 0xFFFF0000; } this.anInt470 = arg0.g2(); if (this.anInt470 == 65535) { @@ -597,7 +597,7 @@ public final class Component { } if (this.anInt452 == 0) { this.anInt491 = arg0.g2(); - this.aBoolean17 = arg0.g1() == 1; + this.hidden = arg0.g1() == 1; } if (this.anInt452 == 1) { arg0.g2(); @@ -606,8 +606,8 @@ public final class Component { local164 = 0; if (this.anInt452 == 2) { this.aByte3 = 3; - this.anIntArray50 = new int[this.anInt446 * this.anInt488]; - this.anIntArray40 = new int[this.anInt488 * this.anInt446]; + this.objCounts = new int[this.baseWidth * this.anInt488]; + this.objTypes = new int[this.anInt488 * this.baseWidth]; this.aByte5 = 3; local175 = arg0.g1(); local183 = arg0.g1(); @@ -680,11 +680,11 @@ public final class Component { this.anInt519 = arg0.g4(); } if (this.anInt452 == 6) { - this.anInt464 = 1; - this.anInt463 = arg0.g2(); + this.modelType = 1; + this.modelId = arg0.g2(); this.anInt518 = 1; - if (this.anInt463 == 65535) { - this.anInt463 = -1; + if (this.modelId == 65535) { + this.modelId = -1; } this.anInt461 = arg0.g2(); if (this.anInt461 == 65535) { @@ -698,15 +698,15 @@ public final class Component { if (this.anInt462 == 65535) { this.anInt462 = -1; } - this.anInt443 = arg0.g2(); - this.anInt450 = arg0.g2(); - this.anInt524 = arg0.g2(); + this.modelZoom = arg0.g2(); + this.modelXAngle = arg0.g2(); + this.modelYAngle = arg0.g2(); } if (this.anInt452 == 7) { this.aByte3 = 3; this.aByte5 = 3; - this.anIntArray50 = new int[this.anInt488 * this.anInt446]; - this.anIntArray40 = new int[this.anInt446 * this.anInt488]; + this.objCounts = new int[this.anInt488 * this.baseWidth]; + this.objTypes = new int[this.baseWidth * this.anInt488]; this.anInt460 = arg0.g1(); this.anInt502 = arg0.g2(); if (this.anInt502 == 65535) { @@ -820,13 +820,13 @@ public final class Component { } @OriginalMember(owner = "client!be", name = "b", descriptor = "(III)V") - public final void method487(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(8) int local8 = this.anIntArray40[arg1]; - this.anIntArray40[arg1] = this.anIntArray40[arg0]; - this.anIntArray40[arg0] = local8; - @Pc(34) int local34 = this.anIntArray50[arg1]; - this.anIntArray50[arg1] = this.anIntArray50[arg0]; - this.anIntArray50[arg0] = local34; + public final void swapObjs(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + @Pc(8) int local8 = this.objTypes[arg1]; + this.objTypes[arg1] = this.objTypes[arg0]; + this.objTypes[arg0] = local8; + @Pc(34) int local34 = this.objCounts[arg1]; + this.objCounts[arg1] = this.objCounts[arg0]; + this.objCounts[arg0] = local34; } @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;") @@ -838,8 +838,8 @@ public final class Component { local10 = this.anInt518; local13 = this.anInt461; } else { - local13 = this.anInt463; - local10 = this.anInt464; + local13 = this.modelId; + local10 = this.modelType; } if (local10 == 0) { return null; @@ -903,8 +903,8 @@ public final class Component { } else if (arg5 == null) { return null; } else { - @Pc(227) int local227 = this.anInt463 >>> 16; - @Pc(232) int local232 = this.anInt463 & 0xFFFF; + @Pc(227) int local227 = this.modelId >>> 16; + @Pc(232) int local232 = this.modelId & 0xFFFF; @Pc(235) int local235 = this.anInt498; @Pc(246) Model local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232); if (local246 == null) { @@ -983,21 +983,21 @@ public final class Component { arg0.gjstr(); } this.anInt453 = arg0.g2(); - this.anInt529 = arg0.g2s(); - this.anInt444 = arg0.g2s(); - this.anInt446 = arg0.g2(); + this.baseX = arg0.g2s(); + this.baseY = arg0.g2s(); + this.baseWidth = arg0.g2(); this.anInt488 = arg0.g2(); this.aByte5 = arg0.g1s(); this.aByte3 = arg0.g1s(); - this.aByte4 = arg0.g1s(); - this.aByte2 = arg0.g1s(); - this.anInt456 = arg0.g2(); - if (this.anInt456 == 65535) { - this.anInt456 = -1; + this.yMode = arg0.g1s(); + this.xMode = arg0.g1s(); + this.layer = arg0.g2(); + if (this.layer == 65535) { + this.layer = -1; } else { - this.anInt456 = (this.anInt507 & 0xFFFF0000) + this.anInt456; + this.layer = (this.anInt507 & 0xFFFF0000) + this.layer; } - this.aBoolean17 = arg0.g1() == 1; + this.hidden = arg0.g1() == 1; if (this.anInt452 == 0) { this.anInt486 = arg0.g2(); this.anInt491 = arg0.g2(); @@ -1017,17 +1017,17 @@ public final class Component { this.aBoolean26 = arg0.g1() == 1; } if (this.anInt452 == 6) { - this.anInt464 = 1; - this.anInt463 = arg0.g2(); - if (this.anInt463 == 65535) { - this.anInt463 = -1; + this.modelType = 1; + this.modelId = arg0.g2(); + if (this.modelId == 65535) { + this.modelId = -1; } this.anInt495 = arg0.g2s(); this.anInt481 = arg0.g2s(); - this.anInt450 = arg0.g2(); - this.anInt524 = arg0.g2(); - this.anInt508 = arg0.g2(); - this.anInt443 = arg0.g2(); + this.modelXAngle = arg0.g2(); + this.modelYAngle = arg0.g2(); + this.modelYOffset = arg0.g2(); + this.modelZoom = arg0.g2(); this.anInt522 = arg0.g2(); if (this.anInt522 == 65535) { this.anInt522 = -1; diff --git a/client/src/main/java/DelayedStateChange.java b/client/src/main/java/DelayedStateChange.java index 24265b1..b2820a2 100644 --- a/client/src/main/java/DelayedStateChange.java +++ b/client/src/main/java/DelayedStateChange.java @@ -6,16 +6,16 @@ import org.openrs2.deob.annotation.OriginalMember; public final class DelayedStateChange extends SecondaryNode { @OriginalMember(owner = "client!da", name = "T", descriptor = "I") - public int anInt1269; + public int intArg2; @OriginalMember(owner = "client!da", name = "U", descriptor = "I") - public int anInt1270; + public int intArg3; @OriginalMember(owner = "client!da", name = "V", descriptor = "I") - public int anInt1271; + public int intArg1; @OriginalMember(owner = "client!da", name = "W", descriptor = "Lclient!na;") - public JagString aClass100_254; + public JagString stringArg; @OriginalMember(owner = "client!da", name = "", descriptor = "(II)V") public DelayedStateChange(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java index 78824b4..a111264 100644 --- a/client/src/main/java/GameShell.java +++ b/client/src/main/java/GameShell.java @@ -109,7 +109,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Static154.canvas.requestFocus(); Static233.aBoolean253 = true; Static69.aBoolean115 = true; - Static26.aBoolean59 = true; + Static26.focus = true; Static35.aBoolean66 = false; Static243.aLong178 = MonotonicClock.currentTimeMillis(); } @@ -230,7 +230,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Static228.aLongArray8[Static261.anInt5741] = local6; Static261.anInt5741 = Static261.anInt5741 + 1 & 0x1F; synchronized (this) { - Static26.aBoolean59 = Static233.aBoolean253; + Static26.focus = Static233.aBoolean253; } this.method921(); if (local10 != 0L && local6 <= local10) { @@ -386,7 +386,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene while (local76.status == 0) { Static231.method3983(10L); } - Static37.aThread1 = (Thread) local76.anObject6; + Static37.aThread1 = (Thread) local76.result; } catch (@Pc(91) Exception local91) { Static89.method1839(null, local91); } @@ -438,7 +438,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene while (local86.status == 0) { Static231.method3983(10L); } - Static37.aThread1 = (Thread) local86.anObject6; + Static37.aThread1 = (Thread) local86.result; } catch (@Pc(103) Exception local103) { Static89.method1839(null, local103); this.method927("crash"); diff --git a/client/src/main/java/HookRequest.java b/client/src/main/java/HookRequest.java index 6ac77ef..6d908c9 100644 --- a/client/src/main/java/HookRequest.java +++ b/client/src/main/java/HookRequest.java @@ -32,5 +32,5 @@ public final class HookRequest extends Node { public Object[] anObjectArray31; @OriginalMember(owner = "client!jl", name = "F", descriptor = "Lclient!be;") - public Component aClass13_17; + public Component source; } diff --git a/client/src/main/java/Js5CacheQueue.java b/client/src/main/java/Js5CacheQueue.java index 8f4797c..605b0b0 100644 --- a/client/src/main/java/Js5CacheQueue.java +++ b/client/src/main/java/Js5CacheQueue.java @@ -27,7 +27,7 @@ public final class Js5CacheQueue implements Runnable { if (local20.status == 2) { throw new RuntimeException(); } - this.aThread2 = (Thread) local20.anObject6; + this.aThread2 = (Thread) local20.result; } @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!c;I)V") diff --git a/client/src/main/java/MouseRecorder.java b/client/src/main/java/MouseRecorder.java index 0f53148..f7ab43e 100644 --- a/client/src/main/java/MouseRecorder.java +++ b/client/src/main/java/MouseRecorder.java @@ -9,27 +9,27 @@ public final class MouseRecorder implements Runnable { public boolean aBoolean151 = true; @OriginalMember(owner = "client!jd", name = "f", descriptor = "Ljava/lang/Object;") - public final Object anObject4 = new Object(); + public final Object lock = new Object(); @OriginalMember(owner = "client!jd", name = "k", descriptor = "I") - public int anInt2990 = 0; + public int samples = 0; @OriginalMember(owner = "client!jd", name = "l", descriptor = "[I") - public final int[] anIntArray279 = new int[500]; + public final int[] y = new int[500]; @OriginalMember(owner = "client!jd", name = "n", descriptor = "[I") - public final int[] anIntArray280 = new int[500]; + public final int[] x = new int[500]; @OriginalMember(owner = "client!jd", name = "run", descriptor = "()V") @Override public final void run() { while (this.aBoolean151) { - @Pc(12) Object local12 = this.anObject4; - synchronized (this.anObject4) { - if (this.anInt2990 < 500) { - this.anIntArray280[this.anInt2990] = Static215.anInt4873; - this.anIntArray279[this.anInt2990] = Static223.anInt5032; - this.anInt2990++; + @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.samples++; } } Static231.method3983(50L); diff --git a/client/src/main/java/Packet.java b/client/src/main/java/Packet.java index de3881e..09e28b1 100644 --- a/client/src/main/java/Packet.java +++ b/client/src/main/java/Packet.java @@ -59,7 +59,7 @@ public final class Packet extends Buffer { } @OriginalMember(owner = "client!i", name = "r", descriptor = "(II)V") - public final void method2242(@OriginalArg(1) int arg0) { + public final void p1isaac(@OriginalArg(1) int arg0) { this.data[this.offset++] = (byte) (arg0 + this.aClass71_1.method2295()); } diff --git a/client/src/main/java/PathingEntity.java b/client/src/main/java/PathingEntity.java index 9729418..affe4b2 100644 --- a/client/src/main/java/PathingEntity.java +++ b/client/src/main/java/PathingEntity.java @@ -79,7 +79,7 @@ public abstract class PathingEntity extends Entity { public int anInt3431; @OriginalMember(owner = "client!fe", name = "w", descriptor = "[I") - public final int[] anIntArray317 = new int[10]; + public final int[] movementQueueZ = new int[10]; @OriginalMember(owner = "client!fe", name = "z", descriptor = "I") public int anInt3358 = 0; @@ -91,7 +91,7 @@ public abstract class PathingEntity extends Entity { public final int[] anIntArray319 = new int[4]; @OriginalMember(owner = "client!fe", name = "K", descriptor = "[I") - public final int[] anIntArray318 = new int[10]; + public final int[] movementQueueX = new int[10]; @OriginalMember(owner = "client!fe", name = "B", descriptor = "I") public int anInt3360 = 0; @@ -269,39 +269,39 @@ public abstract class PathingEntity extends Entity { this.anInt3369 = -1; } if (!arg3) { - @Pc(32) int local32 = arg1 - this.anIntArray318[0]; - @Pc(40) int local40 = arg2 - this.anIntArray317[0]; + @Pc(32) int local32 = arg1 - this.movementQueueX[0]; + @Pc(40) int local40 = arg2 - this.movementQueueZ[0]; if (local32 >= -8 && local32 <= 8 && local40 >= -8 && local40 <= 8) { if (this.anInt3409 < 9) { this.anInt3409++; } for (@Pc(72) int local72 = this.anInt3409; local72 > 0; local72--) { - this.anIntArray318[local72] = this.anIntArray318[local72 - 1]; - this.anIntArray317[local72] = this.anIntArray317[local72 - 1]; + this.movementQueueX[local72] = this.movementQueueX[local72 - 1]; + this.movementQueueZ[local72] = this.movementQueueZ[local72 - 1]; this.aByteArray48[local72] = this.aByteArray48[local72 - 1]; } this.aByteArray48[0] = 1; - this.anIntArray318[0] = arg1; - this.anIntArray317[0] = arg2; + this.movementQueueX[0] = arg1; + this.movementQueueZ[0] = arg2; return; } } this.anInt3417 = 0; - this.anIntArray318[0] = arg1; - this.anIntArray317[0] = arg2; + this.movementQueueX[0] = arg1; + this.movementQueueZ[0] = arg2; this.anInt3409 = 0; this.anInt3405 = 0; - this.anInt3421 = arg0 * 64 + this.anIntArray317[0] * 128; - this.anInt3412 = arg0 * 64 + this.anIntArray318[0] * 128; - if (Static239.aBoolean269 && Static173.aClass8_Sub4_Sub1_2 == this) { + this.anInt3421 = arg0 * 64 + this.movementQueueZ[0] * 128; + this.anInt3412 = arg0 * 64 + this.movementQueueX[0] * 128; + if (Static239.aBoolean269 && Static173.self == this) { Static86.method1799(); } } @OriginalMember(owner = "client!fe", name = "a", descriptor = "(IBI)V") public final void method2684(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - @Pc(10) int local10 = this.anIntArray318[0]; - @Pc(15) int local15 = this.anIntArray317[0]; + @Pc(10) int local10 = this.movementQueueX[0]; + @Pc(15) int local15 = this.movementQueueZ[0]; if (arg1 == 0) { local10--; local15++; @@ -313,8 +313,8 @@ public abstract class PathingEntity extends Entity { this.anInt3409++; } for (@Pc(50) int local50 = this.anInt3409; local50 > 0; local50--) { - this.anIntArray318[local50] = this.anIntArray318[local50 - 1]; - this.anIntArray317[local50] = this.anIntArray317[local50 - 1]; + this.movementQueueX[local50] = this.movementQueueX[local50 - 1]; + this.movementQueueZ[local50] = this.movementQueueZ[local50 - 1]; this.aByteArray48[local50] = this.aByteArray48[local50 - 1]; } if (arg1 == 1) { @@ -342,8 +342,8 @@ public abstract class PathingEntity extends Entity { local15--; local10++; } - this.anIntArray318[0] = local10; - this.anIntArray317[0] = local15; + this.movementQueueX[0] = local10; + this.movementQueueZ[0] = local15; } @OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V") @@ -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 = Static207.method3685(Static55.anInt1735, local75 + this.anInt3412, this.anInt3421 + local64); + @Pc(87) int local87 = Static207.method3685(Static55.level, local75 + this.anInt3412, this.anInt3421 + 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 = Static207.method3685(Static55.anInt1735, local106 + this.anInt3412, this.anInt3421 - -local121); + @Pc(134) int local134 = Static207.method3685(Static55.level, local106 + this.anInt3412, this.anInt3421 - -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 = Static207.method3685(Static55.anInt1735, this.anInt3412 + local169, local150 + this.anInt3421); + @Pc(201) int local201 = Static207.method3685(Static55.level, this.anInt3412 + local169, local150 + this.anInt3421); @Pc(212) int local212 = local134 > local87 ? local87 : local134; - @Pc(224) int local224 = Static207.method3685(Static55.anInt1735, local189 + this.anInt3412, local179 + this.anInt3421); + @Pc(224) int local224 = Static207.method3685(Static55.level, local189 + this.anInt3412, local179 + this.anInt3421); @Pc(231) int local231 = local224 > local201 ? local201 : local224; @Pc(238) int local238 = local224 > local134 ? local134 : local224; @Pc(245) int local245 = local201 <= local87 ? local201 : local87; diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java index 041dba7..c80d3c5 100644 --- a/client/src/main/java/Player.java +++ b/client/src/main/java/Player.java @@ -157,8 +157,8 @@ public final class Player extends PathingEntity { local175 = this.aClass59_1.anInt2492; this.aClass59_1.method1950(local197, local22, local26 == 1, local44, this.anInt3365); if (local175 != local22) { - this.anInt3412 = this.anIntArray318[0] * 128 + this.method2693() * 64; - this.anInt3421 = this.anIntArray317[0] * 128 + this.method2693() * 64; + this.anInt3412 = this.movementQueueX[0] * 128 + this.method2693() * 64; + this.anInt3421 = this.movementQueueZ[0] * 128 + this.method2693() * 64; } if (this.aClass47_Sub1_5 != null) { this.aClass47_Sub1_5.method1646(); @@ -209,7 +209,7 @@ public final class Player extends PathingEntity { local184.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null); } } - if (Static173.aClass8_Sub4_Sub1_2 == this) { + if (Static173.self == this) { for (local102 = Static143.aClass102Array1.length - 1; local102 >= 0; local102--) { @Pc(245) Class102 local245 = Static143.aClass102Array1[local102]; if (local245 != null && local245.anInt4052 != -1) { @@ -218,21 +218,21 @@ public final class Player extends PathingEntity { if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.aClass8_Sub4_Sub2Array1.length > local245.anInt4057) { @Pc(278) Npc local278 = Static175.aClass8_Sub4_Sub2Array1[local245.anInt4057]; if (local278 != null) { - local291 = local278.anInt3412 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; - local302 = local278.anInt3421 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + local291 = local278.anInt3412 / 32 - Static173.self.anInt3412 / 32; + local302 = local278.anInt3421 / 32 - Static173.self.anInt3421 / 32; this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6); } } if (local245.anInt4058 == 2) { - @Pc(340) int local340 = (local245.anInt4053 - Static225.anInt5068) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; - local291 = (local245.anInt4046 - Static142.anInt3483) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + @Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32; + local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - Static173.self.anInt3421 / 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.aClass8_Sub4_Sub1Array1.length > local245.anInt4057) { @Pc(395) Player local395 = Static159.aClass8_Sub4_Sub1Array1[local245.anInt4057]; if (local395 != null) { - local291 = local395.anInt3412 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; - local302 = local395.anInt3421 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + local291 = local395.anInt3412 / 32 - Static173.self.anInt3412 / 32; + local302 = local395.anInt3421 / 32 - Static173.self.anInt3421 / 32; this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6); } } diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java index 21de2b7..faaa045 100644 --- a/client/src/main/java/Static10.java +++ b/client/src/main/java/Static10.java @@ -26,9 +26,9 @@ public final class Static10 { @OriginalMember(owner = "client!an", name = "a", descriptor = "(BI)I") public static int method347(@OriginalArg(1) int arg0) { - if (Static124.aClass95_2 != null) { - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + if (Static124.socket != null) { + Static124.socket.method2834(); + Static124.socket = null; } Static127.anInt3132++; if (Static127.anInt3132 > 4) { @@ -72,14 +72,14 @@ public final class Static10 { } @OriginalMember(owner = "client!an", name = "h", descriptor = "(I)Z") - public static boolean method349() { + 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 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028 + "," + (Static225.anInt5068 + Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]) + "," + (Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] + Static142.anInt3483) + " - "; + @Pc(61) String local61 = "T2 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028 + "," + (Static225.originX + Static173.self.movementQueueX[0]) + "," + (Static173.self.movementQueueZ[0] + Static142.originZ) + " - "; for (@Pc(63) int local63 = 0; local63 < Static223.anInt5028 && local63 < 50; local63++) { local61 = local61 + Static57.aClass3_Sub15_Sub1_3.data[local63] + ","; } diff --git a/client/src/main/java/Static102.java b/client/src/main/java/Static102.java index 9bdd99b..18deb29 100644 --- a/client/src/main/java/Static102.java +++ b/client/src/main/java/Static102.java @@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static102 { @OriginalMember(owner = "client!hn", name = "Z", descriptor = "I") - public static int anInt2681; + public static int keyCode; @OriginalMember(owner = "client!hn", name = "K", descriptor = "Ljava/util/Calendar;") public static final Calendar aCalendar2 = Calendar.getInstance(); @@ -65,12 +65,12 @@ public final class Static102 { @OriginalMember(owner = "client!hn", name = "a", descriptor = "(IIIZIIIIIIII)Z") public static boolean method2075(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10) { - if (Static173.aClass8_Sub4_Sub1_2.method2693() == 2) { + if (Static173.self.method2693() == 2) { return Static2.method8(arg6, arg7, arg4, arg0, arg9, arg3, arg2, arg1, arg5, arg8, arg10); - } else if (Static173.aClass8_Sub4_Sub1_2.method2693() <= 2) { + } else if (Static173.self.method2693() <= 2) { return Static45.method1171(arg5, arg4, arg10, arg9, arg8, arg2, arg1, arg3, arg7, arg0, arg6); } else { - return Static96.method1955(arg9, arg6, arg8, arg1, Static173.aClass8_Sub4_Sub1_2.method2693(), arg5, arg7, arg4, arg10, arg2, arg3, arg0); + return Static96.method1955(arg9, arg6, arg8, arg1, Static173.self.method2693(), arg5, arg7, arg4, arg10, arg2, arg3, arg0); } } } diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java index 56f38e0..03efce9 100644 --- a/client/src/main/java/Static103.java +++ b/client/src/main/java/Static103.java @@ -38,86 +38,86 @@ public final class Static103 { if (local23 == 31) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static70.anInt2013 = 2; - Static17.anInt577 = 0; - Static122.anInt3047 = Static7.anInt985; - Static25.anInt826 = Static60.anInt1893; - Static6.aClass3_Sub15_Sub1_1.method2242(71); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static70.type = 2; + Static17.milliseconds = 0; + Static122.x = Static7.clickX; + Static25.y = Static60.clickY; + Static6.outboundBuffer.p1isaac(71); + Static6.outboundBuffer.p2leadd(local36); } } if (local23 == 46) { Static233.method4003(local31, local19, local15); - Static6.aClass3_Sub15_Sub1_1.method2242(247); - Static6.aClass3_Sub15_Sub1_1.p2le(Static142.anInt3483 + local19); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.p2(Integer.MAX_VALUE & (int) (local31 >>> 32)); + Static6.outboundBuffer.p1isaac(247); + Static6.outboundBuffer.p2le(Static142.originZ + local19); + Static6.outboundBuffer.p2leadd(local15 + Static225.originX); + Static6.outboundBuffer.p2(Integer.MAX_VALUE & (int) (local31 >>> 32)); } if (local23 == 40) { - Static6.aClass3_Sub15_Sub1_1.method2242(27); - Static6.aClass3_Sub15_Sub1_1.p2(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.p4le2(local19); - Static6.aClass3_Sub15_Sub1_1.p2le(local15); - Static6.aClass3_Sub15_Sub1_1.p4le2(Static224.anInt5062); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static274.anInt4997); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static6.outboundBuffer.p1isaac(27); + Static6.outboundBuffer.p2(Static185.anInt4370); + Static6.outboundBuffer.p4le2(local19); + Static6.outboundBuffer.p2le(local15); + Static6.outboundBuffer.p4le2(Static224.anInt5062); + Static6.outboundBuffer.p2leadd(Static274.anInt4997); + Static6.outboundBuffer.p2leadd(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } @Pc(192) Npc local192; if (local23 == 19) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; if (local192 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local192.anIntArray318[0], 1, 0, 2, local192.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static122.anInt3047 = Static7.anInt985; - Static70.anInt2013 = 2; - Static17.anInt577 = 0; - Static25.anInt826 = Static60.anInt1893; - Static6.aClass3_Sub15_Sub1_1.method2242(30); - Static6.aClass3_Sub15_Sub1_1.p2(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static122.x = Static7.clickX; + Static70.type = 2; + Static17.milliseconds = 0; + Static25.y = Static60.clickY; + Static6.outboundBuffer.p1isaac(30); + Static6.outboundBuffer.p2(local36); } } if (local23 == 17) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; if (local192 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local192.anIntArray318[0], 1, 0, 2, local192.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static122.anInt3047 = Static7.anInt985; - Static17.anInt577 = 0; - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static6.aClass3_Sub15_Sub1_1.method2242(78); - Static6.aClass3_Sub15_Sub1_1.p2le(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static122.x = Static7.clickX; + Static17.milliseconds = 0; + Static70.type = 2; + Static25.y = Static60.clickY; + Static6.outboundBuffer.p1isaac(78); + Static6.outboundBuffer.p2le(local36); } } if (local23 == 44) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static122.anInt3047 = Static7.anInt985; - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static17.anInt577 = 0; - Static6.aClass3_Sub15_Sub1_1.method2242(133); - Static6.aClass3_Sub15_Sub1_1.p2le(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static122.x = Static7.clickX; + Static70.type = 2; + Static25.y = Static60.clickY; + Static17.milliseconds = 0; + Static6.outboundBuffer.p1isaac(133); + Static6.outboundBuffer.p2le(local36); } } if (local23 == 58) { - Static6.aClass3_Sub15_Sub1_1.method2242(135); - Static6.aClass3_Sub15_Sub1_1.p2add(local36); - Static6.aClass3_Sub15_Sub1_1.p2add(local15); - Static6.aClass3_Sub15_Sub1_1.p4me(local19); + Static6.outboundBuffer.p1isaac(135); + Static6.outboundBuffer.p2add(local36); + Static6.outboundBuffer.p2add(local15); + Static6.outboundBuffer.p4me(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 42) { Static233.method4003(local31, local19, local15); - Static6.aClass3_Sub15_Sub1_1.method2242(254); - Static6.aClass3_Sub15_Sub1_1.p2le(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); - Static6.aClass3_Sub15_Sub1_1.p2(local19 + Static142.anInt3483); + Static6.outboundBuffer.p1isaac(254); + Static6.outboundBuffer.p2le(local15 + Static225.originX); + Static6.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); + Static6.outboundBuffer.p2(local19 + Static142.originZ); } if (local23 == 28) { Static153.method2909(); @@ -125,90 +125,90 @@ public final class Static103 { if (local23 == 45) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; if (local192 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local192.anIntArray318[0], 1, 0, 2, local192.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static122.anInt3047 = Static7.anInt985; - Static70.anInt2013 = 2; - Static17.anInt577 = 0; - Static25.anInt826 = Static60.anInt1893; - Static6.aClass3_Sub15_Sub1_1.method2242(239); - Static6.aClass3_Sub15_Sub1_1.p4le2(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.p2add(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static122.x = Static7.clickX; + Static70.type = 2; + Static17.milliseconds = 0; + Static25.y = Static60.clickY; + Static6.outboundBuffer.p1isaac(239); + Static6.outboundBuffer.p4le2(Static98.anInt2512); + Static6.outboundBuffer.p2add(Static15.anInt506); + Static6.outboundBuffer.p2leadd(local36); } } @Pc(560) boolean local560; if (local23 == 18) { if (Static266.game == 1) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } } - Static122.anInt3047 = Static7.anInt985; - Static17.anInt577 = 0; - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static6.aClass3_Sub15_Sub1_1.method2242(66); - Static6.aClass3_Sub15_Sub1_1.p2le(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.p2(local36); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local19 + Static142.anInt3483); + Static122.x = Static7.clickX; + Static17.milliseconds = 0; + Static70.type = 2; + Static25.y = Static60.clickY; + Static6.outboundBuffer.p1isaac(66); + Static6.outboundBuffer.p2le(Static225.originX + local15); + Static6.outboundBuffer.p2(local36); + Static6.outboundBuffer.p2leadd(local19 + Static142.originZ); } if (local23 == 1001) { Static233.method4003(local31, local19, local15); - Static6.aClass3_Sub15_Sub1_1.method2242(170); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local19 + Static142.anInt3483); + Static6.outboundBuffer.p1isaac(170); + Static6.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); + Static6.outboundBuffer.p2leadd(local15 + Static225.originX); + Static6.outboundBuffer.p2leadd(local19 + Static142.originZ); } if (local23 == 1002) { - Static70.anInt2013 = 2; - Static122.anInt3047 = Static7.anInt985; - Static25.anInt826 = Static60.anInt1893; - Static17.anInt577 = 0; - Static6.aClass3_Sub15_Sub1_1.method2242(92); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static70.type = 2; + Static122.x = Static7.clickX; + Static25.y = Static60.clickY; + Static17.milliseconds = 0; + Static6.outboundBuffer.p1isaac(92); + Static6.outboundBuffer.p2leadd(local36); } @Pc(693) Component local693; if (local23 == 1006) { - local693 = Static5.method32(local19); - if (local693 == null || local693.anIntArray50[local15] < 100000) { - Static6.aClass3_Sub15_Sub1_1.method2242(92); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + local693 = Static5.getComponent(local19); + if (local693 == null || local693.objCounts[local15] < 100000) { + Static6.outboundBuffer.p1isaac(92); + Static6.outboundBuffer.p2leadd(local36); } else { - method2231(Static186.aClass100_827, 0, Static34.method882(new JagString[] { Static123.method2423(local693.anIntArray50[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 })); + method2231(Static186.aClass100_827, 0, Static34.method882(new JagString[] { Static123.method2423(local693.objCounts[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 })); } Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 60) { if (local36 == 0) { - Static113.method3556(Static55.anInt1735, local15, local19); + Static113.method3556(Static55.level, local15, local19); } else if (local36 == 1) { - if (Static191.anInt4502 > 0 && Static187.aBooleanArray101[82] && Static187.aBooleanArray101[81]) { - Static61.method1454(Static225.anInt5068 + local15, Static142.anInt3483 + local19, Static55.anInt1735); - } else if (Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, true, 0, local15, 0, 0, 1, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0])) { - Static6.aClass3_Sub15_Sub1_1.p1(Static1.anInt5); - Static6.aClass3_Sub15_Sub1_1.p1(Static107.anInt2878); - Static6.aClass3_Sub15_Sub1_1.p2(Static57.anInt1747); - Static6.aClass3_Sub15_Sub1_1.p1(57); - Static6.aClass3_Sub15_Sub1_1.p1(Static59.anInt1814); - Static6.aClass3_Sub15_Sub1_1.p1(Static273.anInt4130); - Static6.aClass3_Sub15_Sub1_1.p1(89); - Static6.aClass3_Sub15_Sub1_1.p2(Static173.aClass8_Sub4_Sub1_2.anInt3412); - Static6.aClass3_Sub15_Sub1_1.p2(Static173.aClass8_Sub4_Sub1_2.anInt3421); - Static6.aClass3_Sub15_Sub1_1.p1(Static221.anInt4364); - Static6.aClass3_Sub15_Sub1_1.p1(63); + if (Static191.staffModLevel > 0 && Static187.pressedKeys[82] && Static187.pressedKeys[81]) { + Static61.teleport(Static225.originX + local15, Static142.originZ + local19, Static55.level); + } else if (Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, Static173.self.movementQueueX[0])) { + Static6.outboundBuffer.p1(Static1.anInt5); + Static6.outboundBuffer.p1(Static107.anInt2878); + Static6.outboundBuffer.p2(Static57.anInt1747); + Static6.outboundBuffer.p1(57); + Static6.outboundBuffer.p1(Static59.anInt1814); + Static6.outboundBuffer.p1(Static273.anInt4130); + Static6.outboundBuffer.p1(89); + Static6.outboundBuffer.p2(Static173.self.anInt3412); + Static6.outboundBuffer.p2(Static173.self.anInt3421); + Static6.outboundBuffer.p1(Static221.anInt4364); + Static6.outboundBuffer.p1(63); } } } if (local23 == 1007) { - Static17.anInt577 = 0; - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static122.anInt3047 = Static7.anInt985; + Static17.milliseconds = 0; + Static70.type = 2; + Static25.y = Static60.clickY; + Static122.x = Static7.clickX; local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; if (local192 != null) { @Pc(884) NpcType local884 = local192.aClass96_1; @@ -216,41 +216,41 @@ public final class Static103 { local884 = local884.method2932(); } if (local884 != null) { - Static6.aClass3_Sub15_Sub1_1.method2242(72); - Static6.aClass3_Sub15_Sub1_1.p2(local884.anInt3741); + Static6.outboundBuffer.p1isaac(72); + Static6.outboundBuffer.p2(local884.anInt3741); } } } if (local23 == 47) { - Static6.aClass3_Sub15_Sub1_1.method2242(156); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local15); - Static6.aClass3_Sub15_Sub1_1.p2add(local36); - Static6.aClass3_Sub15_Sub1_1.p4le2(local19); + Static6.outboundBuffer.p1isaac(156); + Static6.outboundBuffer.p2leadd(local15); + Static6.outboundBuffer.p2add(local36); + Static6.outboundBuffer.p4le2(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 3) { - Static6.aClass3_Sub15_Sub1_1.method2242(253); - Static6.aClass3_Sub15_Sub1_1.p4le2(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local15); - Static6.aClass3_Sub15_Sub1_1.p4le2(local19); - Static6.aClass3_Sub15_Sub1_1.p2add(local36); - Static6.aClass3_Sub15_Sub1_1.p2le(Static15.anInt506); + Static6.outboundBuffer.p1isaac(253); + Static6.outboundBuffer.p4le2(Static98.anInt2512); + Static6.outboundBuffer.p2leadd(local15); + Static6.outboundBuffer.p4le2(local19); + Static6.outboundBuffer.p2add(local36); + Static6.outboundBuffer.p2le(Static15.anInt506); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 10) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static122.anInt3047 = Static7.anInt985; - Static17.anInt577 = 0; - Static6.aClass3_Sub15_Sub1_1.method2242(4); - Static6.aClass3_Sub15_Sub1_1.p2le(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static70.type = 2; + Static25.y = Static60.clickY; + Static122.x = Static7.clickX; + Static17.milliseconds = 0; + Static6.outboundBuffer.p1isaac(4); + Static6.outboundBuffer.p2le(local36); } } if (local23 == 41 && Static39.aClass13_10 == null) { @@ -260,81 +260,81 @@ public final class Static103 { } if (local23 == 49) { Static233.method4003(local31, local19, local15); - Static6.aClass3_Sub15_Sub1_1.method2242(84); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static142.anInt3483 + local19); - Static6.aClass3_Sub15_Sub1_1.p2le(local15 + Static225.anInt5068); + Static6.outboundBuffer.p1isaac(84); + Static6.outboundBuffer.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); + Static6.outboundBuffer.p2leadd(Static142.originZ + local19); + Static6.outboundBuffer.p2le(local15 + Static225.originX); } if (local23 == 23) { - Static6.aClass3_Sub15_Sub1_1.method2242(206); - Static6.aClass3_Sub15_Sub1_1.p2add(local36); - Static6.aClass3_Sub15_Sub1_1.p2le(local15); - Static6.aClass3_Sub15_Sub1_1.p4le2(local19); + Static6.outboundBuffer.p1isaac(206); + Static6.outboundBuffer.p2add(local36); + Static6.outboundBuffer.p2le(local15); + Static6.outboundBuffer.p4le2(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 14 && Static233.method4003(local31, local19, local15)) { - Static6.aClass3_Sub15_Sub1_1.method2242(134); - Static6.aClass3_Sub15_Sub1_1.p2add(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.p2(Static274.anInt4997); - Static6.aClass3_Sub15_Sub1_1.p2le(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.p2(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.p4me(Static224.anInt5062); - Static6.aClass3_Sub15_Sub1_1.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); + Static6.outboundBuffer.p1isaac(134); + Static6.outboundBuffer.p2add(Static225.originX + local15); + Static6.outboundBuffer.p2(Static274.anInt4997); + Static6.outboundBuffer.p2le(local19 + Static142.originZ); + Static6.outboundBuffer.p2(Static185.anInt4370); + Static6.outboundBuffer.p4me(Static224.anInt5062); + Static6.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 37) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static17.anInt577 = 0; - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static122.anInt3047 = Static7.anInt985; - Static6.aClass3_Sub15_Sub1_1.method2242(114); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static17.milliseconds = 0; + Static70.type = 2; + Static25.y = Static60.clickY; + Static122.x = Static7.clickX; + Static6.outboundBuffer.p1isaac(114); + Static6.outboundBuffer.p2leadd(local36); } } if (local23 == 9 || local23 == 1003) { Static263.method4512(Static233.aClass100Array160[arg0], local15, local36, local19); } if (local23 == 5) { - Static6.aClass3_Sub15_Sub1_1.method2242(55); - Static6.aClass3_Sub15_Sub1_1.p2le(local36); - Static6.aClass3_Sub15_Sub1_1.p2add(local15); - Static6.aClass3_Sub15_Sub1_1.p4rme(local19); + Static6.outboundBuffer.p1isaac(55); + Static6.outboundBuffer.p2le(local36); + Static6.outboundBuffer.p2add(local15); + Static6.outboundBuffer.p4rme(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 21) { if (Static266.game == 1) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } } - Static70.anInt2013 = 2; - Static122.anInt3047 = Static7.anInt985; - Static17.anInt577 = 0; - Static25.anInt826 = Static60.anInt1893; - Static6.aClass3_Sub15_Sub1_1.method2242(228); - Static6.aClass3_Sub15_Sub1_1.p2(local36); - Static6.aClass3_Sub15_Sub1_1.p2le(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static142.anInt3483 + local19); + Static70.type = 2; + Static122.x = Static7.clickX; + Static17.milliseconds = 0; + Static25.y = Static60.clickY; + Static6.outboundBuffer.p1isaac(228); + Static6.outboundBuffer.p2(local36); + Static6.outboundBuffer.p2le(Static225.originX + local15); + Static6.outboundBuffer.p2leadd(Static142.originZ + local19); } if (local23 == 4) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; if (local192 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local192.anIntArray318[0], 1, 0, 2, local192.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static70.anInt2013 = 2; - Static17.anInt577 = 0; - Static25.anInt826 = Static60.anInt1893; - Static122.anInt3047 = Static7.anInt985; - Static6.aClass3_Sub15_Sub1_1.method2242(148); - Static6.aClass3_Sub15_Sub1_1.p2add(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static70.type = 2; + Static17.milliseconds = 0; + Static25.y = Static60.clickY; + Static122.x = Static7.clickX; + Static6.outboundBuffer.p1isaac(148); + Static6.outboundBuffer.p2add(local36); } } if (local23 == 32) { @@ -359,82 +359,82 @@ public final class Static103 { if (local23 == 29) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static25.anInt826 = Static60.anInt1893; - Static17.anInt577 = 0; - Static70.anInt2013 = 2; - Static122.anInt3047 = Static7.anInt985; - Static6.aClass3_Sub15_Sub1_1.method2242(180); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static25.y = Static60.clickY; + Static17.milliseconds = 0; + Static70.type = 2; + Static122.x = Static7.clickX; + Static6.outboundBuffer.p1isaac(180); + Static6.outboundBuffer.p2leadd(local36); } } if (local23 == 35) { - Static6.aClass3_Sub15_Sub1_1.method2242(161); - Static6.aClass3_Sub15_Sub1_1.p4le2(local19); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local15); + Static6.outboundBuffer.p1isaac(161); + Static6.outboundBuffer.p4le2(local19); + Static6.outboundBuffer.p2leadd(local36); + Static6.outboundBuffer.p2leadd(local15); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 15) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static17.anInt577 = 0; - Static70.anInt2013 = 2; - Static122.anInt3047 = Static7.anInt985; - Static25.anInt826 = Static60.anInt1893; - Static6.aClass3_Sub15_Sub1_1.method2242(195); - Static6.aClass3_Sub15_Sub1_1.p2add(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.p4le2(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static17.milliseconds = 0; + Static70.type = 2; + Static122.x = Static7.clickX; + Static25.y = Static60.clickY; + Static6.outboundBuffer.p1isaac(195); + Static6.outboundBuffer.p2add(Static15.anInt506); + Static6.outboundBuffer.p4le2(Static98.anInt2512); + Static6.outboundBuffer.p2leadd(local36); } } if (local23 == 34) { if (Static266.game == 1) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } } - Static122.anInt3047 = Static7.anInt985; - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static17.anInt577 = 0; - Static6.aClass3_Sub15_Sub1_1.method2242(109); - Static6.aClass3_Sub15_Sub1_1.p2le(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.p2(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static122.x = Static7.clickX; + Static70.type = 2; + Static25.y = Static60.clickY; + Static17.milliseconds = 0; + Static6.outboundBuffer.p1isaac(109); + Static6.outboundBuffer.p2le(local19 + Static142.originZ); + Static6.outboundBuffer.p2(local15 + Static225.originX); + Static6.outboundBuffer.p2leadd(local36); } if (local23 == 25) { - Static6.aClass3_Sub15_Sub1_1.method2242(81); - Static6.aClass3_Sub15_Sub1_1.p2add(local15); - Static6.aClass3_Sub15_Sub1_1.p2(local36); - Static6.aClass3_Sub15_Sub1_1.p4rme(local19); + Static6.outboundBuffer.p1isaac(81); + Static6.outboundBuffer.p2add(local15); + Static6.outboundBuffer.p2(local36); + Static6.outboundBuffer.p4rme(local19); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 2) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; if (local192 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local192.anIntArray318[0], 1, 0, 2, local192.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static25.anInt826 = Static60.anInt1893; - Static70.anInt2013 = 2; - Static122.anInt3047 = Static7.anInt985; - Static17.anInt577 = 0; - Static6.aClass3_Sub15_Sub1_1.method2242(218); - Static6.aClass3_Sub15_Sub1_1.p2le(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static25.y = Static60.clickY; + Static70.type = 2; + Static122.x = Static7.clickX; + Static17.milliseconds = 0; + Static6.outboundBuffer.p1isaac(218); + Static6.outboundBuffer.p2le(local36); } } @Pc(1955) int local1955; if (local23 == 51) { - Static6.aClass3_Sub15_Sub1_1.method2242(10); - Static6.aClass3_Sub15_Sub1_1.p4(local19); - local693 = Static5.method32(local19); + Static6.outboundBuffer.p1isaac(10); + Static6.outboundBuffer.p4(local19); + local693 = Static5.getComponent(local19); if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { local1955 = local693.anIntArrayArray4[0][1]; if (Static7.anIntArray75[local1955] != local693.anIntArray48[0]) { @@ -446,22 +446,22 @@ public final class Static103 { if (local23 == 26) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; if (local192 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local192.anIntArray318[0], 1, 0, 2, local192.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static70.anInt2013 = 2; - Static17.anInt577 = 0; - Static25.anInt826 = Static60.anInt1893; - Static122.anInt3047 = Static7.anInt985; - Static6.aClass3_Sub15_Sub1_1.method2242(115); - Static6.aClass3_Sub15_Sub1_1.p4me(Static224.anInt5062); - Static6.aClass3_Sub15_Sub1_1.p2le(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.p2le(local36); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static274.anInt4997); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static70.type = 2; + Static17.milliseconds = 0; + Static25.y = Static60.clickY; + Static122.x = Static7.clickX; + Static6.outboundBuffer.p1isaac(115); + Static6.outboundBuffer.p4me(Static224.anInt5062); + Static6.outboundBuffer.p2le(Static185.anInt4370); + Static6.outboundBuffer.p2le(local36); + Static6.outboundBuffer.p2leadd(Static274.anInt4997); } } if (local23 == 59) { - Static6.aClass3_Sub15_Sub1_1.method2242(10); - Static6.aClass3_Sub15_Sub1_1.p4(local19); - local693 = Static5.method32(local19); + Static6.outboundBuffer.p1isaac(10); + Static6.outboundBuffer.p4(local19); + local693 = Static5.getComponent(local19); if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { local1955 = local693.anIntArrayArray4[0][1]; Static7.anIntArray75[local1955] = 1 - Static7.anIntArray75[local1955]; @@ -469,127 +469,127 @@ public final class Static103 { } } if (local23 == 33) { - local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } - Static122.anInt3047 = Static7.anInt985; - Static17.anInt577 = 0; - Static25.anInt826 = Static60.anInt1893; - Static70.anInt2013 = 2; - Static6.aClass3_Sub15_Sub1_1.method2242(101); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.p2le(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.p2le(Static274.anInt4997); - Static6.aClass3_Sub15_Sub1_1.p2le(local36); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static142.anInt3483 + local19); - Static6.aClass3_Sub15_Sub1_1.p4me(Static224.anInt5062); + Static122.x = Static7.clickX; + Static17.milliseconds = 0; + Static25.y = Static60.clickY; + Static70.type = 2; + Static6.outboundBuffer.p1isaac(101); + Static6.outboundBuffer.p2leadd(local15 + Static225.originX); + Static6.outboundBuffer.p2le(Static185.anInt4370); + Static6.outboundBuffer.p2le(Static274.anInt4997); + Static6.outboundBuffer.p2le(local36); + Static6.outboundBuffer.p2leadd(Static142.originZ + local19); + Static6.outboundBuffer.p4me(Static224.anInt5062); } if (local23 == 1004) { - Static17.anInt577 = 0; - Static122.anInt3047 = Static7.anInt985; - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static6.aClass3_Sub15_Sub1_1.method2242(94); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static17.milliseconds = 0; + Static122.x = Static7.clickX; + Static70.type = 2; + Static25.y = Static60.clickY; + Static6.outboundBuffer.p1isaac(94); + Static6.outboundBuffer.p2leadd(local36); } if (local23 == 11) { if (local36 == 0) { Static125.anInt3096 = 1; - Static113.method3556(Static55.anInt1735, local15, local19); + Static113.method3556(Static55.level, local15, local19); } else if (local36 == 1) { - Static6.aClass3_Sub15_Sub1_1.method2242(131); - Static6.aClass3_Sub15_Sub1_1.p4me(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.p2add(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.p2add(local19 + Static142.anInt3483); + Static6.outboundBuffer.p1isaac(131); + Static6.outboundBuffer.p4me(Static98.anInt2512); + Static6.outboundBuffer.p2add(Static225.originX + local15); + Static6.outboundBuffer.p2leadd(Static15.anInt506); + Static6.outboundBuffer.p2add(local19 + Static142.originZ); } } if (local23 == 8) { - local693 = Static5.method32(local19); + local693 = Static5.getComponent(local19); @Pc(2287) boolean local2287 = true; if (local693.anInt453 > 0) { local2287 = Static249.method4265(local693); } if (local2287) { - Static6.aClass3_Sub15_Sub1_1.method2242(10); - Static6.aClass3_Sub15_Sub1_1.p4(local19); + Static6.outboundBuffer.p1isaac(10); + Static6.outboundBuffer.p4(local19); } } if (local23 == 1) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static17.anInt577 = 0; - Static25.anInt826 = Static60.anInt1893; - Static70.anInt2013 = 2; - Static122.anInt3047 = Static7.anInt985; - Static6.aClass3_Sub15_Sub1_1.method2242(248); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); - Static6.aClass3_Sub15_Sub1_1.p2(Static274.anInt4997); - Static6.aClass3_Sub15_Sub1_1.p2(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.p4me(Static224.anInt5062); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static17.milliseconds = 0; + Static25.y = Static60.clickY; + Static70.type = 2; + Static122.x = Static7.clickX; + Static6.outboundBuffer.p1isaac(248); + Static6.outboundBuffer.p2leadd(local36); + Static6.outboundBuffer.p2(Static274.anInt4997); + Static6.outboundBuffer.p2(Static185.anInt4370); + Static6.outboundBuffer.p4me(Static224.anInt5062); } } if (local23 == 7) { - Static6.aClass3_Sub15_Sub1_1.method2242(85); - Static6.aClass3_Sub15_Sub1_1.p4rme(local19); - Static6.aClass3_Sub15_Sub1_1.p2(local15); - Static6.aClass3_Sub15_Sub1_1.p2add(local36); + Static6.outboundBuffer.p1isaac(85); + Static6.outboundBuffer.p4rme(local19); + Static6.outboundBuffer.p2(local15); + Static6.outboundBuffer.p2add(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 24) { if (Static266.game == 1) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } } - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static122.anInt3047 = Static7.anInt985; - Static17.anInt577 = 0; - Static6.aClass3_Sub15_Sub1_1.method2242(48); - Static6.aClass3_Sub15_Sub1_1.p2add(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); - Static6.aClass3_Sub15_Sub1_1.p2le(Static142.anInt3483 + local19); + Static70.type = 2; + Static25.y = Static60.clickY; + Static122.x = Static7.clickX; + Static17.milliseconds = 0; + Static6.outboundBuffer.p1isaac(48); + Static6.outboundBuffer.p2add(local15 + Static225.originX); + Static6.outboundBuffer.p2leadd(local36); + Static6.outboundBuffer.p2le(Static142.originZ + local19); } if (local23 == 38 && Static233.method4003(local31, local19, local15)) { - Static6.aClass3_Sub15_Sub1_1.method2242(233); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.p2add(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.p4rme(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); + Static6.outboundBuffer.p1isaac(233); + Static6.outboundBuffer.p2leadd(local19 + Static142.originZ); + Static6.outboundBuffer.p2add(Static225.originX + local15); + Static6.outboundBuffer.p2leadd(Static15.anInt506); + Static6.outboundBuffer.p4rme(Static98.anInt2512); + Static6.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 13) { - Static6.aClass3_Sub15_Sub1_1.method2242(6); - Static6.aClass3_Sub15_Sub1_1.p4(local19); - Static6.aClass3_Sub15_Sub1_1.p2add(local15); - Static6.aClass3_Sub15_Sub1_1.p2le(local36); + Static6.outboundBuffer.p1isaac(6); + Static6.outboundBuffer.p4(local19); + Static6.outboundBuffer.p2add(local15); + Static6.outboundBuffer.p2le(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 57) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static70.anInt2013 = 2; - Static25.anInt826 = Static60.anInt1893; - Static122.anInt3047 = Static7.anInt985; - Static17.anInt577 = 0; - Static6.aClass3_Sub15_Sub1_1.method2242(175); - Static6.aClass3_Sub15_Sub1_1.p2add(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static70.type = 2; + Static25.y = Static60.clickY; + Static122.x = Static7.clickX; + Static17.milliseconds = 0; + Static6.outboundBuffer.p1isaac(175); + Static6.outboundBuffer.p2add(local36); } } if (local23 == 22) { Static53.method1294(); - local693 = Static5.method32(local19); + local693 = Static5.getComponent(local19); Static224.anInt5062 = local19; Static185.anInt4370 = local15; Static260.anInt5014 = 1; @@ -603,121 +603,121 @@ public final class Static103 { } if (local23 == 50) { Static233.method4003(local31, local19, local15); - Static6.aClass3_Sub15_Sub1_1.method2242(194); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.p2le(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.p2((int) (local31 >>> 32) & Integer.MAX_VALUE); + Static6.outboundBuffer.p1isaac(194); + Static6.outboundBuffer.p2leadd(local19 + Static142.originZ); + Static6.outboundBuffer.p2le(Static225.originX + local15); + Static6.outboundBuffer.p2((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 48) { - Static6.aClass3_Sub15_Sub1_1.method2242(154); - Static6.aClass3_Sub15_Sub1_1.p2le(local15); - Static6.aClass3_Sub15_Sub1_1.p4rme(local19); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static6.outboundBuffer.p1isaac(154); + Static6.outboundBuffer.p2le(local15); + Static6.outboundBuffer.p4rme(local19); + Static6.outboundBuffer.p2leadd(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 30) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static17.anInt577 = 0; - Static122.anInt3047 = Static7.anInt985; - Static25.anInt826 = Static60.anInt1893; - Static70.anInt2013 = 2; - Static6.aClass3_Sub15_Sub1_1.method2242(68); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static17.milliseconds = 0; + Static122.x = Static7.clickX; + Static25.y = Static60.clickY; + Static70.type = 2; + Static6.outboundBuffer.p1isaac(68); + Static6.outboundBuffer.p2leadd(local36); } } if (local23 == 43) { - Static6.aClass3_Sub15_Sub1_1.method2242(153); - Static6.aClass3_Sub15_Sub1_1.p4le2(local19); - Static6.aClass3_Sub15_Sub1_1.p2le(local15); - Static6.aClass3_Sub15_Sub1_1.p2le(local36); + Static6.outboundBuffer.p1isaac(153); + Static6.outboundBuffer.p4le2(local19); + Static6.outboundBuffer.p2le(local15); + Static6.outboundBuffer.p2le(local36); Static72.anInt2043 = 0; - Static257.aClass13_7 = Static5.method32(local19); + Static257.aClass13_7 = Static5.getComponent(local19); Static250.anInt5444 = local15; } if (local23 == 39) { - local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } - Static25.anInt826 = Static60.anInt1893; - Static122.anInt3047 = Static7.anInt985; - Static70.anInt2013 = 2; - Static17.anInt577 = 0; - Static6.aClass3_Sub15_Sub1_1.method2242(73); - Static6.aClass3_Sub15_Sub1_1.p4rme(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.p2(Static142.anInt3483 + local19); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.p2le(Static15.anInt506); + Static25.y = Static60.clickY; + Static122.x = Static7.clickX; + Static70.type = 2; + Static17.milliseconds = 0; + Static6.outboundBuffer.p1isaac(73); + Static6.outboundBuffer.p4rme(Static98.anInt2512); + Static6.outboundBuffer.p2(Static142.originZ + local19); + Static6.outboundBuffer.p2leadd(local36); + Static6.outboundBuffer.p2leadd(local15 + Static225.originX); + Static6.outboundBuffer.p2le(Static15.anInt506); } if (local23 == 12) { - Static6.aClass3_Sub15_Sub1_1.method2242(82); - Static6.aClass3_Sub15_Sub1_1.p2(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.p4rme(local19); - Static6.aClass3_Sub15_Sub1_1.p4(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local15); + Static6.outboundBuffer.p1isaac(82); + Static6.outboundBuffer.p2(Static15.anInt506); + Static6.outboundBuffer.p4rme(local19); + Static6.outboundBuffer.p4(Static98.anInt2512); + Static6.outboundBuffer.p2leadd(local15); } if (local23 == 36) { if (local36 == 0) { Static187.anInt4422 = 1; - Static113.method3556(Static55.anInt1735, local15, local19); - } else if (Static191.anInt4502 > 0 && Static187.aBooleanArray101[82] && Static187.aBooleanArray101[81]) { - Static61.method1454(local15 + Static225.anInt5068, Static142.anInt3483 - -local19, Static55.anInt1735); + Static113.method3556(Static55.level, local15, local19); + } else if (Static191.staffModLevel > 0 && Static187.pressedKeys[82] && Static187.pressedKeys[81]) { + Static61.teleport(local15 + Static225.originX, Static142.originZ - -local19, Static55.level); } else { - Static6.aClass3_Sub15_Sub1_1.method2242(179); - Static6.aClass3_Sub15_Sub1_1.p2(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.p2(local15 + Static225.anInt5068); + Static6.outboundBuffer.p1isaac(179); + Static6.outboundBuffer.p2(local19 + Static142.originZ); + Static6.outboundBuffer.p2(local15 + Static225.originX); } } if (local23 == 6) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; if (local43 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local43.anIntArray318[0], 1, 0, 2, local43.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static25.anInt826 = Static60.anInt1893; - Static17.anInt577 = 0; - Static70.anInt2013 = 2; - Static122.anInt3047 = Static7.anInt985; - Static6.aClass3_Sub15_Sub1_1.method2242(106); - Static6.aClass3_Sub15_Sub1_1.p2(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static25.y = Static60.clickY; + Static17.milliseconds = 0; + Static70.type = 2; + Static122.x = Static7.clickX; + Static6.outboundBuffer.p1isaac(106); + Static6.outboundBuffer.p2(local36); } } if (local23 == 20) { if (Static266.game == 1) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } else { - local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + local560 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.self.movementQueueX[0]); if (!local560) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.self.movementQueueX[0]); } } - Static25.anInt826 = Static60.anInt1893; - Static17.anInt577 = 0; - Static122.anInt3047 = Static7.anInt985; - Static70.anInt2013 = 2; - Static6.aClass3_Sub15_Sub1_1.method2242(33); - Static6.aClass3_Sub15_Sub1_1.p2(local36); - Static6.aClass3_Sub15_Sub1_1.p2(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.p2le(Static142.anInt3483 + local19); + Static25.y = Static60.clickY; + Static17.milliseconds = 0; + Static122.x = Static7.clickX; + Static70.type = 2; + Static6.outboundBuffer.p1isaac(33); + Static6.outboundBuffer.p2(local36); + Static6.outboundBuffer.p2(Static225.originX + local15); + Static6.outboundBuffer.p2le(Static142.originZ + local19); } if (local23 == 16) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; if (local192 != null) { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local192.anIntArray318[0], 1, 0, 2, local192.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - Static122.anInt3047 = Static7.anInt985; - Static17.anInt577 = 0; - Static25.anInt826 = Static60.anInt1893; - Static70.anInt2013 = 2; - Static6.aClass3_Sub15_Sub1_1.method2242(3); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]); + Static122.x = Static7.clickX; + Static17.milliseconds = 0; + Static25.y = Static60.clickY; + Static70.type = 2; + Static6.outboundBuffer.p1isaac(3); + Static6.outboundBuffer.p2leadd(local36); } } if (Static260.anInt5014 != 0) { Static260.anInt5014 = 0; - Static43.method1143(Static5.method32(Static224.anInt5062)); + Static43.method1143(Static5.getComponent(Static224.anInt5062)); } if (Static241.aBoolean302) { Static53.method1294(); @@ -797,9 +797,9 @@ public final class Static103 { public static void method2245() { for (@Pc(6) Class3_Sub31 local6 = (Class3_Sub31) Static119.aClass133_9.method3859(); local6 != null; local6 = (Class3_Sub31) Static119.aClass133_9.method3861()) { @Pc(14) int local14 = local6.anInt5878; - if (Static245.method4225(local14)) { + if (Static245.load(local14)) { @Pc(21) boolean local21 = true; - @Pc(25) Component[] local25 = Static241.aClass13ArrayArray12[local14]; + @Pc(25) Component[] local25 = Static241.components[local14]; @Pc(27) int local27; for (local27 = 0; local27 < local25.length; local27++) { if (local25[local27] != null) { @@ -809,7 +809,7 @@ public final class Static103 { } if (!local21) { local27 = (int) local6.aLong192; - @Pc(60) Component local60 = Static5.method32(local27); + @Pc(60) Component local60 = Static5.getComponent(local27); if (local60 != null) { Static43.method1143(local60); } diff --git a/client/src/main/java/Static104.java b/client/src/main/java/Static104.java index fe3198b..25da4d8 100644 --- a/client/src/main/java/Static104.java +++ b/client/src/main/java/Static104.java @@ -28,8 +28,8 @@ public final class Static104 { } @Pc(79) int local79 = arg0.anInt3412; @Pc(82) int local82 = arg0.anInt3421; - @Pc(99) int local99 = arg0.anIntArray318[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64; - @Pc(116) int local116 = arg0.anIntArray317[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64; + @Pc(99) int local99 = arg0.movementQueueX[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64; + @Pc(116) int local116 = arg0.movementQueueZ[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64; if (local99 - local79 > 256 || local99 - local79 < -256 || local116 - local82 > 256 || local116 - local82 < -256) { arg0.anInt3412 = local99; arg0.anInt3421 = local116; diff --git a/client/src/main/java/Static109.java b/client/src/main/java/Static109.java index 57e9252..429d512 100644 --- a/client/src/main/java/Static109.java +++ b/client/src/main/java/Static109.java @@ -33,21 +33,21 @@ public final class Static109 { return; } Static202.aClass153_84.method4490(arg0); - if (Static241.aClass13ArrayArray12[arg0] == null) { + if (Static241.components[arg0] == null) { return; } @Pc(27) boolean local27 = true; - for (@Pc(29) int local29 = 0; local29 < Static241.aClass13ArrayArray12[arg0].length; local29++) { - if (Static241.aClass13ArrayArray12[arg0][local29] != null) { - if (Static241.aClass13ArrayArray12[arg0][local29].anInt452 == 2) { + for (@Pc(29) int local29 = 0; local29 < Static241.components[arg0].length; local29++) { + if (Static241.components[arg0][local29] != null) { + if (Static241.components[arg0][local29].anInt452 == 2) { local27 = false; } else { - Static241.aClass13ArrayArray12[arg0][local29] = null; + Static241.components[arg0][local29] = null; } } } if (local27) { - Static241.aClass13ArrayArray12[arg0] = null; + Static241.components[arg0] = null; } Static223.aBooleanArray115[arg0] = false; } diff --git a/client/src/main/java/Static111.java b/client/src/main/java/Static111.java index 124433a..6a61af6 100644 --- a/client/src/main/java/Static111.java +++ b/client/src/main/java/Static111.java @@ -24,44 +24,44 @@ public final class Static111 { @OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V") public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - if (arg0.aByte2 == 0) { - arg0.anInt469 = arg0.anInt444; - } else if (arg0.aByte2 == 1) { - arg0.anInt469 = (arg1 - arg0.anInt459) / 2 + arg0.anInt444; - } else if (arg0.aByte2 == 2) { - arg0.anInt469 = arg1 - arg0.anInt459 - arg0.anInt444; - } else if (arg0.aByte2 == 3) { - arg0.anInt469 = arg0.anInt444 * arg1 >> 14; - } else if (arg0.aByte2 == 4) { - arg0.anInt469 = (arg1 * arg0.anInt444 >> 14) + (arg1 - arg0.anInt459) / 2; + if (arg0.xMode == 0) { + arg0.y = arg0.baseY; + } else if (arg0.xMode == 1) { + arg0.y = (arg1 - arg0.anInt459) / 2 + arg0.baseY; + } else if (arg0.xMode == 2) { + arg0.y = arg1 - arg0.anInt459 - arg0.baseY; + } else if (arg0.xMode == 3) { + arg0.y = arg0.baseY * arg1 >> 14; + } else if (arg0.xMode == 4) { + arg0.y = (arg1 * arg0.baseY >> 14) + (arg1 - arg0.anInt459) / 2; } else { - arg0.anInt469 = arg1 - (arg1 * arg0.anInt444 >> 14) - arg0.anInt459; + arg0.y = arg1 - (arg1 * arg0.baseY >> 14) - arg0.anInt459; } - if (arg0.aByte4 == 0) { - arg0.anInt523 = arg0.anInt529; - } else if (arg0.aByte4 == 1) { - arg0.anInt523 = arg0.anInt529 + (arg2 - arg0.anInt445) / 2; - } else if (arg0.aByte4 == 2) { - arg0.anInt523 = arg2 - arg0.anInt529 - arg0.anInt445; - } else if (arg0.aByte4 == 3) { - arg0.anInt523 = arg0.anInt529 * arg2 >> 14; - } else if (arg0.aByte4 == 4) { - arg0.anInt523 = (arg0.anInt529 * arg2 >> 14) + (arg2 - arg0.anInt445) / 2; + if (arg0.yMode == 0) { + arg0.x = arg0.baseX; + } else if (arg0.yMode == 1) { + arg0.x = arg0.baseX + (arg2 - arg0.anInt445) / 2; + } else if (arg0.yMode == 2) { + arg0.x = arg2 - arg0.baseX - arg0.anInt445; + } else if (arg0.yMode == 3) { + arg0.x = arg0.baseX * arg2 >> 14; + } else if (arg0.yMode == 4) { + arg0.x = (arg0.baseX * arg2 >> 14) + (arg2 - arg0.anInt445) / 2; } else { - arg0.anInt523 = arg2 - (arg2 * arg0.anInt529 >> 14) - arg0.anInt445; + arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.anInt445; } if (!Static121.aBoolean154 || Static36.method940(arg0).anInt546 == 0 && arg0.anInt452 != 0) { return; } - if (arg0.anInt469 < 0) { - arg0.anInt469 = 0; - } else if (arg0.anInt459 + arg0.anInt469 > arg1) { - arg0.anInt469 = arg1 - arg0.anInt459; + if (arg0.y < 0) { + arg0.y = 0; + } else if (arg0.anInt459 + arg0.y > arg1) { + arg0.y = arg1 - arg0.anInt459; } - if (arg0.anInt523 < 0) { - arg0.anInt523 = 0; - } else if (arg2 < arg0.anInt523 + arg0.anInt445) { - arg0.anInt523 = arg2 - arg0.anInt445; + if (arg0.x < 0) { + arg0.x = 0; + } else if (arg2 < arg0.x + arg0.anInt445) { + arg0.x = arg2 - arg0.anInt445; } } @@ -72,11 +72,11 @@ public final class Static111 { Static22.anInt723 = Static57.anInt1759; Static215.anInt4873 = Static147.anInt3521; Static223.anInt5032 = Static165.anInt4039; - Static150.anInt3585 = Static41.anInt1313; - Static7.anInt985 = Static34.anInt1034; + Static150.clickButton = Static41.anInt1313; + Static7.clickX = Static34.anInt1034; Static93.anInt2467++; - Static60.anInt1893 = Static222.anInt4973; - Static133.aLong175 = Static209.aLong161; + Static60.clickY = Static222.anInt4973; + Static133.clickTime = Static209.aLong161; Static41.anInt1313 = 0; } } diff --git a/client/src/main/java/Static115.java b/client/src/main/java/Static115.java index d2bc6b0..4d259c8 100644 --- a/client/src/main/java/Static115.java +++ b/client/src/main/java/Static115.java @@ -56,11 +56,11 @@ public final class Static115 { @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V") public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - if (Static70.anInt2013 == 1) { - Static240.aClass3_Sub2_Sub1Array10[Static17.anInt577 / 100].method1423(Static122.anInt3047 - 8, Static25.anInt826 + -8); + if (Static70.type == 1) { + Static240.aClass3_Sub2_Sub1Array10[Static17.milliseconds / 100].method1423(Static122.x - 8, Static25.y + -8); } - if (Static70.anInt2013 == 2) { - Static240.aClass3_Sub2_Sub1Array10[Static17.anInt577 / 100 + 4].method1423(Static122.anInt3047 - 8, Static25.anInt826 + -8); + if (Static70.type == 2) { + Static240.aClass3_Sub2_Sub1Array10[Static17.milliseconds / 100 + 4].method1423(Static122.x - 8, Static25.y + -8); } Static256.method4392(); } diff --git a/client/src/main/java/Static116.java b/client/src/main/java/Static116.java index a64923a..89ced10 100644 --- a/client/src/main/java/Static116.java +++ b/client/src/main/java/Static116.java @@ -32,7 +32,7 @@ public final class Static116 { public static void method2325(@OriginalArg(1) boolean arg0) { Static90.aByteArrayArrayArray8 = null; Static83.anIntArrayArrayArray3 = null; - Static24.aClass13_8 = null; + Static24.component = null; Static34.aByteArrayArrayArray3 = null; Static145.anIntArray330 = null; Static125.aByteArrayArrayArray10 = null; diff --git a/client/src/main/java/Static118.java b/client/src/main/java/Static118.java index 6ff196b..b62969f 100644 --- a/client/src/main/java/Static118.java +++ b/client/src/main/java/Static118.java @@ -29,14 +29,14 @@ public final class Static118 { public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) { for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) { @Pc(15) Component local15 = arg1[local7]; - if (local15 != null && local15.anInt456 == arg0 && (!local15.aBoolean32 || !Static36.method947(local15))) { + if (local15 != null && local15.layer == arg0 && (!local15.aBoolean32 || !Static36.method947(local15))) { if (local15.anInt452 == 0) { if (!local15.aBoolean32 && Static36.method947(local15) && local15 != Static180.aClass13_22) { continue; } method2354(local15.anInt507, arg1); - if (local15.aClass13Array3 != null) { - method2354(local15.anInt507, local15.aClass13Array3); + if (local15.createdComponents != null) { + method2354(local15.anInt507, local15.createdComponents); } @Pc(73) Class3_Sub31 local73 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local15.anInt507); if (local73 != null) { @@ -77,13 +77,13 @@ public final class Static118 { } } } - if (local15.anInt483 != 0 && !local15.aBoolean32) { - @Pc(239) int local239 = local15.anInt483 >> 16; + if (local15.modelRotationSpeed != 0 && !local15.aBoolean32) { + @Pc(239) int local239 = local15.modelRotationSpeed >> 16; @Pc(243) int local243 = local239 * Static178.anInt4247; - local105 = local15.anInt483 << 16 >> 16; - local15.anInt450 = local243 + local15.anInt450 & 0x7FF; + local105 = local15.modelRotationSpeed << 16 >> 16; + local15.modelXAngle = local243 + local15.modelXAngle & 0x7FF; local105 *= Static178.anInt4247; - local15.anInt524 = local15.anInt524 + local105 & 0x7FF; + local15.modelYAngle = local15.modelYAngle + local105 & 0x7FF; Static43.method1143(local15); } } diff --git a/client/src/main/java/Static119.java b/client/src/main/java/Static119.java index 4b462cf..779c5cc 100644 --- a/client/src/main/java/Static119.java +++ b/client/src/main/java/Static119.java @@ -23,7 +23,7 @@ public final class Static119 { public static final JagString aClass100_589 = Static28.parse(" "); @OriginalMember(owner = "client!je", name = "fb", descriptor = "I") - public static int anInt3028 = 1; + public static int transmitTimer = 1; @OriginalMember(owner = "client!je", name = "h", descriptor = "(I)V") public static void method2380() { diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java index 7f9d0b5..88969ea 100644 --- a/client/src/main/java/Static122.java +++ b/client/src/main/java/Static122.java @@ -23,7 +23,7 @@ public final class Static122 { public static final JagString aClass100_591 = Static28.parse("(Udns"); @OriginalMember(owner = "client!jh", name = "j", descriptor = "I") - public static int anInt3047 = 0; + public static int x = 0; @OriginalMember(owner = "client!jh", name = "a", descriptor = "(Lclient!ve;ZIIZI)V") public static void method2410(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1, @OriginalArg(5) int arg2) { diff --git a/client/src/main/java/Static124.java b/client/src/main/java/Static124.java index 27752f7..ea850ed 100644 --- a/client/src/main/java/Static124.java +++ b/client/src/main/java/Static124.java @@ -8,7 +8,7 @@ public final class Static124 { public static int anInt3080; @OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;") - public static BufferedSocket aClass95_2; + public static BufferedSocket socket; @OriginalMember(owner = "client!jk", name = "J", descriptor = "I") public static int anInt3083; diff --git a/client/src/main/java/Static125.java b/client/src/main/java/Static125.java index 7fe545d..ed4b75b 100644 --- a/client/src/main/java/Static125.java +++ b/client/src/main/java/Static125.java @@ -31,12 +31,12 @@ public final class Static125 { @OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V") public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - Static6.aClass3_Sub15_Sub1_1.offset = 0; - Static6.aClass3_Sub15_Sub1_1.p1(147); - Static6.aClass3_Sub15_Sub1_1.p1(arg2); - Static6.aClass3_Sub15_Sub1_1.p1(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg0); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.offset = 0; + Static6.outboundBuffer.p1(147); + Static6.outboundBuffer.p1(arg2); + Static6.outboundBuffer.p1(arg3); + Static6.outboundBuffer.p2(arg0); + Static6.outboundBuffer.p2(arg1); Static226.anInt5079 = 0; Static57.anInt1758 = 0; Static179.anInt4261 = 1; @@ -62,11 +62,11 @@ public final class Static125 { public static void method2450() { @Pc(9) int local9 = Static248.anInt4232 * 128 + 64; @Pc(15) int local15 = Static245.anInt5375 * 128 + 64; - @Pc(23) int local23 = Static207.method3685(Static55.anInt1735, local15, local9) - Static231.anInt5203; + @Pc(23) int local23 = Static207.method3685(Static55.level, local15, local9) - Static231.anInt5203; if (Static113.anInt4612 >= 100) { Static138.anInt3439 = Static245.anInt5375 * 128 + 64; Static134.anInt3302 = Static248.anInt4232 * 128 + 64; - Static5.anInt40 = Static207.method3685(Static55.anInt1735, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203; + Static5.anInt40 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203; } else { if (Static138.anInt3439 < local15) { Static138.anInt3439 += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.anInt3439) / 1000; @@ -107,7 +107,7 @@ public final class Static125 { } local9 = Static265.anInt5765 * 128 + 64; local15 = Static251.anInt5449 * 128 + 64; - local23 = Static207.method3685(Static55.anInt1735, local15, local9) - Static57.anInt1744; + local23 = Static207.method3685(Static55.level, local15, local9) - Static57.anInt1744; @Pc(236) int local236 = local23 - Static5.anInt40; @Pc(241) int local241 = local9 - Static134.anInt3302; @Pc(246) int local246 = local15 - Static138.anInt3439; diff --git a/client/src/main/java/Static126.java b/client/src/main/java/Static126.java index 0c3ca84..6c0f039 100644 --- a/client/src/main/java/Static126.java +++ b/client/src/main/java/Static126.java @@ -17,8 +17,8 @@ public final class Static126 { @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V") public static void method2460() { - if (Static154.anInt3711 != -1) { - Static96.method1949(Static154.anInt3711); + if (Static154.topLevelInterace != -1) { + Static96.method1949(Static154.topLevelInterace); } for (@Pc(15) int local15 = 0; local15 < Static24.anInt766; local15++) { if (Static186.aBooleanArray100[local15]) { @@ -34,7 +34,7 @@ public final class Static126 { Static263.aBoolean299 = true; } Static214.anInt5574 = -1; - if (Static154.anInt3711 != -1) { + if (Static154.topLevelInterace != -1) { Static24.anInt766 = 0; Static9.method182(); } diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java index bcfd7e6..4194d5c 100644 --- a/client/src/main/java/Static127.java +++ b/client/src/main/java/Static127.java @@ -45,13 +45,13 @@ public final class Static127 { Static196.method3534(25); } Static114.method4636(true, LocalizedText.LOADING); - @Pc(53) int local53 = Static142.anInt3483; - @Pc(55) int local55 = Static225.anInt5068; - Static142.anInt3483 = arg1 * 8 - 48; - Static225.anInt5068 = (arg2 - 6) * 8; + @Pc(53) int local53 = Static142.originZ; + @Pc(55) int local55 = Static225.originX; + Static142.originZ = arg1 * 8 - 48; + Static225.originX = (arg2 - 6) * 8; Static158.aClass3_Sub2_Sub4_3 = Static29.method803(Static80.anInt4701 * 8, Static52.anInt1695 * 8); - @Pc(81) int local81 = Static142.anInt3483 - local53; - @Pc(86) int local86 = Static225.anInt5068 - local55; + @Pc(81) int local81 = Static142.originZ - local53; + @Pc(86) int local86 = Static225.originX - local55; Static235.aClass134_2 = null; @Pc(96) int local96; @Pc(103) Npc local103; @@ -65,8 +65,8 @@ public final class Static127 { local103.anInt3421 -= local81 * 128; if (local103.anInt3412 >= 0 && local103.anInt3412 <= 13184 && local103.anInt3421 >= 0 && local103.anInt3421 <= 13184) { for (local109 = 0; local109 < 10; local109++) { - local103.anIntArray318[local109] -= local86; - local103.anIntArray317[local109] -= local81; + local103.movementQueueX[local109] -= local86; + local103.movementQueueZ[local109] -= local81; } Static33.anIntArray79[Static272.anInt5214++] = local96; } else { @@ -80,8 +80,8 @@ public final class Static127 { local103 = Static175.aClass8_Sub4_Sub2Array1[local96]; if (local103 != null) { for (local109 = 0; local109 < 10; local109++) { - local103.anIntArray318[local109] -= local86; - local103.anIntArray317[local109] -= local81; + local103.movementQueueX[local109] -= local86; + local103.movementQueueZ[local109] -= local81; } local103.anInt3412 -= local86 * 128; local103.anInt3421 -= local81 * 128; @@ -92,15 +92,15 @@ public final class Static127 { @Pc(265) Player local265 = Static159.aClass8_Sub4_Sub1Array1[local96]; if (local265 != null) { for (local109 = 0; local109 < 10; local109++) { - local265.anIntArray318[local109] -= local86; - local265.anIntArray317[local109] -= local81; + local265.movementQueueX[local109] -= local86; + local265.movementQueueZ[local109] -= local81; } local265.anInt3412 -= local86 * 128; local265.anInt3421 -= local81 * 128; } } - Static55.anInt1735 = arg0; - Static173.aClass8_Sub4_Sub1_2.method1265(arg5, false, arg3); + Static55.level = arg0; + Static173.self.method1265(arg5, false, arg3); @Pc(322) byte local322 = 104; @Pc(324) byte local324 = 0; @Pc(326) byte local326 = 0; @@ -161,7 +161,7 @@ public final class Static127 { } @OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;") - public static DelayedStateChange method2464() { + public static DelayedStateChange poll() { @Pc(10) DelayedStateChange local10 = (DelayedStateChange) Static215.aClass16_9.method795(); if (local10 != null) { local10.method4658(); @@ -211,8 +211,8 @@ public final class Static127 { if (Static232.aClass212_5 != null) { local246 = Static181.method3341(Static232.aClass212_5.anInt5926); try { - if (Static232.aClass212_5.anObject6 != null) { - @Pc(265) byte[] local265 = ((String) Static232.aClass212_5.anObject6).getBytes("ISO-8859-1"); + if (Static232.aClass212_5.result != null) { + @Pc(265) byte[] local265 = ((String) Static232.aClass212_5.result).getBytes("ISO-8859-1"); local246 = Static10.decodeString(local265, local265.length, 0); } } catch (@Pc(274) UnsupportedEncodingException local274) { @@ -239,7 +239,7 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!na;Z)V") public static void method2470(@OriginalArg(0) JagString arg0) { - if (Static191.anInt4502 >= 2) { + if (Static191.staffModLevel >= 2) { @Pc(18) int local18; @Pc(38) int local38; @Pc(29) Runtime local29; @@ -288,7 +288,7 @@ public final class Static127 { } if (arg0.method3111(Static165.aClass100_775)) { Static71.signLink.method5110(); - Static124.aClass95_2.method2833(); + Static124.socket.method2833(); Static107.js5NetQueue.method2323(); } if (arg0.method3111(Static114.aClass100_1100)) { @@ -327,7 +327,7 @@ public final class Static127 { if (arg0.method3138(Static241.aClass100_1088)) { Static76.method1645(arg0.method3136(15).method3132()); Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; } if (arg0.method3138(Static170.aClass100_623) && Static83.modeWhere != 0) { Static115.method2312(arg0.method3136(6).method3132()); @@ -361,8 +361,8 @@ public final class Static127 { } } } - Static6.aClass3_Sub15_Sub1_1.method2242(44); - Static6.aClass3_Sub15_Sub1_1.p1(arg0.length() - 1); - Static6.aClass3_Sub15_Sub1_1.pjstr(arg0.method3136(2)); + Static6.outboundBuffer.p1isaac(44); + Static6.outboundBuffer.p1(arg0.length() - 1); + Static6.outboundBuffer.pjstr(arg0.method3136(2)); } } diff --git a/client/src/main/java/Static13.java b/client/src/main/java/Static13.java index 52e2692..7632c76 100644 --- a/client/src/main/java/Static13.java +++ b/client/src/main/java/Static13.java @@ -30,7 +30,7 @@ public final class Static13 { local32 = Static34.method882(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, Static34.aClass100_203, Static225.aClass100_961 }); } else if (Static241.aBoolean302 && Static231.anInt5204 < 2) { local32 = Static34.method882(new JagString[] { Static102.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 }); - } else if (Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) { + } else if (Static172.shiftClick && Static187.pressedKeys[81] && Static231.anInt5204 > 2) { local32 = Static269.method2228(Static231.anInt5204 - 2); } else { local32 = Static269.method2228(Static231.anInt5204 - 1); diff --git a/client/src/main/java/Static132.java b/client/src/main/java/Static132.java index ea3f580..b0432a5 100644 --- a/client/src/main/java/Static132.java +++ b/client/src/main/java/Static132.java @@ -25,7 +25,7 @@ public final class Static132 { Static109.method2275(local16); } Static273.method3214(local16); - @Pc(32) Component local32 = Static5.method32(local9); + @Pc(32) Component local32 = Static5.getComponent(local9); if (local32 != null) { Static43.method1143(local32); } @@ -51,8 +51,8 @@ public final class Static132 { Static13.anInt436 = Static231.anInt5204 * 15 + (Static261.aBoolean298 ? 26 : 22); Static24.anInt761 = local43 + 8; } - if (Static154.anInt3711 != -1) { - Static54.method1304(1, Static154.anInt3711); + if (Static154.topLevelInterace != -1) { + Static54.method1304(1, Static154.topLevelInterace); } } @@ -60,16 +60,16 @@ public final class Static132 { public static void method2606(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(8) DelayedStateChange local8 = Static238.method4143(1, arg0); local8.method1017(); - local8.anInt1271 = arg1; + local8.intArg1 = arg1; } @OriginalMember(owner = "client!ke", name = "a", descriptor = "(IIIBI)V") public static void method2607(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { @Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg2); local8.method1017(); - local8.anInt1270 = arg3; - local8.anInt1269 = arg0; - local8.anInt1271 = arg1; + local8.intArg3 = arg3; + local8.intArg2 = arg0; + local8.intArg1 = arg1; } @OriginalMember(owner = "client!ke", name = "f", descriptor = "(B)V") diff --git a/client/src/main/java/Static133.java b/client/src/main/java/Static133.java index 2e995a7..8d6bb19 100644 --- a/client/src/main/java/Static133.java +++ b/client/src/main/java/Static133.java @@ -8,7 +8,7 @@ public final class Static133 { public static int anInt5230; @OriginalMember(owner = "client!kf", name = "c", descriptor = "J") - public static long aLong175 = 0L; + public static long clickTime = 0L; @OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;") public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14]; diff --git a/client/src/main/java/Static134.java b/client/src/main/java/Static134.java index 15c5a9e..a2bc019 100644 --- a/client/src/main/java/Static134.java +++ b/client/src/main/java/Static134.java @@ -36,7 +36,7 @@ public final class Static134 { @OriginalMember(owner = "client!kh", name = "b", descriptor = "(I)V") public static void method2623() { - Static6.aClass3_Sub15_Sub1_1.method2242(104); - Static6.aClass3_Sub15_Sub1_1.p8(0L); + Static6.outboundBuffer.p1isaac(104); + Static6.outboundBuffer.p8(0L); } } diff --git a/client/src/main/java/Static136.java b/client/src/main/java/Static136.java index 6826586..00201ce 100644 --- a/client/src/main/java/Static136.java +++ b/client/src/main/java/Static136.java @@ -21,7 +21,7 @@ public final class Static136 { public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(4) DelayedStateChange local4 = Static238.method4143(6, arg1); local4.method1017(); - local4.anInt1271 = arg0; + local4.intArg1 = arg0; } @OriginalMember(owner = "client!kk", name = "a", descriptor = "(ZLjava/awt/event/KeyEvent;)I") diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java index 07a20c0..d50856d 100644 --- a/client/src/main/java/Static137.java +++ b/client/src/main/java/Static137.java @@ -50,7 +50,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.anInt1735, local37 + 0, local76); + @Pc(169) long local169 = Static20.method602(Static55.level, local37 + 0, local76); if (local169 != 0L) { @Pc(184) LocType local184 = Static271.method4601((int) (local169 >>> 32) & Integer.MAX_VALUE); @Pc(187) int local187 = local184.anInt4400; @@ -70,7 +70,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 = Static148.aClass97Array1[Static55.anInt1735].anIntArrayArray30; + @Pc(269) int[][] local269 = Static148.aClass97Array1[Static55.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 b8dbf68..8c5f809 100644 --- a/client/src/main/java/Static138.java +++ b/client/src/main/java/Static138.java @@ -65,7 +65,7 @@ public final class Static138 { 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[] anIntArray323 = new int[32]; + public static final int[] updatedVarcs = new int[32]; @OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;") public static final JagString aClass100_652 = Static28.parse("loginscreen"); diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java index 205acdd..82408a3 100644 --- a/client/src/main/java/Static140.java +++ b/client/src/main/java/Static140.java @@ -71,15 +71,15 @@ public final class Static140 { return; } } - if (local34.method3108(Static173.aClass8_Sub4_Sub1_2.aClass100_364)) { + if (local34.method3108(Static173.self.aClass100_364)) { Static103.method2231(Static186.aClass100_827, 0, LocalizedText.IGNORECANTADDSELF); return; } Static190.aLongArray6[Static35.anInt1093] = arg0; Static193.aClass100Array134[Static35.anInt1093++] = Static79.method1702(arg0); - Static185.anInt4369 = Static119.anInt3028; - Static6.aClass3_Sub15_Sub1_1.method2242(34); - Static6.aClass3_Sub15_Sub1_1.p8(arg0); + Static185.anInt4369 = Static119.transmitTimer; + Static6.outboundBuffer.p1isaac(34); + Static6.outboundBuffer.p8(arg0); } @OriginalMember(owner = "client!la", name = "a", descriptor = "(Lsignlink!ll;Ljava/lang/Object;I)V") diff --git a/client/src/main/java/Static141.java b/client/src/main/java/Static141.java index 0430bf4..045231c 100644 --- a/client/src/main/java/Static141.java +++ b/client/src/main/java/Static141.java @@ -84,7 +84,7 @@ public final class Static141 { if (arg0 && Static113.anInt4612 >= 100) { Static138.anInt3439 = Static245.anInt5375 * 128 + 64; Static134.anInt3302 = Static248.anInt4232 * 128 + 64; - Static5.anInt40 = Static207.method3685(Static55.anInt1735, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203; + Static5.anInt40 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203; } Static227.anInt5096 = 2; } diff --git a/client/src/main/java/Static142.java b/client/src/main/java/Static142.java index fb1b6f3..878a7f6 100644 --- a/client/src/main/java/Static142.java +++ b/client/src/main/java/Static142.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static142 { @OriginalMember(owner = "client!lc", name = "n", descriptor = "I") - public static int anInt3483; + public static int originZ; @OriginalMember(owner = "client!lc", name = "e", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_23 = new SoftLruHashTable(64); @@ -29,7 +29,7 @@ public final class Static142 { for (local5 = -1; local5 < Static267.anInt5774 + Static272.anInt5214; local5++) { @Pc(17) PathingEntity local17; if (local5 == -1) { - local17 = Static173.aClass8_Sub4_Sub1_2; + local17 = Static173.self; } else if (Static267.anInt5774 > local5) { local17 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local5]]; } else { @@ -314,7 +314,7 @@ public final class Static142 { } @OriginalMember(owner = "client!lc", name = "a", descriptor = "(B)I") - public static int method2727() { + public static int getIdleLoops() { return Static93.anInt2467; } } diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java index 1c355e8..47be9a0 100644 --- a/client/src/main/java/Static145.java +++ b/client/src/main/java/Static145.java @@ -98,9 +98,9 @@ public final class Static145 { public static void method2745(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { @Pc(8) DelayedStateChange local8 = Static238.method4143(10, arg0); local8.method1017(); - local8.anInt1270 = arg2; - local8.anInt1271 = arg3; - local8.anInt1269 = arg1; + local8.intArg3 = arg2; + local8.intArg1 = arg3; + local8.intArg2 = arg1; } @OriginalMember(owner = "client!lf", name = "c", descriptor = "(I)I") diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java index daad25d..0efb809 100644 --- a/client/src/main/java/Static150.java +++ b/client/src/main/java/Static150.java @@ -14,7 +14,7 @@ public final class Static150 { public static int anInt3582 = 0; @OriginalMember(owner = "client!lk", name = "Z", descriptor = "I") - public static int anInt3585 = 0; + public static int clickButton = 0; @OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!ve;)I") public static int method2797(@OriginalArg(1) Js5 arg0) { @@ -38,16 +38,16 @@ public final class Static150 { @Pc(4) int local4 = arg2.anInt445; @Pc(7) int local7 = arg2.anInt459; if (arg2.aByte5 == 0) { - arg2.anInt445 = arg2.anInt446; + arg2.anInt445 = arg2.baseWidth; } else if (arg2.aByte5 == 1) { - arg2.anInt445 = arg1 - arg2.anInt446; + arg2.anInt445 = arg1 - arg2.baseWidth; } else if (arg2.aByte5 == 2) { - arg2.anInt445 = arg2.anInt446 * arg1 >> 14; + arg2.anInt445 = arg2.baseWidth * arg1 >> 14; } else if (arg2.aByte5 == 3) { if (arg2.anInt452 == 2) { - arg2.anInt445 = arg2.anInt446 * 32 + (arg2.anInt446 - 1) * arg2.anInt512; + arg2.anInt445 = arg2.baseWidth * 32 + (arg2.baseWidth - 1) * arg2.anInt512; } else if (arg2.anInt452 == 7) { - arg2.anInt445 = arg2.anInt446 * 115 + arg2.anInt512 * (arg2.anInt446 - 1); + arg2.anInt445 = arg2.baseWidth * 115 + arg2.anInt512 * (arg2.baseWidth - 1); } } if (arg2.aByte3 == 0) { @@ -88,7 +88,7 @@ public final class Static150 { if (arg3 && arg2.anObjectArray17 != null && (local4 != arg2.anInt445 || arg2.anInt459 != local7)) { @Pc(305) HookRequest local305 = new HookRequest(); local305.anObjectArray31 = arg2.anObjectArray17; - local305.aClass13_17 = arg2; + local305.source = arg2; Static185.aClass69_101.method2282(local305); } } diff --git a/client/src/main/java/Static153.java b/client/src/main/java/Static153.java index 0503927..be481f3 100644 --- a/client/src/main/java/Static153.java +++ b/client/src/main/java/Static153.java @@ -41,7 +41,7 @@ public final class Static153 { public static void method2905(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { @Pc(14) DelayedStateChange local14 = Static238.method4143(7, arg0); local14.method1017(); - local14.anInt1271 = arg1; + local14.intArg1 = arg1; } @OriginalMember(owner = "client!mc", name = "a", descriptor = "(IIIIIIII)V") @@ -67,7 +67,7 @@ public final class Static153 { @OriginalMember(owner = "client!mc", name = "f", descriptor = "(B)V") public static void method2909() { - Static6.aClass3_Sub15_Sub1_1.method2242(184); + Static6.outboundBuffer.p1isaac(184); for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.method3859(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.method3861()) { if (local18.anInt5879 == 0) { Static132.method2605(true, local18); diff --git a/client/src/main/java/Static154.java b/client/src/main/java/Static154.java index 07ab86b..986a179 100644 --- a/client/src/main/java/Static154.java +++ b/client/src/main/java/Static154.java @@ -21,7 +21,7 @@ public final class Static154 { public static final short[][] aShortArrayArray6 = new short[][] { { 6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 4626, 11146, 6439, 12, 4758, 10270 }, { 4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574 } }; @OriginalMember(owner = "client!md", name = "W", descriptor = "I") - public static int anInt3711 = -1; + public static int topLevelInterace = -1; @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z") public static boolean method2926(@OriginalArg(0) Component arg0) { @@ -62,7 +62,7 @@ public final class Static154 { Static62.anInt1941++; Static26.anIntArray67[0] = arg1; Static153.aClass100Array112[0] = arg4; - Static49.anInt1464 = Static119.anInt3028; + Static49.anInt1464 = Static119.transmitTimer; Static241.anIntArray521[0] = arg0; Static230.aClass100Array158[0] = arg2; Static64.aClass100Array62[0] = arg3; diff --git a/client/src/main/java/Static155.java b/client/src/main/java/Static155.java index 97dc692..beda485 100644 --- a/client/src/main/java/Static155.java +++ b/client/src/main/java/Static155.java @@ -11,7 +11,7 @@ public final class Static155 { public static int anInt3718 = -1; @OriginalMember(owner = "client!me", name = "P", descriptor = "[I") - public static final int[] anIntArray355 = new int[2000]; + public static final int[] varcs = new int[2000]; @OriginalMember(owner = "client!me", name = "a", descriptor = "(IB)V") public static void method2940(@OriginalArg(0) int arg0) { diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index e7db40f..fa0433c 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -110,8 +110,8 @@ public final class Static156 { @OriginalMember(owner = "client!mf", name = "a", descriptor = "(JI)V") public static void method2956(@OriginalArg(0) long arg0) { if ((long) 0 != arg0) { - Static6.aClass3_Sub15_Sub1_1.method2242(104); - Static6.aClass3_Sub15_Sub1_1.p8(arg0); + Static6.outboundBuffer.p1isaac(104); + Static6.outboundBuffer.p8(arg0); } } diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java index ad58c41..7be2014 100644 --- a/client/src/main/java/Static158.java +++ b/client/src/main/java/Static158.java @@ -27,9 +27,9 @@ public final class Static158 { } try { if (++Static226.anInt5079 > 2000) { - if (Static124.aClass95_2 != null) { - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + if (Static124.socket != null) { + Static124.socket.method2834(); + Static124.socket = null; } if (Static57.anInt1758 >= 1) { Static223.anInt5034 = -5; @@ -57,16 +57,16 @@ public final class Static158 { if (Static72.aClass212_3.status != 1) { return; } - Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink); + Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink); Static72.aClass212_3 = null; - Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); + Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } if (Static147.aClass62_2 != null) { Static147.aClass62_2.method3571(); } - local120 = Static124.aClass95_2.read(); + local120 = Static124.socket.read(); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } @@ -76,38 +76,38 @@ public final class Static158 { if (local120 != 21) { Static223.anInt5034 = local120; Static179.anInt4261 = 0; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; return; } Static179.anInt4261 = 3; } if (Static179.anInt4261 == 3) { - if (Static124.aClass95_2.available() < 1) { + if (Static124.socket.available() < 1) { return; } - Static229.aClass100Array156 = new JagString[Static124.aClass95_2.read()]; + Static229.aClass100Array156 = new JagString[Static124.socket.read()]; Static179.anInt4261 = 4; } if (Static179.anInt4261 == 4) { - if (Static124.aClass95_2.available() < Static229.aClass100Array156.length * 8) { + if (Static124.socket.available() < Static229.aClass100Array156.length * 8) { return; } Static57.aClass3_Sub15_Sub1_3.offset = 0; - Static124.aClass95_2.method2827(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.data); + Static124.socket.method2827(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.data); for (local120 = 0; local120 < Static229.aClass100Array156.length; local120++) { Static229.aClass100Array156[local120] = Static79.method1702(Static57.aClass3_Sub15_Sub1_3.g8()); } Static223.anInt5034 = 21; Static179.anInt4261 = 0; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; return; } } catch (@Pc(238) IOException local238) { - if (Static124.aClass95_2 != null) { - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + if (Static124.socket != null) { + Static124.socket.method2834(); + Static124.socket = null; } if (Static57.anInt1758 < 1) { Static57.anInt1758++; @@ -153,9 +153,9 @@ public final class Static158 { @Pc(103) int local103 = local74.g2(); @Pc(107) int local107 = local103 >> 14; @Pc(113) int local113 = local103 >> 7 & 0x3F; - @Pc(125) int local125 = local113 + (Static238.anIntArray470[local16] >> 8) * 64 - Static225.anInt5068; + @Pc(125) int local125 = local113 + (Static238.anIntArray470[local16] >> 8) * 64 - Static225.originX; @Pc(129) int local129 = local103 & 0x3F; - @Pc(142) int local142 = local129 + (Static238.anIntArray470[local16] & 0xFF) * 64 - Static142.anInt3483; + @Pc(142) int local142 = local129 + (Static238.anIntArray470[local16] & 0xFF) * 64 - Static142.originZ; @Pc(148) NpcType local148 = Static214.method4363(local74.g2()); if (Static175.aClass8_Sub4_Sub2Array1[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) { Static175.aClass8_Sub4_Sub2Array1[local97] = new Npc(); diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java index e4eab8f..fc295e0 100644 --- a/client/src/main/java/Static164.java +++ b/client/src/main/java/Static164.java @@ -8,7 +8,7 @@ public final class Static164 { public static boolean aBoolean192; @OriginalMember(owner = "client!na", name = "W", descriptor = "Z") - public static boolean aBoolean194; + public static boolean newTab; @OriginalMember(owner = "client!na", name = "h", descriptor = "Z") public static boolean aBoolean191 = false; diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java index 930b07e..2d1c7a1 100644 --- a/client/src/main/java/Static169.java +++ b/client/src/main/java/Static169.java @@ -24,7 +24,7 @@ public final class Static169 { public static int anInt4075 = -1; @OriginalMember(owner = "client!nf", name = "a", descriptor = "(Lclient!na;BZ)V") - public static void method3175(@OriginalArg(0) JagString arg0, @OriginalArg(2) boolean arg1) { + public static void openUrl(@OriginalArg(0) JagString arg0, @OriginalArg(2) boolean arg1) { if (!arg1) { try { Static230.anApplet_Sub1_1.getAppletContext().showDocument(arg0.method3127(Static230.anApplet_Sub1_1.getCodeBase()), "_top"); @@ -68,7 +68,7 @@ public final class Static169 { while (local90.status == 0) { Static231.method3983(10L); } - @Pc(103) Frame local103 = (Frame) local90.anObject6; + @Pc(103) Frame local103 = (Frame) local90.result; if (local103 == null) { return null; } else if (local90.status == 2) { diff --git a/client/src/main/java/Static17.java b/client/src/main/java/Static17.java index 068d167..b7716b5 100644 --- a/client/src/main/java/Static17.java +++ b/client/src/main/java/Static17.java @@ -14,7 +14,7 @@ public final class Static17 { public static final int[] anIntArray53 = new int[128]; @OriginalMember(owner = "client!bg", name = "M", descriptor = "I") - public static int anInt577 = 0; + public static int milliseconds = 0; @OriginalMember(owner = "client!bg", name = "N", descriptor = "Lclient!na;") public static final JagString aClass100_102 = Static28.parse("mapfunction"); @@ -35,7 +35,7 @@ public final class Static17 { @Pc(64) int local64; if (local23 == 1) { local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3); - Static173.aClass8_Sub4_Sub1_2.method2684(1, local54); + Static173.self.method2684(1, local54); local64 = Static57.aClass3_Sub15_Sub1_3.method2238(1); if (local64 == 1) { Static44.anIntArray106[Static116.anInt2951++] = 2047; @@ -43,12 +43,12 @@ public final class Static17 { } else if (local23 == 2) { if (Static57.aClass3_Sub15_Sub1_3.method2238(1) == 1) { local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3); - Static173.aClass8_Sub4_Sub1_2.method2684(2, local54); + Static173.self.method2684(2, local54); local64 = Static57.aClass3_Sub15_Sub1_3.method2238(3); - Static173.aClass8_Sub4_Sub1_2.method2684(2, local64); + Static173.self.method2684(2, local64); } else { local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3); - Static173.aClass8_Sub4_Sub1_2.method2684(0, local54); + Static173.self.method2684(0, local54); } local54 = Static57.aClass3_Sub15_Sub1_3.method2238(1); if (local54 == 1) { @@ -57,13 +57,13 @@ public final class Static17 { } else if (local23 == 3) { local54 = Static57.aClass3_Sub15_Sub1_3.method2238(7); local64 = Static57.aClass3_Sub15_Sub1_3.method2238(1); - Static55.anInt1735 = Static57.aClass3_Sub15_Sub1_3.method2238(2); + Static55.level = Static57.aClass3_Sub15_Sub1_3.method2238(2); @Pc(163) int local163 = Static57.aClass3_Sub15_Sub1_3.method2238(1); if (local163 == 1) { Static44.anIntArray106[Static116.anInt2951++] = 2047; } @Pc(181) int local181 = Static57.aClass3_Sub15_Sub1_3.method2238(7); - Static173.aClass8_Sub4_Sub1_2.method1265(local181, local64 == 1, local54); + Static173.self.method1265(local181, local64 == 1, local54); } } @@ -76,9 +76,9 @@ public final class Static17 { public static void method531(@OriginalArg(0) Component arg0, @OriginalArg(1) boolean arg1) { @Pc(20) int local20 = arg0.anInt486 == 0 ? arg0.anInt445 : arg0.anInt486; @Pc(32) int local32 = arg0.anInt491 == 0 ? arg0.anInt459 : arg0.anInt491; - Static266.method4190(arg0.anInt507, arg1, local20, local32, Static241.aClass13ArrayArray12[arg0.anInt507 >> 16]); - if (arg0.aClass13Array3 != null) { - Static266.method4190(arg0.anInt507, arg1, local20, local32, arg0.aClass13Array3); + Static266.method4190(arg0.anInt507, arg1, local20, local32, Static241.components[arg0.anInt507 >> 16]); + if (arg0.createdComponents != null) { + Static266.method4190(arg0.anInt507, arg1, local20, local32, arg0.createdComponents); } @Pc(66) Class3_Sub31 local66 = (Class3_Sub31) Static119.aClass133_9.method3863((long) arg0.anInt507); if (local66 != null) { diff --git a/client/src/main/java/Static171.java b/client/src/main/java/Static171.java index 2264d47..de00b6a 100644 --- a/client/src/main/java/Static171.java +++ b/client/src/main/java/Static171.java @@ -48,8 +48,8 @@ public final class Static171 { @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;I)V") public static void method3221(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) { - Static6.aClass3_Sub15_Sub1_1.method2242(188); - Static6.aClass3_Sub15_Sub1_1.p1a(arg1); - Static6.aClass3_Sub15_Sub1_1.p8(arg0.method3158()); + Static6.outboundBuffer.p1isaac(188); + Static6.outboundBuffer.p1a(arg1); + Static6.outboundBuffer.p8(arg0.method3158()); } } diff --git a/client/src/main/java/Static173.java b/client/src/main/java/Static173.java index 8a35feb..5eaee87 100644 --- a/client/src/main/java/Static173.java +++ b/client/src/main/java/Static173.java @@ -14,7 +14,7 @@ public final class Static173 { public static SoftwareSprite[] aClass3_Sub2_Sub1_Sub1Array9; @OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;") - public static Player aClass8_Sub4_Sub1_2; + public static Player self; @OriginalMember(owner = "client!nk", name = "n", descriptor = "[Lclient!sl;") public static final SynthSound[] aClass138Array1 = new SynthSound[50]; @@ -128,8 +128,8 @@ public final class Static173 { if (!local16.aClass96_1.aBoolean183) { local262 |= Long.MIN_VALUE; } - local16.anInt3424 = Static207.method3685(Static55.anInt1735, local16.anInt3412, local16.anInt3421); - Static43.method1141(Static55.anInt1735, local16.anInt3412, local16.anInt3421, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171); + local16.anInt3424 = Static207.method3685(Static55.level, local16.anInt3412, local16.anInt3421); + Static43.method1141(Static55.level, local16.anInt3412, local16.anInt3421, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171); } } } diff --git a/client/src/main/java/Static175.java b/client/src/main/java/Static175.java index f0d3c2b..2afd4b1 100644 --- a/client/src/main/java/Static175.java +++ b/client/src/main/java/Static175.java @@ -6,7 +6,7 @@ public final class Static175 { public static int[] anIntArray371; @OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;") - public static JagString aClass100_797; + public static JagString url; @OriginalMember(owner = "client!nm", name = "S", descriptor = "[Lclient!km;") public static final Npc[] aClass8_Sub4_Sub2Array1 = new Npc[32768]; @@ -25,8 +25,8 @@ public final class Static175 { if (Static267.anInt5775 > 0) { Static278.method4653(); } else { - Static233.aClass95_4 = Static124.aClass95_2; - Static124.aClass95_2 = null; + Static233.aClass95_4 = Static124.socket; + Static124.socket = null; Static196.method3534(40); } } diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java index b94a0c7..6bd647a 100644 --- a/client/src/main/java/Static176.java +++ b/client/src/main/java/Static176.java @@ -95,7 +95,7 @@ public final class Static176 { if (local121 != local112) { local112 = local121; @Pc(240) int local240; - if (local133 == 2 && Static257.method523(Static55.anInt1735, local47, local147, local121)) { + if (local133 == 2 && Static257.method523(Static55.level, local47, local147, local121)) { @Pc(172) LocType local172 = Static271.method4601(local140); if (local172.anIntArray380 != null) { local172 = local172.method3417(); @@ -203,7 +203,7 @@ public final class Static176 { Static217.method3767(local140, local147, local688, local47); } if (local133 == 3) { - @Pc(931) LinkedList local931 = Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local47][local147]; + @Pc(931) LinkedList local931 = Static159.aClass69ArrayArrayArray1[Static55.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/Static178.java b/client/src/main/java/Static178.java index f0bc307..fd324f0 100644 --- a/client/src/main/java/Static178.java +++ b/client/src/main/java/Static178.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static178 { @OriginalMember(owner = "client!od", name = "f", descriptor = "Lclient!jd;") - public static MouseRecorder aClass74_1; + public static MouseRecorder instance; @OriginalMember(owner = "client!od", name = "c", descriptor = "Z") public static boolean aBoolean202 = true; @@ -36,8 +36,8 @@ public final class Static178 { local24++; } if (local24 < Static199.aClass3_Sub22Array1.length && Static199.aClass3_Sub22Array1[local24] != null) { - Static6.aClass3_Sub15_Sub1_1.method2242(162); - Static6.aClass3_Sub15_Sub1_1.p8(Static199.aClass3_Sub22Array1[local24].aLong192); + Static6.outboundBuffer.p1isaac(162); + Static6.outboundBuffer.p8(Static199.aClass3_Sub22Array1[local24].aLong192); } } diff --git a/client/src/main/java/Static179.java b/client/src/main/java/Static179.java index 2105c61..39959c7 100644 --- a/client/src/main/java/Static179.java +++ b/client/src/main/java/Static179.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static179 { @OriginalMember(owner = "client!oe", name = "a", descriptor = "I") - public static int anInt4253 = 0; + public static int mouseRecorderPrevY = 0; @OriginalMember(owner = "client!oe", name = "b", descriptor = "I") public static int anInt4254 = 0; diff --git a/client/src/main/java/Static18.java b/client/src/main/java/Static18.java index c6ef6a0..c284c09 100644 --- a/client/src/main/java/Static18.java +++ b/client/src/main/java/Static18.java @@ -17,7 +17,7 @@ public final class Static18 { public static final JagString aClass100_107 = Static28.parse("floorshadows"); @OriginalMember(owner = "client!bh", name = "z", descriptor = "Z") - public static boolean aBoolean39 = true; + public static boolean sentToServer = true; @OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;") public static final JagString aClass100_108 = Static28.parse("
(X100(U(Y"); diff --git a/client/src/main/java/Static182.java b/client/src/main/java/Static182.java index 3390605..f3373e5 100644 --- a/client/src/main/java/Static182.java +++ b/client/src/main/java/Static182.java @@ -20,7 +20,7 @@ public final class Static182 { public static int anInt4311 = -2; @OriginalMember(owner = "client!oj", name = "y", descriptor = "I") - public static int anInt4313 = 0; + public static int keyQueueSize = 0; @OriginalMember(owner = "client!oj", name = "z", descriptor = "[Z") public static final boolean[] aBooleanArray97 = new boolean[] { true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false }; diff --git a/client/src/main/java/Static183.java b/client/src/main/java/Static183.java index ada3d98..fd31add 100644 --- a/client/src/main/java/Static183.java +++ b/client/src/main/java/Static183.java @@ -11,7 +11,7 @@ public final class Static183 { public static int anInt4272 = (int) (Math.random() * 33.0D) - 16; @OriginalMember(owner = "client!ok", name = "f", descriptor = "J") - public static long aLong139 = 0L; + public static long prevClickTime = 0L; @OriginalMember(owner = "client!ok", name = "a", descriptor = "(Lclient!ab;Lclient!ab;I)V") public static void method3331(@OriginalArg(0) Node arg0, @OriginalArg(1) Node arg1) { diff --git a/client/src/main/java/Static186.java b/client/src/main/java/Static186.java index 92fa6de..ebb7431 100644 --- a/client/src/main/java/Static186.java +++ b/client/src/main/java/Static186.java @@ -62,9 +62,9 @@ public final class Static186 { Static83.aFloat3 = 8.0F; Static138.aFloat14 = 8.0F; } - @Pc(144) int local144 = (Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7) + Static225.anInt5068 - Static158.anInt3846; + @Pc(144) int local144 = (Static173.self.anInt3412 >> 7) + Static225.originX - Static158.anInt3846; @Pc(153) int local153 = local144 + (int) (Math.random() * 10.0D) - 5; - @Pc(168) int local168 = Static2.anInt13 + Static181.anInt4296 - Static142.anInt3483 - (Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7) - 1; + @Pc(168) int local168 = Static2.anInt13 + Static181.anInt4296 - Static142.originZ - (Static173.self.anInt3421 >> 7) - 1; @Pc(177) int local177 = local168 + (int) (Math.random() * 10.0D) - 5; if (local153 >= 0 && Static48.anInt1449 > local153 && local177 >= 0 && local177 < Static181.anInt4296) { Static13.anInt435 = local153; @@ -173,7 +173,7 @@ public final class Static186 { arg2.anInt3373 = 1; arg2.anInt3425 = 0; arg2.anInt3371 = 0; - Static152.method2836(arg2.anInt3421, local89, arg2.anInt3412, Static173.aClass8_Sub4_Sub1_2 == arg2, arg2.anInt3425); + Static152.method2836(arg2.anInt3421, local89, arg2.anInt3412, Static173.self == arg2, arg2.anInt3425); } if (local92 == 2) { arg2.anInt3371 = 0; @@ -187,7 +187,7 @@ public final class Static186 { arg2.anInt3360 = 0; arg2.anInt3369 = arg1; if (arg2.anInt3369 != -1) { - Static152.method2836(arg2.anInt3421, Static36.method941(arg2.anInt3369), arg2.anInt3412, arg2 == Static173.aClass8_Sub4_Sub1_2, arg2.anInt3425); + Static152.method2836(arg2.anInt3421, Static36.method941(arg2.anInt3369), arg2.anInt3412, arg2 == Static173.self, arg2.anInt3425); } } } diff --git a/client/src/main/java/Static187.java b/client/src/main/java/Static187.java index 34ca57d..6d832c9 100644 --- a/client/src/main/java/Static187.java +++ b/client/src/main/java/Static187.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static187 { @OriginalMember(owner = "client!pb", name = "q", descriptor = "[Z") - public static final boolean[] aBooleanArray101 = new boolean[112]; + public static final boolean[] pressedKeys = new boolean[112]; @OriginalMember(owner = "client!pb", name = "x", descriptor = "[[[I") public static final int[][][] anIntArrayArrayArray18 = new int[4][13][13]; diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java index a0a4d07..e834af6 100644 --- a/client/src/main/java/Static19.java +++ b/client/src/main/java/Static19.java @@ -45,7 +45,7 @@ public final class Static19 { } @OriginalMember(owner = "client!bi", name = "f", descriptor = "(B)V") - public static void method587() { + public static void loop() { @Pc(11) int local11; for (local11 = -1; local11 < Static267.anInt5774; local11++) { @Pc(22) int local22; diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java index 0d1dc48..e8f8f08 100644 --- a/client/src/main/java/Static190.java +++ b/client/src/main/java/Static190.java @@ -51,7 +51,7 @@ public final class Static190 { public static void method3444(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(14) DelayedStateChange local14 = Static238.method4143(13, arg1); local14.method1017(); - local14.anInt1271 = arg0; + local14.intArg1 = arg0; } @OriginalMember(owner = "client!pf", name = "c", descriptor = "(II)V") diff --git a/client/src/main/java/Static191.java b/client/src/main/java/Static191.java index 57fd07a..1d84e7d 100644 --- a/client/src/main/java/Static191.java +++ b/client/src/main/java/Static191.java @@ -18,7 +18,7 @@ public final class Static191 { public static final int[] anIntArray385 = new int[anInt4506]; @OriginalMember(owner = "client!pg", name = "S", descriptor = "I") - public static int anInt4502 = 0; + public static int staffModLevel = 0; @OriginalMember(owner = "client!pg", name = "T", descriptor = "[I") public static final int[] anIntArray386 = new int[] { 76, 8, 137, 4, 0, 1, 38, 2, 19 }; diff --git a/client/src/main/java/Static192.java b/client/src/main/java/Static192.java index 607a042..9ce329d 100644 --- a/client/src/main/java/Static192.java +++ b/client/src/main/java/Static192.java @@ -7,7 +7,7 @@ public final class Static192 { public static final Environment[][] aClass92ArrayArray1 = new Environment[13][13]; @OriginalMember(owner = "client!ph", name = "a", descriptor = "(B)V") - public static void method3473() { + public static void loop() { while (true) { @Pc(17) Class3_Sub8 local17 = (Class3_Sub8) Static128.aClass69_77.method2287(); if (local17 == null) { @@ -18,7 +18,7 @@ public final class Static192 { if (local17.anInt1192 < 0) { local29 = -local17.anInt1192 - 1; if (local29 == Static16.anInt549) { - local40 = Static173.aClass8_Sub4_Sub1_2; + local40 = Static173.self; } else { local40 = Static159.aClass8_Sub4_Sub1Array1[local29]; } @@ -28,7 +28,7 @@ public final class Static192 { } if (local40 != null) { @Pc(63) LocType local63 = Static271.method4601(local17.anInt1189); - if (Static55.anInt1735 < 3) { + if (Static55.level < 3) { } @Pc(86) int local86; @Pc(83) int local83; @@ -43,33 +43,33 @@ 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.anIntArrayArrayArray4[Static55.anInt1735]; + @Pc(130) int[][] local130 = Static83.anIntArrayArrayArray4[Static55.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.anInt1735, local17.anInt1190, local17.anInt1204); + @Pc(176) Wall local176 = Static262.method4509(Static55.level, local17.anInt1190, local17.anInt1204); if (local176 != null) { local159 = local176.aClass8_5; } } else if (local164 == 1) { - @Pc(231) WallDecor local231 = Static83.method435(Static55.anInt1735, local17.anInt1190, local17.anInt1204); + @Pc(231) WallDecor local231 = Static83.method435(Static55.level, local17.anInt1190, local17.anInt1204); if (local231 != null) { local159 = local231.aClass8_3; } } else if (local164 == 2) { - @Pc(198) Scenery local198 = Static133.method4008(Static55.anInt1735, local17.anInt1190, local17.anInt1204); + @Pc(198) Scenery local198 = Static133.method4008(Static55.level, local17.anInt1190, local17.anInt1204); if (local198 != null) { local159 = local198.aClass8_4; } } else if (local164 == 3) { - @Pc(216) GroundDecor local216 = Static269.method2210(Static55.anInt1735, local17.anInt1190, local17.anInt1204); + @Pc(216) GroundDecor local216 = Static269.method2210(Static55.level, local17.anInt1190, local17.anInt1204); if (local216 != null) { local159 = local216.aClass8_1; } } if (local159 != null) { - Static29.method800(Static55.anInt1735, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1); + Static29.method800(Static55.level, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1); local40.anInt3375 = local17.anInt1205 + Static83.anInt372; local40.anInt3426 = local83 * 64 + local17.anInt1204 * 128; local40.anInt3379 = local86 * 64 + local17.anInt1190 * 128; diff --git a/client/src/main/java/Static193.java b/client/src/main/java/Static193.java index 8830473..a5a8bdc 100644 --- a/client/src/main/java/Static193.java +++ b/client/src/main/java/Static193.java @@ -8,7 +8,7 @@ public final class Static193 { public static int anInt4539; @OriginalMember(owner = "client!pi", name = "Y", descriptor = "I") - public static int anInt4542; + public static int keyChar; @OriginalMember(owner = "client!pi", name = "P", descriptor = "J") public static long aLong147 = 0L; @@ -23,7 +23,7 @@ public final class Static193 { public static void method3498(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) { @Pc(10) DelayedStateChange local10 = Static238.method4143(2, arg1); local10.method1017(); - local10.aClass100_254 = arg0; + local10.stringArg = arg0; } @OriginalMember(owner = "client!pi", name = "a", descriptor = "(JI)V") @@ -42,9 +42,9 @@ public final class Static193 { Static106.anIntArray258[local41] = Static106.anIntArray258[local41 + 1]; Static3.aBooleanArray135[local41] = Static3.aBooleanArray135[local41 + 1]; } - Static185.anInt4369 = Static119.anInt3028; - Static6.aClass3_Sub15_Sub1_1.method2242(57); - Static6.aClass3_Sub15_Sub1_1.p8(arg0); + Static185.anInt4369 = Static119.transmitTimer; + Static6.outboundBuffer.p1isaac(57); + Static6.outboundBuffer.p8(arg0); break; } } @@ -284,26 +284,26 @@ public final class Static193 { @Pc(23) int local23 = Static259.anIntArray514[arg0]; @Pc(27) int local27 = Static84.anIntArray209[arg0]; if (arg1 == 0) { - Static6.aClass3_Sub15_Sub1_1.method2242(215); - Static6.aClass3_Sub15_Sub1_1.p1(local13 + local13 + 3); + Static6.outboundBuffer.p1isaac(215); + Static6.outboundBuffer.p1(local13 + local13 + 3); } if (arg1 == 1) { - Static6.aClass3_Sub15_Sub1_1.method2242(39); - Static6.aClass3_Sub15_Sub1_1.p1(local13 + local13 + 3 + 14); + Static6.outboundBuffer.p1isaac(39); + Static6.outboundBuffer.p1(local13 + local13 + 3 + 14); } if (arg1 == 2) { - Static6.aClass3_Sub15_Sub1_1.method2242(77); - Static6.aClass3_Sub15_Sub1_1.p1(local13 + local13 + 3); + Static6.outboundBuffer.p1isaac(77); + Static6.outboundBuffer.p1(local13 + local13 + 3); } - Static6.aClass3_Sub15_Sub1_1.p1a(Static187.aBooleanArray101[82] ? 1 : 0); - Static6.aClass3_Sub15_Sub1_1.p2(Static225.anInt5068 + local23); - Static6.aClass3_Sub15_Sub1_1.p2add(Static142.anInt3483 + local27); + Static6.outboundBuffer.p1a(Static187.pressedKeys[82] ? 1 : 0); + Static6.outboundBuffer.p2(Static225.originX + local23); + Static6.outboundBuffer.p2add(Static142.originZ + local27); Static84.anInt2255 = Static84.anIntArray209[0]; Static115.anInt2939 = Static259.anIntArray514[0]; for (@Pc(126) int local126 = 1; local126 < local13; local126++) { arg0--; - Static6.aClass3_Sub15_Sub1_1.p1a(Static259.anIntArray514[arg0] - local23); - Static6.aClass3_Sub15_Sub1_1.p1sub(Static84.anIntArray209[arg0] - local27); + Static6.outboundBuffer.p1a(Static259.anIntArray514[arg0] - local23); + Static6.outboundBuffer.p1sub(Static84.anIntArray209[arg0] - local27); } } } diff --git a/client/src/main/java/Static195.java b/client/src/main/java/Static195.java index a8126b1..560848e 100644 --- a/client/src/main/java/Static195.java +++ b/client/src/main/java/Static195.java @@ -19,7 +19,7 @@ public final class Static195 { public static final short[] aShortArray64 = new short[] { -10304, 9104, -1, -1, -1 }; @OriginalMember(owner = "client!pk", name = "f", descriptor = "(B)I") - public static int method3531() { + public static int getIdleLoops() { return Static229.anInt5140; } @@ -27,7 +27,7 @@ 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.anInt1735 != local21.anInt4810 || local21.anInt4800 < Static83.anInt372) { + if (Static55.level != local21.anInt4810 || local21.anInt4800 < Static83.anInt372) { local16.method4658(); } else if (Static83.anInt372 >= local21.anInt4822) { if (local21.anInt4819 > 0) { @@ -40,7 +40,7 @@ public final class Static195 { @Pc(102) int local102 = -local21.anInt4819 - 1; @Pc(107) Player local107; if (Static16.anInt549 == local102) { - local107 = Static173.aClass8_Sub4_Sub1_2; + local107 = Static173.self; } else { local107 = Static159.aClass8_Sub4_Sub1Array1[local102]; } @@ -49,7 +49,7 @@ public final class Static195 { } } local21.method3704(Static178.anInt4247); - Static43.method1141(Static55.anInt1735, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false); + Static43.method1141(Static55.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false); } } } diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java index d88b3c4..2a4313d 100644 --- a/client/src/main/java/Static197.java +++ b/client/src/main/java/Static197.java @@ -31,7 +31,7 @@ public final class Static197 { if (local17.status == 2) { return new Class114[0]; } - @Pc(39) int[] local39 = (int[]) local17.anObject6; + @Pc(39) int[] local39 = (int[]) local17.result; @Pc(45) Class114[] local45 = new Class114[local39.length >> 2]; for (@Pc(47) int local47 = 0; local47 < local45.length; local47++) { @Pc(59) Class114 local59 = new Class114(); @@ -199,10 +199,10 @@ public final class Static197 { } else { Static124.aBoolean156 = false; } - if (Static154.anInt3711 != -1) { + if (Static154.topLevelInterace != -1) { Static210.method3712(true); } - if (Static124.aClass95_2 != null && (Static244.anInt5370 == 30 || Static244.anInt5370 == 25)) { + if (Static124.socket != null && (Static244.anInt5370 == 30 || Static244.anInt5370 == 25)) { Static59.method1373(); } for (@Pc(466) int local466 = 0; local466 < 100; local466++) { diff --git a/client/src/main/java/Static198.java b/client/src/main/java/Static198.java index a6d1260..f8f3968 100644 --- a/client/src/main/java/Static198.java +++ b/client/src/main/java/Static198.java @@ -55,7 +55,7 @@ public final class Static198 { Static65.anInt1951 = -1; return; } - @Pc(38) int local38 = Static207.method3685(Static55.anInt1735, arg5, arg2) - arg3; + @Pc(38) int local38 = Static207.method3685(Static55.level, arg5, arg2) - arg3; @Pc(42) int local42 = arg2 - Static134.anInt3302; @Pc(46) int local46 = local38 - Static5.anInt40; @Pc(50) int local50 = arg5 - Static138.anInt3439; diff --git a/client/src/main/java/Static2.java b/client/src/main/java/Static2.java index c8673d7..d840e04 100644 --- a/client/src/main/java/Static2.java +++ b/client/src/main/java/Static2.java @@ -41,8 +41,8 @@ public final class Static2 { @Pc(23) Component local23 = arg0[local11]; if (local23 != null) { if (local23.anInt452 == 0) { - if (local23.aClass13Array3 != null) { - method7(local23.aClass13Array3, arg1); + if (local23.createdComponents != null) { + method7(local23.createdComponents, arg1); } @Pc(49) Class3_Sub31 local49 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local23.anInt507); if (local49 != null) { @@ -53,19 +53,19 @@ public final class Static2 { if (arg1 == 0 && local23.anObjectArray12 != null) { local72 = new HookRequest(); local72.anObjectArray31 = local23.anObjectArray12; - local72.aClass13_17 = local23; + local72.source = local23; Static82.method1767(local72); } if (arg1 == 1 && local23.anObjectArray8 != null) { - if (local23.anInt457 >= 0) { - @Pc(103) Component local103 = Static5.method32(local23.anInt507); - if (local103 == null || local103.aClass13Array3 == null || local23.anInt457 >= local103.aClass13Array3.length || local103.aClass13Array3[local23.anInt457] != local23) { + if (local23.componentId >= 0) { + @Pc(103) Component local103 = Static5.getComponent(local23.anInt507); + if (local103 == null || local103.createdComponents == null || local23.componentId >= local103.createdComponents.length || local103.createdComponents[local23.componentId] != local23) { continue; } } local72 = new HookRequest(); local72.anObjectArray31 = local23.anObjectArray8; - local72.aClass13_17 = local23; + local72.source = local23; Static82.method1767(local72); } } @@ -92,7 +92,7 @@ public final class Static2 { @Pc(61) int local61 = 0; @Pc(64) int local64 = local53 + 1; Static84.anIntArray209[0] = arg3; - @Pc(71) int[][] local71 = Static148.aClass97Array1[Static55.anInt1735].anIntArrayArray30; + @Pc(71) int[][] local71 = Static148.aClass97Array1[Static55.level].anIntArrayArray30; @Pc(193) int local193; while (local61 != local64) { local3 = Static259.anIntArray514[local61]; @@ -103,16 +103,16 @@ public final class Static2 { break; } if (arg1 != 0) { - if ((arg1 < 5 || arg1 == 10) && Static148.aClass97Array1[Static55.anInt1735].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) { + if ((arg1 < 5 || arg1 == 10) && Static148.aClass97Array1[Static55.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) { local59 = true; break; } - if (arg1 < 10 && Static148.aClass97Array1[Static55.anInt1735].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) { + if (arg1 < 10 && Static148.aClass97Array1[Static55.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) { local59 = true; break; } } - if (arg0 != 0 && arg6 != 0 && Static148.aClass97Array1[Static55.anInt1735].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) { + if (arg0 != 0 && arg6 != 0 && Static148.aClass97Array1[Static55.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) { local59 = true; break; } @@ -250,9 +250,9 @@ public final class Static2 { @OriginalMember(owner = "client!aa", name = "a", descriptor = "(IZI)V") public static void method10(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - Static6.aClass3_Sub15_Sub1_1.method2242(132); - Static6.aClass3_Sub15_Sub1_1.p4rme(arg1); - Static6.aClass3_Sub15_Sub1_1.p2le(arg0); + Static6.outboundBuffer.p1isaac(132); + Static6.outboundBuffer.p4rme(arg1); + Static6.outboundBuffer.p2le(arg0); } @OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!be;)V") @@ -279,22 +279,22 @@ public final class Static2 { arg0.anInt477 = Static158.anInt3851; } } else if (local16 == 327) { - arg0.anInt450 = 150; - arg0.anInt524 = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF; - arg0.anInt464 = 5; - arg0.anInt463 = -1; + arg0.modelXAngle = 150; + arg0.modelYAngle = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF; + arg0.modelType = 5; + arg0.modelId = -1; } else if (local16 == 328) { - if (Static173.aClass8_Sub4_Sub1_2.aClass100_364 == null) { - arg0.anInt463 = 0; + if (Static173.self.aClass100_364 == null) { + arg0.modelId = 0; } else { - arg0.anInt450 = 150; - arg0.anInt524 = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF; - arg0.anInt464 = 5; - arg0.anInt463 = ((int) Static173.aClass8_Sub4_Sub1_2.aClass100_364.method3158() << 11) + 2047; - arg0.anInt496 = Static173.aClass8_Sub4_Sub1_2.anInt3388; + arg0.modelXAngle = 150; + arg0.modelYAngle = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF; + arg0.modelType = 5; + arg0.modelId = ((int) Static173.self.aClass100_364.method3158() << 11) + 2047; + arg0.anInt496 = Static173.self.anInt3388; arg0.anInt500 = 0; - arg0.anInt522 = Static173.aClass8_Sub4_Sub1_2.anInt3366; - arg0.anInt510 = Static173.aClass8_Sub4_Sub1_2.anInt3407; + arg0.anInt522 = Static173.self.anInt3366; + arg0.anInt510 = Static173.self.anInt3407; } } } diff --git a/client/src/main/java/Static201.java b/client/src/main/java/Static201.java index 4c15ffd..f886aa5 100644 --- a/client/src/main/java/Static201.java +++ b/client/src/main/java/Static201.java @@ -24,13 +24,13 @@ public final class Static201 { @OriginalMember(owner = "client!qf", name = "a", descriptor = "(BII)Lclient!be;") public static Component method1418(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(7) Component local7 = Static5.method32(arg0); + @Pc(7) Component local7 = Static5.getComponent(arg0); if (arg1 == -1) { return local7; - } else if (local7 == null || local7.aClass13Array3 == null || local7.aClass13Array3.length <= arg1) { + } else if (local7 == null || local7.createdComponents == null || local7.createdComponents.length <= arg1) { return null; } else { - return local7.aClass13Array3[arg1]; + return local7.createdComponents[arg1]; } } } diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java index 440ca23..c65882a 100644 --- a/client/src/main/java/Static203.java +++ b/client/src/main/java/Static203.java @@ -63,7 +63,7 @@ public final class Static203 { } else { Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246); } - if (Static154.anInt3711 != -1) { + if (Static154.topLevelInterace != -1) { Static210.method3712(true); } Static139.method2704(); @@ -78,7 +78,7 @@ public final class Static203 { Static231.method3983(1L); } if (local16.status == 1) { - local11 = (FileOnDisk) local16.anObject6; + local11 = (FileOnDisk) local16.result; @Pc(39) Buffer local39 = Static48.method1196(); local11.method5134(local39.data, local39.offset, 0); } diff --git a/client/src/main/java/Static205.java b/client/src/main/java/Static205.java index 2b3cd73..a2015ba 100644 --- a/client/src/main/java/Static205.java +++ b/client/src/main/java/Static205.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static205 { @OriginalMember(owner = "client!qj", name = "i", descriptor = "[I") - public static final int[] anIntArray426 = new int[128]; + public static final int[] keyChars = new int[128]; @OriginalMember(owner = "client!qj", name = "a", descriptor = "(Lclient!be;BI)Lclient!na;") public static JagString method3677(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1) { diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java index 00fa77c..c34f03c 100644 --- a/client/src/main/java/Static207.java +++ b/client/src/main/java/Static207.java @@ -109,23 +109,23 @@ public final class Static207 { if (Static72.aClass212_3.status != 1) { return -1; } - Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink); - Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink); + Static6.outboundBuffer.offset = 0; Static72.aClass212_3 = null; local82 = 0; if (Static61.aBoolean109) { local82 = Static80.anInt4702; } - Static6.aClass3_Sub15_Sub1_1.p1(255); - Static6.aClass3_Sub15_Sub1_1.p4(local82); - Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); + Static6.outboundBuffer.p1(255); + Static6.outboundBuffer.p4(local82); + Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } if (Static147.aClass62_2 != null) { Static147.aClass62_2.method3571(); } - local124 = Static124.aClass95_2.read(); + local124 = Static124.socket.read(); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } @@ -138,12 +138,12 @@ public final class Static207 { Static82.anInt2231 = 2; } if (Static82.anInt2231 == 2) { - if (Static124.aClass95_2.available() < 2) { + if (Static124.socket.available() < 2) { return -1; } - Static116.anInt2961 = Static124.aClass95_2.read(); + Static116.anInt2961 = Static124.socket.read(); Static116.anInt2961 <<= 0x8; - Static116.anInt2961 += Static124.aClass95_2.read(); + Static116.anInt2961 += Static124.socket.read(); Static82.anInt2231 = 3; Static141.anInt3469 = 0; Static229.aByteArray70 = new byte[Static116.anInt2961]; @@ -151,14 +151,14 @@ public final class Static207 { if (Static82.anInt2231 != 3) { return -1; } - local82 = Static124.aClass95_2.available(); + local82 = Static124.socket.available(); if (local82 < 1) { return -1; } if (local82 > Static116.anInt2961 - Static141.anInt3469) { local82 = Static116.anInt2961 - Static141.anInt3469; } - Static124.aClass95_2.method2827(Static141.anInt3469, local82, Static229.aByteArray70); + Static124.socket.method2827(Static141.anInt3469, local82, Static229.aByteArray70); Static141.anInt3469 += local82; if (Static141.anInt3469 < Static116.anInt2961) { return -1; @@ -171,8 +171,8 @@ public final class Static207 { Static101.aClass10_Sub1Array1[local124++] = local247; } } - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; Static127.anInt3132 = 0; Static82.anInt2231 = 0; Static229.aByteArray70 = null; diff --git a/client/src/main/java/Static209.java b/client/src/main/java/Static209.java index 8b9da1f..2756587 100644 --- a/client/src/main/java/Static209.java +++ b/client/src/main/java/Static209.java @@ -11,7 +11,7 @@ public final class Static209 { public static Js5 aClass153_86; @OriginalMember(owner = "client!ra", name = "J", descriptor = "I") - public static int anInt4808 = 0; + public static int miscTransmitAt = 0; @OriginalMember(owner = "client!ra", name = "R", descriptor = "Z") public static boolean aBoolean240 = true; @@ -53,8 +53,8 @@ public final class Static209 { public static void method3707(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @Pc(12) DelayedStateChange local12 = Static238.method4143(9, arg0); local12.method1017(); - local12.anInt1271 = arg2; - local12.anInt1270 = arg1; + local12.intArg1 = arg2; + local12.intArg3 = arg1; } @OriginalMember(owner = "client!ra", name = "a", descriptor = "(IBILclient!ve;)[Lclient!qf;") diff --git a/client/src/main/java/Static210.java b/client/src/main/java/Static210.java index af6eb48..add9b3d 100644 --- a/client/src/main/java/Static210.java +++ b/client/src/main/java/Static210.java @@ -21,7 +21,7 @@ public final class Static210 { @OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V") public static void method3712(@OriginalArg(0) boolean arg0) { - Static234.method4017(Static254.anInt5554, arg0, Static154.anInt3711, Static48.anInt1448); + Static234.method4017(Static254.anInt5554, arg0, Static154.topLevelInterace, Static48.anInt1448); } @OriginalMember(owner = "client!rb", name = "a", descriptor = "(Lclient!wa;Z)Lclient!bn;") diff --git a/client/src/main/java/Static214.java b/client/src/main/java/Static214.java index b7378fc..a8a267c 100644 --- a/client/src/main/java/Static214.java +++ b/client/src/main/java/Static214.java @@ -29,7 +29,7 @@ public final class Static214 { public static void method4359(@OriginalArg(0) Player arg0) { @Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.method3863(arg0.aClass100_364.method3158()); if (local12 == null) { - Static122.method2411(arg0.anIntArray317[0], null, 0, null, arg0.anIntArray318[0], Static55.anInt1735, arg0); + Static122.method2411(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Static55.level, arg0); } else { local12.method1567(); } diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java index cf082d1..5f27456 100644 --- a/client/src/main/java/Static216.java +++ b/client/src/main/java/Static216.java @@ -22,9 +22,9 @@ public final class Static216 { } try { if (++Static92.anInt2430 > 2000) { - if (Static124.aClass95_2 != null) { - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + if (Static124.socket != null) { + Static124.socket.method2834(); + Static124.socket = null; } if (Static276.anInt5816 >= 1) { Static266.anInt5336 = -5; @@ -51,21 +51,21 @@ public final class Static216 { if (Static72.aClass212_3.status != 1) { return; } - Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink); + Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink); Static72.aClass212_3 = null; @Pc(106) long local106 = Static101.aLong98 = Static186.aClass100_829.method3158(); - Static6.aClass3_Sub15_Sub1_1.offset = 0; - Static6.aClass3_Sub15_Sub1_1.p1(14); + Static6.outboundBuffer.offset = 0; + Static6.outboundBuffer.p1(14); @Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL); - Static6.aClass3_Sub15_Sub1_1.p1(local120); - Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, 2); + Static6.outboundBuffer.p1(local120); + Static124.socket.write(Static6.outboundBuffer.data, 2); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } if (Static147.aClass62_2 != null) { Static147.aClass62_2.method3571(); } - @Pc(150) int local150 = Static124.aClass95_2.read(); + @Pc(150) int local150 = Static124.socket.read(); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } @@ -75,40 +75,40 @@ public final class Static216 { if (local150 != 0) { Static266.anInt5336 = local150; Static184.anInt4348 = 0; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; return; } Static184.anInt4348 = 3; } if (Static184.anInt4348 == 3) { - if (Static124.aClass95_2.available() < 8) { + if (Static124.socket.available() < 8) { return; } - Static124.aClass95_2.method2827(0, 8, Static57.aClass3_Sub15_Sub1_3.data); + Static124.socket.method2827(0, 8, Static57.aClass3_Sub15_Sub1_3.data); Static57.aClass3_Sub15_Sub1_3.offset = 0; Static193.aLong147 = Static57.aClass3_Sub15_Sub1_3.g8(); @Pc(210) int[] local210 = new int[4]; - Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static6.outboundBuffer.offset = 0; local210[2] = (int) (Static193.aLong147 >> 32); local210[3] = (int) Static193.aLong147; local210[1] = (int) (Math.random() * 9.9999999E7D); local210[0] = (int) (Math.random() * 9.9999999E7D); - Static6.aClass3_Sub15_Sub1_1.p1(10); - Static6.aClass3_Sub15_Sub1_1.p4(local210[0]); - Static6.aClass3_Sub15_Sub1_1.p4(local210[1]); - Static6.aClass3_Sub15_Sub1_1.p4(local210[2]); - Static6.aClass3_Sub15_Sub1_1.p4(local210[3]); - Static6.aClass3_Sub15_Sub1_1.p8(Static186.aClass100_829.method3158()); - Static6.aClass3_Sub15_Sub1_1.pjstr(Static186.aClass100_828); - Static6.aClass3_Sub15_Sub1_1.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2); + Static6.outboundBuffer.p1(10); + Static6.outboundBuffer.p4(local210[0]); + Static6.outboundBuffer.p4(local210[1]); + Static6.outboundBuffer.p4(local210[2]); + Static6.outboundBuffer.p4(local210[3]); + Static6.outboundBuffer.p8(Static186.aClass100_829.method3158()); + Static6.outboundBuffer.pjstr(Static186.aClass100_828); + Static6.outboundBuffer.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2); Static17.aClass3_Sub15_Sub1_2.offset = 0; if (Static244.anInt5370 == 40) { Static17.aClass3_Sub15_Sub1_2.p1(18); } else { Static17.aClass3_Sub15_Sub1_2.p1(16); } - Static17.aClass3_Sub15_Sub1_2.p2(Static6.aClass3_Sub15_Sub1_1.offset + Static229.method3937(Static47.aClass100_991) + 159); + Static17.aClass3_Sub15_Sub1_2.p2(Static6.outboundBuffer.offset + Static229.method3937(Static47.aClass100_991) + 159); Static17.aClass3_Sub15_Sub1_2.p4(530); Static17.aClass3_Sub15_Sub1_2.p1(Static5.anInt39); Static17.aClass3_Sub15_Sub1_2.p1(Static249.aBoolean282 ? 1 : 0); @@ -121,7 +121,7 @@ public final class Static216 { Static17.aClass3_Sub15_Sub1_2.pjstr(Static47.aClass100_991); Static17.aClass3_Sub15_Sub1_2.p4(Static204.anInt4760); Static17.aClass3_Sub15_Sub1_2.p4(Static145.method2746()); - Static18.aBoolean39 = true; + Static18.sentToServer = true; Static17.aClass3_Sub15_Sub1_2.p2(Static189.anInt4443); Static17.aClass3_Sub15_Sub1_2.p4(Static213.aClass153_88.method4480()); Static17.aClass3_Sub15_Sub1_2.p4(Static249.aClass153_100.method4480()); @@ -151,9 +151,9 @@ public final class Static216 { Static17.aClass3_Sub15_Sub1_2.p4(Static28.aClass153_18.method4480()); Static17.aClass3_Sub15_Sub1_2.p4(Static167.aClass153_63.method4480()); Static17.aClass3_Sub15_Sub1_2.p4(Static226.aClass153_93.method4480()); - Static17.aClass3_Sub15_Sub1_2.pBytes(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); - Static124.aClass95_2.write(Static17.aClass3_Sub15_Sub1_2.data, Static17.aClass3_Sub15_Sub1_2.offset); - Static6.aClass3_Sub15_Sub1_1.method2240(local210); + Static17.aClass3_Sub15_Sub1_2.pBytes(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); + Static124.socket.write(Static17.aClass3_Sub15_Sub1_2.data, Static17.aClass3_Sub15_Sub1_2.offset); + Static6.outboundBuffer.method2240(local210); for (@Pc(583) int local583 = 0; local583 < 4; local583++) { local210[local583] += 50; } @@ -161,10 +161,10 @@ public final class Static216 { Static184.anInt4348 = 4; } if (Static184.anInt4348 == 4) { - if (Static124.aClass95_2.available() < 1) { + if (Static124.socket.available() < 1) { return; } - @Pc(623) int local623 = Static124.aClass95_2.read(); + @Pc(623) int local623 = Static124.socket.read(); if (local623 == 21) { Static184.anInt4348 = 7; } else if (local623 == 29) { @@ -183,59 +183,59 @@ public final class Static216 { Static184.anInt4348 = 1; Static276.anInt5816++; Static92.anInt2430 = 0; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; return; } else { Static266.anInt5336 = local623; Static184.anInt4348 = 0; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; return; } } if (Static184.anInt4348 == 6) { - Static6.aClass3_Sub15_Sub1_1.offset = 0; - Static6.aClass3_Sub15_Sub1_1.method2242(17); - Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); + Static6.outboundBuffer.offset = 0; + Static6.outboundBuffer.p1isaac(17); + Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); Static184.anInt4348 = 4; return; } if (Static184.anInt4348 == 7) { - if (Static124.aClass95_2.available() >= 1) { - Static231.anInt5202 = (Static124.aClass95_2.read() + 3) * 60; + if (Static124.socket.available() >= 1) { + Static231.anInt5202 = (Static124.socket.read() + 3) * 60; Static184.anInt4348 = 0; Static266.anInt5336 = 21; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; return; } return; } if (Static184.anInt4348 == 10) { - if (Static124.aClass95_2.available() >= 1) { - Static204.anInt4765 = Static124.aClass95_2.read(); + if (Static124.socket.available() >= 1) { + Static204.anInt4765 = Static124.socket.read(); Static184.anInt4348 = 0; Static266.anInt5336 = 29; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; return; } return; } if (Static184.anInt4348 == 8) { - if (Static124.aClass95_2.available() < 14) { + if (Static124.socket.available() < 14) { return; } - Static124.aClass95_2.method2827(0, 14, Static57.aClass3_Sub15_Sub1_3.data); + Static124.socket.method2827(0, 14, Static57.aClass3_Sub15_Sub1_3.data); Static57.aClass3_Sub15_Sub1_3.offset = 0; - Static191.anInt4502 = Static57.aClass3_Sub15_Sub1_3.g1(); + Static191.staffModLevel = Static57.aClass3_Sub15_Sub1_3.g1(); Static249.anInt5431 = Static57.aClass3_Sub15_Sub1_3.g1(); Static124.aBoolean157 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; Static207.aBoolean236 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; Static25.aBoolean57 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; Static86.aBoolean129 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; - Static245.aBoolean281 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; + Static245.enabled = Static57.aClass3_Sub15_Sub1_3.g1() == 1; Static16.anInt549 = Static57.aClass3_Sub15_Sub1_3.g2(); Static202.aBoolean233 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; Static2.aBoolean1 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; @@ -259,11 +259,11 @@ public final class Static216 { Static184.anInt4348 = 9; } if (Static184.anInt4348 == 9) { - if (Static124.aClass95_2.available() < Static223.anInt5028) { + if (Static124.socket.available() < Static223.anInt5028) { return; } Static57.aClass3_Sub15_Sub1_3.offset = 0; - Static124.aClass95_2.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); + Static124.socket.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); Static266.anInt5336 = 2; Static184.anInt4348 = 0; Static243.method4221(); @@ -273,9 +273,9 @@ public final class Static216 { return; } } catch (@Pc(977) IOException local977) { - if (Static124.aClass95_2 != null) { - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + if (Static124.socket != null) { + Static124.socket.method2834(); + Static124.socket = null; } if (Static276.anInt5816 >= 1) { Static184.anInt4348 = 0; diff --git a/client/src/main/java/Static217.java b/client/src/main/java/Static217.java index 17aaf04..fd6b7d4 100644 --- a/client/src/main/java/Static217.java +++ b/client/src/main/java/Static217.java @@ -24,17 +24,17 @@ public final class Static217 { @OriginalMember(owner = "client!rj", name = "a", descriptor = "(IIILclient!e;I)V") public static void method3767(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2, @OriginalArg(4) int arg3) { - if (Static173.aClass8_Sub4_Sub1_2 == arg2 || Static231.anInt5204 >= 400) { + if (Static173.self == arg2 || Static231.anInt5204 >= 400) { return; } @Pc(158) JagString local158; if (arg2.anInt1671 == 0) { @Pc(22) boolean local22 = true; - if (Static173.aClass8_Sub4_Sub1_2.anInt1667 != -1 && arg2.anInt1667 != -1) { - @Pc(43) int local43 = arg2.anInt1652 < Static173.aClass8_Sub4_Sub1_2.anInt1652 ? Static173.aClass8_Sub4_Sub1_2.anInt1652 : arg2.anInt1652; - @Pc(58) int local58 = Static173.aClass8_Sub4_Sub1_2.anInt1667 < arg2.anInt1667 ? Static173.aClass8_Sub4_Sub1_2.anInt1667 : arg2.anInt1667; + if (Static173.self.anInt1667 != -1 && arg2.anInt1667 != -1) { + @Pc(43) int local43 = arg2.anInt1652 < Static173.self.anInt1652 ? Static173.self.anInt1652 : arg2.anInt1652; + @Pc(58) int local58 = Static173.self.anInt1667 < arg2.anInt1667 ? Static173.self.anInt1667 : arg2.anInt1667; @Pc(69) int local69 = local43 * 10 / 100 + local58 + 5; - @Pc(76) int local76 = Static173.aClass8_Sub4_Sub1_2.anInt1652 - arg2.anInt1652; + @Pc(76) int local76 = Static173.self.anInt1652 - arg2.anInt1652; if (local76 < 0) { local76 = -local76; } @@ -44,9 +44,9 @@ public final class Static217 { } @Pc(95) JagString local95 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL; if (arg2.anInt1652 < arg2.anInt1656) { - local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.aClass8_Sub4_Sub1_2.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static78.aClass100_465, Static123.method2423(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 }); + local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static78.aClass100_465, Static123.method2423(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 }); } else { - local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.aClass8_Sub4_Sub1_2.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static72.aClass100_448 }); + local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static72.aClass100_448 }); } } else { local158 = Static34.method882(new JagString[] { arg2.method1264(), Static123.aClass100_593, LocalizedText.SKILL, Static123.method2423(arg2.anInt1671), Static72.aClass100_448 }); @@ -59,11 +59,11 @@ public final class Static217 { if (Static160.aClass100Array121[local275] != null) { @Pc(291) short local291 = 0; if (Static266.game == 0 && Static160.aClass100Array121[local275].method3111(LocalizedText.ATTACK)) { - if (arg2.anInt1652 > Static173.aClass8_Sub4_Sub1_2.anInt1652) { + if (arg2.anInt1652 > Static173.self.anInt1652) { local291 = 2000; } - if (Static173.aClass8_Sub4_Sub1_2.anInt1650 != 0 && arg2.anInt1650 != 0) { - if (Static173.aClass8_Sub4_Sub1_2.anInt1650 == arg2.anInt1650) { + if (Static173.self.anInt1650 != 0 && arg2.anInt1650 != 0) { + if (Static173.self.anInt1650 == arg2.anInt1650) { local291 = 2000; } else { local291 = 0; diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 1e20477..d01d2da 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -18,9 +18,9 @@ public final class Static220 { @OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V") public static void method3797(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - @Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Static55.anInt1735][arg1][arg0]; + @Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Static55.level][arg1][arg0]; if (local9 == null) { - Static187.method3420(Static55.anInt1735, arg1, arg0); + Static187.method3420(Static55.level, arg1, arg0); return; } @Pc(28) int local28 = -99999999; @@ -38,7 +38,7 @@ public final class Static220 { } } if (local30 == null) { - Static187.method3420(Static55.anInt1735, arg1, arg0); + Static187.method3420(Static55.level, arg1, arg0); return; } local9.method2283(local30); @@ -56,7 +56,7 @@ public final class Static220 { } } @Pc(152) long local152 = (long) ((arg0 << 7) + arg1 + 1610612736); - Static69.method1543(Static55.anInt1735, arg1, arg0, Static207.method3685(Static55.anInt1735, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91); + Static69.method1543(Static55.level, arg1, arg0, Static207.method3685(Static55.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91); } @OriginalMember(owner = "client!rm", name = "a", descriptor = "(JB)V") @@ -90,18 +90,18 @@ public final class Static220 { @Pc(94) int local94; if (Static239.aBoolean269) { @Pc(68) GlModel local68 = (GlModel) local10; - if (arg5 != Static207.method3685(Static55.anInt1735, arg3 + local42, arg1 + local48) || arg5 != Static207.method3685(Static55.anInt1735, arg3 + local45, local51 + arg1)) { + if (arg5 != Static207.method3685(Static55.level, arg3 + local42, arg1 + local48) || arg5 != Static207.method3685(Static55.level, arg3 + local45, local51 + arg1)) { for (local94 = 0; local94 < local68.anInt5295; local94++) { - local68.anIntArray465[local94] += Static207.method3685(Static55.anInt1735, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5; + local68.anIntArray465[local94] += Static207.method3685(Static55.level, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5; } local68.aClass127_4.aBoolean235 = false; local68.aClass5_1.aBoolean3 = false; } } else { @Pc(142) SoftwareModel local142 = (SoftwareModel) local10; - if (arg5 != Static207.method3685(Static55.anInt1735, local42 + arg3, local48 + arg1) || arg5 != Static207.method3685(Static55.anInt1735, arg3 + local45, local51 + arg1)) { + if (arg5 != Static207.method3685(Static55.level, local42 + arg3, local48 + arg1) || arg5 != Static207.method3685(Static55.level, arg3 + local45, local51 + arg1)) { for (local94 = 0; local94 < local142.anInt5788; local94++) { - local142.anIntArray527[local94] += Static207.method3685(Static55.anInt1735, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5; + local142.anIntArray527[local94] += Static207.method3685(Static55.level, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5; } local142.aBoolean305 = false; } diff --git a/client/src/main/java/Static225.java b/client/src/main/java/Static225.java index 4a99c12..76d4daf 100644 --- a/client/src/main/java/Static225.java +++ b/client/src/main/java/Static225.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static225 { @OriginalMember(owner = "client!se", name = "a", descriptor = "I") - public static int anInt5068; + public static int originX; @OriginalMember(owner = "client!se", name = "l", descriptor = "Lclient!ve;") public static Js5 aClass153_92; @@ -53,7 +53,7 @@ public final class Static225 { if (local121 > 15) { local121 -= 32; } - local65.method1265(local92 + Static173.aClass8_Sub4_Sub1_2.anIntArray318[0], local116 == 1, Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] + local121); + local65.method1265(local92 + Static173.self.movementQueueX[0], local116 == 1, Static173.self.movementQueueZ[0] + local121); continue; } } @@ -74,7 +74,7 @@ public final class Static225 { public static void method3893(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(14) DelayedStateChange local14 = Static238.method4143(5, arg0); local14.method1017(); - local14.anInt1271 = arg1; + local14.intArg1 = arg1; } @OriginalMember(owner = "client!se", name = "a", descriptor = "(Lclient!na;Lclient!na;IB)V") @@ -98,10 +98,10 @@ public final class Static225 { local43.pjstr(Static186.aClass100_828); local43.p4((int) (Math.random() * 9.9999999E7D)); local43.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2); - Static6.aClass3_Sub15_Sub1_1.offset = 0; - Static6.aClass3_Sub15_Sub1_1.p1(210); - Static6.aClass3_Sub15_Sub1_1.p1(local43.offset); - Static6.aClass3_Sub15_Sub1_1.pBytes(local43.data, local43.offset); + Static6.outboundBuffer.offset = 0; + Static6.outboundBuffer.p1(210); + Static6.outboundBuffer.p1(local43.offset); + Static6.outboundBuffer.pBytes(local43.data, local43.offset); } else { Static49.method1208(); } diff --git a/client/src/main/java/Static226.java b/client/src/main/java/Static226.java index af08b5b..7069628 100644 --- a/client/src/main/java/Static226.java +++ b/client/src/main/java/Static226.java @@ -23,7 +23,7 @@ public final class Static226 { public static final JagString aClass100_965 = Static28.parse(""); @OriginalMember(owner = "client!sf", name = "h", descriptor = "[Lclient!na;") - public static final JagString[] aClass100Array154 = new JagString[1000]; + public static final JagString[] varcstrs = new JagString[1000]; @OriginalMember(owner = "client!sf", name = "i", descriptor = "I") public static int anInt5084 = 0; @@ -97,7 +97,7 @@ public final class Static226 { Static60.aBoolean108 = true; Static24.anInt761 = local16; } - } else if (Static155.anInt3751 == Static7.anInt985 && Static60.anInt1892 == Static60.anInt1893) { + } else if (Static155.anInt3751 == Static7.clickX && Static60.anInt1892 == Static60.clickY) { Static183.anInt4271 = local27; Static162.anInt3953 = 0; Static24.anInt761 = local16; @@ -105,8 +105,8 @@ public final class Static226 { Static13.anInt436 = (Static261.aBoolean298 ? 26 : 22) + Static231.anInt5204 * 15; Static60.aBoolean108 = true; } else { - Static280.anInt5895 = Static60.anInt1893; - Static277.anInt5850 = Static7.anInt985; + Static280.anInt5895 = Static60.clickY; + Static277.anInt5850 = Static7.clickX; Static162.anInt3953 = 1; } } diff --git a/client/src/main/java/Static227.java b/client/src/main/java/Static227.java index 5f4032b..d5f600b 100644 --- a/client/src/main/java/Static227.java +++ b/client/src/main/java/Static227.java @@ -27,7 +27,7 @@ public final class Static227 { public static final JagString aClass100_966 = Static28.parse("settings"); @OriginalMember(owner = "client!sg", name = "q", descriptor = "[I") - public static final int[] anIntArray447 = new int[128]; + public static final int[] keyCodes = new int[128]; @OriginalMember(owner = "client!sg", name = "a", descriptor = "(B)V") public static void method3903() { diff --git a/client/src/main/java/Static229.java b/client/src/main/java/Static229.java index 0bc6389..2389ec2 100644 --- a/client/src/main/java/Static229.java +++ b/client/src/main/java/Static229.java @@ -50,6 +50,6 @@ public final class Static229 { public static void method3938(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(16) DelayedStateChange local16 = Static238.method4143(12, arg1); local16.method1017(); - local16.anInt1271 = arg0; + local16.intArg1 = arg0; } } diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java index 43b5eba..cd229b5 100644 --- a/client/src/main/java/Static233.java +++ b/client/src/main/java/Static233.java @@ -50,7 +50,7 @@ public final class Static233 { public static final JagString aClass100_994 = Static28.parse(")3"); @OriginalMember(owner = "client!t", name = "E", descriptor = "[I") - public static final int[] anIntArray452 = new int[32]; + public static final int[] updatedVarcstrs = new int[32]; @OriginalMember(owner = "client!t", name = "F", descriptor = "I") public static int js5PrevErrors = 0; @@ -67,7 +67,7 @@ public final class Static233 { while (local5.length > local3) { @Pc(17) Class102 local17 = local5[local3]; if (local17 != null && local17.anInt4058 == 2) { - Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.anInt3483 << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.anInt4053 - Static225.anInt5068 << 7), arg3); + 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.anInt372 % 20 < 10) { Static276.aClass3_Sub2_Sub1Array11[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548); } @@ -139,19 +139,19 @@ public final class Static233 { if (local24 != 0) { local73 = (local73 << local24 & 0xF) + (local73 >> 4 - local24); } - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, local59, true, local73, arg2, local62, 0, 2, arg1, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, local59, true, local73, arg2, local62, 0, 2, arg1, Static173.self.movementQueueX[0]); } else { - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], local24, 0, true, 0, arg2, 0, local12 + 1, 2, arg1, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], local24, 0, true, 0, arg2, 0, local12 + 1, 2, arg1, Static173.self.movementQueueX[0]); } - Static25.anInt826 = Static60.anInt1893; - Static17.anInt577 = 0; - Static70.anInt2013 = 2; - Static122.anInt3047 = Static7.anInt985; + Static25.y = Static60.clickY; + Static17.milliseconds = 0; + Static70.type = 2; + Static122.x = Static7.clickX; return true; } @OriginalMember(owner = "client!t", name = "a", descriptor = "(Lclient!i;II)V") - public static void method4005(@OriginalArg(0) Packet arg0) { + public static void loop(@OriginalArg(0) Packet arg0) { while (true) { @Pc(18) ReflectionCheck local18 = (ReflectionCheck) Static204.aClass69_113.method2289(); if (local18 == null) { @@ -180,7 +180,7 @@ public final class Static233 { if (local23) { return; } - arg0.method2242(163); + arg0.p1isaac(163); arg0.p1(0); local25 = arg0.offset; arg0.p4(local18.anInt1732); @@ -191,23 +191,23 @@ public final class Static233 { @Pc(168) Field local168; @Pc(195) int local195; if (local151 == 0) { - local168 = (Field) local18.aClass212Array2[local121].anObject6; + local168 = (Field) local18.aClass212Array2[local121].result; local195 = local168.getInt(null); arg0.p1(0); arg0.p4(local195); } else if (local151 == 1) { - local168 = (Field) local18.aClass212Array2[local121].anObject6; + local168 = (Field) local18.aClass212Array2[local121].result; local168.setInt(null, local18.anIntArray137[local121]); arg0.p1(0); } else if (local151 == 2) { - local168 = (Field) local18.aClass212Array2[local121].anObject6; + local168 = (Field) local18.aClass212Array2[local121].result; local195 = local168.getModifiers(); arg0.p1(0); arg0.p4(local195); } @Pc(234) Method local234; if (local151 == 3) { - local234 = (Method) local18.aClass212Array1[local121].anObject6; + local234 = (Method) local18.aClass212Array1[local121].result; @Pc(239) byte[][] local239 = local18.aByteArrayArrayArray6[local121]; @Pc(243) Object[] local243 = new Object[local239.length]; for (@Pc(245) int local245 = 0; local245 < local239.length; local245++) { @@ -227,7 +227,7 @@ public final class Static233 { arg0.p1(4); } } else if (local151 == 4) { - local234 = (Method) local18.aClass212Array1[local121].anObject6; + local234 = (Method) local18.aClass212Array1[local121].result; local195 = local234.getModifiers(); arg0.p1(0); arg0.p4(local195); diff --git a/client/src/main/java/Static234.java b/client/src/main/java/Static234.java index 695d118..8a555ee 100644 --- a/client/src/main/java/Static234.java +++ b/client/src/main/java/Static234.java @@ -92,7 +92,7 @@ public final class Static234 { local14.method2692(local14.aClass96_1.anInt3713); local14.anInt3365 = local14.aClass96_1.anInt3737; if (local14.aClass96_1.method2935()) { - Static122.method2411(local14.anIntArray317[0], null, 0, local14, local14.anIntArray318[0], Static55.anInt1735, null); + Static122.method2411(local14.movementQueueZ[0], null, 0, local14, local14.movementQueueX[0], Static55.level, null); } } if ((local18 & 0x20) != 0) { @@ -135,8 +135,8 @@ public final class Static234 { @OriginalMember(owner = "client!ta", name = "a", descriptor = "(IZIII)V") public static void method4017(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - if (Static245.method4225(arg2)) { - Static266.method4190(-1, arg1, arg3, arg0, Static241.aClass13ArrayArray12[arg2]); + if (Static245.load(arg2)) { + Static266.method4190(-1, arg1, arg3, arg0, Static241.components[arg2]); } } diff --git a/client/src/main/java/Static235.java b/client/src/main/java/Static235.java index 7a207ff..861a9cc 100644 --- a/client/src/main/java/Static235.java +++ b/client/src/main/java/Static235.java @@ -15,7 +15,7 @@ public final class Static235 { @OriginalMember(owner = "client!tb", name = "h", descriptor = "(I)I") public static int method4044() { - return Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2 ? Static190.anIntArray382[Static231.anInt5204 - 2] : Static190.anIntArray382[Static231.anInt5204 - 1]; + return Static172.shiftClick && Static187.pressedKeys[81] && Static231.anInt5204 > 2 ? Static190.anIntArray382[Static231.anInt5204 - 2] : Static190.anIntArray382[Static231.anInt5204 - 1]; } @OriginalMember(owner = "client!tb", name = "b", descriptor = "(IB)Lclient!bc;") diff --git a/client/src/main/java/Static236.java b/client/src/main/java/Static236.java index ab52d57..cef41b6 100644 --- a/client/src/main/java/Static236.java +++ b/client/src/main/java/Static236.java @@ -29,10 +29,10 @@ public final class Static236 { @Pc(139) int local139; if (Static22.anInt723 != 0) { if (arg4 <= arg3 && arg4 + 16 > arg3 && arg0 >= arg5 && arg5 + 16 > arg0) { - arg2.anInt468 -= 4; + arg2.scrollY -= 4; Static43.method1143(arg2); } else if (arg3 >= arg4 && arg3 < arg4 + 16 && arg0 >= arg1 + arg5 - 16 && arg1 + arg5 > arg0) { - arg2.anInt468 += 4; + arg2.scrollY += 4; Static43.method1143(arg2); } else if (arg3 >= arg4 - Static42.anInt1396 && arg3 < arg4 + Static42.anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) { local139 = arg1 * (arg1 - 32) / arg6; @@ -41,17 +41,17 @@ public final class Static236 { } @Pc(150) int local150 = arg1 - local139 - 32; @Pc(162) int local162 = arg0 - local139 / 2 - arg5 - 16; - arg2.anInt468 = (arg6 - arg1) * local162 / local150; + arg2.scrollY = (arg6 - arg1) * local162 / local150; Static43.method1143(arg2); Static45.aBoolean84 = true; } } - if (Static58.anInt1766 == 0) { + if (Static58.wheelRotation == 0) { return; } local139 = arg2.anInt445; if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) { - arg2.anInt468 += Static58.anInt1766 * 45; + arg2.scrollY += Static58.wheelRotation * 45; Static43.method1143(arg2); } } diff --git a/client/src/main/java/Static24.java b/client/src/main/java/Static24.java index 9d5865a..ca1d7dc 100644 --- a/client/src/main/java/Static24.java +++ b/client/src/main/java/Static24.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static24 { @OriginalMember(owner = "client!bn", name = "N", descriptor = "Lclient!be;") - public static Component aClass13_8; + public static Component component; @OriginalMember(owner = "client!bn", name = "O", descriptor = "I") public static int anInt761; diff --git a/client/src/main/java/Static241.java b/client/src/main/java/Static241.java index 559000c..35c91f9 100644 --- a/client/src/main/java/Static241.java +++ b/client/src/main/java/Static241.java @@ -8,7 +8,7 @@ public final class Static241 { public static IndexedSprite[] aClass36Array16; @OriginalMember(owner = "client!th", name = "j", descriptor = "[[Lclient!be;") - public static Component[][] aClass13ArrayArray12; + public static Component[][] components; @OriginalMember(owner = "client!th", name = "m", descriptor = "[Lclient!be;") public static Component[] aClass13Array13; diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java index fbb7ddc..5f14c6e 100644 --- a/client/src/main/java/Static243.java +++ b/client/src/main/java/Static243.java @@ -39,17 +39,17 @@ public final class Static243 { @OriginalMember(owner = "client!tk", name = "a", descriptor = "(Z)V") public static void method4221() { Static204.anInt4762 = 0; - Static67.aBoolean168 = true; - Static183.aLong139 = 0L; - Static178.aClass74_1.anInt2990 = 0; - Static26.aBoolean59 = true; + Static67.prevFocus = true; + Static183.prevClickTime = 0L; + Static178.instance.samples = 0; + Static26.focus = true; Static114.method4625(); Static49.anInt1462 = -1; Static5.anInt45 = -1; Static164.anInt3985 = -1; Static267.anInt5775 = 0; - Static60.anInt1894 = 0; - Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static60.rebootTimer = 0; + Static6.outboundBuffer.offset = 0; Static230.anInt5152 = -1; Static201.anInt1862 = 0; Static57.aClass3_Sub15_Sub1_3.offset = 0; @@ -59,7 +59,7 @@ public final class Static243 { } Static231.anInt5204 = 0; Static60.aBoolean108 = false; - Static48.method1197(0); + Static48.setIdleLoops(0); for (local3506 = 0; local3506 < 100; local3506++) { Static230.aClass100Array158[local3506] = null; } @@ -86,7 +86,7 @@ public final class Static243 { for (local3506 = 0; local3506 < 32768; local3506++) { Static175.aClass8_Sub4_Sub2Array1[local3506] = null; } - Static173.aClass8_Sub4_Sub1_2 = Static159.aClass8_Sub4_Sub1Array1[2047] = new Player(); + Static173.self = Static159.aClass8_Sub4_Sub1Array1[2047] = new Player(); Static217.aClass69_116.method2278(); Static99.aClass69_64.method2278(); if (Static159.aClass69ArrayArrayArray1 != null) { @@ -113,16 +113,16 @@ public final class Static243 { Static251.anInt5449 = 0; Static113.anInt4612 = 0; Static233.anInt5225 = 0; - for (local3506 = 0; local3506 < Static155.anIntArray355.length; local3506++) { - Static155.anIntArray355[local3506] = -1; + for (local3506 = 0; local3506 < Static155.varcs.length; local3506++) { + Static155.varcs[local3506] = -1; } - if (Static154.anInt3711 != -1) { - Static109.method2275(Static154.anInt3711); + if (Static154.topLevelInterace != -1) { + Static109.method2275(Static154.topLevelInterace); } for (@Pc(3755) Class3_Sub31 local3755 = (Class3_Sub31) Static119.aClass133_9.method3859(); local3755 != null; local3755 = (Class3_Sub31) Static119.aClass133_9.method3861()) { Static132.method2605(true, local3755); } - Static154.anInt3711 = -1; + Static154.topLevelInterace = -1; Static119.aClass133_9 = new HashTable(8); Static52.method1287(); Static39.aClass13_10 = null; diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java index 23896f3..1188241 100644 --- a/client/src/main/java/Static245.java +++ b/client/src/main/java/Static245.java @@ -11,7 +11,7 @@ public final class Static245 { public static final JagString aClass100_1018 = Static28.parse("; Expires=Thu)1 01)2Jan)21970 00:00:00 GMT; Max)2Age=0"); @OriginalMember(owner = "client!tm", name = "e", descriptor = "Z") - public static boolean aBoolean281 = false; + public static boolean enabled = false; @OriginalMember(owner = "client!tm", name = "i", descriptor = "I") public static int anInt5377 = 0; @@ -23,7 +23,7 @@ public final class Static245 { } @OriginalMember(owner = "client!tm", name = "b", descriptor = "(II)Z") - public static boolean method4225(@OriginalArg(0) int arg0) { + public static boolean load(@OriginalArg(0) int arg0) { if (Static223.aBooleanArray115[arg0]) { return true; } else if (Static202.aClass153_84.method4479(arg0)) { @@ -32,14 +32,14 @@ public final class Static245 { Static223.aBooleanArray115[arg0] = true; return true; } - if (Static241.aClass13ArrayArray12[arg0] == null) { - Static241.aClass13ArrayArray12[arg0] = new Component[local25]; + if (Static241.components[arg0] == null) { + Static241.components[arg0] = new Component[local25]; } for (@Pc(46) int local46 = 0; local46 < local25; local46++) { - if (Static241.aClass13ArrayArray12[arg0][local46] == null) { + if (Static241.components[arg0][local46] == null) { @Pc(62) byte[] local62 = Static202.aClass153_84.method4495(arg0, local46); if (local62 != null) { - @Pc(74) Component local74 = Static241.aClass13ArrayArray12[arg0][local46] = new Component(); + @Pc(74) Component local74 = Static241.components[arg0][local46] = new Component(); local74.anInt507 = local46 + (arg0 << 16); if (local62[0] == -1) { local74.method490(new Buffer(local62)); diff --git a/client/src/main/java/Static246.java b/client/src/main/java/Static246.java index 0d06845..6c299a5 100644 --- a/client/src/main/java/Static246.java +++ b/client/src/main/java/Static246.java @@ -23,7 +23,7 @@ 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.anInt1735 || local15.aBoolean41) { + if (local15.anInt606 != Static55.level || local15.aBoolean41) { local9.method4658(); } else if (local15.anInt590 <= Static83.anInt372) { local15.method558(Static178.anInt4247); @@ -50,7 +50,7 @@ public final class Static246 { @Pc(35) JagString local35 = arg0.aClass100_738; if (arg0.anInt3726 != 0) { @Pc(47) JagString local47 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL; - local35 = Static34.method882(new JagString[] { local35, Static123.method2420(arg0.anInt3726, Static173.aClass8_Sub4_Sub1_2.anInt1652), Static123.aClass100_593, local47, Static123.method2423(arg0.anInt3726), Static72.aClass100_448 }); + local35 = Static34.method882(new JagString[] { local35, Static123.method2420(arg0.anInt3726, Static173.self.anInt1652), Static123.aClass100_593, local47, Static123.method2423(arg0.anInt3726), Static72.aClass100_448 }); } if (Static260.anInt5014 == 1) { Static98.method1966(Static169.anInt4075, (long) arg2, Static34.method882(new JagString[] { Static34.aClass100_203, Static201.aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3); @@ -99,7 +99,7 @@ public final class Static246 { for (local140 = 4; local140 >= 0; local140--) { if (local129[local140] != null && local129[local140].method3111(LocalizedText.ATTACK)) { @Pc(271) short local271 = 0; - if (arg0.anInt3726 > Static173.aClass8_Sub4_Sub1_2.anInt1652) { + if (arg0.anInt3726 > Static173.self.anInt1652) { local271 = 2000; } @Pc(281) short local281 = 0; diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java index c985408..37f58c8 100644 --- a/client/src/main/java/Static247.java +++ b/client/src/main/java/Static247.java @@ -663,7 +663,7 @@ public final class Static247 { @Pc(8) Component local8 = Static201.method1418(arg0, arg1); if (local8 != null && local8.anObjectArray11 != null) { @Pc(19) HookRequest local19 = new HookRequest(); - local19.aClass13_17 = local8; + local19.source = local8; local19.anObjectArray31 = local8.anObjectArray11; Static82.method1767(local19); } diff --git a/client/src/main/java/Static248.java b/client/src/main/java/Static248.java index b747131..eb81a99 100644 --- a/client/src/main/java/Static248.java +++ b/client/src/main/java/Static248.java @@ -20,7 +20,7 @@ public final class Static248 { @OriginalMember(owner = "client!uc", name = "a", descriptor = "(IB)Z") public static boolean method3288(@OriginalArg(0) int arg0) { Static189.anInt4443 = arg0 + 1 & 0xFFFF; - Static34.aBoolean65 = true; + Static34.verifyIdChanged = true; return true; } diff --git a/client/src/main/java/Static25.java b/client/src/main/java/Static25.java index b9a7660..8aa00b0 100644 --- a/client/src/main/java/Static25.java +++ b/client/src/main/java/Static25.java @@ -12,20 +12,20 @@ public final class Static25 { public static final JagString aClass100_154 = Static28.parse("Mem:"); @OriginalMember(owner = "client!c", name = "eb", descriptor = "I") - public static int anInt826 = 0; + public static int y = 0; @OriginalMember(owner = "client!c", name = "hb", descriptor = "Z") public static boolean aBoolean57 = false; @OriginalMember(owner = "client!c", name = "d", descriptor = "(I)Z") - public static boolean method712() { + public static boolean nextKey() { @Pc(6) Keyboard local6 = Static10.aClass149_1; synchronized (Static10.aClass149_1) { if (Static228.anInt5105 == Static102.anInt2678) { return false; } else { - Static102.anInt2681 = Static221.anIntArray375[Static102.anInt2678]; - Static193.anInt4542 = Static264.anIntArray413[Static102.anInt2678]; + Static102.keyCode = Static221.anIntArray375[Static102.anInt2678]; + Static193.keyChar = Static264.anIntArray413[Static102.anInt2678]; Static102.anInt2678 = Static102.anInt2678 + 1 & 0x7F; return true; } diff --git a/client/src/main/java/Static250.java b/client/src/main/java/Static250.java index 1949af8..23b6137 100644 --- a/client/src/main/java/Static250.java +++ b/client/src/main/java/Static250.java @@ -35,8 +35,8 @@ public final class Static250 { @OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V") public static void method4273() { - @Pc(14) int local14 = Static173.aClass8_Sub4_Sub1_2.anInt3412 + Static132.anInt3291; - @Pc(20) int local20 = Static173.aClass8_Sub4_Sub1_2.anInt3421 + Static206.anInt4774; + @Pc(14) int local14 = Static173.self.anInt3412 + Static132.anInt3291; + @Pc(20) int local20 = Static173.self.anInt3421 + Static206.anInt4774; if (Static81.anInt2223 - local14 < -500 || Static81.anInt2223 - local14 > 500 || Static111.anInt2900 - local20 < -500 || Static111.anInt2900 - local20 > 500) { Static81.anInt2223 = local14; Static111.anInt2900 = local20; @@ -48,8 +48,8 @@ public final class Static250 { Static81.anInt2223 += (local14 - Static81.anInt2223) / 16; } if (Static33.aBoolean63) { - for (@Pc(93) int local93 = 0; local93 < Static182.anInt4313; local93++) { - @Pc(104) int local104 = Static227.anIntArray447[local93]; + for (@Pc(93) int local93 = 0; local93 < Static182.keyQueueSize; local93++) { + @Pc(104) int local104 = Static227.keyCodes[local93]; if (local104 == 98) { Static72.anInt2031 = Static72.anInt2031 + 47 & 0xFFFFFFF0; } else if (local104 == 99) { @@ -61,16 +61,16 @@ public final class Static250 { } } } else { - if (Static187.aBooleanArray101[98]) { + if (Static187.pressedKeys[98]) { Static56.anInt1743 += (12 - Static56.anInt1743) / 2; - } else if (Static187.aBooleanArray101[99]) { + } else if (Static187.pressedKeys[99]) { Static56.anInt1743 += (-Static56.anInt1743 - 12) / 2; } else { Static56.anInt1743 /= 2; } - if (Static187.aBooleanArray101[96]) { + if (Static187.pressedKeys[96]) { Static38.anInt1203 += (-Static38.anInt1203 - 24) / 2; - } else if (Static187.aBooleanArray101[97]) { + } else if (Static187.pressedKeys[97]) { Static38.anInt1203 += (24 - Static38.anInt1203) / 2; } else { Static38.anInt1203 /= 2; diff --git a/client/src/main/java/Static251.java b/client/src/main/java/Static251.java index 5119d6b..382aabb 100644 --- a/client/src/main/java/Static251.java +++ b/client/src/main/java/Static251.java @@ -29,7 +29,7 @@ public final class Static251 { public static int anInt5459 = 0; @OriginalMember(owner = "client!ug", name = "a", descriptor = "(B)V") - public static void method4274() { + public static void loop() { for (@Pc(10) Class3_Sub7 local10 = (Class3_Sub7) Static26.aClass69_27.method2289(); local10 != null; local10 = (Class3_Sub7) Static26.aClass69_27.method2288()) { if (local10.anInt924 > 0) { local10.anInt924--; diff --git a/client/src/main/java/Static252.java b/client/src/main/java/Static252.java index 0b3fdba..3c7ef41 100644 --- a/client/src/main/java/Static252.java +++ b/client/src/main/java/Static252.java @@ -31,7 +31,7 @@ public final class Static252 { Static266.aByteArrayArrayArray15[local33][local31][local40] = local27; } } - if (Static55.anInt1735 == 3) { + if (Static55.level == 3) { return; } for (local33 = 0; local33 < 2; local33++) { @@ -42,19 +42,19 @@ public final class Static252 { Static50.anIntArray134[local33] = 0; } if (Static227.anInt5096 != 1) { - local33 = Static207.method3685(Static55.anInt1735, Static138.anInt3439, Static134.anInt3302); - if (local33 - Static5.anInt40 < 800 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][Static138.anInt3439 >> 7][Static134.anInt3302 >> 7] & 0x4) != 0) { + local33 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302); + if (local33 - Static5.anInt40 < 800 && (Static12.aByteArrayArrayArray2[Static55.level][Static138.anInt3439 >> 7][Static134.anInt3302 >> 7] & 0x4) != 0) { Static254.method4348(false, Static138.anInt3439 >> 7, Static134.anInt3302 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 1); } return; } - if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7][Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7] & 0x4) != 0) { - Static254.method4348(false, Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7, Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0); + if ((Static12.aByteArrayArrayArray2[Static55.level][Static173.self.anInt3412 >> 7][Static173.self.anInt3421 >> 7] & 0x4) != 0) { + Static254.method4348(false, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0); } if (Static240.anInt5333 >= 310) { return; } - @Pc(135) int local135 = Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7; + @Pc(135) int local135 = Static173.self.anInt3421 >> 7; local40 = Static134.anInt3302 >> 7; @Pc(146) int local146; if (local40 < local135) { @@ -63,7 +63,7 @@ public final class Static252 { local146 = local40 - local135; } local33 = Static138.anInt3439 >> 7; - @Pc(162) int local162 = Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7; + @Pc(162) int local162 = Static173.self.anInt3412 >> 7; @Pc(174) int local174; if (local162 > local33) { local174 = local162 - local33; @@ -81,7 +81,7 @@ public final class Static252 { } else if (local40 > local135) { local40--; } - if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local33][local40] & 0x4) != 0) { + if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } @@ -93,7 +93,7 @@ public final class Static252 { local33--; } local186 -= 65536; - if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local33][local40] & 0x4) != 0) { + if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } @@ -109,7 +109,7 @@ public final class Static252 { } else if (local33 > local162) { local33--; } - if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local33][local40] & 0x4) != 0) { + if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } @@ -121,7 +121,7 @@ public final class Static252 { local40--; } local186 -= 65536; - if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local33][local40] & 0x4) != 0) { + if ((Static12.aByteArrayArrayArray2[Static55.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 223a95a..e58eb94 100644 --- a/client/src/main/java/Static253.java +++ b/client/src/main/java/Static253.java @@ -54,7 +54,7 @@ public final class Static253 { if (Static176.aBooleanArray95[4] && Static276.anIntArray564[4] + 128 > local59) { local59 = Static276.anIntArray564[4] + 128; } - Static18.method555(Static81.anInt2223, arg0, Static207.method3685(Static55.anInt1735, Static173.aClass8_Sub4_Sub1_2.anInt3412, Static173.aClass8_Sub4_Sub1_2.anInt3421) - 50, 600 - -(local59 * 3), local57, Static111.anInt2900, local59); + Static18.method555(Static81.anInt2223, arg0, Static207.method3685(Static55.level, Static173.self.anInt3412, Static173.self.anInt3421) - 50, 600 - -(local59 * 3), local57, Static111.anInt2900, local59); } local57 = Static5.anInt40; local59 = Static138.anInt3439; @@ -125,13 +125,13 @@ public final class Static253 { if (Static244.anInt5370 == 10) { local171 = Static103.method2235(Static178.anInt4247, Static134.anInt3302 >> 10, Static113.anInt4609, Static138.anInt3439 >> 10); } else { - local171 = Static103.method2235(Static178.anInt4247, Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] >> 3, Static113.anInt4609, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0] >> 3); + local171 = Static103.method2235(Static178.anInt4247, Static173.self.movementQueueZ[0] >> 3, Static113.anInt4609, Static173.self.movementQueueX[0] >> 3); } Static120.method2394(Static83.anInt372, !Static11.aBoolean15); Static239.method4176(local171); Static143.method2731(Static240.anInt5333, Static134.anInt3302, Static5.anInt40, Static138.anInt3439, Static184.anInt4358); Static239.anInt5323 = Static83.anInt372; - Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.anInt1735 + 1, local387, Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7, Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7); + Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7); Static263.aBoolean299 = true; Static120.method2390(); Static143.method2731(0, 0, 0, 0, 0); @@ -141,7 +141,7 @@ public final class Static253 { Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4); } else { Static129.method2495(arg2, arg4, arg3, arg0, 0); - Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.anInt1735 + 1, local387, Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7, Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7); + Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7); Static107.method2261(); 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 33b028a..24a4a5b 100644 --- a/client/src/main/java/Static254.java +++ b/client/src/main/java/Static254.java @@ -45,9 +45,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.anInt1735][arg1][arg2]) { + if (local14 == Static266.aByteArrayArrayArray15[Static55.level][arg1][arg2]) { return false; - } else if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][arg1][arg2] & 0x4) == 0) { + } else if ((Static12.aByteArrayArrayArray2[Static55.level][arg1][arg2] & 0x4) == 0) { return false; } else { @Pc(47) int local47 = 0; @@ -55,7 +55,7 @@ public final class Static254 { Static259.anIntArray514[0] = arg1; @Pc(69) int local69 = local49 + 1; Static84.anIntArray209[0] = arg2; - Static266.aByteArrayArrayArray15[Static55.anInt1735][arg1][arg2] = local14; + Static266.aByteArrayArrayArray15[Static55.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; @@ -65,12 +65,12 @@ public final class Static254 { local47 = local47 + 1 & 0xFFF; @Pc(130) boolean local130 = false; @Pc(132) boolean local132 = false; - if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0) { + if ((Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0) { local130 = true; } @Pc(150) int local150; @Pc(191) int local191; - label238: for (local150 = Static55.anInt1735 + 1; local150 <= 3; local150++) { + label238: for (local150 = Static55.level + 1; local150 <= 3; local150++) { if ((Static12.aByteArrayArrayArray2[local150][local108][local122] & 0x8) == 0) { @Pc(227) int local227; @Pc(358) int local358; @@ -125,8 +125,8 @@ public final class Static254 { } } if (local132) { - if (Static83.anIntArrayArrayArray4[Static55.anInt1735 + 1][local108][local122] > Static79.anIntArray205[arg4]) { - Static79.anIntArray205[arg4] = Static83.anIntArrayArrayArray4[Static55.anInt1735 + 1][local108][local122]; + if (Static83.anIntArrayArrayArray4[Static55.level + 1][local108][local122] > Static79.anIntArray205[arg4]) { + Static79.anIntArray205[arg4] = Static83.anIntArrayArrayArray4[Static55.level + 1][local108][local122]; } local150 = local108 << 7; if (local150 < Static149.anIntArray338[arg4]) { @@ -142,58 +142,58 @@ public final class Static254 { } } if (!local130) { - if (local108 >= 1 && Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] != local14) { + if (local108 >= 1 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14) { Static259.anIntArray514[local69] = local108 - 1 | 0x120000 | 0xD3000000; Static84.anIntArray209[local69] = local122 | 0x130000; local69 = local69 + 1 & 0xFFF; - Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] = local14; + Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14; } local122++; if (local122 < 104) { - if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108 - 1][local122 - 1] & 0x4) == 0) { + if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 - 1][local122 - 1] & 0x4) == 0) { Static259.anIntArray514[local69] = 0x52000000 | 0x120000 | local108 - 1; Static84.anIntArray209[local69] = local122 | 0x130000; - Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] = local14; + Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14; local69 = local69 + 1 & 0xFFF; } - if (local14 != Static266.aByteArrayArrayArray15[Static55.anInt1735][local108][local122]) { + if (local14 != Static266.aByteArrayArrayArray15[Static55.level][local108][local122]) { Static259.anIntArray514[local69] = local108 | 0x13000000 | 0x520000; Static84.anIntArray209[local69] = local122 | 0x530000; local69 = local69 + 1 & 0xFFF; - Static266.aByteArrayArrayArray15[Static55.anInt1735][local108][local122] = local14; + Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14; } - if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108 + 1][local122 - 1] & 0x4) == 0) { + if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 + 1][local122 - 1] & 0x4) == 0) { Static259.anIntArray514[local69] = 0x92000000 | 0x520000 | local108 + 1; Static84.anIntArray209[local69] = local122 | 0x530000; - Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] = local14; + Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14; local69 = local69 + 1 & 0xFFF; } } local122--; - if (local108 + 1 < 104 && local14 != Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122]) { + if (local108 + 1 < 104 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122]) { Static259.anIntArray514[local69] = local108 + 1 | 0x920000 | 0x53000000; Static84.anIntArray209[local69] = local122 | 0x930000; - Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] = local14; + Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14; local69 = local69 + 1 & 0xFFF; } local122--; if (local122 >= 0) { - if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108 - 1][local122 + 1] & 0x4) == 0) { + if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 - 1][local122 + 1] & 0x4) == 0) { Static259.anIntArray514[local69] = local108 - 1 | 0xD20000 | 0x12000000; Static84.anIntArray209[local69] = local122 | 0xD30000; - Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] = local14; + Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14; local69 = local69 + 1 & 0xFFF; } - if (local14 != Static266.aByteArrayArrayArray15[Static55.anInt1735][local108][local122]) { + if (local14 != Static266.aByteArrayArrayArray15[Static55.level][local108][local122]) { Static259.anIntArray514[local69] = local108 | 0xD20000 | 0x93000000; Static84.anIntArray209[local69] = local122 | 0xD30000; local69 = local69 + 1 & 0xFFF; - Static266.aByteArrayArrayArray15[Static55.anInt1735][local108][local122] = local14; + Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14; } - if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108 + 1][local122 + 1] & 0x4) == 0) { + if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 + 1][local122 + 1] & 0x4) == 0) { Static259.anIntArray514[local69] = local108 + 1 | 0xD2000000 | 0x920000; Static84.anIntArray209[local69] = local122 | 0x930000; - Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] = local14; + Static266.aByteArrayArrayArray15[Static55.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 7d1d051..ada91dc 100644 --- a/client/src/main/java/Static256.java +++ b/client/src/main/java/Static256.java @@ -14,8 +14,8 @@ public final class Static256 { @OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V") public static void method4392() { Static11.anInt384 = 0; - @Pc(17) int local17 = Static225.anInt5068 + (Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7); - @Pc(25) int local25 = (Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7) + Static142.anInt3483; + @Pc(17) int local17 = Static225.originX + (Static173.self.anInt3412 >> 7); + @Pc(25) int local25 = (Static173.self.anInt3421 >> 7) + Static142.originZ; if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) { Static11.anInt384 = 1; } diff --git a/client/src/main/java/Static258.java b/client/src/main/java/Static258.java index 43bfacc..7138243 100644 --- a/client/src/main/java/Static258.java +++ b/client/src/main/java/Static258.java @@ -47,7 +47,7 @@ public final class Static258 { if (arg2.anInt452 == 2) { local171 = 0; for (local173 = 0; local173 < arg2.anInt488; local173++) { - for (@Pc(183) int local183 = 0; local183 < arg2.anInt446; local183++) { + for (@Pc(183) int local183 = 0; local183 < arg2.baseWidth; local183++) { @Pc(195) int local195 = (arg2.anInt512 + 32) * local183; @Pc(202) int local202 = (arg2.anInt516 + 32) * local173; if (local171 < 20) { @@ -57,9 +57,9 @@ public final class Static258 { if (arg1 >= local195 && local202 <= arg0 && local195 + 32 > arg1 && local202 + 32 > arg0) { Static169.aClass13_18 = arg2; Static18.anInt588 = local171; - if (arg2.anIntArray40[local171] > 0) { + if (arg2.objTypes[local171] > 0) { @Pc(267) ServerActiveProperties local267 = Static36.method940(arg2); - @Pc(276) ObjType local276 = Static71.method1439(arg2.anIntArray40[local171] - 1); + @Pc(276) ObjType local276 = Static71.method1439(arg2.objTypes[local171] - 1); if (Static260.anInt5014 == 1 && local267.method510()) { if (Static224.anInt5062 != arg2.anInt507 || Static185.anInt4370 != local171) { Static98.method1966(-1, (long) local276.anInt2354, Static34.method882(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local276.aClass100_495 }), local171, (short) 40, LocalizedText.USE, arg2.anInt507); @@ -150,24 +150,24 @@ public final class Static258 { for (local171 = 9; local171 >= 5; local171--) { @Pc(765) JagString local765 = Static205.method3677(arg2, local171); if (local765 != null) { - Static98.method1966(Static8.method118(local171, arg2), (long) (local171 + 1), arg2.aClass100_88, arg2.anInt457, (short) 1003, local765, arg2.anInt507); + Static98.method1966(Static8.method118(local171, arg2), (long) (local171 + 1), arg2.aClass100_88, arg2.componentId, (short) 1003, local765, arg2.anInt507); } } local47 = Static97.method1963(arg2); if (local47 != null) { - Static98.method1966(-1, 0L, arg2.aClass100_88, arg2.anInt457, (short) 32, local47, arg2.anInt507); + Static98.method1966(-1, 0L, arg2.aClass100_88, arg2.componentId, (short) 32, local47, arg2.anInt507); } for (local173 = 4; local173 >= 0; local173--) { @Pc(828) JagString local828 = Static205.method3677(arg2, local173); if (local828 != null) { - Static98.method1966(Static8.method118(local173, arg2), (long) (local173 + 1), arg2.aClass100_88, arg2.anInt457, (short) 9, local828, arg2.anInt507); + Static98.method1966(Static8.method118(local173, arg2), (long) (local173 + 1), arg2.aClass100_88, arg2.componentId, (short) 9, local828, arg2.anInt507); } } if (Static36.method940(arg2).method506()) { - Static98.method1966(-1, 0L, Static186.aClass100_827, arg2.anInt457, (short) 41, LocalizedText.CONTINUE, arg2.anInt507); + Static98.method1966(-1, 0L, Static186.aClass100_827, arg2.componentId, (short) 41, LocalizedText.CONTINUE, arg2.anInt507); } } else if (Static36.method940(arg2).method508() && (Static274.anInt4999 & 0x20) != 0) { - Static98.method1966(Static246.anInt5393, 0L, Static34.method882(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, arg2.aClass100_88 }), arg2.anInt457, (short) 12, Static102.aClass100_545, arg2.anInt507); + Static98.method1966(Static246.anInt5393, 0L, Static34.method882(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, arg2.aClass100_88 }), arg2.componentId, (short) 12, Static102.aClass100_545, arg2.anInt507); } } diff --git a/client/src/main/java/Static26.java b/client/src/main/java/Static26.java index a0511eb..fa81169 100644 --- a/client/src/main/java/Static26.java +++ b/client/src/main/java/Static26.java @@ -11,7 +11,7 @@ public final class Static26 { public static Js5 aClass153_16; @OriginalMember(owner = "client!ca", name = "ab", descriptor = "Z") - public static boolean aBoolean59; + public static boolean focus; @OriginalMember(owner = "client!ca", name = "X", descriptor = "Lclient!ih;") public static LinkedList aClass69_27 = new LinkedList(); @@ -30,8 +30,8 @@ public final class Static26 { @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V") public static void method740() { - @Pc(10) int local10 = (Static138.anInt3439 >> 10) + (Static225.anInt5068 >> 3); - @Pc(23) int local23 = (Static134.anInt3302 >> 10) + (Static142.anInt3483 >> 3); + @Pc(10) int local10 = (Static138.anInt3439 >> 10) + (Static225.originX >> 3); + @Pc(23) int local23 = (Static134.anInt3302 >> 10) + (Static142.originZ >> 3); Static156.aByteArrayArray11 = new byte[18][]; Static35.anIntArray82 = new int[18]; Static191.aByteArrayArray15 = new byte[18][]; @@ -92,8 +92,8 @@ public final class Static26 { for (@Pc(25) int local25 = 0; local25 < local13; local25++) { @Pc(32) byte[] local32 = local19[local25]; if (local32 != null) { - @Pc(45) int local45 = (Static238.anIntArray470[local25] >> 8) * 64 - Static225.anInt5068; - @Pc(56) int local56 = (Static238.anIntArray470[local25] & 0xFF) * 64 - Static142.anInt3483; + @Pc(45) int local45 = (Static238.anIntArray470[local25] >> 8) * 64 - Static225.originX; + @Pc(56) int local56 = (Static238.anIntArray470[local25] & 0xFF) * 64 - Static142.originZ; Static107.method2261(); Static124.method2437(local45, arg0, local32, local56, Static148.aClass97Array1); } diff --git a/client/src/main/java/Static260.java b/client/src/main/java/Static260.java index 1da43f6..edf5828 100644 --- a/client/src/main/java/Static260.java +++ b/client/src/main/java/Static260.java @@ -29,7 +29,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 = Static207.method3685(Static55.anInt1735, local30, local36) - Static57.anInt1744; + @Pc(44) int local44 = Static207.method3685(Static55.level, local30, local36) - Static57.anInt1744; @Pc(49) int local49 = local44 - Static5.anInt40; @Pc(54) int local54 = local30 - Static138.anInt3439; @Pc(59) int local59 = local36 - Static134.anInt3302; diff --git a/client/src/main/java/Static261.java b/client/src/main/java/Static261.java index 69a562b..4bcf9e7 100644 --- a/client/src/main/java/Static261.java +++ b/client/src/main/java/Static261.java @@ -20,8 +20,8 @@ public final class Static261 { public static void method4505(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { @Pc(8) DelayedStateChange local8 = Static238.method4143(8, arg1); local8.method1017(); - local8.anInt1269 = arg0; - local8.anInt1271 = arg3; - local8.anInt1270 = arg2; + local8.intArg2 = arg0; + local8.intArg1 = arg3; + local8.intArg3 = arg2; } } diff --git a/client/src/main/java/Static263.java b/client/src/main/java/Static263.java index 96b945b..9dbff70 100644 --- a/client/src/main/java/Static263.java +++ b/client/src/main/java/Static263.java @@ -45,7 +45,7 @@ public final class Static263 { if (local8.anObjectArray29 != null) { @Pc(19) HookRequest local19 = new HookRequest(); local19.anObjectArray31 = local8.anObjectArray29; - local19.aClass13_17 = local8; + local19.source = local8; local19.aClass100_598 = arg0; local19.anInt3101 = arg2; Static82.method1767(local19); @@ -58,54 +58,54 @@ public final class Static263 { return; } if (arg2 == 1) { - Static6.aClass3_Sub15_Sub1_1.method2242(155); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(155); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } if (arg2 == 2) { - Static6.aClass3_Sub15_Sub1_1.method2242(196); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(196); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } if (arg2 == 3) { - Static6.aClass3_Sub15_Sub1_1.method2242(124); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(124); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } if (arg2 == 4) { - Static6.aClass3_Sub15_Sub1_1.method2242(199); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(199); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } if (arg2 == 5) { - Static6.aClass3_Sub15_Sub1_1.method2242(234); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(234); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } if (arg2 == 6) { - Static6.aClass3_Sub15_Sub1_1.method2242(168); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(168); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } if (arg2 == 7) { - Static6.aClass3_Sub15_Sub1_1.method2242(166); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(166); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } if (arg2 == 8) { - Static6.aClass3_Sub15_Sub1_1.method2242(64); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(64); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } if (arg2 == 9) { - Static6.aClass3_Sub15_Sub1_1.method2242(53); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(53); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } if (arg2 == 10) { - Static6.aClass3_Sub15_Sub1_1.method2242(9); - Static6.aClass3_Sub15_Sub1_1.p4(arg3); - Static6.aClass3_Sub15_Sub1_1.p2(arg1); + Static6.outboundBuffer.p1isaac(9); + Static6.outboundBuffer.p4(arg3); + Static6.outboundBuffer.p2(arg1); } } @@ -123,17 +123,17 @@ public final class Static263 { arg1.anInt3432 = -1; arg1.anInt3395 = 0; arg1.anInt3386 = 0; - arg1.anInt3412 = arg1.anIntArray318[0] * 128 + arg1.method2693() * 64; - arg1.anInt3421 = arg1.anIntArray317[0] * 128 + arg1.method2693() * 64; + arg1.anInt3412 = arg1.movementQueueX[0] * 128 + arg1.method2693() * 64; + arg1.anInt3421 = arg1.movementQueueZ[0] * 128 + arg1.method2693() * 64; arg1.method2689(); } - if (arg1 == Static173.aClass8_Sub4_Sub1_2 && (arg1.anInt3412 < 1536 || arg1.anInt3421 < 1536 || arg1.anInt3412 >= 11776 || arg1.anInt3421 >= 11776)) { + if (arg1 == Static173.self && (arg1.anInt3412 < 1536 || arg1.anInt3421 < 1536 || arg1.anInt3412 >= 11776 || arg1.anInt3421 >= 11776)) { arg1.anInt3432 = -1; arg1.anInt3395 = 0; arg1.anInt3386 = 0; arg1.anInt3369 = -1; - arg1.anInt3412 = arg1.anIntArray318[0] * 128 + arg1.method2693() * 64; - arg1.anInt3421 = arg1.anIntArray317[0] * 128 + arg1.method2693() * 64; + arg1.anInt3412 = arg1.movementQueueX[0] * 128 + arg1.method2693() * 64; + arg1.anInt3421 = arg1.movementQueueZ[0] * 128 + arg1.method2693() * 64; arg1.method2689(); } Static37.method949(arg1); diff --git a/client/src/main/java/Static264.java b/client/src/main/java/Static264.java index 993db11..2cb83d0 100644 --- a/client/src/main/java/Static264.java +++ b/client/src/main/java/Static264.java @@ -17,7 +17,7 @@ public final class Static264 { public static final int[] anIntArray412 = new int[] { 1, 0, 0, 0, 1, 0, 2, 1, 1, 1, 0, 2, 0, 0, 1, 0 }; @OriginalMember(owner = "client!vh", name = "s", descriptor = "I") - public static int anInt4632 = 0; + public static int mouseRecorderPrevX = 0; @OriginalMember(owner = "client!vh", name = "u", descriptor = "[I") public static final int[] anIntArray413 = new int[128]; diff --git a/client/src/main/java/Static266.java b/client/src/main/java/Static266.java index 0c4f988..e1c9ac1 100644 --- a/client/src/main/java/Static266.java +++ b/client/src/main/java/Static266.java @@ -35,17 +35,17 @@ public final class Static266 { public static void method4190(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Component[] arg4) { for (@Pc(3) int local3 = 0; local3 < arg4.length; local3++) { @Pc(19) Component local19 = arg4[local3]; - if (local19 != null && local19.anInt456 == arg0) { + if (local19 != null && local19.layer == arg0) { Static150.method2801(arg3, arg2, local19, arg1); Static111.method2291(local19, arg3, arg2); if (local19.anInt486 - local19.anInt445 < local19.anInt489) { local19.anInt489 = local19.anInt486 - local19.anInt445; } - if (local19.anInt468 > local19.anInt491 - local19.anInt459) { - local19.anInt468 = local19.anInt491 - local19.anInt459; + if (local19.scrollY > local19.anInt491 - local19.anInt459) { + local19.scrollY = local19.anInt491 - local19.anInt459; } - if (local19.anInt468 < 0) { - local19.anInt468 = 0; + if (local19.scrollY < 0) { + local19.scrollY = 0; } if (local19.anInt489 < 0) { local19.anInt489 = 0; diff --git a/client/src/main/java/Static273.java b/client/src/main/java/Static273.java index f75ed84..212df99 100644 --- a/client/src/main/java/Static273.java +++ b/client/src/main/java/Static273.java @@ -63,12 +63,12 @@ public final class Static273 { if (local46 == 4) { local124 = local33[local39++] << 16; @Pc(131) int local131 = local124 + local33[local39++]; - local135 = Static5.method32(local131); + local135 = Static5.getComponent(local131); local140 = local33[local39++]; if (local140 != -1 && (!Static71.method1439(local140).aBoolean131 || Static2.aBoolean1)) { - for (local152 = 0; local152 < local135.anIntArray40.length; local152++) { - if (local140 + 1 == local135.anIntArray40[local152]) { - local41 += local135.anIntArray50[local152]; + for (local152 = 0; local152 < local135.objTypes.length; local152++) { + if (local140 + 1 == local135.objTypes[local152]) { + local41 += local135.objCounts[local152]; } } } @@ -83,7 +83,7 @@ public final class Static273 { local41 = Static7.anIntArray75[local33[local39++]] * 100 / 46875; } if (local46 == 8) { - local41 = Static173.aClass8_Sub4_Sub1_2.anInt1652; + local41 = Static173.self.anInt1652; } if (local46 == 9) { for (local124 = 0; local124 < 25; local124++) { @@ -95,11 +95,11 @@ public final class Static273 { if (local46 == 10) { local124 = local33[local39++] << 16; local124 += local33[local39++]; - local135 = Static5.method32(local124); + local135 = Static5.getComponent(local124); local140 = local33[local39++]; if (local140 != -1 && (!Static71.method1439(local140).aBoolean131 || Static2.aBoolean1)) { - for (local152 = 0; local152 < local135.anIntArray40.length; local152++) { - if (local135.anIntArray40[local152] == local140 + 1) { + for (local152 = 0; local152 < local135.objTypes.length; local152++) { + if (local135.objTypes[local152] == local140 + 1) { local41 = 999999999; break; } @@ -122,10 +122,10 @@ public final class Static273 { local41 = Static155.method2945(local124); } if (local46 == 18) { - local41 = (Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7) + Static225.anInt5068; + local41 = (Static173.self.anInt3412 >> 7) + Static225.originX; } if (local46 == 19) { - local41 = (Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7) + Static142.anInt3483; + local41 = (Static173.self.anInt3421 >> 7) + Static142.originZ; } if (local46 == 20) { local41 = local33[local39++]; diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java index a023640..b37e5da 100644 --- a/client/src/main/java/Static276.java +++ b/client/src/main/java/Static276.java @@ -55,22 +55,22 @@ public final class Static276 { @Pc(28) Player local28 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local15]]; if (local28 != null && local28.aClass100_364 != null && local28.aClass100_364.method3111(local7)) { local13 = true; - Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local28.anIntArray318[0], 1, 0, 2, local28.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local28.movementQueueX[0], 1, 0, 2, local28.movementQueueZ[0], Static173.self.movementQueueX[0]); if (arg0 == 1) { - Static6.aClass3_Sub15_Sub1_1.method2242(68); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static105.anIntArray256[local15]); + Static6.outboundBuffer.p1isaac(68); + Static6.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); } else if (arg0 == 4) { - Static6.aClass3_Sub15_Sub1_1.method2242(180); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static105.anIntArray256[local15]); + Static6.outboundBuffer.p1isaac(180); + Static6.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); } else if (arg0 == 5) { - Static6.aClass3_Sub15_Sub1_1.method2242(4); - Static6.aClass3_Sub15_Sub1_1.p2le(Static105.anIntArray256[local15]); + Static6.outboundBuffer.p1isaac(4); + Static6.outboundBuffer.p2le(Static105.anIntArray256[local15]); } else if (arg0 == 6) { - Static6.aClass3_Sub15_Sub1_1.method2242(133); - Static6.aClass3_Sub15_Sub1_1.p2le(Static105.anIntArray256[local15]); + Static6.outboundBuffer.p1isaac(133); + Static6.outboundBuffer.p2le(Static105.anIntArray256[local15]); } else if (arg0 == 7) { - Static6.aClass3_Sub15_Sub1_1.method2242(114); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static105.anIntArray256[local15]); + Static6.outboundBuffer.p1isaac(114); + Static6.outboundBuffer.p2leadd(Static105.anIntArray256[local15]); } break; } diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java index 22d351e..d4d78bf 100644 --- a/client/src/main/java/Static278.java +++ b/client/src/main/java/Static278.java @@ -57,9 +57,9 @@ public final class Static278 { if (local37.anInt3376 == 0) { local37.anInt3381 = 0; } - local37.method2683(local37.method2693(), Static173.aClass8_Sub4_Sub1_2.anIntArray318[0] + local124, local105 + Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], local66 == 1); + local37.method2683(local37.method2693(), Static173.self.movementQueueX[0] + local124, local105 + Static173.self.movementQueueZ[0], local66 == 1); if (local37.aClass96_1.method2935()) { - Static122.method2411(local37.anIntArray317[0], null, 0, local37, local37.anIntArray318[0], Static55.anInt1735, null); + Static122.method2411(local37.movementQueueZ[0], null, 0, local37, local37.movementQueueX[0], Static55.level, null); } continue; } @@ -195,9 +195,9 @@ public final class Static278 { @OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V") public static void method4653() { - if (Static124.aClass95_2 != null) { - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + if (Static124.socket != null) { + Static124.socket.method2834(); + Static124.socket = null; } Static217.method3768(); Static65.method1500(); @@ -212,10 +212,10 @@ public final class Static278 { Static221.anInt4363 = -1; Static260.method3852(true); Static230.aBoolean250 = false; - Static142.anInt3483 = 0; + Static142.originZ = 0; Static80.anInt4701 = 0; Static52.anInt1695 = 0; - Static225.anInt5068 = 0; + Static225.originX = 0; for (local19 = 0; local19 < Static143.aClass102Array1.length; local19++) { Static143.aClass102Array1[local19] = null; } diff --git a/client/src/main/java/Static280.java b/client/src/main/java/Static280.java index a21c379..ab441b7 100644 --- a/client/src/main/java/Static280.java +++ b/client/src/main/java/Static280.java @@ -54,8 +54,8 @@ public final class Static280 { public static void method4666(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { @Pc(18) DelayedStateChange local18 = Static238.method4143(11, arg1); local18.method1017(); - local18.anInt1270 = arg2; - local18.anInt1271 = arg0; + local18.intArg3 = arg2; + local18.intArg1 = arg0; } @OriginalMember(owner = "client!wl", name = "a", descriptor = "([IIIIIIIIIZB)V") @@ -544,14 +544,14 @@ public final class Static280 { @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;") public static Component method4668(@OriginalArg(0) Component arg0) { - if (arg0.anInt456 != -1) { - return Static5.method32(arg0.anInt456); + if (arg0.layer != -1) { + return Static5.getComponent(arg0.layer); } @Pc(28) int local28 = arg0.anInt507 >>> 16; @Pc(33) HashTableIterator local33 = new HashTableIterator(Static119.aClass133_9); for (@Pc(38) Class3_Sub31 local38 = (Class3_Sub31) local33.method2701(); local38 != null; local38 = (Class3_Sub31) local33.method2700()) { if (local28 == local38.anInt5878) { - return Static5.method32((int) local38.aLong192); + return Static5.getComponent((int) local38.aLong192); } } return null; diff --git a/client/src/main/java/Static3.java b/client/src/main/java/Static3.java index a5385c8..441149c 100644 --- a/client/src/main/java/Static3.java +++ b/client/src/main/java/Static3.java @@ -83,7 +83,7 @@ public final class Static3 { Static167.aClass153_64 = arg0; Static202.aClass153_84 = arg2; Static203.aClass153_85 = arg3; - Static241.aClass13ArrayArray12 = new Component[Static202.aClass153_84.method4483()][]; + Static241.components = new Component[Static202.aClass153_84.method4483()][]; Static223.aBooleanArray115 = new boolean[Static202.aClass153_84.method4483()]; } } diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java index 9cd3282..6f1fca4 100644 --- a/client/src/main/java/Static31.java +++ b/client/src/main/java/Static31.java @@ -27,10 +27,10 @@ public final class Static31 { @OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V") public static void method846() { - if (!Static138.method2697() && Static41.anInt1316 != Static55.anInt1735) { - Static127.method2463(Static55.anInt1735, Static52.anInt1695, Static80.anInt4701, Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], false, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); - } else if (Static55.anInt1735 != Static107.anInt2875 && Static137.method2665(Static55.anInt1735)) { - Static107.anInt2875 = Static55.anInt1735; + if (!Static138.method2697() && Static41.anInt1316 != Static55.level) { + Static127.method2463(Static55.level, Static52.anInt1695, Static80.anInt4701, Static173.self.movementQueueZ[0], false, Static173.self.movementQueueX[0]); + } else if (Static55.level != Static107.anInt2875 && Static137.method2665(Static55.level)) { + Static107.anInt2875 = Static55.level; Static269.method2218(); } } @@ -49,9 +49,9 @@ public final class Static31 { } try { if (++Static20.anInt673 > 1500) { - if (Static124.aClass95_2 != null) { - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + if (Static124.socket != null) { + Static124.socket.method2834(); + Static124.socket = null; } if (Static196.anInt4587 >= 1) { Static266.anInt5336 = -5; @@ -79,16 +79,16 @@ public final class Static31 { if (Static72.aClass212_3.status != 1) { return; } - Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink); + Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink); Static72.aClass212_3 = null; - Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); + Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } if (Static147.aClass62_2 != null) { Static147.aClass62_2.method3571(); } - local126 = Static124.aClass95_2.read(); + local126 = Static124.socket.read(); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } @@ -98,35 +98,35 @@ public final class Static31 { if (local126 != 101) { Static266.anInt5336 = local126; Static219.anInt4937 = 0; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; return; } Static219.anInt4937 = 3; } if (Static219.anInt4937 == 3) { - if (Static124.aClass95_2.available() < 2) { + if (Static124.socket.available() < 2) { return; } - local126 = Static124.aClass95_2.read() << 8 | Static124.aClass95_2.read(); + local126 = Static124.socket.read() << 8 | Static124.socket.read(); Static176.method3303(local126); if (Static125.worldId == -1) { Static219.anInt4937 = 0; Static266.anInt5336 = 6; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; return; } Static219.anInt4937 = 0; - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static124.socket.method2834(); + Static124.socket = null; Static49.method1208(); return; } } catch (@Pc(210) IOException local210) { - if (Static124.aClass95_2 != null) { - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + if (Static124.socket != null) { + Static124.socket.method2834(); + Static124.socket = null; } if (Static196.anInt4587 < 1) { if (Static208.worldListPort == Static249.worldListDefaultPort) { diff --git a/client/src/main/java/Static32.java b/client/src/main/java/Static32.java index 87ceaab..e9fb3b2 100644 --- a/client/src/main/java/Static32.java +++ b/client/src/main/java/Static32.java @@ -38,7 +38,7 @@ public final class Static32 { local76.anInt5399 = 0; local76.anInt5408 = local28; local76.anInt5404 = 0; - Static152.method2836(arg2.anInt3421, local68, arg2.anInt3412, arg2 == Static173.aClass8_Sub4_Sub1_2, 0); + Static152.method2836(arg2.anInt3421, local68, arg2.anInt3412, arg2 == Static173.self, 0); } else if (local71 == 2) { local76.anInt5400 = 0; } @@ -54,7 +54,7 @@ public final class Static32 { local76.anInt5408 = local28; local76.anInt5399 = 0; local76.anInt5400 = 0; - Static152.method2836(arg2.anInt3421, local68, arg2.anInt3412, arg2 == Static173.aClass8_Sub4_Sub1_2, 0); + Static152.method2836(arg2.anInt3421, local68, arg2.anInt3412, arg2 == Static173.self, 0); } } } diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java index 7bf2ba4..81ac511 100644 --- a/client/src/main/java/Static33.java +++ b/client/src/main/java/Static33.java @@ -12,7 +12,7 @@ public final class Static33 { public static boolean aBoolean63; @OriginalMember(owner = "client!cj", name = "n", descriptor = "Lsignlink!im;") - public static PrivilegedRequest aClass212_1; + public static PrivilegedRequest openUrlRequest; @OriginalMember(owner = "client!cj", name = "i", descriptor = "[I") public static final int[] anIntArray79 = new int[32768]; diff --git a/client/src/main/java/Static34.java b/client/src/main/java/Static34.java index 15a1feb..64afdb5 100644 --- a/client/src/main/java/Static34.java +++ b/client/src/main/java/Static34.java @@ -74,7 +74,7 @@ public final class Static34 { public static int anInt1053 = 0; @OriginalMember(owner = "client!ck", name = "eb", descriptor = "Z") - public static boolean aBoolean65 = false; + public static boolean verifyIdChanged = false; @OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!va;Lclient!ve;Lclient!ve;Lclient!ve;)Z") public static boolean method876(@OriginalArg(1) MidiPcmStream arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) { @@ -115,12 +115,12 @@ public final class Static34 { arg0.anInt3396 = 1; arg0.anInt3407++; arg0.anInt3388++; - Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, arg0 == Static173.aClass8_Sub4_Sub1_2, arg0.anInt3407); + Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, arg0 == Static173.self, arg0.anInt3407); } if (arg0.anInt3407 >= local18.anIntArray473.length) { arg0.anInt3407 = 0; arg0.anInt3396 = 0; - Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, Static173.aClass8_Sub4_Sub1_2 == arg0, arg0.anInt3407); + Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, Static173.self == arg0, arg0.anInt3407); } arg0.anInt3388 = arg0.anInt3407 + 1; if (arg0.anInt3388 >= local18.anIntArray473.length) { @@ -140,13 +140,13 @@ public final class Static34 { } else { if (arg0.anInt3399 < 0) { arg0.anInt3399 = 0; - Static152.method2836(arg0.anInt3421, local165, arg0.anInt3412, Static173.aClass8_Sub4_Sub1_2 == arg0, 0); + Static152.method2836(arg0.anInt3421, local165, arg0.anInt3412, Static173.self == arg0, 0); } arg0.anInt3361++; if (arg0.anInt3399 < local165.anIntArray473.length && local165.anIntArray474[arg0.anInt3399] < arg0.anInt3361) { arg0.anInt3399++; arg0.anInt3361 = 1; - Static152.method2836(arg0.anInt3421, local165, arg0.anInt3412, Static173.aClass8_Sub4_Sub1_2 == arg0, arg0.anInt3399); + Static152.method2836(arg0.anInt3421, local165, arg0.anInt3412, Static173.self == arg0, arg0.anInt3399); } if (arg0.anInt3399 >= local165.anIntArray473.length) { arg0.anInt3432 = -1; @@ -174,7 +174,7 @@ public final class Static34 { if (arg0.anInt3425 < local18.anIntArray473.length && arg0.anInt3360 > local18.anIntArray474[arg0.anInt3425]) { arg0.anInt3360 = 1; arg0.anInt3425++; - Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, arg0 == Static173.aClass8_Sub4_Sub1_2, arg0.anInt3425); + Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, arg0 == Static173.self, arg0.anInt3425); } if (local18.anIntArray473.length <= arg0.anInt3425) { arg0.anInt3425 -= local18.anInt5362; @@ -182,7 +182,7 @@ public final class Static34 { if (arg0.anInt3371 >= local18.anInt5357) { arg0.anInt3369 = -1; } else if (arg0.anInt3425 >= 0 && local18.anIntArray473.length > arg0.anInt3425) { - Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, Static173.aClass8_Sub4_Sub1_2 == arg0, arg0.anInt3425); + Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, Static173.self == arg0, arg0.anInt3425); } else { arg0.anInt3369 = -1; } @@ -216,7 +216,7 @@ public final class Static34 { if (local545.anInt5399 < local570.anIntArray473.length && local545.anInt5404 > local570.anIntArray474[local545.anInt5399]) { local545.anInt5399++; local545.anInt5404 = 1; - Static152.method2836(arg0.anInt3421, local570, arg0.anInt3412, arg0 == Static173.aClass8_Sub4_Sub1_2, local545.anInt5399); + Static152.method2836(arg0.anInt3421, local570, arg0.anInt3412, arg0 == Static173.self, local545.anInt5399); } if (local570.anIntArray473.length <= local545.anInt5399) { local545.anInt5400++; @@ -224,7 +224,7 @@ public final class Static34 { if (local570.anInt5357 <= local545.anInt5400) { arg0.aClass147Array3[local156] = null; } else if (local545.anInt5399 >= 0 && local545.anInt5399 < local570.anIntArray473.length) { - Static152.method2836(arg0.anInt3421, local570, arg0.anInt3412, Static173.aClass8_Sub4_Sub1_2 == arg0, local545.anInt5399); + Static152.method2836(arg0.anInt3421, local570, arg0.anInt3412, Static173.self == arg0, local545.anInt5399); } else { arg0.aClass147Array3[local156] = null; } diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index e571725..b0b0017 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -23,7 +23,7 @@ public final class Static36 { return null; } for (@Pc(10) int local10 = 0; local10 < local4; local10++) { - arg0 = Static5.method32(arg0.anInt456); + arg0 = Static5.getComponent(arg0.layer); if (arg0 == null) { return null; } @@ -33,7 +33,7 @@ public final class Static36 { @OriginalMember(owner = "client!client", name = "b", descriptor = "(Lclient!be;)Lclient!bf;") public static ServerActiveProperties method940(@OriginalArg(0) Component arg0) { - @Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) Static210.aClass133_21.method3863(((long) arg0.anInt507 << 32) + (long) arg0.anInt457); + @Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) Static210.aClass133_21.method3863(((long) arg0.anInt507 << 32) + (long) arg0.componentId); return local13 == null ? arg0.aClass3_Sub4_1 : local13; } @@ -58,9 +58,9 @@ public final class Static36 { 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.anInt456 == arg1 && (!local9.aBoolean32 || local9.anInt452 == 0 || local9.aBoolean25 || method940(local9).anInt546 != 0 || local9 == Static4.aClass13_1 || local9.anInt453 == 1338) && (!local9.aBoolean32 || !method947(local9))) { - @Pc(50) int local50 = local9.anInt523 + arg6; - @Pc(55) int local55 = local9.anInt469 + arg7; + if (local9 != null && local9.layer == arg1 && (!local9.aBoolean32 || local9.anInt452 == 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(61) int local61; @Pc(63) int local63; @Pc(65) int local65; @@ -96,7 +96,7 @@ public final class Static36 { for (@Pc(164) HookRequest local164 = (HookRequest) Static185.aClass69_101.method2289(); local164 != null; local164 = (HookRequest) Static185.aClass69_101.method2288()) { if (local164.aBoolean158) { local164.method4658(); - local164.aClass13_17.aBoolean19 = false; + local164.source.aBoolean19 = false; } } if (Static213.anInt4851 == 0) { @@ -118,17 +118,17 @@ public final class Static36 { local212 = true; } @Pc(221) boolean local221 = false; - if (Static150.anInt3585 == 1 && Static7.anInt985 >= local61 && Static60.anInt1893 >= local63 && Static7.anInt985 < local65 && Static60.anInt1893 < local67) { + if (Static150.clickButton == 1 && Static7.clickX >= local61 && Static60.clickY >= local63 && Static7.clickX < local65 && Static60.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 (Static187.aBooleanArray101[local9.aByteArray8[local243]]) { + if (Static187.pressedKeys[local9.aByteArray8[local243]]) { if (local9.anIntArray49 == null || Static83.anInt372 >= local9.anIntArray49[local243]) { @Pc(279) byte local279 = local9.aByteArray7[local243]; - if (local279 == 0 || ((local279 & 0x2) == 0 || Static187.aBooleanArray101[86]) && ((local279 & 0x1) == 0 || Static187.aBooleanArray101[82]) && ((local279 & 0x4) == 0 || Static187.aBooleanArray101[81])) { + if (local279 == 0 || ((local279 & 0x2) == 0 || Static187.pressedKeys[86]) && ((local279 & 0x1) == 0 || Static187.pressedKeys[82]) && ((local279 & 0x4) == 0 || Static187.pressedKeys[81])) { Static263.method4512(Static186.aClass100_827, -1, local243 + 1, local9.anInt507); local322 = local9.anIntArray46[local243]; if (local9.anIntArray49 == null) { @@ -147,7 +147,7 @@ public final class Static36 { } } if (local221) { - Static40.method1015(Static60.anInt1893 - local55, Static7.anInt985 - local50, local9); + Static40.method1015(Static60.clickY - local55, Static7.clickX - local50, local9); } if (Static105.aClass13_14 != null && Static105.aClass13_14 != local9 && local207 && method940(local9).method509()) { Static56.aClass13_12 = local9; @@ -159,11 +159,11 @@ public final class Static36 { } if (local9.aBoolean25 || local9.anInt453 != 0) { @Pc(399) HookRequest local399; - if (local207 && Static58.anInt1766 != 0 && local9.anObjectArray10 != null) { + if (local207 && Static58.wheelRotation != 0 && local9.anObjectArray10 != null) { local399 = new HookRequest(); local399.aBoolean158 = true; - local399.aClass13_17 = local9; - local399.anInt3097 = Static58.anInt1766; + local399.source = local9; + local399.anInt3097 = Static58.wheelRotation; local399.anObjectArray31 = local9.anObjectArray10; Static185.aClass69_101.method2282(local399); } @@ -181,22 +181,22 @@ public final class Static36 { } if (local9.anInt453 == 1338) { if (local221) { - Static1.anInt5 = Static7.anInt985 - local50; - Static107.anInt2878 = Static60.anInt1893 - local55; + Static1.anInt5 = Static7.clickX - local50; + Static107.anInt2878 = Static60.clickY - local55; } continue; } if (local9.anInt453 == 1400) { - Static24.aClass13_8 = local9; + Static24.component = local9; if (local221) { - if (Static187.aBooleanArray101[82] && Static191.anInt4502 > 0) { - local243 = (int) ((double) (Static7.anInt985 - local50 - local9.anInt445 / 2) * 2.0D / (double) Static83.aFloat3); - local508 = (int) ((double) (Static60.anInt1893 - local55 - local9.anInt459 / 2) * 2.0D / (double) Static83.aFloat3); + if (Static187.pressedKeys[82] && Static191.staffModLevel > 0) { + local243 = (int) ((double) (Static7.clickX - local50 - local9.anInt445 / 2) * 2.0D / (double) Static83.aFloat3); + local508 = (int) ((double) (Static60.clickY - local55 - local9.anInt459 / 2) * 2.0D / (double) Static83.aFloat3); local322 = Static13.anInt435 + local243; @Pc(516) int local516 = Static28.anInt919 + local508; @Pc(520) int local520 = local322 + Static158.anInt3846; @Pc(528) int local528 = Static181.anInt4296 + Static2.anInt13 - local516 - 1; - Static61.method1454(local520, local528, 0); + Static61.teleport(local520, local528, 0); Static153.method2909(); continue; } @@ -238,9 +238,9 @@ public final class Static36 { if (local9.anObjectArray5 != null) { local399 = new HookRequest(); local399.aBoolean158 = true; - local399.aClass13_17 = local9; - local399.anInt3102 = Static7.anInt985 - local50; - local399.anInt3097 = Static60.anInt1893 - local55; + local399.source = local9; + local399.anInt3102 = Static7.clickX - local50; + local399.anInt3097 = Static60.clickY - local55; local399.anObjectArray31 = local9.anObjectArray5; Static185.aClass69_101.method2282(local399); } @@ -248,7 +248,7 @@ public final class Static36 { if (local9.aBoolean24 && local212 && local9.anObjectArray6 != null) { local399 = new HookRequest(); local399.aBoolean158 = true; - local399.aClass13_17 = local9; + local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; local399.anObjectArray31 = local9.anObjectArray6; @@ -259,7 +259,7 @@ public final class Static36 { if (local9.anObjectArray18 != null) { local399 = new HookRequest(); local399.aBoolean158 = true; - local399.aClass13_17 = local9; + local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; local399.anObjectArray31 = local9.anObjectArray18; @@ -269,7 +269,7 @@ public final class Static36 { if (local212 && local9.anObjectArray9 != null) { local399 = new HookRequest(); local399.aBoolean158 = true; - local399.aClass13_17 = local9; + local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; local399.anObjectArray31 = local9.anObjectArray9; @@ -280,7 +280,7 @@ public final class Static36 { if (local9.anObjectArray19 != null) { local399 = new HookRequest(); local399.aBoolean158 = true; - local399.aClass13_17 = local9; + local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; local399.anObjectArray31 = local9.anObjectArray19; @@ -290,7 +290,7 @@ public final class Static36 { if (local9.aBoolean19 && local207 && local9.anObjectArray23 != null) { local399 = new HookRequest(); local399.aBoolean158 = true; - local399.aClass13_17 = local9; + local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; local399.anObjectArray31 = local9.anObjectArray23; @@ -301,7 +301,7 @@ public final class Static36 { if (local9.anObjectArray24 != null) { local399 = new HookRequest(); local399.aBoolean158 = true; - local399.aClass13_17 = local9; + local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; local399.anObjectArray31 = local9.anObjectArray24; @@ -310,24 +310,24 @@ public final class Static36 { } if (local9.anObjectArray22 != null) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray22; Static4.aClass69_2.method2282(local399); } @Pc(966) HookRequest local966; - if (local9.anObjectArray4 != null && Static4.anInt37 > local9.anInt511) { - if (local9.anIntArray38 == null || Static4.anInt37 - local9.anInt511 > 32) { + if (local9.anObjectArray4 != null && Static4.updatedVarcsWriterIndex > local9.anInt511) { + if (local9.anIntArray38 == null || Static4.updatedVarcsWriterIndex - local9.anInt511 > 32) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray4; Static185.aClass69_101.method2282(local399); } else { - label563: for (local243 = local9.anInt511; local243 < Static4.anInt37; local243++) { - local508 = Static138.anIntArray323[local243 & 0x1F]; + 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.aClass13_17 = local9; + local966.source = local9; local966.anObjectArray31 = local9.anObjectArray4; Static185.aClass69_101.method2282(local966); break label563; @@ -335,21 +335,21 @@ public final class Static36 { } } } - local9.anInt511 = Static4.anInt37; + local9.anInt511 = Static4.updatedVarcsWriterIndex; } - if (local9.anObjectArray15 != null && Static72.anInt2036 > local9.anInt487) { - if (local9.anIntArray35 == null || Static72.anInt2036 - local9.anInt487 > 32) { + if (local9.anObjectArray15 != null && Static72.updatedVarcstrsWriterIndex > local9.anInt487) { + if (local9.anIntArray35 == null || Static72.updatedVarcstrsWriterIndex - local9.anInt487 > 32) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray15; Static185.aClass69_101.method2282(local399); } else { - label539: for (local243 = local9.anInt487; local243 < Static72.anInt2036; local243++) { - local508 = Static233.anIntArray452[local243 & 0x1F]; + 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.aClass13_17 = local9; + local966.source = local9; local966.anObjectArray31 = local9.anObjectArray15; Static185.aClass69_101.method2282(local966); break label539; @@ -357,21 +357,21 @@ public final class Static36 { } } } - local9.anInt487 = Static72.anInt2036; + local9.anInt487 = Static72.updatedVarcstrsWriterIndex; } - if (local9.anObjectArray25 != null && Static70.anInt2015 > local9.anInt471) { - if (local9.anIntArray44 == null || Static70.anInt2015 - local9.anInt471 > 32) { + if (local9.anObjectArray25 != null && Static70.updatedVarpsWriterIndex > local9.anInt471) { + if (local9.anIntArray44 == null || Static70.updatedVarpsWriterIndex - local9.anInt471 > 32) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray25; Static185.aClass69_101.method2282(local399); } else { - label515: for (local243 = local9.anInt471; local243 < Static70.anInt2015; local243++) { - local508 = Static83.anIntArray23[local243 & 0x1F]; + 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.aClass13_17 = local9; + local966.source = local9; local966.anObjectArray31 = local9.anObjectArray25; Static185.aClass69_101.method2282(local966); break label515; @@ -379,12 +379,12 @@ public final class Static36 { } } } - local9.anInt471 = Static70.anInt2015; + local9.anInt471 = Static70.updatedVarpsWriterIndex; } if (local9.anObjectArray7 != null && Static111.anInt2901 > local9.anInt493) { if (local9.anIntArray34 == null || Static111.anInt2901 - local9.anInt493 > 32) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray7; Static185.aClass69_101.method2282(local399); } else { @@ -393,7 +393,7 @@ public final class Static36 { for (local322 = 0; local322 < local9.anIntArray34.length; local322++) { if (local9.anIntArray34[local322] == local508) { local966 = new HookRequest(); - local966.aClass13_17 = local9; + local966.source = local9; local966.anObjectArray31 = local9.anObjectArray7; Static185.aClass69_101.method2282(local966); break label491; @@ -406,7 +406,7 @@ public final class Static36 { if (local9.anObjectArray2 != null && Static89.anInt2385 > local9.anInt525) { if (local9.anIntArray42 == null || Static89.anInt2385 - local9.anInt525 > 32) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray2; Static185.aClass69_101.method2282(local399); } else { @@ -415,7 +415,7 @@ public final class Static36 { for (local322 = 0; local322 < local9.anIntArray42.length; local322++) { if (local9.anIntArray42[local322] == local508) { local966 = new HookRequest(); - local966.aClass13_17 = local9; + local966.source = local9; local966.anObjectArray31 = local9.anObjectArray2; Static185.aClass69_101.method2282(local966); break label467; @@ -427,48 +427,48 @@ public final class Static36 { } if (Static49.anInt1464 > local9.anInt482 && local9.anObjectArray20 != null) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray20; Static185.aClass69_101.method2282(local399); } if (Static185.anInt4369 > local9.anInt482 && local9.anObjectArray1 != null) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray1; Static185.aClass69_101.method2282(local399); } if (Static278.anInt5867 > local9.anInt482 && local9.anObjectArray28 != null) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray28; Static185.aClass69_101.method2282(local399); } if (Static207.anInt4778 > local9.anInt482 && local9.anObjectArray21 != null) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray21; Static185.aClass69_101.method2282(local399); } - if (Static209.anInt4808 > local9.anInt482 && local9.anObjectArray30 != null) { + if (Static209.miscTransmitAt > local9.anInt482 && local9.anObjectArray30 != null) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray30; Static185.aClass69_101.method2282(local399); } - local9.anInt482 = Static119.anInt3028; + local9.anInt482 = Static119.transmitTimer; if (local9.anObjectArray14 != null) { - for (local243 = 0; local243 < Static182.anInt4313; local243++) { + for (local243 = 0; local243 < Static182.keyQueueSize; local243++) { @Pc(1430) HookRequest local1430 = new HookRequest(); - local1430.aClass13_17 = local9; - local1430.anInt3100 = Static227.anIntArray447[local243]; - local1430.anInt3099 = Static205.anIntArray426[local243]; + local1430.source = local9; + local1430.anInt3100 = Static227.keyCodes[local243]; + local1430.anInt3099 = Static205.keyChars[local243]; local1430.anObjectArray31 = local9.anObjectArray14; Static185.aClass69_101.method2282(local1430); } } if (Static13.aBoolean16 && local9.anObjectArray13 != null) { local399 = new HookRequest(); - local399.aClass13_17 = local9; + local399.source = local9; local399.anObjectArray31 = local9.anObjectArray13; Static185.aClass69_101.method2282(local399); } @@ -490,9 +490,9 @@ public final class Static36 { } } if (local9.anInt452 == 0) { - method946(arg0, local9.anInt507, local61, local63, local65, local67, local50 - local9.anInt489, local55 - local9.anInt468); - if (local9.aClass13Array3 != null) { - method946(local9.aClass13Array3, local9.anInt507, local61, local63, local65, local67, local50 - local9.anInt489, local55 - local9.anInt468); + method946(arg0, local9.anInt507, local61, local63, local65, local67, local50 - local9.anInt489, local55 - local9.scrollY); + if (local9.createdComponents != null) { + method946(local9.createdComponents, local9.anInt507, local61, local63, local65, local67, local50 - local9.anInt489, local55 - local9.scrollY); } @Pc(1595) Class3_Sub31 local1595 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local9.anInt507); if (local1595 != null) { @@ -514,6 +514,6 @@ public final class Static36 { return false; } } - return arg0.aBoolean17; + return arg0.hidden; } } diff --git a/client/src/main/java/Static37.java b/client/src/main/java/Static37.java index 7098eb0..13ccdbb 100644 --- a/client/src/main/java/Static37.java +++ b/client/src/main/java/Static37.java @@ -51,8 +51,8 @@ public final class Static37 { } } if ((arg0.anInt3382 != 0 || arg0.anInt3363 != 0) && (arg0.anInt3409 == 0 || arg0.anInt3417 > 0)) { - local70 = arg0.anInt3412 - (arg0.anInt3382 - Static225.anInt5068 - Static225.anInt5068) * 64; - local43 = arg0.anInt3421 - (arg0.anInt3363 - Static142.anInt3483 - Static142.anInt3483) * 64; + local70 = arg0.anInt3412 - (arg0.anInt3382 - Static225.originX - Static225.originX) * 64; + local43 = arg0.anInt3421 - (arg0.anInt3363 - Static142.originZ - Static142.originZ) * 64; if (local70 != 0 || local43 != 0) { arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF; } diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java index 5b3294a..d3e16f8 100644 --- a/client/src/main/java/Static38.java +++ b/client/src/main/java/Static38.java @@ -136,7 +136,7 @@ public final class Static38 { } @OriginalMember(owner = "client!cn", name = "a", descriptor = "(ZI)I") - public static int method963(@OriginalArg(0) boolean arg0) { + public static int poll(@OriginalArg(0) boolean arg0) { @Pc(4) long local4 = MonotonicClock.currentTimeMillis(); for (@Pc(28) LongNode local28 = arg0 ? (LongNode) Static199.aClass133_20.method3859() : (LongNode) Static199.aClass133_20.method3861(); local28 != null; local28 = (LongNode) Static199.aClass133_20.method3861()) { if ((local28.aLong55 & 0x3FFFFFFFFFFFFFFFL) < local4) { @@ -155,7 +155,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; - if (Static115.anInt2939 == Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7 && Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7 == Static84.anInt2255) { + if (Static115.anInt2939 == Static173.self.anInt3412 >> 7 && Static173.self.anInt3421 >> 7 == Static84.anInt2255) { Static115.anInt2939 = 0; } if (arg0) { @@ -171,7 +171,7 @@ public final class Static38 { @Pc(106) int local106; for (local28 = 0; local28 < local3; local28++) { if (arg0) { - local39 = Static173.aClass8_Sub4_Sub1_2; + local39 = Static173.self; } else { local39 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local28]]; } @@ -214,7 +214,7 @@ public final class Static38 { label220: for (local28 = 0; local28 < local3; local28++) { @Pc(272) long local272; if (arg0) { - local39 = Static173.aClass8_Sub4_Sub1_2; + local39 = Static173.self; local272 = 8791798054912L; } else { local39 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local28]]; @@ -280,12 +280,12 @@ public final class Static38 { } } if (local39.anObject5 == null || Static83.anInt372 < local39.anInt3390 || local39.anInt3375 <= Static83.anInt372) { - local39.anInt3424 = Static207.method3685(Static55.anInt1735, local39.anInt3412, local39.anInt3421); - Static43.method1141(Static55.anInt1735, local39.anInt3412, local39.anInt3421, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171); + local39.anInt3424 = Static207.method3685(Static55.level, local39.anInt3412, local39.anInt3421); + Static43.method1141(Static55.level, local39.anInt3412, local39.anInt3421, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171); } else { local39.aBoolean98 = false; - local39.anInt3424 = Static207.method3685(Static55.anInt1735, local39.anInt3412, local39.anInt3421); - Static184.method3387(Static55.anInt1735, local39.anInt3412, local39.anInt3421, local39.anInt3424, local39, local39.anInt3381, local272, local39.anInt3384, local39.anInt3374, local39.anInt3411, local39.anInt3410); + local39.anInt3424 = Static207.method3685(Static55.level, local39.anInt3412, local39.anInt3421); + Static184.method3387(Static55.level, local39.anInt3412, local39.anInt3421, 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 5280230..e698d50 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -27,7 +27,7 @@ public final class Static4 { public static int anInt36 = 0; @OriginalMember(owner = "client!ac", name = "o", descriptor = "I") - public static int anInt37 = 0; + public static int updatedVarcsWriterIndex = 0; @OriginalMember(owner = "client!ac", name = "p", descriptor = "Lclient!be;") public static Component aClass13_1 = null; @@ -67,16 +67,16 @@ public final class Static4 { @OriginalMember(owner = "client!ac", name = "a", descriptor = "(B)Z") public static boolean method26() throws IOException { - if (Static124.aClass95_2 == null) { + if (Static124.socket == null) { return false; } - @Pc(14) int local14 = Static124.aClass95_2.available(); + @Pc(14) int local14 = Static124.socket.available(); if (local14 == 0) { return false; } if (Static164.anInt3985 == -1) { local14--; - Static124.aClass95_2.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.data); + Static124.socket.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.data); Static57.aClass3_Sub15_Sub1_3.offset = 0; Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.method2243(); Static223.anInt5028 = Static234.anIntArray456[Static164.anInt3985]; @@ -85,7 +85,7 @@ public final class Static4 { if (local14 <= 0) { return false; } - Static124.aClass95_2.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.data); + Static124.socket.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.data); local14--; Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.data[0] & 0xFF; } @@ -94,7 +94,7 @@ public final class Static4 { return false; } local14 -= 2; - Static124.aClass95_2.method2827(0, 2, Static57.aClass3_Sub15_Sub1_3.data); + Static124.socket.method2827(0, 2, Static57.aClass3_Sub15_Sub1_3.data); Static57.aClass3_Sub15_Sub1_3.offset = 0; Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.g2(); } @@ -102,7 +102,7 @@ public final class Static4 { return false; } Static57.aClass3_Sub15_Sub1_3.offset = 0; - Static124.aClass95_2.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); + Static124.socket.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); Static49.anInt1462 = Static5.anInt45; Static5.anInt45 = Static230.anInt5152; Static230.anInt5152 = Static164.anInt3985; @@ -345,7 +345,7 @@ public final class Static4 { @Pc(1160) int local1160; @Pc(1245) boolean local1245; if (Static164.anInt3985 == 55) { - Static278.anInt5867 = Static119.anInt3028; + Static278.anInt5867 = Static119.transmitTimer; local884 = Static57.aClass3_Sub15_Sub1_3.g8(); if (local884 == 0L) { Static270.aClass100_1094 = null; @@ -463,10 +463,10 @@ public final class Static4 { if (local786 == 2) { Static5.method34(); } - Static154.anInt3711 = local133; + Static154.topLevelInterace = local133; Static81.method1753(local133); Static210.method3712(false); - Static74.method1626(Static154.anInt3711); + Static74.method1626(Static154.topLevelInterace); for (local171 = 0; local171 < 100; local171++) { Static186.aBooleanArray100[local171] = true; } @@ -496,7 +496,7 @@ public final class Static4 { } else if (Static164.anInt3985 == 89) { Static8.method121(); Static103.method2245(); - Static70.anInt2015 += 32; + Static70.updatedVarpsWriterIndex += 32; Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 125) { @@ -543,7 +543,7 @@ public final class Static4 { local1814 = new ServerActiveProperties(local1804.anInt546, local133); local1804.method4658(); } else if (local277 == -1) { - local1814 = new ServerActiveProperties(Static5.method32(local786).aClass3_Sub4_1.anInt546, local133); + local1814 = new ServerActiveProperties(Static5.getComponent(local786).aClass3_Sub4_1.anInt546, local133); } else { local1814 = new ServerActiveProperties(0, local133); } @@ -597,7 +597,7 @@ public final class Static4 { local1146 = local864 & 0xFFFF; @Pc(2033) Player local2033; if (Static16.anInt549 == local1146) { - local2033 = Static173.aClass8_Sub4_Sub1_2; + local2033 = Static173.self; } else { local2033 = Static159.aClass8_Sub4_Sub1Array1[local1146]; } @@ -627,7 +627,7 @@ public final class Static4 { if (local1986 != -1) { local1994 = Static36.method941(local1986); if (local1994 != null && local1994.anIntArray473 != null) { - Static152.method2836(local2033.anInt3421, local1994, local2033.anInt3412, local2033 == Static173.aClass8_Sub4_Sub1_2, 0); + Static152.method2836(local2033.anInt3421, local1994, local2033.anInt3412, local2033 == Static173.self, 0); } } } @@ -636,8 +636,8 @@ public final class Static4 { } } else { local1146 = local864 >> 28 & 0x3; - local277 = (local864 >> 14 & 0x3FFF) - Static225.anInt5068; - local1160 = (local864 & 0x3FFF) - Static142.anInt3483; + 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; @@ -723,14 +723,14 @@ public final class Static4 { Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.p1neg(); for (local133 = Static115.anInt2940; local133 < Static115.anInt2940 + 8; local133++) { for (local786 = Static180.anInt4264; local786 < Static180.anInt4264 + 8; local786++) { - if (Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local133][local786] != null) { - Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local133][local786] = null; + if (Static159.aClass69ArrayArrayArray1[Static55.level][local133][local786] != null) { + Static159.aClass69ArrayArrayArray1[Static55.level][local133][local786] = null; Static220.method3797(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.anInt1735) { + 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; } } @@ -738,10 +738,10 @@ public final class Static4 { return true; } else if (Static164.anInt3985 == 144) { local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); - @Pc(2666) Component local2666 = Static5.method32(local133); - for (local864 = 0; local864 < local2666.anIntArray40.length; local864++) { - local2666.anIntArray40[local864] = -1; - local2666.anIntArray40[local864] = 0; + @Pc(2666) Component local2666 = Static5.getComponent(local133); + for (local864 = 0; local864 < local2666.objTypes.length; local864++) { + local2666.objTypes[local864] = -1; + local2666.objTypes[local864] = 0; } Static43.method1143(local2666); Static164.anInt3985 = -1; @@ -766,8 +766,8 @@ public final class Static4 { local133 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); local786 = Static57.aClass3_Sub15_Sub1_3.g1add(); local864 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static55.anInt1735 = local786 >> 1; - Static173.aClass8_Sub4_Sub1_2.method1265(local133, (local786 & 0x1) == 1, local864); + Static55.level = local786 >> 1; + Static173.self.method1265(local133, (local786 & 0x1) == 1, local864); Static164.anInt3985 = -1; return true; } else { @@ -815,7 +815,7 @@ public final class Static4 { Static3.aBooleanArray135[Static9.anInt178] = local262; Static9.anInt178++; } - Static185.anInt4369 = Static119.anInt3028; + Static185.anInt4369 = Static119.transmitTimer; local908 = Static9.anInt178; while (local908 > 0) { local908--; @@ -862,7 +862,7 @@ public final class Static4 { if (Static106.anIntArray257[local133] != Static7.anIntArray75[local133]) { Static7.anIntArray75[local133] = Static106.anIntArray257[local133]; Static85.method1775(local133); - Static83.anIntArray23[Static70.anInt2015++ & 0x1F] = local133; + Static83.updatedVarps[Static70.updatedVarpsWriterIndex++ & 0x1F] = local133; } } Static164.anInt3985 = -1; @@ -937,17 +937,17 @@ public final class Static4 { local3449.method4658(); Static119.aClass133_9.method3862(local3449, (long) local864); } - @Pc(3490) Component local3490 = Static5.method32(local133); + @Pc(3490) Component local3490 = Static5.getComponent(local133); if (local3490 != null) { Static43.method1143(local3490); } - local3490 = Static5.method32(local864); + local3490 = Static5.getComponent(local864); if (local3490 != null) { Static43.method1143(local3490); Static17.method531(local3490, true); } - if (Static154.anInt3711 != -1) { - Static54.method1304(1, Static154.anInt3711); + if (Static154.topLevelInterace != -1) { + Static54.method1304(1, Static154.topLevelInterace); } } Static164.anInt3985 = -1; @@ -978,9 +978,9 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 85) { - Static60.anInt1894 = Static57.aClass3_Sub15_Sub1_3.g2() * 30; + Static60.rebootTimer = Static57.aClass3_Sub15_Sub1_3.g2() * 30; Static164.anInt3985 = -1; - Static209.anInt4808 = Static119.anInt3028; + Static209.miscTransmitAt = Static119.transmitTimer; return true; } else if (Static164.anInt3985 == 114) { Static202.method3654(Static71.signLink, Static57.aClass3_Sub15_Sub1_3, Static223.anInt5028); @@ -998,12 +998,12 @@ public final class Static4 { } else if (Static164.anInt3985 == 234) { Static103.method2245(); Static12.anInt400 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static209.anInt4808 = Static119.anInt3028; + Static209.miscTransmitAt = Static119.transmitTimer; Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 209) { - if (Static154.anInt3711 != -1) { - Static54.method1304(0, Static154.anInt3711); + if (Static154.topLevelInterace != -1) { + Static54.method1304(0, Static154.topLevelInterace); } Static164.anInt3985 = -1; return true; @@ -1026,7 +1026,7 @@ public final class Static4 { } else if (Static164.anInt3985 == 159) { Static103.method2245(); Static251.anInt5456 = Static57.aClass3_Sub15_Sub1_3.g2s(); - Static209.anInt4808 = Static119.anInt3028; + Static209.miscTransmitAt = Static119.transmitTimer; Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 71) { @@ -1043,11 +1043,11 @@ public final class Static4 { Static57.aClass3_Sub15_Sub1_3.method2237(local3848, Static223.anInt5028); local156 = Static10.decodeString(local3848, Static223.anInt5028, 0); if (Static39.aFrame1 == null && (SignLink.anInt5928 == 3 || !SignLink.aString15.startsWith("win") || Static178.aBoolean203)) { - Static169.method3175(local156, true); + Static169.openUrl(local156, true); } else { - Static175.aClass100_797 = local156; - Static164.aBoolean194 = true; - Static33.aClass212_1 = Static71.signLink.method5131(new String(local156.method3148(), "ISO-8859-1")); + Static175.url = local156; + Static164.newTab = true; + Static33.openUrlRequest = Static71.signLink.method5131(new String(local156.method3148(), "ISO-8859-1")); } Static164.anInt3985 = -1; return true; @@ -1145,7 +1145,7 @@ public final class Static4 { Static190.aLongArray6[local133] = Static57.aClass3_Sub15_Sub1_3.g8(); Static193.aClass100Array134[local133] = Static79.method1702(Static190.aLongArray6[local133]); } - Static185.anInt4369 = Static119.anInt3028; + Static185.anInt4369 = Static119.transmitTimer; Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 32) { @@ -1174,8 +1174,8 @@ public final class Static4 { } local908 = local277 & 0x3FFF; local1986 = local277 >> 14 & 0x3FFF; - local1986 -= Static225.anInt5068; - local908 -= Static142.anInt3483; + local1986 -= Static225.originX; + local908 -= Static142.originZ; local1160 = local277 >> 28 & 0x3; Static92.method1881(local1160, local864, local786, local908, local171, local1986, local1146); Static164.anInt3985 = -1; @@ -1289,8 +1289,8 @@ public final class Static4 { local786 = Static57.aClass3_Sub15_Sub1_3.g4rme(); if (Static248.method3288(local133)) { local864 = 0; - if (Static173.aClass8_Sub4_Sub1_2.aClass59_1 != null) { - local864 = Static173.aClass8_Sub4_Sub1_2.aClass59_1.method1952(); + if (Static173.self.aClass59_1 != null) { + local864 = Static173.self.aClass59_1.method1952(); } Static132.method2607(-1, 3, local786, local864); } @@ -1322,7 +1322,7 @@ public final class Static4 { if (local133 < 0) { local4956 = null; } else { - local4956 = Static5.method32(local133); + local4956 = Static5.getComponent(local133); } while (Static57.aClass3_Sub15_Sub1_3.offset < Static223.anInt5028) { local171 = Static57.aClass3_Sub15_Sub1_3.gSmart1or2(); @@ -1334,9 +1334,9 @@ public final class Static4 { local277 = Static57.aClass3_Sub15_Sub1_3.g4(); } } - if (local4956 != null && local171 >= 0 && local4956.anIntArray40.length > local171) { - local4956.anIntArray40[local171] = local1146; - local4956.anIntArray50[local171] = local277; + if (local4956 != null && local171 >= 0 && local4956.objTypes.length > local171) { + local4956.objTypes[local171] = local1146; + local4956.objCounts[local171] = local277; } Static280.method4672(local1146 - 1, local171, local277, local786); } @@ -1367,7 +1367,7 @@ public final class Static4 { Static229.aClass136Array1[local133] = new StockMarketOffer(Static57.aClass3_Sub15_Sub1_3); } Static164.anInt3985 = -1; - Static207.anInt4778 = Static119.anInt3028; + Static207.anInt4778 = Static119.transmitTimer; return true; } else if (Static164.anInt3985 == 73) { local133 = Static57.aClass3_Sub15_Sub1_3.g2sub(); @@ -1405,7 +1405,7 @@ public final class Static4 { local1814 = new ServerActiveProperties(local1146, local1804.anInt540); local1804.method4658(); } else if (local277 == -1) { - local1814 = new ServerActiveProperties(local1146, Static5.method32(local864).aClass3_Sub4_1.anInt540); + local1814 = new ServerActiveProperties(local1146, Static5.getComponent(local864).aClass3_Sub4_1.anInt540); } else { local1814 = new ServerActiveProperties(local1146, -1); } @@ -1416,7 +1416,7 @@ public final class Static4 { return true; } else if (Static164.anInt3985 == 197) { Static166.anInt4054 = Static57.aClass3_Sub15_Sub1_3.g1(); - Static185.anInt4369 = Static119.anInt3028; + Static185.anInt4369 = Static119.transmitTimer; Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 196) { @@ -1460,7 +1460,7 @@ public final class Static4 { if (local884 == Static101.aLong98) { Static160.aByte14 = local5325; } - Static278.anInt5867 = Static119.anInt3028; + Static278.anInt5867 = Static119.transmitTimer; Static164.anInt3985 = -1; return true; } @@ -1485,7 +1485,7 @@ public final class Static4 { Static214.anInt5577++; } Static164.anInt3985 = -1; - Static278.anInt5867 = Static119.anInt3028; + Static278.anInt5867 = Static119.transmitTimer; return true; } else if (Static164.anInt3985 == 50) { local133 = Static57.aClass3_Sub15_Sub1_3.g4(); @@ -1496,7 +1496,7 @@ public final class Static4 { } local171 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (Static248.method3288(local171)) { - @Pc(5603) Component local5603 = Static5.method32(local786); + @Pc(5603) Component local5603 = Static5.getComponent(local786); @Pc(5615) ObjType local5615; if (local5603.aBoolean32) { Static209.method3707(local786, local133, local864); @@ -1504,16 +1504,16 @@ public final class Static4 { Static261.method4505(local5615.anInt2375, local786, local5615.anInt2369, local5615.anInt2353); Static145.method2745(local786, local5615.anInt2339, local5615.anInt2319, local5615.anInt2359); } else if (local864 == -1) { - local5603.anInt464 = 0; + local5603.modelType = 0; Static164.anInt3985 = -1; return true; } else { local5615 = Static71.method1439(local864); - local5603.anInt450 = local5615.anInt2353; - local5603.anInt443 = local5615.anInt2375 * 100 / local133; - local5603.anInt464 = 4; - local5603.anInt463 = local864; - local5603.anInt524 = local5615.anInt2369; + local5603.modelXAngle = local5615.anInt2353; + local5603.modelZoom = local5615.anInt2375 * 100 / local133; + local5603.modelType = 4; + local5603.modelId = local864; + local5603.modelYAngle = local5615.anInt2369; Static43.method1143(local5603); } } @@ -1526,14 +1526,14 @@ public final class Static4 { local786 += 32768; } if (local133 >= 0) { - local4956 = Static5.method32(local133); + local4956 = Static5.getComponent(local133); } else { local4956 = null; } if (local4956 != null) { - for (local171 = 0; local171 < local4956.anIntArray40.length; local171++) { - local4956.anIntArray40[local171] = 0; - local4956.anIntArray50[local171] = 0; + for (local171 = 0; local171 < local4956.objTypes.length; local171++) { + local4956.objTypes[local171] = 0; + local4956.objCounts[local171] = 0; } } Static14.method475(local786); @@ -1544,9 +1544,9 @@ public final class Static4 { local277 = Static57.aClass3_Sub15_Sub1_3.g4(); } local1160 = Static57.aClass3_Sub15_Sub1_3.g2(); - if (local4956 != null && local1146 < local4956.anIntArray40.length) { - local4956.anIntArray40[local1146] = local1160; - local4956.anIntArray50[local1146] = local277; + if (local4956 != null && local1146 < local4956.objTypes.length) { + local4956.objTypes[local1146] = local1160; + local4956.objCounts[local1146] = local277; } Static280.method4672(local1160 - 1, local1146, local277, local786); } @@ -1620,7 +1620,7 @@ public final class Static4 { @Pc(109) int local109 = local41 - Static20.anInt660; @Pc(114) int local114 = local30 - Static124.anInt3075; @Pc(122) int local122 = local30 + aClass13_1.anInt489 - Static81.anInt2225; - @Pc(130) int local130 = aClass13_1.anInt468 + local41 - Static228.anInt5103; + @Pc(130) int local130 = aClass13_1.scrollY + local41 - Static228.anInt5103; @Pc(133) int local133 = Static105.aClass13_14.anInt472; if (Static213.anInt4851 > Static105.aClass13_14.anInt447 && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) { Static138.aBoolean172 = true; @@ -1628,7 +1628,7 @@ public final class Static4 { @Pc(176) HookRequest local176; if (Static105.aClass13_14.anObjectArray26 != null && Static138.aBoolean172) { local176 = new HookRequest(); - local176.aClass13_17 = Static105.aClass13_14; + local176.source = Static105.aClass13_14; local176.anObjectArray31 = Static105.aClass13_14.anObjectArray26; local176.anInt3102 = local122; local176.anInt3097 = local130; @@ -1642,15 +1642,15 @@ public final class Static4 { local176.aClass13_16 = Static56.aClass13_12; local176.anInt3102 = local122; local176.anObjectArray31 = Static105.aClass13_14.anObjectArray16; - local176.aClass13_17 = Static105.aClass13_14; + local176.source = Static105.aClass13_14; Static82.method1767(local176); } if (Static56.aClass13_12 != null && Static36.method938(Static105.aClass13_14) != null) { - Static6.aClass3_Sub15_Sub1_1.method2242(79); - Static6.aClass3_Sub15_Sub1_1.p4me(Static105.aClass13_14.anInt507); - Static6.aClass3_Sub15_Sub1_1.p2le(Static56.aClass13_12.anInt457); - Static6.aClass3_Sub15_Sub1_1.p4(Static56.aClass13_12.anInt507); - Static6.aClass3_Sub15_Sub1_1.p2le(Static105.aClass13_14.anInt457); + Static6.outboundBuffer.p1isaac(79); + Static6.outboundBuffer.p4me(Static105.aClass13_14.anInt507); + Static6.outboundBuffer.p2le(Static56.aClass13_12.componentId); + Static6.outboundBuffer.p4(Static56.aClass13_12.anInt507); + Static6.outboundBuffer.p2le(Static105.aClass13_14.componentId); } } else if ((Static116.anInt2952 == 1 || Static277.method4640(Static231.anInt5204 - 1)) && Static231.anInt5204 > 2) { Static226.method3901(); diff --git a/client/src/main/java/Static40.java b/client/src/main/java/Static40.java index f5f65ce..f403a67 100644 --- a/client/src/main/java/Static40.java +++ b/client/src/main/java/Static40.java @@ -53,8 +53,8 @@ public final class Static40 { local30[local72] = (float) local119 + (((float) local173 * local66 + (float) local155) * local66 + (float) local146) * local66; } Static5.anInt40 = (int) local30[1] * -1; - Static138.anInt3439 = (int) local30[0] - Static225.anInt5068 * 128; - Static134.anInt3302 = (int) local30[2] - Static142.anInt3483 * 128; + Static138.anInt3439 = (int) local30[0] - Static225.originX * 128; + Static134.anInt3302 = (int) local30[2] - Static142.originZ * 128; @Pc(226) float[] local226 = new float[3]; local141 = Static75.anInt2119 * 2; for (local131 = 0; local131 < 3; local131++) { @@ -136,10 +136,10 @@ public final class Static40 { local8.p2(arg1); local8.p4((int) (Math.random() * 9.9999999E7D)); local8.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2); - Static6.aClass3_Sub15_Sub1_1.offset = 0; - Static6.aClass3_Sub15_Sub1_1.p1(36); - Static6.aClass3_Sub15_Sub1_1.p1(local8.offset); - Static6.aClass3_Sub15_Sub1_1.pBytes(local8.data, local8.offset); + Static6.outboundBuffer.offset = 0; + Static6.outboundBuffer.p1(36); + Static6.outboundBuffer.p1(local8.offset); + Static6.outboundBuffer.pBytes(local8.data, local8.offset); Static223.anInt5034 = -3; Static179.anInt4261 = 1; Static226.anInt5079 = 0; diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java index dc3caa9..ce3573b 100644 --- a/client/src/main/java/Static41.java +++ b/client/src/main/java/Static41.java @@ -140,18 +140,18 @@ public final class Static41 { } if (Static239.aBoolean269) { @Pc(650) GlModel local650 = (GlModel) local33; - if (Static207.method3685(Static55.anInt1735, arg3 + local384, local126 + arg5) != arg11 || Static207.method3685(Static55.anInt1735, local115 + arg3, arg5 - -local130) != arg11) { + if (Static207.method3685(Static55.level, arg3 + local384, local126 + arg5) != arg11 || Static207.method3685(Static55.level, local115 + arg3, arg5 - -local130) != arg11) { for (local162 = 0; local162 < local650.anInt5295; local162++) { - local650.anIntArray465[local162] += Static207.method3685(Static55.anInt1735, local650.anIntArray461[local162] + arg3, arg5 + local650.anIntArray466[local162]) - arg11; + local650.anIntArray465[local162] += Static207.method3685(Static55.level, local650.anIntArray461[local162] + arg3, arg5 + local650.anIntArray466[local162]) - arg11; } local650.aClass5_1.aBoolean3 = false; local650.aClass127_4.aBoolean235 = false; } } else { @Pc(574) SoftwareModel local574 = (SoftwareModel) local33; - if (Static207.method3685(Static55.anInt1735, arg3 + local384, arg5 - -local126) != arg11 || arg11 != Static207.method3685(Static55.anInt1735, arg3 + local115, arg5 - -local130)) { + if (Static207.method3685(Static55.level, arg3 + local384, arg5 - -local126) != arg11 || arg11 != Static207.method3685(Static55.level, arg3 + local115, arg5 - -local130)) { for (local162 = 0; local162 < local574.anInt5788; local162++) { - local574.anIntArray527[local162] += Static207.method3685(Static55.anInt1735, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11; + local574.anIntArray527[local162] += Static207.method3685(Static55.level, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11; } local574.aBoolean305 = false; } diff --git a/client/src/main/java/Static44.java b/client/src/main/java/Static44.java index a378d32..ca7a46e 100644 --- a/client/src/main/java/Static44.java +++ b/client/src/main/java/Static44.java @@ -21,7 +21,7 @@ public final class Static44 { @OriginalMember(owner = "client!dh", name = "a", descriptor = "(Z)V") public static void method1146() { - Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static6.outboundBuffer.offset = 0; Static5.anInt45 = -1; Static60.aBoolean108 = false; Static223.anInt5028 = 0; @@ -29,7 +29,7 @@ public final class Static44 { Static231.anInt5204 = 0; Static230.anInt5152 = -1; Static270.anInt5795 = 0; - Static60.anInt1894 = 0; + Static60.rebootTimer = 0; Static49.anInt1462 = -1; Static57.aClass3_Sub15_Sub1_3.offset = 0; Static201.anInt1862 = 0; @@ -70,7 +70,7 @@ public final class Static44 { local9.anInt5878 = arg0; Static119.aClass133_9.method3862(local9, (long) arg1); Static81.method1753(arg0); - @Pc(28) Component local28 = Static5.method32(arg1); + @Pc(28) Component local28 = Static5.getComponent(arg1); if (local28 != null) { Static43.method1143(local28); } @@ -104,8 +104,8 @@ public final class Static44 { Static17.method531(local28, false); } Static74.method1626(arg0); - if (Static154.anInt3711 != -1) { - Static54.method1304(1, Static154.anInt3711); + if (Static154.topLevelInterace != -1) { + Static54.method1304(1, Static154.topLevelInterace); } return local9; } diff --git a/client/src/main/java/Static45.java b/client/src/main/java/Static45.java index e418449..f9a65f8 100644 --- a/client/src/main/java/Static45.java +++ b/client/src/main/java/Static45.java @@ -507,7 +507,7 @@ public final class Static45 { Static259.anIntArray514[0] = arg2; @Pc(71) int local71 = local51 + 1; Static84.anIntArray209[0] = arg9; - @Pc(78) int[][] local78 = Static148.aClass97Array1[Static55.anInt1735].anIntArrayArray30; + @Pc(78) int[][] local78 = Static148.aClass97Array1[Static55.level].anIntArrayArray30; @Pc(198) int local198; while (local71 != local64) { local10 = Static84.anIntArray209[local64]; @@ -518,16 +518,16 @@ public final class Static45 { break; } if (arg8 != 0) { - if ((arg8 < 5 || arg8 == 10) && Static148.aClass97Array1[Static55.anInt1735].method3042(arg3, local3, local10, arg0, arg8 - 1, 1, arg6)) { + if ((arg8 < 5 || arg8 == 10) && Static148.aClass97Array1[Static55.level].method3042(arg3, local3, local10, arg0, arg8 - 1, 1, arg6)) { local53 = true; break; } - if (arg8 < 10 && Static148.aClass97Array1[Static55.anInt1735].method3046(arg3, arg8 - 1, arg0, local10, 1, arg6, local3)) { + if (arg8 < 10 && Static148.aClass97Array1[Static55.level].method3046(arg3, arg8 - 1, arg0, local10, 1, arg6, local3)) { local53 = true; break; } } - if (arg10 != 0 && arg5 != 0 && Static148.aClass97Array1[Static55.anInt1735].method3052(arg0, local10, local3, 1, arg10, arg1, arg3, arg5)) { + if (arg10 != 0 && arg5 != 0 && Static148.aClass97Array1[Static55.level].method3052(arg0, local10, local3, 1, arg10, arg1, arg3, arg5)) { local53 = true; break; } diff --git a/client/src/main/java/Static48.java b/client/src/main/java/Static48.java index dfbab17..b39bbc1 100644 --- a/client/src/main/java/Static48.java +++ b/client/src/main/java/Static48.java @@ -61,7 +61,7 @@ public final class Static48 { } @OriginalMember(owner = "client!dl", name = "a", descriptor = "(II)V") - public static void method1197(@OriginalArg(1) int arg0) { + public static void setIdleLoops(@OriginalArg(1) int arg0) { @Pc(10) Mouse local10 = Static93.aClass150_1; synchronized (Static93.aClass150_1) { Static93.anInt2467 = arg0; diff --git a/client/src/main/java/Static5.java b/client/src/main/java/Static5.java index 4354467..6ea504c 100644 --- a/client/src/main/java/Static5.java +++ b/client/src/main/java/Static5.java @@ -31,16 +31,20 @@ public final class Static5 { } @OriginalMember(owner = "client!af", name = "a", descriptor = "(BI)Lclient!be;") - public static Component method32(@OriginalArg(1) int arg0) { - @Pc(7) int local7 = arg0 >> 16; - @Pc(18) int local18 = arg0 & 0xFFFF; - if (Static241.aClass13ArrayArray12[local7] == null || Static241.aClass13ArrayArray12[local7][local18] == null) { - @Pc(33) boolean local33 = Static245.method4225(local7); - if (!local33) { + public static Component getComponent(@OriginalArg(1) int id) { + @Pc(7) int interfaceId = id >> 16; + @Pc(18) int componentId = id & 0xFFFF; + if (Static241.components[interfaceId] == null || Static241.components[interfaceId][componentId] == null) { + @Pc(33) boolean success = Static245.load(interfaceId); + if (!success) { + return null; + } + // todo: this should not be necessary, data/server-related? + if (Static241.components.length <= interfaceId || Static241.components[interfaceId].length <= componentId) { return null; } } - return Static241.aClass13ArrayArray12[local7][local18]; + return Static241.components[interfaceId][componentId]; } @OriginalMember(owner = "client!af", name = "b", descriptor = "(B)V") diff --git a/client/src/main/java/Static52.java b/client/src/main/java/Static52.java index 24b62d1..695167f 100644 --- a/client/src/main/java/Static52.java +++ b/client/src/main/java/Static52.java @@ -34,7 +34,7 @@ public final class Static52 { @OriginalMember(owner = "client!eb", name = "d", descriptor = "(I)V") public static void method1287() { - Static241.aClass13ArrayArray12 = new Component[Static202.aClass153_84.method4483()][]; + Static241.components = new Component[Static202.aClass153_84.method4483()][]; Static223.aBooleanArray115 = new boolean[Static202.aClass153_84.method4483()]; } diff --git a/client/src/main/java/Static53.java b/client/src/main/java/Static53.java index faebc9c..ea86c14 100644 --- a/client/src/main/java/Static53.java +++ b/client/src/main/java/Static53.java @@ -91,7 +91,7 @@ public final class Static53 { if (local19 != null && local19.anObjectArray27 != null) { @Pc(29) HookRequest local29 = new HookRequest(); local29.anObjectArray31 = local19.anObjectArray27; - local29.aClass13_17 = local19; + local29.source = local19; Static82.method1767(local29); } Static241.aBoolean302 = false; diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index 4a346bd..90ea26e 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -12,8 +12,8 @@ public final class Static54 { @OriginalMember(owner = "client!ed", name = "a", descriptor = "(III)V") public static void method1304(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - if (Static245.method4225(arg1)) { - Static2.method7(Static241.aClass13ArrayArray12[arg1], arg0); + if (Static245.load(arg1)) { + Static2.method7(Static241.components[arg1], arg0); } } @@ -27,8 +27,8 @@ public final class Static54 { } if (Static270.anInt5795 != 2 && Static270.anInt5795 != 5 && Static89.aClass3_Sub2_Sub1_5 != null) { @Pc(48) int local48 = Static59.anInt1814 + Static57.anInt1747 & 0x7FF; - @Pc(57) int local57 = Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32 + 48; - @Pc(67) int local67 = 464 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + @Pc(57) int local57 = Static173.self.anInt3412 / 32 + 48; + @Pc(67) int local67 = 464 - Static173.self.anInt3421 / 32; if (Static239.aBoolean269) { ((GlSprite) Static89.aClass3_Sub2_Sub1_5).method1427(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, (GlSprite) arg3.method489(false)); } else { @@ -45,12 +45,12 @@ public final class Static54 { if (Static235.aClass134_2 != null) { for (@Pc(117) int local117 = 0; local117 < Static235.aClass134_2.anInt5074; local117++) { if (Static235.aClass134_2.method3892(local117)) { - local146 = (Static235.aClass134_2.aShortArray73[local117] - Static225.anInt5068) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; + local146 = (Static235.aClass134_2.aShortArray73[local117] - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32; local150 = MathUtils.anIntArray223[local48]; local154 = MathUtils.anIntArray225[local48]; @Pc(156) Font local156 = Static114.aClass3_Sub2_Sub9_42; @Pc(164) int local164 = local150 * 256 / (Static273.anInt4130 + 256); - local181 = (Static235.aClass134_2.aShortArray72[local117] - Static142.anInt3483) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + local181 = (Static235.aClass134_2.aShortArray72[local117] - Static142.originZ) * 4 + 2 - Static173.self.anInt3421 / 32; @Pc(189) int local189 = local154 * 256 / (Static273.anInt4130 + 256); local200 = local181 * local189 - local146 * local164 >> 16; if (Static235.aClass134_2.method3894(local117) == 1) { @@ -83,8 +83,8 @@ public final class Static54 { } } for (local146 = 0; local146 < Static251.anInt5454; local146++) { - local181 = Static145.anIntArray331[local146] * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; - local150 = Static93.anIntArray219[local146] * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + local181 = Static145.anIntArray331[local146] * 4 + 2 - Static173.self.anInt3412 / 32; + local150 = Static93.anIntArray219[local146] * 4 + 2 - Static173.self.anInt3421 / 32; @Pc(382) LocType local382 = Static271.method4601(Static199.anIntArray417[local146]); if (local382.anIntArray380 != null) { local382 = local382.method3417(); @@ -96,10 +96,10 @@ public final class Static54 { } for (local146 = 0; local146 < 104; local146++) { for (local181 = 0; local181 < 104; local181++) { - @Pc(439) LinkedList local439 = Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local146][local181]; + @Pc(439) LinkedList local439 = Static159.aClass69ArrayArrayArray1[Static55.level][local146][local181]; if (local439 != null) { - local154 = local146 * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; - local231 = local181 * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + local154 = local146 * 4 + 2 - Static173.self.anInt3412 / 32; + local231 = local181 * 4 + 2 - Static173.self.anInt3421 / 32; Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[0], local231, local154, arg1, arg2); } } @@ -112,8 +112,8 @@ public final class Static54 { local507 = local507.method2932(); } if (local507 != null && local507.aBoolean184 && local507.aBoolean183) { - local154 = local498.anInt3412 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; - local231 = local498.anInt3421 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + local154 = local498.anInt3412 / 32 - Static173.self.anInt3412 / 32; + local231 = local498.anInt3421 / 32 - Static173.self.anInt3421 / 32; if (local507.anInt3739 == -1) { Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[1], local231, local154, arg1, arg2); } else { @@ -125,8 +125,8 @@ public final class Static54 { for (local146 = 0; local146 < Static267.anInt5774; local146++) { @Pc(591) Player local591 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local146]]; if (local591 != null && local591.method2682()) { - local154 = local591.anInt3421 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; - local150 = local591.anInt3412 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; + local154 = local591.anInt3421 / 32 - Static173.self.anInt3421 / 32; + local150 = local591.anInt3412 / 32 - Static173.self.anInt3412 / 32; @Pc(624) long local624 = local591.aClass100_364.method3158(); @Pc(626) boolean local626 = false; for (local239 = 0; local239 < Static9.anInt178; local239++) { @@ -143,7 +143,7 @@ public final class Static54 { } } @Pc(682) boolean local682 = false; - if (Static173.aClass8_Sub4_Sub1_2.anInt1650 != 0 && local591.anInt1650 != 0 && local591.anInt1650 == Static173.aClass8_Sub4_Sub1_2.anInt1650) { + if (Static173.self.anInt1650 != 0 && local591.anInt1650 != 0 && local591.anInt1650 == Static173.self.anInt1650) { local682 = true; } if (local626) { @@ -164,29 +164,29 @@ public final class Static54 { if (local770.anInt4058 == 1 && local770.anInt4057 >= 0 && local770.anInt4057 < Static175.aClass8_Sub4_Sub2Array1.length) { @Pc(804) Npc local804 = Static175.aClass8_Sub4_Sub2Array1[local770.anInt4057]; if (local804 != null) { - local231 = local804.anInt3412 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; - local200 = local804.anInt3421 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + local231 = local804.anInt3412 / 32 - Static173.self.anInt3412 / 32; + local200 = local804.anInt3421 / 32 - Static173.self.anInt3421 / 32; Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3); } } if (local770.anInt4058 == 2) { - local154 = (local770.anInt4053 - Static225.anInt5068) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; - local231 = (-Static142.anInt3483 + local770.anInt4046) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + local154 = (local770.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32; + local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - Static173.self.anInt3421 / 32; Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3); } if (local770.anInt4058 == 10 && local770.anInt4057 >= 0 && Static159.aClass8_Sub4_Sub1Array1.length > local770.anInt4057) { @Pc(905) Player local905 = Static159.aClass8_Sub4_Sub1Array1[local770.anInt4057]; if (local905 != null) { - local200 = local905.anInt3421 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; - local231 = local905.anInt3412 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; + local200 = local905.anInt3421 / 32 - Static173.self.anInt3421 / 32; + local231 = local905.anInt3412 / 32 - Static173.self.anInt3412 / 32; Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3); } } } } if (Static115.anInt2939 != 0) { - local146 = Static115.anInt2939 * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; - local181 = Static84.anInt2255 * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; + local146 = Static115.anInt2939 * 4 + 2 - Static173.self.anInt3412 / 32; + local181 = Static84.anInt2255 * 4 + 2 - Static173.self.anInt3421 / 32; Static60.method1446(arg3, Static84.aClass3_Sub2_Sub1_4, local181, local146, arg1, arg2); } if (Static239.aBoolean269) { @@ -270,7 +270,7 @@ public final class Static54 { } @OriginalMember(owner = "client!ed", name = "d", descriptor = "(B)V") - public static void method1312() { + public static void loop() { for (@Pc(5) int local5 = 0; local5 < Static189.anInt4451; local5++) { @Pc(12) int local12 = Static164.anIntArray362[local5]--; if (Static164.anIntArray362[local5] >= -10) { @@ -291,11 +291,11 @@ public final class Static54 { @Pc(125) int local125 = (Static26.anIntArray68[local5] & 0xFF) * 128; @Pc(133) int local133 = Static26.anIntArray68[local5] >> 8 & 0xFF; @Pc(141) int local141 = Static26.anIntArray68[local5] >> 16 & 0xFF; - @Pc(151) int local151 = local133 * 128 + 64 - Static173.aClass8_Sub4_Sub1_2.anInt3421; + @Pc(151) int local151 = local133 * 128 + 64 - Static173.self.anInt3421; if (local151 < 0) { local151 = -local151; } - @Pc(167) int local167 = local141 * 128 + 64 - Static173.aClass8_Sub4_Sub1_2.anInt3412; + @Pc(167) int local167 = local141 * 128 + 64 - Static173.self.anInt3412; if (local167 < 0) { local167 = -local167; } @@ -335,8 +335,8 @@ public final class Static54 { } Static144.aBoolean173 = false; } else if (Static12.anInt391 != 0 && Static221.anInt4363 != -1 && !Static136.method2655()) { - Static6.aClass3_Sub15_Sub1_1.method2242(137); - Static6.aClass3_Sub15_Sub1_1.p4(Static221.anInt4363); + Static6.outboundBuffer.p1isaac(137); + Static6.outboundBuffer.p4(Static221.anInt4363); Static221.anInt4363 = -1; } } diff --git a/client/src/main/java/Static55.java b/client/src/main/java/Static55.java index 1402fd5..6e572b9 100644 --- a/client/src/main/java/Static55.java +++ b/client/src/main/java/Static55.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static55 { @OriginalMember(owner = "client!ee", name = "b", descriptor = "I") - public static int anInt1735; + public static int level; @OriginalMember(owner = "client!ee", name = "c", descriptor = "I") public static int anInt1736; diff --git a/client/src/main/java/Static57.java b/client/src/main/java/Static57.java index f562caf..2ecbf0b 100644 --- a/client/src/main/java/Static57.java +++ b/client/src/main/java/Static57.java @@ -23,8 +23,8 @@ public final class Static57 { @OriginalMember(owner = "client!eg", name = "a", descriptor = "(IIIIIIII)V") public static void method1320(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { - if (Static245.method4225(arg4)) { - Static36.method946(Static241.aClass13ArrayArray12[arg4], -1, arg5, arg1, arg3, arg6, arg0, arg2); + if (Static245.load(arg4)) { + Static36.method946(Static241.components[arg4], -1, arg5, arg1, arg3, arg6, arg0, arg2); } } } diff --git a/client/src/main/java/Static58.java b/client/src/main/java/Static58.java index fddbb20..bc48447 100644 --- a/client/src/main/java/Static58.java +++ b/client/src/main/java/Static58.java @@ -14,7 +14,7 @@ public final class Static58 { public static boolean aBoolean101 = false; @OriginalMember(owner = "client!eh", name = "j", descriptor = "I") - public static int anInt1766 = 0; + public static int wheelRotation = 0; @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I)V") public static void method1321() { diff --git a/client/src/main/java/Static59.java b/client/src/main/java/Static59.java index 32d6b8f..4921b9a 100644 --- a/client/src/main/java/Static59.java +++ b/client/src/main/java/Static59.java @@ -21,33 +21,33 @@ public final class Static59 { if (Static162.anInt3953 == 2) { if (Static155.anInt3751 == Static277.anInt5850 && Static60.anInt1892 == Static280.anInt5895) { Static162.anInt3953 = 0; - if (Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) { + if (Static172.shiftClick && Static187.pressedKeys[81] && Static231.anInt5204 > 2) { Static103.method2232(Static231.anInt5204 - 2); } else { Static103.method2232(Static231.anInt5204 - 1); } } - } else if (Static155.anInt3751 == Static7.anInt985 && Static60.anInt1892 == Static60.anInt1893) { + } else if (Static155.anInt3751 == Static7.clickX && Static60.anInt1892 == Static60.clickY) { Static162.anInt3953 = 0; - if (Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) { + if (Static172.shiftClick && Static187.pressedKeys[81] && Static231.anInt5204 > 2) { Static103.method2232(Static231.anInt5204 - 2); } else { Static103.method2232(Static231.anInt5204 - 1); } } else { - Static280.anInt5895 = Static60.anInt1893; + Static280.anInt5895 = Static60.clickY; Static162.anInt3953 = 2; - Static277.anInt5850 = Static7.anInt985; + Static277.anInt5850 = Static7.clickX; } } @OriginalMember(owner = "client!ej", name = "i", descriptor = "(I)V") public static void method1373() { - Static6.aClass3_Sub15_Sub1_1.method2242(243); - Static6.aClass3_Sub15_Sub1_1.p1(Static144.method2736()); - Static6.aClass3_Sub15_Sub1_1.p2(Static48.anInt1448); - Static6.aClass3_Sub15_Sub1_1.p2(Static254.anInt5554); - Static6.aClass3_Sub15_Sub1_1.p1(Static186.anInt4392); + Static6.outboundBuffer.p1isaac(243); + Static6.outboundBuffer.p1(Static144.method2736()); + Static6.outboundBuffer.p2(Static48.anInt1448); + Static6.outboundBuffer.p2(Static254.anInt5554); + Static6.outboundBuffer.p1(Static186.anInt4392); } @OriginalMember(owner = "client!ej", name = "a", descriptor = "(Lclient!ve;ILclient!ve;Lclient!of;)V") diff --git a/client/src/main/java/Static6.java b/client/src/main/java/Static6.java index b28388a..50cbe7f 100644 --- a/client/src/main/java/Static6.java +++ b/client/src/main/java/Static6.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static6 { @OriginalMember(owner = "client!ag", name = "P", descriptor = "Lclient!i;") - public static final Packet aClass3_Sub15_Sub1_1 = new Packet(5000); + public static final Packet outboundBuffer = new Packet(5000); @OriginalMember(owner = "client!ag", name = "ab", descriptor = "Lclient!na;") public static final JagString aClass100_17 = Static28.parse("0"); @@ -60,8 +60,8 @@ public final class Static6 { @OriginalMember(owner = "client!ag", name = "a", descriptor = "(IIIIIIIII)V") public static void method86(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { - if (Static245.method4225(arg0)) { - Static87.method1809(arg1, arg7, arg3, Static241.aClass13ArrayArray12[arg0], arg2, -1, arg6, arg5, arg4); + if (Static245.load(arg0)) { + Static87.method1809(arg1, arg7, arg3, Static241.components[arg0], arg2, -1, arg6, arg5, arg4); } else if (arg4 == -1) { for (@Pc(27) int local27 = 0; local27 < 100; local27++) { Static186.aBooleanArray100[local27] = true; diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java index cb2b049..be025f0 100644 --- a/client/src/main/java/Static60.java +++ b/client/src/main/java/Static60.java @@ -23,13 +23,13 @@ public final class Static60 { public static final JagString aClass100_420 = Static28.parse(")1o"); @OriginalMember(owner = "client!em", name = "y", descriptor = "I") - public static int anInt1893 = 0; + public static int clickY = 0; @OriginalMember(owner = "client!em", name = "z", descriptor = "Z") public static boolean aBoolean108 = false; @OriginalMember(owner = "client!em", name = "B", descriptor = "I") - public static int anInt1894 = 0; + public static int rebootTimer = 0; @OriginalMember(owner = "client!em", name = "a", descriptor = "(Lclient!be;Lclient!qf;IIIBI)V") public static void method1446(@OriginalArg(0) Component arg0, @OriginalArg(1) Sprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) { diff --git a/client/src/main/java/Static61.java b/client/src/main/java/Static61.java index 32763ef..01e178d 100644 --- a/client/src/main/java/Static61.java +++ b/client/src/main/java/Static61.java @@ -23,7 +23,7 @@ public final class Static61 { public static boolean aBoolean109 = false; @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V") - public static void method1454(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(66) JagString local66 = Static34.method882(new JagString[] { Static96.aClass100_521, Static123.method2423(arg2), Static159.aClass100_760, Static123.method2423(arg0 >> 6), Static159.aClass100_760, Static123.method2423(arg1 >> 6), Static159.aClass100_760, Static123.method2423(arg0 & 0x3F), Static159.aClass100_760, Static123.method2423(arg1 & 0x3F) }); local66.method3129(); Static127.method2470(local66); diff --git a/client/src/main/java/Static64.java b/client/src/main/java/Static64.java index 0734edf..bd6d1d6 100644 --- a/client/src/main/java/Static64.java +++ b/client/src/main/java/Static64.java @@ -76,7 +76,7 @@ public final class Static64 { return; } } - if (local35.method3108(Static173.aClass8_Sub4_Sub1_2.aClass100_364)) { + if (local35.method3108(Static173.self.aClass100_364)) { Static103.method2231(Static186.aClass100_827, 0, LocalizedText.FRIENDCANTADDSELF); return; } @@ -87,8 +87,8 @@ public final class Static64 { Static106.anIntArray258[Static9.anInt178] = 0; Static3.aBooleanArray135[Static9.anInt178] = false; Static9.anInt178++; - Static185.anInt4369 = Static119.anInt3028; - Static6.aClass3_Sub15_Sub1_1.method2242(120); - Static6.aClass3_Sub15_Sub1_1.p8(arg0); + Static185.anInt4369 = Static119.transmitTimer; + Static6.outboundBuffer.p1isaac(120); + Static6.outboundBuffer.p8(arg0); } } diff --git a/client/src/main/java/Static65.java b/client/src/main/java/Static65.java index 09f95df..daaa70a 100644 --- a/client/src/main/java/Static65.java +++ b/client/src/main/java/Static65.java @@ -80,7 +80,7 @@ public final class Static65 { @Pc(23) int local23; if (Static114.anInt5844 < 0) { for (local23 = 0; local23 < 112; local23++) { - Static187.aBooleanArray101[local23] = false; + Static187.pressedKeys[local23] = false; } Static114.anInt5844 = Static227.anInt5087; } else { @@ -88,9 +88,9 @@ public final class Static65 { local23 = Static17.anIntArray53[Static227.anInt5087]; Static227.anInt5087 = Static227.anInt5087 + 1 & 0x7F; if (local23 >= 0) { - Static187.aBooleanArray101[local23] = true; + Static187.pressedKeys[local23] = true; } else { - Static187.aBooleanArray101[~local23] = false; + Static187.pressedKeys[~local23] = false; } } } diff --git a/client/src/main/java/Static67.java b/client/src/main/java/Static67.java index a924702..b7583f7 100644 --- a/client/src/main/java/Static67.java +++ b/client/src/main/java/Static67.java @@ -12,7 +12,7 @@ public final class Static67 { public static final JagString aClass100_639 = Static28.parse(" "); @OriginalMember(owner = "client!fe", name = "R", descriptor = "Z") - public static boolean aBoolean168 = true; + public static boolean prevFocus = true; @OriginalMember(owner = "client!fe", name = "jb", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_20 = new SoftLruHashTable(64); diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java index 8940089..291a18a 100644 --- a/client/src/main/java/Static69.java +++ b/client/src/main/java/Static69.java @@ -44,9 +44,9 @@ public final class Static69 { Static190.aLongArray6[local36] = Static190.aLongArray6[local36 + 1]; Static193.aClass100Array134[local36] = Static193.aClass100Array134[local36 + 1]; } - Static185.anInt4369 = Static119.anInt3028; - Static6.aClass3_Sub15_Sub1_1.method2242(213); - Static6.aClass3_Sub15_Sub1_1.p8(arg0); + Static185.anInt4369 = Static119.transmitTimer; + Static6.outboundBuffer.p1isaac(213); + Static6.outboundBuffer.p8(arg0); break; } } diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java index 7ae0d05..a350ca7 100644 --- a/client/src/main/java/Static7.java +++ b/client/src/main/java/Static7.java @@ -27,7 +27,7 @@ public final class Static7 { public static final LinkedList aClass69_32 = new LinkedList(); @OriginalMember(owner = "client!ah", name = "s", descriptor = "I") - public static int anInt985 = 0; + public static int clickX = 0; @OriginalMember(owner = "client!ah", name = "a", descriptor = "(BZ)V") public static void method842(@OriginalArg(1) boolean arg0) { @@ -40,11 +40,11 @@ public final class Static7 { return; } Static131.anInt3251 = 0; - if (!Static224.aBoolean247 && Static124.aClass95_2 != null) { - Static6.aClass3_Sub15_Sub1_1.method2242(93); + if (!Static224.aBoolean247 && Static124.socket != null) { + Static6.outboundBuffer.p1isaac(93); try { - Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); - Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); + Static6.outboundBuffer.offset = 0; } catch (@Pc(53) IOException local53) { Static224.aBoolean247 = true; } @@ -57,7 +57,7 @@ public final class Static7 { if (Static118.aClass13_15 != null || Static105.aClass13_14 != null) { return; } - @Pc(20) int local20 = Static150.anInt3585; + @Pc(20) int local20 = Static150.clickButton; @Pc(93) int local93; @Pc(99) int local99; if (!Static60.aBoolean108) { @@ -66,7 +66,7 @@ public final class Static7 { if (local37 == 25 || local37 == 23 || local37 == 48 || local37 == 7 || local37 == 13 || local37 == 47 || local37 == 5 || local37 == 43 || local37 == 35 || local37 == 58 || local37 == 22 || local37 == 1006) { local93 = Static196.anIntArray408[Static231.anInt5204 - 1]; local99 = Static56.anIntArray142[Static231.anInt5204 - 1]; - @Pc(103) Component local103 = Static5.method32(local99); + @Pc(103) Component local103 = Static5.getComponent(local99); @Pc(106) ServerActiveProperties local106 = Static36.method940(local103); if (local106.method511() || local106.method504()) { Static78.anInt2145 = 0; @@ -74,9 +74,9 @@ public final class Static7 { if (Static118.aClass13_15 != null) { Static43.method1143(Static118.aClass13_15); } - Static118.aClass13_15 = Static5.method32(local99); - Static149.anInt3554 = anInt985; - Static206.anInt4773 = Static60.anInt1893; + Static118.aClass13_15 = Static5.getComponent(local99); + Static149.anInt3554 = clickX; + Static206.anInt4773 = Static60.clickY; Static4.anInt36 = local93; Static43.method1143(Static118.aClass13_15); return; @@ -109,8 +109,8 @@ public final class Static7 { local204 = Static183.anInt4271; local93 = Static229.anInt5138; local99 = Static24.anInt761; - @Pc(265) int local265 = anInt985; - @Pc(267) int local267 = Static60.anInt1893; + @Pc(265) int local265 = clickX; + @Pc(267) int local267 = Static60.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 f0ef51a..a3aef7f 100644 --- a/client/src/main/java/Static70.java +++ b/client/src/main/java/Static70.java @@ -11,13 +11,13 @@ public final class Static70 { public static byte[][][] aByteArrayArrayArray7; @OriginalMember(owner = "client!fi", name = "k", descriptor = "I") - public static int anInt2013 = 0; + public static int type = 0; @OriginalMember(owner = "client!fi", name = "l", descriptor = "I") public static int anInt2014 = 0; @OriginalMember(owner = "client!fi", name = "n", descriptor = "I") - public static int anInt2015 = 0; + public static int updatedVarpsWriterIndex = 0; @OriginalMember(owner = "client!fi", name = "a", descriptor = "(B)Lclient!s;") public static Timer method1547() { diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java index 4f728a1..99fe2f5 100644 --- a/client/src/main/java/Static71.java +++ b/client/src/main/java/Static71.java @@ -85,8 +85,8 @@ public final class Static71 { } @OriginalMember(owner = "client!fk", name = "c", descriptor = "(I)V") - public static void method1445() { - Static6.aClass3_Sub15_Sub1_1.method2242(177); - Static6.aClass3_Sub15_Sub1_1.p2(Static189.anInt4443); + public static void transmitVerifyId() { + Static6.outboundBuffer.p1isaac(177); + Static6.outboundBuffer.p2(Static189.anInt4443); } } diff --git a/client/src/main/java/Static72.java b/client/src/main/java/Static72.java index a21443a..69602dc 100644 --- a/client/src/main/java/Static72.java +++ b/client/src/main/java/Static72.java @@ -23,7 +23,7 @@ public final class Static72 { public static long aLong74 = 0L; @OriginalMember(owner = "client!fl", name = "B", descriptor = "I") - public static int anInt2036 = 0; + public static int updatedVarcstrsWriterIndex = 0; @OriginalMember(owner = "client!fl", name = "H", descriptor = "Lclient!na;") public static final JagString aClass100_446 = Static28.parse(""); diff --git a/client/src/main/java/Static73.java b/client/src/main/java/Static73.java index e8d525a..ff8d9c3 100644 --- a/client/src/main/java/Static73.java +++ b/client/src/main/java/Static73.java @@ -28,25 +28,25 @@ public final class Static73 { @OriginalMember(owner = "client!fm", name = "a", descriptor = "(ZI)V") public static void method1596(@OriginalArg(0) boolean arg0) { if (arg0) { - if (Static154.anInt3711 != -1) { - Static109.method2275(Static154.anInt3711); + if (Static154.topLevelInterace != -1) { + Static109.method2275(Static154.topLevelInterace); } for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.method3859(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.method3861()) { Static132.method2605(true, local18); } - Static154.anInt3711 = -1; + Static154.topLevelInterace = -1; Static119.aClass133_9 = new HashTable(8); Static52.method1287(); - Static154.anInt3711 = Static156.anInt3783; + Static154.topLevelInterace = Static156.anInt3783; Static210.method3712(false); Static87.method1807(); - Static74.method1626(Static154.anInt3711); + Static74.method1626(Static154.topLevelInterace); } Static35.anInt1092 = -1; Static81.method1750(Static270.anInt5794); - Static173.aClass8_Sub4_Sub1_2 = new Player(); - Static173.aClass8_Sub4_Sub1_2.anInt3421 = 3000; - Static173.aClass8_Sub4_Sub1_2.anInt3412 = 3000; + Static173.self = new Player(); + Static173.self.anInt3421 = 3000; + Static173.self.anInt3412 = 3000; if (!Static239.aBoolean269) { Static145.method2743(Static209.aClass153_86); Static196.method3534(10); diff --git a/client/src/main/java/Static74.java b/client/src/main/java/Static74.java index 1f4054a..95fa41d 100644 --- a/client/src/main/java/Static74.java +++ b/client/src/main/java/Static74.java @@ -74,16 +74,16 @@ public final class Static74 { @OriginalMember(owner = "client!fn", name = "c", descriptor = "(II)V") public static void method1626(@OriginalArg(0) int arg0) { - if (arg0 == -1 || !Static245.method4225(arg0)) { + if (arg0 == -1 || !Static245.load(arg0)) { return; } - @Pc(31) Component[] local31 = Static241.aClass13ArrayArray12[arg0]; + @Pc(31) Component[] local31 = Static241.components[arg0]; for (@Pc(33) int local33 = 0; local33 < local31.length; local33++) { @Pc(41) Component local41 = local31[local33]; if (local41.anObjectArray3 != null) { @Pc(50) HookRequest local50 = new HookRequest(); local50.anObjectArray31 = local41.anObjectArray3; - local50.aClass13_17 = local41; + local50.source = local41; Static88.method1818(2000000, local50); } } diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java index a607812..c6910fd 100644 --- a/client/src/main/java/Static75.java +++ b/client/src/main/java/Static75.java @@ -194,7 +194,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.anInt1735, local45, local19, local39, -1, -1, local27, local23, 0); + Static29.method800(Static55.level, local45, local19, local39, -1, -1, local27, local23, 0); } } else if (Static164.anInt3985 == 33) { local15 = Static57.aClass3_Sub15_Sub1_3.g2le(); @@ -206,10 +206,10 @@ public final class Static75 { @Pc(122) ObjStack local122 = new ObjStack(); local122.anInt5550 = local31; local122.anInt5555 = local15; - if (Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local19][local27] == null) { - Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local19][local27] = new LinkedList(); + if (Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] == null) { + Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] = new LinkedList(); } - Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local19][local27].method2282(new ObjStackNode(local122)); + Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].method2282(new ObjStackNode(local122)); Static220.method3797(local27, local19); } } else { @@ -242,8 +242,8 @@ public final class Static75 { local27 = local27 * 64; local19 = local19 * 64; local23 = local23 * 64; - local317 = new ProjAnim(local45, Static55.anInt1735, local23, local19, Static207.method3685(Static55.anInt1735, local23, local19) - local218, Static83.anInt372 + local228, local232 + Static83.anInt372, local236, local247, local39, local224); - local317.method3705(local31, Static83.anInt372 + local228, -local224 + Static207.method3685(Static55.anInt1735, local27, local31), local27); + local317 = new ProjAnim(local45, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local218, Static83.anInt372 + local228, local232 + Static83.anInt372, local236, local247, local39, local224); + local317.method3705(local31, Static83.anInt372 + local228, -local224 + Static207.method3685(Static55.level, local27, local31), local27); Static217.aClass69_116.method2282(new ProjAnimNode(local317)); } } else if (Static164.anInt3985 == 17) { @@ -256,7 +256,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.anInt1735, local23, local19, Static207.method3685(Static55.anInt1735, local23, local19) - local31, local39, Static83.anInt372); + @Pc(427) SpotAnim local427 = new SpotAnim(local27, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local31, local39, Static83.anInt372); Static99.aClass69_64.method2282(new SpotAnimNode(local427)); } } else if (Static164.anInt3985 == 179) { @@ -269,7 +269,7 @@ public final class Static75 { local45 = (local31 & 0x7) + Static180.anInt4264; local218 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) { - Static29.method800(Static55.anInt1735, local45, local19, local39, -1, local218, local27, local23, 0); + Static29.method800(Static55.level, local45, local19, local39, -1, local218, local27, local23, 0); } } else if (Static164.anInt3985 == 20) { local15 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); @@ -283,7 +283,7 @@ public final class Static75 { if (local218 == 65535) { local218 = -1; } - Static92.method1881(Static55.anInt1735, local39, local31, local19, local45, local23, local218); + Static92.method1881(Static55.level, local39, local31, local19, local45, local23, local218); } else { @Pc(633) int local633; if (Static164.anInt3985 == 202) { @@ -313,7 +313,7 @@ public final class Static75 { local31 = Static57.aClass3_Sub15_Sub1_3.g2(); local39 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { - @Pc(710) LinkedList local710 = Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local23][local19]; + @Pc(710) LinkedList local710 = Static159.aClass69ArrayArrayArray1[Static55.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; @@ -336,10 +336,10 @@ public final class Static75 { @Pc(812) ObjStack local812 = new ObjStack(); local812.anInt5550 = local31; local812.anInt5555 = local39; - if (Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local19][local27] == null) { - Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local19][local27] = new LinkedList(); + if (Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] == null) { + Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] = new LinkedList(); } - Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local19][local27].method2282(new ObjStackNode(local812)); + Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].method2282(new ObjStackNode(local812)); Static220.method3797(local27, local19); } } else if (Static164.anInt3985 == 16) { @@ -364,8 +364,8 @@ public final class Static75 { local19 = local19 * 128 + 64; local23 = local23 * 128 + 64; local27 = local27 * 128 + 64; - local317 = new ProjAnim(local45, Static55.anInt1735, local23, local19, Static207.method3685(Static55.anInt1735, local23, local19) - local218, local228 + Static83.anInt372, local232 + Static83.anInt372, local236, local247, local39, local224); - local317.method3705(local31, Static83.anInt372 + local228, Static207.method3685(Static55.anInt1735, local27, local31) - local224, local27); + local317 = new ProjAnim(local45, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local218, local228 + Static83.anInt372, local232 + Static83.anInt372, local236, local247, local39, local224); + local317.method3705(local31, Static83.anInt372 + local228, Static207.method3685(Static55.level, local27, local31) - local224, local27); Static217.aClass69_116.method2282(new ProjAnimNode(local317)); } } else if (Static164.anInt3985 == 104) { @@ -406,7 +406,7 @@ public final class Static75 { local1194 = local1184 >> 11 & 0xF; local1188 = local1184 & 0x7FF; if (Static16.anInt549 == local1188) { - local1198 = Static173.aClass8_Sub4_Sub1_2; + local1198 = Static173.self; } else { local1198 = Static159.aClass8_Sub4_Sub1Array1[local1188]; } @@ -426,8 +426,8 @@ public final class Static75 { } } } - @Pc(1331) ProjAnim local1331 = new ProjAnim(local218, Static55.anInt1735, local23, local19, Static207.method3685(Static55.anInt1735, local23, local19) - local224, local232 + Static83.anInt372, local236 + Static83.anInt372, local247, local633, local45, local228); - local1331.method3705(local31, local232 + Static83.anInt372, -local228 + Static207.method3685(Static55.anInt1735, local27, local31), local27); + @Pc(1331) ProjAnim local1331 = new ProjAnim(local218, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local224, local232 + Static83.anInt372, local236 + Static83.anInt372, local247, local633, local45, local228); + local1331.method3705(local31, local232 + Static83.anInt372, -local228 + Static207.method3685(Static55.level, local27, local31), local27); Static217.aClass69_116.method2282(new ProjAnimNode(local1331)); } } else if (Static164.anInt3985 == 97) { @@ -444,7 +444,7 @@ public final class Static75 { local45 = local31 & 0x7; if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { local224 = local39 + 1; - if (Static173.aClass8_Sub4_Sub1_2.anIntArray318[0] >= local23 - local224 && local224 + local23 >= Static173.aClass8_Sub4_Sub1_2.anIntArray318[0] && Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] >= local19 - local224 && Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] <= local224 + local19 && Static30.anInt978 != 0 && local45 > 0 && Static189.anInt4451 < 50 && local27 != -1) { + if (Static173.self.movementQueueX[0] >= local23 - local224 && local224 + local23 >= Static173.self.movementQueueX[0] && Static173.self.movementQueueZ[0] >= local19 - local224 && Static173.self.movementQueueZ[0] <= local224 + local19 && Static30.anInt978 != 0 && local45 > 0 && Static189.anInt4451 < 50 && local27 != -1) { Static200.anIntArray421[Static189.anInt4451] = local27; Static276.anIntArray563[Static189.anInt4451] = local45; Static164.anIntArray362[Static189.anInt4451] = local218; @@ -459,7 +459,7 @@ public final class Static75 { local23 = (local15 >> 4 & 0x7) + Static115.anInt2940; local27 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { - @Pc(1565) LinkedList local1565 = Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local23][local19]; + @Pc(1565) LinkedList local1565 = Static159.aClass69ArrayArrayArray1[Static55.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)) { @@ -468,7 +468,7 @@ public final class Static75 { } } if (local1565.method2289() == null) { - Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local23][local19] = null; + Static159.aClass69ArrayArrayArray1[Static55.level][local23][local19] = null; } Static220.method3797(local19, local23); } diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java index 70d7dfd..ff64273 100644 --- a/client/src/main/java/Static78.java +++ b/client/src/main/java/Static78.java @@ -35,9 +35,9 @@ public final class Static78 { @OriginalMember(owner = "client!gd", name = "a", descriptor = "(JI)V") public static void method1691(@OriginalArg(0) long arg0) { - Static6.aClass3_Sub15_Sub1_1.offset = 0; - Static6.aClass3_Sub15_Sub1_1.p1(186); - Static6.aClass3_Sub15_Sub1_1.p8(arg0); + Static6.outboundBuffer.offset = 0; + Static6.outboundBuffer.p1(186); + Static6.outboundBuffer.p8(arg0); Static179.anInt4261 = 1; Static226.anInt5079 = 0; Static57.anInt1758 = 0; @@ -125,8 +125,8 @@ public final class Static78 { for (local14 = 0; local14 < Static273.aByteArrayArray13.length; local14++) { @Pc(294) byte[] local294 = Static156.aByteArrayArray11[local14]; if (local294 != null) { - local309 = (Static238.anIntArray470[local14] & 0xFF) * 64 - Static142.anInt3483; - local320 = (Static238.anIntArray470[local14] >> 8) * 64 - Static225.anInt5068; + local309 = (Static238.anIntArray470[local14] & 0xFF) * 64 - Static142.originZ; + local320 = (Static238.anIntArray470[local14] >> 8) * 64 - Static225.originX; if (Static230.aBoolean250) { local309 = 10; local320 = 10; @@ -136,8 +136,8 @@ public final class Static78 { if (Static239.aBoolean269) { local294 = Static19.aByteArrayArray4[local14]; if (local294 != null) { - local320 = (Static238.anIntArray470[local14] >> 8) * 64 - Static225.anInt5068; - local309 = (Static238.anIntArray470[local14] & 0xFF) * 64 - Static142.anInt3483; + local320 = (Static238.anIntArray470[local14] >> 8) * 64 - Static225.originX; + local309 = (Static238.anIntArray470[local14] & 0xFF) * 64 - Static142.originZ; if (Static230.aBoolean250) { local309 = 10; local320 = 10; @@ -199,8 +199,8 @@ public final class Static78 { Static87.method1805(false); Static7.method842(true); if (Static239.aBoolean269) { - local427 = Static173.aClass8_Sub4_Sub1_2.anIntArray318[0] >> 3; - local320 = Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] >> 3; + local427 = Static173.self.movementQueueX[0] >> 3; + local320 = Static173.self.movementQueueZ[0] >> 3; Static73.method1597(local320, local427); } Static26.method743(false); @@ -212,8 +212,8 @@ public final class Static78 { Static89.method1835(false); Static7.method842(true); if (Static239.aBoolean269) { - local427 = Static173.aClass8_Sub4_Sub1_2.anIntArray318[0] >> 3; - local320 = Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] >> 3; + local427 = Static173.self.movementQueueX[0] >> 3; + local320 = Static173.self.movementQueueZ[0] >> 3; Static73.method1597(local320, local427); } Static233.method4002(false); @@ -226,10 +226,10 @@ public final class Static78 { } Static7.method842(true); local427 = Static146.anInt3508; - if (local427 > Static55.anInt1735) { - local427 = Static55.anInt1735; + if (local427 > Static55.level) { + local427 = Static55.level; } - if (local427 < Static55.anInt1735 - 1) { + if (local427 < Static55.level - 1) { } if (Static138.method2697()) { Static146.method2750(0); @@ -274,9 +274,9 @@ public final class Static78 { Static219.method3796(); Static217.method3768(); Static231.aBoolean252 = false; - if (Static39.aFrame1 != null && Static124.aClass95_2 != null && Static244.anInt5370 == 25) { - Static6.aClass3_Sub15_Sub1_1.method2242(20); - Static6.aClass3_Sub15_Sub1_1.p4(1057001181); + if (Static39.aFrame1 != null && Static124.socket != null && Static244.anInt5370 == 25) { + Static6.outboundBuffer.p1isaac(20); + Static6.outboundBuffer.p4(1057001181); } if (!Static230.aBoolean250) { @Pc(815) int local815 = (Static52.anInt1695 + 6) / 8; @@ -296,8 +296,8 @@ public final class Static78 { Static196.method3534(10); } else { Static196.method3534(30); - if (Static124.aClass95_2 != null) { - Static6.aClass3_Sub15_Sub1_1.method2242(110); + if (Static124.socket != null) { + Static6.outboundBuffer.p1isaac(110); } } Static141.method2720(); diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java index d8f9a08..49a8ae7 100644 --- a/client/src/main/java/Static80.java +++ b/client/src/main/java/Static80.java @@ -76,7 +76,7 @@ public final class Static80 { Static231.method3983(1L); } if (local78.status == 1) { - local48 = (FileOnDisk) local78.anObject6; + local48 = (FileOnDisk) local78.result; @Pc(106) byte[] local106 = new byte[(int) local48.method5137()]; @Pc(128) int local128; for (@Pc(108) int local108 = 0; local108 < local106.length; local108 += local128) { @@ -100,22 +100,22 @@ public final class Static80 { @OriginalMember(owner = "client!gf", name = "a", descriptor = "(BII)V") public static void method3616(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { Static142.anInt3482 = arg0 - Static158.anInt3846; - @Pc(24) int local24 = Static142.anInt3482 - (int) ((float) Static24.aClass13_8.anInt445 / Static83.aFloat3); - @Pc(33) int local33 = Static142.anInt3482 + (int) ((float) Static24.aClass13_8.anInt445 / Static83.aFloat3); + @Pc(24) int local24 = Static142.anInt3482 - (int) ((float) Static24.component.anInt445 / Static83.aFloat3); + @Pc(33) int local33 = Static142.anInt3482 + (int) ((float) Static24.component.anInt445 / Static83.aFloat3); if (local24 < 0) { - Static142.anInt3482 = (int) ((float) Static24.aClass13_8.anInt445 / Static83.aFloat3); + Static142.anInt3482 = (int) ((float) Static24.component.anInt445 / Static83.aFloat3); } Static217.anInt4901 = Static181.anInt4296 + Static2.anInt13 - arg1 - 1; - @Pc(61) int local61 = (int) ((float) Static24.aClass13_8.anInt459 / Static83.aFloat3) + Static217.anInt4901; - @Pc(70) int local70 = Static217.anInt4901 - (int) ((float) Static24.aClass13_8.anInt459 / Static83.aFloat3); + @Pc(61) int local61 = (int) ((float) Static24.component.anInt459 / Static83.aFloat3) + Static217.anInt4901; + @Pc(70) int local70 = Static217.anInt4901 - (int) ((float) Static24.component.anInt459 / Static83.aFloat3); if (local33 > Static48.anInt1449) { - Static142.anInt3482 = Static48.anInt1449 - (int) ((float) Static24.aClass13_8.anInt445 / Static83.aFloat3); + Static142.anInt3482 = Static48.anInt1449 - (int) ((float) Static24.component.anInt445 / Static83.aFloat3); } if (local70 < 0) { - Static217.anInt4901 = (int) ((float) Static24.aClass13_8.anInt459 / Static83.aFloat3); + Static217.anInt4901 = (int) ((float) Static24.component.anInt459 / Static83.aFloat3); } if (Static181.anInt4296 < local61) { - Static217.anInt4901 = Static181.anInt4296 - (int) ((float) Static24.aClass13_8.anInt459 / Static83.aFloat3); + Static217.anInt4901 = Static181.anInt4296 - (int) ((float) Static24.component.anInt459 / Static83.aFloat3); } } @@ -123,6 +123,6 @@ public final class Static80 { public static void method3617(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) { @Pc(6) DelayedStateChange local6 = Static238.method4143(3, arg1); local6.method1017(); - local6.aClass100_254 = arg0; + local6.stringArg = arg0; } } diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index e4661b5..1247a38 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -73,10 +73,10 @@ public final class Static81 { @OriginalMember(owner = "client!gg", name = "e", descriptor = "(II)V") public static void method1753(@OriginalArg(0) int arg0) { - if (!Static245.method4225(arg0)) { + if (!Static245.load(arg0)) { return; } - @Pc(15) Component[] local15 = Static241.aClass13ArrayArray12[arg0]; + @Pc(15) Component[] local15 = Static241.components[arg0]; for (@Pc(17) int local17 = 0; local17 < local15.length; local17++) { @Pc(29) Component local29 = local15[local17]; if (local29 != null) { @@ -94,91 +94,91 @@ public final class Static81 { @OriginalMember(owner = "client!gg", name = "a", descriptor = "(Z)V") public static void method1756() { + // todo: consolidate/rename static classes if (Static267.anInt5775 > 0) { Static267.anInt5775--; } - if (Static60.anInt1894 > 1) { - Static60.anInt1894--; - Static209.anInt4808 = Static119.anInt3028; + if (Static60.rebootTimer > 1) { + Static60.rebootTimer--; + Static209.miscTransmitAt = Static119.transmitTimer; } if (Static224.aBoolean247) { Static224.aBoolean247 = false; Static175.method3279(); return; } - @Pc(34) int local34; - for (local34 = 0; local34 < 100 && Static10.method349(); local34++) { + for (@Pc(34) int i = 0; i < 100 && Static10.readPacket(); i++) { } if (Static244.anInt5370 != 30) { return; } - Static233.method4005(Static6.aClass3_Sub15_Sub1_1); - @Pc(60) Object local60 = Static178.aClass74_1.anObject4; - @Pc(86) int local86; - @Pc(79) int local79; - @Pc(88) int local88; - @Pc(106) int local106; - @Pc(111) int local111; - @Pc(182) int local182; - @Pc(189) int local189; - synchronized (Static178.aClass74_1.anObject4) { - if (!Static245.aBoolean281) { - Static178.aClass74_1.anInt2990 = 0; - } else if (Static150.anInt3585 != 0 || Static178.aClass74_1.anInt2990 >= 40) { - Static6.aClass3_Sub15_Sub1_1.method2242(123); - local79 = 0; - Static6.aClass3_Sub15_Sub1_1.p1(0); - local86 = Static6.aClass3_Sub15_Sub1_1.offset; - for (local88 = 0; Static178.aClass74_1.anInt2990 > local88 && Static6.aClass3_Sub15_Sub1_1.offset - local86 < 240; local88++) { - local79++; - local106 = Static178.aClass74_1.anIntArray279[local88]; - local111 = Static178.aClass74_1.anIntArray280[local88]; - if (local106 < 0) { - local106 = 0; - } else if (local106 > 65534) { - local106 = 65534; + Static233.loop(Static6.outboundBuffer); // ReflectionCheck + @Pc(60) Object mouseRecorder = Static178.instance.lock; + @Pc(86) int offset; + @Pc(79) int samples; + @Pc(88) int i; + @Pc(106) int y; + @Pc(111) int x; + @Pc(182) int dx; + @Pc(189) int dy; + synchronized (mouseRecorder) { + if (!Static245.enabled) { + Static178.instance.samples = 0; + } else if (Static150.clickButton != 0 || Static178.instance.samples >= 40) { + Static6.outboundBuffer.p1isaac(123); + samples = 0; + Static6.outboundBuffer.p1(0); + offset = Static6.outboundBuffer.offset; + for (i = 0; Static178.instance.samples > i && Static6.outboundBuffer.offset - offset < 240; i++) { + samples++; + y = Static178.instance.y[i]; + x = Static178.instance.x[i]; + if (y < 0) { + y = 0; + } else if (y > 65534) { + y = 65534; } - if (local111 < 0) { - local111 = 0; - } else if (local111 > 65534) { - local111 = 65534; + if (x < 0) { + x = 0; + } else if (x > 65534) { + x = 65534; } - @Pc(142) boolean local142 = false; - if (Static178.aClass74_1.anIntArray279[local88] == -1 && Static178.aClass74_1.anIntArray280[local88] == -1) { - local142 = true; - local106 = -1; - local111 = -1; + @Pc(142) boolean outsideWindow = false; + if (Static178.instance.y[i] == -1 && Static178.instance.x[i] == -1) { + outsideWindow = true; + y = -1; + x = -1; } - if (Static264.anInt4632 != local111 || local106 != Static179.anInt4253) { - local182 = local111 - Static264.anInt4632; - Static264.anInt4632 = local111; - local189 = local106 - Static179.anInt4253; - Static179.anInt4253 = local106; - if (Static204.anInt4762 < 8 && local182 >= -32 && local182 <= 31 && local189 >= -32 && local189 <= 31) { - local189 += 32; - local182 += 32; - Static6.aClass3_Sub15_Sub1_1.p2(local189 + (Static204.anInt4762 << 12) + (local182 << 6)); + if (Static264.mouseRecorderPrevX != x || y != Static179.mouseRecorderPrevY) { + dx = x - Static264.mouseRecorderPrevX; + Static264.mouseRecorderPrevX = x; + dy = y - Static179.mouseRecorderPrevY; + Static179.mouseRecorderPrevY = y; + if (Static204.anInt4762 < 8 && dx >= -32 && dx <= 31 && dy >= -32 && dy <= 31) { + dy += 32; + dx += 32; + Static6.outboundBuffer.p2(dy + (Static204.anInt4762 << 12) + (dx << 6)); Static204.anInt4762 = 0; - } else if (Static204.anInt4762 < 32 && local182 >= -128 && local182 <= 127 && local189 >= -128 && local189 <= 127) { - Static6.aClass3_Sub15_Sub1_1.p1(Static204.anInt4762 + 128); - local189 += 128; - local182 += 128; - Static6.aClass3_Sub15_Sub1_1.p2((local182 << 8) + local189); + } else if (Static204.anInt4762 < 32 && dx >= -128 && dx <= 127 && dy >= -128 && dy <= 127) { + Static6.outboundBuffer.p1(Static204.anInt4762 + 128); + dy += 128; + dx += 128; + Static6.outboundBuffer.p2((dx << 8) + dy); Static204.anInt4762 = 0; } else if (Static204.anInt4762 < 32) { - Static6.aClass3_Sub15_Sub1_1.p1(Static204.anInt4762 + 192); - if (local142) { - Static6.aClass3_Sub15_Sub1_1.p4(Integer.MIN_VALUE); + Static6.outboundBuffer.p1(Static204.anInt4762 + 192); + if (outsideWindow) { + Static6.outboundBuffer.p4(Integer.MIN_VALUE); } else { - Static6.aClass3_Sub15_Sub1_1.p4(local111 | local106 << 16); + Static6.outboundBuffer.p4(x | y << 16); } Static204.anInt4762 = 0; } else { - Static6.aClass3_Sub15_Sub1_1.p2(Static204.anInt4762 + 57344); - if (local142) { - Static6.aClass3_Sub15_Sub1_1.p4(Integer.MIN_VALUE); + Static6.outboundBuffer.p2(Static204.anInt4762 + 57344); + if (outsideWindow) { + Static6.outboundBuffer.p4(Integer.MIN_VALUE); } else { - Static6.aClass3_Sub15_Sub1_1.p4(local111 | local106 << 16); + Static6.outboundBuffer.p4(x | y << 16); } Static204.anInt4762 = 0; } @@ -186,88 +186,88 @@ public final class Static81 { Static204.anInt4762++; } } - Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local86); - if (Static178.aClass74_1.anInt2990 > local79) { - Static178.aClass74_1.anInt2990 -= local79; - for (local88 = 0; local88 < Static178.aClass74_1.anInt2990; local88++) { - Static178.aClass74_1.anIntArray280[local88] = Static178.aClass74_1.anIntArray280[local79 + local88]; - Static178.aClass74_1.anIntArray279[local88] = Static178.aClass74_1.anIntArray279[local88 + local79]; + Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - offset); + if (Static178.instance.samples > samples) { + Static178.instance.samples -= samples; + for (i = 0; i < Static178.instance.samples; i++) { + Static178.instance.x[i] = Static178.instance.x[samples + i]; + Static178.instance.y[i] = Static178.instance.y[samples + i]; } } else { - Static178.aClass74_1.anInt2990 = 0; + Static178.instance.samples = 0; } } } - if (Static150.anInt3585 != 0) { - @Pc(411) long local411 = (Static133.aLong175 - Static183.aLong139) / 50L; - local79 = Static60.anInt1893; - if (local79 < 0) { - local79 = 0; - } else if (local79 > 65535) { - local79 = 65535; + if (Static150.clickButton != 0) { + @Pc(411) long loops = (Static133.clickTime - Static183.prevClickTime) / 50L; + samples = Static60.clickY; + if (samples < 0) { + samples = 0; + } else if (samples > 65535) { + samples = 65535; } - if (local411 > 32767L) { - local411 = 32767L; + if (loops > 32767L) { + loops = 32767L; } - local88 = Static7.anInt985; - Static183.aLong139 = Static133.aLong175; - @Pc(437) byte local437 = 0; - if (local88 < 0) { - local88 = 0; - } else if (local88 > 65535) { - local88 = 65535; + i = Static7.clickX; + Static183.prevClickTime = Static133.clickTime; + @Pc(437) byte button = 0; + if (i < 0) { + i = 0; + } else if (i > 65535) { + i = 65535; } - local111 = (int) local411; - if (Static150.anInt3585 == 2) { - local437 = 1; + x = (int) loops; + if (Static150.clickButton == 2) { + button = 1; } - Static6.aClass3_Sub15_Sub1_1.method2242(75); - Static6.aClass3_Sub15_Sub1_1.p2leadd(local437 << 15 | local111); - Static6.aClass3_Sub15_Sub1_1.p4me(local88 | local79 << 16); + Static6.outboundBuffer.p1isaac(75); + Static6.outboundBuffer.p2leadd(button << 15 | x); + Static6.outboundBuffer.p4me(i | samples << 16); } if (Static16.anInt551 > 0) { Static16.anInt551--; } if (Static33.aBoolean63) { - for (local34 = 0; local34 < Static182.anInt4313; local34++) { - local86 = Static227.anIntArray447[local34]; - if (local86 == 98 || local86 == 99 || local86 == 96 || local86 == 97) { + for (i = 0; i < Static182.keyQueueSize; i++) { + offset = Static227.keyCodes[i]; + if (offset == 98 || offset == 99 || offset == 96 || offset == 97) { Static197.aBoolean228 = true; break; } } - } else if (Static187.aBooleanArray101[96] || Static187.aBooleanArray101[97] || Static187.aBooleanArray101[98] || Static187.aBooleanArray101[99]) { + } else if (Static187.pressedKeys[96] || Static187.pressedKeys[97] || Static187.pressedKeys[98] || Static187.pressedKeys[99]) { Static197.aBoolean228 = true; } if (Static197.aBoolean228 && Static16.anInt551 <= 0) { Static16.anInt551 = 20; Static197.aBoolean228 = false; - Static6.aClass3_Sub15_Sub1_1.method2242(21); - Static6.aClass3_Sub15_Sub1_1.p2add(Static72.anInt2031); - Static6.aClass3_Sub15_Sub1_1.p2le(Static57.anInt1747); + Static6.outboundBuffer.p1isaac(21); + Static6.outboundBuffer.p2add(Static72.anInt2031); + Static6.outboundBuffer.p2le(Static57.anInt1747); } - if (Static26.aBoolean59 && !Static67.aBoolean168) { - Static67.aBoolean168 = true; - Static6.aClass3_Sub15_Sub1_1.method2242(22); - Static6.aClass3_Sub15_Sub1_1.p1(1); + if (Static26.focus && !Static67.prevFocus) { + Static67.prevFocus = true; + Static6.outboundBuffer.p1isaac(22); + Static6.outboundBuffer.p1(1); } - if (!Static26.aBoolean59 && Static67.aBoolean168) { - Static67.aBoolean168 = false; - Static6.aClass3_Sub15_Sub1_1.method2242(22); - Static6.aClass3_Sub15_Sub1_1.p1(0); + if (!Static26.focus && Static67.prevFocus) { + Static67.prevFocus = false; + Static6.outboundBuffer.p1isaac(22); + Static6.outboundBuffer.p1(0); } - if (!Static18.aBoolean39) { - Static6.aClass3_Sub15_Sub1_1.method2242(98); - Static6.aClass3_Sub15_Sub1_1.p4(Static145.method2746()); - Static18.aBoolean39 = true; + if (!Static18.sentToServer) { + Static6.outboundBuffer.p1isaac(98); + Static6.outboundBuffer.p4(Static145.method2746()); + Static18.sentToServer = true; } Static31.method846(); if (Static244.anInt5370 != 30) { return; } - Static251.method4274(); - Static192.method3473(); - Static54.method1312(); + Static251.loop(); // ChangeLocRequest + Static192.loop(); // AttachLocRequest + Static54.loop(); // SoundPlayer Static201.anInt1862++; if (Static201.anInt1862 > 750) { Static175.method3279(); @@ -275,132 +275,138 @@ public final class Static81 { } Static71.method1444(); Static109.method2274(); - Static19.method587(); - if (Static24.aClass13_8 != null) { + Static19.loop(); // OverheadChat + if (Static24.component != null) { Static12.method447(); } - for (local34 = Static38.method963(true); local34 != -1; local34 = Static38.method963(false)) { - Static85.method1775(local34); - Static83.anIntArray23[Static70.anInt2015++ & 0x1F] = local34; + // VarpDomain + for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) { + Static85.method1775(i); + Static83.updatedVarps[Static70.updatedVarpsWriterIndex++ & 0x1F] = i; } - @Pc(782) int local782; - for (@Pc(709) DelayedStateChange local709 = Static127.method2464(); local709 != null; local709 = Static127.method2464()) { - local79 = local709.method1011(); - local88 = local709.method1012(); - if (local79 == 1) { - Static155.anIntArray355[local88] = local709.anInt1271; - Static138.anIntArray323[Static4.anInt37++ & 0x1F] = local88; - } else if (local79 == 2) { - Static226.aClass100Array154[local88] = local709.aClass100_254; - Static233.anIntArray452[Static72.anInt2036++ & 0x1F] = local88; + @Pc(782) int modelId; + // DelayedStateChange + for (@Pc(709) DelayedStateChange change = Static127.poll(); change != null; change = Static127.poll()) { + samples = change.method1011(); + i = change.method1012(); + if (samples == 1) { + Static155.varcs[i] = change.intArg1; + Static138.updatedVarcs[Static4.updatedVarcsWriterIndex++ & 0x1F] = i; + } else if (samples == 2) { + Static226.varcstrs[i] = change.stringArg; + Static233.updatedVarcstrs[Static72.updatedVarcstrsWriterIndex++ & 0x1F] = i; } else { - @Pc(773) Component local773; - if (local79 == 3) { - local773 = Static5.method32(local88); - if (!local709.aClass100_254.method3108(local773.aClass100_84)) { - local773.aClass100_84 = local709.aClass100_254; - Static43.method1143(local773); + @Pc(773) Component component; + if (samples == 3) { + component = Static5.getComponent(i); + if (!change.stringArg.method3108(component.aClass100_84)) { + component.aClass100_84 = change.stringArg; + Static43.method1143(component); } - } else if (local79 == 4) { - local773 = Static5.method32(local88); - local111 = local709.anInt1271; - local182 = local709.anInt1269; - local782 = local709.anInt1270; - if (local773.anInt464 != local111 || local773.anInt463 != local782 || local182 != local773.anInt498) { - local773.anInt463 = local782; - local773.anInt498 = local182; - local773.anInt464 = local111; - Static43.method1143(local773); + } else if (samples == 4) { + component = Static5.getComponent(i); + x = change.intArg1; + dx = change.intArg2; + modelId = change.intArg3; + if (component.modelType != x || component.modelId != modelId || dx != component.anInt498) { + component.modelId = modelId; + component.anInt498 = dx; + component.modelType = x; + Static43.method1143(component); } - } else if (local79 == 5) { - local773 = Static5.method32(local88); - if (local773.anInt522 != local709.anInt1271 || local709.anInt1271 == -1) { - local773.anInt496 = 1; - local773.anInt500 = 0; - local773.anInt522 = local709.anInt1271; - local773.anInt510 = 0; - Static43.method1143(local773); + } else if (samples == 5) { + component = Static5.getComponent(i); + if (component.anInt522 != change.intArg1 || change.intArg1 == -1) { + component.anInt496 = 1; + component.anInt500 = 0; + component.anInt522 = change.intArg1; + component.anInt510 = 0; + Static43.method1143(component); } - } else if (local79 == 6) { - local106 = local709.anInt1271; - local111 = local106 >> 10 & 0x1F; - local182 = local106 & 0x1F; - local782 = local106 >> 5 & 0x1F; - @Pc(1189) Component local1189 = Static5.method32(local88); - local189 = (local182 << 3) + (local782 << 11) + (local111 << 19); - if (local189 != local1189.anInt474) { - local1189.anInt474 = local189; + } else if (samples == 6) { + y = change.intArg1; + x = y >> 10 & 0x1F; + dx = y & 0x1F; + modelId = y >> 5 & 0x1F; + @Pc(1189) Component local1189 = Static5.getComponent(i); + dy = (dx << 3) + (modelId << 11) + (x << 19); + if (dy != local1189.anInt474) { + local1189.anInt474 = dy; Static43.method1143(local1189); } - } else if (local79 == 7) { - local773 = Static5.method32(local88); - @Pc(1145) boolean local1145 = local709.anInt1271 == 1; - if (local1145 != local773.aBoolean17) { - local773.aBoolean17 = local1145; - Static43.method1143(local773); + } else if (samples == 7) { + component = Static5.getComponent(i); + // todo: this should not be necessary, data/server-related? + if (component != null) { + @Pc(1145) boolean hidden = change.intArg1 == 1; + if (hidden != component.hidden) { + component.hidden = hidden; + Static43.method1143(component); + } } - } else if (local79 == 8) { - local773 = Static5.method32(local88); - if (local709.anInt1271 != local773.anInt450 || local773.anInt524 != local709.anInt1270 || local709.anInt1269 != local773.anInt443) { - local773.anInt450 = local709.anInt1271; - local773.anInt443 = local709.anInt1269; - local773.anInt524 = local709.anInt1270; - if (local773.anInt458 != -1) { - if (local773.anInt451 > 0) { - local773.anInt443 = local773.anInt443 * 32 / local773.anInt451; - } else if (local773.anInt446 > 0) { - local773.anInt443 = local773.anInt443 * 32 / local773.anInt446; + } else if (samples == 8) { + component = Static5.getComponent(i); + if (change.intArg1 != component.modelXAngle || component.modelYAngle != change.intArg3 || change.intArg2 != component.modelZoom) { + component.modelXAngle = change.intArg1; + component.modelZoom = change.intArg2; + component.modelYAngle = change.intArg3; + if (component.objId != -1) { + if (component.anInt451 > 0) { + component.modelZoom = component.modelZoom * 32 / component.anInt451; + } else if (component.baseWidth > 0) { + component.modelZoom = component.modelZoom * 32 / component.baseWidth; } } - Static43.method1143(local773); + Static43.method1143(component); } - } else if (local79 == 9) { - local773 = Static5.method32(local88); - if (local709.anInt1271 != local773.anInt458 || local773.anInt503 != local709.anInt1270) { - local773.anInt458 = local709.anInt1271; - local773.anInt503 = local709.anInt1270; - Static43.method1143(local773); + } else if (samples == 9) { + component = Static5.getComponent(i); + if (change.intArg1 != component.objId || component.objCount != change.intArg3) { + component.objId = change.intArg1; + component.objCount = change.intArg3; + Static43.method1143(component); } - } else if (local79 == 10) { - local773 = Static5.method32(local88); - if (local773.anInt494 != local709.anInt1271 || local709.anInt1270 != local773.anInt497 || local773.anInt508 != local709.anInt1269) { - local773.anInt497 = local709.anInt1270; - local773.anInt508 = local709.anInt1269; - local773.anInt494 = local709.anInt1271; - Static43.method1143(local773); + } else if (samples == 10) { + component = Static5.getComponent(i); + if (component.modelXOffset != change.intArg1 || change.intArg3 != component.modelZOffset || component.modelYOffset != change.intArg2) { + component.modelZOffset = change.intArg3; + component.modelYOffset = change.intArg2; + component.modelXOffset = change.intArg1; + Static43.method1143(component); } - } else if (local79 == 11) { - local773 = Static5.method32(local88); - local773.anInt523 = local773.anInt529 = local709.anInt1271; - local773.aByte4 = 0; - local773.aByte2 = 0; - local773.anInt469 = local773.anInt444 = local709.anInt1270; - Static43.method1143(local773); - } else if (local79 == 12) { - local773 = Static5.method32(local88); - local111 = local709.anInt1271; - if (local773 != null && local773.anInt452 == 0) { - if (local111 > local773.anInt491 - local773.anInt459) { - local111 = local773.anInt491 - local773.anInt459; + } else if (samples == 11) { + component = Static5.getComponent(i); + component.x = component.baseX = change.intArg1; + component.yMode = 0; + component.xMode = 0; + component.y = component.baseY = change.intArg3; + Static43.method1143(component); + } else if (samples == 12) { + component = Static5.getComponent(i); + x = change.intArg1; + if (component != null && component.anInt452 == 0) { + if (x > component.anInt491 - component.anInt459) { + x = component.anInt491 - component.anInt459; } - if (local111 < 0) { - local111 = 0; + if (x < 0) { + x = 0; } - if (local111 != local773.anInt468) { - local773.anInt468 = local111; - Static43.method1143(local773); + if (x != component.scrollY) { + component.scrollY = x; + Static43.method1143(component); } } - } else if (local79 == 13) { - local773 = Static5.method32(local88); - local773.anInt483 = local709.anInt1271; + } else if (samples == 13) { + component = Static5.getComponent(i); + component.modelRotationSpeed = change.intArg1; } } } - if (Static70.anInt2013 != 0) { - Static17.anInt577 += 20; - if (Static17.anInt577 >= 400) { - Static70.anInt2013 = 0; + // Cross + if (Static70.type != 0) { + Static17.milliseconds += 20; + if (Static17.milliseconds >= 400) { + Static70.type = 0; } } Static178.anInt4247++; @@ -426,43 +432,43 @@ public final class Static81 { if (Static179.anInt4254 == 1 && local1361.anInt453 == 206) { local1363 = 1; } - if (local1361.anIntArray40[Static18.anInt588] <= 0) { + if (local1361.objTypes[Static18.anInt588] <= 0) { local1363 = 0; } if (Static36.method940(local1361).method504()) { - local106 = Static4.anInt36; - local111 = Static18.anInt588; - local1361.anIntArray40[local111] = local1361.anIntArray40[local106]; - local1361.anIntArray50[local111] = local1361.anIntArray50[local106]; - local1361.anIntArray40[local106] = -1; - local1361.anIntArray50[local106] = 0; + y = Static4.anInt36; + x = Static18.anInt588; + local1361.objTypes[x] = local1361.objTypes[y]; + local1361.objCounts[x] = local1361.objCounts[y]; + local1361.objTypes[y] = -1; + local1361.objCounts[y] = 0; } else if (local1363 == 1) { - local111 = Static18.anInt588; - local106 = Static4.anInt36; - while (local111 != local106) { - if (local106 > local111) { - local1361.method487(local106 - 1, local106); - local106--; - } else if (local111 > local106) { - local1361.method487(local106 + 1, local106); - local106++; + x = Static18.anInt588; + y = Static4.anInt36; + while (x != y) { + if (y > x) { + local1361.swapObjs(y - 1, y); + y--; + } else if (x > y) { + local1361.swapObjs(y + 1, y); + y++; } } } else { - local1361.method487(Static18.anInt588, Static4.anInt36); + local1361.swapObjs(Static18.anInt588, Static4.anInt36); } - Static6.aClass3_Sub15_Sub1_1.method2242(231); - Static6.aClass3_Sub15_Sub1_1.p2(Static4.anInt36); - Static6.aClass3_Sub15_Sub1_1.p4le2(Static118.aClass13_15.anInt507); - Static6.aClass3_Sub15_Sub1_1.p2add(Static18.anInt588); - Static6.aClass3_Sub15_Sub1_1.p1sub(local1363); + Static6.outboundBuffer.p1isaac(231); + Static6.outboundBuffer.p2(Static4.anInt36); + Static6.outboundBuffer.p4le2(Static118.aClass13_15.anInt507); + Static6.outboundBuffer.p2add(Static18.anInt588); + Static6.outboundBuffer.p1sub(local1363); } } else if ((Static116.anInt2952 == 1 || Static277.method4640(Static231.anInt5204 - 1)) && Static231.anInt5204 > 2) { Static226.method3901(); } else if (Static231.anInt5204 > 0) { Static59.method1372(); } - Static150.anInt3585 = 0; + Static150.clickButton = 0; Static72.anInt2043 = 10; Static118.aClass13_15 = null; } @@ -470,88 +476,91 @@ public final class Static81 { Static146.aBoolean174 = false; Static56.aClass13_12 = null; Static44.aBoolean83 = false; - Static182.anInt4313 = 0; + Static182.keyQueueSize = 0; local1361 = Static180.aClass13_22; Static180.aClass13_22 = null; @Pc(1508) Component local1508 = Static43.aClass13_11; Static43.aClass13_11 = null; - while (Static25.method712() && Static182.anInt4313 < 128) { - Static227.anIntArray447[Static182.anInt4313] = Static102.anInt2681; - Static205.anIntArray426[Static182.anInt4313] = Static193.anInt4542; - Static182.anInt4313++; + while (Static25.nextKey() && Static182.keyQueueSize < 128) { + Static227.keyCodes[Static182.keyQueueSize] = Static102.keyCode; + Static205.keyChars[Static182.keyQueueSize] = Static193.keyChar; + Static182.keyQueueSize++; } - Static24.aClass13_8 = null; - if (Static154.anInt3711 != -1) { - Static57.method1320(0, 0, 0, Static48.anInt1448, Static154.anInt3711, 0, Static254.anInt5554); + // WorldMap.component + Static24.component = null; + if (Static154.topLevelInterace != -1) { + Static57.method1320(0, 0, 0, Static48.anInt1448, Static154.topLevelInterace, 0, Static254.anInt5554); } - Static119.anInt3028++; + Static119.transmitTimer++; while (true) { - @Pc(1569) Component local1569; - @Pc(1560) Component local1560; - @Pc(1555) HookRequest local1555; + // todo: this is actually split up into low/medium/high + @Pc(1569) Component highPriorityComponent; + @Pc(1560) Component highPrioritySource; + @Pc(1555) HookRequest highPriorityRequest; do { - local1555 = (HookRequest) Static4.aClass69_2.method2287(); - if (local1555 == null) { + highPriorityRequest = (HookRequest) Static4.aClass69_2.method2287(); + if (highPriorityRequest == null) { while (true) { do { - local1555 = (HookRequest) Static115.aClass69_70.method2287(); - if (local1555 == null) { + highPriorityRequest = (HookRequest) Static115.aClass69_70.method2287(); + if (highPriorityRequest == null) { while (true) { do { - local1555 = (HookRequest) Static185.aClass69_101.method2287(); - if (local1555 == null) { - if (Static24.aClass13_8 == null) { + highPriorityRequest = (HookRequest) Static185.aClass69_101.method2287(); + if (highPriorityRequest == null) { + if (Static24.component == null) { Static137.anInt3337 = 0; } if (Static105.aClass13_14 != null) { Static4.method28(); } - if (Static191.anInt4502 > 0 && Static187.aBooleanArray101[82] && Static187.aBooleanArray101[81] && Static58.anInt1766 != 0) { - local106 = Static55.anInt1735 - Static58.anInt1766; - if (local106 < 0) { - local106 = 0; - } else if (local106 > 3) { - local106 = 3; + if (Static191.staffModLevel > 0 && Static187.pressedKeys[82] && Static187.pressedKeys[81] && Static58.wheelRotation != 0) { + y = Static55.level - Static58.wheelRotation; + if (y < 0) { + y = 0; + } else if (y > 3) { + y = 3; } - Static61.method1454(Static173.aClass8_Sub4_Sub1_2.anIntArray318[0] + Static225.anInt5068, Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] + Static142.anInt3483, local106); + // Cheat + Static61.teleport(Static173.self.movementQueueX[0] + Static225.originX, Static173.self.movementQueueZ[0] + Static142.originZ, y); } - if (Static191.anInt4502 > 0 && Static187.aBooleanArray101[82] && Static187.aBooleanArray101[81]) { + if (Static191.staffModLevel > 0 && Static187.pressedKeys[82] && Static187.pressedKeys[81]) { if (Static56.anInt1742 != -1) { - Static61.method1454(Static225.anInt5068 + Static56.anInt1742, Static142.anInt3483 - -Static116.anInt2954, Static55.anInt1735); + Static61.teleport(Static225.originX + Static56.anInt1742, Static142.originZ - -Static116.anInt2954, Static55.level); } Static187.anInt4422 = 0; Static125.anInt3096 = 0; } else if (Static125.anInt3096 == 2) { if (Static56.anInt1742 != -1) { - Static6.aClass3_Sub15_Sub1_1.method2242(131); - Static6.aClass3_Sub15_Sub1_1.p4me(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.p2add(Static225.anInt5068 + Static56.anInt1742); - Static6.aClass3_Sub15_Sub1_1.p2leadd(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.p2add(Static116.anInt2954 + Static142.anInt3483); - Static70.anInt2013 = 1; - Static17.anInt577 = 0; - Static25.anInt826 = Static60.anInt1893; - Static122.anInt3047 = Static7.anInt985; + Static6.outboundBuffer.p1isaac(131); + Static6.outboundBuffer.p4me(Static98.anInt2512); + Static6.outboundBuffer.p2add(Static225.originX + Static56.anInt1742); + Static6.outboundBuffer.p2leadd(Static15.anInt506); + Static6.outboundBuffer.p2add(Static116.anInt2954 + Static142.originZ); + Static70.type = 1; + Static17.milliseconds = 0; + Static25.y = Static60.clickY; + Static122.x = Static7.clickX; } Static125.anInt3096 = 0; } else if (Static187.anInt4422 == 2) { if (Static56.anInt1742 != -1) { - Static6.aClass3_Sub15_Sub1_1.method2242(179); - Static6.aClass3_Sub15_Sub1_1.p2(Static142.anInt3483 + Static116.anInt2954); - Static6.aClass3_Sub15_Sub1_1.p2(Static56.anInt1742 + Static225.anInt5068); - Static17.anInt577 = 0; - Static70.anInt2013 = 1; - Static122.anInt3047 = Static7.anInt985; - Static25.anInt826 = Static60.anInt1893; + Static6.outboundBuffer.p1isaac(179); + Static6.outboundBuffer.p2(Static142.originZ + Static116.anInt2954); + Static6.outboundBuffer.p2(Static56.anInt1742 + Static225.originX); + Static17.milliseconds = 0; + Static70.type = 1; + Static122.x = Static7.clickX; + Static25.y = Static60.clickY; } Static187.anInt4422 = 0; } else if (Static56.anInt1742 != -1 && Static125.anInt3096 == 0 && Static187.anInt4422 == 0) { - @Pc(1871) boolean local1871 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, true, 0, Static56.anInt1742, 0, 0, 0, Static116.anInt2954, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); + @Pc(1871) boolean local1871 = Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, true, 0, Static56.anInt1742, 0, 0, 0, Static116.anInt2954, Static173.self.movementQueueX[0]); if (local1871) { - Static25.anInt826 = Static60.anInt1893; - Static17.anInt577 = 0; - Static122.anInt3047 = Static7.anInt985; - Static70.anInt2013 = 1; + Static25.y = Static60.clickY; + Static17.milliseconds = 0; + Static122.x = Static7.clickX; + Static70.type = 1; } } Static56.anInt1742 = -1; @@ -589,47 +598,47 @@ public final class Static81 { } else { Static40.method1008(); } - for (local106 = 0; local106 < 5; local106++) { - @Pc(2001) int local2001 = Static31.anIntArray76[local106]++; + for (y = 0; y < 5; y++) { + @Pc(2001) int local2001 = Static31.anIntArray76[y]++; } - local106 = Static142.method2727(); - local111 = Static195.method3531(); - if (local106 > 15000 && local111 > 15000) { + y = Static142.getIdleLoops(); // Mouse + x = Static195.getIdleLoops(); // Keyboard + if (y > 15000 && x > 15000) { Static267.anInt5775 = 250; - Static48.method1197(14500); - Static6.aClass3_Sub15_Sub1_1.method2242(245); + Static48.setIdleLoops(14500); + Static6.outboundBuffer.p1isaac(245); } - if (Static33.aClass212_1 != null && Static33.aClass212_1.status == 1) { - if (Static33.aClass212_1.anObject6 != null) { - Static169.method3175(Static175.aClass100_797, Static164.aBoolean194); + if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) { + if (Static33.openUrlRequest.result != null) { + Static169.openUrl(Static175.url, Static164.newTab); } - Static175.aClass100_797 = null; - Static33.aClass212_1 = null; - Static164.aBoolean194 = false; + Static175.url = null; + Static33.openUrlRequest = null; + Static164.newTab = false; } Static131.anInt3251++; Static82.anInt2252++; Static143.anInt3486++; if (Static143.anInt3486 > 500) { Static143.anInt3486 = 0; - local782 = (int) (Math.random() * 8.0D); - if ((local782 & 0x4) == 4) { + modelId = (int) (Math.random() * 8.0D); + if ((modelId & 0x4) == 4) { Static230.anInt5161 += Static220.anInt4941; } - if ((local782 & 0x2) == 2) { + if ((modelId & 0x2) == 2) { Static206.anInt4774 += Static20.anInt659; } - if ((local782 & 0x1) == 1) { + if ((modelId & 0x1) == 1) { Static132.anInt3291 += Static248.anInt4229; } } if (Static82.anInt2252 > 500) { Static82.anInt2252 = 0; - local782 = (int) (Math.random() * 8.0D); - if ((local782 & 0x1) == 1) { + modelId = (int) (Math.random() * 8.0D); + if ((modelId & 0x1) == 1) { Static59.anInt1814 += Static263.anInt5755; } - if ((local782 & 0x2) == 2) { + if ((modelId & 0x2) == 2) { Static273.anInt4130 += Static179.anInt4262; } } @@ -664,48 +673,49 @@ public final class Static81 { Static263.anInt5755 = -2; } if (Static131.anInt3251 > 50) { - Static6.aClass3_Sub15_Sub1_1.method2242(93); + Static6.outboundBuffer.p1isaac(93); } - if (Static34.aBoolean65) { - Static71.method1445(); - Static34.aBoolean65 = false; + if (Static34.verifyIdChanged) { + Static71.transmitVerifyId(); + Static34.verifyIdChanged = false; } try { - if (Static124.aClass95_2 != null && Static6.aClass3_Sub15_Sub1_1.offset > 0) { - Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); + if (Static124.socket != null && Static6.outboundBuffer.offset > 0) { + Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); Static131.anInt3251 = 0; - Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static6.outboundBuffer.offset = 0; } } catch (@Pc(2266) IOException local2266) { Static175.method3279(); } return; } - local1560 = local1555.aClass13_17; - if (local1560.anInt457 < 0) { + // low priority actually + highPrioritySource = highPriorityRequest.source; + if (highPrioritySource.componentId < 0) { break; } - local1569 = Static5.method32(local1560.anInt456); - } while (local1569 == null || local1569.aClass13Array3 == null || local1560.anInt457 >= local1569.aClass13Array3.length || local1560 != local1569.aClass13Array3[local1560.anInt457]); - Static82.method1767(local1555); + highPriorityComponent = Static5.getComponent(highPrioritySource.layer); + } while (highPriorityComponent == null || highPriorityComponent.createdComponents == null || highPrioritySource.componentId >= highPriorityComponent.createdComponents.length || highPrioritySource != highPriorityComponent.createdComponents[highPrioritySource.componentId]); + Static82.method1767(highPriorityRequest); } } - local1560 = local1555.aClass13_17; - if (local1560.anInt457 < 0) { + highPrioritySource = highPriorityRequest.source; + if (highPrioritySource.componentId < 0) { break; } - local1569 = Static5.method32(local1560.anInt456); - } while (local1569 == null || local1569.aClass13Array3 == null || local1569.aClass13Array3.length <= local1560.anInt457 || local1569.aClass13Array3[local1560.anInt457] != local1560); - Static82.method1767(local1555); + highPriorityComponent = Static5.getComponent(highPrioritySource.layer); + } while (highPriorityComponent == null || highPriorityComponent.createdComponents == null || highPriorityComponent.createdComponents.length <= highPrioritySource.componentId || highPriorityComponent.createdComponents[highPrioritySource.componentId] != highPrioritySource); + Static82.method1767(highPriorityRequest); } } - local1560 = local1555.aClass13_17; - if (local1560.anInt457 < 0) { + highPrioritySource = highPriorityRequest.source; + if (highPrioritySource.componentId < 0) { break; } - local1569 = Static5.method32(local1560.anInt456); - } while (local1569 == null || local1569.aClass13Array3 == null || local1560.anInt457 >= local1569.aClass13Array3.length || local1569.aClass13Array3[local1560.anInt457] != local1560); - Static82.method1767(local1555); + highPriorityComponent = Static5.getComponent(highPrioritySource.layer); + } while (highPriorityComponent == null || highPriorityComponent.createdComponents == null || highPrioritySource.componentId >= highPriorityComponent.createdComponents.length || highPriorityComponent.createdComponents[highPrioritySource.componentId] != highPrioritySource); + Static82.method1767(highPriorityRequest); } } } diff --git a/client/src/main/java/Static83.java b/client/src/main/java/Static83.java index 517909f..01c946e 100644 --- a/client/src/main/java/Static83.java +++ b/client/src/main/java/Static83.java @@ -23,7 +23,7 @@ public final class Static83 { public static final SoftLruHashTable aClass99_3 = new SoftLruHashTable(64); @OriginalMember(owner = "client!gj", name = "q", descriptor = "[I") - public static final int[] anIntArray23 = new int[32]; + 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) { diff --git a/client/src/main/java/Static84.java b/client/src/main/java/Static84.java index 021c67c..6e36fd8 100644 --- a/client/src/main/java/Static84.java +++ b/client/src/main/java/Static84.java @@ -128,7 +128,7 @@ public final class Static84 { if (arg2.aClass100_640.method3149(0) == 126) { arg2.aClass100_640 = arg2.aClass100_640.method3136(1); Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640); - } else if (arg2 == Static173.aClass8_Sub4_Sub1_2) { + } else if (arg2 == Static173.self) { Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640); } arg2.anInt3352 = 0; @@ -181,7 +181,7 @@ public final class Static84 { if (local24 != -1) { @Pc(663) SeqType local663 = Static36.method941(local24); if (local663 != null && local663.anIntArray473 != null) { - Static152.method2836(arg2.anInt3421, local663, arg2.anInt3412, arg2 == Static173.aClass8_Sub4_Sub1_2, 0); + Static152.method2836(arg2.anInt3421, local663, arg2.anInt3412, arg2 == Static173.self, 0); } } } diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index d2ec3cd..71485a6 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -79,8 +79,8 @@ public final class Static87 { @Pc(49) int local49; @Pc(53) byte[] local53; for (local20 = 0; local20 < local18; local20++) { - local38 = (Static238.anIntArray470[local20] >> 8) * 64 - Static225.anInt5068; - local49 = (Static238.anIntArray470[local20] & 0xFF) * 64 - Static142.anInt3483; + local38 = (Static238.anIntArray470[local20] >> 8) * 64 - Static225.originX; + local49 = (Static238.anIntArray470[local20] & 0xFF) * 64 - Static142.originZ; local53 = local9[local20]; if (local53 != null) { Static107.method2261(); @@ -88,8 +88,8 @@ public final class Static87 { } } for (local20 = 0; local20 < local18; local20++) { - local38 = (Static238.anIntArray470[local20] >> 8) * 64 - Static225.anInt5068; - local49 = (Static238.anIntArray470[local20] & 0xFF) * 64 - Static142.anInt3483; + local38 = (Static238.anIntArray470[local20] >> 8) * 64 - Static225.originX; + local49 = (Static238.anIntArray470[local20] & 0xFF) * 64 - Static142.originZ; local53 = local9[local20]; if (local53 == null && Static52.anInt1695 < 800) { Static107.method2261(); @@ -117,11 +117,11 @@ public final class Static87 { } for (@Pc(18) int local18 = 0; local18 < arg3.length; local18++) { @Pc(30) Component local30 = arg3[local18]; - if (local30 != null && (local30.anInt456 == arg5 || arg5 == -1412584499 && local30 == Static105.aClass13_14)) { + if (local30 != null && (local30.layer == arg5 || arg5 == -1412584499 && local30 == Static105.aClass13_14)) { @Pc(57) int local57; if (arg8 == -1) { - Static264.anIntArray410[Static24.anInt766] = arg2 + local30.anInt523; - Static50.anIntArray133[Static24.anInt766] = local30.anInt469 + arg1; + Static264.anIntArray410[Static24.anInt766] = arg2 + local30.x; + Static50.anIntArray133[Static24.anInt766] = local30.y + arg1; Static224.anIntArray443[Static24.anInt766] = local30.anInt445; Static67.anIntArray320[Static24.anInt766] = local30.anInt459; local57 = Static24.anInt766++; @@ -134,9 +134,9 @@ public final class Static87 { if (local30.anInt453 > 0) { Static2.method13(local30); } - @Pc(114) int local114 = arg1 + local30.anInt469; + @Pc(114) int local114 = arg1 + local30.y; @Pc(117) int local117 = local30.anInt476; - @Pc(123) int local123 = local30.anInt523 + arg2; + @Pc(123) int local123 = local30.x + arg2; if (Static121.aBoolean154 && (Static36.method940(local30).anInt546 != 0 || local30.anInt452 == 0) && local117 > 127) { local117 = 127; } @@ -244,8 +244,8 @@ public final class Static87 { local518 = (Static273.anInt4130 + 256) * local518 >> 8; local545 = local518 * local276 - local514 * local270 >> 11; local556 = local276 * local514 + local270 * local518 >> 11; - local563 = Static173.aClass8_Sub4_Sub1_2.anInt3412 + local556 >> 7; - local571 = Static173.aClass8_Sub4_Sub1_2.anInt3421 - local545 >> 7; + local563 = Static173.self.anInt3412 + local556 >> 7; + local571 = Static173.self.anInt3421 - local545 >> 7; if (Static241.aBoolean302 && (Static274.anInt4999 & 0x40) != 0) { @Pc(583) Component local583 = Static201.method1418(Static98.anInt2512, Static15.anInt506); if (local583 == null) { @@ -368,16 +368,16 @@ public final class Static87 { continue; } if (!local30.aBoolean32) { - if (local30.anInt491 - local30.anInt459 < local30.anInt468) { - local30.anInt468 = local30.anInt491 - local30.anInt459; + if (local30.anInt491 - local30.anInt459 < local30.scrollY) { + local30.scrollY = local30.anInt491 - local30.anInt459; } - if (local30.anInt468 < 0) { - local30.anInt468 = 0; + if (local30.scrollY < 0) { + local30.scrollY = 0; } } - method1809(local166, local114 - local30.anInt468, -local30.anInt489 + local123, arg3, local302, local30.anInt507, local164, local291, local57); - if (local30.aClass13Array3 != null) { - method1809(local166, local114 - local30.anInt468, -local30.anInt489 + local123, local30.aClass13Array3, local302, local30.anInt507, local164, local291, local57); + method1809(local166, local114 - local30.scrollY, -local30.anInt489 + local123, arg3, local302, local30.anInt507, local164, local291, local57); + if (local30.createdComponents != null) { + method1809(local166, local114 - local30.scrollY, -local30.anInt489 + local123, local30.createdComponents, local302, local30.anInt507, local164, local291, local57); } @Pc(1186) Class3_Sub31 local1186 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local30.anInt507); if (local1186 != null) { @@ -399,27 +399,27 @@ public final class Static87 { } if (Static223.aBooleanArray116[local57] || Static199.anInt4672 > 1) { if (local30.anInt452 == 0 && !local30.aBoolean32 && local30.anInt491 > local30.anInt459) { - Static74.method1624(local30.anInt468, local30.anInt491, local30.anInt445 + local123, local114, local30.anInt459); + Static74.method1624(local30.scrollY, local30.anInt491, local30.anInt445 + local123, local114, local30.anInt459); } if (local30.anInt452 != 1) { if (local30.anInt452 == 2) { local270 = 0; for (local276 = 0; local276 < local30.anInt488; local276++) { - for (local468 = 0; local468 < local30.anInt446; local468++) { + for (local468 = 0; local468 < local30.baseWidth; local468++) { local514 = local114 + local276 * (local30.anInt516 + 32); local503 = (local30.anInt512 + 32) * local468 + local123; if (local270 < 20) { local514 += local30.anIntArray47[local270]; local503 += local30.anIntArray41[local270]; } - if (local30.anIntArray40[local270] > 0) { - local545 = local30.anIntArray40[local270] - 1; + if (local30.objTypes[local270] > 0) { + local545 = local30.objTypes[local270] - 1; if (arg0 < local503 + 32 && local503 < arg4 && arg6 < local514 + 32 && local514 < arg7 || local30 == Static118.aClass13_15 && Static4.anInt36 == local270) { @Pc(1476) Sprite local1476; if (Static260.anInt5014 == 1 && Static185.anInt4370 == local270 && local30.anInt507 == Static224.anInt5062) { - local1476 = Static190.method3443(2, local545, local30.aBoolean31, local30.anIntArray50[local270], 0); + local1476 = Static190.method3443(2, local545, local30.aBoolean31, local30.objCounts[local270], 0); } else { - local1476 = Static190.method3443(1, local545, local30.aBoolean31, local30.anIntArray50[local270], 3153952); + local1476 = Static190.method3443(1, local545, local30.aBoolean31, local30.objCounts[local270], 3153952); } if (Rasteriser.aBoolean134) { Static186.aBooleanArray100[local57] = true; @@ -452,27 +452,27 @@ public final class Static87 { local1575 = Static129.anInt3149; } @Pc(1611) int local1611; - if (local1577 > local556 + local514 && local1571.anInt468 > 0) { + if (local1577 > local556 + local514 && local1571.scrollY > 0) { local1611 = Static178.anInt4247 * (local1577 - local556 - local514) / 3; if (local1611 > Static178.anInt4247 * 10) { local1611 = Static178.anInt4247 * 10; } - if (local1611 > local1571.anInt468) { - local1611 = local1571.anInt468; + if (local1611 > local1571.scrollY) { + local1611 = local1571.scrollY; } - local1571.anInt468 -= local1611; + local1571.scrollY -= local1611; Static206.anInt4773 += local1611; Static43.method1143(local1571); } - if (local1575 < local556 + local514 + 32 && local1571.anInt468 < local1571.anInt491 - local1571.anInt459) { + if (local1575 < local556 + local514 + 32 && local1571.scrollY < local1571.anInt491 - local1571.anInt459) { local1611 = (local514 + local556 + 32 - local1575) * Static178.anInt4247 / 3; if (local1611 > Static178.anInt4247 * 10) { local1611 = Static178.anInt4247 * 10; } - if (local1571.anInt491 - local1571.anInt468 - local1571.anInt459 < local1611) { - local1611 = local1571.anInt491 - local1571.anInt459 - local1571.anInt468; + if (local1571.anInt491 - local1571.scrollY - local1571.anInt459 < local1611) { + local1611 = local1571.anInt491 - local1571.anInt459 - local1571.scrollY; } - local1571.anInt468 += local1611; + local1571.scrollY += local1611; Static206.anInt4773 -= local1611; Static43.method1143(local1571); } @@ -549,14 +549,14 @@ public final class Static87 { local276 = local30.anInt480; } } - if (local30.aBoolean32 && local30.anInt458 != -1) { - @Pc(1989) ObjType local1989 = Static71.method1439(local30.anInt458); + if (local30.aBoolean32 && local30.objId != -1) { + @Pc(1989) ObjType local1989 = Static71.method1439(local30.objId); local1934 = local1989.aClass100_495; if (local1934 == null) { local1934 = Static92.aClass100_510; } - if ((local1989.anInt2336 == 1 || local30.anInt503 != 1) && local30.anInt503 != -1) { - local1934 = Static34.method882(new JagString[] { Static8.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(local30.anInt503) }); + if ((local1989.anInt2336 == 1 || local30.objCount != 1) && local30.objCount != -1) { + local1934 = Static34.method882(new JagString[] { Static8.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(local30.objCount) }); } } if (Static39.aClass13_10 == local30) { @@ -573,10 +573,10 @@ public final class Static87 { } else if (local30.anInt452 == 5) { @Pc(2094) Sprite local2094; if (local30.aBoolean32) { - if (local30.anInt458 == -1) { + if (local30.objId == -1) { local2094 = local30.method489(false); } else { - local2094 = Static190.method3443(local30.anInt514, local30.anInt458, local30.aBoolean31, local30.anInt503, local30.anInt513); + local2094 = Static190.method3443(local30.anInt514, local30.objId, local30.aBoolean31, local30.objCount, local30.anInt513); } if (local2094 != null) { local276 = local2094.anInt1860; @@ -672,10 +672,10 @@ public final class Static87 { local276 = local30.anInt522; } local503 = 0; - if (local30.anInt458 != -1) { - local2611 = Static71.method1439(local30.anInt458); + if (local30.objId != -1) { + local2611 = Static71.method1439(local30.objId); if (local2611 != null) { - local2611 = local2611.method1820(local30.anInt503); + local2611 = local2611.method1820(local30.objCount); @Pc(2630) SeqType local2630 = local276 == -1 ? null : Static36.method941(local276); local2589 = local2611.method1824(local30.anInt496, local30.anInt500, local2630, 1, local30.anInt510); if (local2589 == null) { @@ -684,28 +684,28 @@ public final class Static87 { local503 = -local2589.method4549() / 2; } } - } else if (local30.anInt464 == 5) { - if (local30.anInt463 == -1) { + } else if (local30.modelType == 5) { + if (local30.modelId == -1) { local2589 = Static134.aClass59_2.method1954(null, -1, null, null, 0, -1, 0, -1, -1); } else { - local514 = local30.anInt463 & 0x7FF; + local514 = local30.modelId & 0x7FF; if (local514 == Static16.anInt549) { local514 = 2047; } @Pc(2751) Player local2751 = Static159.aClass8_Sub4_Sub1Array1[local514]; @Pc(2760) SeqType local2760 = local276 == -1 ? null : Static36.method941(local276); - if (local2751 != null && (int) local2751.aClass100_364.method3158() << 11 == (local30.anInt463 & 0xFFFFF800)) { + if (local2751 != null && (int) local2751.aClass100_364.method3158() << 11 == (local30.modelId & 0xFFFFF800)) { local2589 = local2751.aClass59_1.method1954(null, -1, null, local2760, 0, -1, 0, local30.anInt510, 0); } } } else if (local276 == -1) { - local2589 = local30.method488(-1, null, -1, 0, local2587, Static173.aClass8_Sub4_Sub1_2.aClass59_1); + local2589 = local30.method488(-1, null, -1, 0, local2587, Static173.self.aClass59_1); if (local2589 == null && Static211.aBoolean72) { Static43.method1143(local30); } } else { @Pc(2689) SeqType local2689 = Static36.method941(local276); - local2589 = local30.method488(local30.anInt496, local2689, local30.anInt510, local30.anInt500, local2587, Static173.aClass8_Sub4_Sub1_2.aClass59_1); + local2589 = local30.method488(local30.anInt496, local2689, local30.anInt510, local30.anInt500, local2587, Static173.self.aClass59_1); if (local2589 == null && Static211.aBoolean72) { Static43.method1143(local30); } @@ -725,7 +725,7 @@ public final class Static87 { local545 = local30.anInt459 / 2 + local114 + (local518 * local30.anInt481 >> 8); if (Static239.aBoolean269) { if (local30.aBoolean22) { - Static239.method4182(local556, local545, local30.anInt443, local30.aShort11, local514, local518); + Static239.method4182(local556, local545, local30.modelZoom, local30.aShort11, local514, local518); } else { Static239.method4148(local556, local545, local514, local518); Static239.method4152((float) local30.aShort10, (float) local30.aShort11 * 1.5F); @@ -743,26 +743,26 @@ public final class Static87 { if (local30.aBoolean34) { Static239.method4178(); } - local563 = MathUtils.anIntArray223[local30.anInt450] * local30.anInt443 >> 16; - local571 = local30.anInt443 * MathUtils.anIntArray225[local30.anInt450] >> 16; + local563 = MathUtils.anIntArray223[local30.modelXAngle] * local30.modelZoom >> 16; + local571 = local30.modelZoom * MathUtils.anIntArray225[local30.modelXAngle] >> 16; if (local30.aBoolean32) { - local2589.method4571(local30.anInt524, local30.anInt508, local30.anInt450, local30.anInt494, local30.anInt497 + local563 + local503, local30.anInt497 + local571, -1L); + local2589.method4571(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + local563 + local503, local30.modelZOffset + local571, -1L); } else { - local2589.method4571(local30.anInt524, 0, local30.anInt450, 0, local563, local571, -1L); + local2589.method4571(local30.modelYAngle, 0, local30.modelXAngle, 0, local563, local571, -1L); } if (local30.aBoolean34) { Static239.method4157(); } } else { Rasteriser.method1919(local556, local545); - local563 = MathUtils.anIntArray223[local30.anInt450] * local30.anInt443 >> 16; - local571 = local30.anInt443 * MathUtils.anIntArray225[local30.anInt450] >> 16; + local563 = MathUtils.anIntArray223[local30.modelXAngle] * local30.modelZoom >> 16; + local571 = local30.modelZoom * MathUtils.anIntArray225[local30.modelXAngle] >> 16; if (!local30.aBoolean32) { - local2589.method4571(local30.anInt524, 0, local30.anInt450, 0, local563, local571, -1L); + local2589.method4571(local30.modelYAngle, 0, local30.modelXAngle, 0, local563, local571, -1L); } else if (local30.aBoolean22) { - ((SoftwareModel) local2589).method4591(local30.anInt524, local30.anInt508, local30.anInt450, local30.anInt494, local30.anInt497 + local503 + local563, local571 + local30.anInt497, local30.anInt443); + ((SoftwareModel) local2589).method4591(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + local503 + local563, local571 + local30.modelZOffset, local30.modelZoom); } else { - local2589.method4571(local30.anInt524, local30.anInt508, local30.anInt450, local30.anInt494, local30.anInt497 + local563 + local503, local571 + local30.anInt497, -1L); + local2589.method4571(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + local563 + local503, local571 + local30.modelZOffset, -1L); } Rasteriser.method1915(); } @@ -778,14 +778,14 @@ public final class Static87 { } local276 = 0; for (local468 = 0; local468 < local30.anInt488; local468++) { - for (local503 = 0; local503 < local30.anInt446; local503++) { - if (local30.anIntArray40[local276] > 0) { - local2611 = Static71.method1439(local30.anIntArray40[local276] - 1); + for (local503 = 0; local503 < local30.baseWidth; local503++) { + if (local30.objTypes[local276] > 0) { + local2611 = Static71.method1439(local30.objTypes[local276] - 1); @Pc(3159) JagString local3159; - if (local2611.anInt2336 != 1 && local30.anIntArray50[local276] == 1) { + if (local2611.anInt2336 != 1 && local30.objCounts[local276] == 1) { local3159 = Static34.method882(new JagString[] { Static8.aClass100_32, local2611.aClass100_495, Static230.aClass100_978 }); } else { - local3159 = Static34.method882(new JagString[] { Static8.aClass100_32, local2611.aClass100_495, Static54.aClass100_375, Static70.method1548(local30.anIntArray50[local276]) }); + local3159 = Static34.method882(new JagString[] { Static8.aClass100_32, local2611.aClass100_495, Static54.aClass100_375, Static70.method1548(local30.objCounts[local276]) }); } local556 = local123 + local503 * (local30.anInt512 + 115); local545 = (local30.anInt516 + 12) * local468 + local114; @@ -903,13 +903,13 @@ public final class Static87 { Static57.anInt1747 &= 0x7FF; @Pc(33) int local33 = Static81.anInt2223 >> 7; @Pc(37) int local37 = Static111.anInt2900 >> 7; - @Pc(43) int local43 = Static207.method3685(Static55.anInt1735, Static81.anInt2223, Static111.anInt2900); + @Pc(43) int local43 = Static207.method3685(Static55.level, Static81.anInt2223, Static111.anInt2900); @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.anInt1735; + @Pc(80) int local80 = Static55.level; if (local80 < 3 && (Static12.aByteArrayArrayArray2[1][local64][local73] & 0x2) == 2) { local80++; } diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index 3aed203..6ea85b0 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -45,19 +45,19 @@ public final class Static88 { local77 = arg1.anInt3097; } if (local77 == -2147483645) { - local77 = arg1.aClass13_17 == null ? -1 : arg1.aClass13_17.anInt507; + local77 = arg1.source == null ? -1 : arg1.source.anInt507; } if (local77 == -2147483644) { local77 = arg1.anInt3101; } if (local77 == -2147483643) { - local77 = arg1.aClass13_17 == null ? -1 : arg1.aClass13_17.anInt457; + local77 = arg1.source == null ? -1 : arg1.source.componentId; } if (local77 == -2147483642) { local77 = arg1.aClass13_16 == null ? -1 : arg1.aClass13_16.anInt507; } if (local77 == -2147483641) { - local77 = arg1.aClass13_16 == null ? -1 : arg1.aClass13_16.anInt457; + local77 = arg1.aClass13_16 == null ? -1 : arg1.aClass13_16.componentId; } if (local77 == -2147483640) { local77 = arg1.anInt3100; @@ -243,13 +243,13 @@ public final class Static88 { continue; } if (local226 == 42) { - Static254.anIntArray487[local28++] = Static155.anIntArray355[local33[local30]]; + Static254.anIntArray487[local28++] = Static155.varcs[local33[local30]]; continue; } if (local226 == 43) { local77 = local33[local30]; local28--; - Static155.anIntArray355[local77] = Static254.anIntArray487[local28]; + Static155.varcs[local77] = Static254.anIntArray487[local28]; Static4.method24(local77); continue; } @@ -296,7 +296,7 @@ public final class Static88 { throw new RuntimeException(); } if (local226 == 47) { - local194 = Static226.aClass100Array154[local33[local30]]; + local194 = Static226.varcstrs[local33[local30]]; if (local194 == null) { local194 = Static254.aClass100_1061; } @@ -306,7 +306,7 @@ public final class Static88 { if (local226 == 48) { local77 = local33[local30]; local26--; - Static226.aClass100Array154[local77] = Static3.aClass100Array176[local26]; + Static226.varcstrs[local77] = Static3.aClass100Array176[local26]; Static89.method1840(local77); continue; } @@ -338,26 +338,26 @@ public final class Static88 { local803 = Static254.anIntArray487[local28 + 1]; local1052 = Static254.anIntArray487[local28 + 2]; if (local803 != 0) { - local1063 = Static5.method32(local809); - if (local1063.aClass13Array3 == null) { - local1063.aClass13Array3 = new Component[local1052 + 1]; + local1063 = Static5.getComponent(local809); + if (local1063.createdComponents == null) { + local1063.createdComponents = new Component[local1052 + 1]; } - if (local1052 >= local1063.aClass13Array3.length) { + if (local1052 >= local1063.createdComponents.length) { @Pc(1085) Component[] local1085 = new Component[local1052 + 1]; - for (local1087 = 0; local1087 < local1063.aClass13Array3.length; local1087++) { - local1085[local1087] = local1063.aClass13Array3[local1087]; + for (local1087 = 0; local1087 < local1063.createdComponents.length; local1087++) { + local1085[local1087] = local1063.createdComponents[local1087]; } - local1063.aClass13Array3 = local1085; + local1063.createdComponents = local1085; } - if (local1052 > 0 && local1063.aClass13Array3[local1052 - 1] == null) { + if (local1052 > 0 && local1063.createdComponents[local1052 - 1] == null) { throw new RuntimeException("Gap at:" + (local1052 - 1)); } @Pc(1137) Component local1137 = new Component(); local1137.aBoolean32 = true; - local1137.anInt457 = local1052; - local1137.anInt456 = local1137.anInt507 = local1063.anInt507; + local1137.componentId = local1052; + local1137.layer = local1137.anInt507 = local1063.anInt507; local1137.anInt452 = local803; - local1063.aClass13Array3[local1052] = local1137; + local1063.createdComponents[local1052] = local1137; if (local1020) { Static274.aClass13_24 = local1137; } else { @@ -371,21 +371,21 @@ public final class Static88 { @Pc(1204) Component local1204; if (local226 == 101) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { if (!local1020) { throw new RuntimeException("Tried to cc_delete static active-component!"); } throw new RuntimeException("Tried to .cc_delete static .active-component!"); } - local1204 = Static5.method32(local1182.anInt507); - local1204.aClass13Array3[local1182.anInt457] = null; + local1204 = Static5.getComponent(local1182.anInt507); + local1204.createdComponents[local1182.componentId] = null; Static43.method1143(local1204); continue; } if (local226 == 102) { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); - local1182.aClass13Array3 = null; + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); + local1182.createdComponents = null; Static43.method1143(local1182); continue; } @@ -409,7 +409,7 @@ public final class Static88 { if (local226 == 201) { local28--; local809 = Static254.anIntArray487[local28]; - local1204 = Static5.method32(local809); + local1204 = Static5.getComponent(local809); if (local1204 == null) { Static254.anIntArray487[local28++] = 0; } else { @@ -431,7 +431,7 @@ public final class Static88 { local809 = Static254.anIntArray487[local28]; for (local1052 = 0; local1052 < Static204.anIntArray425.length; local1052++) { if (local809 == Static204.anIntArray425[local1052]) { - Static173.aClass8_Sub4_Sub1_2.aClass59_1.method1953(local1052, local803); + Static173.self.aClass59_1.method1953(local1052, local803); continue label4266; } } @@ -441,7 +441,7 @@ public final class Static88 { continue label4266; } if (local809 == Static153.anIntArray351[local1052]) { - Static173.aClass8_Sub4_Sub1_2.aClass59_1.method1953(local1052, local803); + Static173.self.aClass59_1.method1953(local1052, local803); continue label4266; } local1052++; @@ -451,13 +451,13 @@ public final class Static88 { local28 -= 2; local809 = Static254.anIntArray487[local28]; local803 = Static254.anIntArray487[local28 + 1]; - Static173.aClass8_Sub4_Sub1_2.aClass59_1.method1951(local809, local803); + Static173.self.aClass59_1.method1951(local809, local803); continue; } if (local226 == 410) { local28--; local12388 = Static254.anIntArray487[local28] != 0; - Static173.aClass8_Sub4_Sub1_2.aClass59_1.method1948(local12388); + Static173.self.aClass59_1.method1948(local12388); continue; } } else { @@ -470,7 +470,7 @@ public final class Static88 { } else { local226 -= 1000; local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); } if (local226 == 1100) { local28 -= 2; @@ -481,15 +481,15 @@ public final class Static88 { if (local1182.anInt489 < 0) { local1182.anInt489 = 0; } - local1182.anInt468 = Static254.anIntArray487[local28 + 1]; - if (local1182.anInt468 > local1182.anInt491 - local1182.anInt459) { - local1182.anInt468 = local1182.anInt491 - local1182.anInt459; + local1182.scrollY = Static254.anIntArray487[local28 + 1]; + if (local1182.scrollY > local1182.anInt491 - local1182.anInt459) { + local1182.scrollY = local1182.anInt491 - local1182.anInt459; } - if (local1182.anInt468 < 0) { - local1182.anInt468 = 0; + if (local1182.scrollY < 0) { + local1182.scrollY = 0; } Static43.method1143(local1182); - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static118.method2353(local1182.anInt507); } continue; @@ -498,7 +498,7 @@ public final class Static88 { local28--; local1182.anInt474 = Static254.anIntArray487[local28]; Static43.method1143(local1182); - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static245.method4224(local1182.anInt507); } continue; @@ -540,25 +540,25 @@ public final class Static88 { continue; } if (local226 == 1108) { - local1182.anInt464 = 1; + local1182.modelType = 1; local28--; - local1182.anInt463 = Static254.anIntArray487[local28]; + local1182.modelId = Static254.anIntArray487[local28]; Static43.method1143(local1182); - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static271.method4600(local1182.anInt507); } continue; } if (local226 == 1109) { local28 -= 6; - local1182.anInt494 = Static254.anIntArray487[local28]; - local1182.anInt497 = Static254.anIntArray487[local28 + 1]; - local1182.anInt450 = Static254.anIntArray487[local28 + 2]; - local1182.anInt524 = Static254.anIntArray487[local28 + 3]; - local1182.anInt508 = Static254.anIntArray487[local28 + 4]; - local1182.anInt443 = Static254.anIntArray487[local28 + 5]; + local1182.modelXOffset = Static254.anIntArray487[local28]; + local1182.modelZOffset = Static254.anIntArray487[local28 + 1]; + local1182.modelXAngle = Static254.anIntArray487[local28 + 2]; + local1182.modelYAngle = Static254.anIntArray487[local28 + 3]; + local1182.modelYOffset = Static254.anIntArray487[local28 + 4]; + local1182.modelZoom = Static254.anIntArray487[local28 + 5]; Static43.method1143(local1182); - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static153.method2910(local1182.anInt507); Static180.method3328(local1182.anInt507); } @@ -574,7 +574,7 @@ public final class Static88 { local1182.anInt496 = 1; Static43.method1143(local1182); } - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static181.method3345(local1182.anInt507); } continue; @@ -592,7 +592,7 @@ public final class Static88 { local1182.aClass100_84 = local2522; Static43.method1143(local1182); } - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static163.method3096(local1182.anInt507); } continue; @@ -666,9 +666,9 @@ public final class Static88 { } if (local226 == 1123) { local28--; - local1182.anInt443 = Static254.anIntArray487[local28]; + local1182.modelZoom = Static254.anIntArray487[local28]; Static43.method1143(local1182); - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static153.method2910(local1182.anInt507); } continue; @@ -678,7 +678,7 @@ public final class Static88 { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; } else { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); local226 -= 1000; } Static43.method1143(local1182); @@ -686,29 +686,29 @@ public final class Static88 { local28 -= 2; local1052 = Static254.anIntArray487[local28 + 1]; local803 = Static254.anIntArray487[local28]; - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static251.method4279(local1182.anInt507); Static153.method2910(local1182.anInt507); Static180.method3328(local1182.anInt507); } if (local803 == -1) { - local1182.anInt463 = -1; - local1182.anInt464 = 1; - local1182.anInt458 = -1; + local1182.modelId = -1; + local1182.modelType = 1; + local1182.objId = -1; } else { - local1182.anInt458 = local803; - local1182.anInt503 = local1052; + local1182.objId = local803; + local1182.objCount = local1052; @Pc(13416) ObjType local13416 = Static71.method1439(local803); - local1182.anInt508 = local13416.anInt2339; - local1182.anInt494 = local13416.anInt2359; - local1182.anInt450 = local13416.anInt2353; - local1182.anInt497 = local13416.anInt2319; - local1182.anInt524 = local13416.anInt2369; - local1182.anInt443 = local13416.anInt2375; + local1182.modelYOffset = local13416.anInt2339; + local1182.modelXOffset = local13416.anInt2359; + local1182.modelXAngle = local13416.anInt2353; + local1182.modelZOffset = local13416.anInt2319; + local1182.modelYAngle = local13416.anInt2369; + local1182.modelZoom = local13416.anInt2375; if (local1182.anInt451 > 0) { - local1182.anInt443 = local1182.anInt443 * 32 / local1182.anInt451; - } else if (local1182.anInt446 > 0) { - local1182.anInt443 = local1182.anInt443 * 32 / local1182.anInt446; + local1182.modelZoom = local1182.modelZoom * 32 / local1182.anInt451; + } else if (local1182.baseWidth > 0) { + local1182.modelZoom = local1182.modelZoom * 32 / local1182.baseWidth; } if (local226 == 1205) { local1182.aBoolean31 = false; @@ -719,36 +719,36 @@ public final class Static88 { continue; } if (local226 == 1201) { - local1182.anInt464 = 2; + local1182.modelType = 2; local28--; - local1182.anInt463 = Static254.anIntArray487[local28]; - if (local1182.anInt457 == -1) { + local1182.modelId = Static254.anIntArray487[local28]; + if (local1182.componentId == -1) { Static271.method4600(local1182.anInt507); } continue; } if (local226 == 1202) { - local1182.anInt464 = 3; - local1182.anInt463 = Static173.aClass8_Sub4_Sub1_2.aClass59_1.method1952(); - if (local1182.anInt457 == -1) { + local1182.modelType = 3; + local1182.modelId = Static173.self.aClass59_1.method1952(); + if (local1182.componentId == -1) { Static271.method4600(local1182.anInt507); } continue; } if (local226 == 1203) { - local1182.anInt464 = 6; + local1182.modelType = 6; local28--; - local1182.anInt463 = Static254.anIntArray487[local28]; - if (local1182.anInt457 == -1) { + local1182.modelId = Static254.anIntArray487[local28]; + if (local1182.componentId == -1) { Static271.method4600(local1182.anInt507); } continue; } if (local226 == 1204) { - local1182.anInt464 = 5; + local1182.modelType = 5; local28--; - local1182.anInt463 = Static254.anIntArray487[local28]; - if (local1182.anInt457 == -1) { + local1182.modelId = Static254.anIntArray487[local28]; + if (local1182.componentId == -1) { Static271.method4600(local1182.anInt507); } continue; @@ -756,7 +756,7 @@ public final class Static88 { } else if (local226 >= 1300 && local226 < 1400 || local226 >= 2300 && local226 < 2400) { if (local226 >= 2000) { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); local226 -= 1000; } else { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; @@ -833,7 +833,7 @@ public final class Static88 { } else { local226 -= 1000; local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); } @Pc(12937) int[] local12937 = null; local26--; @@ -937,11 +937,11 @@ public final class Static88 { if (local226 < 1600) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; if (local226 == 1500) { - Static254.anIntArray487[local28++] = local1182.anInt523; + Static254.anIntArray487[local28++] = local1182.x; continue; } if (local226 == 1501) { - Static254.anIntArray487[local28++] = local1182.anInt469; + Static254.anIntArray487[local28++] = local1182.y; continue; } if (local226 == 1502) { @@ -953,11 +953,11 @@ public final class Static88 { continue; } if (local226 == 1504) { - Static254.anIntArray487[local28++] = local1182.aBoolean17 ? 1 : 0; + Static254.anIntArray487[local28++] = local1182.hidden ? 1 : 0; continue; } if (local226 == 1505) { - Static254.anIntArray487[local28++] = local1182.anInt456; + Static254.anIntArray487[local28++] = local1182.layer; continue; } } else if (local226 < 1700) { @@ -967,7 +967,7 @@ public final class Static88 { continue; } if (local226 == 1601) { - Static254.anIntArray487[local28++] = local1182.anInt468; + Static254.anIntArray487[local28++] = local1182.scrollY; continue; } if (local226 == 1602) { @@ -983,19 +983,19 @@ public final class Static88 { continue; } if (local226 == 1605) { - Static254.anIntArray487[local28++] = local1182.anInt443; + Static254.anIntArray487[local28++] = local1182.modelZoom; continue; } if (local226 == 1606) { - Static254.anIntArray487[local28++] = local1182.anInt450; + Static254.anIntArray487[local28++] = local1182.modelXAngle; continue; } if (local226 == 1607) { - Static254.anIntArray487[local28++] = local1182.anInt508; + Static254.anIntArray487[local28++] = local1182.modelYOffset; continue; } if (local226 == 1608) { - Static254.anIntArray487[local28++] = local1182.anInt524; + Static254.anIntArray487[local28++] = local1182.modelYAngle; continue; } if (local226 == 1609) { @@ -1003,11 +1003,11 @@ public final class Static88 { continue; } if (local226 == 1610) { - Static254.anIntArray487[local28++] = local1182.anInt494; + Static254.anIntArray487[local28++] = local1182.modelXOffset; continue; } if (local226 == 1611) { - Static254.anIntArray487[local28++] = local1182.anInt497; + Static254.anIntArray487[local28++] = local1182.modelZOffset; continue; } if (local226 == 1612) { @@ -1017,19 +1017,19 @@ public final class Static88 { } else if (local226 < 1800) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; if (local226 == 1700) { - Static254.anIntArray487[local28++] = local1182.anInt458; + Static254.anIntArray487[local28++] = local1182.objId; continue; } if (local226 == 1701) { - if (local1182.anInt458 == -1) { + if (local1182.objId == -1) { Static254.anIntArray487[local28++] = 0; } else { - Static254.anIntArray487[local28++] = local1182.anInt503; + Static254.anIntArray487[local28++] = local1182.objCount; } continue; } if (local226 == 1702) { - Static254.anIntArray487[local28++] = local1182.anInt457; + Static254.anIntArray487[local28++] = local1182.componentId; continue; } } else if (local226 < 1900) { @@ -1059,13 +1059,13 @@ public final class Static88 { } } else if (local226 < 2600) { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); if (local226 == 2500) { - Static254.anIntArray487[local28++] = local1182.anInt523; + Static254.anIntArray487[local28++] = local1182.x; continue; } if (local226 == 2501) { - Static254.anIntArray487[local28++] = local1182.anInt469; + Static254.anIntArray487[local28++] = local1182.y; continue; } if (local226 == 2502) { @@ -1077,22 +1077,22 @@ public final class Static88 { continue; } if (local226 == 2504) { - Static254.anIntArray487[local28++] = local1182.aBoolean17 ? 1 : 0; + Static254.anIntArray487[local28++] = local1182.hidden ? 1 : 0; continue; } if (local226 == 2505) { - Static254.anIntArray487[local28++] = local1182.anInt456; + Static254.anIntArray487[local28++] = local1182.layer; continue; } } else if (local226 < 2700) { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); if (local226 == 2600) { Static254.anIntArray487[local28++] = local1182.anInt489; continue; } if (local226 == 2601) { - Static254.anIntArray487[local28++] = local1182.anInt468; + Static254.anIntArray487[local28++] = local1182.scrollY; continue; } if (local226 == 2602) { @@ -1108,19 +1108,19 @@ public final class Static88 { continue; } if (local226 == 2605) { - Static254.anIntArray487[local28++] = local1182.anInt443; + Static254.anIntArray487[local28++] = local1182.modelZoom; continue; } if (local226 == 2606) { - Static254.anIntArray487[local28++] = local1182.anInt450; + Static254.anIntArray487[local28++] = local1182.modelXAngle; continue; } if (local226 == 2607) { - Static254.anIntArray487[local28++] = local1182.anInt508; + Static254.anIntArray487[local28++] = local1182.modelYOffset; continue; } if (local226 == 2608) { - Static254.anIntArray487[local28++] = local1182.anInt524; + Static254.anIntArray487[local28++] = local1182.modelYAngle; continue; } if (local226 == 2609) { @@ -1128,11 +1128,11 @@ public final class Static88 { continue; } if (local226 == 2610) { - Static254.anIntArray487[local28++] = local1182.anInt494; + Static254.anIntArray487[local28++] = local1182.modelXOffset; continue; } if (local226 == 2611) { - Static254.anIntArray487[local28++] = local1182.anInt497; + Static254.anIntArray487[local28++] = local1182.modelZOffset; continue; } if (local226 == 2612) { @@ -1142,17 +1142,17 @@ public final class Static88 { } else if (local226 < 2800) { if (local226 == 2700) { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); - Static254.anIntArray487[local28++] = local1182.anInt458; + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); + Static254.anIntArray487[local28++] = local1182.objId; continue; } if (local226 == 2701) { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); - if (local1182.anInt458 == -1) { + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); + if (local1182.objId == -1) { Static254.anIntArray487[local28++] = 0; } else { - Static254.anIntArray487[local28++] = local1182.anInt503; + Static254.anIntArray487[local28++] = local1182.objCount; } continue; } @@ -1169,14 +1169,14 @@ public final class Static88 { } if (local226 == 2703) { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); - if (local1182.aClass13Array3 == null) { + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); + if (local1182.createdComponents == null) { Static254.anIntArray487[local28++] = 0; continue; } - local803 = local1182.aClass13Array3.length; - for (local1052 = 0; local1052 < local1182.aClass13Array3.length; local1052++) { - if (local1182.aClass13Array3[local1052] == null) { + local803 = local1182.createdComponents.length; + for (local1052 = 0; local1052 < local1182.createdComponents.length; local1052++) { + if (local1182.createdComponents[local1052] == null) { local803 = local1052; break; } @@ -1198,7 +1198,7 @@ public final class Static88 { } } else if (local226 < 2900) { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); if (local226 == 2800) { Static254.anIntArray487[local28++] = Static36.method940(local1182).method512(); continue; @@ -1231,7 +1231,7 @@ public final class Static88 { } if (local226 == 3101) { local28 -= 2; - Static186.method3415(Static254.anIntArray487[local28 + 1], Static254.anIntArray487[local28], Static173.aClass8_Sub4_Sub1_2); + Static186.method3415(Static254.anIntArray487[local28 + 1], Static254.anIntArray487[local28], Static173.self); continue; } if (local226 == 3103) { @@ -1245,23 +1245,23 @@ public final class Static88 { if (local609.method3123()) { local803 = local609.method3132(); } - Static6.aClass3_Sub15_Sub1_1.method2242(23); - Static6.aClass3_Sub15_Sub1_1.p4(local803); + Static6.outboundBuffer.p1isaac(23); + Static6.outboundBuffer.p4(local803); continue; } if (local226 == 3105) { local26--; local609 = Static3.aClass100Array176[local26]; - Static6.aClass3_Sub15_Sub1_1.method2242(244); - Static6.aClass3_Sub15_Sub1_1.p8(local609.method3158()); + Static6.outboundBuffer.p1isaac(244); + Static6.outboundBuffer.p8(local609.method3158()); continue; } if (local226 == 3106) { local26--; local609 = Static3.aClass100Array176[local26]; - Static6.aClass3_Sub15_Sub1_1.method2242(65); - Static6.aClass3_Sub15_Sub1_1.p1(local609.length() + 1); - Static6.aClass3_Sub15_Sub1_1.pjstr(local609); + Static6.outboundBuffer.p1isaac(65); + Static6.outboundBuffer.p1(local609.length() + 1); + Static6.outboundBuffer.pjstr(local609); continue; } if (local226 == 3107) { @@ -1277,7 +1277,7 @@ public final class Static88 { local803 = Static254.anIntArray487[local28 + 1]; local809 = Static254.anIntArray487[local28]; local1052 = Static254.anIntArray487[local28 + 2]; - local1063 = Static5.method32(local1052); + local1063 = Static5.getComponent(local1052); Static40.method1015(local803, local809, local1063); continue; } @@ -1292,8 +1292,8 @@ public final class Static88 { if (local226 == 3110) { local28--; local809 = Static254.anIntArray487[local28]; - Static6.aClass3_Sub15_Sub1_1.method2242(111); - Static6.aClass3_Sub15_Sub1_1.p2(local809); + Static6.outboundBuffer.p1isaac(111); + Static6.outboundBuffer.p2(local809); continue; } } else if (local226 < 3300) { @@ -1363,9 +1363,9 @@ public final class Static88 { continue; } if (local226 == 3308) { - local809 = Static55.anInt1735; - local803 = Static225.anInt5068 + (Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7); - local1052 = (Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7) + Static142.anInt3483; + local809 = Static55.level; + local803 = Static225.originX + (Static173.self.anInt3412 >> 7); + local1052 = (Static173.self.anInt3421 >> 7) + Static142.originZ; Static254.anIntArray487[local28++] = (local809 << 28) - (-(local803 << 14) - local1052); continue; } @@ -1413,15 +1413,15 @@ public final class Static88 { continue; } if (local226 == 3316) { - if (Static191.anInt4502 < 2) { + if (Static191.staffModLevel < 2) { Static254.anIntArray487[local28++] = 0; } else { - Static254.anIntArray487[local28++] = Static191.anInt4502; + Static254.anIntArray487[local28++] = Static191.staffModLevel; } continue; } if (local226 == 3317) { - Static254.anIntArray487[local28++] = Static60.anInt1894; + Static254.anIntArray487[local28++] = Static60.rebootTimer; continue; } if (local226 == 3318) { @@ -1457,11 +1457,11 @@ public final class Static88 { continue; } if (local226 == 3326) { - Static254.anIntArray487[local28++] = Static173.aClass8_Sub4_Sub1_2.anInt1652; + Static254.anIntArray487[local28++] = Static173.self.anInt1652; continue; } if (local226 == 3327) { - Static254.anIntArray487[local28++] = Static173.aClass8_Sub4_Sub1_2.aClass59_1.aBoolean141 ? 1 : 0; + Static254.anIntArray487[local28++] = Static173.self.aClass59_1.aBoolean141 ? 1 : 0; continue; } if (local226 == 3328) { @@ -1774,7 +1774,7 @@ public final class Static88 { if (local226 == 3624) { local28--; local809 = Static254.anIntArray487[local28]; - if (Static199.aClass3_Sub22Array1 != null && Static214.anInt5577 > local809 && Static199.aClass3_Sub22Array1[local809].aClass100_636.method3111(Static173.aClass8_Sub4_Sub1_2.aClass100_364)) { + if (Static199.aClass3_Sub22Array1 != null && Static214.anInt5577 > local809 && Static199.aClass3_Sub22Array1[local809].aClass100_636.method3111(Static173.self.aClass100_364)) { Static254.anIntArray487[local28++] = 1; continue; } @@ -2168,10 +2168,10 @@ public final class Static88 { Static59.anInt1812 = Static254.anIntArray487[local28]; Static49.anInt1459 = Static254.anIntArray487[local28 + 1]; Static84.anInt2256 = Static254.anIntArray487[local28 + 2]; - Static6.aClass3_Sub15_Sub1_1.method2242(157); - Static6.aClass3_Sub15_Sub1_1.p1(Static59.anInt1812); - Static6.aClass3_Sub15_Sub1_1.p1(Static49.anInt1459); - Static6.aClass3_Sub15_Sub1_1.p1(Static84.anInt2256); + Static6.outboundBuffer.p1isaac(157); + Static6.outboundBuffer.p1(Static59.anInt1812); + Static6.outboundBuffer.p1(Static49.anInt1459); + Static6.outboundBuffer.p1(Static84.anInt2256); continue; } if (local226 == 5002) { @@ -2180,10 +2180,10 @@ public final class Static88 { local28 -= 2; local803 = Static254.anIntArray487[local28]; local1052 = Static254.anIntArray487[local28 + 1]; - Static6.aClass3_Sub15_Sub1_1.method2242(99); - Static6.aClass3_Sub15_Sub1_1.p8(local609.method3158()); - Static6.aClass3_Sub15_Sub1_1.p1(local803 - 1); - Static6.aClass3_Sub15_Sub1_1.p1(local1052); + Static6.outboundBuffer.p1isaac(99); + Static6.outboundBuffer.p8(local609.method3158()); + Static6.outboundBuffer.p1(local803 - 1); + Static6.outboundBuffer.p1(local1052); continue; } if (local226 == 5003) { @@ -2217,7 +2217,7 @@ public final class Static88 { local26--; local609 = Static3.aClass100Array176[local26]; if (!local609.method3138(Static12.aClass100_74)) { - if (Static191.anInt4502 == 0 && (Static124.aBoolean157 && !Static207.aBoolean236 || Static86.aBoolean129)) { + if (Static191.staffModLevel == 0 && (Static124.aBoolean157 && !Static207.aBoolean236 || Static86.aBoolean129)) { continue; } local2522 = local609.method3114(); @@ -2332,13 +2332,13 @@ public final class Static88 { local5943 = 5; } } - Static6.aClass3_Sub15_Sub1_1.method2242(237); - Static6.aClass3_Sub15_Sub1_1.p1(0); - local4859 = Static6.aClass3_Sub15_Sub1_1.offset; - Static6.aClass3_Sub15_Sub1_1.p1(local5555); - Static6.aClass3_Sub15_Sub1_1.p1(local5943); - Static146.method2748(Static6.aClass3_Sub15_Sub1_1, local609); - Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local4859); + Static6.outboundBuffer.p1isaac(237); + Static6.outboundBuffer.p1(0); + local4859 = Static6.outboundBuffer.offset; + Static6.outboundBuffer.p1(local5555); + Static6.outboundBuffer.p1(local5943); + Static146.method2748(Static6.outboundBuffer, local609); + Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local4859); continue; } Static127.method2470(local609); @@ -2348,13 +2348,13 @@ public final class Static88 { local26 -= 2; local2522 = Static3.aClass100Array176[local26 + 1]; local609 = Static3.aClass100Array176[local26]; - if (Static191.anInt4502 != 0 || (!Static124.aBoolean157 || Static207.aBoolean236) && !Static86.aBoolean129) { - Static6.aClass3_Sub15_Sub1_1.method2242(201); - Static6.aClass3_Sub15_Sub1_1.p1(0); - local1052 = Static6.aClass3_Sub15_Sub1_1.offset; - Static6.aClass3_Sub15_Sub1_1.p8(local609.method3158()); - Static146.method2748(Static6.aClass3_Sub15_Sub1_1, local2522); - Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local1052); + if (Static191.staffModLevel != 0 || (!Static124.aBoolean157 || Static207.aBoolean236) && !Static86.aBoolean129) { + Static6.outboundBuffer.p1isaac(201); + Static6.outboundBuffer.p1(0); + local1052 = Static6.outboundBuffer.offset; + Static6.outboundBuffer.p8(local609.method3158()); + Static146.method2748(Static6.outboundBuffer, local2522); + Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local1052); } continue; } @@ -2395,10 +2395,10 @@ public final class Static88 { continue; } if (local226 == 5015) { - if (Static173.aClass8_Sub4_Sub1_2 == null || Static173.aClass8_Sub4_Sub1_2.aClass100_364 == null) { + if (Static173.self == null || Static173.self.aClass100_364 == null) { local609 = Static186.aClass100_829; } else { - local609 = Static173.aClass8_Sub4_Sub1_2.method1264(); + local609 = Static173.self.method1264(); } Static3.aClass100Array176[local26++] = local609; continue; @@ -2489,35 +2489,35 @@ public final class Static88 { continue; } if (local226 == 5059) { - Static6.aClass3_Sub15_Sub1_1.method2242(167); - Static6.aClass3_Sub15_Sub1_1.p1(0); - local809 = Static6.aClass3_Sub15_Sub1_1.offset; - Static6.aClass3_Sub15_Sub1_1.p1(0); - Static6.aClass3_Sub15_Sub1_1.p2(Static122.aClass12_1.anInt439); - Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.aClass3_Sub15_Sub1_1, Static122.aClass12_1.anIntArray33); - Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local809); + Static6.outboundBuffer.p1isaac(167); + Static6.outboundBuffer.p1(0); + local809 = Static6.outboundBuffer.offset; + Static6.outboundBuffer.p1(0); + Static6.outboundBuffer.p2(Static122.aClass12_1.anInt439); + Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.outboundBuffer, Static122.aClass12_1.anIntArray33); + Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local809); continue; } if (local226 == 5060) { local26--; local609 = Static3.aClass100Array176[local26]; - Static6.aClass3_Sub15_Sub1_1.method2242(178); - Static6.aClass3_Sub15_Sub1_1.p1(0); - local803 = Static6.aClass3_Sub15_Sub1_1.offset; - Static6.aClass3_Sub15_Sub1_1.p8(local609.method3158()); - Static6.aClass3_Sub15_Sub1_1.p2(Static122.aClass12_1.anInt439); - Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.aClass3_Sub15_Sub1_1, Static122.aClass12_1.anIntArray33); - Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local803); + Static6.outboundBuffer.p1isaac(178); + Static6.outboundBuffer.p1(0); + local803 = Static6.outboundBuffer.offset; + Static6.outboundBuffer.p8(local609.method3158()); + Static6.outboundBuffer.p2(Static122.aClass12_1.anInt439); + Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.outboundBuffer, Static122.aClass12_1.anIntArray33); + Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local803); continue; } if (local226 == 5061) { - Static6.aClass3_Sub15_Sub1_1.method2242(167); - Static6.aClass3_Sub15_Sub1_1.p1(0); - local809 = Static6.aClass3_Sub15_Sub1_1.offset; - Static6.aClass3_Sub15_Sub1_1.p1(1); - Static6.aClass3_Sub15_Sub1_1.p2(Static122.aClass12_1.anInt439); - Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.aClass3_Sub15_Sub1_1, Static122.aClass12_1.anIntArray33); - Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local809); + Static6.outboundBuffer.p1isaac(167); + Static6.outboundBuffer.p1(0); + local809 = Static6.outboundBuffer.offset; + Static6.outboundBuffer.p1(1); + Static6.outboundBuffer.p2(Static122.aClass12_1.anInt439); + Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.outboundBuffer, Static122.aClass12_1.anIntArray33); + Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local809); continue; } if (local226 == 5062) { @@ -2619,7 +2619,7 @@ public final class Static88 { } } else if (local226 < 5200) { if (local226 == 5100) { - if (Static187.aBooleanArray101[86]) { + if (Static187.pressedKeys[86]) { Static254.anIntArray487[local28++] = 1; } else { Static254.anIntArray487[local28++] = 0; @@ -2627,7 +2627,7 @@ public final class Static88 { continue; } if (local226 == 5101) { - if (Static187.aBooleanArray101[82]) { + if (Static187.pressedKeys[82]) { Static254.anIntArray487[local28++] = 1; } else { Static254.anIntArray487[local28++] = 0; @@ -2635,7 +2635,7 @@ public final class Static88 { continue; } if (local226 == 5102) { - if (Static187.aBooleanArray101[81]) { + if (Static187.pressedKeys[81]) { Static254.anIntArray487[local28++] = 1; } else { Static254.anIntArray487[local28++] = 0; @@ -2892,11 +2892,11 @@ public final class Static88 { local2522 = Static3.aClass100Array176[local26 + 1]; local28--; local1052 = Static254.anIntArray487[local28]; - Static6.aClass3_Sub15_Sub1_1.method2242(117); - Static6.aClass3_Sub15_Sub1_1.p1(Static229.method3937(local609) + Static229.method3937(local2522) + 1); - Static6.aClass3_Sub15_Sub1_1.pjstr(local609); - Static6.aClass3_Sub15_Sub1_1.pjstr(local2522); - Static6.aClass3_Sub15_Sub1_1.p1(local1052); + Static6.outboundBuffer.p1isaac(117); + Static6.outboundBuffer.p1(Static229.method3937(local609) + Static229.method3937(local2522) + 1); + Static6.outboundBuffer.pjstr(local609); + Static6.outboundBuffer.pjstr(local2522); + Static6.outboundBuffer.p1(local1052); continue; } if (local226 == 5401) { @@ -2944,7 +2944,7 @@ public final class Static88 { Static241.method4540(false, Static214.anInt5581, -1, -1); } if (Static39.aFrame1 == null) { - Static169.method3175(Static15.method479(), false); + Static169.openUrl(Static15.method479(), false); } else { System.exit(0); } @@ -2955,8 +2955,8 @@ public final class Static88 { if (Static232.aClass212_5 != null) { local609 = Static181.method3341(Static232.aClass212_5.anInt5926); try { - if (Static232.aClass212_5.anObject6 != null) { - @Pc(8281) byte[] local8281 = ((String) Static232.aClass212_5.anObject6).getBytes("ISO-8859-1"); + if (Static232.aClass212_5.result != null) { + @Pc(8281) byte[] local8281 = ((String) Static232.aClass212_5.result).getBytes("ISO-8859-1"); local609 = Static10.decodeString(local8281, local8281.length, 0); } } catch (@Pc(8290) UnsupportedEncodingException local8290) { @@ -2979,12 +2979,12 @@ public final class Static88 { local609 = Static3.aClass100Array176[local26]; @Pc(8356) JagString local8356 = Static34.method882(new JagString[] { Static15.method479(), local609 }); if (Static39.aFrame1 != null || local1552 && SignLink.anInt5928 != 3 && SignLink.aString15.startsWith("win") && !Static178.aBoolean203) { - Static164.aBoolean194 = local1552; - Static175.aClass100_797 = local8356; - Static33.aClass212_1 = Static71.signLink.method5131(new String(local8356.method3148(), "ISO-8859-1")); + Static164.newTab = local1552; + Static175.url = local8356; + Static33.openUrlRequest = Static71.signLink.method5131(new String(local8356.method3148(), "ISO-8859-1")); continue; } - Static169.method3175(local8356, local1552); + Static169.openUrl(local8356, local1552); continue; } if (local226 == 5422) { @@ -3056,7 +3056,7 @@ public final class Static88 { local652 = Static254.anIntArray487[local28 + 3]; local1052 = Static254.anIntArray487[local28 + 2]; local803 = Static254.anIntArray487[local28 + 1]; - Static141.method2722(false, local1052, local803, local652, (local809 & 0x3FFF) - Static142.anInt3483, (local809 >> 14 & 0x3FFF) - Static225.anInt5068); + Static141.method2722(false, local1052, local803, local652, (local809 & 0x3FFF) - Static142.originZ, (local809 >> 14 & 0x3FFF) - Static225.originX); continue; } if (local226 == 5501) { @@ -3065,7 +3065,7 @@ public final class Static88 { local809 = Static254.anIntArray487[local28]; local652 = Static254.anIntArray487[local28 + 3]; local1052 = Static254.anIntArray487[local28 + 2]; - Static260.method3849(local803, (local809 & 0x3FFF) - Static142.anInt3483, local1052, (local809 >> 14 & 0x3FFF) - Static225.anInt5068, local652); + Static260.method3849(local803, (local809 & 0x3FFF) - Static142.originZ, local1052, (local809 >> 14 & 0x3FFF) - Static225.originX, local652); continue; } if (local226 == 5502) { @@ -3225,7 +3225,7 @@ public final class Static88 { } Static269.method2172(); Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6002) { @@ -3235,7 +3235,7 @@ public final class Static88 { Static145.method2742(); Static269.method2218(); Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6003) { @@ -3243,7 +3243,7 @@ public final class Static88 { Static80.aBoolean231 = Static254.anIntArray487[local28] == 1; Static269.method2218(); Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6005) { @@ -3251,7 +3251,7 @@ public final class Static88 { Static250.aBoolean283 = Static254.anIntArray487[local28] == 1; Static145.method2742(); Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6006) { @@ -3259,35 +3259,35 @@ public final class Static88 { Static53.aBoolean99 = Static254.anIntArray487[local28] == 1; ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3245(!Static53.aBoolean99); Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6007) { local28--; Static15.aBoolean33 = Static254.anIntArray487[local28] == 1; Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6008) { local28--; Static11.aBoolean15 = Static254.anIntArray487[local28] == 1; Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6009) { local28--; Static159.aBoolean189 = Static254.anIntArray487[local28] == 1; Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6010) { local28--; Static209.aBoolean240 = Static254.anIntArray487[local28] == 1; Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6011) { @@ -3298,7 +3298,7 @@ public final class Static88 { } Static139.anInt3451 = local809; Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6012) { @@ -3325,7 +3325,7 @@ public final class Static88 { } Static145.method2742(); Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6014) { @@ -3335,7 +3335,7 @@ public final class Static88 { Static145.method2742(); } Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6015) { @@ -3345,7 +3345,7 @@ public final class Static88 { Static86.method1799(); } Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6016) { @@ -3365,7 +3365,7 @@ public final class Static88 { Static99.aBoolean143 = Static254.anIntArray487[local28] == 1; Static211.method930(); Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6018) { @@ -3379,7 +3379,7 @@ public final class Static88 { } Static125.anInt3104 = local809; Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6019) { @@ -3404,7 +3404,7 @@ public final class Static88 { Static12.anInt391 = local809; } Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6020) { @@ -3418,7 +3418,7 @@ public final class Static88 { } Static30.anInt978 = local809; Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; continue; } if (local226 == 6021) { @@ -3443,7 +3443,7 @@ public final class Static88 { } Static76.method1645(local809); Static203.method3663(Static71.signLink); - Static18.aBoolean39 = false; + Static18.sentToServer = false; Static254.anIntArray487[local28++] = local1552 ? 0 : 1; continue; } @@ -3856,7 +3856,7 @@ public final class Static88 { local26 -= 2; local2522 = Static3.aClass100Array176[local26 + 1]; local609 = Static3.aClass100Array176[local26]; - if (Static173.aClass8_Sub4_Sub1_2.aClass59_1 != null && Static173.aClass8_Sub4_Sub1_2.aClass59_1.aBoolean141) { + if (Static173.self.aClass59_1 != null && Static173.self.aClass59_1.aBoolean141) { Static3.aClass100Array176[local26++] = local2522; continue; } @@ -4028,13 +4028,13 @@ public final class Static88 { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; } else { local28--; - local1182 = Static5.method32(Static254.anIntArray487[local28]); + local1182 = Static5.getComponent(Static254.anIntArray487[local28]); local226 -= 1000; } if (local226 == 1000) { local28 -= 4; - local1182.anInt529 = Static254.anIntArray487[local28]; - local1182.anInt444 = Static254.anIntArray487[local28 + 1]; + local1182.baseX = Static254.anIntArray487[local28]; + local1182.baseY = Static254.anIntArray487[local28 + 1]; local1052 = Static254.anIntArray487[local28 + 3]; if (local1052 < 0) { local1052 = 0; @@ -4047,18 +4047,18 @@ public final class Static88 { } else if (local803 > 5) { local803 = 5; } - local1182.aByte2 = (byte) local1052; - local1182.aByte4 = (byte) local803; + local1182.xMode = (byte) local1052; + local1182.yMode = (byte) local803; Static43.method1143(local1182); Static74.method1625(local1182); - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static280.method4675(local1182.anInt507); } continue; } if (local226 == 1001) { local28 -= 4; - local1182.anInt446 = Static254.anIntArray487[local28]; + local1182.baseWidth = Static254.anIntArray487[local28]; local1182.anInt488 = Static254.anIntArray487[local28 + 1]; local1182.anInt451 = 0; local1182.anInt526 = 0; @@ -4086,11 +4086,11 @@ public final class Static88 { if (local226 == 1003) { local28--; local1552 = Static254.anIntArray487[local28] == 1; - if (local1552 != local1182.aBoolean17) { - local1182.aBoolean17 = local1552; + if (local1552 != local1182.hidden) { + local1182.hidden = local1552; Static43.method1143(local1182); } - if (local1182.anInt457 == -1) { + if (local1182.componentId == -1) { Static93.method1906(local1182.anInt507); } continue; diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java index 3140823..78ddf1e 100644 --- a/client/src/main/java/Static89.java +++ b/client/src/main/java/Static89.java @@ -135,7 +135,7 @@ public final class Static89 { Static231.method3983(1L); } if (local109.status == 1) { - @Pc(128) DataInputStream local128 = (DataInputStream) local109.anObject6; + @Pc(128) DataInputStream local128 = (DataInputStream) local109.result; local128.read(); local128.close(); } @@ -155,12 +155,12 @@ public final class Static89 { if (Static162.anInt3953 != 0) { Static155.anInt3751 = Static277.anInt5850; Static60.anInt1892 = Static280.anInt5895; - } else if (Static150.anInt3585 == 0) { + } else if (Static150.clickButton == 0) { Static155.anInt3751 = Static215.anInt4873; Static60.anInt1892 = Static223.anInt5032; } else { - Static155.anInt3751 = Static7.anInt985; - Static60.anInt1892 = Static60.anInt1893; + Static155.anInt3751 = Static7.clickX; + Static60.anInt1892 = Static60.clickY; } Static231.anInt5204 = 1; Static254.aClass100Array168[0] = LocalizedText.CANCEL; @@ -168,8 +168,8 @@ public final class Static89 { Static39.aShortArray6[0] = 1005; Static190.anIntArray382[0] = Static35.anInt1092; } - if (Static154.anInt3711 != -1) { - Static96.method1949(Static154.anInt3711); + if (Static154.topLevelInterace != -1) { + Static96.method1949(Static154.topLevelInterace); } @Pc(60) int local60; for (local60 = 0; local60 < Static24.anInt766; local60++) { @@ -187,7 +187,7 @@ public final class Static89 { Static263.aBoolean299 = true; } Static182.anInt4311 = Static83.anInt372; - if (Static154.anInt3711 != -1) { + if (Static154.topLevelInterace != -1) { Static24.anInt766 = 0; Static9.method182(); } @@ -236,7 +236,7 @@ public final class Static89 { } } } - Static110.method2281(Static178.anInt4247, Static173.aClass8_Sub4_Sub1_2.anInt3412, Static173.aClass8_Sub4_Sub1_2.anInt3421, Static55.anInt1735); + Static110.method2281(Static178.anInt4247, Static173.self.anInt3412, Static173.self.anInt3421, Static55.level); Static178.anInt4247 = 0; } diff --git a/client/src/main/java/Static9.java b/client/src/main/java/Static9.java index a74fab5..686fd8c 100644 --- a/client/src/main/java/Static9.java +++ b/client/src/main/java/Static9.java @@ -67,7 +67,7 @@ public final class Static9 { @OriginalMember(owner = "client!al", name = "a", descriptor = "(Z)V") public static void method182() { Static241.aClass13Array13 = null; - Static6.method86(Static154.anInt3711, 0, Static48.anInt1448, 0, -1, Static254.anInt5554, 0, 0); + Static6.method86(Static154.topLevelInterace, 0, Static48.anInt1448, 0, -1, Static254.anInt5554, 0, 0); if (Static241.aClass13Array13 != null) { Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, Static48.anInt1448, -1412584499, 0, Static254.anInt5554, Static4.aClass13_1.anInt517); Static241.aClass13Array13 = null; diff --git a/client/src/main/java/Static96.java b/client/src/main/java/Static96.java index 068a27b..49be664 100644 --- a/client/src/main/java/Static96.java +++ b/client/src/main/java/Static96.java @@ -21,8 +21,8 @@ public final class Static96 { @OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V") public static void method1949(@OriginalArg(1) int arg0) { - if (Static245.method4225(arg0)) { - Static118.method2354(-1, Static241.aClass13ArrayArray12[arg0]); + if (Static245.load(arg0)) { + Static118.method2354(-1, Static241.components[arg0]); } } @@ -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 = Static148.aClass97Array1[Static55.anInt1735].anIntArrayArray30; + @Pc(76) int[][] local76 = Static148.aClass97Array1[Static55.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) && Static148.aClass97Array1[Static55.anInt1735].method3042(arg0, local3, local10, arg5, arg6 - 1, arg4, arg3)) { + if ((arg6 < 5 || arg6 == 10) && Static148.aClass97Array1[Static55.level].method3042(arg0, local3, local10, arg5, arg6 - 1, arg4, arg3)) { local71 = true; break; } - if (arg6 < 10 && Static148.aClass97Array1[Static55.anInt1735].method3046(arg0, arg6 - 1, arg5, local10, arg4, arg3, local3)) { + if (arg6 < 10 && Static148.aClass97Array1[Static55.level].method3046(arg0, arg6 - 1, arg5, local10, arg4, arg3, local3)) { local71 = true; break; } } - if (arg1 != 0 && arg9 != 0 && Static148.aClass97Array1[Static55.anInt1735].method3052(arg5, local10, local3, arg4, arg1, arg7, arg0, arg9)) { + if (arg1 != 0 && arg9 != 0 && Static148.aClass97Array1[Static55.level].method3052(arg5, local10, local3, arg4, arg1, arg7, arg0, arg9)) { local71 = true; break; } diff --git a/client/src/main/java/Static98.java b/client/src/main/java/Static98.java index c9e732f..5cc4d72 100644 --- a/client/src/main/java/Static98.java +++ b/client/src/main/java/Static98.java @@ -34,7 +34,7 @@ public final class Static98 { return true; } } - if (arg0.method3111(Static173.aClass8_Sub4_Sub1_2.aClass100_364)) { + if (arg0.method3111(Static173.self.aClass100_364)) { return true; } else { return false; diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index 690ae5c..21a1a71 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -105,7 +105,7 @@ public final class client extends GameShell { Static97.aLong89 = MonotonicClock.currentTimeMillis() + 500L; } } - if (Static69.aFrame2 != null && !Static26.aBoolean59 && (Static244.anInt5370 == 30 || Static244.anInt5370 == 10)) { + if (Static69.aFrame2 != null && !Static26.focus && (Static244.anInt5370 == 30 || Static244.anInt5370 == 10)) { Static241.method4540(false, Static214.anInt5581, -1, -1); } @Pc(158) boolean local158 = false; @@ -182,7 +182,7 @@ public final class client extends GameShell { if (Static107.aBoolean147) { Static213.method3729(); } - if (Static164.aBoolean191 && Static244.anInt5370 == 10 && Static154.anInt3711 != -1) { + if (Static164.aBoolean191 && Static244.anInt5370 == 10 && Static154.topLevelInterace != -1) { Static164.aBoolean191 = false; Static203.method3663(Static71.signLink); } @@ -201,13 +201,13 @@ public final class client extends GameShell { if (Static71.signLink != null) { Static71.signLink.method5121(this.getClass()); } - if (Static178.aClass74_1 != null) { - Static178.aClass74_1.aBoolean151 = false; + if (Static178.instance != null) { + Static178.instance.aBoolean151 = false; } - Static178.aClass74_1 = null; - if (Static124.aClass95_2 != null) { - Static124.aClass95_2.method2834(); - Static124.aClass95_2 = null; + Static178.instance = null; + if (Static124.socket != null) { + Static124.socket.method2834(); + Static124.socket = null; } Static31.method847(Static154.canvas); Static223.method3866(Static154.canvas); @@ -414,15 +414,15 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "d", descriptor = "(B)V") private void method943() { - for (Static182.anInt4313 = 0; Static25.method712() && Static182.anInt4313 < 128; Static182.anInt4313++) { - Static227.anIntArray447[Static182.anInt4313] = Static102.anInt2681; - Static205.anIntArray426[Static182.anInt4313] = Static193.anInt4542; + for (Static182.keyQueueSize = 0; Static25.nextKey() && Static182.keyQueueSize < 128; Static182.keyQueueSize++) { + Static227.keyCodes[Static182.keyQueueSize] = Static102.keyCode; + Static205.keyChars[Static182.keyQueueSize] = Static193.keyChar; } Static178.anInt4247++; - if (Static154.anInt3711 != -1) { - Static57.method1320(0, 0, 0, Static48.anInt1448, Static154.anInt3711, 0, Static254.anInt5554); + if (Static154.topLevelInterace != -1) { + Static57.method1320(0, 0, 0, Static48.anInt1448, Static154.topLevelInterace, 0, Static254.anInt5554); } - Static119.anInt3028++; + Static119.transmitTimer++; if (Static239.aBoolean269) { label191: for (@Pc(57) int local57 = 0; local57 < 32768; local57++) { @Pc(66) Npc local66 = Static175.aClass8_Sub4_Sub2Array1[local57]; @@ -433,14 +433,14 @@ public final class client extends GameShell { @Pc(106) int local106 = (int) Math.round(Math.random() * 2.0D - 1.0D); if (local98 != 0 || local106 != 0) { local66.aByteArray48[0] = 1; - local66.anIntArray318[0] = local98 + (local66.anInt3412 >> 7); - local66.anIntArray317[0] = local106 + (local66.anInt3421 >> 7); - Static148.aClass97Array1[Static55.anInt1735].method3056(local66.anInt3412 >> 7, local66.method2693(), false, 0, local66.method2693(), local66.anInt3421 >> 7); - if (local66.anIntArray318[0] >= 0 && local66.anIntArray318[0] <= 104 - local66.method2693() && local66.anIntArray317[0] >= 0 && local66.anIntArray317[0] <= 104 - local66.method2693() && Static148.aClass97Array1[Static55.anInt1735].method3054(local66.anInt3421 >> 7, local66.anIntArray317[0], local66.anIntArray318[0], local66.anInt3412 >> 7)) { + local66.movementQueueX[0] = local98 + (local66.anInt3412 >> 7); + local66.movementQueueZ[0] = local106 + (local66.anInt3421 >> 7); + Static148.aClass97Array1[Static55.level].method3056(local66.anInt3412 >> 7, local66.method2693(), false, 0, local66.method2693(), local66.anInt3421 >> 7); + if (local66.movementQueueX[0] >= 0 && local66.movementQueueX[0] <= 104 - local66.method2693() && local66.movementQueueZ[0] >= 0 && local66.movementQueueZ[0] <= 104 - local66.method2693() && Static148.aClass97Array1[Static55.level].method3054(local66.anInt3421 >> 7, local66.movementQueueZ[0], local66.movementQueueX[0], local66.anInt3412 >> 7)) { if (local66.method2693() > 1) { - for (@Pc(226) int local226 = local66.anIntArray318[0]; local66.anIntArray318[0] + local66.method2693() > local226; local226++) { - for (@Pc(246) int local246 = local66.anIntArray317[0]; local66.anIntArray317[0] + local66.method2693() > local246; local246++) { - if ((Static148.aClass97Array1[Static55.anInt1735].anIntArrayArray30[local226][local246] & 0x12401FF) != 0) { + for (@Pc(226) int local226 = local66.movementQueueX[0]; local66.movementQueueX[0] + local66.method2693() > local226; local226++) { + for (@Pc(246) int local246 = local66.movementQueueZ[0]; local66.movementQueueZ[0] + local66.method2693() > local246; local246++) { + if ((Static148.aClass97Array1[Static55.level].anIntArrayArray30[local226][local246] & 0x12401FF) != 0) { continue label191; } } @@ -453,7 +453,7 @@ public final class client extends GameShell { Static104.method2247(local66); Static37.method949(local66); Static34.method879(local66); - Static148.aClass97Array1[Static55.anInt1735].method3043(local66.anInt3412 >> 7, false, local66.anInt3421 >> 7, local66.method2693(), local66.method2693()); + Static148.aClass97Array1[Static55.level].method3043(local66.anInt3412 >> 7, false, local66.anInt3421 >> 7, local66.method2693(), local66.method2693()); } } } @@ -487,43 +487,43 @@ public final class client extends GameShell { if (Static105.aClass13_14 != null) { Static4.method28(); } - if (Static33.aClass212_1 != null && Static33.aClass212_1.status == 1) { - if (Static33.aClass212_1.anObject6 != null) { - Static169.method3175(Static175.aClass100_797, Static164.aBoolean194); + if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) { + if (Static33.openUrlRequest.result != null) { + Static169.openUrl(Static175.url, Static164.newTab); } - Static164.aBoolean194 = false; - Static175.aClass100_797 = null; - Static33.aClass212_1 = null; + Static164.newTab = false; + Static175.url = null; + Static33.openUrlRequest = null; } if (Static83.anInt372 % 1500 == 0) { Static123.method2418(); } return; } - local379 = local374.aClass13_17; - if (local379.anInt457 < 0) { + local379 = local374.source; + if (local379.componentId < 0) { break; } - local387 = Static5.method32(local379.anInt456); - } while (local387 == null || local387.aClass13Array3 == null || local387.aClass13Array3.length <= local379.anInt457 || local379 != local387.aClass13Array3[local379.anInt457]); + local387 = Static5.getComponent(local379.layer); + } while (local387 == null || local387.createdComponents == null || local387.createdComponents.length <= local379.componentId || local379 != local387.createdComponents[local379.componentId]); Static82.method1767(local374); } } - local379 = local374.aClass13_17; - if (local379.anInt457 < 0) { + local379 = local374.source; + if (local379.componentId < 0) { break; } - local387 = Static5.method32(local379.anInt456); - } while (local387 == null || local387.aClass13Array3 == null || local379.anInt457 >= local387.aClass13Array3.length || local379 != local387.aClass13Array3[local379.anInt457]); + local387 = Static5.getComponent(local379.layer); + } while (local387 == null || local387.createdComponents == null || local379.componentId >= local387.createdComponents.length || local379 != local387.createdComponents[local379.componentId]); Static82.method1767(local374); } } - local379 = local374.aClass13_17; - if (local379.anInt457 < 0) { + local379 = local374.source; + if (local379.componentId < 0) { break; } - local387 = Static5.method32(local379.anInt456); - } while (local387 == null || local387.aClass13Array3 == null || local387.aClass13Array3.length <= local379.anInt457 || local379 != local387.aClass13Array3[local379.anInt457]); + local387 = Static5.getComponent(local379.layer); + } while (local387 == null || local387.createdComponents == null || local387.createdComponents.length <= local379.componentId || local379 != local387.createdComponents[local379.componentId]); Static82.method1767(local374); } } @@ -590,7 +590,7 @@ public final class client extends GameShell { } } if (Static4.js5ConnectState == 2) { - Static206.js5Socket = new BufferedSocket((Socket) Static37.js5SocketRequest.anObject6, Static71.signLink); + Static206.js5Socket = new BufferedSocket((Socket) Static37.js5SocketRequest.result, Static71.signLink); @Pc(194) Buffer buffer = new Buffer(5); buffer.p1(15); buffer.p4(530); @@ -628,10 +628,10 @@ public final class client extends GameShell { if (!Static164.aBoolean191) { label252: while (true) { do { - if (!Static25.method712()) { + if (!Static25.nextKey()) { break label252; } - } while (Static193.anInt4542 != 115 && Static193.anInt4542 != 83); + } while (Static193.keyChar != 115 && Static193.keyChar != 83); Static164.aBoolean191 = true; } } @@ -860,8 +860,8 @@ public final class client extends GameShell { Static166.anInt4051 = 110; } } else if (Static166.anInt4051 == 110) { - Static178.aClass74_1 = new MouseRecorder(); - Static71.signLink.method5130(10, Static178.aClass74_1); + Static178.instance = new MouseRecorder(); + Static71.signLink.method5130(10, Static178.instance); Static126.aClass100_602 = LocalizedText.MAINLOAD110B; Static199.anInt4670 = 75; Static166.anInt4051 = 120; @@ -967,7 +967,7 @@ public final class client extends GameShell { } if (Static71.mouseWheel != null) { @Pc(75) int local75 = Static71.mouseWheel.method3287(); - Static58.anInt1766 = local75; + Static58.wheelRotation = local75; } if (Static244.anInt5370 == 0) { this.method948(); diff --git a/signlink/src/main/java/PrivilegedRequest.java b/signlink/src/main/java/PrivilegedRequest.java index e1e556e..0428c55 100644 --- a/signlink/src/main/java/PrivilegedRequest.java +++ b/signlink/src/main/java/PrivilegedRequest.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class PrivilegedRequest { @OriginalMember(owner = "signlink!im", name = "e", descriptor = "Ljava/lang/Object;") - public volatile Object anObject6; + public volatile Object result; @OriginalMember(owner = "signlink!im", name = "f", descriptor = "I") public int anInt5924; diff --git a/signlink/src/main/java/SignLink.java b/signlink/src/main/java/SignLink.java index 0de196f..2d69b36 100644 --- a/signlink/src/main/java/SignLink.java +++ b/signlink/src/main/java/SignLink.java @@ -350,18 +350,18 @@ public final class SignLink implements Runnable { if (aLong1314 > MonotonicClock.currentTimeMillis()) { throw new IOException(); } - local16.anObject6 = new Socket(InetAddress.getByName((String) local16.anObject7), local16.anInt5926); + local16.result = new Socket(InetAddress.getByName((String) local16.anObject7), local16.anInt5926); } else if (local45 == 2) { @Pc(813) Thread local813 = new Thread((Runnable) local16.anObject7); local813.setDaemon(true); local813.start(); local813.setPriority(local16.anInt5926); - local16.anObject6 = local813; + local16.result = local813; } else if (local45 == 4) { if (aLong1314 > MonotonicClock.currentTimeMillis()) { throw new IOException(); } - local16.anObject6 = new DataInputStream(((URL) local16.anObject7).openStream()); + local16.result = new DataInputStream(((URL) local16.anObject7).openStream()); } else { @Pc(687) Object[] local687; if (local45 == 8) { @@ -369,13 +369,13 @@ public final class SignLink implements Runnable { if (((Class) local687[0]).getClassLoader() == null) { throw new SecurityException(); } - local16.anObject6 = ((Class) local687[0]).getDeclaredMethod((String) local687[1], (Class[]) local687[2]); + local16.result = ((Class) local687[0]).getDeclaredMethod((String) local687[1], (Class[]) local687[2]); } else if (local45 == 9) { local687 = (Object[]) local16.anObject7; if (((Class) local687[0]).getClassLoader() == null) { throw new SecurityException(); } - local16.anObject6 = ((Class) local687[0]).getDeclaredField((String) local687[1]); + local16.result = ((Class) local687[0]).getDeclaredField((String) local687[1]); } else { @Pc(147) String local147; if (local45 == 3) { @@ -383,12 +383,12 @@ public final class SignLink implements Runnable { throw new IOException(); } local147 = (local16.anInt5926 >> 24 & 0xFF) + "." + (local16.anInt5926 >> 16 & 0xFF) + "." + (local16.anInt5926 >> 8 & 0xFF) + "." + (local16.anInt5926 & 0xFF); - local16.anObject6 = InetAddress.getByName(local147).getHostName(); + local16.result = InetAddress.getByName(local147).getHostName(); } else if (local45 == 5) { - local16.anObject6 = this.aClass210_1.method5105(); + local16.result = this.aClass210_1.method5105(); } else if (local45 == 6) { @Pc(168) Frame local168 = new Frame("Jagex Full Screen"); - local16.anObject6 = local168; + local16.result = local168; local168.setResizable(false); this.aClass210_1.method5104(local16.anInt5927 & 0xFFFF, local16.anInt5927 >> 16, local16.anInt5926 & 0xFFFF, local168, local16.anInt5926 >>> 16); } else if (local45 == 7) { @@ -443,7 +443,7 @@ public final class SignLink implements Runnable { } else if (local45 == 12) { local147 = (String) local16.anObject7; @Pc(558) FileOnDisk local558 = method5117(local147); - local16.anObject6 = local558; + local16.result = local558; } else if (local45 == 14) { @Pc(570) int local570 = local16.anInt5927; @Pc(573) int local573 = local16.anInt5926; @@ -471,9 +471,9 @@ public final class SignLink implements Runnable { } } Runtime.getRuntime().exec("cmd /c start \"j\" \"" + local147 + "\""); - local16.anObject6 = null; + local16.result = null; } catch (@Pc(674) Exception local674) { - local16.anObject6 = local674; + local16.result = local674; } } else { throw new Exception();